From f8d98a0dc280ab442c320be8bab643fcb5aebf04 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 27 Dec 2013 17:23:21 +0100
Subject: Fix for bug #1236282 (add full keyboard navigation support for new
 templates dialog).

Fixed bugs:
  - https://launchpad.net/bugs/1236282

(bzr r12862)
---
 src/ui/dialog/new-from-template.cpp |  2 +-
 src/ui/dialog/template-load-tab.cpp | 10 ++++++++--
 src/ui/dialog/template-load-tab.h   |  2 ++
 src/ui/dialog/template-widget.cpp   |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 2595e2cf5..177f15195 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -34,7 +34,7 @@ NewFromTemplate::NewFromTemplate()
     align->set_padding(0, 0, 0, 15);
     align->add(_create_template_button);
     
-    _create_template_button.signal_pressed().connect(
+    _create_template_button.signal_clicked().connect(
     sigc::mem_fun(*this, &NewFromTemplate::_createFromTemplate));
    
     show_all();
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 8e33cf503..057eff337 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -9,7 +9,6 @@
  */
 
 #include "template-widget.h"
-
 #include "template-load-tab.h"
 
 #include <gtkmm/messagedialog.h>
@@ -83,6 +82,11 @@ void TemplateLoadTab::createTemplate()
 }
 
 
+void TemplateLoadTab::_onRowActivated(const Gtk::TreeModel::Path &, Gtk::TreeViewColumn*)
+{
+    _info_widget->create();
+}
+
 void TemplateLoadTab::_displayTemplateInfo()
 {
     Glib::RefPtr<Gtk::TreeSelection> templateSelectionRef = _tlist_view.get_selection();
@@ -119,9 +123,11 @@ void TemplateLoadTab::_initLists()
     _tlist_view.get_selection(); 
     templateSelectionRef->signal_changed().connect(
     sigc::mem_fun(*this, &TemplateLoadTab::_displayTemplateInfo));
+    
+    _tlist_view.signal_row_activated().connect(
+    sigc::mem_fun(*this, &TemplateLoadTab::_onRowActivated));
 }
 
-
 void TemplateLoadTab::_keywordSelected()
 {
     _current_keyword = _keywords_combo.get_active_text();
diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h
index 744a2a9fb..920ae6ca2 100644
--- a/src/ui/dialog/template-load-tab.h
+++ b/src/ui/dialog/template-load-tab.h
@@ -101,6 +101,8 @@ private:
     void _getTemplatesFromDir(const std::string &);
     void _keywordSelected();    
     TemplateData _processTemplateFile(const std::string &);
+    
+    void _onRowActivated(const Gtk::TreeModel::Path &, Gtk::TreeViewColumn*);
 };
 
 }
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 898903f2b..d1697244e 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -53,7 +53,7 @@ TemplateWidget::TemplateWidget()
     
     pack_end(_short_description_label, Gtk::PACK_SHRINK, 5);
     
-    _more_info_button.signal_pressed().connect(
+    _more_info_button.signal_clicked().connect(
     sigc::mem_fun(*this, &TemplateWidget::_displayTemplateDetails));
 }
 
-- 
cgit v1.2.3