port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on...

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 4d6f7119cc72b9ac5528a7ed7a1de675165aee5c..11be303099b6fec2b9bbc5b859e96e54233f1077 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -67,7 +67,6 @@ Mixer_UI::Mixer_UI ()
        _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
        track_menu = 0;
         _monitor_section = 0;
-       route_group_context_menu = 0;
        no_track_list_redisplay = false;
        in_group_row_change = false;
        _visible = false;
@@ -171,8 +170,8 @@ Mixer_UI::Mixer_UI ()
        route_group_add_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_route_group));
        route_group_remove_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::remove_selected_route_group));
 
-       route_group_display_button_box->add (*route_group_remove_button);
        route_group_display_button_box->add (*route_group_add_button);
+       route_group_display_button_box->add (*route_group_remove_button);
 
        group_display_vbox.pack_start (group_display_scroller, true, true);
        group_display_vbox.pack_start (*route_group_display_button_box, false, false);
@@ -214,7 +213,7 @@ Mixer_UI::Mixer_UI ()
        title += _("Mixer");
        set_title (title.get_string());
 
-       set_wmclass (X_("ardour_mixer"), "Ardour");
+       set_wmclass (X_("ardour_mixer"), PROGRAM_NAME);
 
        add_accel_group (ActionManager::ui_manager->get_accel_group());
 
@@ -1056,37 +1055,9 @@ Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip
        error << _("track display list item for renamed strip not found!") << endmsg;
 }
 
-
-void
-Mixer_UI::build_route_group_context_menu ()
-{
-       using namespace Gtk::Menu_Helpers;
-
-       route_group_context_menu = new Menu;
-       route_group_context_menu->set_name ("ArdourContextMenu");
-       MenuList& items = route_group_context_menu->items();
-
-       items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &Mixer_UI::activate_all_route_groups)));
-       items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &Mixer_UI::disable_all_route_groups)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Add group"), sigc::mem_fun(*this, &Mixer_UI::new_route_group)));
-
-}
-
 bool
 Mixer_UI::group_display_button_press (GdkEventButton* ev)
 {
-       if (Keyboard::is_context_menu_event (ev)) {
-               if (route_group_context_menu == 0) {
-                       build_route_group_context_menu ();
-               }
-               route_group_context_menu->popup (1, ev->time);
-               return true;
-       }
-
-
-        RouteGroup* group;
-       TreeIter iter;
        TreeModel::Path path;
        TreeViewColumn* column;
        int cellx;
@@ -1096,32 +1067,40 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
                return false;
        }
 
+       TreeIter iter = group_model->get_iter (path);
+       if (!iter) {
+               return false;
+       }
+
+       RouteGroup* group = (*iter)[group_columns.group];
+
+       if (Keyboard::is_context_menu_event (ev)) {
+               _group_tabs->get_menu(group)->popup (1, ev->time);
+               return true;
+       }
+
        switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
        case 0:
                if (Keyboard::is_edit_event (ev)) {
-                       if ((iter = group_model->get_iter (path))) {
-                               if ((group = (*iter)[group_columns.group]) != 0) {
-                                       // edit_route_group (group);
+                       if (group) {
+                               // edit_route_group (group);
 #ifdef GTKOSX
-                                       group_display.queue_draw();
+                               group_display.queue_draw();
 #endif
-                                       return true;
-                               }
+                               return true;
                        }
-
                }
                break;
 
        case 1:
-               if ((iter = group_model->get_iter (path))) {
-                       bool visible = (*iter)[group_columns.visible];
-                       (*iter)[group_columns.visible] = !visible;
+       {
+               bool visible = (*iter)[group_columns.visible];
+               (*iter)[group_columns.visible] = !visible;
 #ifdef GTKOSX
-                       group_display.queue_draw();
+               group_display.queue_draw();
 #endif
-                       return true;
-               }
-               break;
+               return true;
+       }
 
        default:
                break;
@@ -1160,22 +1139,16 @@ Mixer_UI::route_groups_changed ()
        }
 
        _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
+
+       _group_tabs->set_dirty ();
 }
 
 void
 Mixer_UI::new_route_group ()
 {
-       PropertyList plist;
-
-       plist.add (Properties::active, true);
-       plist.add (Properties::gain, true);
-       plist.add (Properties::mute, true);
-       plist.add (Properties::solo, true);
-
-       RouteGroup* g = new RouteGroup (*_session, "");
-       g->set_properties (plist);
-
-       _session->add_route_group (g);
+       RouteList rl;
+       
+       _group_tabs->run_new_group_dialog (rl);
 }
 
 void
@@ -1242,7 +1215,7 @@ Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange&
 }
 
 void
-Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+Mixer_UI::route_group_name_edit (const std::string& path, const std::string& new_text)
 {
        RouteGroup* group;
        TreeIter iter;
@@ -1286,7 +1259,7 @@ Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeMo
                }
        }
 
-       Glib::ustring name = (*iter)[group_columns.text];
+       std::string name = (*iter)[group_columns.text];
 
        if (name != group->name()) {
                group->set_name (name);
@@ -1320,6 +1293,8 @@ Mixer_UI::add_route_group (RouteGroup* group)
                group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
        }
 
+       _group_tabs->set_dirty ();
+
        in_group_row_change = false;
 }