Templates gui fixes

(bzr r12379.2.14)

4 files changed, 19 insertions, 20 deletions

diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 6598aecdf..2595e2cf5 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -30,7 +30,8 @@ NewFromTemplate::NewFromTemplate()
    
     Gtk::Alignment *align;
     align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
-    get_vbox()->pack_end(*align, Gtk::PACK_SHRINK, 5);
+    get_vbox()->pack_end(*align, Gtk::PACK_SHRINK);
+    align->set_padding(0, 0, 0, 15);
     align->add(_create_template_button);
     
     _create_template_button.signal_pressed().connect(
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 58219f8f2..65d5e6447 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -38,18 +38,16 @@ TemplateLoadTab::TemplateLoadTab()
     set_border_width(10);
 
     _info_widget = manage(new TemplateWidget());
+    
     Gtk::Label *title;
     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);
+    _search_box.pack_start(*title, Gtk::PACK_SHRINK);
+    _search_box.pack_start(_keywords_combo, Gtk::PACK_SHRINK, 5);
     
-    title = manage(new Gtk::Label(_("Templates")));
-    _tlist_box.pack_start(*title, Gtk::PACK_SHRINK, 10);
+    _tlist_box.pack_start(_search_box, 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);
+    pack_start(_tlist_box, Gtk::PACK_SHRINK);
+    pack_start(*_info_widget, Gtk::PACK_EXPAND_WIDGET, 5);
     
     Gtk::ScrolledWindow *scrolled;
     scrolled = manage(new Gtk::ScrolledWindow());
diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h
index cc5229c95..c3c512374 100644
--- a/src/ui/dialog/template-load-tab.h
+++ b/src/ui/dialog/template-load-tab.h
@@ -25,7 +25,7 @@ namespace UI {
 
 class TemplateWidget;
     
-class TemplateLoadTab : public Gtk::Frame
+class TemplateLoadTab : public Gtk::HBox
 {
 
 public:
@@ -71,8 +71,9 @@ protected:
     void _loadTemplates();
     void _initLists();
     
-    Gtk::HBox _main_box;
+   // Gtk::HBox _main_box;
     Gtk::VBox _tlist_box;
+    Gtk::HBox _search_box;
     TemplateWidget *_info_widget;
     
     Gtk::ComboBoxText _keywords_combo;
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index bb2c4a683..56346403e 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -27,26 +27,25 @@ namespace UI {
 
 TemplateWidget::TemplateWidget()
     : _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")
+    , _short_description_label(_(" "))
+    , _template_author_label(_(" "))
+    , _template_name_label(_("no template selected"))
+    , _preview_image(" ")
 {
-    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_name_label, Gtk::PACK_SHRINK, 10);
     pack_start(_template_author_label, Gtk::PACK_SHRINK, 0);
     pack_start(_preview_image, Gtk::PACK_SHRINK, 15);
-    pack_start(_short_description_label, Gtk::PACK_SHRINK, 4);
     
     _short_description_label.set_line_wrap(true);
     _short_description_label.set_size_request(200);
 
     Gtk::Alignment *align;
     align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
-    pack_start(*align, Gtk::PACK_SHRINK, 5);
+    pack_end(*align, Gtk::PACK_SHRINK);
     align->add(_more_info_button);
     
+    pack_end(_short_description_label, Gtk::PACK_SHRINK, 5);
+    
     _more_info_button.signal_pressed().connect(
     sigc::mem_fun(*this, &TemplateWidget::_displayTemplateDetails));
 }