diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-07 19:19:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-07 19:19:31 +0000 |
| commit | 9674867b9dee7816c263c54fd4b47b8a85b4cd2c (patch) | |
| tree | be3a81adef35e258120b3ee18e1bb50539a87681 /libs | |
| parent | b1990cf026eaa65a4e27a7abcc85e5edac9e9bad (diff) | |
switch use of Option/Alt and Control on OS X for bindings. Option/Alt is intended by Apple to be used primarily (if not entirely) for entering alternate characters. Shift would be more conventional as 2ndary modified on OS X but that might have a few more implications than we want to deal with right now
git-svn-id: svn://localhost/ardour2/branches/3.0@10481 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 10c9723696..1550ab9b68 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -57,19 +57,19 @@ guint Keyboard::snap_mod = GDK_MOD3_MASK; #ifdef GTKOSX -guint Keyboard::PrimaryModifier = GDK_META_MASK; // Command -guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option +uint Keyboard::PrimaryModifier = GDK_META_MASK; // Command +guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Alt/Option guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift -guint Keyboard::Level4Modifier = GDK_CONTROL_MASK; // Control -guint Keyboard::CopyModifier = GDK_MOD1_MASK; // Alt/Option +guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Control +guint Keyboard::CopyModifier = GDK_CONTROL_MASK; // Control guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; const char* Keyboard::primary_modifier_name() { return _("Command"); } -const char* Keyboard::secondary_modifier_name() { return _("Option"); } +const char* Keyboard::secondary_modifier_name() { return _("Control"); } const char* Keyboard::tertiary_modifier_name() { return _("Shift"); } -const char* Keyboard::level4_modifier_name() { return _("Control"); } -const char* Keyboard::copy_modifier_name() { return _("Mod1"); } +const char* Keyboard::level4_modifier_name() { return _("Option"); } +const char* Keyboard::copy_modifier_name() { return _("Control"); } const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); } #else |