fix column expansion behaviour of editor region list (#4489)

[ardour.git] / gtk2_ardour / editor_regions.cc

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index c6c8f1e9149874165e16117c8a16b300337bb4de..781af4960f9453b0a02fe575ed1e668a49a54ff6 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -59,6 +59,12 @@ using namespace Glib;
 using namespace Editing;
 using Gtkmm2ext::Keyboard;
 
+struct ColumnInfo {
+    int         index;
+    const char* label;
+    const char* tooltip;
+};
+
 EditorRegions::EditorRegions (Editor* e)
        : EditorComponent (e)
        , old_focus (0)
@@ -71,6 +77,8 @@ EditorRegions::EditorRegions (Editor* e)
        , _sort_type ((Editing::RegionListSortType) 0)
        , expanded (false)
 {
+       static const int column_width = 22;
+
        _display.set_size_request (100, -1);
        _display.set_name ("RegionListDisplay");
        _display.set_rules_hint (true);
@@ -86,24 +94,56 @@ EditorRegions::EditorRegions (Editor* e)
 
        _display.set_model (_model);
 
-       _display.append_column (_("Regions"), _columns.name);
-       _display.append_column (_("Position"), _columns.position);
-       _display.append_column (_("End"), _columns.end);
-       _display.append_column (_("Length"), _columns.length);
-       _display.append_column (_("Sync"), _columns.sync);
-       _display.append_column (_("Fade In"), _columns.fadein);
-       _display.append_column (_("Fade Out"), _columns.fadeout);
-       _display.append_column (_("L"), _columns.locked);
-       _display.append_column (_("G"), _columns.glued);
-       _display.append_column (_("M"), _columns.muted);
-       _display.append_column (_("O"), _columns.opaque);
-       // _display.append_column (_("Used"), _columns.used);
-       // _display.append_column (_("Path"), _columns.path);
+       _display.append_column ("", _columns.name);
+       _display.append_column ("", _columns.position);
+       _display.append_column ("", _columns.end);
+       _display.append_column ("", _columns.length);
+       _display.append_column ("", _columns.sync);
+       _display.append_column ("", _columns.fadein);
+       _display.append_column ("", _columns.fadeout);
+       _display.append_column ("", _columns.locked);
+       _display.append_column ("", _columns.glued);
+       _display.append_column ("", _columns.muted);
+       _display.append_column ("", _columns.opaque);
+
+       TreeViewColumn* col;
+       Gtk::Label* l;
+
+       ColumnInfo ci[] = {
+               { 0, _("Region"), _("Region name, with number of channels in []'s") },
+               { 1, _("Position"),  _("Length of the region") },
+               { 2, _("End"),  _("Length of the region") },
+               { 3, _("End"),  _("Length of the region") },
+               { 4, _("Sync"),  _("Position of region sync point, relative to start of the region") },
+               { 5, _("Sync"),  _("Region fade-in enabled?") },
+               { 6, _("Fade In"),  _("Region fade-out enabled?") },
+               { 7, _("L"),  _("Region position locked?") },
+               { 8, _("G"),  _("Region position glued to Bars|Beats time?") },
+               { 9, _("M"),  _("Region muted?") },
+               { 10, _("O"),  _("Region opaque (blocks regions below it from being heard)?") },
+               { -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));
+               ARDOUR_UI::instance()->set_tip (*l, ci[i].tooltip);
+               col->set_widget (*l);
+               l->show ();
+
+               if (ci[i].index > 6) {
+                       col->set_fixed_width(column_width);
+                       col->set_expand (false);
+                       col->set_sizing (TREE_VIEW_COLUMN_FIXED);
+                       col->set_alignment (ALIGN_CENTER);
+               } 
+       }
+
        _display.set_headers_visible (true);
-       //_display.set_grid_lines (TREE_VIEW_GRID_LINES_BOTH);
+       _display.set_rules_hint ();
 
        /* show path as the row tooltip */
-       _display.set_tooltip_column (15); /* path */
+       _display.set_tooltip_column (14); /* path */
 
        CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
        region_name_cell->property_editable() = true;
@@ -116,6 +156,7 @@ EditorRegions::EditorRegions (Editor* e)
        CellRendererText* renderer = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
        tv_col->add_attribute(renderer->property_text(), _columns.name);
        tv_col->add_attribute(renderer->property_foreground_gdk(), _columns.color_);
+       tv_col->set_expand (true);
 
        CellRendererToggle* locked_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (7));
        locked_cell->property_activatable() = true;
@@ -409,7 +450,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 }
 
 void
-EditorRegions::delete_unused_regions ()
+EditorRegions::remove_unused_regions ()
 {
        vector<string> choices;
        string prompt;
@@ -1543,7 +1584,7 @@ EditorRegions::show_action () const
 }
 
 RefPtr<Action>
-EditorRegions::delete_unused_regions_action () const
+EditorRegions::remove_unused_regions_action () const
 {
        return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
 }