when connecting to sigc signals, use sigc methods, not boost::bind

[ardour.git] / gtk2_ardour / template_dialog.cc

diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
index 49d6f44f3f8ead0f3d686dca9d3604a1b1358cad..1703b0907ff4e9ff769d0137863921c4e243c6c4 100644 (file)
--- a/gtk2_ardour/template_dialog.cc
+++ b/gtk2_ardour/template_dialog.cc
@@ -63,7 +63,7 @@ class TemplateManager : public Gtk::HBox,
 public:
        virtual ~TemplateManager () {}
 
-       virtual void init () = 0;
+       void init ();
        void handle_dirty_description ();
 
        PBD::Signal0<void> TemplatesImported;
@@ -107,6 +107,8 @@ private:
 
        bool key_event (GdkEventKey* ev);
 
+       virtual void get_templates (vector<TemplateInfo>& templates) const = 0;
+
        virtual void rename_template (Gtk::TreeModel::iterator& item, const Glib::ustring& new_name) = 0;
 
        virtual void save_template_desc ();
@@ -133,6 +135,8 @@ private:
        Gtk::Button _export_all_templates_button;
        Gtk::Button _import_template_set_button;
 
+       sigc::connection _cursor_changed_connection;
+
        void update_progress_gui (float p);
 };
 
@@ -142,7 +146,7 @@ public:
        SessionTemplateManager () : TemplateManager () {}
        ~SessionTemplateManager () {}
 
-       void init ();
+       void get_templates (vector<TemplateInfo>& templates) const;
 
 private:
        void rename_template (Gtk::TreeModel::iterator& item, const Glib::ustring& new_name);
@@ -161,7 +165,7 @@ public:
        RouteTemplateManager () : TemplateManager () {}
        ~RouteTemplateManager () {}
 
-       void init ();
+       void get_templates (vector<TemplateInfo>& templates) const;
 
 private:
        void rename_template (Gtk::TreeModel::iterator& item, const Glib::ustring& new_name);
@@ -187,7 +191,7 @@ TemplateDialog::TemplateDialog ()
        nb->append_page (*route_tm, _("Track Templates"));
 
        get_vbox()->pack_start (*nb);
-       add_button (_("Ok"), Gtk::RESPONSE_OK);
+       add_button (_("Done"), Gtk::RESPONSE_OK);
 
        get_vbox()->show_all();
 
@@ -199,8 +203,8 @@ TemplateDialog::TemplateDialog ()
 
        signal_hide().connect (sigc::mem_fun (session_tm, &TemplateManager::handle_dirty_description));
        signal_hide().connect (sigc::mem_fun (route_tm, &TemplateManager::handle_dirty_description));
-       nb->signal_switch_page().connect (boost::bind (&TemplateManager::handle_dirty_description, session_tm));
-       nb->signal_switch_page().connect (boost::bind (&TemplateManager::handle_dirty_description, route_tm));
+       nb->signal_switch_page().connect (sigc::hide (sigc::hide (sigc::mem_fun (session_tm, &TemplateManager::handle_dirty_description))));
+       nb->signal_switch_page().connect (sigc::hide (sigc::hide (sigc::mem_fun (route_tm, &TemplateManager::handle_dirty_description))));
 }
 
 TemplateManager::TemplateManager ()
@@ -223,7 +227,7 @@ TemplateManager::TemplateManager ()
 
        _validated_column.set_cell_data_func (_validating_cellrenderer, sigc::mem_fun (*this, &TemplateManager::render_template_names));
        _validating_cellrenderer.signal_edited().connect (sigc::mem_fun (*this, &TemplateManager::validate_edit));
-       _template_treeview.signal_cursor_changed().connect (sigc::mem_fun (*this, &TemplateManager::row_selection_changed));
+       _cursor_changed_connection = _template_treeview.signal_cursor_changed().connect (sigc::mem_fun (*this, &TemplateManager::row_selection_changed));
        _template_treeview.signal_key_press_event().connect (sigc::mem_fun (*this, &TemplateManager::key_event));
 
        ScrolledWindow* sw = manage (new ScrolledWindow);
@@ -280,6 +284,18 @@ TemplateManager::TemplateManager ()
        _progress_bar.hide ();
 }
 
+void
+TemplateManager::init ()
+{
+       vector<TemplateInfo> templates;
+       get_templates (templates);
+       setup_model (templates);
+
+       _progress_bar.hide ();
+       _description_editor.set_sensitive (false);
+       _save_desc.set_sensitive (false);
+}
+
 void
 TemplateManager::setup_model (const vector<TemplateInfo>& templates)
 {
@@ -318,24 +334,28 @@ TemplateManager::handle_dirty_description ()
                } else {
                        _description_editor.get_buffer()->set_text (_current_selection->get_value (_template_columns.description));
                }
-
-               _desc_dirty = false;
        }
 }
 
 void
 TemplateManager::row_selection_changed ()
 {
-       handle_dirty_description ();
+       if (_current_selection) {
+               handle_dirty_description ();
+       } else {
+               _description_editor.get_buffer()->set_text ("");
+       }
 
        _current_selection = _template_treeview.get_selection()->get_selected ();
        if (_current_selection) {
                const string desc = _current_selection->get_value (_template_columns.description);
                _description_editor.get_buffer()->set_text (desc);
-               _desc_dirty = false;
-               _save_desc.set_sensitive (false);
        }
 
+       _desc_dirty = false;
+       _save_desc.set_sensitive (false);
+
+       _description_editor.set_sensitive (_current_selection);
        _rename_button.set_sensitive (_current_selection);
        _remove_button.set_sensitive (_current_selection);
 }
@@ -383,7 +403,9 @@ TemplateManager::start_edit ()
        TreeModel::Path path;
        TreeViewColumn* col;
        _template_treeview.get_cursor (path, col);
+       _cursor_changed_connection.block ();
        _template_treeview.set_cursor (path, *col, /*set_editing =*/ true);
+       _cursor_changed_connection.unblock ();
 }
 
 void
@@ -398,7 +420,12 @@ TemplateManager::save_template_desc ()
 {
        const string file_path = template_file (_current_selection);
 
-       const string desc_txt = _description_editor.get_buffer()->get_text ();
+       string desc_txt = _description_editor.get_buffer()->get_text ();
+       string::reverse_iterator wss = desc_txt.rbegin();
+       while (wss != desc_txt.rend() && isspace (*wss)) {
+               desc_txt.erase (--(wss++).base());
+       }
+
        _current_selection->set_value (_template_columns.description, desc_txt);
 
        XMLTree tree;
@@ -408,7 +435,7 @@ TemplateManager::save_template_desc ()
                return;
        }
 
-       tree.root()->remove_nodes (X_("description"));
+       tree.root()->remove_nodes_and_delete (X_("description"));
        XMLNode* desc = new XMLNode (X_("description"));
 
        XMLNode* dn = new XMLNode (X_("content"), desc_txt);
@@ -641,23 +668,15 @@ TemplateManager::update_progress_gui (float p)
        _progress_bar.set_fraction (p);
 }
 
-
-void SessionTemplateManager::init ()
+void
+SessionTemplateManager::get_templates (vector<TemplateInfo>& templates) const
 {
-       vector<TemplateInfo> templates;
        find_session_templates (templates, /* read_xml = */ true);
-       setup_model (templates);
-
-       _progress_bar.hide ();
 }
 
-void RouteTemplateManager::init ()
+void RouteTemplateManager::get_templates (vector<TemplateInfo>& templates) const
 {
-       vector<TemplateInfo> templates;
        find_route_templates (templates);
-       setup_model (templates);
-
-       _progress_bar.hide ();
 }
 
 #include <cerrno>
@@ -726,6 +745,7 @@ SessionTemplateManager::delete_selected_template ()
        PBD::remove_directory (_current_selection->get_value (_template_columns.path));
 
        _template_model->erase (_current_selection);
+       _current_selection = TreeIter ();
        row_selection_changed ();
 }