diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 20:29:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 20:29:12 +0000 |
| commit | 00b409b66147d8598aa30653531baaedc0b27064 (patch) | |
| tree | b75d286bcea0a6bb91aafd22d90ce5b0f7580633 /gtk2_ardour/option_editor.cc | |
| parent | 36bb879385c14042b468bec792ed3dfdc71bf8aa (diff) | |
fix for vamp-sdk botch in SConstruct; new audio clock focus command; make insert-region pay attention to entered track; different modifier list for gtk/osx; hide ye olde blue arrow on selected marker line
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2718 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index f0cf59da1c..2a2cb4e359 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -1078,6 +1078,23 @@ static const struct { const char *name; guint modifier; } modifiers[] = { + +#ifdef GTKOSX + + /* Command = Mod1 + Option/Alt = Mod5 + */ + + { "Shift", GDK_SHIFT_MASK }, + { "Command", GDK_MOD1_MASK }, + { "Control", GDK_CONTROL_MASK }, + { "Option", GDK_MOD5_MASK }, + { "Command-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK }, + { "Command-Option", GDK_MOD1_MASK|GDK_MOD5_MASK }, + { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD5_MASK }, + { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK }, + +#else { "Shift", GDK_SHIFT_MASK }, { "Control", GDK_CONTROL_MASK }, { "Alt (Mod1)", GDK_MOD1_MASK }, @@ -1089,6 +1106,7 @@ static const struct { { "Mod3", GDK_MOD3_MASK }, { "Mod4", GDK_MOD4_MASK }, { "Mod5", GDK_MOD5_MASK }, +#endif { 0, 0 } }; |