smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

OSX copy/constraint mod tweak (amend 0675fe1)

Browse source
This commit is contained in:
Robin Gareus 2015-10-20 16:15:38 +02:00
parent 47bbffc5d8
commit c22a899c6d
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/keyboard.cc
View file

@ -48,7 +48,11 @@ accel_map_changed (GtkAccelMap* /*map*/,
me->ui.setup_tooltips (); me->ui.setup_tooltips ();
} }
#ifdef GTKOSX
guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
#else
guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier; guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;
#endif
guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier; guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier;
guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier; guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier;
guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier; guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier;

16
gtk2_ardour/rc_option_editor.cc
View file

@ -511,7 +511,13 @@ public:
set_popdown_strings (_copy_modifier_combo, dumb); set_popdown_strings (_copy_modifier_combo, dumb);
_copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen)); _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo, 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) { for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) { if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
_copy_modifier_combo.set_active_text (S_(modifiers[x].name)); _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
@ -532,7 +538,13 @@ public:
set_popdown_strings (_constraint_modifier_combo, dumb); set_popdown_strings (_constraint_modifier_combo, dumb);
_constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen)); _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo, 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) { for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) { if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
_constraint_modifier_combo.set_active_text (S_(modifiers[x].name)); _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));