creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-14 12:20:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev-rework'

Browse Source 
# Conflicts:
#   cppcheck_errors.txt
#   src/GUI/IntelliPhotoGui.h
This commit is contained in:
Conrad
2020-01-15 13:57:27 +00:00
parent dcbf163c7f 65b6de44e6
commit 14233f8484
8 changed files with 216 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/GUI/IntelliPhotoGui.h
View File

@@ -40,11 +40,13 @@ private slots:
void slotOpen();
void slotSave();
void slotCreateNewLayer();
// layer slots here
void slotCreateNewRasterLayer();
void slotCreateNewShapedLayer();
void slotDeleteLayer();
void slotClearActiveLayer();
void slotSetActiveLayer();
void slotSetActiveAlpha();
void slotSetPolygon();
void slotPositionMoveUp();
void slotPositionMoveDown();
void slotPositionMoveLeft();
@@ -123,6 +125,7 @@ QMenu*saveAsMenu;
QMenu*fileMenu;
QMenu*renderMenu;
QMenu*optionMenu;
QMenu*layerCreationMenu;
QMenu*layerMenu;
QMenu*colorMenu;
QMenu*toolCreationMenu;
@@ -158,10 +161,12 @@ QAction*actionAboutDialog;
QAction*actionAboutQtDialog;
// layer change actions
QAction*actionCreateNewLayer;
QAction*actionDeleteLayer;
QAction* actionCreateNewRasterLayer;
QAction* actionCreateNewShapedLayer;
QAction* actionDeleteLayer;
QAction* actionSetActiveLayer;
QAction* actionSetActiveAlpha;
QAction* actionSetPolygon;
QAction* actionMovePositionUp;
QAction* actionMovePositionDown;
QAction* actionMovePositionLeft;