diff --git a/src/gui/plugin/gui.pro b/src/gui/plugin/gui.pro index ba4beddc..77123fd6 100644 --- a/src/gui/plugin/gui.pro +++ b/src/gui/plugin/gui.pro @@ -1,12 +1,14 @@ TARGET = plugindownloader TEMPLATE = app SOURCES += src/main.cpp \ - src/MainWindow.cpp \ - src/Authenticate.cpp -HEADERS += src/MainWindow.h \ - src/Arguments.h \ - src/Authenticate.h -FORMS += res/MainWindowBase.ui + 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 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 new file mode 100644 index 00000000..f658b0ce --- /dev/null +++ b/src/gui/plugin/res/MainDialogBase.ui @@ -0,0 +1,127 @@ + + + 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 deleted file mode 100644 index f4b2b0af..00000000 --- a/src/gui/plugin/res/MainWindowBase.ui +++ /dev/null @@ -1,84 +0,0 @@ - - - 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 new file mode 100644 index 00000000..3a88e4e5 --- /dev/null +++ b/src/gui/plugin/res/Synergy.qrc @@ -0,0 +1,6 @@ + + + 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 new file mode 100644 index 00000000..fc2e4146 Binary files /dev/null and b/src/gui/plugin/res/icons/256x256/synergy.ico differ diff --git a/src/gui/plugin/res/image/spinning-wheel.gif b/src/gui/plugin/res/image/spinning-wheel.gif new file mode 100644 index 00000000..220f0207 Binary files /dev/null and b/src/gui/plugin/res/image/spinning-wheel.gif differ diff --git a/src/gui/plugin/res/win/Synergy.rc b/src/gui/plugin/res/win/Synergy.rc new file mode 100644 index 00000000..62ec63d6 --- /dev/null +++ b/src/gui/plugin/res/win/Synergy.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "../icons/256x256/synergy.ico" diff --git a/src/gui/plugin/src/MainDialog.cpp b/src/gui/plugin/src/MainDialog.cpp new file mode 100644 index 00000000..ff4729bf --- /dev/null +++ b/src/gui/plugin/src/MainDialog.cpp @@ -0,0 +1,34 @@ +#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 new file mode 100644 index 00000000..997fdfe2 --- /dev/null +++ b/src/gui/plugin/src/MainDialog.h @@ -0,0 +1,20 @@ +#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 deleted file mode 100644 index 5aa2a690..00000000 --- a/src/gui/plugin/src/MainWindow.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#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 deleted file mode 100644 index 993daded..00000000 --- a/src/gui/plugin/src/MainWindow.h +++ /dev/null @@ -1,26 +0,0 @@ -#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 2f1ba115..ff2af021 100644 --- a/src/gui/plugin/src/main.cpp +++ b/src/gui/plugin/src/main.cpp @@ -1,27 +1,27 @@ -#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(); -} +#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(); +}