diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14fe29c81..6c4a4621d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,8 @@
project(rssguard)
set(APP_NAME "RSS Guard")
set(APP_LOW_NAME "rssguard")
-set(APP_VERSION "1.9.9.1")
-set(FILE_VERSION "1,9,9,1")
+set(APP_VERSION "1.9.9.2")
+set(FILE_VERSION "1,9,9,2")
set(APP_AUTHOR "Martin Rotter")
set(APP_URL "http://www.rssguard.comehere.cz")
set(APP_URL_ISSUES "http://github.com/martinrotter/rssguard/issues")
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index c0c4d3c7e..4236cc58f 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -248,7 +248,7 @@
- &Edit selected feed/category
+ &Edit selected item
Edit selected feed/category.
@@ -256,7 +256,7 @@
- &Delete selected feed/category
+ &Delete selected item
Delete selected feed/category.
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index 980ab2eb4..6a840cfee 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -153,25 +153,9 @@ void FormSettings::selectBrowserExecutable() {
}
void FormSettings::loadFeedsMessages() {
- Settings *settings = Settings::instance();
-
- m_ui->m_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), "-nosession %1");
- m_ui->m_txtExternalBrowserExecutable->setText(settings->value(APP_CFG_MESSAGES,
- "external_browser_executable").toString());
- m_ui->m_txtExternalBrowserArguments->setText(settings->value(APP_CFG_MESSAGES,
- "external_browser_arguments",
- "%1").toString());
}
void FormSettings::saveFeedsMessages() {
- Settings *settings = Settings::instance();
-
- settings->setValue(APP_CFG_MESSAGES,
- "external_browser_executable",
- m_ui->m_txtExternalBrowserExecutable->text());
- settings->setValue(APP_CFG_MESSAGES,
- "external_browser_arguments",
- m_ui->m_txtExternalBrowserArguments->text());
}
void FormSettings::displayProxyPassword(int state) {
@@ -299,6 +283,13 @@ void FormSettings::loadBrowser() {
m_ui->m_checkQueueTabs->setChecked(settings->value(APP_CFG_BROWSER,
"queue_tabs",
true).toBool());
+
+ m_ui->m_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), "-nosession %1");
+ m_ui->m_txtExternalBrowserExecutable->setText(settings->value(APP_CFG_BROWSER,
+ "external_browser_executable").toString());
+ m_ui->m_txtExternalBrowserArguments->setText(settings->value(APP_CFG_BROWSER,
+ "external_browser_arguments",
+ "%1").toString());
}
void FormSettings::saveBrowser() {
@@ -317,6 +308,13 @@ void FormSettings::saveBrowser() {
settings->setValue(APP_CFG_BROWSER,
"queue_tabs",
m_ui->m_checkQueueTabs->isChecked());
+
+ settings->setValue(APP_CFG_BROWSER,
+ "external_browser_executable",
+ m_ui->m_txtExternalBrowserExecutable->text());
+ settings->setValue(APP_CFG_BROWSER,
+ "external_browser_arguments",
+ m_ui->m_txtExternalBrowserArguments->text());
}
void FormSettings::loadProxy() {
diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h
index e50302f90..a6043961f 100644
--- a/src/gui/formsettings.h
+++ b/src/gui/formsettings.h
@@ -60,17 +60,16 @@ class FormSettings : public QDialog {
void loadBrowser();
void saveBrowser();
+ void changeDefaultBrowserArguments(int index);
+ void selectBrowserExecutable();
void loadProxy();
void saveProxy();
void displayProxyPassword(int state);
+ void onProxyTypeChanged(int index);
void loadFeedsMessages();
void saveFeedsMessages();
- void changeDefaultBrowserArguments(int index);
- void selectBrowserExecutable();
-
- void onProxyTypeChanged(int index);
private:
Ui::FormSettings *m_ui;
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index df86416b5..7314ebaf6 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -102,8 +102,8 @@ Authors of this application are NOT responsible for lost data.
0
0
- 100
- 30
+ 564
+ 363
@@ -180,8 +180,8 @@ Authors of this application are NOT responsible for lost data.
0
0
- 167
- 219
+ 558
+ 337
@@ -434,11 +434,14 @@ Authors of this application are NOT responsible for lost data.
0
-
+
- Web browser
+ Internal web browser
+
+ QFormLayout::AllNonFixedFieldsGrow
+
-
-
@@ -483,7 +486,7 @@ Authors of this application are NOT responsible for lost data.
- -
+
-
Mouse gestures work with middle mouse button. Possible gestures are:
@@ -504,6 +507,81 @@ Authors of this application are NOT responsible for lost data.
+
+
+ External web browser
+
+
+ -
+
+
+ Web browser executable
+
+
+
+ -
+
+
-
+
+
+ Executable file of web browser
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+ -
+
+
+ Executable parameters
+
+
+
+ -
+
+
+ Parameters to executable
+
+
+
+ -
+
+
+ Use sample arguments for
+
+
+
+ -
+
+
+ QComboBox::AdjustToContents
+
+
-
+
+ select browser
+
+
+
+
+ -
+
+
+ Note that "%1" (without quotation marks) is placeholder for URL of selected message.
+
+
+ Qt::AlignCenter
+
+
+
+
+
Proxy
@@ -682,83 +760,9 @@ Authors of this application are NOT responsible for lost data.
Messages
- -
-
-
- External web browser for message viewing
-
-
-
-
-
-
- Web browser executable
-
-
-
- -
-
-
-
-
-
- Executable file of web browser
-
-
-
- -
-
-
- ...
-
-
-
-
-
- -
-
-
- Executable parameters
-
-
-
- -
-
-
- Parameters to executable
-
-
-
- -
-
-
- Use sample arguments for
-
-
-
- -
-
-
- QComboBox::AdjustToContents
-
-
-
-
- select browser
-
-
-
-
- -
-
-
- Note that "%1" (without quotation marks) is placeholder for URL of selected message.
-
-
- Qt::AlignCenter
-
-
-
-
-
-
+
+ QFormLayout::AllNonFixedFieldsGrow
+
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 21f60e4d1..5927f2846 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -214,9 +214,9 @@ void MessagesView::loadFeeds(const QList &feed_ids) {
}
void MessagesView::openSelectedSourceArticlesExternally() {
- QString browser = Settings::instance()->value(APP_CFG_MESSAGES,
+ QString browser = Settings::instance()->value(APP_CFG_BROWSER,
"external_browser_executable").toString();
- QString arguments = Settings::instance()->value(APP_CFG_MESSAGES,
+ QString arguments = Settings::instance()->value(APP_CFG_BROWSER,
"external_browser_arguments",
"%1").toString();
diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp
index 9022baf04..b28f4fc37 100644
--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@@ -31,8 +31,6 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) {
addWidget(m_progressBar);
addWidget(m_progressLabel);
addPermanentWidget(m_fullscreenSwitcher);
-
- setStyleSheet("StatusBar::item { border: none; }");
}
StatusBar::~StatusBar() {
diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp
index 8b0e85d30..c721807e2 100644
--- a/src/gui/webbrowser.cpp
+++ b/src/gui/webbrowser.cpp
@@ -49,13 +49,13 @@ WebBrowser::WebBrowser(QWidget *parent)
// Modify action texts.
m_actionBack->setText(tr("Back"));
- m_actionBack->setToolTip(tr("Go back"));
+ m_actionBack->setToolTip(tr("Go back."));
m_actionForward->setText(tr("Forward"));
- m_actionForward->setToolTip(tr("Go forward"));
+ m_actionForward->setToolTip(tr("Go forward."));
m_actionReload->setText(tr("Reload"));
- m_actionReload->setToolTip(tr("Reload current web page"));
+ m_actionReload->setToolTip(tr("Reload current web page."));
m_actionStop->setText(tr("Stop"));
- m_actionStop->setToolTip(tr("Stop web page loading"));
+ m_actionStop->setToolTip(tr("Stop web page loading."));
// Add needed actions into toolbar.
m_toolBar->addAction(m_actionBack);