Option to hide Reload/Stop buttons in navigation bar

closes #615

src/lib/app/qupzilla.cpp

@@ -57,6 +57,7 @@
 #include "webinspectordockwidget.h"
 #include "bookmarksimportdialog.h"
 #include "globalfunctions.h"
+#include "reloadstopbutton.h"
 #include "enhancedmenu.h"
 #include "settings.h"
 #include "webtab.h"
@@ -568,13 +569,14 @@ void QupZilla::loadSettings()
     //Browser Window settings
     settings.beginGroup("Browser-View-Settings");
     bool showStatusBar = settings.value("showStatusBar", true).toBool();
-    bool showHomeIcon = settings.value("showHomeButton", true).toBool();
+    bool showReloadButton = settings.value("showReloadButton", true).toBool();
+    bool showHomeButton = settings.value("showHomeButton", true).toBool();
+    bool showBackForwardButtons = settings.value("showBackForwardButtons", true).toBool();
+    bool showAddTabButton = settings.value("showAddTabButton", false).toBool();
     bool showWebSearchBar = settings.value("showWebSearchBar", true).toBool();
-    bool showBackForwardIcons = settings.value("showBackForwardButtons", true).toBool();
     bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool();
     bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool();
     bool showMenuBar = settings.value("showMenubar", true).toBool();
-    bool showAddTab = settings.value("showAddTabButton", false).toBool();
     bool makeTransparent = settings.value("useTransparentBackground", false).toBool();
     m_sideBarWidth = settings.value("SideBarWidth", 250).toInt();
     m_webViewWidth = settings.value("WebViewWidth", 2000).toInt();
@@ -592,11 +594,12 @@ void QupZilla::loadSettings()
 #ifndef Q_OS_MAC
     m_navigationBar->buttonSuperMenu()->setVisible(!showMenuBar);
 #endif
-    m_navigationBar->buttonHome()->setVisible(showHomeIcon);
+    m_navigationBar->buttonReloadStop()->setVisible(showReloadButton);
-    m_navigationBar->buttonBack()->setVisible(showBackForwardIcons);
+    m_navigationBar->buttonHome()->setVisible(showHomeButton);
-    m_navigationBar->buttonNext()->setVisible(showBackForwardIcons);
+    m_navigationBar->buttonBack()->setVisible(showBackForwardButtons);
+    m_navigationBar->buttonNext()->setVisible(showBackForwardButtons);
     m_navigationBar->searchLine()->setVisible(showWebSearchBar);
-    m_navigationBar->buttonAddTab()->setVisible(showAddTab);
+    m_navigationBar->buttonAddTab()->setVisible(showAddTabButton);
 
     m_sideBarManager->showSideBar(activeSideBar, false);
 

src/lib/navigation/navigationbar.h

@@ -49,6 +49,7 @@ public:
     inline ToolButton* buttonAddTab() { return m_buttonAddTab; }
     inline ToolButton* buttonSuperMenu() { return m_supMenu; }
     inline ToolButton* buttonExitFullscreen() { return m_exitFullscreen; }
+    inline ReloadStopButton* buttonReloadStop() { return m_reloadStop; }
     inline WebSearchBar* searchLine() { return m_searchLine; }
     inline QSplitter* splitter() { return m_navigationSplitter; }
 

src/lib/preferences/preferences.cpp

@@ -167,6 +167,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
     ui->showHome->setChecked(settings.value("showHomeButton", true).toBool());
     ui->showBackForward->setChecked(settings.value("showBackForwardButtons", true).toBool());
     ui->showAddTabButton->setChecked(settings.value("showAddTabButton", false).toBool());
+    ui->showReloadStopButtons->setChecked(settings.value("showReloadButton", true).toBool());
     ui->showWebSearchBar->setChecked(settings.value("showWebSearchBar", true).toBool());
     ui->useTransparentBg->setChecked(settings.value("useTransparentBackground", false).toBool());
     int currentSettingsPage = settings.value("settingsDialogPage", 0).toInt(0);
@@ -791,6 +792,7 @@ void Preferences::saveSettings()
     settings.setValue("showWebSearchBar", ui->showWebSearchBar->isChecked());
     settings.setValue("useTransparentBackground", ui->useTransparentBg->isChecked());
     settings.setValue("showAddTabButton", ui->showAddTabButton->isChecked());
+    settings.setValue("showReloadButton", ui->showReloadStopButtons->isChecked());
     settings.endGroup();
 
     //TABS

src/lib/preferences/preferences.ui

@@ -547,28 +547,21 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
+           <item row="5" column="1">
             <widget class="QCheckBox" name="showBackForward">
              <property name="text">
               <string>Show Back / Forward buttons</string>
              </property>
             </widget>
            </item>
-           <item row="6" column="1">
+           <item row="9" column="0" colspan="2">
-            <widget class="QCheckBox" name="showAddTabButton">
-             <property name="text">
-              <string>Show Add Tab button</string>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="0" colspan="2">
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>&lt;b&gt;Background&lt;b/&gt;</string>
              </property>
             </widget>
            </item>
-           <item row="9" column="1">
+           <item row="11" column="1">
             <spacer name="verticalSpacer_12">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
@@ -581,20 +574,34 @@
              </property>
             </spacer>
            </item>
-           <item row="8" column="1">
+           <item row="10" column="1">
             <widget class="QCheckBox" name="useTransparentBg">
              <property name="text">
               <string>Use transparent background</string>
              </property>
             </widget>
            </item>
-           <item row="5" column="1">
+           <item row="7" column="1">
             <widget class="QCheckBox" name="showWebSearchBar">
              <property name="text">
               <string>Show web search bar</string>
              </property>
             </widget>
            </item>
+           <item row="6" column="1">
+            <widget class="QCheckBox" name="showAddTabButton">
+             <property name="text">
+              <string>Show Add Tab button</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QCheckBox" name="showReloadStopButtons">
+             <property name="text">
+              <string>Show Reload / Stop buttons</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -2461,7 +2468,6 @@
   <tabstop>showStatusbar</tabstop>
   <tabstop>useTransparentBg</tabstop>
   <tabstop>showNavigationToolbar</tabstop>
-  <tabstop>showAddTabButton</tabstop>
   <tabstop>pagesInCache</tabstop>
   <tabstop>showHome</tabstop>
   <tabstop>showBookmarksToolbar</tabstop>