aboutsummaryrefslogtreecommitdiff
path: root/desktop/src
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2021-11-06 20:52:05 -0700
committerMicah Lee <micah@micahflee.com>2021-11-06 20:52:05 -0700
commit0e2d2a1e46f87df6fa76bf180f6bda2df1efa5e9 (patch)
tree2b8a3ea468574e462ea673f0dad20d119b328600 /desktop/src
parentfa70368a8d4891461ae503ba40594e456e1b4dae (diff)
downloadonionshare-0e2d2a1e46f87df6fa76bf180f6bda2df1efa5e9.tar.gz
onionshare-0e2d2a1e46f87df6fa76bf180f6bda2df1efa5e9.zip
macOS seems to have close buttons that work on their own now
Diffstat (limited to 'desktop/src')
-rw-r--r--desktop/src/onionshare/tab_widget.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py
index c7a3552a..7f42632d 100644
--- a/desktop/src/onionshare/tab_widget.py
+++ b/desktop/src/onionshare/tab_widget.py
@@ -186,10 +186,6 @@ class TabWidget(QtWidgets.QTabWidget):
index = self.addTab(tab, strings._("gui_new_tab"))
self.setCurrentIndex(index)
- # In macOS, manually create a close button because tabs don't seem to have them otherwise
- if self.common.platform == "Darwin":
- self.macos_create_close_button(tab, index)
-
tab.init(mode_settings)
# Make sure the title is set
@@ -218,10 +214,6 @@ class TabWidget(QtWidgets.QTabWidget):
index = self.addTab(settings_tab, strings._("gui_settings_window_title"))
self.setCurrentIndex(index)
- # In macOS, manually create a close button because tabs don't seem to have them otherwise
- if self.common.platform == "Darwin":
- self.macos_create_close_button(settings_tab, index)
-
def open_tor_settings_tab(self):
self.common.log("TabWidget", "open_tor_settings_tab")
@@ -244,10 +236,6 @@ class TabWidget(QtWidgets.QTabWidget):
)
self.setCurrentIndex(index)
- # In macOS, manually create a close button because tabs don't seem to have them otherwise
- if self.common.platform == "Darwin":
- self.macos_create_close_button(self.tor_settings_tab, index)
-
def change_title(self, tab_id, title):
shortened_title = title
if len(shortened_title) > 11:
@@ -388,19 +376,6 @@ class TabWidget(QtWidgets.QTabWidget):
super(TabWidget, self).resizeEvent(event)
self.move_new_tab_button()
- def macos_create_close_button(self, tab, index):
- def close_tab():
- self.tabBar().tabCloseRequested.emit(self.indexOf(tab))
-
- close_button = QtWidgets.QPushButton()
- close_button.setFlat(True)
- close_button.setFixedWidth(40)
- close_button.setIcon(
- QtGui.QIcon(GuiCommon.get_resource_path("images/close_tab.png"))
- )
- close_button.clicked.connect(close_tab)
- self.tabBar().setTabButton(index, QtWidgets.QTabBar.RightSide, tab.close_button)
-
def tor_is_connected(self):
for tab_id in self.tabs:
if not (