#include <cstdlib>
#include <cmath>
+#include "fix_carbon.h"
+
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/cell_renderer_color_selector.h"
_model = ListStore::create (_columns);
_display.set_model (_model);
+ 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);
+
_display.append_column ("", _columns.text);
+ _display.append_column ("", _columns.is_visible);
+ _display.append_column ("", _columns.active_state);
_display.append_column ("", _columns.gain);
_display.append_column ("", _columns.gain_relative);
_display.append_column ("", _columns.mute);
_display.append_column ("", _columns.monitoring);
_display.append_column ("", _columns.select);
_display.append_column ("", _columns.edits);
- _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);
+ _display.append_column ("", _columns.active_shared);
TreeViewColumn* col;
Gtk::Label* l;
ColumnInfo ci[] = {
- { 0, _("Name"), _("Name of Group") },
- { 1, S_("group|G"), _("Sharing Gain?") },
- { 2, S_("relative|Rel"), _("Relevative Gain Changes?") },
- { 3, S_("mute|M"), _("Sharing Mute?") },
- { 4, S_("solo|S"), _("Sharing Solo?") },
- { 5, _("Rec"), _("Sharing Record-enable Status?") },
- { 6, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
- { 7, S_("selection|Sel"), _("Sharing Selected Status?") },
- { 8, S_("editing|E"), _("Sharing Editing?") },
- { 9, S_("active|A"), _("Sharing Active Status?") },
- { 10, _("Show"), _("Group is visible?") },
- { 11, _("Col"), _("Group Tab Color") },
+ { 0, _("Col"), _("Group Tab Color") },
+ { 1, _("Name"), _("Name of Group") },
+ { 2, _("V"), _("Group is visible?") },
+ { 3, _("On"), _("Group is enabled?") },
+ { 4, S_("group|G"), _("Sharing Gain?") },
+ { 5, S_("relative|Rel"), _("Relevative Gain Changes?") },
+ { 6, S_("mute|M"), _("Sharing Mute?") },
+ { 7, S_("solo|S"), _("Sharing Solo?") },
+ { 8, _("Rec"), _("Sharing Record-enable Status?") },
+ { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
+ { 10, S_("selection|Sel"), _("Sharing Selected Status?") },
+ { 11, S_("editing|E"), _("Sharing Editing?") },
+ { 12, S_("active|A"), _("Sharing Active Status?") },
{ -1, 0, 0 }
};
l->show ();
col->set_data (X_("colnum"), GUINT_TO_POINTER(i));
- if (i == 0) {
+ if (i == 1) {
col->set_expand (true);
} else {
col->set_expand (false);
/* name is directly editable */
- CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (1));
name_cell->property_editable() = true;
name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRouteGroups::name_edit));
- /* use checkbox for the active + visible columns */
-
for (int i = 1; ci[i].index >= 0; ++i) {
CellRendererToggle* active_cell = dynamic_cast <CellRendererToggle*> (_display.get_column_cell_renderer (i));
int celly;
bool ret = false;
Gdk::Color c;
+ bool val;
bool const p = _display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly);
return true;
}
+ group = (*iter)[_columns.routegroup];
+
switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
- case 0:
- if (Keyboard::is_edit_event (ev)) {
- if ((iter = _model->get_iter (path))) {
- if ((group = (*iter)[_columns.routegroup]) != 0) {
- ret = true;
- }
- }
+ case 0:
+ 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:
+ break;
+ case RESPONSE_ACCEPT:
+ c = color_dialog.get_colorsel()->get_current_color();
+ GroupTabs::set_group_color (group, c);
+ ARDOUR_UI::config()->set_dirty ();
+ break;
+
+ default:
+ break;
+
}
+
+ color_dialog.hide ();
+ ret = true;
break;
case 1:
- if ((iter = _model->get_iter (path))) {
- bool gain = (*iter)[_columns.gain];
- (*iter)[_columns.gain] = !gain;
+ if (Keyboard::is_edit_event (ev) && group) {
+ /* we'll be editing now ... */
ret = true;
}
break;
case 2:
- if ((iter = _model->get_iter (path))) {
- bool gain_relative = (*iter)[_columns.gain_relative];
- (*iter)[_columns.gain_relative] = !gain_relative;
- ret = true;
- }
+ val = (*iter)[_columns.is_visible];
+ /* note subtle logic inverse here: we set the new value with
+ "val", rather than !val, because we're using ::set_hidden()
+ not a (non-existent) ::set_visible() call.
+ */
+ group->set_hidden (val, this);
+ ret = true;
break;
+
case 3:
- if ((iter = _model->get_iter (path))) {
- bool mute = (*iter)[_columns.mute];
- (*iter)[_columns.mute] = !mute;
- ret = true;
- }
+ val = (*iter)[_columns.active_state];
+ group->set_active (!val, this);
+ ret = true;
break;
case 4:
- if ((iter = _model->get_iter (path))) {
- bool solo = (*iter)[_columns.solo];
- (*iter)[_columns.solo] = !solo;
- ret = true;
- }
+ val = (*iter)[_columns.gain];
+ group->set_gain (!val);
+ ret = true;
break;
case 5:
- if ((iter = _model->get_iter (path))) {
- bool record = (*iter)[_columns.record];
- (*iter)[_columns.record] = !record;
- ret = true;
- }
+ val = (*iter)[_columns.gain_relative];
+ group->set_relative (!val, this);
+ ret = true;
break;
case 6:
- if ((iter = _model->get_iter (path))) {
- bool monitoring = (*iter)[_columns.monitoring];
- (*iter)[_columns.monitoring] = !monitoring;
- ret = true;
- }
+ val = (*iter)[_columns.mute];
+ group->set_mute (!val);
+ ret = true;
break;
case 7:
- if ((iter = _model->get_iter (path))) {
- bool select = (*iter)[_columns.select];
- (*iter)[_columns.select] = !select;
- ret = true;
- }
+ val = (*iter)[_columns.solo];
+ group->set_solo (!val);
+ ret = true;
break;
case 8:
- if ((iter = _model->get_iter (path))) {
- bool edits = (*iter)[_columns.edits];
- (*iter)[_columns.edits] = !edits;
- ret = true;
- }
+ val = (*iter)[_columns.record];
+ group->set_recenable (!val);
+ ret = true;
break;
case 9:
- if ((iter = _model->get_iter (path))) {
- bool active_state = (*iter)[_columns.active_state];
- (*iter)[_columns.active_state] = !active_state;
- ret = true;
- }
+ val = (*iter)[_columns.monitoring];
+ group->set_monitoring (!val);
+ ret = true;
break;
case 10:
- if ((iter = _model->get_iter (path))) {
- bool is_visible = (*iter)[_columns.is_visible];
- (*iter)[_columns.is_visible] = !is_visible;
- ret = true;
- }
+ val = (*iter)[_columns.select];
+ group->set_select (!val);
+ 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:
- break;
- case RESPONSE_ACCEPT:
- c = color_dialog.get_colorsel()->get_current_color();
- (*iter)[_columns.gdkcolor] = c;
- GroupTabs::set_group_color ((*iter)[_columns.routegroup], c);
- ARDOUR_UI::config()->set_dirty ();
- break;
-
- default:
- break;
-
- }
+ case 11:
+ val = (*iter)[_columns.edits];
+ group->set_edit (!val);
+ ret = true;
+ break;
- color_dialog.hide ();
+ case 12:
+ val = (*iter)[_columns.active_shared];
+ cerr << "set group active to " << !val << endl;
+ group->set_route_active (!val);
ret = true;
break;
-
+
default:
break;
}
-#ifdef GTKOSX
- if (ret) {
- _display.queue_draw();
- }
-#endif
-
return ret;
}
void
-EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
+EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter)
{
RouteGroup* group;
PropertyList plist;
plist.add (Properties::name, string ((*iter)[_columns.text]));
-
+
bool val = (*iter)[_columns.gain];
plist.add (Properties::gain, val);
val = (*iter)[_columns.gain_relative];
plist.add (Properties::select, val);
val = (*iter)[_columns.edits];
plist.add (Properties::edit, val);
- val = (*iter)[_columns.active_state];
+ val = (*iter)[_columns.active_shared];
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 */
+ val = (*iter)[_columns.active_state];
+ plist.add (Properties::active, val);
+ val = (*iter)[_columns.is_visible];
+ plist.add (Properties::hidden, !val);
group->apply_changes (plist);
+
+ GroupTabs::set_group_color ((*iter)[_columns.routegroup], (*iter)[_columns.gdkcolor]);
}
void
row[_columns.monitoring] = group->is_monitoring();
row[_columns.select] = group->is_select ();
row[_columns.edits] = group->is_edit ();
- row[_columns.active_state] = group->is_route_active ();
+ row[_columns.active_shared] = group->is_route_active ();
+ row[_columns.active_state] = group->is_active ();
row[_columns.is_visible] = !group->is_hidden();
row[_columns.gdkcolor] = GroupTabs::group_color (group);
if (focus) {
TreeViewColumn* col = _display.get_column (0);
- CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (1));
_display.set_cursor (_model->get_path (row), *col, *name_cell, true);
}
for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
if (group == (*iter)[_columns.routegroup]) {
+
+ /* we could check the PropertyChange and only set
+ * appropriate fields. but the amount of saved by doing
+ * that is pretty minimal, and this is nice and simple.
+ */
+
(*iter)[_columns.text] = group->name();
(*iter)[_columns.gain] = group->is_gain ();
(*iter)[_columns.gain_relative] = group->is_relative ();
(*iter)[_columns.monitoring] = group->is_monitoring ();
(*iter)[_columns.select] = group->is_select ();
(*iter)[_columns.edits] = group->is_edit ();
- (*iter)[_columns.active_state] = group->is_route_active ();
+ (*iter)[_columns.active_shared] = group->is_route_active ();
+ (*iter)[_columns.active_state] = group->is_active ();
(*iter)[_columns.is_visible] = !group->is_hidden();
(*iter)[_columns.gdkcolor] = GroupTabs::group_color (group);
+
+ break;
}
}
-
+
_in_row_change = false;
- if (change.contains (Properties::name) || change.contains (Properties::color) || change.contains (Properties::active)) {
- _editor->_group_tabs->set_dirty ();
- }
-
for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
if ((*i)->route_group() == group) {
if (group->is_hidden ()) {
projects / ardour.git / blobdiff