diff --git a/src/gui/plugin/gui.pro b/src/gui/plugin/gui.pro index 77123fd6..ba4beddc 100644 --- a/src/gui/plugin/gui.pro +++ b/src/gui/plugin/gui.pro @@ -1,14 +1,12 @@ TARGET = plugindownloader TEMPLATE = app SOURCES += src/main.cpp \ - src/Authenticate.cpp \ - src/MainDialog.cpp -HEADERS += src/Arguments.h \ - src/Authenticate.h \ - src/MainDialog.h -FORMS += res/MainDialogBase.ui -RESOURCES += res/Synergy.qrc -RC_FILE = res/win/Synergy.rc + src/MainWindow.cpp \ + src/Authenticate.cpp +HEADERS += src/MainWindow.h \ + src/Arguments.h \ + src/Authenticate.h +FORMS += res/MainWindowBase.ui win32 { Debug:DESTDIR = ../../../bin/Debug Release:DESTDIR = ../../../bin/Release diff --git a/src/gui/plugin/res/MainDialogBase.ui b/src/gui/plugin/res/MainDialogBase.ui deleted file mode 100644 index f658b0ce..00000000 --- a/src/gui/plugin/res/MainDialogBase.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - MainDialog - - - - 0 - 0 - 275 - 129 - - - - Synergy - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 2 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 2 - - - - - - - - - diff --git a/src/gui/plugin/res/MainWindowBase.ui b/src/gui/plugin/res/MainWindowBase.ui new file mode 100644 index 00000000..f4b2b0af --- /dev/null +++ b/src/gui/plugin/res/MainWindowBase.ui @@ -0,0 +1,84 @@ + + + MainWindow + + + + 0 + 0 + 400 + 293 + + + + Synergy Plugin Downloader + + + + + + + true + + + false + + + true + + + + + + + + + Processing, please wait... + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + 0 + 400 + 21 + + + + + + + + diff --git a/src/gui/plugin/res/Synergy.qrc b/src/gui/plugin/res/Synergy.qrc deleted file mode 100644 index 3a88e4e5..00000000 --- a/src/gui/plugin/res/Synergy.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - image/spinning-wheel.gif - icons/256x256/synergy.ico - - diff --git a/src/gui/plugin/res/icons/256x256/synergy.ico b/src/gui/plugin/res/icons/256x256/synergy.ico deleted file mode 100644 index fc2e4146..00000000 Binary files a/src/gui/plugin/res/icons/256x256/synergy.ico and /dev/null differ diff --git a/src/gui/plugin/res/image/spinning-wheel.gif b/src/gui/plugin/res/image/spinning-wheel.gif deleted file mode 100644 index 220f0207..00000000 Binary files a/src/gui/plugin/res/image/spinning-wheel.gif and /dev/null differ diff --git a/src/gui/plugin/res/win/Synergy.rc b/src/gui/plugin/res/win/Synergy.rc deleted file mode 100644 index 62ec63d6..00000000 --- a/src/gui/plugin/res/win/Synergy.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "../icons/256x256/synergy.ico" diff --git a/src/gui/plugin/src/MainDialog.cpp b/src/gui/plugin/src/MainDialog.cpp deleted file mode 100644 index ff4729bf..00000000 --- a/src/gui/plugin/src/MainDialog.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "MainDialog.h" -#include "ui_MainDialogBase.h" - -#include - -MainDialog::MainDialog(Arguments& args, QWidget* parent) : - QDialog(parent) -{ - setupUi(this); - - setFixedSize(size()); - - QMovie *movie = new QMovie(":/res/image/spinning-wheel.gif"); - m_pLabelSpinning->setMovie(movie); - movie->start(); - - m_pLabelInfo->setText(args.email); -} - -MainDialog::~MainDialog() -{ -} - -void MainDialog::changeEvent(QEvent *e) -{ - QDialog::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - retranslateUi(this); - break; - default: - break; - } -} diff --git a/src/gui/plugin/src/MainDialog.h b/src/gui/plugin/src/MainDialog.h deleted file mode 100644 index 997fdfe2..00000000 --- a/src/gui/plugin/src/MainDialog.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MAINDIALOG_H -#define MAINDIALOG_H - -#include "Arguments.h" - -#include "ui_MainDialogBase.h" - -#include - -class MainDialog : public QDialog, public Ui::MainDialog { - Q_OBJECT -public: - MainDialog(Arguments& args, QWidget* parent = 0); - ~MainDialog(); - -protected: - void changeEvent(QEvent *e); -}; - -#endif // MAINDIALOG_H diff --git a/src/gui/plugin/src/MainWindow.cpp b/src/gui/plugin/src/MainWindow.cpp new file mode 100644 index 00000000..5aa2a690 --- /dev/null +++ b/src/gui/plugin/src/MainWindow.cpp @@ -0,0 +1,31 @@ +#include "MainWindow.h" +#include "ui_MainWindowBase.h" + +MainWindow::MainWindow(Arguments& args, QWidget* parent) : + QMainWindow(parent), + m_Arguments(args) +{ + setupUi(this); + appendInfo(m_Arguments.email); +} + +MainWindow::~MainWindow() +{ +} + +void MainWindow::changeEvent(QEvent* e) +{ + QMainWindow::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + retranslateUi(this); + break; + default: + break; + } +} + +void MainWindow::appendInfo(QString& s) +{ + m_pTextEditInfo->append(s); +} diff --git a/src/gui/plugin/src/MainWindow.h b/src/gui/plugin/src/MainWindow.h new file mode 100644 index 00000000..993daded --- /dev/null +++ b/src/gui/plugin/src/MainWindow.h @@ -0,0 +1,26 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include "Arguments.h" + +#include + +#include "ui_MainWindowBase.h" + +class MainWindow : public QMainWindow, public Ui::MainWindow { + Q_OBJECT +public: + MainWindow(Arguments& args, QWidget* parent = 0); + ~MainWindow(); + +protected: + void changeEvent(QEvent* e); + +private: + void appendInfo(QString& s); + +private: + Arguments m_Arguments; +}; + +#endif // MAINWINDOW_H diff --git a/src/gui/plugin/src/main.cpp b/src/gui/plugin/src/main.cpp index ff2af021..2f1ba115 100644 --- a/src/gui/plugin/src/main.cpp +++ b/src/gui/plugin/src/main.cpp @@ -1,27 +1,27 @@ -#include "MainDialog.h" -#include "Arguments.h" - -#include - -void parseArgs(Arguments& args, int argc, char* argv[]) -{ - for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "--email") == 0) { - args.email = argv[++i]; - } - if (strcmp(argv[i], "--password") == 0) { - args.password = argv[++i]; - } - } -} - -int main(int argc, char *argv[]) -{ - Arguments args; - parseArgs(args, argc, argv); - - QApplication a(argc, argv); - MainDialog d(args); - d.show(); - return a.exec(); -} +#include "MainWindow.h" +#include "Arguments.h" + +#include + +void parseArgs(Arguments& args, int argc, char* argv[]) +{ + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "--email") == 0) { + args.email = argv[++i]; + } + if (strcmp(argv[i], "--password") == 0) { + args.password = argv[++i]; + } + } +} + +int main(int argc, char *argv[]) +{ + Arguments args; + parseArgs(args, argc, argv); + + QApplication a(argc, argv); + MainWindow w(args); + w.show(); + return a.exec(); +}