diff options
| author | Miguel Jacq <mig@mig5.net> | 2019-09-03 17:02:00 +1000 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2019-09-03 17:02:29 +1000 |
| commit | 09f2f572982f39a411ae82891d677d929c29a52f (patch) | |
| tree | 52608c9934cce03c254aa7088dba8bbc12c0edee | |
| parent | f118ebcb090021d9468b9f26a2c24395eaea8fa9 (diff) | |
| download | onionshare-09f2f572982f39a411ae82891d677d929c29a52f.tar.gz onionshare-09f2f572982f39a411ae82891d677d929c29a52f.zip | |
Reset the ToggleHistory indicator count/label when a share starts. Add a test for this
| -rw-r--r-- | onionshare_gui/mode/receive_mode/__init__.py | 2 | ||||
| -rw-r--r-- | onionshare_gui/mode/share_mode/__init__.py | 2 | ||||
| -rw-r--r-- | onionshare_gui/mode/website_mode/__init__.py | 2 | ||||
| -rw-r--r-- | tests/GuiBaseTest.py | 3 | ||||
| -rw-r--r-- | tests/GuiShareTest.py | 1 |
5 files changed, 10 insertions, 0 deletions
diff --git a/onionshare_gui/mode/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py index dbc0bc73..0010fbd2 100644 --- a/onionshare_gui/mode/receive_mode/__init__.py +++ b/onionshare_gui/mode/receive_mode/__init__.py @@ -212,6 +212,8 @@ class ReceiveMode(Mode): Set the info counters back to zero. """ self.history.reset() + self.toggle_history.indicator_count = 0 + self.toggle_history.update_indicator() def update_primary_action(self): self.common.log('ReceiveMode', 'update_primary_action') diff --git a/onionshare_gui/mode/share_mode/__init__.py b/onionshare_gui/mode/share_mode/__init__.py index a9752174..56aa1364 100644 --- a/onionshare_gui/mode/share_mode/__init__.py +++ b/onionshare_gui/mode/share_mode/__init__.py @@ -334,6 +334,8 @@ class ShareMode(Mode): Set the info counters back to zero. """ self.history.reset() + self.toggle_history.indicator_count = 0 + self.toggle_history.update_indicator() @staticmethod def _compute_total_size(filenames): diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py index 9f01cabc..8ac88c8c 100644 --- a/onionshare_gui/mode/website_mode/__init__.py +++ b/onionshare_gui/mode/website_mode/__init__.py @@ -258,6 +258,8 @@ class WebsiteMode(Mode): Set the info counters back to zero. """ self.history.reset() + self.toggle_history.indicator_count = 0 + self.toggle_history.update_indicator() @staticmethod def _compute_total_size(filenames): diff --git a/tests/GuiBaseTest.py b/tests/GuiBaseTest.py index f478dd94..9a69619b 100644 --- a/tests/GuiBaseTest.py +++ b/tests/GuiBaseTest.py @@ -170,6 +170,9 @@ class GuiBaseTest(object): QtTest.QTest.mouseClick(mode.server_status.server_button, QtCore.Qt.LeftButton) self.assertEqual(mode.server_status.status, 1) + def toggle_indicator_is_reset(self, mode): + self.assertEqual(mode.toggle_history.indicator_count, 0) + self.assertFalse(mode.toggle_history.indicator_label.isVisible()) def server_status_indicator_says_starting(self, mode): '''Test that the Server Status indicator shows we are Starting''' diff --git a/tests/GuiShareTest.py b/tests/GuiShareTest.py index f8fefe60..038f052b 100644 --- a/tests/GuiShareTest.py +++ b/tests/GuiShareTest.py @@ -173,6 +173,7 @@ class GuiShareTest(GuiBaseTest): self.server_status_indicator_says_closed(self.gui.share_mode, stay_open) self.add_button_visible(self.gui.share_mode) self.server_working_on_start_button_pressed(self.gui.share_mode) + self.toggle_indicator_is_reset(self.gui.share_mode) self.server_is_started(self.gui.share_mode) self.history_indicator(self.gui.share_mode, public_mode) |