summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorSlagvi Public <JandotDarowskiattgmaildottcom>2013-07-03 11:35:06 +0000
committerSlagvi Public <JandotDarowskiattgmaildottcom>2013-07-03 11:35:06 +0000
commitec3d3965f0aa7444d42fc8765abbc9c3ed0916ce (patch)
tree2343cccb3cec58a0dc71138b844cb55d0895e7d6 /src/ui
parentAdding NewFromTemplate to the Inkscape menu (diff)
downloadinkscape-ec3d3965f0aa7444d42fc8765abbc9c3ed0916ce.tar.gz
inkscape-ec3d3965f0aa7444d42fc8765abbc9c3ed0916ce.zip
Templates menu item fixed
(bzr r12379.2.6)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/new-from-template.h2
-rw-r--r--src/ui/dialog/static-template-load-tab.cpp3
-rw-r--r--src/ui/dialog/static-template-load-tab.h3
-rw-r--r--src/ui/dialog/template-load-tab.cpp7
4 files changed, 8 insertions, 7 deletions
diff --git a/src/ui/dialog/new-from-template.h b/src/ui/dialog/new-from-template.h
index ef3cbce18..f8c4bbb37 100644
--- a/src/ui/dialog/new-from-template.h
+++ b/src/ui/dialog/new-from-template.h
@@ -1,8 +1,8 @@
#ifndef INKSCAPE_SEEN_UI_DIALOG_NEW_FROM_TEMPLATE_H
#define INKSCAPE_SEEN_UI_DIALOG_NEW_FROM_TEMPLATE_H
-#include <gtkmm/button.h>
#include <gtkmm/dialog.h>
+#include <gtkmm/button.h>
#include <gtkmm/notebook.h>
#include "template-load-tab.h"
diff --git a/src/ui/dialog/static-template-load-tab.cpp b/src/ui/dialog/static-template-load-tab.cpp
index 83ff32e52..94298bf1d 100644
--- a/src/ui/dialog/static-template-load-tab.cpp
+++ b/src/ui/dialog/static-template-load-tab.cpp
@@ -1,9 +1,10 @@
+#include "static-template-load-tab.h"
+
#include <gtkmm/alignment.h>
#include <gtkmm/button.h>
#include <gtkmm/label.h>
#include <iostream>
-#include "static-template-load-tab.h"
namespace Inkscape {
namespace UI {
diff --git a/src/ui/dialog/static-template-load-tab.h b/src/ui/dialog/static-template-load-tab.h
index 651f146a0..a1a3adf7b 100644
--- a/src/ui/dialog/static-template-load-tab.h
+++ b/src/ui/dialog/static-template-load-tab.h
@@ -1,12 +1,11 @@
#ifndef INKSCAPE_SEEN_UI_DIALOG_STATIC_TEMPLATE_LOAD_TAB_H
#define INKSCAPE_SEEN_UI_DIALOG_STATIC_TEMPLATE_LOAD_TAB_H
+#include "template-load-tab.h"
#include <gtkmm/label.h>
#include <gtkmm/button.h>
#include <gtkmm/image.h>
-#include "template-load-tab.h"
-
namespace Inkscape {
namespace UI {
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index a7b5e63f3..5d4c3a364 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -1,7 +1,7 @@
+#include "template-load-tab.h"
#include <gtkmm/alignment.h>
#include <iostream>
-#include "template-load-tab.h"
namespace Inkscape {
namespace UI {
@@ -66,10 +66,11 @@ void TemplateLoadTab::_displayTemplateInfo()
void TemplateLoadTab::_initKeywordsList()
{
- _keywords_combo.append_text("All");
+ _keywords_combo.append("All");
+ // _keywords_combo
for (int i = 0 ; i < 10 ; ++i) {
- _keywords_combo.append_text( "Keyword" + Glib::ustring::format(i));
+ _keywords_combo.append( "Keyword" + Glib::ustring::format(i));
}
}