diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-26 13:35:45 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 589f2a1ab83e4498920faa2f0ef37c1632eaf914 (patch) | |
tree | e49066b419b9d65e889093dc87f68a2ec6c3f7d9 /libs/gtkmm2ext | |
parent | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (diff) |
change suffix of keybinding files to ".keys" to avoid conflict with earlier versions.
Move some code around that should never have been inside libs/ardour to begin with.
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/keyboard.h | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index fdea0416c3..34be6e44ab 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -173,6 +173,8 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful static bool load_keybindings (std::string const& path); static void save_keybindings (std::string const& path); + static std::string binding_filename_suffix; + int reset_bindings (); sigc::signal0<void> ZoomVerticalModifierReleased; diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index cd6c179b1a..d23529f232 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -111,6 +111,7 @@ bool Keyboard::can_save_keybindings = false; bool Keyboard::bindings_changed_after_save_became_legal = false; map<string,string> Keyboard::binding_files; string Keyboard::_current_binding_name; +string Keyboard::binding_filename_suffix = X_(".keys"); /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ GdkModifierType Keyboard::RelevantModifierKeyMask; |