Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserTabWidget.py	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py	Sat May 04 14:45:04 2019 +0200
@@ -127,20 +127,8 @@
         self.__closedTabsButton.setEnabled(False)
         self.__rightCornerWidgetLayout.addWidget(self.__closedTabsButton)
         
-        self.__closeButton = QToolButton(self)
-        self.__closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
-        self.__closeButton.setToolTip(
-            self.tr("Close the current web browser"))
-        self.__closeButton.setEnabled(False)
-        self.__closeButton.clicked.connect(self.closeBrowser)
-        self.__rightCornerWidgetLayout.addWidget(self.__closeButton)
-        if Preferences.getUI("SingleCloseButton") or \
-           not hasattr(self, 'setTabsClosable'):
-            self.__closeButton.show()
-        else:
-            self.setTabsClosable(True)
-            self.tabCloseRequested.connect(self.closeBrowserAt)
-            self.__closeButton.hide()
+        self.setTabsClosable(True)
+        self.tabCloseRequested.connect(self.closeBrowserAt)
         
         self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner)
         
@@ -460,7 +448,6 @@
         
         self.__mainWindow.closeAct.setEnabled(True)
         self.__mainWindow.closeAllAct.setEnabled(True)
-        self.__closeButton.setEnabled(True)
         self.__navigationButton.setEnabled(True)
         
         if not restoreSession:
@@ -928,18 +915,6 @@
         
         for urlbar in self.__stackedUrlBar.urlBars():
             urlbar.preferencesChanged()
-        
-        if Preferences.getUI("SingleCloseButton"):
-            self.setTabsClosable(False)
-            try:
-                self.tabCloseRequested.disconnect(self.closeBrowserAt)
-            except TypeError:
-                pass
-            self.__closeButton.show()
-        else:
-            self.setTabsClosable(True)
-            self.tabCloseRequested.connect(self.closeBrowserAt)
-            self.__closeButton.hide()
     
     def __loadStarted(self, browser):
         """