X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmainmenu.C;h=edad4a7bff9c4a4e6e471576b6d394769a36c280;hp=990f83f946c8dbf6b54bbe32d00157eeaa3a04a4;hb=52fcc46226f9df46f9ce9d0566dc568455a7db0b;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c diff --git a/cinelerra-5.0/cinelerra/mainmenu.C b/cinelerra-5.0/cinelerra/mainmenu.C index 990f83f9..edad4a7b 100644 --- a/cinelerra-5.0/cinelerra/mainmenu.C +++ b/cinelerra-5.0/cinelerra/mainmenu.C @@ -25,6 +25,7 @@ #include "bcdisplayinfo.h" #include "bchash.h" #include "bcsignals.h" +#include "bdcreate.h" #include "cache.h" #include "channelinfo.h" #include "cplayback.h" @@ -32,6 +33,7 @@ #include "cwindow.h" #include "cwindowgui.h" #include "dbwindow.h" +#include "dvdcreate.h" #include "edl.h" #include "edlsession.h" #include "featheredits.h" @@ -76,8 +78,8 @@ #include -MainMenu::MainMenu(MWindow *mwindow, MWindowGUI *gui) - : BC_MenuBar(0, 0, gui->get_w()) +MainMenu::MainMenu(MWindow *mwindow, MWindowGUI *gui, int w) + : BC_MenuBar(0, 0, w) { this->gui = gui; this->mwindow = mwindow; @@ -116,6 +118,7 @@ void MainMenu::create_objects() filemenu->add_item(render = new RenderItem(mwindow)); filemenu->add_item(new BatchRenderMenuItem(mwindow)); + filemenu->add_item(new CreateBD_MenuItem(mwindow)); filemenu->add_item(new CreateDVD_MenuItem(mwindow)); filemenu->add_item(new BC_MenuItem("-")); filemenu->add_item(quit_program = new Quit(mwindow)); @@ -140,6 +143,7 @@ void MainMenu::create_objects() editmenu->add_item(new SelectAll(mwindow)); editmenu->add_item(new BC_MenuItem("-")); editmenu->add_item(new MenuEditShuffle(mwindow)); + editmenu->add_item(new MenuEditReverse(mwindow)); editmenu->add_item(new MenuEditLength(mwindow)); editmenu->add_item(new MenuEditAlign(mwindow)); editmenu->add_item(new MenuTransitionLength(mwindow)); @@ -200,6 +204,7 @@ void MainMenu::create_objects() settingsmenu->add_item(keyframes_follow_edits = new KeyframesFollowEdits(mwindow)); settingsmenu->add_item(cursor_on_frames = new CursorOnFrames(mwindow)); settingsmenu->add_item(typeless_keyframes = new TypelessKeyframes(mwindow)); + settingsmenu->add_item(new BC_MenuItem("-")); settingsmenu->add_item(new SaveSettingsNow(mwindow)); settingsmenu->add_item(loop_playback = new LoopPlayback(mwindow)); settingsmenu->add_item(new SetBRenderStart(mwindow)); @@ -239,9 +244,10 @@ void MainMenu::create_objects() windowmenu->add_item(show_cwindow = new ShowCWindow(mwindow)); windowmenu->add_item(show_gwindow = new ShowGWindow(mwindow)); windowmenu->add_item(show_lwindow = new ShowLWindow(mwindow)); + windowmenu->add_item(new BC_MenuItem("-")); windowmenu->add_item(split_x = new SplitX(mwindow)); windowmenu->add_item(split_y = new SplitY(mwindow)); - windowmenu->add_item(new TileWindows(mwindow,_("Default positions"),-1,_("Ctrl+d"),'d')); + windowmenu->add_item(new TileWindows(mwindow,_("Default positions"),-1,_("Ctrl+P"),'p')); windowmenu->add_item(new TileWindows(mwindow,_("Tile left"),0)); windowmenu->add_item(new TileWindows(mwindow,_("Tile right"),1)); } @@ -1417,8 +1423,8 @@ int TileWindows::handle_event() int window_config = config >= 0 ? config : mwindow->session->window_config; if( mwindow->tile_windows(window_config) ) { - mwindow->reload_status = 1; - mwindow->quit(1); + mwindow->restart_status = 1; + mwindow->gui->set_done(0); } return 1; }