Fixed #69.

2014-09-17 16:10:24 +02:00 · 2014-09-17 16:10:24 +02:00 · 819d043dc2
parent fb19f12ad3
commit 819d043dc2
6 changed files with 34 additions and 38 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -78,6 +78,7 @@ set(APP_URL "http://bitbucket.org/skunkos/rssguard")
 set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")
 set(APP_URL_ISSUES_NEW_GITHUB "https://github.com/martinrotter/rssguard/issues/new")
 set(APP_URL_ISSUES_NEW_BITBUCKET "http://bitbucket.org/skunkos/rssguard/issues/new")
+set(APP_URL_WIKI "https://bitbucket.org/skunkos/rssguard/wiki/Home")
 set(APP_EMAIL "rotter.martinos@gmail.com")
 set(MINIMUM_QT_VERSION 4.7.3)
 set(EXE_NAME ${APP_LOW_NAME})
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@ -4,7 +4,7 @@
 Fixed:
 <ul>
 <li>Overall code cleanups and refactoring primarily in area of feed/message models and recycle bin functionality.</li>
-<li>Fixed bug #66, #67.</li>
+<li>Fixed bug #66, #67, #69..</li>
 <li>Blau skin now has colored webkit scrollbars, fixed some button widths and enhanced menu popup tool buttons.</li>
 </ul>

--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@ -33,10 +33,12 @@
 #define APP_URL_ISSUES      "@APP_URL_ISSUES@"
 #define APP_URL_ISSUES_NEW_GITHUB  "@APP_URL_ISSUES_NEW_GITHUB@"
 #define APP_URL_ISSUES_NEW_BITBUCKET  "@APP_URL_ISSUES_NEW_BITBUCKET@"
+#define APP_URL_WIKI        "@APP_URL_WIKI@"
 #define APP_VERSION         "@APP_VERSION@"
 #define APP_USERAGENT       QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@")
 #define APP_DONATE_URL      "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XMWPLPK893VH4"

+
 #define RELEASES_LIST                   "https://bitbucket.org/skunkos/rssguard/raw/master/resources/text/UPDATES?at=master"
 #define DEFAULT_LOCALE                  "en_GB"
 #define DEFAULT_FEED_ENCODING           "UTF-8"
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@ -205,6 +205,7 @@ void FormMain::setupIcons() {
  m_ui->m_actionExportFeeds->setIcon(icon_theme_factory->fromTheme("document-export"));
  m_ui->m_actionImportFeeds->setIcon(icon_theme_factory->fromTheme("document-import"));
  m_ui->m_actionDonate->setIcon(icon_theme_factory->fromTheme("application-donate"));
+  m_ui->m_actionDisplayWiki->setIcon(icon_theme_factory->fromTheme("application-wiki"));

  // View.
  m_ui->m_actionSwitchMainWindow->setIcon(icon_theme_factory->fromTheme("view-switch-window"));
@ -333,6 +334,7 @@ void FormMain::createConnections() {
  connect(m_ui->m_actionReportBugGitHub, SIGNAL(triggered()), this, SLOT(reportABugOnGitHub()));
  connect(m_ui->m_actionReportBugBitBucket, SIGNAL(triggered()), this, SLOT(reportABugOnBitBucket()));
  connect(m_ui->m_actionDonate, SIGNAL(triggered()), this, SLOT(donate()));
+  connect(m_ui->m_actionDisplayWiki, SIGNAL(triggered()), this, SLOT(showWiki()));

  // Menu "Web browser" connections.
  connect(m_ui->m_tabWidget, SIGNAL(currentChanged(int)),
@ -436,40 +438,36 @@ void FormMain::showUpdates() {
  qApp->closeLock()->unlock();
 }

+void FormMain::showWiki() {
+  if (!WebFactory::instance()->openUrlInExternalBrowser(APP_URL_WIKI)) {
+    qApp->showGuiMessage(tr("Cannot open external browser"),
+                         tr("Cannot open external browser. Navigate to application website manually."),
+                         QSystemTrayIcon::Warning);
+  }
+}
+
 void FormMain::reportABugOnGitHub() {
  if (!WebFactory::instance()->openUrlInExternalBrowser(APP_URL_ISSUES_NEW_GITHUB)) {
-    if (SystemTrayIcon::isSystemTrayActivated()) {
-      qApp->trayIcon()->showMessage(tr("Cannot open external browser"),
-                                    tr("Cannot open external browser. Navigate to application website manually."),
-                                    QSystemTrayIcon::Warning);
-    }
-    else {
-      MessageBox::show(this,
-                       QMessageBox::Warning,
-                       tr("Cannot open external browser"),
-                       tr("Cannot open external browser. Navigate to application website manually."));
-    }
+    qApp->showGuiMessage(tr("Cannot open external browser"),
+                         tr("Cannot open external browser. Navigate to application website manually."),
+                         QSystemTrayIcon::Warning);
  }
 }

 void FormMain::reportABugOnBitBucket() {
  if (!WebFactory::instance()->openUrlInExternalBrowser(APP_URL_ISSUES_NEW_BITBUCKET)) {
-    if (SystemTrayIcon::isSystemTrayActivated()) {
-      qApp->trayIcon()->showMessage(tr("Cannot open external browser"),
-                                    tr("Cannot open external browser. Navigate to application website manually."),
-                                    QSystemTrayIcon::Warning);
-    }
-    else {
-      MessageBox::show(this,
-                       QMessageBox::Warning,
-                       tr("Cannot open external browser"),
-                       tr("Cannot open external browser. Navigate to application website manually."));
-    }
+    qApp->showGuiMessage(tr("Cannot open external browser"),
+                         tr("Cannot open external browser. Navigate to application website manually."),
+                         QSystemTrayIcon::Warning);
  }
 }

 void FormMain::donate() {
-  WebFactory::instance()->openUrlInExternalBrowser(APP_DONATE_URL);
+  if (!WebFactory::instance()->openUrlInExternalBrowser(APP_DONATE_URL)) {
+    qApp->showGuiMessage(tr("Cannot open external browser"),
+                         tr("Cannot open external browser. Navigate to application website manually."),
+                         QSystemTrayIcon::Warning);
+  }
 }

 void FormMain::showSettings() {
--- a/src/gui/formmain.h
+++ b/src/gui/formmain.h
@ -100,6 +100,7 @@ class FormMain : public QMainWindow {
    void showSettings();
    void showAbout();
    void showUpdates();
+    void showWiki();
    void reportABugOnGitHub();
    void reportABugOnBitBucket();
    void donate();
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@ -15,16 +15,7 @@
  </property>
  <widget class="QWidget" name="centralwidget">
   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
     <number>0</number>
    </property>
    <item>
@ -48,7 +39,7 @@
     <x>0</x>
     <y>0</y>
     <width>979</width>
-     <height>21</height>
+     <height>20</height>
    </rect>
   </property>
   <widget class="QMenu" name="m_menuFile">
@ -67,6 +58,7 @@
    <addaction name="m_actionCheckForUpdates"/>
    <addaction name="m_actionReportBugGitHub"/>
    <addaction name="m_actionReportBugBitBucket"/>
+    <addaction name="m_actionDisplayWiki"/>
    <addaction name="m_actionDonate"/>
    <addaction name="m_actionAboutGuard"/>
   </widget>
@ -576,10 +568,12 @@
  </action>
  <action name="m_actionDonate">
   <property name="text">
-    <string>Donate via PayPal</string>
+    <string>&amp;Donate via PayPal</string>
   </property>
-   <property name="shortcut">
-    <string notr="true"/>
+  </action>
+  <action name="m_actionDisplayWiki">
+   <property name="text">
+    <string>Display &amp;wiki</string>
   </property>
  </action>
 </widget>