Mercurial Repositories > eric / changeset

--- a/eric6/Helpviewer/HelpTabWidget.py	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Helpviewer/HelpTabWidget.py	Sat May 04 14:45:04 2019 +0200
@@ -116,20 +116,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 help window"))
-        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)
         
@@ -367,7 +355,6 @@
         
         self.__mainWindow.closeAct.setEnabled(True)
         self.__mainWindow.closeAllAct.setEnabled(True)
-        self.__closeButton.setEnabled(True)
         self.__navigationButton.setEnabled(True)
         
         if not linkName and not requestData:
@@ -737,20 +724,6 @@
         
         for urlbar in self.__stackedUrlBar.urlBars():
             urlbar.preferencesChanged()
-        
-        if Preferences.getUI("SingleCloseButton") or \
-           not hasattr(self, 'setTabsClosable'):
-            if hasattr(self, 'setTabsClosable'):
-                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):
         """

--- a/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat May 04 14:45:04 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):

--- a/eric6/Preferences/ConfigurationPages/HelpAppearancePage.py	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/HelpAppearancePage.py	Sat May 04 14:45:04 2019 +0200
@@ -64,8 +64,6 @@
         
         self.styleSheetPicker.setText(Preferences.getHelp("UserStyleSheet"))
         
-        self.tabsCloseButtonCheckBox.setChecked(
-            Preferences.getUI("SingleCloseButton"))
         self.warnOnMultipleCloseCheckBox.setChecked(
             Preferences.getHelp("WarnOnMultipleClose"))
     
@@ -86,8 +84,6 @@
         )
         
         self.__displayMode = displayMode
-        if self.__displayMode != ConfigurationWidget.HelpBrowserMode:
-            self.tabsGroupBox.hide()
     
     def save(self):
         """
@@ -104,12 +100,6 @@
         
         self.saveColours(Preferences.setHelp)
         
-        from ..ConfigurationDialog import ConfigurationWidget
-        if self.__displayMode == ConfigurationWidget.HelpBrowserMode:
-            Preferences.setUI(
-                "SingleCloseButton",
-                self.tabsCloseButtonCheckBox.isChecked())
-        
         Preferences.setHelp(
             "WarnOnMultipleClose",
             self.warnOnMultipleCloseCheckBox.isChecked())

--- a/eric6/Preferences/ConfigurationPages/HelpAppearancePage.ui	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/HelpAppearancePage.ui	Sat May 04 14:45:04 2019 +0200
@@ -195,13 +195,6 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="tabsCloseButtonCheckBox">
-        <property name="text">
-         <string>Show only one close button instead of one for each tab</string>
-        </property>
-       </widget>
-      </item>
-      <item>
        <widget class="QCheckBox" name="warnOnMultipleCloseCheckBox">
         <property name="toolTip">
          <string>Select to issue a warning, if multiple tabs are about to be closed</string>
@@ -243,7 +236,6 @@
   <tabstop>secureURLsColourButton</tabstop>
   <tabstop>autoLoadImagesCheckBox</tabstop>
   <tabstop>styleSheetPicker</tabstop>
-  <tabstop>tabsCloseButtonCheckBox</tabstop>
   <tabstop>warnOnMultipleCloseCheckBox</tabstop>
  </tabstops>
  <resources/>

--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Sat May 04 14:45:04 2019 +0200
@@ -90,8 +90,6 @@
         self.styleSheetPicker.setText(
             Preferences.getWebBrowser("UserStyleSheet"))
         
-        self.tabsCloseButtonCheckBox.setChecked(
-            Preferences.getUI("SingleCloseButton"))
         self.warnOnMultipleCloseCheckBox.setChecked(
             Preferences.getWebBrowser("WarnOnMultipleClose"))
         
@@ -120,8 +118,6 @@
         )
         
         self.__displayMode = displayMode
-        if self.__displayMode != ConfigurationWidget.WebBrowserMode:
-            self.tabsGroupBox.hide()
     
     def save(self):
         """
@@ -173,12 +169,6 @@
         
         self.saveColours(Preferences.setWebBrowser)
         
-        from ..ConfigurationDialog import ConfigurationWidget
-        if self.__displayMode == ConfigurationWidget.WebBrowserMode:
-            Preferences.setUI(
-                "SingleCloseButton",
-                self.tabsCloseButtonCheckBox.isChecked())
-        
         Preferences.setWebBrowser(
             "WarnOnMultipleClose",
             self.warnOnMultipleCloseCheckBox.isChecked())

--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui	Sat May 04 14:44:11 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui	Sat May 04 14:45:04 2019 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>499</width>
-    <height>1116</height>
+    <height>905</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -376,13 +376,6 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="tabsCloseButtonCheckBox">
-        <property name="text">
-         <string>Show only one close button instead of one for each tab</string>
-        </property>
-       </widget>
-      </item>
-      <item>
        <widget class="QCheckBox" name="warnOnMultipleCloseCheckBox">
         <property name="toolTip">
          <string>Select to issue a warning, if multiple tabs are about to be closed</string>
@@ -491,7 +484,6 @@
   <tabstop>secureURLsColourButton</tabstop>
   <tabstop>autoLoadImagesCheckBox</tabstop>
   <tabstop>styleSheetPicker</tabstop>
-  <tabstop>tabsCloseButtonCheckBox</tabstop>
   <tabstop>warnOnMultipleCloseCheckBox</tabstop>
   <tabstop>scrollbarsCheckBox</tabstop>
   <tabstop>toolbarsCheckBox</tabstop>

--- 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):
         """