diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 8 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.menus | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/mnemonic-us.bindings.in | 5 |
6 files changed, 12 insertions, 14 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index d6d7f987dd..705d0cd789 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -461,12 +461,12 @@ if env['NLS']: # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme)) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour3_ui_default.conf')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour3_ui_default.conf')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ergonomic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'mnemonic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de.bindings')) # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files)) diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index c333b03b61..1860106b95 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -136,6 +136,7 @@ <menuitem action='set-mouse-mode-gain'/> <menuitem action='set-mouse-mode-zoom'/> <menuitem action='set-mouse-mode-timefx'/> + <menuitem action='set-mouse-mode-note'/> <separator/> <menuitem action='cycle-edit-point'/> <menuitem action='cycle-edit-point-with-marker'/> diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index d12165bbb7..6f2ead2b79 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -225,8 +225,6 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this, &ARDOUR_UI::remove_last_capture)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_splash)); - Glib::RefPtr<ActionGroup> transport_actions = ActionGroup::create (X_("Transport")); /* do-nothing action for the "transport" menu bar item */ diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 36e2ab7fe1..b7706556ed 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -405,7 +405,6 @@ Keyboard::setup_keybindings () { using namespace ARDOUR_COMMAND_LINE; std::string default_bindings = "mnemonic-us.bindings"; - std::string path; vector<string> strs; binding_files.clear (); @@ -415,7 +414,7 @@ Keyboard::setup_keybindings () /* set up the per-user bindings path */ strs.push_back (Glib::get_home_dir()); - strs.push_back (".ardour2"); + strs.push_back (".ardour3"); strs.push_back ("ardour.bindings"); user_keybindings_path = Glib::build_filename (strs); @@ -484,9 +483,7 @@ Keyboard::setup_keybindings () SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); - find_file_in_search_path (spath, keybindings_path, keybindings_file); - - if (path.empty()) { + if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) { if (keybindings_path == default_bindings) { error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg; @@ -502,7 +499,7 @@ Keyboard::setup_keybindings () /* use it */ - keybindings_path = path; + keybindings_path = keybindings_file.to_string(); break; } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index df72841aff..0ac2dfc43a 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -152,6 +152,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) switch (ev->type) { case GDK_KEY_PRESS: + cout << "KEY" << endl; if (ev->key.keyval == GDK_Delete && !delete_mod) { delete_mod = true; original_mode = trackview.editor.current_midi_edit_mode(); diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 4089b71be4..a4af4359ab 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -91,10 +91,11 @@ ;; HOME ROW -(gtk_accel_path "<Actions>/Editor/zoom-to-region" "z") +(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%SECONDARY%>z") (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z") (gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z") -(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "<%TERTIARY%>z") +(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z") +(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-note" "<%TERTIARY%>n") (gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x") (gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c") (gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c") |