fixed some todos, made updater window changable

Author: Skycoder42

AutoUpdater/updater.cpp

@@ -3,8 +3,14 @@
 #include "updatescheduler.h"
 using namespace QtAutoUpdater;
 
+#ifdef Q_OS_OSX
+#define TOOL_PATH QStringLiteral("../../maintenancetool")//TODO test if ok...
+#else
+#define TOOL_PATH QStringLiteral("./maintenancetool")
+#endif
+
 Updater::Updater(QObject *parent) :
-	Updater(QStringLiteral("./maintenancetool"), parent)//TODO path on mac...
+	Updater(TOOL_PATH, parent)
 {}
 
 Updater::Updater(const QString &maintenanceToolPath, QObject *parent) :

AutoUpdater/updater_p.cpp

@@ -104,7 +104,6 @@ bool UpdaterPrivate::startUpdateCheck()
 		this->lastErrorCode = EXIT_SUCCESS;
 		this->lastErrorLog.clear();
 
-		//TODO change on mac
 		QFileInfo toolInfo(getWorkingDir(QCoreApplication::applicationDirPath()), this->toolPath);
 		this->mainProcess = new QProcess(this);
 		this->mainProcess->setProgram(toolInfo.absoluteFilePath());
@@ -252,7 +251,6 @@ void UpdaterPrivate::taskDone(int taskID)
 void UpdaterPrivate::appAboutToExit()
 {
 	if(this->runOnExit) {
-		//TODO change on mac
 		QFileInfo toolInfo(getWorkingDir(QCoreApplication::applicationDirPath()), this->toolPath);
 		bool ok = false;
 		if(this->adminAuth && !this->adminAuth->hasAdminRights()) {

AutoUpdaterWidgets/updatecontroller.cpp

@@ -68,6 +68,19 @@ bool UpdateController::isRunning() const
 	return d->running;
 }
 
+QWidget *UpdateController::parentWindow() const
+{
+	const Q_D(UpdateController);
+	return d->window;
+}
+
+void UpdateController::setParentWindow(QWidget *parentWindow)
+{
+	Q_D(UpdateController);
+	d->window = parentWindow;
+	d->infoDialog->setNewParent(parentWindow);
+}
+
 bool UpdateController::runAsAdmin() const
 {
 	const Q_D(UpdateController);
@@ -307,8 +320,12 @@ UpdateControllerPrivate::UpdateControllerPrivate(UpdateController *q_ptr, const
 
 UpdateControllerPrivate::~UpdateControllerPrivate()
 {
+	if(this->running) {
+		qWarning("UpdaterController destroyed while still running! "
+				 "This may crash your application!");
+	}
+
+	this->infoDialog->deleteLater();
 	for(int taskID : this->updateTasks.keys())
 		UpdateScheduler::instance()->cancelTask(taskID);
-
-	delete this->mainUpdater;
 }

AutoUpdaterWidgets/updatecontroller.dox

@@ -21,6 +21,10 @@
 @image html ./doc/images/win/action.png "Update action inside a menu and a toolbar"<br>
 
 ## Mac - OsX 10.11
+The following pictures show the controller with a parent windows. Thus, all dialogs
+are shown as "sheets" to that window. If you create the UpdateController without a widget,
+they will show as normal toplevel windows instead.
+
 #### The Updater Elements
 @image html ./doc/images/mac/dialog_ask.png "Ask Dialog"<br>
 @image html ./doc/images/mac/dialog_progress.png "Progress Dialog"<br>

AutoUpdaterWidgets/updatecontroller.h

@@ -20,6 +20,8 @@ namespace QtAutoUpdater
 		Q_PROPERTY(QString maintenanceToolPath READ maintenanceToolPath CONSTANT)
 		//! Specifies whether the controller is currently active or not
 		Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
+		//! Holds the window to be used as parent for all dialogs
+		Q_PROPERTY(QWidget* parentWindow READ parentWindow WRITE setParentWindow)
 		//! Specifies whether the controller should run the updater as admin or not
 		Q_PROPERTY(bool runAsAdmin READ runAsAdmin WRITE setRunAsAdmin)
 		//! Holds the arguments to invoke the updater with
@@ -59,6 +61,10 @@ namespace QtAutoUpdater
 		DisplayLevel currentDisplayLevel() const;
 		//! READ-Accessor for UpdateController::running
 		bool isRunning() const;
+		//! READ-Accessor for UpdateController::parentWindow
+		QWidget* parentWindow() const;
+		//! WRITE-Accessor for UpdateController::parentWindow
+		void setParentWindow(QWidget* parentWindow);
 		//! READ-Accessor for UpdateController::runAsAdmin
 		bool runAsAdmin() const;
 		//! WRITE-Accessor for UpdateController::runAsAdmin

AutoUpdaterWidgets/updateinfodialog.cpp

@@ -34,6 +34,15 @@ UpdateInfoDialog::~UpdateInfoDialog()
 	delete ui;
 }
 
+void UpdateInfoDialog::setNewParent(QWidget *parent)
+{
+	this->setParent(parent);
+	if(parent)
+		this->setWindowModality(Qt::WindowModal);
+	else
+		this->setWindowModality(Qt::ApplicationModal);
+}
+
 UpdateInfoDialog::DialogResult UpdateInfoDialog::showUpdateInfo(QList<Updater::UpdateInfo> updates, bool &runAsAdmin, bool editable)
 {
 	this->ui->headerLabel->setText(tr("Updates for %1 are available!")

AutoUpdaterWidgets/updateinfodialog.h

@@ -24,6 +24,8 @@ namespace QtAutoUpdater
 		explicit UpdateInfoDialog(QWidget *parent = 0);
 		~UpdateInfoDialog();
 
+		void setNewParent(QWidget *parent);
+
 		DialogResult showUpdateInfo(QList<Updater::UpdateInfo> updates, bool &runAsAdmin, bool editable);
 
 	private slots:

Tests/UpdaterTest/tst_updatertest.cpp

@@ -91,7 +91,7 @@ void UpdaterTest::testUpdaterInitState()
 #if defined(Q_OS_WIN32)
 	QCOMPARE(this->updater->maintenanceToolPath(), QStringLiteral("./maintenancetool.exe"));
 #elif defined(Q_OS_OSX)
-	QCOMPARE(this->updater->maintenanceToolPath(), QStringLiteral("./maintenancetool.app/Contents/MacOS/maintenancetool"));
+	QCOMPARE(this->updater->maintenanceToolPath(), QStringLiteral("../../maintenancetool.app/Contents/MacOS/maintenancetool"));
 #elif defined(Q_OS_UNIX)
     QCOMPARE(this->updater->maintenanceToolPath(), QStringLiteral("./maintenancetool"));
 #endif

Tests/WidgetsTest/mainwindow.cpp

@@ -15,14 +15,20 @@ MainWindow::MainWindow(QWidget *parent) :
 
 	QSettings settings("./set.ini", QSettings::IniFormat);
 	this->ui->maintenanceToolLineEdit->setText(settings.value("path").toString());
+	this->ui->hasParentWindowCheckBox->setChecked(settings.value("hasParent", true).toBool());
 	this->ui->displayLevelComboBox->setCurrentIndex((QtAutoUpdater::UpdateController::DisplayLevel)settings.value("level", QtAutoUpdater::UpdateController::ProgressLevel).toInt());
+	this->ui->adminCheckBox->setChecked(settings.value("admin", true).toBool());
+	this->ui->userChangecheckBox->setChecked(settings.value("adminChangable", true).toBool());
 }
 
 MainWindow::~MainWindow()
 {
 	QSettings settings("./set.ini", QSettings::IniFormat);
 	settings.setValue("path", this->ui->maintenanceToolLineEdit->text());
+	settings.setValue("hasParent", this->ui->hasParentWindowCheckBox->isChecked());
 	settings.setValue("level", this->ui->displayLevelComboBox->currentIndex());
+	settings.setValue("admin", this->ui->adminCheckBox->isChecked());
+	settings.setValue("adminChangable", this->ui->userChangecheckBox->isChecked());
 	delete ui;
 }
 
@@ -68,7 +74,8 @@ void MainWindow::on_cancelButton_clicked()
 void MainWindow::on_activeBox_toggled(bool checked)
 {
 	if(checked) {
-		this->controller = new QtAutoUpdater::UpdateController(this->ui->maintenanceToolLineEdit->text(), this);
+		this->controller = new QtAutoUpdater::UpdateController(this->ui->maintenanceToolLineEdit->text(),
+															   this->ui->hasParentWindowCheckBox->isChecked() ? this : NULL);
 		this->ui->menuHelp->addAction(this->controller->getUpdateAction());
 		this->ui->mainToolBar->addAction(this->controller->getUpdateAction());
 		connect(this->controller, &QtAutoUpdater::UpdateController::runningChanged, this, [this](bool running){
@@ -81,3 +88,9 @@ void MainWindow::on_activeBox_toggled(bool checked)
 		this->statusBar()->showMessage("not running");
 	}
 }
+
+void MainWindow::on_hasParentWindowCheckBox_clicked(bool checked)
+{
+	if(this->controller)
+		this->controller->setParentWindow(checked ? this : NULL);
+}

Tests/WidgetsTest/mainwindow.h

@@ -22,6 +22,8 @@ private slots:
 	void on_cancelButton_clicked();
 	void on_activeBox_toggled(bool checked);
 
+	void on_hasParentWindowCheckBox_clicked(bool checked);
+
 private:
 	Ui::MainWindow *ui;
 	QtAutoUpdater::UpdateController *controller;