add color column to editor route groups list

git-svn-id: svn://localhost/ardour2/branches/3.0@10914 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index a38521fbe07ec59e0f4f893a865e66f5b69eb806..5adb193fc2360c703d43c5e35c2b941185311437 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -24,7 +24,9 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <gtkmm2ext/gtk_ui.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/cell_renderer_color_selector.h"
+
 #include "ardour/route_group.h"
 
 #include "editor.h"
@@ -78,6 +80,12 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        _display.append_column ("", _columns.active_state);
        _display.append_column ("", _columns.is_visible);
 
+       Gtkmm2ext::CellRendererColorSelector* color_renderer = manage (new Gtkmm2ext::CellRendererColorSelector);
+       TreeViewColumn* color_column = manage (new TreeViewColumn ("", *color_renderer));
+       color_column->add_attribute (color_renderer->property_color(), _columns.gdkcolor);
+       
+       _display.append_column (*color_column);
+
        TreeViewColumn* col;
        Gtk::Label* l;
 
@@ -93,9 +101,11 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
                { 8, S_("editing|E"), _("Sharing Editing?") },
                { 9, S_("active|A"), _("Sharing Active Status?") },
                { 10, _("Show"), _("Group is visible?") },
+               { 11, _("Col"), _("Group Tab Color") },
                { -1, 0, 0 }
        };
 
+
        for (int i = 0; ci[i].index >= 0; ++i) {
                col = _display.get_column (ci[i].index);
                l = manage (new Label (ci[i].label));
@@ -114,6 +124,11 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 
        _display.set_headers_visible (true);
 
+       color_dialog.get_colorsel()->set_has_opacity_control (false);
+       color_dialog.get_colorsel()->set_has_palette (true);
+       color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
+       color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
+
        /* name is directly editable */
 
        CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
@@ -124,8 +139,11 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        
        for (int i = 1; ci[i].index >= 0; ++i) {
                CellRendererToggle* active_cell = dynamic_cast <CellRendererToggle*> (_display.get_column_cell_renderer (i));
-               active_cell->property_activatable() = true;
-               active_cell->property_radio() = false;
+
+               if (active_cell) {
+                       active_cell->property_activatable() = true;
+                       active_cell->property_radio() = false;
+               }
        }
 
        _model->signal_row_changed().connect (sigc::mem_fun (*this, &EditorRouteGroups::row_change));
@@ -138,9 +156,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        _display.set_name ("EditGroupList");
        _display.get_selection()->set_mode (SELECTION_SINGLE);
        _display.set_headers_visible (true);
-       _display.set_reorderable (true);
+       _display.set_reorderable (false);
        _display.set_rules_hint (true);
-       _display.set_size_request (75, -1);
 
        _scroller.add (_display);
        _scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
@@ -221,6 +238,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
        int cellx;
        int celly;
        bool ret = false;
+       Gdk::Color c;
 
        bool const p = _display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly);
 
@@ -245,6 +263,8 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                return true;
        }
 
+       cerr << "click on col " << GPOINTER_TO_UINT (column->get_data (X_("colnum"))) << endl;
+
        switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
        case 0:
                if (Keyboard::is_edit_event (ev)) {
@@ -336,6 +356,36 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                        ret = true;
                }
                break;
+
+       case 11: 
+               c = (*iter)[_columns.gdkcolor];
+
+               color_dialog.get_colorsel()->set_previous_color (c);
+               color_dialog.get_colorsel()->set_current_color (c);
+
+               switch (color_dialog.run()) {
+               case RESPONSE_CANCEL:
+                       cerr << "cancel\n";
+                       break;
+               case RESPONSE_ACCEPT:
+                       c = color_dialog.get_colorsel()->get_current_color();
+                       (*iter)[_columns.gdkcolor] = c;
+                       cerr << "Set group " << (*iter)[_columns.routegroup] << " color to " 
+                            << c.get_red_p() << ':' << c.get_green_p() << ':' 
+                            << c.get_blue_p() << endl;
+                       GroupTabs::set_group_color ((*iter)[_columns.routegroup], c);
+                       ARDOUR_UI::config()->set_dirty ();
+                       break;
+                       
+               default:
+                       cerr << "no accept nor cancel\n";
+                       break;
+                       
+               }
+
+               color_dialog.hide ();
+               ret = true;
+               break;
                
        default:
                break;
@@ -385,8 +435,12 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
        val = (*iter)[_columns.active_state];
        plist.add (Properties::route_active, val);
 
+       GroupTabs::set_group_color ((*iter)[_columns.routegroup], (*iter)[_columns.gdkcolor]);
+       
        group->set_hidden (!(*iter)[_columns.is_visible], this);
 
+       /* XXX set color here */
+
        group->apply_changes (plist);
 }
 
@@ -408,7 +462,8 @@ EditorRouteGroups::add (RouteGroup* group)
        row[_columns.edits] = group->is_edit ();
        row[_columns.active_state] = group->is_route_active ();
        row[_columns.is_visible] = !group->is_hidden();
-
+       row[_columns.gdkcolor] = GroupTabs::group_color (group);
+       
        _in_row_change = true;
 
        row[_columns.routegroup] = group;
@@ -471,12 +526,13 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& ch
                        (*iter)[_columns.edits] = group->is_edit ();
                        (*iter)[_columns.active_state] = group->is_route_active ();
                        (*iter)[_columns.is_visible] = !group->is_hidden();
+                       (*iter)[_columns.gdkcolor] = GroupTabs::group_color (group);
                }
        }
 
        _in_row_change = false;
 
-       if (change.contains (Properties::name) || change.contains (Properties::active)) {
+       if (change.contains (Properties::name) || change.contains (Properties::color) || change.contains (Properties::active)) {
                _editor->_group_tabs->set_dirty ();
        }
 

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 40effb61c8293b43e390808a86a926523483a60d..f92e79c7cc3942eee5f5ad94005e0a01ce280a7e 100644 (file)
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -50,6 +50,7 @@ private:
                        add (edits);
                        add (active_state);
                        add (is_visible);
+                       add (gdkcolor);
                        add (routegroup);
                 }
 
@@ -64,6 +65,7 @@ private:
                Gtk::TreeModelColumn<bool> edits;
                Gtk::TreeModelColumn<bool> active_state;
                Gtk::TreeModelColumn<bool> is_visible;
+               Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
                Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
        };
 
@@ -92,6 +94,7 @@ private:
        bool _in_rebuild;
        PBD::ScopedConnectionList _property_changed_connections;
        PBD::ScopedConnection all_route_groups_changed_connection;
+       Gtk::ColorSelectionDialog color_dialog;
 };