mirror of
https://github.com/creyD/intelliphoto.git
synced 2026-04-14 20:30:32 +02:00
Merge branch 'dev' into dev-colorpalette
This commit is contained in:
@@ -49,11 +49,12 @@ void slotOpen();
|
||||
void slotSave();
|
||||
|
||||
// layer slots here
|
||||
void slotCreateNewLayer();
|
||||
void slotCreateNewRasterLayer();
|
||||
void slotCreateNewShapedLayer();
|
||||
void slotDeleteLayer();
|
||||
void slotClearActiveLayer();
|
||||
void slotSetActiveLayer();
|
||||
void slotSetActiveAlpha();
|
||||
void slotSetPolygon();
|
||||
void slotPositionMoveUp();
|
||||
void slotPositionMoveDown();
|
||||
void slotPositionMoveLeft();
|
||||
@@ -136,6 +137,7 @@ QMenu*saveAsMenu;
|
||||
QMenu*fileMenu;
|
||||
QMenu*renderMenu;
|
||||
QMenu*optionMenu;
|
||||
QMenu*layerCreationMenu;
|
||||
QMenu*layerMenu;
|
||||
QMenu*colorMenu;
|
||||
QMenu*toolCreationMenu;
|
||||
@@ -171,10 +173,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;
|
||||
|
||||
Reference in New Issue
Block a user