diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-31 17:28:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-31 17:28:50 +0000 |
| commit | 1cca368ef43d49eb0a0918cd9dc6987473e725d1 (patch) | |
| tree | 288c3c65db1d9e5e6e60aca8f6901f9022cc0a5c /gtk2_ardour | |
| parent | 84b45aefded6de0aaa1bc8fe9f3632ada686e6e0 (diff) | |
fix up user keybindings saving, and bump to 2.0.42.0.4
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2201 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index c8a67ed7ec..ac9df314b1 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -181,7 +181,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) _will_create_new_session_automatically = false; session_loaded = false; last_speed_displayed = -1.0f; + keybindings_path = ARDOUR::find_config_file ("ardour.bindings"); + /* all changes go to the user directory */ + user_keybindings_path = get_user_ardour_path (); + user_keybindings_path += '/'; + user_keybindings_path += "ardour.bindings"; can_save_keybindings = false; @@ -2659,7 +2664,7 @@ void ARDOUR_UI::save_keybindings () { if (can_save_keybindings) { - AccelMap::save (keybindings_path); + AccelMap::save (user_keybindings_path); } } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 628206f70e..4f2d78c736 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -576,6 +576,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void we_have_dependents (); std::string keybindings_path; + std::string user_keybindings_path; void setup_keybindings (); void setup_session_options (); diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 5617cdbc4f..d9d8396d2c 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -90,6 +90,8 @@ ARDOUR_UI::setup_keybindings () GtkAccelMap* accelmap = gtk_accel_map_get(); g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this); + + } void |