From b8248630c2a607d331bef7326c93ec8607a92090 Mon Sep 17 00:00:00 2001 From: mrexodia Date: Tue, 27 Jun 2017 03:13:06 +0200 Subject: [PATCH] GUI: updated AboutDialog --- src/gui/Src/Gui/AboutDialog.cpp | 92 ++++++++-------- src/gui/Src/Gui/AboutDialog.h | 63 +++++------ src/gui/Src/Gui/AboutDialog.ui | 182 +++++++++++++++----------------- src/gui/Src/Gui/MainWindow.h | 2 +- src/gui/images/donation_qr.png | Bin 2483 -> 0 bytes src/gui/images/donation_qr.svg | 4 + src/gui/resource.qrc | 2 +- 7 files changed, 167 insertions(+), 178 deletions(-) delete mode 100644 src/gui/images/donation_qr.png create mode 100644 src/gui/images/donation_qr.svg diff --git a/src/gui/Src/Gui/AboutDialog.cpp b/src/gui/Src/Gui/AboutDialog.cpp index 9864a60b..4146ecb5 100644 --- a/src/gui/Src/Gui/AboutDialog.cpp +++ b/src/gui/Src/Gui/AboutDialog.cpp @@ -1,46 +1,46 @@ -#include "AboutDialog.h" -#include "UpdateChecker.h" -#include "ui_AboutDialog.h" -#include -#include -#include - -AboutDialog::AboutDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AboutDialog) -{ - ui->setupUi(this); - //set window flags - setModal(true); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint | Qt::MSWindowsFixedSizeDialogHint); - - ui->lblVersion->setText(ToDateString(GetCompileDate()) + ", " __TIME__); - - // Create updatechecker - mUpdateChecker = new UpdateChecker(this); -} - -AboutDialog::~AboutDialog() -{ - delete ui; -} - -void AboutDialog::on_lblWebsite_linkActivated(const QString &link) -{ - QDesktopServices::openUrl(QUrl(link)); -} - -void AboutDialog::on_lblVersion_7_linkActivated(const QString &link) -{ - QDesktopServices::openUrl(QUrl(link)); -} - -void AboutDialog::on_lblAbout_2_linkActivated(const QString &link) -{ - QDesktopServices::openUrl(QUrl(link)); -} - -void AboutDialog::on_btnCheckUpdates_clicked() -{ - mUpdateChecker->checkForUpdates(); -} +#include "AboutDialog.h" +#include "UpdateChecker.h" +#include "ui_AboutDialog.h" +#include +#include +#include + +AboutDialog::AboutDialog(QWidget* parent) : + QDialog(parent), + ui(new Ui::AboutDialog) +{ + ui->setupUi(this); + //set window flags + setModal(true); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint | Qt::MSWindowsFixedSizeDialogHint); + + ui->lblVersion->setText(ToDateString(GetCompileDate()) + ", " __TIME__); + + // Create updatechecker + mUpdateChecker = new UpdateChecker(this); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} + +void AboutDialog::on_lblWebsite_linkActivated(const QString & link) +{ + QDesktopServices::openUrl(QUrl(link)); +} + +void AboutDialog::on_lblVersion_7_linkActivated(const QString & link) +{ + QDesktopServices::openUrl(QUrl(link)); +} + +void AboutDialog::on_lblAbout_2_linkActivated(const QString & link) +{ + QDesktopServices::openUrl(QUrl(link)); +} + +void AboutDialog::on_btnCheckUpdates_clicked() +{ + mUpdateChecker->checkForUpdates(); +} diff --git a/src/gui/Src/Gui/AboutDialog.h b/src/gui/Src/Gui/AboutDialog.h index 8c4943f1..eee075fa 100644 --- a/src/gui/Src/Gui/AboutDialog.h +++ b/src/gui/Src/Gui/AboutDialog.h @@ -1,31 +1,32 @@ -#ifndef ABOUTDIALOG_H -#define ABOUTDIALOG_H - -#include - -class UpdateChecker; - -namespace Ui { -class AboutDialog; -} - -class AboutDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AboutDialog(QWidget *parent = 0); - ~AboutDialog(); - -private slots: - void on_lblWebsite_linkActivated(const QString &link); - void on_lblVersion_7_linkActivated(const QString &link); - void on_btnCheckUpdates_clicked(); - void on_lblAbout_2_linkActivated(const QString &link); - -private: - Ui::AboutDialog *ui; - UpdateChecker* mUpdateChecker; -}; - -#endif // ABOUTDIALOG_H +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include + +class UpdateChecker; + +namespace Ui +{ + class AboutDialog; +} + +class AboutDialog : public QDialog +{ + Q_OBJECT + +public: + explicit AboutDialog(QWidget* parent = 0); + ~AboutDialog(); + +private slots: + void on_lblWebsite_linkActivated(const QString & link); + void on_lblVersion_7_linkActivated(const QString & link); + void on_btnCheckUpdates_clicked(); + void on_lblAbout_2_linkActivated(const QString & link); + +private: + Ui::AboutDialog* ui; + UpdateChecker* mUpdateChecker; +}; + +#endif // ABOUTDIALOG_H diff --git a/src/gui/Src/Gui/AboutDialog.ui b/src/gui/Src/Gui/AboutDialog.ui index cc684936..2ec2c92a 100644 --- a/src/gui/Src/Gui/AboutDialog.ui +++ b/src/gui/Src/Gui/AboutDialog.ui @@ -6,8 +6,8 @@ 0 0 - 326 - 384 + 321 + 321 @@ -20,10 +20,10 @@ - 48 - 30 - 81 - 81 + 40 + 17 + 128 + 128 @@ -39,8 +39,8 @@ - 158 - 47 + 180 + 27 101 16 @@ -55,23 +55,23 @@ Qt::ImhUrlCharactersOnly - <html><head/><body><p><a href="http://x64dbg.com"><span style=" text-decoration: underline; color:#0000ff;">http://x64dbg.com</span></a></p></body></html> + <a href="http://x64dbg.com">http://x64dbg.com</a> Qt::RichText - false + true - Qt::TextBrowserInteraction + Qt::LinksAccessibleByMouse - 158 - 30 + 180 + 10 101 16 @@ -92,8 +92,8 @@ - 158 - 71 + 180 + 51 101 16 @@ -105,7 +105,7 @@ Qt::ImhUrlCharactersOnly - Version + Version: true @@ -114,8 +114,8 @@ - 158 - 88 + 180 + 68 141 16 @@ -132,13 +132,16 @@ true + + Qt::NoTextInteraction + - 46 - 126 - 241 + 0 + 152 + 321 20 @@ -151,6 +154,9 @@ An open-source x64/x32 debugger for windows. + + Qt::AlignCenter + true @@ -159,7 +165,7 @@ 100 - 164 + 185 121 28 @@ -178,7 +184,7 @@ 21 - 276 + 256 201 41 @@ -190,7 +196,10 @@ Qt::ImhUrlCharactersOnly - <html><head/><body><p>Consider donating using bitcoins using the following QR Code or just through the address: </p></body></html> + Please consider donating using the Bitcoin address on the right or by going to <a href="http://donate.x64dbg.com">donate.x64dbg.com</a>. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true @@ -198,13 +207,16 @@ true + + Qt::LinksAccessibleByMouse + 20 - 256 - 101 + 236 + 201 16 @@ -215,75 +227,19 @@ Qt::ImhUrlCharactersOnly - <html><head/><body><p><span style=" font-size:11pt;">Donations:</span></p></body></html> + <h3>Donations</h3> true - - - - 22 - 336 - 211 - 31 - - - - - - - Qt::ImhUrlCharactersOnly - - - <html><head/><body><p>You can also donate through the following link:</p></body></html> - - - true - - - true - - - - - - 45 - 350 - 101 - 16 - - - - PointingHandCursor - - - - - - Qt::ImhUrlCharactersOnly - - - <html><head/><body><p><a href="http://donate.x64dbg.com"><span style="text-decoration: none;">donate.x64dbg.com</span></a></p></body></html> - - - true - - - false - - - Qt::TextBrowserInteraction - - - 237 - 266 - 71 - 71 + 230 + 230 + 81 + 81 @@ -296,7 +252,7 @@ Qt::RichText - :/icons/images/donation_qr.png + :/icons/images/donation_qr.svg true @@ -305,18 +261,15 @@ false - + - 20 - 314 - 201 - 20 + 180 + 92 + 101 + 16 - - IBeamCursor - @@ -324,13 +277,44 @@ Qt::ImhUrlCharactersOnly - <html><head/><body><p><a href="https://blockchain.info/address/1GuXgtCrLk4aYgivAT7xAi8zVHWk5CkEoY"><span style="text-decoration: none;">1GuXgtCrLk4aYgivAT7xAi8zVHWk5CkEoY</span></a></p></body></html> + Icons: - false + true + + + + + + 180 + 110 + 141 + 31 + + + + PointingHandCursor + + + + + + Qt::ImhUrlCharactersOnly + + + <html><head/><body><p><a href="http://p.yusukekamiyamane.com"><span style=" text-decoration: underline; color:#0000ff;">Yusuke Kamiyamane</span></a><br/><a href="https://github.com/mrfearless"><span style=" text-decoration: underline; color:#0000ff;">mrfearless</span></a></p></body></html> + + + Qt::RichText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true - Qt::TextBrowserInteraction + Qt::LinksAccessibleByMouse diff --git a/src/gui/Src/Gui/MainWindow.h b/src/gui/Src/Gui/MainWindow.h index 88620b5a..464a9f18 100644 --- a/src/gui/Src/Gui/MainWindow.h +++ b/src/gui/Src/Gui/MainWindow.h @@ -177,7 +177,7 @@ private: NotesManager* mNotesManager; DisassemblerGraphView* mGraphView; SimpleTraceDialog* mSimpleTraceDialog; - AboutDialog *mAboutDialog; + AboutDialog* mAboutDialog; DebugStatusLabel* mStatusLabel; LogStatusLabel* mLastLogLabel; diff --git a/src/gui/images/donation_qr.png b/src/gui/images/donation_qr.png deleted file mode 100644 index db4a6d66ea0ad6666394604d14d8a9b63bc4b2c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2483 zcmcgu>rY!{7(X~=G656kOu)hXFhh`lrosTv$_8Np475s(w~mVfLy)#?*cN)Bb>5yoi?ZHddmv5CMoLJ#B6Q{t3HV6EC(E@$-M8mO$Hhpo^;+tYgb7o2|Dhc|ED%aiAM ze$Vs!z3=z$uu2jRBp(0(Afc?ZxDo(j`Xb}mSZe23>^F7P6w_8&QUr{c4sTG4ryC0^ z3IX7j>bc-2&rs{Q*3ysK03h+V$cVX`k@zyTS6WtF_+ESU<_dD@Q2vW2-<5>IgGo=F zk8_t^%R^M!k2AjfIW?iAZPzR6X(14yo?~~6SzPMnWCJ9_ zqw=?E<%qJ`(phOamfXD&u=6EodDsN;Ty4vrP=xecqJ&Tu-ee$YQRcRImI}vXoxr&s#gxD{0;FHXp`uYLIvxMS}17Ot&=Zh&=GiHFuoPp zP|tF~Zw0t^D#rvHj9AZpMH;Q;D44YRMTz?wCXV3FBAU1k2G51??tKN#8=7b#Pio?LkA}*+hX9WI0-|KjtUwYr2Zcs(VbL9z7m)d6m z=W#Cz>FjlW6dD>Nye=NChziL+04{h#AP$%wY!F_Z6U-syaHoLl>F`S+og1MidqfRq z6PGdZYixvMY8WOM^ON=h0uC{I&P0RS6fbSdW_mzT1}_-BFju9cRG60D=NQwuy`3mb zA-?Hj=8!Ur&MtNZG<~Vv(9LL`4hAV>-?3|9Iot%Ra4me%W0RJT(OK?HUWwu7lBlRs zai*H=#hi27$9ue89m3gYxD|Od%oa<-=a6sH(P&qQ0zq(G7@d{_N<%-LW + + + diff --git a/src/gui/resource.qrc b/src/gui/resource.qrc index 3465850f..aea39935 100644 --- a/src/gui/resource.qrc +++ b/src/gui/resource.qrc @@ -309,7 +309,7 @@ images/localvars.png images/nextref.png images/prevref.png - images/donation_qr.png images/bug.png + images/donation_qr.svg