diff --git a/src/Painting/GUI/IntelliPhotoGui.cpp b/src/Painting/GUI/IntelliPhotoGui.cpp index 72cf39b..885df18 100644 --- a/src/Painting/GUI/IntelliPhotoGui.cpp +++ b/src/Painting/GUI/IntelliPhotoGui.cpp @@ -109,15 +109,14 @@ void IntelliPhotoGui::newLayer() // tr("new Layer") is the title // the next tr is the text to display - // Get the current pen width - // Define the min, max, step and ok button + // Define the standard Value, min, max, step and ok button int width = QInputDialog::getInt(this, tr("new Layer"), tr("Width:"), 200,1, 500, 1, &ok); int height = QInputDialog::getInt(this, tr("new Layer"), tr("Height:"), 200,1, 500, 1, &ok); - // Change the pen width + // Create new Layer if (ok) { int layer = paintingArea->addLayer(width,height,100,100); @@ -125,6 +124,23 @@ void IntelliPhotoGui::newLayer() } } +// Opens a dialog that allows the user to delete a Layer +void IntelliPhotoGui::deleteLayer() +{ + // Stores button value + bool ok; + + // tr("delete Layer") is the title + // the next tr is the text to display + // Define the standard Value, min, max, step and ok button + int layerNumber = QInputDialog::getInt(this, tr("delete Layer"), + tr("Number:"), + 1,1, 500, 1, &ok); + // Create new Layer + if (ok) + paintingArea->deleteLayer(layerNumber-1); +} + // Open an about dialog void IntelliPhotoGui::about() { @@ -135,7 +151,8 @@ void IntelliPhotoGui::about() void IntelliPhotoGui::onSetAlpha(){ int a = this->setAlphaEdit->text().toInt(); - emit this->sendAlpha(a); + if (a >= 0 && a < 256) + emit this->sendAlpha(a); } void IntelliPhotoGui::onMoveUp(){ @@ -170,12 +187,13 @@ void IntelliPhotoGui::onClearedPressed(){ int r = this->RedEdit->text().toInt(); int g = this->GreenEdit->text().toInt(); int b = this->BlueEdit->text().toInt(); - emit this->sendClearColor(r,g,b); + if(r < 256 && r >= 0 && g < 256 && g >= 0 && b < 256 && b >= 0) + emit this->sendClearColor(r,g,b); } void IntelliPhotoGui::onActivePressed(){ int a = this->selectActiveEdit->text().toInt(); - emit this->sendActiveLayer(a); + emit this->sendActiveLayer(a-1); }; @@ -275,6 +293,14 @@ void IntelliPhotoGui::createActions() newLayerAct = new QAction(tr("&new Layer..."), this); connect(newLayerAct, SIGNAL(triggered()), this, SLOT(newLayer())); + // Delete New Layer action and tie to IntelliPhotoGui::deleteLayer() + deleteLayerAct = new QAction(tr("&Delete Layer..."), this); + connect(deleteLayerAct, SIGNAL(triggered()), this, SLOT(deleteLayer())); + + // Delete Active Layer action and tie to paintingArea::deleteActiveLayerLayer() + deleteActiveLayerAct = new QAction(tr("&Delete active Layer"), this); + connect(deleteActiveLayerAct, SIGNAL(triggered()), paintingArea, SLOT(deleteActiveLayer())); + // Create about action and tie to IntelliPhotoGui::about() aboutAct = new QAction(tr("&About"), this); connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); @@ -310,6 +336,8 @@ void IntelliPhotoGui::createMenus() // Attach all actions to Layer layerMenu = new QMenu(tr("&Layer"), this); layerMenu->addAction(newLayerAct); + layerMenu->addAction(deleteLayerAct); + layerMenu->addAction(deleteActiveLayerAct); // Attach all actions to Help helpMenu = new QMenu(tr("&Help"), this); @@ -349,7 +377,7 @@ void IntelliPhotoGui::createGui(){ selectActiveButton = new QPushButton("select Active"); selectActiveLabel = new QLabel("Active:"); - selectActiveEdit = new QLineEdit("0"); + selectActiveEdit = new QLineEdit("1"); selectActiveLabel->setMaximumSize(150,20); selectActiveEdit->setMaximumSize(150,20); diff --git a/src/Painting/GUI/IntelliPhotoGui.h b/src/Painting/GUI/IntelliPhotoGui.h index 2a220ee..fa36326 100644 --- a/src/Painting/GUI/IntelliPhotoGui.h +++ b/src/Painting/GUI/IntelliPhotoGui.h @@ -42,6 +42,7 @@ private slots: void penColor(); void penWidth(); void newLayer(); + void deleteLayer(); void about(); void onClearedPressed(); @@ -92,6 +93,8 @@ private: QAction *penWidthAct; QAction *clearScreenAct; QAction *newLayerAct; + QAction *deleteLayerAct; + QAction *deleteActiveLayerAct; QAction *aboutAct; QAction *aboutQtAct; diff --git a/src/Painting/Layer/PaintingArea.cpp b/src/Painting/Layer/PaintingArea.cpp index 0ff7e44..c02f89c 100644 --- a/src/Painting/Layer/PaintingArea.cpp +++ b/src/Painting/Layer/PaintingArea.cpp @@ -76,6 +76,11 @@ void PaintingArea::deleteLayer(int index){ } } +void PaintingArea::deleteActiveLayer(){ + this->layerStructure.erase(layerStructure.begin()+activeLayer); + activeLayer--; +} + void PaintingArea::setLayerToActive(int index) { if(indexactiveLayer=index; diff --git a/src/Painting/Layer/PaintingArea.h b/src/Painting/Layer/PaintingArea.h index 46f613d..50a74bf 100644 --- a/src/Painting/Layer/PaintingArea.h +++ b/src/Painting/Layer/PaintingArea.h @@ -44,6 +44,7 @@ public slots: // Events to handle void clearImage(int r, int g, int b); void activate(int a); + void deleteActiveLayer(); void setAlpha(int a); void getMoveUp(int a); diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhoto.exe b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhoto.exe index fe20b21..a2b34ff 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhoto.exe and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhoto.exe differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhotoGui.o b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhotoGui.o index d5f3682..eda9bf1 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhotoGui.o and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/IntelliPhotoGui.o differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/PaintingArea.o b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/PaintingArea.o index 7568435..8404d6a 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/PaintingArea.o and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/PaintingArea.o differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/main.o b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/main.o index e8e139c..06cfb9e 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/main.o and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/main.o differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.cpp b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.cpp index a020330..11d1ea8 100644 --- a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.cpp +++ b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.cpp @@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_IntelliPhotoGui_t { - QByteArrayData data[30]; - char stringdata0[287]; + QByteArrayData data[31]; + char stringdata0[299]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -51,26 +51,28 @@ QT_MOC_LITERAL(16, 132, 4), // "save" QT_MOC_LITERAL(17, 137, 8), // "penColor" QT_MOC_LITERAL(18, 146, 8), // "penWidth" QT_MOC_LITERAL(19, 155, 8), // "newLayer" -QT_MOC_LITERAL(20, 164, 5), // "about" -QT_MOC_LITERAL(21, 170, 16), // "onClearedPressed" -QT_MOC_LITERAL(22, 187, 15), // "onActivePressed" -QT_MOC_LITERAL(23, 203, 10), // "onSetAlpha" -QT_MOC_LITERAL(24, 214, 8), // "onMoveUp" -QT_MOC_LITERAL(25, 223, 10), // "onMoveDown" -QT_MOC_LITERAL(26, 234, 10), // "onMoveLeft" -QT_MOC_LITERAL(27, 245, 11), // "onMoveRight" -QT_MOC_LITERAL(28, 257, 13), // "onMoveLayerUp" -QT_MOC_LITERAL(29, 271, 15) // "onMoveLayerDown" +QT_MOC_LITERAL(20, 164, 11), // "deleteLayer" +QT_MOC_LITERAL(21, 176, 5), // "about" +QT_MOC_LITERAL(22, 182, 16), // "onClearedPressed" +QT_MOC_LITERAL(23, 199, 15), // "onActivePressed" +QT_MOC_LITERAL(24, 215, 10), // "onSetAlpha" +QT_MOC_LITERAL(25, 226, 8), // "onMoveUp" +QT_MOC_LITERAL(26, 235, 10), // "onMoveDown" +QT_MOC_LITERAL(27, 246, 10), // "onMoveLeft" +QT_MOC_LITERAL(28, 257, 11), // "onMoveRight" +QT_MOC_LITERAL(29, 269, 13), // "onMoveLayerUp" +QT_MOC_LITERAL(30, 283, 15) // "onMoveLayerDown" }, "IntelliPhotoGui\0sendClearColor\0\0r\0g\0" "b\0sendActiveLayer\0a\0sendAlpha\0moveUp\0" "moveDown\0moveRight\0moveLeft\0moveLayerUp\0" "moveLayerDown\0open\0save\0penColor\0" - "penWidth\0newLayer\0about\0onClearedPressed\0" - "onActivePressed\0onSetAlpha\0onMoveUp\0" - "onMoveDown\0onMoveLeft\0onMoveRight\0" - "onMoveLayerUp\0onMoveLayerDown" + "penWidth\0newLayer\0deleteLayer\0about\0" + "onClearedPressed\0onActivePressed\0" + "onSetAlpha\0onMoveUp\0onMoveDown\0" + "onMoveLeft\0onMoveRight\0onMoveLayerUp\0" + "onMoveLayerDown" }; #undef QT_MOC_LITERAL @@ -80,7 +82,7 @@ static const uint qt_meta_data_IntelliPhotoGui[] = { 8, // revision 0, // classname 0, 0, // classinfo - 24, 14, // methods + 25, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -88,32 +90,33 @@ static const uint qt_meta_data_IntelliPhotoGui[] = { 9, // signalCount // signals: name, argc, parameters, tag, flags - 1, 3, 134, 2, 0x06 /* Public */, - 6, 1, 141, 2, 0x06 /* Public */, - 8, 1, 144, 2, 0x06 /* Public */, - 9, 1, 147, 2, 0x06 /* Public */, - 10, 1, 150, 2, 0x06 /* Public */, - 11, 1, 153, 2, 0x06 /* Public */, - 12, 1, 156, 2, 0x06 /* Public */, - 13, 0, 159, 2, 0x06 /* Public */, - 14, 0, 160, 2, 0x06 /* Public */, + 1, 3, 139, 2, 0x06 /* Public */, + 6, 1, 146, 2, 0x06 /* Public */, + 8, 1, 149, 2, 0x06 /* Public */, + 9, 1, 152, 2, 0x06 /* Public */, + 10, 1, 155, 2, 0x06 /* Public */, + 11, 1, 158, 2, 0x06 /* Public */, + 12, 1, 161, 2, 0x06 /* Public */, + 13, 0, 164, 2, 0x06 /* Public */, + 14, 0, 165, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 15, 0, 161, 2, 0x08 /* Private */, - 16, 0, 162, 2, 0x08 /* Private */, - 17, 0, 163, 2, 0x08 /* Private */, - 18, 0, 164, 2, 0x08 /* Private */, - 19, 0, 165, 2, 0x08 /* Private */, - 20, 0, 166, 2, 0x08 /* Private */, - 21, 0, 167, 2, 0x08 /* Private */, - 22, 0, 168, 2, 0x08 /* Private */, - 23, 0, 169, 2, 0x08 /* Private */, - 24, 0, 170, 2, 0x08 /* Private */, - 25, 0, 171, 2, 0x08 /* Private */, - 26, 0, 172, 2, 0x08 /* Private */, - 27, 0, 173, 2, 0x08 /* Private */, - 28, 0, 174, 2, 0x08 /* Private */, - 29, 0, 175, 2, 0x08 /* Private */, + 15, 0, 166, 2, 0x08 /* Private */, + 16, 0, 167, 2, 0x08 /* Private */, + 17, 0, 168, 2, 0x08 /* Private */, + 18, 0, 169, 2, 0x08 /* Private */, + 19, 0, 170, 2, 0x08 /* Private */, + 20, 0, 171, 2, 0x08 /* Private */, + 21, 0, 172, 2, 0x08 /* Private */, + 22, 0, 173, 2, 0x08 /* Private */, + 23, 0, 174, 2, 0x08 /* Private */, + 24, 0, 175, 2, 0x08 /* Private */, + 25, 0, 176, 2, 0x08 /* Private */, + 26, 0, 177, 2, 0x08 /* Private */, + 27, 0, 178, 2, 0x08 /* Private */, + 28, 0, 179, 2, 0x08 /* Private */, + 29, 0, 180, 2, 0x08 /* Private */, + 30, 0, 181, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int, 3, 4, 5, @@ -141,6 +144,7 @@ static const uint qt_meta_data_IntelliPhotoGui[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -166,16 +170,17 @@ void IntelliPhotoGui::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 11: _t->penColor(); break; case 12: _t->penWidth(); break; case 13: _t->newLayer(); break; - case 14: _t->about(); break; - case 15: _t->onClearedPressed(); break; - case 16: _t->onActivePressed(); break; - case 17: _t->onSetAlpha(); break; - case 18: _t->onMoveUp(); break; - case 19: _t->onMoveDown(); break; - case 20: _t->onMoveLeft(); break; - case 21: _t->onMoveRight(); break; - case 22: _t->onMoveLayerUp(); break; - case 23: _t->onMoveLayerDown(); break; + case 14: _t->deleteLayer(); break; + case 15: _t->about(); break; + case 16: _t->onClearedPressed(); break; + case 17: _t->onActivePressed(); break; + case 18: _t->onSetAlpha(); break; + case 19: _t->onMoveUp(); break; + case 20: _t->onMoveDown(); break; + case 21: _t->onMoveLeft(); break; + case 22: _t->onMoveRight(); break; + case 23: _t->onMoveLayerUp(); break; + case 24: _t->onMoveLayerDown(); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -275,13 +280,13 @@ int IntelliPhotoGui::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 24) + if (_id < 25) qt_static_metacall(this, _c, _id, _a); - _id -= 24; + _id -= 25; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 24) + if (_id < 25) *reinterpret_cast(_a[0]) = -1; - _id -= 24; + _id -= 25; } return _id; } diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.o b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.o index 03a7204..b41120c 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.o and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_IntelliPhotoGui.o differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.cpp b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.cpp index 6c9637c..e438179 100644 --- a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.cpp +++ b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.cpp @@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_PaintingArea_t { - QByteArrayData data[18]; - char stringdata0[155]; + QByteArrayData data[19]; + char stringdata0[173]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -39,23 +39,24 @@ QT_MOC_LITERAL(4, 27, 1), // "g" QT_MOC_LITERAL(5, 29, 1), // "b" QT_MOC_LITERAL(6, 31, 8), // "activate" QT_MOC_LITERAL(7, 40, 1), // "a" -QT_MOC_LITERAL(8, 42, 8), // "setAlpha" -QT_MOC_LITERAL(9, 51, 9), // "getMoveUp" -QT_MOC_LITERAL(10, 61, 11), // "getMoveDown" -QT_MOC_LITERAL(11, 73, 12), // "getMoveRight" -QT_MOC_LITERAL(12, 86, 11), // "getMoveLeft" -QT_MOC_LITERAL(13, 98, 14), // "getMoveLayerUp" -QT_MOC_LITERAL(14, 113, 16), // "getMoveLayerDown" -QT_MOC_LITERAL(15, 130, 5), // "setUp" -QT_MOC_LITERAL(16, 136, 8), // "maxWidth" -QT_MOC_LITERAL(17, 145, 9) // "maxHeight" +QT_MOC_LITERAL(8, 42, 17), // "deleteActiveLayer" +QT_MOC_LITERAL(9, 60, 8), // "setAlpha" +QT_MOC_LITERAL(10, 69, 9), // "getMoveUp" +QT_MOC_LITERAL(11, 79, 11), // "getMoveDown" +QT_MOC_LITERAL(12, 91, 12), // "getMoveRight" +QT_MOC_LITERAL(13, 104, 11), // "getMoveLeft" +QT_MOC_LITERAL(14, 116, 14), // "getMoveLayerUp" +QT_MOC_LITERAL(15, 131, 16), // "getMoveLayerDown" +QT_MOC_LITERAL(16, 148, 5), // "setUp" +QT_MOC_LITERAL(17, 154, 8), // "maxWidth" +QT_MOC_LITERAL(18, 163, 9) // "maxHeight" }, "PaintingArea\0clearImage\0\0r\0g\0b\0activate\0" - "a\0setAlpha\0getMoveUp\0getMoveDown\0" - "getMoveRight\0getMoveLeft\0getMoveLayerUp\0" - "getMoveLayerDown\0setUp\0maxWidth\0" - "maxHeight" + "a\0deleteActiveLayer\0setAlpha\0getMoveUp\0" + "getMoveDown\0getMoveRight\0getMoveLeft\0" + "getMoveLayerUp\0getMoveLayerDown\0setUp\0" + "maxWidth\0maxHeight" }; #undef QT_MOC_LITERAL @@ -65,7 +66,7 @@ static const uint qt_meta_data_PaintingArea[] = { 8, // revision 0, // classname 0, 0, // classinfo - 10, 14, // methods + 11, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -73,20 +74,22 @@ static const uint qt_meta_data_PaintingArea[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 3, 64, 2, 0x0a /* Public */, - 6, 1, 71, 2, 0x0a /* Public */, - 8, 1, 74, 2, 0x0a /* Public */, - 9, 1, 77, 2, 0x0a /* Public */, - 10, 1, 80, 2, 0x0a /* Public */, - 11, 1, 83, 2, 0x0a /* Public */, - 12, 1, 86, 2, 0x0a /* Public */, - 13, 0, 89, 2, 0x0a /* Public */, - 14, 0, 90, 2, 0x0a /* Public */, - 15, 2, 91, 2, 0x0a /* Public */, + 1, 3, 69, 2, 0x0a /* Public */, + 6, 1, 76, 2, 0x0a /* Public */, + 8, 0, 79, 2, 0x0a /* Public */, + 9, 1, 80, 2, 0x0a /* Public */, + 10, 1, 83, 2, 0x0a /* Public */, + 11, 1, 86, 2, 0x0a /* Public */, + 12, 1, 89, 2, 0x0a /* Public */, + 13, 1, 92, 2, 0x0a /* Public */, + 14, 0, 95, 2, 0x0a /* Public */, + 15, 0, 96, 2, 0x0a /* Public */, + 16, 2, 97, 2, 0x0a /* Public */, // slots: parameters QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int, 3, 4, 5, QMetaType::Void, QMetaType::Int, 7, + QMetaType::Void, QMetaType::Void, QMetaType::Int, 7, QMetaType::Void, QMetaType::Int, 7, QMetaType::Void, QMetaType::Int, 7, @@ -94,7 +97,7 @@ static const uint qt_meta_data_PaintingArea[] = { QMetaType::Void, QMetaType::Int, 7, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Int, QMetaType::Int, 16, 17, + QMetaType::Void, QMetaType::Int, QMetaType::Int, 17, 18, 0 // eod }; @@ -107,14 +110,15 @@ void PaintingArea::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id switch (_id) { case 0: _t->clearImage((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3]))); break; case 1: _t->activate((*reinterpret_cast< int(*)>(_a[1]))); break; - case 2: _t->setAlpha((*reinterpret_cast< int(*)>(_a[1]))); break; - case 3: _t->getMoveUp((*reinterpret_cast< int(*)>(_a[1]))); break; - case 4: _t->getMoveDown((*reinterpret_cast< int(*)>(_a[1]))); break; - case 5: _t->getMoveRight((*reinterpret_cast< int(*)>(_a[1]))); break; - case 6: _t->getMoveLeft((*reinterpret_cast< int(*)>(_a[1]))); break; - case 7: _t->getMoveLayerUp(); break; - case 8: _t->getMoveLayerDown(); break; - case 9: _t->setUp((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + case 2: _t->deleteActiveLayer(); break; + case 3: _t->setAlpha((*reinterpret_cast< int(*)>(_a[1]))); break; + case 4: _t->getMoveUp((*reinterpret_cast< int(*)>(_a[1]))); break; + case 5: _t->getMoveDown((*reinterpret_cast< int(*)>(_a[1]))); break; + case 6: _t->getMoveRight((*reinterpret_cast< int(*)>(_a[1]))); break; + case 7: _t->getMoveLeft((*reinterpret_cast< int(*)>(_a[1]))); break; + case 8: _t->getMoveLayerUp(); break; + case 9: _t->getMoveLayerDown(); break; + case 10: _t->setUp((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; default: ; } } @@ -149,13 +153,13 @@ int PaintingArea::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 10) + if (_id < 11) qt_static_metacall(this, _c, _id, _a); - _id -= 10; + _id -= 11; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 10) + if (_id < 11) *reinterpret_cast(_a[0]) = -1; - _id -= 10; + _id -= 11; } return _id; } diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.o b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.o index 135c460..736eaa5 100644 Binary files a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.o and b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/debug/moc_PaintingArea.o differ diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmp2qsmaj b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmp2qsmaj new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmp_8x6f1 b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmp_8x6f1 new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpempc3h b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpempc3h new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpwqcqn3 b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpwqcqn3 new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpxt_h8j b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpxt_h8j new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpy4gaim b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpy4gaim new file mode 100644 index 0000000..e69de29 diff --git a/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpzwcrjl b/src/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/usersmienekappdatalocaltemptmpzwcrjl new file mode 100644 index 0000000..e69de29