Remove upload/download toggle buttons

onionshare_gui/mode.py

@@ -78,6 +78,7 @@ class Mode(QtWidgets.QWidget):
         # Layout
         self.layout = QtWidgets.QVBoxLayout()
         self.layout.addWidget(self.primary_action)
+        self.layout.addStretch()
         # Hack to allow a minimum width on self.layout
         min_width_widget = QtWidgets.QWidget()
         min_width_widget.setMinimumWidth(450)

onionshare_gui/receive_mode/__init__.py

@@ -53,12 +53,6 @@ class ReceiveMode(Mode):
         self.new_upload = False # For scrolling to the bottom of the uploads list
 
         # Information about share, and show uploads button
-        self.info_show_uploads = QtWidgets.QToolButton()
-        self.info_show_uploads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/upload_window_gray.png')))
-        self.info_show_uploads.setCheckable(True)
-        self.info_show_uploads.toggled.connect(self.uploads_toggled)
-        self.info_show_uploads.setToolTip(strings._('gui_uploads_window_tooltip', True))
-
         self.info_in_progress_uploads_count = QtWidgets.QLabel()
         self.info_in_progress_uploads_count.setStyleSheet(self.common.css['mode_info_label'])
 
@@ -72,7 +66,6 @@ class ReceiveMode(Mode):
         self.info_layout.addStretch()
         self.info_layout.addWidget(self.info_in_progress_uploads_count)
         self.info_layout.addWidget(self.info_completed_uploads_count)
-        self.info_layout.addWidget(self.info_show_uploads)
 
         self.info_widget = QtWidgets.QWidget()
         self.info_widget.setLayout(self.info_layout)
@@ -189,7 +182,6 @@ class ReceiveMode(Mode):
         self.uploads_in_progress = 0
         self.update_uploads_completed()
         self.update_uploads_in_progress()
-        self.info_show_uploads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/upload_window_gray.png')))
         self.uploads.reset()
 
     def update_uploads_completed(self):
@@ -211,7 +203,6 @@ class ReceiveMode(Mode):
             image = self.common.get_resource_path('images/share_in_progress_none.png')
         else:
             image = self.common.get_resource_path('images/share_in_progress.png')
-            self.info_show_uploads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/upload_window_green.png')))
         self.info_in_progress_uploads_count.setText('<img src="{0:s}" /> {1:d}'.format(image, self.uploads_in_progress))
         self.info_in_progress_uploads_count.setToolTip(strings._('info_in_progress_uploads_tooltip', True).format(self.uploads_in_progress))
 
@@ -226,13 +217,3 @@ class ReceiveMode(Mode):
 
         # Resize window
         self.adjustSize()
-
-    def uploads_toggled(self, checked):
-        """
-        When the 'Show/hide uploads' button is toggled, show or hide the uploads window.
-        """
-        self.common.log('ReceiveMode', 'toggle_uploads')
-        if checked:
-            self.uploads.show()
-        else:
-            self.uploads.hide()

onionshare_gui/share_mode/__init__.py

@@ -79,12 +79,6 @@ class ShareMode(Mode):
         self.info_label = QtWidgets.QLabel()
         self.info_label.setStyleSheet(self.common.css['mode_info_label'])
 
-        self.info_show_downloads = QtWidgets.QToolButton()
-        self.info_show_downloads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/download_window_gray.png')))
-        self.info_show_downloads.setCheckable(True)
-        self.info_show_downloads.toggled.connect(self.downloads_toggled)
-        self.info_show_downloads.setToolTip(strings._('gui_downloads_window_tooltip', True))
-
         self.info_in_progress_downloads_count = QtWidgets.QLabel()
         self.info_in_progress_downloads_count.setStyleSheet(self.common.css['mode_info_label'])
 
@@ -99,7 +93,6 @@ class ShareMode(Mode):
         self.info_layout.addStretch()
         self.info_layout.addWidget(self.info_in_progress_downloads_count)
         self.info_layout.addWidget(self.info_completed_downloads_count)
-        self.info_layout.addWidget(self.info_show_downloads)
 
         self.info_widget = QtWidgets.QWidget()
         self.info_widget.setLayout(self.info_layout)
@@ -316,16 +309,6 @@ class ShareMode(Mode):
         # Resize window
         self.adjustSize()
 
-    def downloads_toggled(self, checked):
-        """
-        When the 'Show/hide downloads' button is toggled, show or hide the downloads window.
-        """
-        self.common.log('ShareMode', 'toggle_downloads')
-        if checked:
-            self.downloads.show()
-        else:
-            self.downloads.hide()
-
     def reset_info_counters(self):
         """
         Set the info counters back to zero.
@@ -334,7 +317,6 @@ class ShareMode(Mode):
         self.downloads_in_progress = 0
         self.update_downloads_completed()
         self.update_downloads_in_progress()
-        self.info_show_downloads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/download_window_gray.png')))
         self.downloads.reset()
 
     def update_downloads_completed(self):
@@ -356,7 +338,6 @@ class ShareMode(Mode):
             image = self.common.get_resource_path('images/share_in_progress_none.png')
         else:
             image = self.common.get_resource_path('images/share_in_progress.png')
-            self.info_show_downloads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/download_window_green.png')))
         self.info_in_progress_downloads_count.setText('<img src="{0:s}" /> {1:d}'.format(image, self.downloads_in_progress))
         self.info_in_progress_downloads_count.setToolTip(strings._('info_in_progress_downloads_tooltip', True).format(self.downloads_in_progress))