allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9214 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-03-26 20:11:28 +00:00
parent 8ceb8ac79f
commit b691ba816f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_ui.h
View File

@@ -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;

5
gtk2_ardour/ardour_ui2.cc
View File

@@ -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()) {

5
gtk2_ardour/editor.cc
View File

@@ -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");