reorder editor route list columns to put visible and active first (from joern)

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

3 files changed, 18 insertions, 15 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 3e1206a3c9..76b41280c2 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -256,8 +256,8 @@ Editor::initialize_canvas ()
 
 	track_canvas->set_name ("EditorMainCanvas");
 	track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
-	track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas));
-	track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas));
+	track_canvas->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas), false);
+	track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas), false);
 	track_canvas->set_flags (CAN_FOCUS);
 
 	/* set up drag-n-drop */
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index d98ee0a8d2..985ae37b60 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -182,6 +182,10 @@ EditorRoutes::EditorRoutes (Editor* e)
 	solo_safe_state_column->set_expand(false);
 	solo_safe_state_column->set_fixed_width(column_width);
 
+        _name_column = _display.append_column ("", _columns.text) - 1;
+	_visible_column = _display.append_column ("", _columns.visible) - 1;
+	_active_column = _display.append_column ("", _columns.active) - 1;
+
 	_display.append_column (*input_active_column);
 	_display.append_column (*rec_state_column);
 	_display.append_column (*mute_state_column);
@@ -189,23 +193,20 @@ EditorRoutes::EditorRoutes (Editor* e)
 	_display.append_column (*solo_isolate_state_column);
 	_display.append_column (*solo_safe_state_column);
 
-        _name_column = _display.append_column ("", _columns.text) - 1;
-	_visible_column = _display.append_column ("", _columns.visible) - 1;
-	_active_column = _display.append_column ("", _columns.active) - 1;
 
 	TreeViewColumn* col;
 	Gtk::Label* l;
 
 	ColumnInfo ci[] = {
-		{ 0, _("I"), _("MIDI input enabled") },
-		{ 1, _("R"), _("Record enabled") },
-		{ 2, _("M"), _("Muted") },
-		{ 3, _("S"), _("Soloed") },
-		{ 4, _("SI"), _("Solo Isolated") },
-		{ 5, _("SS"), _("Solo Safe (Locked)") },
-		{ 6, _("Name"), _("Track/Bus Name") },
-		{ 7, _("V"), _("Track/Bus visible ?") },
-		{ 8, _("A"), _("Track/Bus active ?") },
+		{ 0, _("Name"), _("Track/Bus Name") },
+		{ 1, _("V"), _("Track/Bus visible ?") },
+		{ 2, _("A"), _("Track/Bus active ?") },
+		{ 3, _("I"), _("MIDI input enabled") },
+		{ 4, _("R"), _("Record enabled") },
+		{ 5, _("M"), _("Muted") },
+		{ 6, _("S"), _("Soloed") },
+		{ 7, _("SI"), _("Solo Isolated") },
+		{ 8, _("SS"), _("Solo Safe (Locked)") },
 		{ -1, 0, 0 }
 	};
 
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 166026d092..deba448071 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -137,7 +137,7 @@ EditorSummary::on_expose_event (GdkEventExpose* event)
 void
 EditorSummary::render (cairo_t* cr)
 {
-	/* background */
+	/* background (really just the dividing lines between tracks */
 
 	cairo_set_source_rgb (cr, 0, 0, 0);
 	cairo_rectangle (cr, 0, 0, get_width(), get_height());
@@ -184,6 +184,8 @@ EditorSummary::render (cairo_t* cr)
 			continue;
 		}
 
+		/* paint a non-bg colored strip to represent the track itself */
+
 		cairo_set_source_rgb (cr, 0.2, 0.2, 0.2);
 		cairo_set_line_width (cr, _track_height - 1);
 		cairo_move_to (cr, 0, y + _track_height / 2);