Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat May 04 12:04:12 2019 +0200
+++ b/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Jun 02 11:42:48 2019 +0200
@@ -209,18 +209,7 @@
         self.navigationButton.setEnabled(False)
         self.rightCornerWidgetLayout.addWidget(self.navigationButton)
         
-        if Preferences.getUI("SingleCloseButton") or \
-           not hasattr(self, 'setTabsClosable'):
-            self.closeButton = QToolButton(self)
-            self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
-            self.closeButton.setToolTip(
-                self.tr("Close the current editor"))
-            self.closeButton.setEnabled(False)
-            self.closeButton.clicked[bool].connect(self.__closeButtonClicked)
-            self.rightCornerWidgetLayout.addWidget(self.closeButton)
-        else:
-            self.tabCloseRequested.connect(self.__closeRequested)
-            self.closeButton = None
+        self.tabCloseRequested.connect(self.__closeRequested)
         
         self.setCornerWidget(self.rightCornerWidget, Qt.TopRightCorner)
         
@@ -370,10 +359,7 @@
         editor = assembly.getEditor()
         super(TabWidget, self).addTab(
             assembly, UI.PixmapCache.getIcon("empty.png"), title)
-        if self.closeButton:
-            self.closeButton.setEnabled(True)
-        else:
-            self.setTabsClosable(True)
+        self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
         
         if editor not in self.editors:
@@ -404,10 +390,7 @@
             index, assembly,
             UI.PixmapCache.getIcon("empty.png"),
             title)
-        if self.closeButton:
-            self.closeButton.setEnabled(True)
-        else:
-            self.setTabsClosable(True)
+        self.setTabsClosable(True)
         self.navigationButton.setEnabled(True)
         
         if editor not in self.editors:
@@ -488,10 +471,7 @@
             super(TabWidget, self).addTab(
                 self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
             self.emptyLabel.show()
-            if self.closeButton:
-                self.closeButton.setEnabled(False)
-            else:
-                self.setTabsClosable(False)
+            self.setTabsClosable(False)
             self.navigationButton.setEnabled(False)
         
     def __relocateTab(self, sourceId, sourceIndex, targetIndex):