Tweaking of settings window.

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(APP_VERSION "1.9.9.2")
-set(FILE_VERSION "1,9,9,1")
+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")

src/gui/formmain.ui

@@ -248,7 +248,7 @@
   </action>
   <action name="m_actionEditSelectedFeedCategory">
    <property name="text">
-    <string>&amp;Edit selected feed/category</string>
+    <string>&amp;Edit selected item</string>
    </property>
    <property name="toolTip">
     <string>Edit selected feed/category.</string>
@@ -256,7 +256,7 @@
   </action>
   <action name="m_actionDeleteSelectedFeedCategory">
    <property name="text">
-    <string>&amp;Delete selected feed/category</string>
+    <string>&amp;Delete selected item</string>
    </property>
    <property name="toolTip">
     <string>Delete selected feed/category.</string>

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() {

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;

src/gui/formsettings.ui

@@ -102,8 +102,8 @@ Authors of this application are NOT responsible for lost data.</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>100</width>
+            <width>564</width>
-            <height>30</height>
+            <height>363</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -180,8 +180,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>167</width>
+                <width>558</width>
-                <height>219</height>
+                <height>337</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -434,11 +434,14 @@ Authors of this application are NOT responsible for lost data.</string>
          <property name="currentIndex">
           <number>0</number>
          </property>
-         <widget class="QWidget" name="m_tabBrowser">
+         <widget class="QWidget" name="m_tabInternalBrowser">
           <attribute name="title">
-           <string>Web browser</string>
+           <string>Internal web browser</string>
           </attribute>
           <layout class="QFormLayout" name="formLayout_4">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           </property>
            <item row="0" column="0">
             <layout class="QHBoxLayout" name="horizontalLayout_12">
              <item>
@@ -483,7 +486,7 @@ Authors of this application are NOT responsible for lost data.</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" colspan="2">
+           <item row="3" column="0">
             <widget class="QLabel" name="m_lblMouseGestures">
              <property name="text">
               <string>Mouse gestures work with middle mouse button. Possible gestures are:
@@ -504,6 +507,81 @@ Authors of this application are NOT responsible for lost data.</string>
            </item>
           </layout>
          </widget>
+         <widget class="QWidget" name="m_tabExternalBrowser">
+          <attribute name="title">
+           <string>External web browser</string>
+          </attribute>
+          <layout class="QFormLayout" name="formLayout_12">
+           <item row="0" column="0">
+            <widget class="QLabel" name="m_lblExternalBrowserExecutable">
+             <property name="text">
+              <string>Web browser executable</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_10">
+             <item>
+              <widget class="QLineEdit" name="m_txtExternalBrowserExecutable">
+               <property name="placeholderText">
+                <string>Executable file of web browser</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="m_btnExternalBrowserExecutable">
+               <property name="text">
+                <string>...</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="m_lblExternalBrowserArguments">
+             <property name="text">
+              <string>Executable parameters</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="m_txtExternalBrowserArguments">
+             <property name="placeholderText">
+              <string>Parameters to executable</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="m_lblExternalBrowserPreset">
+             <property name="text">
+              <string>Use sample arguments for</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QComboBox" name="m_cmbExternalBrowserPreset">
+             <property name="sizeAdjustPolicy">
+              <enum>QComboBox::AdjustToContents</enum>
+             </property>
+             <item>
+              <property name="text">
+               <string>select browser</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
          <widget class="QWidget" name="m_tabProxy">
           <attribute name="title">
            <string>Proxy</string>
@@ -682,83 +760,9 @@ Authors of this application are NOT responsible for lost data.</string>
            <string>Messages</string>
           </attribute>
           <layout class="QFormLayout" name="formLayout_11">
-           <item row="0" column="0" colspan="2">
+           <property name="fieldGrowthPolicy">
-            <widget class="QGroupBox" name="groupBox_3">
+            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-             <property name="title">
-              <string>External web browser for message viewing</string>
            </property>
-             <layout class="QFormLayout" name="formLayout_10">
-              <item row="0" column="0">
-               <widget class="QLabel" name="m_lblExternalBrowserExecutable">
-                <property name="text">
-                 <string>Web browser executable</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <layout class="QHBoxLayout" name="horizontalLayout_10">
-                <item>
-                 <widget class="QLineEdit" name="m_txtExternalBrowserExecutable">
-                  <property name="placeholderText">
-                   <string>Executable file of web browser</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="m_btnExternalBrowserExecutable">
-                  <property name="text">
-                   <string>...</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="m_lblExternalBrowserArguments">
-                <property name="text">
-                 <string>Executable parameters</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QLineEdit" name="m_txtExternalBrowserArguments">
-                <property name="placeholderText">
-                 <string>Parameters to executable</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="m_lblExternalBrowserPreset">
-                <property name="text">
-                 <string>Use sample arguments for</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QComboBox" name="m_cmbExternalBrowserPreset">
-                <property name="sizeAdjustPolicy">
-                 <enum>QComboBox::AdjustToContents</enum>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>select browser</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="3" column="0" colspan="2">
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
           </layout>
          </widget>
         </widget>

src/gui/messagesview.cpp

@@ -214,9 +214,9 @@ void MessagesView::loadFeeds(const QList<int> &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();
 

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() {

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);