diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
index 3a40f7a..bc422d1 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
@@ -105,7 +105,7 @@
-
+
@@ -192,7 +192,7 @@
-
+
diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
index b24135f..f7e8d97 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
@@ -219,7 +219,7 @@
Source Files
-
+
Source Files
@@ -260,7 +260,7 @@
Header Files
-
+
Header Files
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
similarity index 80%
rename from ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp
rename to ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
index dfa7e5a..e1f3129 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp
+++ b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
@@ -1,5 +1,6 @@
#include "LayerStyleDialog.h"
#include
+#include
#include
#include
#include
@@ -19,8 +20,9 @@ LayerStyleDialog::LayerStyleDialog(
{
this->layerStyle = existedStyle;
- QWidget* styleWidget = layerStyle->getInputWidget();
- styleWidget->setParent(this);
+ this->styleContainer = nullptr;
+ this->styleWidget = layerStyle->getInputWidget();
+ this->styleWidget->setParent(this);
dialogLayout->addWidget(styleWidget);
// do something
}
@@ -59,6 +61,10 @@ LayerStyleDialog::LayerStyleDialog(
this, &LayerStyleDialog::onStyleTypeSelectorChanged);
}
}
+ QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &LayerStyleDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &LayerStyleDialog::reject);
+ dialogLayout->addWidget(buttonBox);
}
void LayerStyleDialog::onStyleTypeSelectorChanged(int index)
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.h b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.h
similarity index 100%
rename from ArchitectureColoredPainting/src/Editor/LayerStyleDialog.h
rename to ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.h
diff --git a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
index 21bffff..0e86147 100644
--- a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
+++ b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
@@ -1,5 +1,5 @@
#include "InfoDisplayWidget.h"
-#include "LayerStyleDialog.h"
+#include "./EditorWidgetComponent/LayerStyleDialog.h"
#include
#include
#include
@@ -191,7 +191,7 @@ void InfoDisplayWidget::generateLayerForm()
removeButton->setFixedSize(QSize(20, 20));
connect(detailButton, &QPushButton::clicked, this,
- [=]()
+ [this, styleIterator]()
{
LayerStyleDialog* dialog = new LayerStyleDialog(nullptr, *styleIterator);
dialog->exec();