switch move/swap tracks, add mv trk shortcut, update msg

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mainmenu.C

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 9c5c81851084f20da98696684ea089874be9704f..56b18436e0efcc95f525be8610b2561e9a6bcee9 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -118,8 +118,8 @@ void MainMenu::create_objects()
        filemenu->add_item(saveas = new SaveAs(mwindow));
        save->create_objects(saveas);
        saveas->set_mainmenu(this);
-       SaveProject *save_project;
-       filemenu->add_item(save_project = new SaveProject(mwindow));
+       filemenu->add_item(new SaveProject(mwindow));
+       filemenu->add_item(new SaveSession(mwindow));
 
        filemenu->add_item(record_menu_item = new RecordMenuItem(mwindow));
 #ifdef HAVE_DVB
@@ -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();
@@ -638,7 +638,7 @@ int DumpUndo::handle_event()
 
 // ================================================= edit
 
-Undo::Undo(MWindow *mwindow) : BC_MenuItem(_("Undo"), "z", 'z')
+Undo::Undo(MWindow *mwindow) : BC_MenuItem(_("Undo"), "z or Ctrl-z", 'z')
 {
        this->mwindow = mwindow;
 }
@@ -1345,7 +1345,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 +1357,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;
 }
 
@@ -1573,10 +1577,11 @@ int ScrubSpeed::handle_event()
 }
 
 SaveSettingsNow::SaveSettingsNow(MWindow *mwindow)
- : BC_MenuItem(_("Save settings now"),_("Ctrl-s"),'s')
+ : BC_MenuItem(_("Save settings now"),_("Ctrl-Shift-S"),'S')
 {
        this->mwindow = mwindow;
        set_ctrl(1);
+       set_shift(1);
 }
 
 int SaveSettingsNow::handle_event()
@@ -1604,7 +1609,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;
 }