diff --git a/CMakeLists.txt b/CMakeLists.txt index 97b811c47..eb5ab988e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,7 @@ configure_file(declarativeimports/coretypes.h.in containment/plugin/lattetypes.h # Share App::Settings::GenericTools to containment actions configure_file(app/settings/generic/generictools.h containmentactions/contextmenu/generictools.h) configure_file(app/settings/generic/generictools.cpp containmentactions/contextmenu/generictools.cpp) +configure_file(app/data/contextmenudata.h containmentactions/contextmenu/contextmenudata.h) # subdirectories add_subdirectory(declarativeimports) diff --git a/app/data/contextmenudata.h b/app/data/contextmenudata.h index b74f937fe..9efac59df 100644 --- a/app/data/contextmenudata.h +++ b/app/data/contextmenudata.h @@ -13,17 +13,17 @@ namespace Latte { namespace Data { namespace ContextMenu { -static const char *ADDVIEWACTION= "_add_view"; -static const char *LAYOUTSACTION[] = "_layouts"; -static const char *PREFERENCESACTION[] = "_preferences"; -static const char *QUITLATTEACTION[] = "_quit_latte"; -static const char *ADDWIDGETSACTION[] = "_add_latte_widgets"; -static const char *DUPLICATEVIEWACTION[] = "_duplicate_view"; -static const char *EDITVIEWACTION[] = "_edit_view"; -static const char *EXPORTVIEWTEMPLATEACTION[] = "_export_view"; -static const char *REMOVEVIEWACTION[] = "_remove_view"; -static const char *MOVEVIEWACTION[] = "_move_view"; -static const char *SEPARATOR1ACTION[] = "_separator1"; +static const char ADDVIEWACTION[]= "_add_view"; +static const char LAYOUTSACTION[] = "_layouts"; +static const char PREFERENCESACTION[] = "_preferences"; +static const char QUITLATTEACTION[] = "_quit_latte"; +static const char ADDWIDGETSACTION[] = "_add_latte_widgets"; +static const char DUPLICATEVIEWACTION[] = "_duplicate_view"; +static const char EDITVIEWACTION[] = "_edit_view"; +static const char EXPORTVIEWTEMPLATEACTION[] = "_export_view"; +static const char REMOVEVIEWACTION[] = "_remove_view"; +static const char MOVEVIEWACTION[] = "_move_view"; +static const char SEPARATOR1ACTION[] = "_separator1"; static QStringList ACTIONSALWAYSVISIBLE = {LAYOUTSACTION, PREFERENCESACTION, @@ -33,7 +33,7 @@ static QStringList ACTIONSALWAYSVISIBLE = {LAYOUTSACTION, ADDVIEWACTION, MOVEVIEWACTION, EXPORTVIEWTEMPLATEACTION, - REMOVEVIEWACTION} + REMOVEVIEWACTION}; static QStringList ACTIONSVISIBLEONLYINEDIT = {MOVEVIEWACTION, EXPORTVIEWTEMPLATEACTION, diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp index f85095c14..493ffcb62 100644 --- a/containmentactions/contextmenu/menu.cpp +++ b/containmentactions/contextmenu/menu.cpp @@ -6,6 +6,7 @@ #include "menu.h" // local +#include "contextmenudata.h" #include "layoutmenuitemwidget.h" // Qt