Templates menu item fixed

(bzr r12379.2.6)

5 files changed, 16 insertions, 7 deletions

diff --git a/src/file.cpp b/src/file.cpp
index 5b4110253..7f8bfc8bf 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -66,6 +66,7 @@
 #include "verbs.h"
 #include "event-log.h"
 #include "ui/dialog/font-substitution.h"
+#include "ui/dialog/new-from-template.h"
 
 #include <gtk/gtk.h>
 
@@ -199,6 +200,13 @@ SPDesktop* sp_file_new_default()
     return desk;
 }
 
+SPDesktop* sp_file_new_from_templatee()
+{
+    Inkscape::UI::NewFromTemplate dl;
+    dl.run();
+    return sp_file_new_default();
+}
+
 /*######################
 ## D E L E T E
 ######################*/
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));
     }
 }