diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7d8f604f..1de3417e4 100755
--- 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})
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index d53e41406..6a74f0912 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -4,7 +4,7 @@
Fixed:
- Overall code cleanups and refactoring primarily in area of feed/message models and recycle bin functionality.
-- Fixed bug #66, #67.
+- Fixed bug #66, #67, #69..
- Blau skin now has colored webkit scrollbars, fixed some button widths and enhanced menu popup tool buttons.
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index 2790d51e9..0037ae7e7 100755
--- 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"
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index e48edb883..1ef1c37e3 100755
--- 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() {
diff --git a/src/gui/formmain.h b/src/gui/formmain.h
index c5b23d984..79ec7daa2 100755
--- 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();
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index db3e8b747..a57fa3452 100755
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -15,16 +15,7 @@
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -48,7 +39,7 @@
0
0
979
- 21
+ 20
@@ -576,10 +568,12 @@
- Donate via PayPal
+ &Donate via PayPal
-
-
+
+
+
+ Display &wiki