diff options
| author | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
| commit | 959a7909c1adca430a63f783fd16687242a7be3d (patch) | |
| tree | b5048c3cc1bbb60bb680472b97ebba6ebb92d72f /gtk2_ardour/ardour_ui_ed.cc | |
| parent | 96ca08b9257e4048294cd1804a65d4ae6cd88814 (diff) | |
Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).
git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index b6222af99c..c889eea0f7 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -37,6 +37,7 @@ #include "actions.h" #include <ardour/session.h> +#include <ardour/profile.h> #include <ardour/audioengine.h> #include <ardour/control_protocol_manager.h> @@ -397,8 +398,6 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI feedback"), mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (option_actions, X_("UseMIDIcontrol"), _("Use MIDI control"), mem_fun (*this, &ARDOUR_UI::toggle_use_midi_control)); - ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (option_actions, X_("UseOSC"), _("Use OSC"), mem_fun (*this, &ARDOUR_UI::toggle_use_osc)); #ifndef HAVE_LIBLO @@ -702,11 +701,13 @@ ARDOUR_UI::build_menu_bar () sample_rate_label.set_name ("SampleRate"); menu_hbox.pack_start (*menu_bar, true, true); - menu_hbox.pack_end (wall_clock_box, false, false, 10); - menu_hbox.pack_end (disk_space_box, false, false, 10); - menu_hbox.pack_end (cpu_load_box, false, false, 10); - menu_hbox.pack_end (buffer_load_box, false, false, 10); - menu_hbox.pack_end (sample_rate_box, false, false, 10); + if (!Profile->get_small_screen()) { + menu_hbox.pack_end (wall_clock_box, false, false, 2); + menu_hbox.pack_end (disk_space_box, false, false, 4); + } + menu_hbox.pack_end (cpu_load_box, false, false, 4); + menu_hbox.pack_end (buffer_load_box, false, false, 4); + menu_hbox.pack_end (sample_rate_box, false, false, 4); menu_bar_base.set_name ("MainMenuBar"); menu_bar_base.add (menu_hbox); |