13
0

hide/rearrange stuff affected by last commit only if Profile->get_small_screen() is true

git-svn-id: svn://localhost/ardour2/branches/3.0@9215 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-26 21:03:42 +00:00
parent b691ba816f
commit 7ad031503c
2 changed files with 14 additions and 7 deletions

View File

@ -448,12 +448,16 @@ ARDOUR_UI::setup_transport ()
VBox* auto_box = manage (new VBox); VBox* auto_box = manage (new VBox);
auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_play_button, false, false);
auto_box->pack_start (auto_return_button, false, false); auto_box->pack_start (auto_return_button, false, false);
// toggle_box->pack_start (*auto_box, false, false); if (!Profile->get_small_screen()) {
toggle_box->pack_start (*auto_box, false, false);
}
VBox* io_box = manage (new VBox); VBox* io_box = manage (new VBox);
io_box->pack_start (auto_input_button, false, false); 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);
//toggle_box->pack_start (*io_box, false, false); if (!Profile->get_small_screen()) {
toggle_box->pack_start (*io_box, false, false);
}
/* desensitize */ /* desensitize */
@ -466,7 +470,9 @@ ARDOUR_UI::setup_transport ()
// toggle_box->pack_start (postroll_clock, false, false); // toggle_box->pack_start (postroll_clock, false, false);
transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
if (Profile->get_small_screen()) {
transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4); transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4);
}
transport_tearoff_hbox.pack_start (alert_box, false, false); transport_tearoff_hbox.pack_start (alert_box, false, false);
if (Profile->get_sae()) { if (Profile->get_sae()) {

View File

@ -2929,11 +2929,12 @@ Editor::setup_toolbar ()
toolbar_hbox.pack_start (*_tools_tearoff, false, false); toolbar_hbox.pack_start (*_tools_tearoff, false, false);
hbox->pack_start (snap_box, false, false); hbox->pack_start (snap_box, false, false);
// hbox->pack_start (*nudge_box, false, false); if (!Profile->get_small_screen()) {
hbox->pack_start (panic_box, false, false); hbox->pack_start (*nudge_box, false, false);
} else {
ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_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->pack_start (panic_box, false, false);
hbox->show_all (); hbox->show_all ();