diff --git a/src/gui/Src/Gui/AboutDialog.cpp b/src/gui/Src/Gui/AboutDialog.cpp index 3102ecf7..b4ce2567 100644 --- a/src/gui/Src/Gui/AboutDialog.cpp +++ b/src/gui/Src/Gui/AboutDialog.cpp @@ -5,7 +5,8 @@ #include #include -AboutDialog::AboutDialog(QWidget* parent) : +AboutDialog::AboutDialog(UpdateChecker* updateChecker, QWidget* parent) : + mUpdateChecker(updateChecker), QDialog(parent), ui(new Ui::AboutDialog) { @@ -15,9 +16,7 @@ AboutDialog::AboutDialog(QWidget* parent) : setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint | Qt::MSWindowsFixedSizeDialogHint); ui->lblVersion->setText(ToDateString(GetCompileDate()) + ", " __TIME__); - - // Create updatechecker - mUpdateChecker = new UpdateChecker(this); + ui->lblQrImage->installEventFilter(this); } AboutDialog::~AboutDialog() @@ -25,6 +24,13 @@ AboutDialog::~AboutDialog() delete ui; } +bool AboutDialog::eventFilter(QObject* obj, QEvent* event) +{ + if(obj == ui->lblQrImage && event->type() == QEvent::MouseButtonPress) + QDesktopServices::openUrl(QUrl("https://blockchain.info/address/1GuXgtCrLk4aYgivAT7xAi8zVHWk5CkEoY")); + return false; +} + void AboutDialog::on_btnCheckUpdates_clicked() { mUpdateChecker->checkForUpdates(); diff --git a/src/gui/Src/Gui/AboutDialog.h b/src/gui/Src/Gui/AboutDialog.h index f0fc9ae6..158f4d56 100644 --- a/src/gui/Src/Gui/AboutDialog.h +++ b/src/gui/Src/Gui/AboutDialog.h @@ -15,9 +15,12 @@ class AboutDialog : public QDialog Q_OBJECT public: - explicit AboutDialog(QWidget* parent = 0); + explicit AboutDialog(UpdateChecker* updateChecker, QWidget* parent = 0); ~AboutDialog(); +protected: + bool eventFilter(QObject* obj, QEvent* event) override; + private slots: void on_btnCheckUpdates_clicked(); diff --git a/src/gui/Src/Gui/AboutDialog.ui b/src/gui/Src/Gui/AboutDialog.ui index d0d7dd15..78a3f496 100644 --- a/src/gui/Src/Gui/AboutDialog.ui +++ b/src/gui/Src/Gui/AboutDialog.ui @@ -243,7 +243,7 @@ - ArrowCursor + PointingHandCursor diff --git a/src/gui/Src/Gui/MainWindow.cpp b/src/gui/Src/Gui/MainWindow.cpp index 095c31db..c566d078 100644 --- a/src/gui/Src/Gui/MainWindow.cpp +++ b/src/gui/Src/Gui/MainWindow.cpp @@ -51,6 +51,7 @@ #include "CPUArgumentWidget.h" #include "MRUList.h" #include "AboutDialog.h" +#include "UpdateChecker.h" QString MainWindow::windowTitle = ""; @@ -356,8 +357,8 @@ MainWindow::MainWindow(QWidget* parent) mSimpleTraceDialog = new SimpleTraceDialog(this); - // About dialog - mAboutDialog = new AboutDialog(this); + // Update checker + mUpdateChecker = new UpdateChecker(this); // Setup close thread and dialog bCanClose = false; @@ -812,7 +813,8 @@ void MainWindow::displayScriptWidget() void MainWindow::displayAboutWidget() { - mAboutDialog->exec(); + AboutDialog dialog(mUpdateChecker, this); + dialog.exec(); } void MainWindow::openFileSlot() @@ -2059,3 +2061,8 @@ void MainWindow::on_actionPlugins_triggered() { QDesktopServices::openUrl(QUrl("http://plugins.x64dbg.com")); } + +void MainWindow::on_actionCheckUpdates_triggered() +{ + mUpdateChecker->checkForUpdates(); +} diff --git a/src/gui/Src/Gui/MainWindow.h b/src/gui/Src/Gui/MainWindow.h index 464a9f18..383a0f19 100644 --- a/src/gui/Src/Gui/MainWindow.h +++ b/src/gui/Src/Gui/MainWindow.h @@ -32,7 +32,7 @@ class SettingsDialog; class DisassemblerGraphView; class SimpleTraceDialog; class MRUList; -class AboutDialog; +class UpdateChecker; namespace Ui { @@ -177,7 +177,7 @@ private: NotesManager* mNotesManager; DisassemblerGraphView* mGraphView; SimpleTraceDialog* mSimpleTraceDialog; - AboutDialog* mAboutDialog; + UpdateChecker* mUpdateChecker; DebugStatusLabel* mStatusLabel; LogStatusLabel* mLastLogLabel; @@ -274,6 +274,7 @@ private slots: void on_actionExportdatabase_triggered(); void on_actionRestartAdmin_triggered(); void on_actionPlugins_triggered(); + void on_actionCheckUpdates_triggered(); }; #endif // MAINWINDOW_H diff --git a/src/gui/Src/Gui/MainWindow.ui b/src/gui/Src/Gui/MainWindow.ui index 97cc7e20..1949547b 100644 --- a/src/gui/Src/Gui/MainWindow.ui +++ b/src/gui/Src/Gui/MainWindow.ui @@ -143,6 +143,7 @@ &Help + @@ -215,21 +216,12 @@ + + + - - - - - - - - - - - - @@ -237,18 +229,13 @@ + - - - - - -