allow any btn

src/imports/mvvmcore/plugins.qmltypes

@@ -126,7 +126,10 @@ Module {
             Parameter { name: "text"; type: "string" }
         }
         Signal { name: "closeRequested" }
-        Signal { name: "canceled" }
+        Signal {
+            name: "canceled"
+            Parameter { name: "btn"; type: "MessageConfig::StandardButton" }
+        }
         Signal { name: "closed" }
         Method { name: "close" }
         Method {
@@ -157,7 +160,10 @@ Module {
             name: "setProgress"
             Parameter { name: "progressPercent"; type: "double" }
         }
-        Method { name: "requestCancel" }
+        Method {
+            name: "requestCancel"
+            Parameter { name: "btn"; type: "MessageConfig::StandardButton" }
+        }
         Method { name: "notifyClosed" }
     }
     Component {

src/mvvmcore/message.cpp

@@ -329,9 +329,9 @@ int ProgressControl::progress() const
 	return d->progress;
 }
 
-void ProgressControl::requestCancel()
+void ProgressControl::requestCancel(MessageConfig::StandardButton btn)
 {
-	emit canceled({});
+	emit canceled(btn, {});
 }
 
 void ProgressControl::notifyClosed()

src/mvvmcore/message.h

@@ -263,7 +263,7 @@ public:
 	int maximum() const;
 	int progress() const;
 
-	Q_INVOKABLE void requestCancel();
+	Q_INVOKABLE void requestCancel(MessageConfig::StandardButton btn);
 	Q_INVOKABLE void notifyClosed();
 
 public Q_SLOTS:
@@ -287,7 +287,7 @@ Q_SIGNALS:
 	void changeLabel(const QString &text, QPrivateSignal);
 	void closeRequested(QPrivateSignal);
 
-	void canceled(QPrivateSignal);
+	void canceled(MessageConfig::StandardButton btn, QPrivateSignal);
 	void closed(QPrivateSignal);
 
 private:

src/mvvmwidgets/progressdialog.cpp

@@ -42,18 +42,20 @@ ProgressDialog::ProgressDialog(const MessageConfig &config, QPointer<MessageResu
 	layout->addWidget(_progress);
 
 	//add the cancel button, in case it was requested
-	if(config.buttons().testFlag(MessageConfig::Cancel)) {
+	if(config.buttons() != MessageConfig::NoButton) {
 		_btnBox = new QDialogButtonBox{this};
-		_btnBox->setStandardButtons(QDialogButtonBox::Cancel); //is ok, as the buttons are the same
-		auto btnTexts = config.buttonTexts();
-		if(btnTexts.contains(MessageConfig::Cancel))
-			_btnBox->button(QDialogButtonBox::Cancel)->setText(btnTexts.value(MessageConfig::Cancel));
+		_btnBox->setStandardButtons(static_cast<QDialogButtonBox::StandardButtons>(static_cast<int>(config.buttons()))); //is ok, as the buttons are the same
+		auto btns = config.buttonTexts();
+		for(auto it = btns.constBegin(); it != btns.constEnd(); it++){
+			auto sBtn = static_cast<QDialogButtonBox::StandardButton>(it.key());
+			Q_ASSERT(_btnBox->standardButtons().testFlag(sBtn)); //Must be the case now because of the change in MessageConfig
+			_btnBox->button(sBtn)->setText(it.value());
+		}
 		layout->addWidget(_btnBox);
 		// connect the box
 		connect(_btnBox, &QDialogButtonBox::clicked,
 				this, [this](QAbstractButton *btn) {
-			if(_btnBox->standardButton(btn) == QDialogButtonBox::Cancel)
-				tryCancel();
+			tryCancel(_btnBox->standardButton(btn));
 		});
 	}
 
@@ -75,9 +77,6 @@ ProgressDialog::ProgressDialog(const MessageConfig &config, QPointer<MessageResu
 				this, &ProgressDialog::setIndetem);
 	}
 
-	connect(this, &ProgressDialog::canceled,
-			_control, &ProgressControl::requestCancel);
-
 	adjustSize();
 	DialogMaster::masterDialog(this, true, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
 }
@@ -87,29 +86,25 @@ void ProgressDialog::done(int code)
 	QDialog::done(code);
 	if(_control)
 		_control->notifyClosed();
-	if(_result) {
-		if(_wasCanceled)
-			_result->complete(MessageConfig::Cancel);
-		else
-			_result->complete(MessageConfig::Close);
-	}
+	if(_result)
+		_result->complete(_cancelAction);
 }
 
 void ProgressDialog::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
-	tryCancel();
+	tryCancel(QDialogButtonBox::Cancel);
 }
 
-void ProgressDialog::tryCancel()
+void ProgressDialog::tryCancel(QDialogButtonBox::StandardButton btn)
 {
-	if(!_wasCanceled && _btnBox) {
-		_wasCanceled = true;
-		_btnBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
+	if(_cancelAction == MessageConfig::NoButton && _btnBox) {
+		_cancelAction = static_cast<MessageConfig::StandardButton>(btn);
+		_btnBox->setEnabled(false);
 		if(_control)
-			_control->requestCancel();
+			_control->requestCancel(_cancelAction);
 		else
-			done(QDialogButtonBox::Cancel);
+			done(btn);
 	}
 }
 

src/mvvmwidgets/progressdialog_p.h

@@ -27,14 +27,11 @@ public:
 public Q_SLOTS:
 	void done(int code) override;
 
-Q_SIGNALS:
-	void canceled();
-
 protected:
 	void closeEvent(QCloseEvent *event) override;
 
 private Q_SLOTS:
-	void tryCancel();
+	void tryCancel(QDialogButtonBox::StandardButton btn);
 
 	void updateLabel(const QString &text);
 	void setIndetem(bool indetem);
@@ -49,7 +46,7 @@ private:
 	QLabel *_label;
 	QProgressBar *_progress;
 	QDialogButtonBox *_btnBox = nullptr;
-	bool _wasCanceled = false;
+	MessageConfig::StandardButton _cancelAction = MessageConfig::NoButton;
 };
 
 }