diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 04:59:20 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 04:59:20 +0000 |
| commit | a0663fbd278f4514ba26c4a4c0e2aa5ec2964dd9 (patch) | |
| tree | 0505a7b5fc3c21111cf09279b16bd615e2c5df4b /gtk2_ardour/ardour_ui.cc | |
| parent | 60f817b0d2411947c257ecbf0b0376589ea77acd (diff) | |
a few more header files fixes, plus cleanup from nick_m, and the start of Action/UIManager adoption
git-svn-id: svn://localhost/trunk/ardour2@48 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 76103d2722..dbed06fe2f 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -867,16 +867,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) set_shuttle_units (Percentage); set_shuttle_behaviour (Sprung); - shuttle_unit_menu.items().push_back (MenuElem (_("Percentage"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), - Percentage))); - shuttle_unit_menu.items().push_back (MenuElem (_("Semitones"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), - Semitones))); - - shuttle_style_menu.items().push_back (MenuElem (_("Sprung"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), - Sprung))); - shuttle_style_menu.items().push_back (MenuElem (_("Wheel"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), - Wheel))); + Glib::RefPtr<ActionGroup> shuttle_style_actions = ActionGroup::create (); + Glib::RefPtr<ActionGroup> shuttle_unit_actions = ActionGroup::create (); + + shuttle_unit_actions->add (Action::create (_("Percentage")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), Percentage)); + shuttle_unit_actions->add (Action::create (_("Semitones")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), Semitones)); + shuttle_style_actions->add (Action::create (_("Sprung")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), Sprung)); + shuttle_style_actions->add (Action::create (_("Wheel")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), Wheel)); + + uiManager->insert_action_group (shuttle_style_actions); + uiManager->insert_action_group (shuttle_unit_actions); + shuttle_style_menu = uiManager.get_widget ('/ShuttleStyle'); + shuttle_unit_menu = uiManager.get_widget ('/ShuttleUnits'); + gettimeofday (&last_peak_grab, 0); gettimeofday (&last_shuttle_request, 0); |