From 7ad031503c0e4ea697d2796eea657a802d4a7200 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 26 Mar 2011 21:03:42 +0000 Subject: [PATCH] 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 --- gtk2_ardour/ardour_ui2.cc | 12 +++++++++--- gtk2_ardour/editor.cc | 9 +++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 203a02c75e..445e81b3a7 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -448,12 +448,16 @@ 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); + if (!Profile->get_small_screen()) { + 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); + if (!Profile->get_small_screen()) { + toggle_box->pack_start (*io_box, false, false); + } /* desensitize */ @@ -466,7 +470,9 @@ 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); + if (Profile->get_small_screen()) { + 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 44b017cd77..f14d65279e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2929,12 +2929,13 @@ 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); + if (!Profile->get_small_screen()) { + hbox->pack_start (*nudge_box, false, false); + } else { + ARDOUR_UI::instance()->editor_transport_box().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");