Minor code fixes

(bzr r12379.2.12)

6 files changed, 23 insertions, 49 deletions

diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 241da3f43..6598aecdf 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -10,10 +10,10 @@
 
 
 #include "new-from-template.h"
+#include "file.h"
 
 #include <gtkmm/alignment.h>
-
-#include "file.h"
+#include <glibmm/i18n.h>
 
 
 namespace Inkscape {
@@ -21,9 +21,9 @@ namespace UI {
 
 
 NewFromTemplate::NewFromTemplate()
-    : _create_template_button("Create from template")
+    : _create_template_button(_("Create from template"))
 {
-    set_title("New From Template");
+    set_title(_("New From Template"));
     resize(400, 400);
     
     get_vbox()->pack_start(_main_widget);
@@ -47,6 +47,7 @@ void NewFromTemplate::_createFromTemplate()
     response(0);
 }
 
+
 void NewFromTemplate::load_new_from_template()
 {
     NewFromTemplate dl;
diff --git a/src/ui/dialog/new-from-template.h b/src/ui/dialog/new-from-template.h
index 05af98a50..8ebcb2863 100644
--- a/src/ui/dialog/new-from-template.h
+++ b/src/ui/dialog/new-from-template.h
@@ -13,7 +13,6 @@
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
-#include <gtkmm/notebook.h>
 
 #include "template-load-tab.h"
 
@@ -30,7 +29,6 @@ public:
 private:
     NewFromTemplate();
     Gtk::Button _create_template_button;
-    //StaticTemplateLoadTab _tab1;
     TemplateLoadTab _main_widget;
     
     void _createFromTemplate();
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 70dadfc52..ded4fc6fd 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -9,9 +9,11 @@
  */
 
 #include "template-load-tab.h"
+#include "template-widget.h"
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
+#include <glibmm/i18n.h>
 #include <iostream>
 
 #include "interface.h"
@@ -23,16 +25,6 @@
 #include "xml/document.h"
 #include "xml/node.h"
 
-#include "template-widget.h"
-
-//
-#include <gtk/gtk.h>
-
-#include <glibmm/convert.h>
-#include <glibmm/i18n.h>
-#include <glibmm/miscutils.h>
-//
-
 
 namespace Inkscape {
 namespace UI {
@@ -47,17 +39,14 @@ TemplateLoadTab::TemplateLoadTab()
 
     _info_widget = manage(new TemplateWidget());
     Gtk::Label *title;
-    title = manage(new Gtk::Label("Search:"));
+    title = manage(new Gtk::Label(_("Search:")));
     _tlist_box.pack_start(*title, Gtk::PACK_SHRINK, 10);
     
     _tlist_box.pack_start(_keywords_combo, Gtk::PACK_SHRINK, 0);
     
-    title = manage(new Gtk::Label("Templates"));
+    title = manage(new Gtk::Label(_("Templates")));
     _tlist_box.pack_start(*title, Gtk::PACK_SHRINK, 10);
     
-    title = manage(new Gtk::Label("Selected template"));
-    _info_widget->pack_start(*title, Gtk::PACK_SHRINK, 10);
-    
     add(_main_box);
     _main_box.pack_start(_tlist_box, Gtk::PACK_SHRINK, 20);
     _main_box.pack_start(*_info_widget, Gtk::PACK_EXPAND_WIDGET, 10);
@@ -72,7 +61,6 @@ TemplateLoadTab::TemplateLoadTab()
     sigc::mem_fun(*this, &TemplateLoadTab::_keywordSelected));
     this->show_all();
     
-    
     _loading_path = "";
     _loadTemplates();
     _initLists();
@@ -139,7 +127,7 @@ void TemplateLoadTab::_keywordSelected()
     else
         _current_search_type = LIST_KEYWORD;
     
-    if (_current_keyword == "" || _current_keyword == "All")
+    if (_current_keyword == "" || _current_keyword == _("All"))
         _current_search_type = ALL;
     
     _refreshTemplatesList();
@@ -206,9 +194,7 @@ TemplateLoadTab::TemplateData TemplateLoadTab::_processTemplateFile(const Glib::
     TemplateData result;
     result.path = path;
     result.display_name = Glib::path_get_basename(path);
-    result.is_procedural = false;/*
-    result.short_description = "LaLaLaLa";
-    result.author = "JAASDASD";*/
+    result.is_procedural = false;
     
     Inkscape::XML::Document *rdoc;
     rdoc = sp_repr_read_file(path.data(), SP_SVG_NS_URI);
diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h
index 48ad23ae9..cc5229c95 100644
--- a/src/ui/dialog/template-load-tab.h
+++ b/src/ui/dialog/template-load-tab.h
@@ -46,8 +46,7 @@ public:
     virtual ~TemplateLoadTab();
     virtual void createTemplate();
 
-protected:
-    
+protected:    
     class StringModelColumns : public Gtk::TreeModelColumnRecord
     {
         public:
@@ -80,9 +79,7 @@ protected:
     
     Gtk::TreeView _tlist_view;
     Glib::RefPtr<Gtk::ListStore> _tlist_store;
-    StringModelColumns _columns;
-    
-    
+    StringModelColumns _columns;    
     
 private:
     enum SearchType
@@ -97,7 +94,6 @@ private:
     void _getTemplatesFromDir(const Glib::ustring &);
     void _keywordSelected();    
     TemplateData _processTemplateFile(const Glib::ustring &);
-
 };
 
 }
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index dd066c90b..bb2c4a683 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -12,18 +12,13 @@
 
 #include "template-widget.h"
 #include "template-load-tab.h"
+#include "file.h"
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 #include <gtkmm/messagedialog.h>
-#include <iostream>
-
-#include "file.h"
-
-#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
-#include <glibmm/miscutils.h>
 
 
 namespace Inkscape {
@@ -31,12 +26,14 @@ namespace UI {
     
 
 TemplateWidget::TemplateWidget()
-    : _more_info_button("More info")
-    , _short_description_label("Short description - I like trains. ad asda asd asdweqe gdfg")
-    , _template_author_label("by template_author")
-    , _template_name_label("Template_name")
+    : _more_info_button(_("More info"))
+    , _short_description_label(_("Short description"))
+    , _template_author_label(_("by template_author"))
+    , _template_name_label(_("Template_name"))
     , _preview_image("preview.png")
 {
+    Gtk::Label *title = manage(new Gtk::Label(_("Selected template")));
+    pack_start(*title, Gtk::PACK_SHRINK, 10);
     pack_start(_template_name_label, Gtk::PACK_SHRINK, 4);
     pack_start(_template_author_label, Gtk::PACK_SHRINK, 0);
     pack_start(_preview_image, Gtk::PACK_SHRINK, 15);
@@ -59,9 +56,8 @@ void TemplateWidget::create()
 {
     if (_current_template.path == "")
         return;
-    if (_current_template.is_procedural){
-        
-    }
+    
+    if (_current_template.is_procedural) {}
     else {
         sp_file_new(_current_template.path);
     }
@@ -82,6 +78,7 @@ void TemplateWidget::display(TemplateLoadTab::TemplateData data)
     }
 }
 
+
 void TemplateWidget::_displayTemplateDetails()
 {    
     if (_current_template.path == "")
diff --git a/src/ui/dialog/template-widget.h b/src/ui/dialog/template-widget.h
index 83024e0d8..743fb524d 100644
--- a/src/ui/dialog/template-widget.h
+++ b/src/ui/dialog/template-widget.h
@@ -15,13 +15,10 @@
 #include <gtkmm/box.h>
 
 
-
 namespace Inkscape {
 namespace UI {
     
-class TemplateLoadTab;
     
-
 class TemplateWidget : public Gtk::VBox
 {
 public:
@@ -39,7 +36,6 @@ private:
     Gtk::Image _preview_image;
     
     void _displayTemplateDetails();
-    
 };
 
 }