benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Menu-Actions: inline the directly forwarded actions (#1085)

Browse source 
as a result of the preceding refactorings, we have created a
top level UI context, and most actions are now just forwarede
to a dedicated entity within this globalCtx, mostly to the
InteractionDirector.

Thus we're able to get rid of the one-liner functions in
the Actions class by directly delegating to the respective
entity from within the menu definition lambda.

Is this safe?
Under the assumption that the global context outlives the
GTK main loop, this is safe.
This commit is contained in:
Fischlurch 2017-04-23 17:31:47 +02:00
parent 216fd9d882
commit 790530bc2d
1 changed files with 32 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
src/gui/ctrl/actions.hpp
View file

@ -111,25 +111,42 @@ namespace ctrl {
menu("FileMenu", _("_File"));
entry ([&]() { onMenu_file_newProject(); } , "FileNewProject", Stock::NEW, _("_New Project..."));
entry ([&]() { onMenu_file_save(); } , "FileSave", Stock::SAVE, _("_Save Project"));
entry ([&]() { onMenu_file_saveAs(); } , "FileSaveAs", Stock::SAVE_AS, _("_Save Project As..."));
entry ([&]() { onMenu_file_open(); } , "FileOpen", Stock::OPEN, _("_Open..."));
entry ([&]() { onMenu_file_render(); } , "FileRender", _("_Render...")), AccelKey("<shift>R");
entry ([&]() { onMenu_file_quit(); } , "FileQuit", Stock::QUIT);
entry ([&]() { globalCtx_.director_.newProject(); } , "FileNewProject", Stock::NEW, _("_New Project..."));
entry ([&]() { globalCtx_.director_.saveSnapshot(); } , "FileSave", Stock::SAVE, _("_Save Project"));
entry ([&]() { globalCtx_.director_.forkProject(); } , "FileSaveAs", Stock::SAVE_AS, _("_Save Project As..."));
entry ([&]() { globalCtx_.director_.openFile(); } , "FileOpen", Stock::OPEN, _("_Open..."));
entry ([&]() { onMenu_file_render(); } , "FileRender", _("_Render...")), AccelKey("<shift>R");
entry ([&]() { globalCtx_.uiManager_.terminateUI(); } , "FileQuit", Stock::QUIT);
menu("EditMenu", _("_Edit"));
entry ([&]() { onMenu_others(); } , "EditUndo", Stock::UNDO);
entry ([&]() { onMenu_others(); } , "EditRedo", Stock::REDO);
entry ([&]() { onMenu_others(); } , "EditCut", Stock::CUT);
entry ([&]() { onMenu_others(); } , "EditCopy", Stock::COPY);
entry ([&]() { onMenu_others(); } , "EditPaste",Stock::PASTE);
entry ([&]() { onMenu_edit_preferences(); } , "EditPreferences", Stock::PREFERENCES);
entry ([&]() { onMenu_others(); } , "EditUndo", Stock::UNDO);
entry ([&]() { onMenu_others(); } , "EditRedo", Stock::REDO);
entry ([&]() { onMenu_others(); } , "EditCut", Stock::CUT);
entry ([&]() { onMenu_others(); } , "EditCopy", Stock::COPY);
entry ([&]() { onMenu_others(); } , "EditPaste", Stock::PASTE);
entry ([&]() { onMenu_edit_preferences(); } , "EditPreferences", Stock::PREFERENCES);
menu("SequenceMenu", _("_Sequence"));
entry ([&]() { globalCtx_.director_.newSequence(); } , "SequenceAdd", _("_Add..."));
menu("TrackMenu", _("_Track"));
entry ([&]() { globalCtx_.director_.newTrack(); } , "TrackAdd", _("_Add..."));
menu("HelpMenu", _("_Help"));
entry ([&]() { onMenu_help_about(); } , "HelpAbout", Stock::ABOUT);
menu("WindowMenu", _("_Window"));
entry ([&]() { globalCtx_.windowList_.newWindow(); } , "WindowNewWindow", StockID("new_window"));
entry ([&]() { globalCtx_.windowList_.closeWindow();}, "WindowCloseWindow", _("Close Window"));
actionGroup->add(Action::create("WindowShowPanel", _("_Show Panel")));
menu("ViewMenu", _("_View"));
assetsPanelAction = ToggleAction::create("ViewAssets", StockID("panel_assets"));
assetsPanelAction->signal_toggled().connect ( [&]() { onMenu_view_assets(); });
actionGroup->add(assetsPanelAction);
@ -142,27 +159,10 @@ namespace ctrl {
viewerPanelAction->signal_toggled().connect( [&]() { onMenu_view_viewer(); });
actionGroup->add(viewerPanelAction);
menu("SequenceMenu", _("_Sequence"));
entry ([&]() { onMenu_sequence_add(); } , "SequenceAdd", _("_Add..."));
menu("TrackMenu", _("_Track"));
entry ([&]() { onMenu_track_add(); } , "TrackAdd", _("_Add..."));
menu("WindowMenu", _("_Window"));
entry ([&]() { onMenu_window_new_window(); } , "WindowNewWindow", StockID("new_window"));
entry ([&]() { onMenu_window_close_window();}, "WindowCloseWindow", _("Close Window"));
actionGroup->add(Action::create("WindowShowPanel", _("_Show Panel")));
menu("HelpMenu", _("_Help"));
entry ([&]() { onMenu_help_about(); } , "HelpAbout", Stock::ABOUT);
uiManager.insert_action_group(actionGroup);
//----- Create the UI layout -----//
string ui_info = R"***(
<ui>
@ -305,30 +305,6 @@ namespace ctrl {
/* ============ File Menu ========== */
void
onMenu_file_newProject()
{
globalCtx_.director_.newProject();
}
void
onMenu_file_save()
{
globalCtx_.director_.saveSnapshot();
}
void
onMenu_file_saveAs()
{
globalCtx_.director_.forkProject();
}
void
onMenu_file_open()
{
globalCtx_.director_.openFile();
}
void
onMenu_file_render()
{
@ -336,12 +312,6 @@ namespace ctrl {
dialog.run();
}
void
onMenu_file_quit()
{
globalCtx_.uiManager_.terminateUI();
}
/* ============ Edit Menu ========== */
@ -384,40 +354,6 @@ namespace ctrl {
/* ============ Sequence Menu ====== */
void
onMenu_sequence_add()
{
/////////////////////////////////////////////////////////////////////////////////////TODO consider to invoke those one-liners directly from the lambda!
globalCtx_.director_.newSequence();
}
/* ============ Track Menu ========= */
void
onMenu_track_add()
{
globalCtx_.director_.newSequence();
}
/* ============ Window Menu ======== */
void
onMenu_window_new_window()
{
globalCtx_.windowList_.newWindow();
}
void
onMenu_window_close_window()
{
globalCtx_.windowList_.closeWindow();
}
void
onMenu_show_panel(int panel_index)
@ -426,9 +362,6 @@ namespace ctrl {
}
/* ============ Help Menu ========== */
void
onMenu_help_about()
{