diff options
| author | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
| commit | 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce (patch) | |
| tree | 1fb1a5e7eef6684c0a5bb49be492612c71796fc4 /gtk2_ardour/option_editor.h | |
| parent | 1b657585572298d1a69a7b43e611f59b7e185df3 (diff) | |
Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.h')
| -rw-r--r-- | gtk2_ardour/option_editor.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index 82bb4db79b..45fe092eab 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -1,3 +1,6 @@ +#ifndef __gtk_ardour_option_editor_h__ +#define __gtk_ardour_option_editor_h__ + /* Copyright (C) 2001 Paul Davis @@ -17,8 +20,7 @@ */ -#ifndef __gtk_ardour_option_editor_h__ -#define __gtk_ardour_option_editor_h__ +#include <vector> #include <gtkmm/notebook.h> #include <gtkmm/checkbutton.h> @@ -203,6 +205,7 @@ class OptionEditor : public ArdourDialog /* keyboard/mouse */ Gtk::Table keyboard_mouse_table; + Gtk::ComboBoxText keyboard_layout_selector; Gtk::ComboBoxText edit_modifier_combo; Gtk::ComboBoxText delete_modifier_combo; Gtk::ComboBoxText snap_modifier_combo; @@ -211,12 +214,15 @@ class OptionEditor : public ArdourDialog Gtk::Adjustment edit_button_adjustment; Gtk::SpinButton edit_button_spin; + std::map<std::string,std::string> bindings_files; + void setup_keyboard_options (); void delete_modifier_chosen (); void edit_modifier_chosen (); void snap_modifier_chosen (); void edit_button_changed (); void delete_button_changed (); + void bindings_changed (); void fixup_combo_size (Gtk::ComboBoxText&, std::vector<std::string>& strings); }; |