fixup samples structure, adjust both to match

Author: Skycoder42

examples/autoupdatergui/SimpleUpdaterGui/SimpleUpdaterGui.pro

@@ -0,0 +1,30 @@
+TEMPLATE = app
+
+QT += core gui widgets autoupdatergui
+CONFIG += C++11
+
+TARGET = SimpleUpdaterGui
+
+SOURCES += \
+	main.cpp \
+	mainwindow.cpp
+
+HEADERS += \
+	mainwindow.h
+
+FORMS += \
+	mainwindow.ui
+
+target.path = $$[QT_INSTALL_EXAMPLES]/autoupdatergui/$$TARGET
+INSTALLS += target
+
+#not found by linker?
+unix:!mac {
+	LIBS += -L$$OUT_PWD/../../../lib #required to make this the first place to search
+	LIBS += -L$$[QT_INSTALL_LIBS] -licudata
+	LIBS += -L$$[QT_INSTALL_LIBS] -licui18n
+	LIBS += -L$$[QT_INSTALL_LIBS] -licuuc
+}
+
+#add lib dir to rpath
+mac: QMAKE_LFLAGS += '-Wl,-rpath,\'$$OUT_PWD/../../../lib\''

examples/autoupdatergui/SimpleUpdaterGui/main.cpp

@@ -0,0 +1,32 @@
+#include "mainwindow.h"
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QLibraryInfo>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+
+	//Translate app
+	QTranslator translator;
+	translator.load(QLocale(),
+					QStringLiteral("qt"),
+					QStringLiteral("_"),
+					QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+	a.installTranslator(&translator);
+
+	//Translate updater
+	QTranslator translatorUpdater;
+	translatorUpdater.load(QLocale(),
+						   QStringLiteral("qtautoupdatergui"),
+						   QStringLiteral("_"),
+						   QStringLiteral("translations"));
+	a.installTranslator(&translatorUpdater);
+
+	//Launch GUI
+	MainWindow w;
+	w.show();
+
+	return a.exec();
+}

examples/autoupdatergui/SimpleUpdaterGui/mainwindow.cpp

@@ -0,0 +1,43 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+	QMainWindow(parent),
+	ui(new Ui::MainWindow),
+	controller(nullptr), //add this
+	updateButton(new QtAutoUpdater::UpdateButton(this)) //and this for the updater
+{
+	ui->setupUi(this);
+
+	updateButton->setVisible(false); //The updateButton is not visible
+	initializeUpdater();	//Initialize the updater
+
+	controller->start(QtAutoUpdater::UpdateController::InfoLevel);	//Search for updates. Display a message if updates found, otherwise do nothing
+
+	//Connect the checkUpdateButton button to the checkUpdate method (starts the update check process)
+	connect(ui->checkUpdateButton, &QAbstractButton::clicked,
+			this, &MainWindow::checkUpdate);
+
+	//Connect the actionCheck_for_updates_2 to the method (starts the update check process)
+	connect(ui->actionCheck_for_updates_2, &QAction::triggered,
+			this, &MainWindow::checkUpdate);
+}
+
+MainWindow::~MainWindow()
+{
+	delete ui;
+}
+
+//Initialize the updater
+void MainWindow::initializeUpdater()
+{
+	controller = new QtAutoUpdater::UpdateController(QStringLiteral("maintenancetool.exe"), qApp);	//Updater app name
+	controller->setDetailedUpdateInfo(true);
+	updateButton->setController(controller);
+}
+
+//Starts update check process
+void MainWindow::checkUpdate()
+{
+	controller->start(QtAutoUpdater::UpdateController::ProgressLevel);	//Check for updates. Displays a progress bar when searching
+}

…updatergui/simpleUpdaterGui/mainwindow.h …updatergui/SimpleUpdaterGui/mainwindow.hexamples/autoupdatergui/simpleUpdaterGui/mainwindow.h renamed to examples/autoupdatergui/SimpleUpdaterGui/mainwindow.h examples/autoupdatergui/simpleUpdaterGui/mainwindow.h renamed to examples/autoupdatergui/SimpleUpdaterGui/mainwindow.h

@@ -3,7 +3,6 @@
 
 #include <QMainWindow>
 #include <QDebug>
-#include <QtAutoUpdaterGui>
 #include <QtAutoUpdaterGui/UpdateController>
 #include <QtAutoUpdaterGui/UpdateButton>
 
@@ -13,20 +12,20 @@ class MainWindow;
 
 class MainWindow : public QMainWindow
 {
-    Q_OBJECT
+	Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
-    ~MainWindow();
+	explicit MainWindow(QWidget *parent = nullptr);
+	~MainWindow();
 
 private:
-    Ui::MainWindow *ui;
-    QtAutoUpdater::UpdateController *controller;
-    QtAutoUpdater::UpdateButton *updateButton;
+	Ui::MainWindow *ui;
+	QtAutoUpdater::UpdateController *controller;
+	QtAutoUpdater::UpdateButton *updateButton;
 
 private slots:
-    void initializeUpdater();
-    void checkUpdate();
+	void initializeUpdater();
+	void checkUpdate();
 };
 
 #endif // MAINWINDOW_H

…pdatergui/simpleUpdaterGui/mainwindow.ui …pdatergui/SimpleUpdaterGui/mainwindow.uiexamples/autoupdatergui/simpleUpdaterGui/mainwindow.ui renamed to examples/autoupdatergui/SimpleUpdaterGui/mainwindow.ui examples/autoupdatergui/simpleUpdaterGui/mainwindow.ui renamed to examples/autoupdatergui/SimpleUpdaterGui/mainwindow.ui

@@ -1,26 +1,21 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-12-23T13:59:22
-#
-#-------------------------------------------------
 TEMPLATE = app
 
-QT       += core gui widgets autoupdatergui
+QT += core gui widgets autoupdatergui
 CONFIG += C++11
 
 TARGET = WidgetsUpdater
 
-SOURCES += main.cpp\
-		mainwindow.cpp
+SOURCES += main.cpp \
+	mainwindow.cpp
 
-HEADERS  += mainwindow.h
+HEADERS += mainwindow.h
 
-FORMS    += mainwindow.ui
+FORMS += mainwindow.ui
 
 RESOURCES += \
 	main_res.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/autoupdatergui/WidgetsUpdater
+target.path = $$[QT_INSTALL_EXAMPLES]/autoupdatergui/$$TARGET
 INSTALLS += target
 
 #not found by linker?

examples/autoupdatergui/WidgetsUpdater/WidgetsUpdater.pro

@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
 
 	QTranslator tr;
 	tr.load(QLocale(),
-			QStringLiteral("QtAutoUpdaterController"),
+			QStringLiteral("qtautoupdatergui"),
 			QStringLiteral("_"),
 			QApplication::applicationDirPath());
 	QApplication::installTranslator(&tr);

examples/autoupdatergui/WidgetsUpdater/main.cpp

@@ -1,3 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += WidgetsUpdater simpleUpdaterGui
+SUBDIRS += \
+	WidgetsUpdater \
+	SimpleUpdaterGui