hide speaker-config in menu (it's not implemented yet)

[ardour.git] / gtk2_ardour / editor_group_tabs.cc

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index ccf95b797f65f21a96e58f35bdb7654bd7df66a2..d02181c9b6c56b8f715a87d2c9728fe783edbebe 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
 #include "editor_group_tabs.h"
 #include "editor.h"
@@ -24,6 +26,7 @@
 #include "utils.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -60,7 +63,9 @@ EditorGroupTabs::compute_tabs () const
 
                        tab.from = y;
                        tab.group = g;
-                       tab.colour = (*i)->color ();
+                       if (g) {
+                               tab.color = group_color (g);
+                       }
                }
 
                y += (*i)->effective_height ();
@@ -77,29 +82,29 @@ EditorGroupTabs::compute_tabs () const
 void
 EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
-       double const arc_radius = _width;
+       double const arc_radius = get_width();
 
        if (tab.group && tab.group->is_active()) {
-               cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1);
+               cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1);
        } else {
                cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
        }
-       
+
        cairo_move_to (cr, 0, tab.from + arc_radius);
-       cairo_arc (cr, _width, tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2);
-       cairo_line_to (cr, _width, tab.to);
-       cairo_arc (cr, _width, tab.to - arc_radius, arc_radius, M_PI / 2, M_PI);
+       cairo_arc (cr, get_width(), tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2);
+       cairo_line_to (cr, get_width(), tab.to);
+       cairo_arc (cr, get_width(), tab.to - arc_radius, arc_radius, M_PI / 2, M_PI);
        cairo_line_to (cr, 0, tab.from + arc_radius);
        cairo_fill (cr);
 
        if (tab.group) {
-               pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
-               
+               pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
-               
+
                cairo_set_source_rgb (cr, 1, 1, 1);
-               cairo_move_to (cr, _width - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
+               cairo_move_to (cr, get_width() - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
                cairo_save (cr);
                cairo_rotate (cr, - M_PI / 2);
                cairo_show_text (cr, f.first.c_str());
@@ -118,7 +123,7 @@ EditorGroupTabs::routes_for_tab (Tab const * t) const
 {
        RouteList routes;
        int32_t y = 0;
-       
+
        for (TrackViewList::iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
 
                if ((*i)->marked_for_display() == false) {
@@ -151,7 +156,7 @@ void
 EditorGroupTabs::add_menu_items (Gtk::Menu* m, RouteGroup* g)
 {
        using namespace Gtk::Menu_Helpers;
-       
+
        if (g) {
                MenuList& items = m->items ();
                items.push_back (MenuElem (_("Fit to Window"), sigc::bind (sigc::mem_fun (*_editor, &Editor::fit_route_group), g)));
@@ -162,21 +167,14 @@ PBD::PropertyList
 EditorGroupTabs::default_properties () const
 {
        PBD::PropertyList plist;
-       
+
        plist.add (Properties::active, true);
        plist.add (Properties::mute, true);
        plist.add (Properties::solo, true);
        plist.add (Properties::recenable, true);
-       plist.add (Properties::edit, true);
 
        return plist;
 }
-       
-string
-EditorGroupTabs::order_key () const
-{
-       return X_("editor");
-}
 
 RouteList
 EditorGroupTabs::selected_routes () const
@@ -196,5 +194,5 @@ EditorGroupTabs::selected_routes () const
 void
 EditorGroupTabs::sync_order_keys ()
 {
-       _editor->_routes->sync_order_keys ("");
+       _editor->_routes->sync_order_keys_from_treeview ();
 }