diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/WhatsApp.pro | 2 | ||||
| -rw-r--r-- | src/about.cpp | 5 | ||||
| -rw-r--r-- | src/about.h | 2 | ||||
| -rw-r--r-- | src/about.ui | 17 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/rateapp.cpp | 7 | ||||
| -rw-r--r-- | src/rateapp.h | 2 | ||||
| -rw-r--r-- | src/rateapp.ui | 73 |
8 files changed, 98 insertions, 12 deletions
diff --git a/src/WhatsApp.pro b/src/WhatsApp.pro index 2c9a11b..c7d256f 100644 --- a/src/WhatsApp.pro +++ b/src/WhatsApp.pro @@ -43,7 +43,7 @@ CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT # Set program version -VERSION = 1.0 +VERSION = 2.0 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" SOURCES += \ diff --git a/src/about.cpp b/src/about.cpp index 8344283..2212700 100644 --- a/src/about.cpp +++ b/src/about.cpp @@ -100,3 +100,8 @@ void About::on_debugInfoButton_clicked() } } + +void About::on_donate_2_clicked() +{ + QDesktopServices::openUrl(QUrl("https://opencollective.com/whatsie")); +} diff --git a/src/about.h b/src/about.h index 34551b3..74bfe0d 100644 --- a/src/about.h +++ b/src/about.h @@ -18,6 +18,8 @@ public: private slots: void on_debugInfoButton_clicked(); + void on_donate_2_clicked(); + private: Ui::About *ui; diff --git a/src/about.ui b/src/about.ui index e8a09af..653d972 100644 --- a/src/about.ui +++ b/src/about.ui @@ -168,21 +168,21 @@ p, li { white-space: pre-wrap; } <item> <widget class="QPushButton" name="donate"> <property name="text"> - <string>Donate</string> + <string>Donate Paypal</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="rate"> + <widget class="QPushButton" name="donate_2"> <property name="text"> - <string>Rate in Store</string> + <string>Donate OpenCollective</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="source_code"> + <widget class="QPushButton" name="rate"> <property name="text"> - <string>Source Code</string> + <string>Rate in Store</string> </property> </widget> </item> @@ -197,6 +197,13 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> + <item> + <widget class="QPushButton" name="source_code"> + <property name="text"> + <string>Source Code</string> + </property> + </widget> + </item> </layout> </item> <item> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 85df9ae..e75166c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) setWindowTitle(QApplication::applicationName()); setWindowIcon(QIcon(":/icons/app/icon-256.png")); - setMinimumWidth(650); + setMinimumWidth(500); setMinimumHeight(520); restoreGeometry(settings.value("geometry").toByteArray()); diff --git a/src/rateapp.cpp b/src/rateapp.cpp index 21d2f1c..47382f5 100644 --- a/src/rateapp.cpp +++ b/src/rateapp.cpp @@ -130,3 +130,10 @@ void RateApp::on_donate_clicked() this->reset(); this->close(); } + +void RateApp::on_donate_2_clicked() +{ + QDesktopServices::openUrl(QUrl("https://opencollective.com/whatsie")); + this->reset(); + this->close(); +} diff --git a/src/rateapp.h b/src/rateapp.h index e87719e..50d5b98 100644 --- a/src/rateapp.h +++ b/src/rateapp.h @@ -40,6 +40,8 @@ private slots: void on_donate_clicked(); + void on_donate_2_clicked(); + private: Ui::RateApp *ui; QString app_rating_url; diff --git a/src/rateapp.ui b/src/rateapp.ui index 9b6ee24..38ebc00 100644 --- a/src/rateapp.ui +++ b/src/rateapp.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>472</width> - <height>224</height> + <width>477</width> + <height>257</height> </rect> </property> <property name="windowTitle"> @@ -65,6 +65,19 @@ </widget> </item> <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QLabel" name="label_4"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> @@ -78,14 +91,51 @@ </widget> </item> <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QPushButton" name="rateOnGithub"> <property name="text"> <string>Star rate Github repo</string> </property> </widget> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QPushButton" name="donate"> + <property name="text"> + <string>Donate via Paypal </string> + </property> + </widget> + </item> <item> - <widget class="QLabel" name="label_3"> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_5"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -98,9 +148,22 @@ </widget> </item> <item> - <widget class="QPushButton" name="donate"> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="donate_2"> <property name="text"> - <string>Donate</string> + <string>Donate via OpenCollective</string> </property> </widget> </item> |