ardour/livetrax
13
0
Fork 0
Code

tweak region layering editor to use only a single click to change layering

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13603 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-05 18:29:07 +00:00
parent 3668e822ab
commit 5fb6a52a24
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/region_layering_order_editor.cc
View File

@ -20,6 +20,9 @@
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/alignment.h> #include <gtkmm/alignment.h>
#include "pbd/stateful_diff_command.h"
#include "ardour/region.h" #include "ardour/region.h"
#include "gui_thread.h" #include "gui_thread.h"
@ -80,7 +83,7 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
info_table->attach (track_label, 0, 1, 0, 1, FILL, FILL); info_table->attach (track_label, 0, 1, 0, 1, FILL, FILL);
info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL); info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL);
info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL); info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
info_table->attach (clock, 1, 2, 1, 2, FILL, FILL); info_table->attach (clock, 1, 2, 1, 2, Gtk::AttachOptions(0), FILL);
Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
vbox->set_spacing (12); vbox->set_spacing (12);
@ -92,8 +95,8 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
scroller_table->set_name ("RegionLayeringOrderTable"); scroller_table->set_name ("RegionLayeringOrderTable");
layering_order_display.set_name ("RegionLayeringOrderDisplay"); layering_order_display.set_name ("RegionLayeringOrderDisplay");
layering_order_display.get_selection()->set_mode (SELECTION_SINGLE);
layering_order_display.signal_row_activated ().connect (mem_fun (*this, &RegionLayeringOrderEditor::row_activated)); layering_order_display.get_selection()->signal_changed ().connect (mem_fun (*this, &RegionLayeringOrderEditor::row_selected));
layering_order_display.grab_focus (); layering_order_display.grab_focus ();
@ -107,13 +110,14 @@ RegionLayeringOrderEditor::~RegionLayeringOrderEditor ()
} }
void void
RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn*) RegionLayeringOrderEditor::row_selected ()
{ {
if (in_row_change) { if (in_row_change) {
return; return;
} }
TreeModel::iterator iter = layering_order_model->get_iter (path); Glib::RefPtr<TreeSelection> selection = layering_order_display.get_selection();
TreeModel::iterator iter = selection->get_selected(); // only used with Gtk::SELECTION_SINGLE
if (!iter) { if (!iter) {
return; return;
@ -124,9 +128,14 @@ RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewC
vector<RegionView*> eq; vector<RegionView*> eq;
editor.get_equivalent_regions (rv, eq, Properties::edit.property_id); editor.get_equivalent_regions (rv, eq, Properties::edit.property_id);
/* XXX this should be reversible, really */
for (vector<RegionView*>::iterator i = eq.begin(); i != eq.end(); ++i) { for (vector<RegionView*>::iterator i = eq.begin(); i != eq.end(); ++i) {
(*i)->region()->raise_to_top (); boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
if (pl) {
pl->raise_region_to_top ((*i)->region());
}
} }
} }

2
gtk2_ardour/region_layering_order_editor.h
View File

@ -75,7 +75,7 @@ class RegionLayeringOrderEditor : public ArdourWindow
PublicEditor& editor; PublicEditor& editor;
TimeAxisView* _time_axis_view; TimeAxisView* _time_axis_view;
void row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); void row_selected ();
void refill (); void refill ();
void playlist_modified (); void playlist_modified ();
}; };