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

Merge branch 'dev-menu' into 'dev'

Browse Source 
Moved Save Project Button to Menu

See merge request creyd/intelliphoto!63
This commit is contained in:
Jonas Mucke
2020-01-30 19:31:57 +00:00
parent 826d85bfb9 817953d058
commit cbb11e6357
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/GUI/IntelliPhotoGui.cpp
View File

@@ -389,8 +389,8 @@ void IntelliPhotoGui::createActions(){
actionSaveAs.append(action); actionSaveAs.append(action);
} }
//set exporter to actions // Set exporter to actions
QAction*pngSaveAction = new QAction("PNG-8", this); QAction*pngSaveAction = new QAction("PNG-8...", this);
pngSaveAction->setData("PNG"); pngSaveAction->setData("PNG");
// When clicked call IntelliPhotoGui::save() // When clicked call IntelliPhotoGui::save()
connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave())); connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
@@ -398,14 +398,6 @@ void IntelliPhotoGui::createActions(){
actionSaveAs.append(pngSaveAction); actionSaveAs.append(pngSaveAction);
pngSaveAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S)); pngSaveAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
QAction*projectSaveAction = new QAction("Projekt", this);
projectSaveAction->setData("idf");
// When clicked call IntelliPhotoGui::save()
connect(projectSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
// Attach each PNG in save Menu
actionSaveAs.append(projectSaveAction);
projectSaveAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
// Create exit action and tie to IntelliPhotoGui::close() // Create exit action and tie to IntelliPhotoGui::close()
actionExit = new QAction(tr("&Exit"), this); actionExit = new QAction(tr("&Exit"), this);
actionExit->setShortcuts(QKeySequence::Quit); actionExit->setShortcuts(QKeySequence::Quit);
@@ -472,7 +464,7 @@ void IntelliPhotoGui::createActions(){
actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down)); actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down));
connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown())); connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown()));
//Create Update RenderSettings Actions here // Create Update RenderSettings Actions here
actionUpdateFastRenderSettingsOn = new QAction(tr("&On"), this); actionUpdateFastRenderSettingsOn = new QAction(tr("&On"), this);
actionUpdateFastRenderSettingsOn->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_A)); actionUpdateFastRenderSettingsOn->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_A));
connect(actionUpdateFastRenderSettingsOn, SIGNAL(triggered()),this, SLOT(slotUpdateFastRenderSettingsOn())); connect(actionUpdateFastRenderSettingsOn, SIGNAL(triggered()),this, SLOT(slotUpdateFastRenderSettingsOn()));
@@ -481,7 +473,7 @@ void IntelliPhotoGui::createActions(){
actionUpdateFastRenderSettingsOff->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_D)); actionUpdateFastRenderSettingsOff->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_D));
connect(actionUpdateFastRenderSettingsOff, SIGNAL(triggered()),this, SLOT(slotUpdateFastRenderSettingsOff())); connect(actionUpdateFastRenderSettingsOff, SIGNAL(triggered()),this, SLOT(slotUpdateFastRenderSettingsOff()));
//Create Color Actions here // Create Color Actions here
actionColorPickerFirstColor = new QAction(tr("&Main"), this); actionColorPickerFirstColor = new QAction(tr("&Main"), this);
actionColorPickerFirstColor->setShortcut(QKeySequence(Qt::ALT + Qt::Key_N)); actionColorPickerFirstColor->setShortcut(QKeySequence(Qt::ALT + Qt::Key_N));
connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor())); connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor()));
@@ -497,7 +489,7 @@ void IntelliPhotoGui::createActions(){
connect(actionColorSwap, SIGNAL(triggered()), this, SLOT(slotSwapColor())); connect(actionColorSwap, SIGNAL(triggered()), this, SLOT(slotSwapColor()));
connect(SwitchColorButton, SIGNAL(clicked()), this, SLOT(slotSwapColor())); connect(SwitchColorButton, SIGNAL(clicked()), this, SLOT(slotSwapColor()));
//Create Tool actions down here // Create Tool actions down here
actionCreatePlainTool = new QAction(tr("&Plain"), this); actionCreatePlainTool = new QAction(tr("&Plain"), this);
actionCreatePlainTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_P)); actionCreatePlainTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_P));
connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotResetToolButtons())); connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotResetToolButtons()));
@@ -594,17 +586,24 @@ void IntelliPhotoGui::createActions(){
// Create the menubar // Create the menubar
void IntelliPhotoGui::createMenus(){ void IntelliPhotoGui::createMenus(){
// Create Save As option and the list of file types // Create Save As option and the list of file types
saveAsMenu = new QMenu(tr("&Save As"), this); saveAsMenu = new QMenu(tr("&Export As"), this);
foreach (QAction * action, actionSaveAs) foreach (QAction * action, actionSaveAs)
saveAsMenu->addAction(action); saveAsMenu->addAction(action);
// Attach all actions to File // Attach all actions to file menu
fileMenu = new QMenu(tr("&File"), this); fileMenu = new QMenu(tr("&File"), this);
fileMenu->addAction(actionOpen); fileMenu->addAction(actionOpen);
fileMenu->addMenu(saveAsMenu); fileMenu->addMenu(saveAsMenu);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(actionExit); fileMenu->addAction(actionExit);
// Attach the save project option to file menu
QAction*projectSaveAction = new QAction("Save Project", this);
projectSaveAction->setData("idf");
connect(projectSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
projectSaveAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
fileMenu->addAction(projectSaveAction);
// Attach all actions to Render Settings // Attach all actions to Render Settings
renderMenu = new QMenu(tr("&Fast Renderer"), this); renderMenu = new QMenu(tr("&Fast Renderer"), this);
renderMenu->addAction(actionUpdateFastRenderSettingsOn); renderMenu->addAction(actionUpdateFastRenderSettingsOn);
@@ -623,7 +622,7 @@ void IntelliPhotoGui::createMenus(){
layerMenu->addAction(actionSetActiveLayer); layerMenu->addAction(actionSetActiveLayer);
layerMenu->addAction(actionSetPolygon); layerMenu->addAction(actionSetPolygon);
layerMenu->addSeparator(); layerMenu->addSeparator();
layerMenu->addAction(actionMovePositionUp); layerMenu->addAction(actionMovePositionUp);
layerMenu->addAction(actionMovePositionDown); layerMenu->addAction(actionMovePositionDown);
layerMenu->addAction(actionMovePositionLeft); layerMenu->addAction(actionMovePositionLeft);
layerMenu->addAction(actionMovePositionRight); layerMenu->addAction(actionMovePositionRight);