diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 20:11:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 20:11:28 +0000 |
| commit | b691ba816f3080d0f8029beac6d0ff4c4c3a1900 (patch) | |
| tree | a418c2175b6b7e87e9536d77f9f0d3c09d9e0d34 /gtk2_ardour | |
| parent | 8ceb8ac79f0089de8b2c7082b65562c97dcf52a6 (diff) | |
goodbye toggle buttons for autoplay, autoinput, click and autoreturn; move nudge stuff up to transport bar; reduces minimum width quite a bit (still big though)
git-svn-id: svn://localhost/ardour2/branches/3.0@9214 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index d38dabc085..6814b613c2 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -170,6 +170,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::Tooltips& tooltips() { return _tooltips; } + Gtk::HBox& editor_transport_box() { return _editor_transport_box; } + + static PublicEditor* _instance; static sigc::signal<void,bool> Blink; static sigc::signal<void> RapidScreenUpdate; static sigc::signal<void> SuperRapidScreenUpdate; @@ -367,6 +370,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::HBox transport_tearoff_hbox; Gtk::HBox play_range_hbox; Gtk::VBox play_range_vbox; + Gtk::HBox _editor_transport_box; Gtk::HBox transport_hbox; Gtk::Fixed transport_base; Gtk::Fixed transport_button_base; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 87d119bd47..203a02c75e 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -448,12 +448,12 @@ ARDOUR_UI::setup_transport () VBox* auto_box = manage (new VBox); auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_return_button, false, false); - toggle_box->pack_start (*auto_box, false, false); + // toggle_box->pack_start (*auto_box, false, false); VBox* io_box = manage (new VBox); io_box->pack_start (auto_input_button, false, false); io_box->pack_start (click_button, false, false); - toggle_box->pack_start (*io_box, false, false); + //toggle_box->pack_start (*io_box, false, false); /* desensitize */ @@ -466,6 +466,7 @@ ARDOUR_UI::setup_transport () // toggle_box->pack_start (postroll_clock, false, false); transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); + transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4); transport_tearoff_hbox.pack_start (alert_box, false, false); if (Profile->get_sae()) { diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 62897bda74..44b017cd77 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2929,9 +2929,12 @@ Editor::setup_toolbar () toolbar_hbox.pack_start (*_tools_tearoff, false, false); hbox->pack_start (snap_box, false, false); - hbox->pack_start (*nudge_box, false, false); + // hbox->pack_start (*nudge_box, false, false); hbox->pack_start (panic_box, false, false); + ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_box, false, false); + // ARDOUR_UI::instance()->editor_transport_box().pack_start (panic_box, false, false); + hbox->show_all (); toolbar_base.set_name ("ToolBarBase"); |