a nice excuse for some keybindings, make some markers larger vertically

git-svn-id: svn://localhost/trunk/ardour2@282 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 34 insertions, 30 deletions

diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings
index 2c0a48dcc5..cb8c1bdd6d 100644
--- a/gtk2_ardour/ardour.bindings
+++ b/gtk2_ardour/ardour.bindings
@@ -11,6 +11,7 @@
 (gtk_accel_path "<Actions>/Editor/crop" "c")
 (gtk_accel_path "<Actions>/Editor/duplicate-region" "d")
 (gtk_accel_path "<Actions>/Editor/set-edit-cursor" "e")
+(gtk_accel_path "<Actions>/Editor/split-region" "s")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
 (gtk_accel_path "<Actions>/Transport/loop" "l")
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 466820a1f2..df39e3fb27 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -50,11 +50,6 @@
                <separator/>       
                <menuitem action='playhead-to-range-start'/>
                <menuitem action='playhead-to-range-end'/>
-               <separator/> 
-               <menuitem action='set-playhead'/>
-               <menuitem action='audition-at-mouse'/>
-               <menuitem action='brush-at-mouse'/>
-               <separator/> 
                <menu action='TransportOptions'>
                     <menuitem action='ToggleTimeMaster'/>
                     <menuitem action='TogglePunchIn'/>
@@ -84,7 +79,6 @@
                <menuitem action='edit-cursor-to-previous-region-sync'/>
                <menuitem action='center-edit-cursor'/>
                <menuitem action='edit-to-playhead'/>
-               <menuitem action='set-edit-cursor'/>
                <separator/>       
                <menuitem action='edit-cursor-to-range-start'/>
                <menuitem action='edit-cursor-to-range-end'/>
@@ -206,6 +200,15 @@
                <menuitem action='AutomaticallyCreateCrossfades'/>
                <menuitem action='UnmuteNewFullCrossfades'/>
          </menu>
+	 <menu name='Help' action='Help'>
+	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
+	       		<menuitem action='audition-at-mouse'/>
+               		<menuitem action='brush-at-mouse'/>
+               		<menuitem action='set-edit-cursor'/>
+              	 	<menuitem action='set-playhead'/>
+	       		<menuitem action='split-region'/>
+               </menu>
+	</menu>
      </menubar>
 
      <popup name='redirectmenu'>
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index bbd094245c..fbe61775df 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -71,7 +71,8 @@ ARDOUR_UI::install_actions ()
 	ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
 	ActionManager::register_action (main_actions, X_("Options"), _("Options"));
 	ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
-
+        ActionManager::register_action (main_actions, X_("Help"), _("Help"));
+	ActionManager::register_action (main_actions, X_("KeyMouse Actions"), _("KeyMouse Actions"));
 	/* the real actions */
 
 	act = ActionManager::register_action (main_actions, X_("New"), _("New"),  bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ()));
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index dbf7bc1c89..f85a744a70 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -139,10 +139,16 @@ Editor::register_actions ()
 	act = ActionManager::register_action (editor_actions, "align-regions-sync-relative", _("align regions sync relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint));
 	ActionManager::session_sensitive_actions.push_back (act);
 	
-	act = ActionManager::register_action (editor_actions, "set-playhead", _("set playhead"), mem_fun(*this, &Editor::kbd_set_playhead_cursor));
-	ActionManager::session_sensitive_actions.push_back (act);
+        act = ActionManager::register_action (editor_actions, "audition-at-mouse", _("audition at mouse"), mem_fun(*this, &Editor::kbd_audition));
+        ActionManager::session_sensitive_actions.push_back (act);
+        act = ActionManager::register_action (editor_actions, "brush-at-mouse", _("brush at mouse"), mem_fun(*this, &Editor::kbd_brush));
+        ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "set-edit-cursor", _("set edit cursor"), mem_fun(*this, &Editor::kbd_set_edit_cursor));
 	ActionManager::session_sensitive_actions.push_back (act);
+	act = ActionManager::register_action (editor_actions, "set-playhead", _("set playhead"), mem_fun(*this, &Editor::kbd_set_playhead_cursor));
+	ActionManager::session_sensitive_actions.push_back (act);
+	act = ActionManager::register_action (editor_actions, "split-region", _("split region"), mem_fun(*this, &Editor::kbd_split));
+        ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_action (editor_actions, "undo", _("undo"), bind (mem_fun(*this, &Editor::undo), 1U));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -177,13 +183,6 @@ Editor::register_actions ()
 
 	act = ActionManager::register_action (editor_actions, "split-at-edit-cursor", _("split at edit cursor"), mem_fun(*this, &Editor::split_region));
 	ActionManager::edit_cursor_in_region_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (editor_actions, "split-at-mouse", _("split at mouse"), mem_fun(*this, &Editor::kbd_split));
-	ActionManager::session_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_action (editor_actions, "brush-at-mouse", _("brush at mouse"), mem_fun(*this, &Editor::kbd_brush));
-	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (editor_actions, "audition-at-mouse", _("audition at mouse"), mem_fun(*this, &Editor::kbd_audition));
-	ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_action (editor_actions, "start-range", _("start range"), mem_fun(*this, &Editor::keyboard_selection_begin));
 	ActionManager::session_sensitive_actions.push_back (act);
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 4e3d053c16..fb2afb00b4 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -159,7 +159,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 	case Start:
 	        points = new ArdourCanvas::Points ();
 		points->push_back (Gnome::Art::Point (0.0, 0.0)); 		
-		points->push_back (Gnome::Art::Point (7.0, 7.0)); 		
+		points->push_back (Gnome::Art::Point (6.5, 6.5)); 		
 		points->push_back (Gnome::Art::Point (0.0, 13.0)); 		
 		points->push_back (Gnome::Art::Point (0.0, 0.0));	
 
@@ -169,10 +169,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
 	case End:
 		points = new ArdourCanvas::Points ();
-		points->push_back (Gnome::Art::Point (7.0, 7.0));
+		points->push_back (Gnome::Art::Point (6.5, 6.5));
 		points->push_back (Gnome::Art::Point (13.0, 0.0));		
 		points->push_back (Gnome::Art::Point (13.0, 13.0));			
-		points->push_back (Gnome::Art::Point (7.0, 7.0));		
+		points->push_back (Gnome::Art::Point (6.5, 6.5));		
 		
 		shift = 13;
 		label_offset = 6.0;
@@ -182,8 +182,8 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 	case LoopStart:
 		points = new ArdourCanvas::Points ();
 		points->push_back (Gnome::Art::Point (0.0, 0.0));	
-		points->push_back (Gnome::Art::Point (12.0, 12.0));		
-		points->push_back (Gnome::Art::Point (0.0, 12.0));		
+		points->push_back (Gnome::Art::Point (13.0, 13.0));		
+		points->push_back (Gnome::Art::Point (0.0, 13.0));		
 		points->push_back (Gnome::Art::Point (0.0, 0.0));		
 		
 		shift = 0;
@@ -192,12 +192,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
 	case LoopEnd:
 		points = new ArdourCanvas::Points ();
-		points->push_back (Gnome::Art::Point (12.0,  0.0));
-		points->push_back (Gnome::Art::Point (12.0, 12.0));	
-		points->push_back (Gnome::Art::Point (0.0, 12.0));		
-		points->push_back (Gnome::Art::Point (12.0, 0.0));
+		points->push_back (Gnome::Art::Point (13.0,  0.0));
+		points->push_back (Gnome::Art::Point (13.0, 13.0));	
+		points->push_back (Gnome::Art::Point (0.0, 13.0));		
+		points->push_back (Gnome::Art::Point (13.0, 0.0));
 		
-		shift = 12;
+		shift = 13;
 		label_offset = 0.0;
 		annotate_left = true;
 		break;
@@ -205,12 +205,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 	case  PunchIn:
 		points = new ArdourCanvas::Points ();
 		points->push_back (Gnome::Art::Point (0.0, 0.0));
-		points->push_back (Gnome::Art::Point (12.0, 0.0));		
-		points->push_back (Gnome::Art::Point (0.0, 12.0));	
+		points->push_back (Gnome::Art::Point (13.0, 0.0));		
+		points->push_back (Gnome::Art::Point (0.0, 13.0));	
 		points->push_back (Gnome::Art::Point (0.0, 0.0));	
 
 		shift = 0;
-		label_offset = 12.0;
+		label_offset = 13.0;
 		break;
 		
 	case  PunchOut:
@@ -220,7 +220,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 		points->push_back (Gnome::Art::Point (12.0, 12.0));		
 		points->push_back (Gnome::Art::Point (0.0, 0.0));		
 
-		shift = 12;
+		shift = 13;
 		label_offset = 0.0;
 		annotate_left = true;
 		break;