From 4c18a72616070182157d134c116ca36b92d8822f Mon Sep 17 00:00:00 2001 From: codyroberts Date: Sat, 14 Dec 2019 20:23:53 -0600 Subject: [PATCH 01/22] Made URL selectable by mouse and keyboard, commented out self.copy_url() to prevent overwriting clipboard --- onionshare_gui/server_status.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py index 5732ce91..a575a517 100644 --- a/onionshare_gui/server_status.py +++ b/onionshare_gui/server_status.py @@ -20,6 +20,7 @@ along with this program. If not, see . import platform import textwrap from PyQt5 import QtCore, QtWidgets, QtGui +from PyQt5.QtCore import Qt from onionshare import strings @@ -152,6 +153,7 @@ class ServerStatus(QtWidgets.QWidget): self.url.setWordWrap(True) self.url.setMinimumSize(self.url.sizeHint()) self.url.setStyleSheet(self.common.css["server_status_url"]) + self.url.setTextInteractionFlags(Qt.TextSelectableByMouse | Qt.TextSelectableByKeyboard) self.copy_url_button = QtWidgets.QPushButton(strings._("gui_copy_url")) self.copy_url_button.setFlat(True) @@ -483,7 +485,7 @@ class ServerStatus(QtWidgets.QWidget): The server has finished starting. """ self.status = self.STATUS_STARTED - self.copy_url() + # self.copy_url() self.update() self.server_started_finished.emit() From a7856d5dcb42bc95b1a4d6c127fa798f0a61564f Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 6 Apr 2020 15:29:33 +1000 Subject: [PATCH 02/22] Fix logic that checks if auto-start timer setting is enabled, so that it checks real settings and not widget instantiation. Ensure the auto-start and auto-stop widgets show their datetime widget on start-up if the setting was already enabled. --- onionshare_gui/tab/mode/__init__.py | 11 ++++------- onionshare_gui/tab/mode/mode_settings_widget.py | 10 ++++++++-- onionshare_gui/tab/server_status.py | 11 +---------- onionshare_gui/tab/tab.py | 4 ++-- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/onionshare_gui/tab/mode/__init__.py b/onionshare_gui/tab/mode/__init__.py index 7696f79e..fc79d0ad 100644 --- a/onionshare_gui/tab/mode/__init__.py +++ b/onionshare_gui/tab/mode/__init__.py @@ -138,7 +138,7 @@ class Mode(QtWidgets.QWidget): """ # If this is a scheduled share, display the countdown til the share starts if self.server_status.status == ServerStatus.STATUS_WORKING: - if self.server_status.autostart_timer_datetime: + if self.settings.get("general", "autostart_timer"): now = QtCore.QDateTime.currentDateTime() if self.server_status.local_only: seconds_remaining = now.secsTo( @@ -227,13 +227,8 @@ class Mode(QtWidgets.QWidget): # Start the onion thread. If this share was scheduled for a future date, # the OnionThread will start and exit 'early' to obtain the port, password # and onion address, but it will not start the WebThread yet. - if self.server_status.autostart_timer_datetime: + if self.settings.get("general", "autostart_timer"): self.start_onion_thread(obtain_onion_early=True) - else: - self.start_onion_thread() - - # If scheduling a share, delay starting the real share - if self.server_status.autostart_timer_datetime: self.common.log("Mode", "start_server", "Starting auto-start timer") self.startup_thread = AutoStartTimer(self) # Once the timer has finished, start the real share, with a WebThread @@ -241,6 +236,8 @@ class Mode(QtWidgets.QWidget): self.startup_thread.error.connect(self.start_server_error) self.startup_thread.canceled = False self.startup_thread.start() + else: + self.start_onion_thread() def start_onion_thread(self, obtain_onion_early=False): self.common.log("Mode", "start_server", "Starting an onion thread") diff --git a/onionshare_gui/tab/mode/mode_settings_widget.py b/onionshare_gui/tab/mode/mode_settings_widget.py index 34335494..ed224589 100644 --- a/onionshare_gui/tab/mode/mode_settings_widget.py +++ b/onionshare_gui/tab/mode/mode_settings_widget.py @@ -76,7 +76,10 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.autostart_timer_widget.setCurrentSection( QtWidgets.QDateTimeEdit.MinuteSection ) - self.autostart_timer_widget.hide() + if self.settings.get("general", "autostart_timer"): + self.autostart_timer_widget.show() + else: + self.autostart_timer_widget.hide() # Autostart timer layout autostart_timer_layout = QtWidgets.QHBoxLayout() @@ -104,7 +107,10 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.autostop_timer_widget.setCurrentSection( QtWidgets.QDateTimeEdit.MinuteSection ) - self.autostop_timer_widget.hide() + if self.settings.get("general", "autostop_timer"): + self.autostop_timer_widget.show() + else: + self.autostop_timer_widget.hide() # Autostop timer layout autostop_timer_layout = QtWidgets.QHBoxLayout() diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index 0fbc11b6..961ee03b 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -269,7 +269,7 @@ class ServerStatus(QtWidgets.QWidget): self.common.gui.css["server_status_button_working"] ) self.server_button.setEnabled(True) - if self.autostart_timer_datetime: + if self.settings.get("general", "autostart_timer"): self.server_button.setToolTip( strings._("gui_start_server_autostart_timer_tooltip").format( self.mode_settings_widget.autostart_timer_widget.dateTime().toString( @@ -279,15 +279,6 @@ class ServerStatus(QtWidgets.QWidget): ) else: self.server_button.setText(strings._("gui_please_wait")) - - if self.settings.get("general", "autostart_timer"): - self.server_button.setToolTip( - strings._("gui_start_server_autostart_timer_tooltip").format( - self.mode_settings_widget.autostart_timer_widget.dateTime().toString( - "h:mm AP, MMMM dd, yyyy" - ) - ) - ) else: self.server_button.setStyleSheet( self.common.gui.css["server_status_button_working"] diff --git a/onionshare_gui/tab/tab.py b/onionshare_gui/tab/tab.py index aa4518b5..5117618f 100644 --- a/onionshare_gui/tab/tab.py +++ b/onionshare_gui/tab/tab.py @@ -287,7 +287,7 @@ class Tab(QtWidgets.QWidget): strings._("gui_status_indicator_share_stopped") ) elif self.share_mode.server_status.status == ServerStatus.STATUS_WORKING: - if self.share_mode.server_status.autostart_timer_datetime: + if self.settings.get("general", "autostart_timer"): self.set_server_status_indicator_working( strings._("gui_status_indicator_share_scheduled") ) @@ -320,7 +320,7 @@ class Tab(QtWidgets.QWidget): strings._("gui_status_indicator_receive_stopped") ) elif self.receive_mode.server_status.status == ServerStatus.STATUS_WORKING: - if self.receive_mode.server_status.autostart_timer_datetime: + if self.settings.get("general", "autostart_timer"): self.set_server_status_indicator_working( strings._("gui_status_indicator_receive_scheduled") ) From ce682e239369253998d2e62a24c1e88d54aec1b6 Mon Sep 17 00:00:00 2001 From: Kcchouette Date: Tue, 12 May 2020 19:07:28 +0200 Subject: [PATCH 03/22] update archlinux onionshare URL --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index fd7e9ebe..346a6f43 100644 --- a/BUILD.md +++ b/BUILD.md @@ -103,7 +103,7 @@ Create a .rpm on Fedora-like distros: `./install/build_rpm.sh` For openSUSE: There are instructions for building [in the wiki](https://github.com/micahflee/onionshare/wiki/Linux-Distribution-Support#opensuse-leap-150). -For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/packages/onionshare/) that can be used to install OnionShare. +For ArchLinux: There is a PKBUILD available [here](https://www.archlinux.org/packages/community/any/onionshare/) that can be used to install OnionShare. If you find that these instructions don't work for your Linux distribution or version, consult the [Linux Distribution Support wiki guide](https://github.com/micahflee/onionshare/wiki/Linux-Distribution-Support), which might contain extra instructions. From 1632a00a9198b89faf45e4d32294855fdd8dd874 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Wed, 27 May 2020 12:56:33 +1000 Subject: [PATCH 04/22] #1116 Add a Clear All button in the File List area for share modes --- onionshare_gui/gui_common.py | 5 +++ .../tab/mode/share_mode/__init__.py | 20 +++++++++++ .../tab/mode/website_mode/__init__.py | 20 +++++++++++ share/locale/en.json | 3 +- tests/test_gui_share.py | 34 ++++++++++++++++--- 5 files changed, 77 insertions(+), 5 deletions(-) diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py index 4381545e..91e05b68 100644 --- a/onionshare_gui/gui_common.py +++ b/onionshare_gui/gui_common.py @@ -208,6 +208,11 @@ class GuiCommon: color: #cc0000; }""", # Share mode and child widget styles + "share_clear_all_files_button": """ + QPushButton { + color: #3f7fcf; + } + """, "share_zip_progess_bar": """ QProgressBar { border: 1px solid #4e064f; diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py index 1423d60a..4436ba25 100644 --- a/onionshare_gui/tab/mode/share_mode/__init__.py +++ b/onionshare_gui/tab/mode/share_mode/__init__.py @@ -111,6 +111,13 @@ class ShareMode(Mode): self.info_label = QtWidgets.QLabel() self.info_label.hide() + # Clear all files button + self.clear_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_clear_all")) + self.clear_all_button.setFlat(True) + self.clear_all_button.setStyleSheet(self.common.gui.css["share_clear_all_files_button"]) + self.clear_all_button.clicked.connect(self.clear_all) + self.clear_all_button.hide() + # Toggle history self.toggle_history = ToggleHistory( self.common, @@ -126,6 +133,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.clear_all_button) top_bar_layout.addWidget(self.toggle_history) # Primary action layout @@ -343,6 +351,7 @@ class ShareMode(Mode): if self.server_status.file_selection.get_num_files() > 0: self.primary_action.show() self.info_label.show() + self.clear_all_button.show() def update_primary_action(self): self.common.log("ShareMode", "update_primary_action") @@ -352,6 +361,7 @@ class ShareMode(Mode): if file_count > 0: self.primary_action.show() self.info_label.show() + self.clear_all_button.show() # Update the file count in the info label total_size_bytes = 0 @@ -374,6 +384,7 @@ class ShareMode(Mode): else: self.primary_action.hide() self.info_label.hide() + self.clear_all_button.hide() def reset_info_counters(self): """ @@ -383,6 +394,15 @@ class ShareMode(Mode): self.toggle_history.indicator_count = 0 self.toggle_history.update_indicator() + def clear_all(self): + """ + Delete All button clicked + """ + self.file_selection.file_list.clear() + self.file_selection.file_list.files_updated.emit() + + self.file_selection.file_list.setCurrentItem(None) + @staticmethod def _compute_total_size(filenames): total_size = 0 diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py index db8dbf09..11fba562 100644 --- a/onionshare_gui/tab/mode/website_mode/__init__.py +++ b/onionshare_gui/tab/mode/website_mode/__init__.py @@ -114,6 +114,13 @@ class WebsiteMode(Mode): self.info_label = QtWidgets.QLabel() self.info_label.hide() + # Clear all files button + self.clear_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_clear_all")) + self.clear_all_button.setFlat(True) + self.clear_all_button.setStyleSheet(self.common.gui.css["share_clear_all_files_button"]) + self.clear_all_button.clicked.connect(self.clear_all) + self.clear_all_button.hide() + # Toggle history self.toggle_history = ToggleHistory( self.common, @@ -129,6 +136,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.clear_all_button) top_bar_layout.addWidget(self.toggle_history) # Primary action layout @@ -248,6 +256,7 @@ class WebsiteMode(Mode): if self.server_status.file_selection.get_num_files() > 0: self.primary_action.show() self.info_label.show() + self.clear_all_button.show() def update_primary_action(self): self.common.log("WebsiteMode", "update_primary_action") @@ -257,6 +266,7 @@ class WebsiteMode(Mode): if file_count > 0: self.primary_action.show() self.info_label.show() + self.clear_all_button.show() # Update the file count in the info label total_size_bytes = 0 @@ -279,6 +289,7 @@ class WebsiteMode(Mode): else: self.primary_action.hide() self.info_label.hide() + self.clear_all_button.hide() def reset_info_counters(self): """ @@ -288,6 +299,15 @@ class WebsiteMode(Mode): self.toggle_history.indicator_count = 0 self.toggle_history.update_indicator() + def clear_all(self): + """ + Delete All button clicked + """ + self.file_selection.file_list.clear() + self.file_selection.file_list.files_updated.emit() + + self.file_selection.file_list.setCurrentItem(None) + @staticmethod def _compute_total_size(filenames): total_size = 0 diff --git a/share/locale/en.json b/share/locale/en.json index cca7d92e..66c2d000 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -12,6 +12,7 @@ "gui_add_files": "Add Files", "gui_add_folder": "Add Folder", "gui_delete": "Delete", + "gui_file_selection_clear_all": "Clear All", "gui_choose_items": "Choose", "gui_share_start_server": "Start sharing", "gui_share_stop_server": "Stop sharing", @@ -205,4 +206,4 @@ "mode_settings_receive_data_dir_label": "Save files to", "mode_settings_receive_data_dir_browse_button": "Browse", "mode_settings_website_disable_csp_checkbox": "Disable Content Security Policy header (allows your website to use third-party resources)" -} \ No newline at end of file +} diff --git a/tests/test_gui_share.py b/tests/test_gui_share.py index c8b6292a..c3708c9d 100644 --- a/tests/test_gui_share.py +++ b/tests/test_gui_share.py @@ -55,6 +55,14 @@ class TestShare(GuiBaseTest): ).item_button.click() self.file_selection_widget_has_files(tab, num_files) + def add_a_file_and_delete_using_clear_all_widget(self, tab): + """Test that we can also delete all files by clicking on the Clear All widget""" + tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[0]) + tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[1]) + tab.get_mode().clear_all_button.click() + # Should be no files after clearing all + self.file_selection_widget_has_files(tab, 0) + def file_selection_widget_read_files(self, tab): """Re-add some files to the list so we can share""" num_files = tab.get_mode().server_status.file_selection.get_num_files() @@ -269,7 +277,7 @@ class TestShare(GuiBaseTest): self.run_all_share_mode_started_tests(tab) self.run_all_share_mode_download_tests(tab) - def run_all_clear_all_button_tests(self, tab): + def run_all_clear_all_history_button_tests(self, tab): """Test the Clear All history button""" self.run_all_share_mode_setup_tests(tab) self.run_all_share_mode_started_tests(tab) @@ -279,6 +287,11 @@ class TestShare(GuiBaseTest): self.individual_file_is_viewable_or_not(tab) self.clear_all_history_items(tab, 2) + def run_all_clear_all_file_selection_button_tests(self, tab): + """Test the Clear All File Selection button""" + self.run_all_share_mode_setup_tests(tab) + self.add_a_file_and_delete_using_clear_all_widget(tab) + def run_all_share_mode_individual_file_tests(self, tab): """Tests in share mode when viewing an individual file""" self.run_all_share_mode_setup_tests(tab) @@ -375,18 +388,31 @@ class TestShare(GuiBaseTest): self.close_all_tabs() @pytest.mark.gui - def test_clear_all_button(self): + def test_clear_all_history_button(self): """ - Test canceling a scheduled share + Test clearing all history items """ tab = self.new_share_tab() tab.get_mode().autostop_sharing_checkbox.click() self.run_all_common_setup_tests() - self.run_all_clear_all_button_tests(tab) + self.run_all_clear_all_history_button_tests(tab) self.close_all_tabs() + @pytest.mark.gui + def test_clear_all_file_selection_button(self): + """ + Test clearing all file items at once + """ + tab = self.new_share_tab() + + self.run_all_common_setup_tests() + self.run_all_clear_all_file_selection_button_tests(tab) + + self.close_all_tabs() + + @pytest.mark.gui def test_public_mode(self): """ From 327747fa3f6c376d25abb21dc0c6a329f5ef78d2 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Wed, 27 May 2020 12:59:13 +1000 Subject: [PATCH 05/22] Change code doc from 'Delete All' to 'Clear All' and remove whitespace in test --- onionshare_gui/tab/mode/share_mode/__init__.py | 2 +- onionshare_gui/tab/mode/website_mode/__init__.py | 2 +- tests/test_gui_share.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py index 4436ba25..c64fc78c 100644 --- a/onionshare_gui/tab/mode/share_mode/__init__.py +++ b/onionshare_gui/tab/mode/share_mode/__init__.py @@ -396,7 +396,7 @@ class ShareMode(Mode): def clear_all(self): """ - Delete All button clicked + Clear All button clicked """ self.file_selection.file_list.clear() self.file_selection.file_list.files_updated.emit() diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py index 11fba562..1f7980ff 100644 --- a/onionshare_gui/tab/mode/website_mode/__init__.py +++ b/onionshare_gui/tab/mode/website_mode/__init__.py @@ -301,7 +301,7 @@ class WebsiteMode(Mode): def clear_all(self): """ - Delete All button clicked + Clear All button clicked """ self.file_selection.file_list.clear() self.file_selection.file_list.files_updated.emit() diff --git a/tests/test_gui_share.py b/tests/test_gui_share.py index c3708c9d..91d89d2c 100644 --- a/tests/test_gui_share.py +++ b/tests/test_gui_share.py @@ -412,7 +412,6 @@ class TestShare(GuiBaseTest): self.close_all_tabs() - @pytest.mark.gui def test_public_mode(self): """ From a22a559e989bd08f4b7928e2c511ebfdd4cdb3f8 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 28 May 2020 13:02:16 +1000 Subject: [PATCH 06/22] Hide the Clear All button on server start, show it again when stopped --- onionshare_gui/tab/mode/share_mode/__init__.py | 4 ++++ onionshare_gui/tab/mode/website_mode/__init__.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py index c64fc78c..942f856f 100644 --- a/onionshare_gui/tab/mode/share_mode/__init__.py +++ b/onionshare_gui/tab/mode/share_mode/__init__.py @@ -206,6 +206,8 @@ class ShareMode(Mode): # Hide and reset the downloads if we have previously shared self.reset_info_counters() + self.clear_all_button.hide() + def start_server_step2_custom(self): """ Step 2 in starting the server. Zipping up files. @@ -265,6 +267,8 @@ class ShareMode(Mode): self.history.update_in_progress() self.file_selection.file_list.adjustSize() + self.clear_all_button.show() + def cancel_server_custom(self): """ Stop the compression thread on cancel diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py index 1f7980ff..e8c0a0ef 100644 --- a/onionshare_gui/tab/mode/website_mode/__init__.py +++ b/onionshare_gui/tab/mode/website_mode/__init__.py @@ -199,6 +199,8 @@ class WebsiteMode(Mode): # Hide and reset the downloads if we have previously shared self.reset_info_counters() + self.clear_all_button.hide() + def start_server_step2_custom(self): """ Step 2 in starting the server. Zipping up files. @@ -236,6 +238,8 @@ class WebsiteMode(Mode): self.history.completed_count = 0 self.file_selection.file_list.adjustSize() + self.clear_all_button.show() + def cancel_server_custom(self): """ Log that the server has been cancelled From ff0427daea0828489ff5015485d2e32308fc2a23 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 28 May 2020 15:06:06 +1000 Subject: [PATCH 07/22] #1123 Load the ajax.gif in receive.js via relative directory, now that static path is not... static --- share/static/js/receive.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/static/js/receive.js b/share/static/js/receive.js index cbd60954..30b6a46d 100644 --- a/share/static/js/receive.js +++ b/share/static/js/receive.js @@ -4,6 +4,11 @@ $(function(){ $('#flashes').append($('
  • ').addClass(category).text(message)); }; + var scriptEls = document.getElementsByTagName( 'script' ); + var thisScriptEl = scriptEls[scriptEls.length - 1]; + var scriptPath = thisScriptEl.src; + var scriptFolder = scriptPath.substr(0, scriptPath.lastIndexOf( '/' )+1 ); + // Intercept submitting the form $('#send').submit(function(event){ event.preventDefault(); @@ -38,7 +43,7 @@ $(function(){ // and update the status if(event.loaded == event.total) { $('.cancel', ajax.$upload_div).remove(); - $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); + $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); } }, false); From 554012b8f4786a0b08a734d7966a1f8c566bc7b2 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 28 May 2020 15:19:54 +1000 Subject: [PATCH 08/22] #1121 upgrade to jQuery 3.5.1 --- share/static/js/jquery-3.4.0.min.js | 2 -- share/static/js/jquery-3.5.1.min.js | 2 ++ share/templates/receive.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 share/static/js/jquery-3.4.0.min.js create mode 100644 share/static/js/jquery-3.5.1.min.js diff --git a/share/static/js/jquery-3.4.0.min.js b/share/static/js/jquery-3.4.0.min.js deleted file mode 100644 index 769a1d9a..00000000 --- a/share/static/js/jquery-3.4.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.4.0 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.0",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ae(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ne(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ne(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n=void 0,r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n}else r&&(Q.set(this,i,k.event.trigger(k.extend(r.shift(),k.Event.prototype),r,this)),e.stopImmediatePropagation())}})):k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
    ",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
    ",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 - + From 4cf508ed8e05fc38762ca49942d3a83a3d8123f5 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 31 May 2020 17:44:57 +1000 Subject: [PATCH 09/22] #1115 Add QR Code for onion URL --- onionshare_gui/tab/server_status.py | 20 +++++++++- onionshare_gui/widgets.py | 60 ++++++++++++++++++++++++++++- poetry.lock | 30 +++++++++++++-- pyproject.toml | 1 + share/locale/en.json | 5 ++- tests/gui_base_test.py | 11 ++++++ tests/test_gui_receive.py | 1 + tests/test_gui_share.py | 1 + tests/test_gui_website.py | 1 + 9 files changed, 123 insertions(+), 7 deletions(-) diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index 0fbc11b6..10d45bcc 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -24,7 +24,8 @@ from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings from ..widgets import Alert - +from ..widgets import Image +from ..widgets import QRCodeDialog class ServerStatus(QtWidgets.QWidget): """ @@ -96,6 +97,14 @@ class ServerStatus(QtWidgets.QWidget): self.copy_hidservauth_button = QtWidgets.QPushButton( strings._("gui_copy_hidservauth") ) + self.show_url_qr_code_button = QtWidgets.QPushButton(strings._("gui_show_url_qr_code")) + self.show_url_qr_code_button.hide() + self.show_url_qr_code_button.clicked.connect(self.show_url_qr_code_button_clicked) + self.show_url_qr_code_button.setFlat(True) + self.show_url_qr_code_button.setStyleSheet( + self.common.gui.css["server_status_url_buttons"] + ) + self.copy_hidservauth_button.setFlat(True) self.copy_hidservauth_button.setStyleSheet( self.common.gui.css["server_status_url_buttons"] @@ -103,6 +112,7 @@ class ServerStatus(QtWidgets.QWidget): self.copy_hidservauth_button.clicked.connect(self.copy_hidservauth) url_buttons_layout = QtWidgets.QHBoxLayout() url_buttons_layout.addWidget(self.copy_url_button) + url_buttons_layout.addWidget(self.show_url_qr_code_button) url_buttons_layout.addWidget(self.copy_hidservauth_button) url_buttons_layout.addStretch() @@ -190,6 +200,8 @@ class ServerStatus(QtWidgets.QWidget): self.url.show() self.copy_url_button.show() + self.show_url_qr_code_button.show() + if self.settings.get("general", "client_auth"): self.copy_hidservauth_button.show() else: @@ -364,6 +376,12 @@ class ServerStatus(QtWidgets.QWidget): self.cancel_server() self.button_clicked.emit() + def show_url_qr_code_button_clicked(self): + """ + Show a QR code of the onion URL. + """ + self.qr_code_dialog = QRCodeDialog(self.common, self.get_url()) + def start_server(self): """ Start the server. diff --git a/onionshare_gui/widgets.py b/onionshare_gui/widgets.py index 74ef2c88..3b1180b3 100644 --- a/onionshare_gui/widgets.py +++ b/onionshare_gui/widgets.py @@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ from PyQt5 import QtCore, QtWidgets, QtGui - +from onionshare import strings +import qrcode class Alert(QtWidgets.QMessageBox): """ @@ -90,3 +91,60 @@ class MinimumWidthWidget(QtWidgets.QWidget): super(MinimumWidthWidget, self).__init__() self.setMinimumWidth(width) + +class Image(qrcode.image.base.BaseImage): + def __init__(self, border, width, box_size): + self.border = border + self.width = width + self.box_size = box_size + size = (width + border * 2) * box_size + self._image = QtGui.QImage( + size, size, QtGui.QImage.Format_RGB16) + self._image.fill(QtCore.Qt.white) + + def pixmap(self): + return QtGui.QPixmap.fromImage(self._image) + + def drawrect(self, row, col): + painter = QtGui.QPainter(self._image) + painter.fillRect( + (col + self.border) * self.box_size, + (row + self.border) * self.box_size, + self.box_size, self.box_size, + QtCore.Qt.black) + + def save(self, stream, kind=None): + pass + + +class QRCodeDialog(QtWidgets.QDialog): + """ + A dialog showing a QR code. + """ + + def __init__(self, common, text): + super(QRCodeDialog, self).__init__() + + self.common = common + self.text = text + + self.common.log("QrCode", "__init__") + + self.qr_label = QtWidgets.QLabel(self) + self.qr_label.setPixmap( + qrcode.make(self.text, image_factory=Image).pixmap()) + + self.qr_label_description = QtWidgets.QLabel(self) + self.qr_label_description.setText(strings._("gui_qr_code_description")) + self.qr_label_description.setWordWrap(True) + + self.setWindowTitle(strings._("gui_qr_code_dialog_title")) + self.setWindowIcon( + QtGui.QIcon(self.common.get_resource_path("images/logo.png")) + ) + layout = QtWidgets.QVBoxLayout(self) + layout.addWidget(self.qr_label) + layout.addWidget(self.qr_label_description) + + self.exec_() + diff --git a/poetry.lock b/poetry.lock index 7c4603ba..b3ac93b3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -53,9 +53,9 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" version = "7.1.1" [[package]] -category = "dev" +category = "main" description = "Cross-platform colored terminal text." -marker = "sys_platform == \"win32\"" +marker = "platform_system == \"Windows\" or sys_platform == \"win32\"" name = "colorama" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" @@ -356,6 +356,24 @@ pytest = ">=3.0.0" dev = ["pre-commit", "tox"] doc = ["sphinx", "sphinx-rtd-theme"] +[[package]] +category = "main" +description = "QR Code image generator" +name = "qrcode" +optional = false +python-versions = "*" +version = "6.1" + +[package.dependencies] +colorama = "*" +six = "*" + +[package.extras] +dev = ["tox", "pytest", "mock"] +maintainer = ["zest.releaser"] +pil = ["pillow"] +test = ["pytest", "pytest-cov", "mock"] + [[package]] category = "main" description = "Python HTTP for Humans." @@ -375,7 +393,7 @@ security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] [[package]] -category = "dev" +category = "main" description = "Python 2 and 3 compatibility utilities" name = "six" optional = false @@ -451,7 +469,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "41d68ea93701fdaa1aa56159195db7a65863e3b34cc7305ef4a3f5d02f2bdf13" +content-hash = "3f46cfec01bcb5166c9f354aaf4439064b477955f3ea2373fcfdb65d5b89276e" python-versions = "^3.7" [metadata.files] @@ -671,6 +689,10 @@ pytest-qt = [ {file = "pytest-qt-3.3.0.tar.gz", hash = "sha256:714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"}, {file = "pytest_qt-3.3.0-py2.py3-none-any.whl", hash = "sha256:5f8928288f50489d83f5d38caf2d7d9fcd6e7cf769947902caa4661dc7c851e3"}, ] +qrcode = [ + {file = "qrcode-6.1-py2.py3-none-any.whl", hash = "sha256:3996ee560fc39532910603704c82980ff6d4d5d629f9c3f25f34174ce8606cf5"}, + {file = "qrcode-6.1.tar.gz", hash = "sha256:505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369"}, +] requests = [ {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"}, {file = "requests-2.23.0.tar.gz", hash = "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"}, diff --git a/pyproject.toml b/pyproject.toml index 53ce5858..411d03f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ urllib3 = "*" Werkzeug = "*" watchdog = "*" psutil = "*" +qrcode = "^6.1" [tool.poetry.dev-dependencies] atomicwrites = "*" diff --git a/share/locale/en.json b/share/locale/en.json index cca7d92e..57491c4b 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -28,6 +28,9 @@ "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_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 share it over an application such as Signal.", "gui_waiting_to_start": "Scheduled to start in {}. Click to cancel.", "gui_please_wait": "Starting… Click to cancel.", "error_rate_limit": "Someone has made too many wrong attempts to guess your password, so OnionShare has stopped the server. Start sharing again and send the recipient a new address to share.", @@ -205,4 +208,4 @@ "mode_settings_receive_data_dir_label": "Save files to", "mode_settings_receive_data_dir_browse_button": "Browse", "mode_settings_website_disable_csp_checkbox": "Disable Content Security Policy header (allows your website to use third-party resources)" -} \ No newline at end of file +} diff --git a/tests/gui_base_test.py b/tests/gui_base_test.py index 87353cd7..f1a4efac 100644 --- a/tests/gui_base_test.py +++ b/tests/gui_base_test.py @@ -297,6 +297,17 @@ class GuiBaseTest(unittest.TestCase): f"http://onionshare:{tab.get_mode().server_status.web.password}@127.0.0.1:{tab.app.port}", ) + def have_show_qr_code_button(self, tab): + """Test that the Show QR Code URL button is shown and that it loads a QR Code Dialog""" + self.assertTrue(tab.get_mode().server_status.show_url_qr_code_button.isVisible()) + def accept_dialog(): + window = tab.common.gui.qtapp.activeWindow() + if window: + window.close() + + QtCore.QTimer.singleShot(500, accept_dialog) + tab.get_mode().server_status.show_url_qr_code_button.click() + def server_status_indicator_says_started(self, tab): """Test that the Server Status indicator shows we are started""" if type(tab.get_mode()) == ReceiveMode: diff --git a/tests/test_gui_receive.py b/tests/test_gui_receive.py index 4ee0abd8..bd9cf491 100644 --- a/tests/test_gui_receive.py +++ b/tests/test_gui_receive.py @@ -112,6 +112,7 @@ class TestReceive(GuiBaseTest): self.have_a_password(tab) self.url_description_shown(tab) self.have_copy_url_button(tab) + self.have_show_qr_code_button(tab) self.server_status_indicator_says_started(tab) self.web_page(tab, "Select the files you want to send, then click") diff --git a/tests/test_gui_share.py b/tests/test_gui_share.py index c8b6292a..8e814248 100644 --- a/tests/test_gui_share.py +++ b/tests/test_gui_share.py @@ -231,6 +231,7 @@ class TestShare(GuiBaseTest): self.have_a_password(tab) self.url_description_shown(tab) self.have_copy_url_button(tab) + self.have_show_qr_code_button(tab) self.server_status_indicator_says_started(tab) def run_all_share_mode_download_tests(self, tab): diff --git a/tests/test_gui_website.py b/tests/test_gui_website.py index c88a4910..bc6e16ea 100644 --- a/tests/test_gui_website.py +++ b/tests/test_gui_website.py @@ -70,6 +70,7 @@ class TestWebsite(GuiBaseTest): self.have_a_password(tab) self.url_description_shown(tab) self.have_copy_url_button(tab) + self.have_show_qr_code_button(tab) self.server_status_indicator_says_started(tab) def run_all_website_mode_download_tests(self, tab): From 3c9a105d9283026a6633b4a32329705db2d84dce Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 31 May 2020 20:13:55 +1000 Subject: [PATCH 10/22] Remove unnecessary import of Image class in ServerStatus --- onionshare_gui/tab/server_status.py | 1 - 1 file changed, 1 deletion(-) diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index 10d45bcc..6a9461f0 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -24,7 +24,6 @@ from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings from ..widgets import Alert -from ..widgets import Image from ..widgets import QRCodeDialog class ServerStatus(QtWidgets.QWidget): From faae3d58d23669b51babee0abe79beb71066f994 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 31 May 2020 20:16:33 +1000 Subject: [PATCH 11/22] Update the QR code description text --- share/locale/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/locale/en.json b/share/locale/en.json index 57491c4b..eadeb7f6 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -30,7 +30,7 @@ "gui_copied_hidservauth": "HidServAuth line copied to clipboard", "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 share it over an application such as Signal.", + "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.", "gui_please_wait": "Starting… Click to cancel.", "error_rate_limit": "Someone has made too many wrong attempts to guess your password, so OnionShare has stopped the server. Start sharing again and send the recipient a new address to share.", From ce0d21bb7a961fa72e0437b1d06740576154989d Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 31 May 2020 20:17:52 +1000 Subject: [PATCH 12/22] Add code documentation --- onionshare_gui/widgets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/onionshare_gui/widgets.py b/onionshare_gui/widgets.py index 3b1180b3..58ddd1b5 100644 --- a/onionshare_gui/widgets.py +++ b/onionshare_gui/widgets.py @@ -93,6 +93,10 @@ class MinimumWidthWidget(QtWidgets.QWidget): class Image(qrcode.image.base.BaseImage): + """ + A custom Image class, for use with the QR Code pixmap. + """ + def __init__(self, border, width, box_size): self.border = border self.width = width From 5b782426063387c87d1fe5d7a7e55f108d8f24e1 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 31 May 2020 20:26:07 +1000 Subject: [PATCH 13/22] Fail early if any of the tests fail, rather than continue and possibly exit 0 --- tests/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 3c792cd3..184dfc16 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -20,7 +20,7 @@ do shift done -pytest $PARAMS -vvv ./tests/test_cli*.py +pytest $PARAMS -vvv ./tests/test_cli*.py || exit 1 for filename in ./tests/test_gui_*.py; do - pytest $PARAMS -vvv --no-qt-log $filename + pytest $PARAMS -vvv --no-qt-log $filename || exit 1 done From 39f20874f239b4f57ccf46c320cbcf8a97684eb5 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 7 Jun 2020 15:07:28 +1000 Subject: [PATCH 14/22] #1126 update the status bar each time the active tab is changed --- onionshare_gui/tab_widget.py | 19 +++++++++++++++++++ tests/test_gui_tabs.py | 3 +++ 2 files changed, 22 insertions(+) diff --git a/onionshare_gui/tab_widget.py b/onionshare_gui/tab_widget.py index d69931c0..df4072f3 100644 --- a/onionshare_gui/tab_widget.py +++ b/onionshare_gui/tab_widget.py @@ -60,6 +60,7 @@ class TabWidget(QtWidgets.QTabWidget): # Use a custom tab bar tab_bar = TabBar() tab_bar.move_new_tab_button.connect(self.move_new_tab_button) + tab_bar.currentChanged.connect(self.tab_changed) self.setTabBar(tab_bar) # Set up the tab widget @@ -108,6 +109,24 @@ class TabWidget(QtWidgets.QTabWidget): self.new_tab_button.move(pos) self.new_tab_button.raise_() + def tab_changed(self): + # Active tab was changed + tab_id = self.currentIndex() + self.common.log("TabWidget", "tab_changed", f"Tab was changed to {tab_id}") + try: + mode = self.tabs[tab_id].get_mode() + if mode: + # Update the server status indicator to reflect that of the current tab + self.tabs[tab_id].update_server_status_indicator() + else: + # If this tab doesn't have a mode set yet, blank the server status indicator + self.status_bar.server_status_image_label.clear() + self.status_bar.server_status_label.clear() + except KeyError: + # When all current tabs are closed, index briefly drops to -1 before resetting to 0 + # which will otherwise trigger a KeyError on tab.get_mode() above. + pass + def new_tab_clicked(self): # Create a new tab self.add_tab() diff --git a/tests/test_gui_tabs.py b/tests/test_gui_tabs.py index 47a3d75d..eda30f79 100644 --- a/tests/test_gui_tabs.py +++ b/tests/test_gui_tabs.py @@ -138,18 +138,21 @@ class TestTabs(GuiBaseTest): self.gui.tabs.widget(1).share_button.click() self.assertFalse(self.gui.tabs.widget(1).new_tab.isVisible()) self.assertTrue(self.gui.tabs.widget(1).share_mode.isVisible()) + self.assertEqual(self.gui.status_bar.server_status_label.text(), 'Ready to share') # New tab, receive files self.gui.tabs.new_tab_button.click() self.gui.tabs.widget(2).receive_button.click() self.assertFalse(self.gui.tabs.widget(2).new_tab.isVisible()) self.assertTrue(self.gui.tabs.widget(2).receive_mode.isVisible()) + self.assertEqual(self.gui.status_bar.server_status_label.text(), 'Ready to receive') # New tab, publish website self.gui.tabs.new_tab_button.click() self.gui.tabs.widget(3).website_button.click() self.assertFalse(self.gui.tabs.widget(3).new_tab.isVisible()) self.assertTrue(self.gui.tabs.widget(3).website_mode.isVisible()) + self.assertEqual(self.gui.status_bar.server_status_label.text(), 'Ready to share') # Close tabs self.gui.tabs.tabBar().tabButton(0, QtWidgets.QTabBar.RightSide).click() From a93cba35047147773a01ecb11e014a765fdfd2f2 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 7 Jun 2020 15:29:27 +1000 Subject: [PATCH 15/22] Set the server status indicator to 'Scheduled' when in Website Mode and autostart timer is in use, to match the other modes --- onionshare_gui/tab/tab.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/onionshare_gui/tab/tab.py b/onionshare_gui/tab/tab.py index aa4518b5..640a1c45 100644 --- a/onionshare_gui/tab/tab.py +++ b/onionshare_gui/tab/tab.py @@ -306,9 +306,14 @@ class Tab(QtWidgets.QWidget): strings._("gui_status_indicator_share_stopped") ) elif self.website_mode.server_status.status == ServerStatus.STATUS_WORKING: - self.set_server_status_indicator_working( - strings._("gui_status_indicator_share_working") - ) + if self.website_mode.server_status.autostart_timer_datetime: + self.set_server_status_indicator_working( + strings._("gui_status_indicator_share_scheduled") + ) + else: + self.set_server_status_indicator_working( + strings._("gui_status_indicator_share_working") + ) elif self.website_mode.server_status.status == ServerStatus.STATUS_STARTED: self.set_server_status_indicator_started( strings._("gui_status_indicator_share_started") From 37cab504646174d5d7b78fc3203a4cdd6b53347d Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 8 Jun 2020 09:48:00 +1000 Subject: [PATCH 16/22] Use 'Delete' rather than 'Clear' when talking about removing file items from the FileList, since we have a Delete button for individual files --- onionshare_gui/gui_common.py | 2 +- .../tab/mode/share_mode/__init__.py | 28 +++++++++---------- .../tab/mode/website_mode/__init__.py | 28 +++++++++---------- share/locale/en.json | 2 +- tests/test_gui_share.py | 18 ++++++------ 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py index 91e05b68..40c912bb 100644 --- a/onionshare_gui/gui_common.py +++ b/onionshare_gui/gui_common.py @@ -208,7 +208,7 @@ class GuiCommon: color: #cc0000; }""", # Share mode and child widget styles - "share_clear_all_files_button": """ + "share_delete_all_files_button": """ QPushButton { color: #3f7fcf; } diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py index 942f856f..3f595280 100644 --- a/onionshare_gui/tab/mode/share_mode/__init__.py +++ b/onionshare_gui/tab/mode/share_mode/__init__.py @@ -111,12 +111,12 @@ class ShareMode(Mode): self.info_label = QtWidgets.QLabel() self.info_label.hide() - # Clear all files button - self.clear_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_clear_all")) - self.clear_all_button.setFlat(True) - self.clear_all_button.setStyleSheet(self.common.gui.css["share_clear_all_files_button"]) - self.clear_all_button.clicked.connect(self.clear_all) - self.clear_all_button.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() # Toggle history self.toggle_history = ToggleHistory( @@ -133,7 +133,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.clear_all_button) + top_bar_layout.addWidget(self.delete_all_button) top_bar_layout.addWidget(self.toggle_history) # Primary action layout @@ -206,7 +206,7 @@ class ShareMode(Mode): # Hide and reset the downloads if we have previously shared self.reset_info_counters() - self.clear_all_button.hide() + self.delete_all_button.hide() def start_server_step2_custom(self): """ @@ -267,7 +267,7 @@ class ShareMode(Mode): self.history.update_in_progress() self.file_selection.file_list.adjustSize() - self.clear_all_button.show() + self.delete_all_button.show() def cancel_server_custom(self): """ @@ -355,7 +355,7 @@ class ShareMode(Mode): if self.server_status.file_selection.get_num_files() > 0: self.primary_action.show() self.info_label.show() - self.clear_all_button.show() + self.delete_all_button.show() def update_primary_action(self): self.common.log("ShareMode", "update_primary_action") @@ -365,7 +365,7 @@ class ShareMode(Mode): if file_count > 0: self.primary_action.show() self.info_label.show() - self.clear_all_button.show() + self.delete_all_button.show() # Update the file count in the info label total_size_bytes = 0 @@ -388,7 +388,7 @@ class ShareMode(Mode): else: self.primary_action.hide() self.info_label.hide() - self.clear_all_button.hide() + self.delete_all_button.hide() def reset_info_counters(self): """ @@ -398,9 +398,9 @@ class ShareMode(Mode): self.toggle_history.indicator_count = 0 self.toggle_history.update_indicator() - def clear_all(self): + def delete_all(self): """ - Clear All button clicked + Delete All button clicked """ self.file_selection.file_list.clear() self.file_selection.file_list.files_updated.emit() diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py index e8c0a0ef..badcd729 100644 --- a/onionshare_gui/tab/mode/website_mode/__init__.py +++ b/onionshare_gui/tab/mode/website_mode/__init__.py @@ -114,12 +114,12 @@ class WebsiteMode(Mode): self.info_label = QtWidgets.QLabel() self.info_label.hide() - # Clear all files button - self.clear_all_button = QtWidgets.QPushButton(strings._("gui_file_selection_clear_all")) - self.clear_all_button.setFlat(True) - self.clear_all_button.setStyleSheet(self.common.gui.css["share_clear_all_files_button"]) - self.clear_all_button.clicked.connect(self.clear_all) - self.clear_all_button.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() # Toggle history self.toggle_history = ToggleHistory( @@ -136,7 +136,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.clear_all_button) + top_bar_layout.addWidget(self.delete_all_button) top_bar_layout.addWidget(self.toggle_history) # Primary action layout @@ -199,7 +199,7 @@ class WebsiteMode(Mode): # Hide and reset the downloads if we have previously shared self.reset_info_counters() - self.clear_all_button.hide() + self.delete_all_button.hide() def start_server_step2_custom(self): """ @@ -238,7 +238,7 @@ class WebsiteMode(Mode): self.history.completed_count = 0 self.file_selection.file_list.adjustSize() - self.clear_all_button.show() + self.delete_all_button.show() def cancel_server_custom(self): """ @@ -260,7 +260,7 @@ class WebsiteMode(Mode): if self.server_status.file_selection.get_num_files() > 0: self.primary_action.show() self.info_label.show() - self.clear_all_button.show() + self.delete_all_button.show() def update_primary_action(self): self.common.log("WebsiteMode", "update_primary_action") @@ -270,7 +270,7 @@ class WebsiteMode(Mode): if file_count > 0: self.primary_action.show() self.info_label.show() - self.clear_all_button.show() + self.delete_all_button.show() # Update the file count in the info label total_size_bytes = 0 @@ -293,7 +293,7 @@ class WebsiteMode(Mode): else: self.primary_action.hide() self.info_label.hide() - self.clear_all_button.hide() + self.delete_all_button.hide() def reset_info_counters(self): """ @@ -303,9 +303,9 @@ class WebsiteMode(Mode): self.toggle_history.indicator_count = 0 self.toggle_history.update_indicator() - def clear_all(self): + def delete_all(self): """ - Clear All button clicked + Delete All button clicked """ self.file_selection.file_list.clear() self.file_selection.file_list.files_updated.emit() diff --git a/share/locale/en.json b/share/locale/en.json index 66c2d000..fbed6867 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -12,7 +12,7 @@ "gui_add_files": "Add Files", "gui_add_folder": "Add Folder", "gui_delete": "Delete", - "gui_file_selection_clear_all": "Clear All", + "gui_file_selection_delete_all": "Delete All", "gui_choose_items": "Choose", "gui_share_start_server": "Start sharing", "gui_share_stop_server": "Stop sharing", diff --git a/tests/test_gui_share.py b/tests/test_gui_share.py index 91d89d2c..9ee17ac5 100644 --- a/tests/test_gui_share.py +++ b/tests/test_gui_share.py @@ -55,11 +55,11 @@ class TestShare(GuiBaseTest): ).item_button.click() self.file_selection_widget_has_files(tab, num_files) - def add_a_file_and_delete_using_clear_all_widget(self, tab): - """Test that we can also delete all files by clicking on the Clear All widget""" + def add_a_file_and_delete_using_delete_all_widget(self, tab): + """Test that we can also delete all files by clicking on the Delete All widget""" tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[0]) tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[1]) - tab.get_mode().clear_all_button.click() + tab.get_mode().delete_all_button.click() # Should be no files after clearing all self.file_selection_widget_has_files(tab, 0) @@ -287,10 +287,10 @@ class TestShare(GuiBaseTest): self.individual_file_is_viewable_or_not(tab) self.clear_all_history_items(tab, 2) - def run_all_clear_all_file_selection_button_tests(self, tab): - """Test the Clear All File Selection button""" + def run_all_delete_all_file_selection_button_tests(self, tab): + """Test the Delete All File Selection button""" self.run_all_share_mode_setup_tests(tab) - self.add_a_file_and_delete_using_clear_all_widget(tab) + self.add_a_file_and_delete_using_delete_all_widget(tab) def run_all_share_mode_individual_file_tests(self, tab): """Tests in share mode when viewing an individual file""" @@ -401,14 +401,14 @@ class TestShare(GuiBaseTest): self.close_all_tabs() @pytest.mark.gui - def test_clear_all_file_selection_button(self): + def test_delete_all_file_selection_button(self): """ - Test clearing all file items at once + Test delete all file items at once """ tab = self.new_share_tab() self.run_all_common_setup_tests() - self.run_all_clear_all_file_selection_button_tests(tab) + self.run_all_delete_all_file_selection_button_tests(tab) self.close_all_tabs() From b32e7f8725d373779846e22667bba5571108e63c Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 8 Jun 2020 09:54:52 +1000 Subject: [PATCH 17/22] Use a more efficient way of parsing the path to /img on the static URL in order to load ajax.gif via receive.js --- share/static/js/receive.js | 8 +++----- share/templates/receive.html | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/share/static/js/receive.js b/share/static/js/receive.js index 30b6a46d..eac67412 100644 --- a/share/static/js/receive.js +++ b/share/static/js/receive.js @@ -4,10 +4,8 @@ $(function(){ $('#flashes').append($('
  • ').addClass(category).text(message)); }; - var scriptEls = document.getElementsByTagName( 'script' ); - var thisScriptEl = scriptEls[scriptEls.length - 1]; - var scriptPath = thisScriptEl.src; - var scriptFolder = scriptPath.substr(0, scriptPath.lastIndexOf( '/' )+1 ); + var scriptSrc = document.getElementById('receive-script').src; + var staticImgPath = scriptSrc.substr(0, scriptSrc.lastIndexOf( '/' )+1).replace('js', 'img'); // Intercept submitting the form $('#send').submit(function(event){ @@ -43,7 +41,7 @@ $(function(){ // and update the status if(event.loaded == event.total) { $('.cancel', ajax.$upload_div).remove(); - $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); + $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); } }, false); diff --git a/share/templates/receive.html b/share/templates/receive.html index 59a3ebe4..08875db1 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -39,6 +39,6 @@ - + From ce7313889080197d8643a9d567600a09a6206ada Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 28 May 2020 15:06:06 +1000 Subject: [PATCH 18/22] #1123 Load the ajax.gif in receive.js via relative directory, now that static path is not... static --- share/static/js/receive.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/static/js/receive.js b/share/static/js/receive.js index cbd60954..30b6a46d 100644 --- a/share/static/js/receive.js +++ b/share/static/js/receive.js @@ -4,6 +4,11 @@ $(function(){ $('#flashes').append($('
  • ').addClass(category).text(message)); }; + var scriptEls = document.getElementsByTagName( 'script' ); + var thisScriptEl = scriptEls[scriptEls.length - 1]; + var scriptPath = thisScriptEl.src; + var scriptFolder = scriptPath.substr(0, scriptPath.lastIndexOf( '/' )+1 ); + // Intercept submitting the form $('#send').submit(function(event){ event.preventDefault(); @@ -38,7 +43,7 @@ $(function(){ // and update the status if(event.loaded == event.total) { $('.cancel', ajax.$upload_div).remove(); - $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); + $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); } }, false); From 21480a51177d22dd3c75670c363d4b1ba3bb43c9 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 8 Jun 2020 09:54:52 +1000 Subject: [PATCH 19/22] Use a more efficient way of parsing the path to /img on the static URL in order to load ajax.gif via receive.js --- share/static/js/receive.js | 8 +++----- share/templates/receive.html | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/share/static/js/receive.js b/share/static/js/receive.js index 30b6a46d..eac67412 100644 --- a/share/static/js/receive.js +++ b/share/static/js/receive.js @@ -4,10 +4,8 @@ $(function(){ $('#flashes').append($('
  • ').addClass(category).text(message)); }; - var scriptEls = document.getElementsByTagName( 'script' ); - var thisScriptEl = scriptEls[scriptEls.length - 1]; - var scriptPath = thisScriptEl.src; - var scriptFolder = scriptPath.substr(0, scriptPath.lastIndexOf( '/' )+1 ); + var scriptSrc = document.getElementById('receive-script').src; + var staticImgPath = scriptSrc.substr(0, scriptSrc.lastIndexOf( '/' )+1).replace('js', 'img'); // Intercept submitting the form $('#send').submit(function(event){ @@ -43,7 +41,7 @@ $(function(){ // and update the status if(event.loaded == event.total) { $('.cancel', ajax.$upload_div).remove(); - $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); + $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); } }, false); diff --git a/share/templates/receive.html b/share/templates/receive.html index 26d87ac1..b7e7f8e5 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -39,6 +39,6 @@ - + From f6ea6e4a1d9ecae2b6cf68104db17b6d538b4a94 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 28 Jun 2020 13:01:23 -0700 Subject: [PATCH 20/22] Fix tests --- onionshare_gui/tab/mode/file_selection.py | 12 ++--- .../tab/mode/share_mode/__init__.py | 26 ++++++---- .../tab/mode/website_mode/__init__.py | 26 ++++++---- share/locale/en.json | 6 +-- tests/gui_base_test.py | 6 +-- tests/test_gui_share.py | 52 ++++++++++--------- tests/test_gui_website.py | 2 +- 7 files changed, 70 insertions(+), 60 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): """ diff --git a/share/locale/en.json b/share/locale/en.json index fbed6867..cfe69384 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -11,8 +11,8 @@ "gui_add": "Add", "gui_add_files": "Add Files", "gui_add_folder": "Add Folder", - "gui_delete": "Delete", - "gui_file_selection_delete_all": "Delete All", + "gui_remove": "Remove", + "gui_file_selection_remove_all": "Remove All", "gui_choose_items": "Choose", "gui_share_start_server": "Start sharing", "gui_share_stop_server": "Stop sharing", @@ -206,4 +206,4 @@ "mode_settings_receive_data_dir_label": "Save files to", "mode_settings_receive_data_dir_browse_button": "Browse", "mode_settings_website_disable_csp_checkbox": "Disable Content Security Policy header (allows your website to use third-party resources)" -} +} \ No newline at end of file diff --git a/tests/gui_base_test.py b/tests/gui_base_test.py index 87353cd7..cf936ef1 100644 --- a/tests/gui_base_test.py +++ b/tests/gui_base_test.py @@ -388,13 +388,13 @@ class GuiBaseTest(unittest.TestCase): tab.get_mode().server_status.file_selection.get_num_files(), num ) - def add_delete_buttons_hidden(self, tab): - """Test that the add and delete buttons are hidden when the server starts""" + def add_remove_buttons_hidden(self, tab): + """Test that the add and remove buttons are hidden when the server starts""" self.assertFalse( tab.get_mode().server_status.file_selection.add_button.isVisible() ) self.assertFalse( - tab.get_mode().server_status.file_selection.delete_button.isVisible() + tab.get_mode().server_status.file_selection.remove_button.isVisible() ) # Auto-stop timer tests diff --git a/tests/test_gui_share.py b/tests/test_gui_share.py index 9ee17ac5..daa2c04d 100644 --- a/tests/test_gui_share.py +++ b/tests/test_gui_share.py @@ -12,8 +12,8 @@ from .gui_base_test import GuiBaseTest class TestShare(GuiBaseTest): # Shared test methods - def deleting_all_files_hides_delete_button(self, tab): - """Test that clicking on the file item shows the delete button. Test that deleting the only item in the list hides the delete button""" + def removing_all_files_hides_remove_button(self, tab): + """Test that clicking on the file item shows the remove button. Test that removing the only item in the list hides the remove button""" rect = tab.get_mode().server_status.file_selection.file_list.visualItemRect( tab.get_mode().server_status.file_selection.file_list.item(0) ) @@ -22,12 +22,12 @@ class TestShare(GuiBaseTest): QtCore.Qt.LeftButton, pos=rect.center(), ) - # Delete button should be visible + # Remove button should be visible self.assertTrue( - tab.get_mode().server_status.file_selection.delete_button.isVisible() + tab.get_mode().server_status.file_selection.remove_button.isVisible() ) - # Click delete, delete button should still be visible since we have one more file - tab.get_mode().server_status.file_selection.delete_button.click() + # Click remove, remove button should still be visible since we have one more file + tab.get_mode().server_status.file_selection.remove_button.click() rect = tab.get_mode().server_status.file_selection.file_list.visualItemRect( tab.get_mode().server_status.file_selection.file_list.item(0) ) @@ -37,17 +37,17 @@ class TestShare(GuiBaseTest): pos=rect.center(), ) self.assertTrue( - tab.get_mode().server_status.file_selection.delete_button.isVisible() + tab.get_mode().server_status.file_selection.remove_button.isVisible() ) - tab.get_mode().server_status.file_selection.delete_button.click() + tab.get_mode().server_status.file_selection.remove_button.click() - # No more files, the delete button should be hidden + # No more files, the remove button should be hidden self.assertFalse( - tab.get_mode().server_status.file_selection.delete_button.isVisible() + tab.get_mode().server_status.file_selection.remove_button.isVisible() ) - def add_a_file_and_delete_using_its_delete_widget(self, tab): - """Test that we can also delete a file by clicking on its [X] widget""" + def add_a_file_and_remove_using_its_remove_widget(self, tab): + """Test that we can also remove a file by clicking on its [X] widget""" num_files = tab.get_mode().server_status.file_selection.get_num_files() tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[0]) tab.get_mode().server_status.file_selection.file_list.item( @@ -55,11 +55,11 @@ class TestShare(GuiBaseTest): ).item_button.click() self.file_selection_widget_has_files(tab, num_files) - def add_a_file_and_delete_using_delete_all_widget(self, tab): - """Test that we can also delete all files by clicking on the Delete All widget""" + def add_a_file_and_remove_using_remove_all_widget(self, tab): + """Test that we can also remove all files by clicking on the Remove All widget""" tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[0]) tab.get_mode().server_status.file_selection.file_list.add_file(self.tmpfiles[1]) - tab.get_mode().delete_all_button.click() + tab.get_mode().remove_all_button.click() # Should be no files after clearing all self.file_selection_widget_has_files(tab, 0) @@ -197,7 +197,7 @@ class TestShare(GuiBaseTest): """Test that we can cancel a share before it's started up """ self.server_working_on_start_button_pressed(tab) self.server_status_indicator_says_scheduled(tab) - self.add_delete_buttons_hidden(tab) + self.add_remove_buttons_hidden(tab) self.mode_settings_widget_is_hidden(tab) self.set_autostart_timer(tab, 10) QtTest.QTest.mousePress( @@ -224,15 +224,15 @@ class TestShare(GuiBaseTest): self.history_is_not_visible(tab) self.click_toggle_history(tab) self.history_is_visible(tab) - self.deleting_all_files_hides_delete_button(tab) - self.add_a_file_and_delete_using_its_delete_widget(tab) + self.removing_all_files_hides_remove_button(tab) + self.add_a_file_and_remove_using_its_remove_widget(tab) self.file_selection_widget_read_files(tab) def run_all_share_mode_started_tests(self, tab, startup_time=2000): """Tests in share mode after starting a share""" self.server_working_on_start_button_pressed(tab) self.server_status_indicator_says_starting(tab) - self.add_delete_buttons_hidden(tab) + self.add_remove_buttons_hidden(tab) self.mode_settings_widget_is_hidden(tab) self.server_is_started(tab, startup_time) self.web_server_is_running(tab) @@ -287,10 +287,10 @@ class TestShare(GuiBaseTest): self.individual_file_is_viewable_or_not(tab) self.clear_all_history_items(tab, 2) - def run_all_delete_all_file_selection_button_tests(self, tab): - """Test the Delete All File Selection button""" + def run_all_remove_all_file_selection_button_tests(self, tab): + """Test the Remove All File Selection button""" self.run_all_share_mode_setup_tests(tab) - self.add_a_file_and_delete_using_delete_all_widget(tab) + self.add_a_file_and_remove_using_remove_all_widget(tab) def run_all_share_mode_individual_file_tests(self, tab): """Tests in share mode when viewing an individual file""" @@ -401,14 +401,14 @@ class TestShare(GuiBaseTest): self.close_all_tabs() @pytest.mark.gui - def test_delete_all_file_selection_button(self): + def test_remove_all_file_selection_button(self): """ - Test delete all file items at once + Test remove all file items at once """ tab = self.new_share_tab() self.run_all_common_setup_tests() - self.run_all_delete_all_file_selection_button_tests(tab) + self.run_all_remove_all_file_selection_button_tests(tab) self.close_all_tabs() @@ -586,6 +586,7 @@ class TestShare(GuiBaseTest): Rate limit should be triggered """ tab = self.new_share_tab() + def accept_dialog(): window = tab.common.gui.qtapp.activeWindow() if window: @@ -605,6 +606,7 @@ class TestShare(GuiBaseTest): Public mode should skip the rate limit """ tab = self.new_share_tab() + def accept_dialog(): window = tab.common.gui.qtapp.activeWindow() if window: diff --git a/tests/test_gui_website.py b/tests/test_gui_website.py index c88a4910..e8f8e369 100644 --- a/tests/test_gui_website.py +++ b/tests/test_gui_website.py @@ -64,7 +64,7 @@ class TestWebsite(GuiBaseTest): """Tests in website mode after starting a share""" self.server_working_on_start_button_pressed(tab) self.server_status_indicator_says_starting(tab) - self.add_delete_buttons_hidden(tab) + self.add_remove_buttons_hidden(tab) self.server_is_started(tab, startup_time) self.web_server_is_running(tab) self.have_a_password(tab) From a07cdf855ae5ecece669bd0df593ff14b3ece6e0 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 29 Jun 2020 12:34:38 -0700 Subject: [PATCH 21/22] Remove forced height on copy URL button --- onionshare_gui/tab/server_status.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index 08213747..9bfbce78 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -27,6 +27,7 @@ from onionshare import strings from ..widgets import Alert from ..widgets import QRCodeDialog + class ServerStatus(QtWidgets.QWidget): """ The server status chunk of the GUI. @@ -95,14 +96,17 @@ class ServerStatus(QtWidgets.QWidget): self.copy_url_button.setStyleSheet( self.common.gui.css["server_status_url_buttons"] ) - self.copy_url_button.setMinimumHeight(65) self.copy_url_button.clicked.connect(self.copy_url) self.copy_hidservauth_button = QtWidgets.QPushButton( strings._("gui_copy_hidservauth") ) - self.show_url_qr_code_button = QtWidgets.QPushButton(strings._("gui_show_url_qr_code")) + self.show_url_qr_code_button = QtWidgets.QPushButton( + strings._("gui_show_url_qr_code") + ) self.show_url_qr_code_button.hide() - self.show_url_qr_code_button.clicked.connect(self.show_url_qr_code_button_clicked) + self.show_url_qr_code_button.clicked.connect( + self.show_url_qr_code_button_clicked + ) self.show_url_qr_code_button.setFlat(True) self.show_url_qr_code_button.setStyleSheet( self.common.gui.css["server_status_url_buttons"] @@ -375,7 +379,7 @@ class ServerStatus(QtWidgets.QWidget): Show a QR code of the onion URL. """ self.qr_code_dialog = QRCodeDialog(self.common, self.get_url()) - + def start_server(self): """ Start the server. From 44f732d716ed015da74384d5a0595bf004190397 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 30 Jun 2020 13:33:30 -0700 Subject: [PATCH 22/22] When setting the data_dir in the GUI, set it to the new directory that was just selected, not the one that was already there --- onionshare_gui/tab/mode/receive_mode/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionshare_gui/tab/mode/receive_mode/__init__.py b/onionshare_gui/tab/mode/receive_mode/__init__.py index f7bcbd1c..ba1fc8c4 100644 --- a/onionshare_gui/tab/mode/receive_mode/__init__.py +++ b/onionshare_gui/tab/mode/receive_mode/__init__.py @@ -141,7 +141,7 @@ class ReceiveMode(Mode): f"selected dir: {selected_dir}", ) self.data_dir_lineedit.setText(selected_dir) - self.settings.set("receive", "data_dir", data_dir) + self.settings.set("receive", "data_dir", selected_dir) def get_stop_server_autostop_timer_text(self): """