From c6c08c1c050415fcb580b99a20a1e86d5cbdb510 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 6 Jul 2020 10:25:16 +1000 Subject: [PATCH 1/2] Hide QR code button when server stops. Capitalise Code --- onionshare_gui/tab/server_status.py | 1 + share/locale/en.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index 9bfbce78..b5e20765 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -243,6 +243,7 @@ class ServerStatus(QtWidgets.QWidget): self.url.hide() self.copy_url_button.hide() self.copy_hidservauth_button.hide() + self.show_url_qr_code_button.hide() self.mode_settings_widget.update_ui() diff --git a/share/locale/en.json b/share/locale/en.json index 395d1f90..fa81e4b5 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -29,7 +29,7 @@ "gui_copied_url": "OnionShare address copied to clipboard", "gui_copied_hidservauth_title": "Copied HidServAuth", "gui_copied_hidservauth": "HidServAuth line copied to clipboard", - "gui_show_url_qr_code": "Show QR code", + "gui_show_url_qr_code": "Show QR Code", "gui_qr_code_dialog_title": "OnionShare QR Code", "gui_qr_code_description": "Scan this QR code with a QR reader, such as the camera on your phone, in order to more easily share the OnionShare address with someone.", "gui_waiting_to_start": "Scheduled to start in {}. Click to cancel.", From 410af3d671cc245f6ffd145ac7627decc9f5a4cd Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 6 Jul 2020 10:37:56 +1000 Subject: [PATCH 2/2] Add tests to make sure URL, QR Code, description etc are hidden when server stops --- tests/gui_base_test.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/gui_base_test.py b/tests/gui_base_test.py index fa503faa..ab5df8a1 100644 --- a/tests/gui_base_test.py +++ b/tests/gui_base_test.py @@ -358,6 +358,11 @@ class GuiBaseTest(unittest.TestCase): ): tab.get_mode().server_status.server_button.click() self.assertEqual(tab.get_mode().server_status.status, 0) + self.assertFalse(tab.get_mode().server_status.show_url_qr_code_button.isVisible()) + self.assertFalse(tab.get_mode().server_status.copy_url_button.isVisible()) + self.assertFalse(tab.get_mode().server_status.url.isVisible()) + self.assertFalse(tab.get_mode().server_status.url_description.isVisible()) + self.assertFalse(tab.get_mode().server_status.copy_hidservauth_button.isVisible()) def web_server_is_stopped(self, tab): """Test that the web server also stopped"""