X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=b7b9f3581ae0792ecd18330c104d6fbb53c9dd95;hb=a718f58e6d8061f83bd0c0b10848ac415cd21fcd;hp=3a694f72b6099155ab862fdb8ae929295f246f6e;hpb=45a8ba3455cf252332c03533a7590df5267ce9aa;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 3a694f72..b7b9f358 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -207,13 +207,13 @@ void MainMenu::create_objects()
 	add_menu(trackmenu = new BC_Menu(_("Tracks")));
 	trackmenu->add_item(new MoveTracksUp(mwindow));
 	trackmenu->add_item(new MoveTracksDown(mwindow));
+	trackmenu->add_item(new RollTracksUp(mwindow));
+	trackmenu->add_item(new RollTracksDown(mwindow));
 	trackmenu->add_item(new DeleteTracks(mwindow));
 	trackmenu->add_item(new DeleteFirstTrack(mwindow));
 	trackmenu->add_item(new DeleteLastTrack(mwindow));
 	trackmenu->add_item(new ConcatenateTracks(mwindow));
 	trackmenu->add_item(new AlignTimecodes(mwindow));
-	trackmenu->add_item(new SwapTracksUp(mwindow));
-	trackmenu->add_item(new SwapTracksDown(mwindow));
 	AppendTracks *append_tracks;
 	trackmenu->add_item(append_tracks = new AppendTracks(mwindow));
 	append_tracks->create_objects();
@@ -223,7 +223,6 @@ void MainMenu::create_objects()
 
 	settingsmenu->add_item(new SetFormat(mwindow));
 	settingsmenu->add_item(preferences = new PreferencesMenuitem(mwindow));
-	ProxyMenuItem *proxy;
 	settingsmenu->add_item(proxy = new ProxyMenuItem(mwindow));
 	proxy->create_objects();
 	ConvertMenuItem *convert;
@@ -1345,7 +1344,8 @@ int MoveTracksUp::handle_event()
 MoveTracksDown::MoveTracksDown(MWindow *mwindow)
  : BC_MenuItem(_("Move tracks down"), _("Shift-Down"), DOWN)
 {
-	set_shift(); this->mwindow = mwindow;
+	this->mwindow = mwindow;
+	set_shift();
 }
 
 int MoveTracksDown::handle_event()
@@ -1356,30 +1356,33 @@ int MoveTracksDown::handle_event()
 }
 
 
-SwapTracksUp::SwapTracksUp(MWindow *mwindow)
- : BC_MenuItem(_("Swap tracks up"), 0, UP)
+RollTracksUp::RollTracksUp(MWindow *mwindow)
+ : BC_MenuItem(_("Roll tracks up"), _("Ctrl-Shift-Up"), UP)
 {
 	this->mwindow = mwindow;
+	set_ctrl();
 	set_shift();
 }
 
-int SwapTracksUp::handle_event()
+int RollTracksUp::handle_event()
 {
 	if( mwindow->session->current_operation == NO_OPERATION )
-		mwindow->swap_tracks_up();
+		mwindow->roll_tracks_up();
 	return 1;
 }
 
-SwapTracksDown::SwapTracksDown(MWindow *mwindow)
- : BC_MenuItem(_("Swap tracks down"), 0, DOWN)
+RollTracksDown::RollTracksDown(MWindow *mwindow)
+ : BC_MenuItem(_("Roll tracks down"), _("Ctrl-Shift-Down"), DOWN)
 {
-	set_shift(); this->mwindow = mwindow;
+	this->mwindow = mwindow;
+	set_ctrl();
+	set_shift();
 }
 
-int SwapTracksDown::handle_event()
+int RollTracksDown::handle_event()
 {
 	if( mwindow->session->current_operation == NO_OPERATION )
-		mwindow->swap_tracks_down();
+		mwindow->roll_tracks_down();
 	return 1;
 }
 
@@ -1605,7 +1608,7 @@ ShowVWindow::ShowVWindow(MWindow *mwindow)
 int ShowVWindow::handle_event()
 {
 	mwindow->gui->unlock_window();
-	mwindow->show_vwindow();
+	mwindow->show_vwindow(1);
 	mwindow->gui->lock_window("ShowVWindow::handle_event");
 	return 1;
 }