diff -r aed3e558407f -r d8b99b5fa673 WebBrowser/Navigation/NavigationBar.py
--- a/WebBrowser/Navigation/NavigationBar.py Thu May 11 18:26:56 2017 +0200
+++ b/WebBrowser/Navigation/NavigationBar.py Sat May 13 12:09:45 2017 +0200
@@ -17,6 +17,8 @@
import UI.PixmapCache
+from .ReloadStopButton import ReloadStopButton
+
class NavigationBar(QWidget):
"""
@@ -70,23 +72,7 @@
self.__backNextLayout.addWidget(self.__backButton)
self.__backNextLayout.addWidget(self.__forwardButton)
- self.__reloadButton = QToolButton(self)
- self.__reloadButton.setObjectName("navigation_reload_button")
- self.__reloadButton.setToolTip(self.tr("Reload the current screen"))
- self.__reloadButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
- self.__reloadButton.setFocusPolicy(Qt.NoFocus)
- self.__reloadButton.setAutoRaise(True)
- self.__reloadButton.setIcon(
- UI.PixmapCache.getIcon("reload.png"))
-
- self.__stopButton = QToolButton(self)
- self.__stopButton.setObjectName("navigation_stop_button")
- self.__stopButton.setToolTip(self.tr("Stop loading"))
- self.__stopButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
- self.__stopButton.setFocusPolicy(Qt.NoFocus)
- self.__stopButton.setAutoRaise(True)
- self.__stopButton.setIcon(
- UI.PixmapCache.getIcon("stopLoading.png"))
+ self.__reloadStopButton = ReloadStopButton(self)
self.__homeButton = QToolButton(self)
self.__homeButton.setObjectName("navigation_home_button")
@@ -128,8 +114,7 @@
self.__navigationSplitter.setCollapsible(0, False)
self.__layout.addLayout(self.__backNextLayout)
- self.__layout.addWidget(self.__reloadButton)
- self.__layout.addWidget(self.__stopButton)
+ self.__layout.addWidget(self.__reloadStopButton)
self.__layout.addWidget(self.__homeButton)
self.__layout.addWidget(self.__navigationSplitter)
self.__layout.addWidget(self.__exitFullScreenButton)
@@ -149,8 +134,8 @@
self.__backButton.clicked.connect(self.__goBack)
self.__forwardButton.clicked.connect(self.__goForward)
- self.__reloadButton.clicked.connect(self.__reload)
- self.__stopButton.clicked.connect(self.__stopLoad)
+ self.__reloadStopButton.reloadClicked.connect(self.__reload)
+ self.__reloadStopButton.stopClicked.connect(self.__stopLoad)
self.__homeButton.clicked.connect(self.__goHome)
def backButton(self):
@@ -171,23 +156,14 @@
"""
return self.__forwardButton
- def reloadButton(self):
+ def reloadStopButton(self):
"""
- Public method to get a reference to the reload button.
+ Public method to get a reference to the reload/stop button.
- @return reference to the reload button
+ @return reference to the reload/stop button
@rtype QToolButton
"""
- return self.__reloadButton
-
- def stopButton(self):
- """
- Public method to get a reference to the stop button.
-
- @return reference to the stop button
- @rtype QToolButton
- """
- return self.__stopButton
+ return self.__reloadStopButton
def exitFullScreenButton(self):
"""
