diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-20 16:15:38 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-20 17:57:00 +0200 |
| commit | c22a899c6d9ee0069b110fa0e2f10e07cf6947d0 (patch) | |
| tree | b8c7bc8b5d585f2e1df6ae21f9356d6db68291c6 | |
| parent | 47bbffc5d825c51f87955fde8ff9ca00d38d35f0 (diff) | |
OSX copy/constraint mod tweak (amend 0675fe1)
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index a75635cf94..79f83a4341 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -48,7 +48,11 @@ accel_map_changed (GtkAccelMap* /*map*/, me->ui.setup_tooltips (); } +#ifdef GTKOSX +guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; +#else guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier; +#endif guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier; guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier; guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 0e608af901..e7a080c036 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -511,7 +511,13 @@ public: set_popdown_strings (_copy_modifier_combo, dumb); _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen)); Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo, - (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg))); + (string_compose (_("<b>Recommended Setting: %1</b>%2"), +#ifdef GTKOSX + Keyboard::secondary_modifier_name (), +#else + Keyboard::primary_modifier_name (), +#endif + restart_msg))); for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) { _copy_modifier_combo.set_active_text (S_(modifiers[x].name)); @@ -532,7 +538,13 @@ public: set_popdown_strings (_constraint_modifier_combo, dumb); _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen)); Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo, - (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::secondary_modifier_name (), restart_msg))); + (string_compose (_("<b>Recommended Setting: %1</b>%2"), +#ifdef GTKOSX + Keyboard::primary_modifier_name (), +#else + Keyboard::secondary_modifier_name (), +#endif + restart_msg))); for (int x = 0; modifiers[x].name; ++x) { if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) { _constraint_modifier_combo.set_active_text (S_(modifiers[x].name)); |