Fix tests

3 files changed, 36 insertions, 28 deletions

diff --git a/onionshare_gui/tab/mode/file_selection.py b/onionshare_gui/tab/mode/file_selection.py
index baa460f3..5a9e5d59 100644
--- a/onionshare_gui/tab/mode/file_selection.py
+++ b/onionshare_gui/tab/mode/file_selection.py
@@ -338,8 +338,8 @@ class FileSelection(QtWidgets.QVBoxLayout):
         else:
             self.add_button = QtWidgets.QPushButton(strings._("gui_add"))
             self.add_button.clicked.connect(self.add)
-        self.delete_button = QtWidgets.QPushButton(strings._("gui_delete"))
-        self.delete_button.clicked.connect(self.delete)
+        self.remove_button = QtWidgets.QPushButton(strings._("gui_remove"))
+        self.remove_button.clicked.connect(self.delete)
         button_layout = QtWidgets.QHBoxLayout()
         button_layout.addStretch()
         if self.common.platform == "Darwin":
@@ -347,7 +347,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
             button_layout.addWidget(self.add_folder_button)
         else:
             button_layout.addWidget(self.add_button)
-        button_layout.addWidget(self.delete_button)
+        button_layout.addWidget(self.remove_button)
 
         # Add the widgets
         self.addWidget(self.file_list)
@@ -366,7 +366,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
                 self.add_folder_button.hide()
             else:
                 self.add_button.hide()
-            self.delete_button.hide()
+            self.remove_button.hide()
         else:
             if self.common.platform == "Darwin":
                 self.add_files_button.show()
@@ -376,9 +376,9 @@ class FileSelection(QtWidgets.QVBoxLayout):
 
             # Delete button should be hidden if item isn't selected
             if len(self.file_list.selectedItems()) == 0:
-                self.delete_button.hide()
+                self.remove_button.hide()
             else:
-                self.delete_button.show()
+                self.remove_button.show()
 
         # Update the file list
         self.file_list.update()
diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py
index 3f595280..a81f83d4 100644
--- a/onionshare_gui/tab/mode/share_mode/__init__.py
+++ b/onionshare_gui/tab/mode/share_mode/__init__.py
@@ -112,11 +112,15 @@ class ShareMode(Mode):
         self.info_label.hide()
 
         # Delete all files button
-        self.delete_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_delete_all"))
-        self.delete_all_button.setFlat(True)
-        self.delete_all_button.setStyleSheet(self.common.gui.css["share_delete_all_files_button"])
-        self.delete_all_button.clicked.connect(self.delete_all)
-        self.delete_all_button.hide()
+        self.remove_all_button = QtWidgets.QPushButton(
+            strings._("gui_file_selection_remove_all")
+        )
+        self.remove_all_button.setFlat(True)
+        self.remove_all_button.setStyleSheet(
+            self.common.gui.css["share_delete_all_files_button"]
+        )
+        self.remove_all_button.clicked.connect(self.delete_all)
+        self.remove_all_button.hide()
 
         # Toggle history
         self.toggle_history = ToggleHistory(
@@ -133,7 +137,7 @@ class ShareMode(Mode):
         top_bar_layout = QtWidgets.QHBoxLayout()
         top_bar_layout.addWidget(self.info_label)
         top_bar_layout.addStretch()
-        top_bar_layout.addWidget(self.delete_all_button)
+        top_bar_layout.addWidget(self.remove_all_button)
         top_bar_layout.addWidget(self.toggle_history)
 
         # Primary action layout
@@ -206,7 +210,7 @@ class ShareMode(Mode):
         # Hide and reset the downloads if we have previously shared
         self.reset_info_counters()
 
-        self.delete_all_button.hide()
+        self.remove_all_button.hide()
 
     def start_server_step2_custom(self):
         """
@@ -267,7 +271,7 @@ class ShareMode(Mode):
         self.history.update_in_progress()
         self.file_selection.file_list.adjustSize()
 
-        self.delete_all_button.show()
+        self.remove_all_button.show()
 
     def cancel_server_custom(self):
         """
@@ -355,7 +359,7 @@ class ShareMode(Mode):
         if self.server_status.file_selection.get_num_files() > 0:
             self.primary_action.show()
             self.info_label.show()
-            self.delete_all_button.show()
+            self.remove_all_button.show()
 
     def update_primary_action(self):
         self.common.log("ShareMode", "update_primary_action")
@@ -365,7 +369,7 @@ class ShareMode(Mode):
         if file_count > 0:
             self.primary_action.show()
             self.info_label.show()
-            self.delete_all_button.show()
+            self.remove_all_button.show()
 
             # Update the file count in the info label
             total_size_bytes = 0
@@ -388,7 +392,7 @@ class ShareMode(Mode):
         else:
             self.primary_action.hide()
             self.info_label.hide()
-            self.delete_all_button.hide()
+            self.remove_all_button.hide()
 
     def reset_info_counters(self):
         """
diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py
index badcd729..6199812c 100644
--- a/onionshare_gui/tab/mode/website_mode/__init__.py
+++ b/onionshare_gui/tab/mode/website_mode/__init__.py
@@ -115,11 +115,15 @@ class WebsiteMode(Mode):
         self.info_label.hide()
 
         # Delete all files button
-        self.delete_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_delete_all"))
-        self.delete_all_button.setFlat(True)
-        self.delete_all_button.setStyleSheet(self.common.gui.css["share_delete_all_files_button"])
-        self.delete_all_button.clicked.connect(self.delete_all)
-        self.delete_all_button.hide()
+        self.remove_all_button = QtWidgets.QPushButton(
+            strings._("gui_file_selection_remove_all")
+        )
+        self.remove_all_button.setFlat(True)
+        self.remove_all_button.setStyleSheet(
+            self.common.gui.css["share_delete_all_files_button"]
+        )
+        self.remove_all_button.clicked.connect(self.delete_all)
+        self.remove_all_button.hide()
 
         # Toggle history
         self.toggle_history = ToggleHistory(
@@ -136,7 +140,7 @@ class WebsiteMode(Mode):
         top_bar_layout = QtWidgets.QHBoxLayout()
         top_bar_layout.addWidget(self.info_label)
         top_bar_layout.addStretch()
-        top_bar_layout.addWidget(self.delete_all_button)
+        top_bar_layout.addWidget(self.remove_all_button)
         top_bar_layout.addWidget(self.toggle_history)
 
         # Primary action layout
@@ -199,7 +203,7 @@ class WebsiteMode(Mode):
         # Hide and reset the downloads if we have previously shared
         self.reset_info_counters()
 
-        self.delete_all_button.hide()
+        self.remove_all_button.hide()
 
     def start_server_step2_custom(self):
         """
@@ -238,7 +242,7 @@ class WebsiteMode(Mode):
         self.history.completed_count = 0
         self.file_selection.file_list.adjustSize()
 
-        self.delete_all_button.show()
+        self.remove_all_button.show()
 
     def cancel_server_custom(self):
         """
@@ -260,7 +264,7 @@ class WebsiteMode(Mode):
         if self.server_status.file_selection.get_num_files() > 0:
             self.primary_action.show()
             self.info_label.show()
-            self.delete_all_button.show()
+            self.remove_all_button.show()
 
     def update_primary_action(self):
         self.common.log("WebsiteMode", "update_primary_action")
@@ -270,7 +274,7 @@ class WebsiteMode(Mode):
         if file_count > 0:
             self.primary_action.show()
             self.info_label.show()
-            self.delete_all_button.show()
+            self.remove_all_button.show()
 
             # Update the file count in the info label
             total_size_bytes = 0
@@ -293,7 +297,7 @@ class WebsiteMode(Mode):
         else:
             self.primary_action.hide()
             self.info_label.hide()
-            self.delete_all_button.hide()
+            self.remove_all_button.hide()
 
     def reset_info_counters(self):
         """