X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_ed.cc;h=35100e940b0e47a3f787c9eeac9d87c91068e632;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=ee0b9b0930f5b33c57d55cf476c098a4e71a69a4;hpb=813df53d2ff1cc9612f10cdca3432ba8824f516e;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index ee0b9b0930..35100e940b 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -35,6 +35,7 @@ #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" #include "gtkmm2ext/tearoff.h" +#include "gtkmm2ext/cairo_packer.h" #include "pbd/file_utils.h" #include "pbd/fpu.h" @@ -53,6 +54,7 @@ #include "utils.h" #include "window_proxy.h" #include "global_port_matrix.h" +#include "location_ui.h" #include @@ -93,26 +95,28 @@ void ARDOUR_UI::install_actions () { Glib::RefPtr main_actions = ActionGroup::create (X_("Main")); + Glib::RefPtr main_menu_actions = ActionGroup::create (X_("Main_menu")); Glib::RefPtr act; /* menus + submenus that need action items */ - ActionManager::register_action (main_actions, X_("Session"), _("Session")); - act = ActionManager::register_action (main_actions, X_("Cleanup"), _("Cleanup")); + ActionManager::register_action (main_menu_actions, X_("Session"), _("Session")); + act = ActionManager::register_action (main_menu_actions, X_("Cleanup"), _("Clean-up")); ActionManager::write_sensitive_actions.push_back (act); - ActionManager::register_action (main_actions, X_("Sync"), _("Sync")); - ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options")); - ActionManager::register_action (main_actions, X_("Help"), _("Help")); - ActionManager::register_action (main_actions, X_("KeyMouseActions"), _("Misc. Shortcuts")); - ActionManager::register_action (main_actions, X_("AudioFileFormat"), _("Audio File Format")); - ActionManager::register_action (main_actions, X_("AudioFileFormatHeader"), _("File Type")); - ActionManager::register_action (main_actions, X_("AudioFileFormatData"), _("Sample Format")); - ActionManager::register_action (main_actions, X_("ControlSurfaces"), _("Control Surfaces")); - ActionManager::register_action (main_actions, X_("Plugins"), _("Plugins")); - ActionManager::register_action (main_actions, X_("Metering"), _("Metering")); - ActionManager::register_action (main_actions, X_("MeteringFallOffRate"), _("Fall Off Rate")); - ActionManager::register_action (main_actions, X_("MeteringHoldTime"), _("Hold Time")); - ActionManager::register_action (main_actions, X_("Denormals"), _("Denormal Handling")); + ActionManager::register_action (main_menu_actions, X_("Sync"), _("Sync")); + ActionManager::register_action (main_menu_actions, X_("TransportOptions"), _("Options")); + ActionManager::register_action (main_menu_actions, X_("WindowMenu"), _("Window")); + ActionManager::register_action (main_menu_actions, X_("Help"), _("Help")); + ActionManager::register_action (main_menu_actions, X_("KeyMouseActions"), _("Misc. Shortcuts")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormat"), _("Audio File Format")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormatHeader"), _("File Type")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormatData"), _("Sample Format")); + ActionManager::register_action (main_menu_actions, X_("ControlSurfaces"), _("Control Surfaces")); + ActionManager::register_action (main_menu_actions, X_("Plugins"), _("Plugins")); + ActionManager::register_action (main_menu_actions, X_("Metering"), _("Metering")); + ActionManager::register_action (main_menu_actions, X_("MeteringFallOffRate"), _("Fall Off Rate")); + ActionManager::register_action (main_menu_actions, X_("MeteringHoldTime"), _("Hold Time")); + ActionManager::register_action (main_menu_actions, X_("Denormals"), _("Denormal Handling")); /* the real actions */ @@ -147,6 +151,10 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); + act = ActionManager::register_action (main_actions, X_("Rename"), _("Rename..."), sigc::mem_fun(*this, &ARDOUR_UI::rename_session)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::write_sensitive_actions.push_back (act); + act = ActionManager::register_action (main_actions, X_("SaveTemplate"), _("Save Template..."), sigc::mem_fun(*this, &ARDOUR_UI::save_template)); ActionManager::session_sensitive_actions.push_back (act); @@ -161,14 +169,14 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("ExportAudio"), _("Export To Audio File(s)..."), sigc::mem_fun (*editor, &PublicEditor::export_audio)); ActionManager::session_sensitive_actions.push_back (act); - + act = ActionManager::register_action (main_actions, X_("StemExport"), _("Stem export..."), sigc::mem_fun (*editor, &PublicEditor::stem_export)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (main_actions, X_("Export"), _("Export")); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources..."), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)); + act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Clean-up Unused Sources..."), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); @@ -212,7 +220,6 @@ ARDOUR_UI::install_actions () /* these actions are intended to be shared across all windows */ common_actions = ActionGroup::create (X_("Common")); - ActionManager::register_action (main_actions, X_("WindowMenu"), _("Window")); ActionManager::register_action (common_actions, X_("Quit"), _("Quit"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish)))); /* windows visibility actions */ @@ -221,7 +228,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximised"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), _("Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window)); + ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), S_("Window|Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window)); ActionManager::register_toggle_action (common_actions, X_("toggle-mixer-on-top"), _("Mixer on Top"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_on_top)); ActionManager::register_toggle_action (common_actions, X_("ToggleRCOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_rc_options_window)); ActionManager::register_toggle_action (common_actions, X_("ToggleSessionOptionsEditor"), _("Properties"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_options_window)); @@ -232,6 +239,8 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (common_actions, X_("ToggleBigClock"), _("Big Clock"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window)); ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_toggle_action (common_actions, X_("toggle-speaker-config"), _("Speaker Configuration"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_speaker_config_window)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (common_actions, X_("toggle-audio-connection-manager"), _("Audio Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::AUDIO)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (common_actions, X_("toggle-midi-connection-manager"), _("MIDI Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::MIDI)); @@ -240,7 +249,8 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::register_action (common_actions, X_("About"), _("About"), sigc::mem_fun(*this, &ARDOUR_UI::show_about)); ActionManager::register_action (common_actions, X_("Chat"), _("Chat"), sigc::mem_fun(*this, &ARDOUR_UI::launch_chat)); - ActionManager::register_action (common_actions, X_("Manual"), _("Manual"), mem_fun(*this, &ARDOUR_UI::launch_manual)); + /** TRANSLATORS: This is `Manual' in the sense of an instruction book that tells a user how to use Ardour */ + ActionManager::register_action (common_actions, X_("Manual"), S_("Help|Manual"), mem_fun(*this, &ARDOUR_UI::launch_manual)); ActionManager::register_action (common_actions, X_("Reference"), _("Reference"), mem_fun(*this, &ARDOUR_UI::launch_reference)); ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_theme_manager)); ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Key Bindings"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_key_editor)); @@ -259,8 +269,6 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::save_state), string(""), false)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); - act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), sigc::mem_fun(*this, &ARDOUR_UI::remove_last_capture)); - ActionManager::session_sensitive_actions.push_back (act); Glib::RefPtr transport_actions = ActionGroup::create (X_("Transport")); @@ -279,6 +287,10 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_toggle_action (transport_actions, X_("AlwaysPlayRange"), _("Always Play Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_always_play_range)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); @@ -306,7 +318,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (transport_actions, X_("Loop"), _("Play Loop Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selection"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); + act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selected Range"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); @@ -348,35 +360,38 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("focus-on-clock"), _("Focus On Clock"), sigc::mem_fun(primary_clock, &AudioClock::focus)); + act = ActionManager::register_action (transport_actions, X_("focus-on-clock"), _("Focus On Clock"), sigc::mem_fun(*this, &ARDOUR_UI::focus_on_clock)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("primary-clock-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Timecode)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off)); - ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("secondary-clock-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Timecode)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off)); - ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_in)); + act->set_short_label (_("In")); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchOut"), _("Punch Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_out)); + act->set_short_label (_("Out")); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunch"), _("Punch In/Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch)); + act->set_short_label (_("In/Out")); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (transport_actions, X_("ToggleClick"), _("Click"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_click)); @@ -435,12 +450,19 @@ ARDOUR_UI::install_actions () } } + /* MIDI */ + + Glib::RefPtr midi_actions = ActionGroup::create (X_("MIDI")); + ActionManager::register_action (midi_actions, X_("panic"), _("Panic"), sigc::mem_fun(*this, &ARDOUR_UI::midi_panic)); + ActionManager::add_action_group (shuttle_actions); ActionManager::add_action_group (option_actions); ActionManager::add_action_group (jack_actions); ActionManager::add_action_group (transport_actions); ActionManager::add_action_group (main_actions); + ActionManager::add_action_group (main_menu_actions); ActionManager::add_action_group (common_actions); + ActionManager::add_action_group (midi_actions); } void @@ -513,28 +535,30 @@ ARDOUR_UI::build_menu_bar () // so use this instead ... gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers"); - resize_text_widgets (); - DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets)); + EventBox* ev = manage (new EventBox); + ev->show (); + CairoHPacker* hbox = manage (new CairoHPacker); + hbox->show (); + hbox->set_border_width (3); - wall_clock_box.add (wall_clock_label); - wall_clock_box.set_name ("WallClock"); - wall_clock_label.set_name ("WallClock"); + VBox* vbox = manage (new VBox); + vbox->pack_start (*hbox, true, false); + vbox->show(); - disk_space_box.add (disk_space_label); - disk_space_box.set_name ("WallClock"); - disk_space_label.set_name ("WallClock"); + ev->add (*vbox); - cpu_load_box.add (cpu_load_label); - cpu_load_box.set_name ("CPULoad"); + wall_clock_label.set_name ("WallClock"); + wall_clock_label.set_use_markup (); + disk_space_label.set_name ("WallClock"); + disk_space_label.set_use_markup (); cpu_load_label.set_name ("CPULoad"); - - buffer_load_box.add (buffer_load_label); - buffer_load_box.set_name ("BufferLoad"); + cpu_load_label.set_use_markup (); buffer_load_label.set_name ("BufferLoad"); - - sample_rate_box.add (sample_rate_label); - sample_rate_box.set_name ("SampleRate"); + buffer_load_label.set_use_markup (); sample_rate_label.set_name ("SampleRate"); + sample_rate_label.set_use_markup (); + format_label.set_name ("Format"); + format_label.set_use_markup (); #ifndef TOP_MENUBAR menu_hbox.pack_start (*menu_bar, false, false); @@ -542,32 +566,37 @@ ARDOUR_UI::build_menu_bar () use_menubar_as_top_menubar (); #endif + bool wall_clock = false; + bool disk_space = false; + if (!Profile->get_small_screen()) { #ifndef GTKOSX // OSX provides its own wallclock, thank you very much - menu_hbox.pack_end (wall_clock_box, false, false, 2); + wall_clock = true; #endif - menu_hbox.pack_end (disk_space_box, false, false, 4); + disk_space = true; } + + hbox->pack_end (wall_clock_label, false, false, 2); + hbox->pack_end (disk_space_label, false, false, 4); + hbox->pack_end (cpu_load_label, false, false, 4); + hbox->pack_end (buffer_load_label, false, false, 4); + hbox->pack_end (sample_rate_label, false, false, 4); + hbox->pack_end (format_label, 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_hbox.pack_end (*ev, false, false, 6); menu_bar_base.set_name ("MainMenuBar"); menu_bar_base.add (menu_hbox); -} -void -ARDOUR_UI::resize_text_widgets () -{ - /* Set up some size requests here to stop the menu-bar clock jumping around in full-screen mode */ + _status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), wall_clock); + _status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space); + _status_bar_visibility.add (&cpu_load_label, X_("DSP"), _("DSP"), true); + _status_bar_visibility.add (&buffer_load_label, X_("Buffers"), _("Buffers"), true); + _status_bar_visibility.add (&sample_rate_label, X_("JACK"), _("JACK Sampling Rate and Latency"), true); + _status_bar_visibility.add (&format_label, X_("Format"), _("File Format"), true); - set_size_request_to_display_given_text (wall_clock_label, _("99:99"), 2, 0); - set_size_request_to_display_given_text (disk_space_label, _("9999h:999999m:99999999s"), 2, 0); - set_size_request_to_display_given_text (cpu_load_label, _("DSP: 100.0%"), 2, 0); - set_size_request_to_display_given_text (buffer_load_label, _("Buffers p:100% c:100%"), 2, 0); - set_size_request_to_display_given_text (sample_rate_label, X_("384 kHz / 1000 ms"), 2, 0); + ev->signal_button_press_event().connect (sigc::mem_fun (_status_bar_visibility, &VisibilityGroup::button_press_event)); } void @@ -584,38 +613,63 @@ ARDOUR_UI::use_menubar_as_top_menubar () GtkApplicationMenuGroup* group = app->add_app_menu_group (); - if ((widget = ActionManager::get_widget ("/ui/Main/Help/About"))) { + if ((widget = ActionManager::get_widget ("/ui/Main/Session/About"))) { app->add_app_menu_item (group, dynamic_cast(widget)); } - if ((widget = ActionManager::get_widget ("/ui/Main/WindowMenu/ToggleOptionsEditor"))) { + if ((widget = ActionManager::get_widget ("/ui/Main/Session/ToggleRCOptionsEditor"))) { app->add_app_menu_item (group, dynamic_cast(widget)); } app->set_menu_bar (*menu_bar); } +void +ARDOUR_UI::big_clock_catch_focus () +{ + PublicEditor::instance().reset_focus (); +} + void ARDOUR_UI::setup_clock () { - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (big_clock, &AudioClock::set), false)); + ARDOUR_UI::Clock.connect (sigc::mem_fun (big_clock, &AudioClock::set)); + + big_clock->set_corner_radius (0.0); + big_clock->set_fixed_width (false); + big_clock->mode_changed.connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_reset_aspect_ratio)); big_clock_window->set (new Window (WINDOW_TOPLEVEL), false); big_clock_window->get()->set_keep_above (true); big_clock_window->get()->set_border_width (0); - big_clock_window->get()->add (big_clock); + big_clock_window->get()->add (*big_clock); big_clock_window->get()->set_title (_("Big Clock")); - big_clock_window->get()->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); big_clock_window->get()->signal_realize().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_realized)); - big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleBigClock"))); big_clock_window->get()->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window->get()), false); big_clock_window->get()->signal_size_allocate().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_size_allocate)); + big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleBigClock"))); + big_clock_window->get()->signal_unmap().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_catch_focus)); + manage_window (*big_clock_window->get()); } +void +ARDOUR_UI::big_clock_reset_aspect_ratio () +{ + Gtk::Requisition req; + big_clock->size_request (req); + float aspect = req.width/(float)req.height; + Gdk::Geometry geom; + + geom.min_aspect = aspect; + geom.max_aspect = aspect; + + big_clock_window->get()->set_geometry_hints (*big_clock, geom, Gdk::HINT_ASPECT); +} + void ARDOUR_UI::big_clock_realized () { @@ -624,12 +678,14 @@ ARDOUR_UI::big_clock_realized () set_decoration (big_clock_window->get(), (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); big_clock_window->get()->get_window()->get_geometry (x, y, w, big_clock_height, d); + big_clock_reset_aspect_ratio (); + original_big_clock_height = big_clock_height; original_big_clock_width = w; - Pango::FontDescription fd (big_clock.get_style()->get_font()); + Pango::FontDescription fd (big_clock->get_style()->get_font()); original_big_clock_font_size = fd.get_size (); - + if (!fd.get_size_is_absolute ()) { original_big_clock_font_size /= PANGO_SCALE; } @@ -664,7 +720,7 @@ ARDOUR_UI::idle_big_clock_text_resizer (int, int) big_clock_resize_in_progress = false; Glib::RefPtr win = big_clock_window->get()->get_window(); - Pango::FontDescription fd (big_clock.get_style()->get_font()); + Pango::FontDescription fd (big_clock->get_style()->get_font()); int current_size = fd.get_size (); int x, y, w, h, d; @@ -674,7 +730,7 @@ ARDOUR_UI::idle_big_clock_text_resizer (int, int) win->get_geometry (x, y, w, h, d); - double scale = min (((double) w / (double) original_big_clock_width), + double scale = min (((double) w / (double) original_big_clock_width), ((double) h / (double) original_big_clock_height)); int size = (int) lrintf (original_big_clock_font_size * scale); @@ -684,14 +740,14 @@ ARDOUR_UI::idle_big_clock_text_resizer (int, int) string family = fd.get_family(); char buf[family.length()+16]; snprintf (buf, family.length()+16, "%s %d", family.c_str(), size); - - try { + + try { Pango::FontDescription fd (buf); - Glib::RefPtr rcstyle = big_clock.get_modifier_style (); + Glib::RefPtr rcstyle = big_clock->get_modifier_style (); rcstyle->set_font (fd); - big_clock.modify_style (rcstyle); - } - + big_clock->modify_style (rcstyle); + } + catch (...) { /* oh well, do nothing */ } @@ -716,13 +772,14 @@ ARDOUR_UI::save_ardour_state () Config->add_extra_xml (get_transport_controllable_state()); XMLNode* window_node = new XMLNode (X_("UI")); + window_node->add_property (_status_bar_visibility.get_state_name().c_str(), _status_bar_visibility.get_state_value ()); for (list::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) { if ((*i)->rc_configured()) { window_node->add_child_nocopy (*((*i)->get_state ())); } } - + /* tearoffs */ XMLNode* tearoff_node = new XMLNode (X_("Tearoffs")); @@ -731,20 +788,20 @@ ARDOUR_UI::save_ardour_state () XMLNode* t = new XMLNode (X_("transport")); transport_tearoff->add_state (*t); tearoff_node->add_child_nocopy (*t); - } + } if (mixer && mixer->monitor_section()) { XMLNode* t = new XMLNode (X_("monitor-section")); mixer->monitor_section()->tearoff().add_state (*t); tearoff_node->add_child_nocopy (*t); - } + } if (editor && editor->mouse_mode_tearoff()) { XMLNode* t = new XMLNode (X_("mouse-mode")); editor->mouse_mode_tearoff ()->add_state (*t); tearoff_node->add_child_nocopy (*t); - } - + } + window_node->add_child_nocopy (*tearoff_node); Config->add_extra_xml (*window_node); @@ -753,17 +810,25 @@ ARDOUR_UI::save_ardour_state () Config->add_extra_xml (_startup->engine_control()->get_state()); } Config->save_state(); - ui_config->save_state (); + if (ui_config->dirty()) { + ui_config->save_state (); + } - XMLNode enode(static_cast(editor)->get_state()); - XMLNode mnode(mixer->get_state()); + XMLNode& enode (static_cast(editor)->get_state()); + XMLNode& mnode (mixer->get_state()); if (_session) { _session->add_instant_xml (enode); _session->add_instant_xml (mnode); + if (location_ui->get ()) { + _session->add_instant_xml (location_ui->get()->ui().get_state ()); + } } else { Config->add_instant_xml (enode); Config->add_instant_xml (mnode); + if (location_ui->get ()) { + Config->add_instant_xml (location_ui->get()->ui().get_state ()); + } } Keyboard::save_keybindings (); @@ -773,7 +838,7 @@ void ARDOUR_UI::toggle_global_port_matrix (ARDOUR::DataType t) { std::string const action = string_compose ("toggle-%1-connection-manager", t.to_string ()); - + if (_global_port_matrix[t]->get() == 0) { _global_port_matrix[t]->set (new GlobalPortMatrixWindow (_session, t)); _global_port_matrix[t]->get()->signal_unmap().connect(sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), string_compose (X_("/Common/%1"), action))); @@ -790,3 +855,19 @@ ARDOUR_UI::toggle_global_port_matrix (ARDOUR::DataType t) } } } + +void +ARDOUR_UI::resize_text_widgets () +{ + set_size_request_to_display_given_text (cpu_load_label, "DSP: 100.0%", 2, 2); + set_size_request_to_display_given_text (buffer_load_label, "Buffers: p:100% c:100%", 2, 2); +} + +void +ARDOUR_UI::focus_on_clock () +{ + if (editor && primary_clock) { + editor->present (); + primary_clock->focus (); + } +}