diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-09 15:44:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-09 15:44:09 +0000 |
| commit | 5b3916c62ec07168b8c554a87241917b06d54fb9 (patch) | |
| tree | f4cacb95c11e25183558775db3ebb908303836e1 /gtk2_ardour/ardour_ui2.cc | |
| parent | 1a2a58fdd61efeff7ae5ebbb699526220bb47a6f (diff) | |
split style files apart to better maintain consistency (generates a useless error during program startup - thanks GTK); metronome icon for (moved) click button; move punch in/out buttons around
git-svn-id: svn://localhost/ardour2/branches/3.0@9697 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 5c2ca58087..9329047957 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -323,9 +323,6 @@ ARDOUR_UI::setup_transport () ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button); ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button); ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button); - ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button); - - click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); preroll_button.set_name ("TransportButton"); postroll_button.set_name ("TransportButton"); @@ -409,6 +406,16 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0); transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); + w = manage (new Image (get_icon (X_("metronome")))); + w->show (); + click_button.add (*w); + + ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button); + + click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); + + transport_tearoff_hbox.pack_start (click_button, false, false, 4); + time_info_box = manage (new TimeInfoBox); transport_tearoff_hbox.pack_start (*time_info_box, false, false); @@ -423,7 +430,7 @@ ARDOUR_UI::setup_transport () VBox* io_box = manage (new VBox); io_box->pack_start (auto_input_button, false, false); - io_box->pack_start (click_button, false, false); + //io_box->pack_start (click_button, false, false); if (!Profile->get_small_screen()) { toggle_box->pack_start (*io_box, false, false); } |