diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-05-01 14:28:05 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-05-01 14:33:47 -0600 |
| commit | b258ad792e535a7587f2d055ec519ceb3f861f4d (patch) | |
| tree | 74e23cf2bb4849ba0229663de8ba0ca207d1de98 /gtk2_ardour/ardour_ui_dialogs.cc | |
| parent | 51795d2e117cd05d6951b70dcda57faa757d56b4 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 42 |
1 files changed, 21 insertions, 21 deletions
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<std::string> active_action_names; std::vector<std::string> inactive_action_names; Glib::RefPtr<Action> 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; } |