diff options
author | nick_m <mainsbridge@gmail.com> | 2015-05-21 05:32:23 +1000 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2015-05-21 05:32:23 +1000 |
commit | 186736043cb277b8352a08d1cf61bc81f3169852 (patch) | |
tree | 3cdc2f77016670cb0230ab962aaadac379fc4f7c /gtk2_ardour/keyboard.h | |
parent | ae0759ae88c2497c936b052936610a0e8c97a236 (diff) |
Move ui-centric modifiers into ArdourKeyboard, set some bad defaults.
- Also makes "Mod4" Appear as "Windows" and adds new combination
"Alt-Windows" to the dropdown.
- Attempt to set a pair of default snap modifiers (without
knowing what it actually is for OSX)
- Copy modifier now saves
- Snap modifier modifier problem still remains.
Diffstat (limited to 'gtk2_ardour/keyboard.h')
-rw-r--r-- | gtk2_ardour/keyboard.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h index 6a689567e5..95e40f6e3e 100644 --- a/gtk2_ardour/keyboard.h +++ b/gtk2_ardour/keyboard.h @@ -32,11 +32,51 @@ class ArdourKeyboard : public Gtkmm2ext::Keyboard public: ArdourKeyboard(ARDOUR_UI& ardour_ui) : ui(ardour_ui) {} + XMLNode& get_state (void); + int set_state (const XMLNode&, int version); + void setup_keybindings (); static Selection::Operation selection_type (guint state); ARDOUR_UI& ui; + + static void set_trim_contents_modifier (guint); + /** @return Modifier mask to move contents rather than region bounds during trim; + */ + static ModifierMask trim_contents_modifier () { return ModifierMask (trim_contents_mod); } + + static void set_trim_overlap_modifier (guint); + /** @return Modifier mask to remove region overlaps during trim; + */ + static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); } + + static void set_trim_anchored_modifier (guint); + /** @return Modifier mask to use anchored trim; + */ + static ModifierMask trim_anchored_modifier () { return ModifierMask (trim_anchored_mod); } + + static void set_fine_adjust_modifier (guint); + /** @return Modifier mask to fine adjust (control points only atm); + */ + static ModifierMask fine_adjust_modifier () { return ModifierMask (fine_adjust_mod); } + + static void set_push_points_modifier (guint); + /** @return Modifier mask to push proceeding points; + */ + static ModifierMask push_points_modifier () { return ModifierMask (push_points_mod); } + + static void set_note_size_relative_modifier (guint); + /** @return Modifier mask to resize notes relatively; + */ + static ModifierMask note_size_relative_modifier () { return ModifierMask (note_size_relative_mod); } +private: + static guint trim_contents_mod; + static guint trim_overlap_mod; + static guint trim_anchored_mod; + static guint fine_adjust_mod; + static guint push_points_mod; + static guint note_size_relative_mod; }; #endif /* __ardour_keyboard_h__ */ |