Fader image update for more tactile "track" feel.

[ardour.git] / gtk2_ardour / editor_selection_list.cc

diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index 46a11c75f3d0926485bccfedd21521474e1c2df0..959da1ad2d740e4a335d60d7a5290d45d978b05e 100644 (file)
--- a/gtk2_ardour/editor_selection_list.cc
+++ b/gtk2_ardour/editor_selection_list.cc
@@ -40,72 +40,63 @@
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
 void
 Editor::handle_new_named_selection ()
 {
-       ARDOUR_UI::instance()->call_slot (slot (*this, &Editor::redisplay_named_selections));
+       ARDOUR_UI::instance()->call_slot (mem_fun(*this, &Editor::redisplay_named_selections));
 }
 
 void
 Editor::add_named_selection_to_named_selection_display (NamedSelection& selection)
 {
-       const gchar *row[1];
-
-       row[0] = selection.name.c_str();
-       named_selection_display.rows().push_back (row);
-       named_selection_display.rows().back().set_data (&selection);
+        TreeModel::Row row = *(named_selection_model->append());
+       row[named_selection_columns.text] = selection.name;
+       row[named_selection_columns.selection] = &selection;
 }
 
 void
 Editor::redisplay_named_selections ()
 {
-       named_selection_display.freeze ();
-       named_selection_display.clear ();
+       named_selection_model->clear ();
        session->foreach_named_selection (*this, &Editor::add_named_selection_to_named_selection_display);
-       named_selection_display.thaw ();
 }
 
 gint
 Editor::named_selection_display_button_press (GdkEventButton *ev)
 {
-       NamedSelection* named_selection;
-       gint row;
-       gint col;
-
-       switch (ev->button) {
-       case 1:
-               if (Keyboard::is_delete_event (ev)) {
-                       if (named_selection_display.get_selection_info ((int)ev->x, (int)ev->y, &row, &col) != 0) {
-                               if ((named_selection = reinterpret_cast<NamedSelection *> (named_selection_display.get_row_data (row))) != 0) {
-                                       session->remove_named_selection (named_selection);
+
+       TreeModel::Children rows = named_selection_model->children();
+       TreeModel::Children::iterator i;
+       Glib::RefPtr<TreeSelection> selection = named_selection_display.get_selection();
+
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               if (selection->is_selected (i)) {
+                       switch (ev->button) {
+                       case 1:
+                               if (Keyboard::is_delete_event (ev)) {
+                                       session->remove_named_selection ((*i)[named_selection_columns.selection]);
                                        return stop_signal (named_selection_display, "button_press_event");
                                }
+                               break;
+                       case 2:
+                               break;
+                       case 3:
+                               break;
+                       default:
+                               break;
                        }
-               } 
-               break;
-
-       case 2:
-               break;
-
-       case 3:
-               break;
-       default:
-               break;
+               }
        }
        return FALSE;
 }
 
 
 void
-Editor::named_selection_display_selected (gint row, gint col, GdkEvent *ev)
-{
-}
-
-void
-Editor::named_selection_display_unselected (gint row, gint col, GdkEvent *ev)
+Editor::named_selection_display_selection_changed ()
 {
 }
 
@@ -114,21 +105,22 @@ Editor::name_selection ()
 {
        ArdourPrompter p;
 
-       p.set_prompt (_("name for chunk:"));
-       p.done.connect (slot (*this, &Editor::named_selection_name_chosen));
-       p.change_labels (_("Create chunk"), _("Forget it"));
+       p.set_prompt (_("Name for Chunk:"));
+       p.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
+       p.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
+       p.change_labels (_("Create Chunk"), _("Forget it"));
        p.show_all ();
 
-       Gtk::Main::run ();
-
-       if (p.status == Prompter::entered) {
-               string name;
+       switch (p.run ()) {
+       case Gtk::RESPONSE_ACCEPT:
+         string name;
                p.get_result (name);
-               
-               if (name.length()){
-                       create_named_selection (name);
-               }
+               if (name.length()) {
+                 create_named_selection (name);
+               }       
+               break;
        }
+
 }
 
 void
@@ -138,7 +130,7 @@ Editor::named_selection_name_chosen ()
 }
 
 void
-Editor::create_named_selection (string name)
+Editor::create_named_selection (const string & name)
 {
        if (session == 0) {
                return;
@@ -175,11 +167,15 @@ Editor::create_named_selection (string name)
        }
 
        NamedSelection* ns;
+       TreeModel::Row row = *(named_selection_model->append());
 
        ns = new NamedSelection (name, thelist);
+       row[named_selection_columns.selection] = ns;
+       row[named_selection_columns.text] = name;
 
        /* make the one we just added be selected */
 
-       named_selection_display.rows().back().select ();
+       named_selection_display.get_selection()->select (row);
+
 }