projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tempo ramps - possible fix for loading bjbjb's session, remove insane level 3 map...
[ardour.git]
/
gtk2_ardour
/
route_group_dialog.cc
diff --git
a/gtk2_ardour/route_group_dialog.cc
b/gtk2_ardour/route_group_dialog.cc
index 3addc1c5981fa0c07a04b99d20eea8405ec59cc2..9221a67948964e5d683c0c732fd2adb3ed26b630 100644
(file)
--- a/
gtk2_ardour/route_group_dialog.cc
+++ b/
gtk2_ardour/route_group_dialog.cc
@@
-53,7
+53,6
@@
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
, _share_color (_("Color"))
, _share_monitoring (_("Monitoring"))
{
, _share_color (_("Color"))
, _share_monitoring (_("Monitoring"))
{
- set_modal (true);
set_skip_taskbar_hint (true);
set_resizable (true);
set_name (N_("RouteGroupDialog"));
set_skip_taskbar_hint (true);
set_resizable (true);
set_name (N_("RouteGroupDialog"));
@@
-85,7
+84,7
@@
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
hbox->pack_start (*l, false, false);
hbox->pack_start (_color, false, false);
top_vbox->pack_start (*hbox, false, false);
hbox->pack_start (*l, false, false);
hbox->pack_start (_color, false, false);
top_vbox->pack_start (*hbox, false, false);
-
+
main_vbox->pack_start (*top_vbox, false, false);
_active.set_active (_group->is_active ());
main_vbox->pack_start (*top_vbox, false, false);
_active.set_active (_group->is_active ());
@@
-96,7
+95,7
@@
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
VBox* options_box = manage (new VBox);
options_box->set_spacing (6);
VBox* options_box = manage (new VBox);
options_box->set_spacing (6);
-
+
l = manage (new Label (_("<b>Sharing</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
options_box->pack_start (*l, false, true);
l = manage (new Label (_("<b>Sharing</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
l->set_use_markup ();
options_box->pack_start (*l, false, true);
@@
-135,7
+134,7
@@
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
_route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
_share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
_share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
_route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
_share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
_share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-
+
gain_toggled ();
Table* table = manage (new Table (11, 4, false));
gain_toggled ();
Table* table = manage (new Table (11, 4, false));
@@
-185,9
+184,9
@@
RouteGroupDialog::do_run ()
{
while (1) {
int const r = run ();
{
while (1) {
int const r = run ();
- if (r == Gtk::RESPONSE_CANCEL) {
- /* cancel, so just bail now */
- return
Gtk::RESPONSE_CANCEL
;
+
+ if (r != Gtk::RESPONSE_OK) {
+ return
true
;
}
if (unique_name (_name.get_text())) {
}
if (unique_name (_name.get_text())) {
@@
-207,7
+206,7
@@
RouteGroupDialog::do_run ()
msg.run ();
}
msg.run ();
}
- /* NOTREACHED */
+
abort();
/* NOTREACHED */
return false;
}
return false;
}
@@
-229,7
+228,7
@@
RouteGroupDialog::update ()
plist.add (Properties::monitoring, _share_monitoring.get_active());
_group->apply_changes (plist);
plist.add (Properties::monitoring, _share_monitoring.get_active());
_group->apply_changes (plist);
-
+
GroupTabs::set_group_color (_group, gdk_color_to_rgba (_color.get_color ()));
}
GroupTabs::set_group_color (_group, gdk_color_to_rgba (_color.get_color ()));
}