diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-05-21 23:47:32 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-05-21 23:47:32 +1000 |
| commit | 5d176eefa6706f11031f0b6c01179fe80cbbc6c1 (patch) | |
| tree | 44b3848a46e7be92ce441238642924bb3012ce32 | |
| parent | 186736043cb277b8352a08d1cf61bc81f3169852 (diff) | |
Make the prefs less squashed looking, add another entry for OSX modifiers.
- Defaults are probably still wrong, but at least they are actual
keys.
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 17 | ||||
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 65589abf9e..406b0401f1 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -271,7 +271,8 @@ static const struct { { "Option", GDK_MOD1_MASK }, { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK }, { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK }, - { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD1_MASK }, + { "Option-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK }, + { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK }, { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK }, #else @@ -347,7 +348,7 @@ public: l = manage (left_aligned_label (_("When Clicking:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, col, col + 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; @@ -430,7 +431,7 @@ public: l = manage (left_aligned_label (_("When Beginning a Drag:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, 0, 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; @@ -456,7 +457,7 @@ public: l = manage (left_aligned_label (_("When Beginning a Trim:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, 0, 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; @@ -546,7 +547,7 @@ public: l = manage (left_aligned_label (_("While Dragging:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, 0, 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; @@ -562,7 +563,7 @@ public: } } - l = manage (left_aligned_label (_("Ignore snap using:"))); + l = manage (left_aligned_label (_("Ignore snap by including:"))); l->set_name ("OptionsLabel"); t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL); @@ -592,7 +593,7 @@ public: l = manage (left_aligned_label (_("While Trimming:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, 0, 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; @@ -618,7 +619,7 @@ public: l = manage (left_aligned_label (_("While Dragging Control Points:"))); l->set_name ("OptionEditorHeading"); - t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL); + t->attach (*l, 0, 2, row, row + 1, FILL | EXPAND, FILL); ++row; col = 1; diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 954887e3be..48bdaf0052 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -76,8 +76,8 @@ const char* Keyboard::level4_modifier_name() { return _("Option"); } const char* Keyboard::copy_modifier_name() { return _("Control"); } const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } -guint Keyboard::snap_mod = GDK_MOD3_MASK|Keyboard::Level4Modifier; // XXX this is probably completely wrong -guint Keyboard::snap_delta_mod = GDK_MOD3_MASK; +guint Keyboard::snap_mod = Keyboard::Level4Modifier|Keyboard::TertiaryModifier; // XXX this is probably completely wrong +guint Keyboard::snap_delta_mod = Keyboard::Level4Modifier; #else |