FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-27 07:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Copy html gpl.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-22 08:04:56 +02:00
parent d9c8001401
commit 3cba64fa56
5 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rssguard.pro
View File

@ -72,12 +72,11 @@ APP_COPYRIGHT = "(C) 2011-2016 $$APP_AUTHOR"
APP_VERSION = "3.3.0"
APP_LONG_NAME = "$$APP_NAME $$APP_VERSION"
APP_EMAIL = "rotter.martinos@gmail.com"
APP_URL = "http://bitbucket.org/skunkos/rssguard"
APP_URL_ISSUES = "http://bitbucket.org/skunkos/rssguard/issues"
APP_URL_ISSUES_NEW_GITHUB = "https://github.com/martinrotter/rssguard/issues/new"
APP_URL_ISSUES_NEW_BITBUCKET = "http://bitbucket.org/skunkos/rssguard/issues/new"
APP_URL_WIKI = "https://bitbucket.org/skunkos/rssguard/wiki/Home"
APP_USERAGENT = "RSS Guard/$$APP_VERSION (bitbucket.org/skunkos/rssguard)"
APP_URL = "https://github.com/martinrotter/rssguard"
APP_URL_ISSUES = "https://github.com/martinrotter/rssguard/issues"
APP_URL_ISSUES_NEW = "https://github.com/martinrotter/rssguard/issues/new"
APP_URL_WIKI = "https://github.com/martinrotter/rssguard/wiki"
APP_USERAGENT = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)"
APP_DONATE_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XMWPLPK893VH4"
isEmpty(PREFIX) {
@ -445,7 +444,8 @@ INCLUDEPATH += $$PWD/. \
TEXTS = resources/text/CHANGELOG \
resources/text/COPYING_BSD \
resources/text/COPYING_GNU_GPL
resources/text/COPYING_GNU_GPL \
resources/text/COPYING_GNU_GPL_HTML
# Make sure QM translations are generated.
lrelease.input = TRANSLATIONS

4
src/definitions/definitions.h
View File

@ -34,8 +34,8 @@
#define URI_SCHEME_FEED_SHORT "feed:"
#define URI_SCHEME_FEED "feed://"
#define URI_SCHEME_HTTP "http://"
#define RELEASES_LIST "https://bitbucket.org/skunkos/rssguard/raw/master/resources/text/UPDATES?at=master"
#define CHANGELOG "https://bitbucket.org/skunkos/rssguard/raw/master/resources/text/CHANGELOG?at=master"
#define RELEASES_LIST "https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/text/UPDATES"
#define CHANGELOG "https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/text/CHANGELOG"
#define DEFAULT_LOCALE "en_GB"
#define DEFAULT_FEED_ENCODING "UTF-8"
#define DEFAULT_FEED_TYPE "RSS"

10
src/gui/dialogs/formmain.cpp
View File

@ -335,7 +335,6 @@ void FormMain::setupIcons() {
m_ui->m_actionCheckForUpdates->setIcon(icon_theme_factory->fromTheme(QSL("applications-internet")));
m_ui->m_actionCleanupDatabase->setIcon(icon_theme_factory->fromTheme(QSL("edit-clear")));
m_ui->m_actionReportBugGitHub->setIcon(icon_theme_factory->fromTheme(QSL("call-start")));
m_ui->m_actionReportBugBitBucket->setIcon(icon_theme_factory->fromTheme(QSL("call-start")));
m_ui->m_actionBackupDatabaseSettings->setIcon(icon_theme_factory->fromTheme(QSL("document-export")));
m_ui->m_actionRestoreDatabaseSettings->setIcon(icon_theme_factory->fromTheme(QSL("document-import")));
m_ui->m_actionDonate->setIcon(icon_theme_factory->fromTheme(QSL("applications-office")));
@ -480,7 +479,6 @@ void FormMain::createConnections() {
connect(m_ui->m_actionAboutGuard, SIGNAL(triggered()), this, SLOT(showAbout()));
connect(m_ui->m_actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(showUpdates()));
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()));
@ -553,14 +551,6 @@ void FormMain::reportABugOnGitHub() {
}
}
void FormMain::reportABugOnBitBucket() {
if (!WebFactory::instance()->openUrlInExternalBrowser(STRFY(APP_URL_ISSUES_NEW_BITBUCKET))) {
qApp->showGuiMessage(tr("Cannot open external browser"),
tr("Cannot open external browser. Navigate to application website manually."),
QSystemTrayIcon::Warning, this, true);
}
}
void FormMain::donate() {
if (!WebFactory::instance()->openUrlInExternalBrowser(STRFY(APP_DONATE_URL))) {
qApp->showGuiMessage(tr("Cannot open external browser"),

1
src/gui/dialogs/formmain.h
View File

@ -87,7 +87,6 @@ class FormMain : public QMainWindow {
void showWiki();
void showAddAccountDialog();
void reportABugOnGitHub();
void reportABugOnBitBucket();
void donate();
private:

11
src/gui/dialogs/formmain.ui
View File

@ -63,7 +63,6 @@
</property>
<addaction name="m_actionCheckForUpdates"/>
<addaction name="m_actionReportBugGitHub"/>
<addaction name="m_actionReportBugBitBucket"/>
<addaction name="m_actionDisplayWiki"/>
<addaction name="m_actionDonate"/>
<addaction name="m_actionAboutGuard"/>
@ -484,7 +483,7 @@
</action>
<action name="m_actionReportBugGitHub">
<property name="text">
<string>Report a &amp;bug (GitHub)...</string>
<string>Report a &amp;bug...</string>
</property>
<property name="shortcut">
<string notr="true"/>
@ -521,14 +520,6 @@
<string notr="true">H</string>
</property>
</action>
<action name="m_actionReportBugBitBucket">
<property name="text">
<string>Report a bug (BitBucket)...</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_actionDonate">
<property name="text">
<string>&amp;Donate via PayPal</string>