From b258ad792e535a7587f2d055ec519ceb3f861f4d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 1 May 2020 14:28:05 -0600 Subject: force provision of "menu-name" for all WindowProxy objects, and thus Tabbables Actions for hide/show/attach/detach tabbables use hard-coded names which are not translated. Using Tabbable/WindowProxy::name() to lookup the action will fail, since the name can be translated. This changes just removes the option to not provide a menu-name when creating these objects, and uses the name menu-name when looking up an action by name --- gtk2_ardour/ardour_ui_dialogs.cc | 42 ++++++++++++++++++++-------------------- gtk2_ardour/mixer_ui.cc | 2 +- gtk2_ardour/public_editor.cc | 2 +- gtk2_ardour/rc_option_editor.cc | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 143d9bc4c9..f8b35c6e94 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -698,7 +698,7 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) std::vector active_action_names; std::vector inactive_action_names; Glib::RefPtr action; - std::string downcased_name = downcase (t.name()); + enum ViewState { Tabbed, Windowed, @@ -708,31 +708,31 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) if (t.tabbed()) { - insensitive_action_names.push_back (string_compose ("attach-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("show-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("detach-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("hide-%1", downcased_name)); + insensitive_action_names.push_back (string_compose ("attach-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("show-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("detach-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("hide-%1", t.menu_name())); vs = Tabbed; } else if (t.tabbed_by_default ()) { - insensitive_action_names.push_back (string_compose ("attach-%1", downcased_name)); - insensitive_action_names.push_back (string_compose ("hide-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("show-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("detach-%1", downcased_name)); + insensitive_action_names.push_back (string_compose ("attach-%1", t.menu_name())); + insensitive_action_names.push_back (string_compose ("hide-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("show-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("detach-%1", t.menu_name())); vs = Hidden; } else if (t.window_visible()) { - insensitive_action_names.push_back (string_compose ("detach-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("show-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("attach-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("hide-%1", downcased_name)); + insensitive_action_names.push_back (string_compose ("detach-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("show-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("attach-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("hide-%1", t.menu_name())); - active_action_names.push_back (string_compose ("show-%1", downcased_name)); - inactive_action_names.push_back (string_compose ("hide-%1", downcased_name)); + active_action_names.push_back (string_compose ("show-%1", t.menu_name())); + inactive_action_names.push_back (string_compose ("hide-%1", t.menu_name())); vs = Windowed; @@ -742,13 +742,13 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) * it visible. */ - insensitive_action_names.push_back (string_compose ("detach-%1", downcased_name)); - insensitive_action_names.push_back (string_compose ("hide-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("show-%1", downcased_name)); - sensitive_action_names.push_back (string_compose ("attach-%1", downcased_name)); + insensitive_action_names.push_back (string_compose ("detach-%1", t.menu_name())); + insensitive_action_names.push_back (string_compose ("hide-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("show-%1", t.menu_name())); + sensitive_action_names.push_back (string_compose ("attach-%1", t.menu_name())); - active_action_names.push_back (string_compose ("hide-%1", downcased_name)); - inactive_action_names.push_back (string_compose ("show-%1", downcased_name)); + active_action_names.push_back (string_compose ("hide-%1", t.menu_name())); + inactive_action_names.push_back (string_compose ("show-%1", t.menu_name())); vs = Hidden; } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 20dadf672f..5db4e18c65 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -112,7 +112,7 @@ Mixer_UI::instance () } Mixer_UI::Mixer_UI () - : Tabbable (_content, _("Mixer")) + : Tabbable (_content, _("Mixer"), X_("mixer")) , no_track_list_redisplay (false) , in_group_row_change (false) , track_menu (0) diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc index 1e5d304ab2..4ca046726f 100644 --- a/gtk2_ardour/public_editor.cc +++ b/gtk2_ardour/public_editor.cc @@ -32,7 +32,7 @@ const int PublicEditor::horizontal_spacing = 6; sigc::signal PublicEditor::DropDownKeys; PublicEditor::PublicEditor (Gtk::Widget& content) - : Tabbable (content, _("Editor")) + : Tabbable (content, _("Editor"), X_("editor")) , _suspend_route_redisplay_counter (0) { } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 1e7b565128..b323c1c0e6 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2294,7 +2294,7 @@ MidiPortOptions::pretty_name_edit (std::string const & path, string const & new_ RCOptionEditor::RCOptionEditor () : OptionEditorContainer (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME)) /* pack self-as-vbox into tabbable */ - , Tabbable (*this, _("Preferences"), /* detached by default */ false) + , Tabbable (*this, _("Preferences"), _("preferences"), /* detached by default */ false) , _rc_config (Config) , _mixer_strip_visibility ("mixer-element-visibility") { -- cgit v1.2.3