From b5c68fa5ca63b6a592ac2cfb75179a83222d55ac Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 12 Apr 2021 17:55:16 -0400 Subject: Add --title, and make it display the title in chat mode --- cli/onionshare_cli/__init__.py | 8 ++++++++ cli/onionshare_cli/mode_settings.py | 1 + cli/onionshare_cli/resources/templates/chat.html | 4 ++-- cli/onionshare_cli/web/chat_mode.py | 8 ++------ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 1bd0582c..9e530c6c 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -143,6 +143,12 @@ def main(cwd=None): help="Filename of persistent session", ) # General args + parser.add_argument( + "--title", + metavar="TITLE", + default=None, + help="Set a title", + ) parser.add_argument( "--public", action="store_true", @@ -234,6 +240,7 @@ def main(cwd=None): connect_timeout = int(args.connect_timeout) config_filename = args.config persistent_filename = args.persistent + title = args.title public = bool(args.public) autostart_timer = int(args.autostart_timer) autostop_timer = int(args.autostop_timer) @@ -280,6 +287,7 @@ def main(cwd=None): if mode_settings.just_created: # This means the mode settings were just created, not loaded from disk + mode_settings.set("general", "title", title) mode_settings.set("general", "public", public) mode_settings.set("general", "autostart_timer", autostart_timer) mode_settings.set("general", "autostop_timer", autostop_timer) diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py index c2e5e6cd..9ebf8e61 100644 --- a/cli/onionshare_cli/mode_settings.py +++ b/cli/onionshare_cli/mode_settings.py @@ -42,6 +42,7 @@ class ModeSettings: }, "persistent": {"mode": None, "enabled": False}, "general": { + "title": None, "public": False, "autostart_timer": False, "autostop_timer": False, diff --git a/cli/onionshare_cli/resources/templates/chat.html b/cli/onionshare_cli/resources/templates/chat.html index b4443c09..7156d58c 100644 --- a/cli/onionshare_cli/resources/templates/chat.html +++ b/cli/onionshare_cli/resources/templates/chat.html @@ -2,7 +2,7 @@ - OnionShare + {% if title %}{{ title }}{% else %}OnionShare Chat{% endif %} @@ -11,7 +11,7 @@

OnionShare

{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}

diff --git a/cli/onionshare_cli/web/chat_mode.py b/cli/onionshare_cli/web/chat_mode.py index 2daf9654..8b2a5673 100644 --- a/cli/onionshare_cli/web/chat_mode.py +++ b/cli/onionshare_cli/web/chat_mode.py @@ -18,12 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ -from flask import ( - request, - render_template, - make_response, - jsonify, - session) +from flask import request, render_template, make_response, jsonify, session from flask_socketio import emit, join_room, leave_room @@ -72,6 +67,7 @@ class ChatModeWeb: "chat.html", static_url_path=self.web.static_url_path, username=session.get("name"), + title=self.web.settings.get("general", "title"), ) ) return self.web.add_security_headers(r) -- cgit v1.2.3-54-g00ecf From 1543bb38d236248f0e3676dbe57dde7256621bee Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 12 Apr 2021 18:15:51 -0400 Subject: Show the custom title in all modes --- .../resources/templates/listing.html | 6 +- .../resources/templates/receive.html | 87 +++++++++++----------- cli/onionshare_cli/resources/templates/send.html | 17 +++-- .../resources/templates/thankyou.html | 6 +- cli/onionshare_cli/web/receive_mode.py | 6 +- cli/onionshare_cli/web/share_mode.py | 1 + cli/onionshare_cli/web/website_mode.py | 1 + 7 files changed, 67 insertions(+), 57 deletions(-) diff --git a/cli/onionshare_cli/resources/templates/listing.html b/cli/onionshare_cli/resources/templates/listing.html index 8458bb87..8e0dedf7 100644 --- a/cli/onionshare_cli/resources/templates/listing.html +++ b/cli/onionshare_cli/resources/templates/listing.html @@ -2,7 +2,7 @@ - OnionShare + {% if title %}{{ title }}{% else %}OnionShare{% endif %} @@ -14,7 +14,7 @@

OnionShare

{% if title %}{{ title }}{% else %}OnionShare{% endif %}

OnionShare -

OnionShare

- -

Send Files

Select the files you want to send, then click "Send Files"...

- -

{{ message }}

- - + + {% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %} + + + + + + + + +

{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}

+ +

Send Files

Select the files you want to send, then click "Send Files"...

+ +

{{ message }}

- - - - + + + +

+ + + + + \ No newline at end of file diff --git a/cli/onionshare_cli/resources/templates/send.html b/cli/onionshare_cli/resources/templates/send.html index dd30bfdd..bd9bd631 100644 --- a/cli/onionshare_cli/resources/templates/send.html +++ b/cli/onionshare_cli/resources/templates/send.html @@ -2,9 +2,9 @@ - OnionShare + {% if title %}{{ title }}{% else %}OnionShare{% endif %} - + @@ -16,7 +16,7 @@

OnionShare

{% if title %}{{ title }}{% else %}OnionShare{% endif %}

Total size: {{ filesize_human }} {% if is_zipped %} (compressed){% endif %}

@@ -25,10 +25,11 @@

{% if breadcrumbs %} -

{{ breadcrumb[0] }} ‣
{{ breadcrumbs_leaf }}

- {% endif %} +

{{ breadcrumb[0] }} ‣
{{ breadcrumbs_leaf }}

+ {% endif %}

@@ -66,4 +67,4 @@ - + \ No newline at end of file diff --git a/cli/onionshare_cli/resources/templates/thankyou.html b/cli/onionshare_cli/resources/templates/thankyou.html index aa0bc553..8e92386d 100644 --- a/cli/onionshare_cli/resources/templates/thankyou.html +++ b/cli/onionshare_cli/resources/templates/thankyou.html @@ -4,7 +4,7 @@ OnionShare is closed - + @@ -12,7 +12,7 @@

OnionShare

{% if title %}{{ title }}{% else %}OnionShare{% endif %}

@@ -24,4 +24,4 @@

- + \ No newline at end of file diff --git a/cli/onionshare_cli/web/receive_mode.py b/cli/onionshare_cli/web/receive_mode.py index 46f471a8..21e83f58 100644 --- a/cli/onionshare_cli/web/receive_mode.py +++ b/cli/onionshare_cli/web/receive_mode.py @@ -64,7 +64,9 @@ class ReceiveModeWeb: self.web.add_request(self.web.REQUEST_LOAD, request.path) r = make_response( render_template( - "receive.html", static_url_path=self.web.static_url_path + "receive.html", + static_url_path=self.web.static_url_path, + title=self.web.settings.get("general", "title"), ) ) return self.web.add_security_headers(r) @@ -168,6 +170,7 @@ class ReceiveModeWeb: "new_body": render_template( "thankyou.html", static_url_path=self.web.static_url_path, + title=self.web.settings.get("general", "title"), ) } ) @@ -176,6 +179,7 @@ class ReceiveModeWeb: r = make_response( render_template("thankyou.html"), static_url_path=self.web.static_url_path, + title=self.web.settings.get("general", "title"), ) return self.web.add_security_headers(r) diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py index 72ba8c64..87ec5185 100644 --- a/cli/onionshare_cli/web/share_mode.py +++ b/cli/onionshare_cli/web/share_mode.py @@ -230,6 +230,7 @@ class ShareModeWeb(SendBaseModeWeb): is_zipped=self.is_zipped, static_url_path=self.web.static_url_path, download_individual_files=self.download_individual_files, + title=self.web.settings.get("general", "title"), ) ) diff --git a/cli/onionshare_cli/web/website_mode.py b/cli/onionshare_cli/web/website_mode.py index 5718c9a9..6badd399 100644 --- a/cli/onionshare_cli/web/website_mode.py +++ b/cli/onionshare_cli/web/website_mode.py @@ -60,6 +60,7 @@ class WebsiteModeWeb(SendBaseModeWeb): breadcrumbs=breadcrumbs, breadcrumbs_leaf=breadcrumbs_leaf, static_url_path=self.web.static_url_path, + title=self.web.settings.get("general", "title"), ) ) -- cgit v1.2.3-54-g00ecf From 3c85a8dae11b3a583a1d360a1dc048376ab71010 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 13 Apr 2021 18:06:29 -0400 Subject: Add custom title to GUI --- desktop/src/onionshare/resources/locale/en.json | 1 + .../src/onionshare/tab/mode/chat_mode/__init__.py | 5 +++ .../onionshare/tab/mode/mode_settings_widget.py | 39 ++++++++++++++++++++++ .../onionshare/tab/mode/receive_mode/__init__.py | 5 +++ .../src/onionshare/tab/mode/share_mode/__init__.py | 5 +++ .../onionshare/tab/mode/website_mode/__init__.py | 5 +++ desktop/src/onionshare/tab_widget.py | 4 +++ 7 files changed, 64 insertions(+) diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index 20569c57..679ff965 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -165,6 +165,7 @@ "gui_quit_warning_cancel": "Cancel", "mode_settings_advanced_toggle_show": "Show advanced settings", "mode_settings_advanced_toggle_hide": "Hide advanced settings", + "mode_settings_title_label": "Title", "mode_settings_persistent_checkbox": "Save this tab, and automatically open it when I open OnionShare", "mode_settings_public_checkbox": "Don't use a password", "mode_settings_autostart_timer_checkbox": "Start onion service at scheduled time", diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py index 2312a64e..44a6d240 100644 --- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py @@ -68,6 +68,11 @@ class ChatMode(Mode): self.image = QtWidgets.QWidget() self.image.setLayout(image_layout) + # Set title placeholder + self.mode_settings_widget.title_lineedit.setPlaceholderText( + strings._("gui_tab_name_chat") + ) + # Server status self.server_status.set_mode("chat") self.server_status.server_started_finished.connect(self.update_primary_action) diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index a3a315c9..990e1a92 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -39,6 +39,16 @@ class ModeSettingsWidget(QtWidgets.QWidget): # Downstream Mode need to fill in this layout with its settings self.mode_specific_layout = QtWidgets.QVBoxLayout() + # Title + title_label = QtWidgets.QLabel(strings._("mode_settings_title_label")) + self.title_lineedit = QtWidgets.QLineEdit() + self.title_lineedit.editingFinished.connect(self.title_editing_finished) + if self.settings.get("general", "title"): + self.title_lineedit.setText(self.settings.get("general", "title")) + title_layout = QtWidgets.QHBoxLayout() + title_layout.addWidget(title_label) + title_layout.addWidget(self.title_lineedit) + # Persistent self.persistent_checkbox = QtWidgets.QCheckBox() self.persistent_checkbox.clicked.connect(self.persistent_checkbox_clicked) @@ -162,6 +172,7 @@ class ModeSettingsWidget(QtWidgets.QWidget): layout = QtWidgets.QVBoxLayout() layout.addLayout(self.mode_specific_layout) + layout.addLayout(title_layout) layout.addWidget(self.persistent_checkbox) layout.addWidget(self.public_checkbox) layout.addWidget(self.advanced_widget) @@ -203,6 +214,34 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.legacy_checkbox.hide() self.client_auth_checkbox.hide() + def title_editing_finished(self): + if self.title_lineedit.text() == "": + self.settings.set("general", "title", None) + if self.tab.mode == self.common.gui.MODE_SHARE: + self.tab.change_title.emit( + self.tab.tab_id, strings._("gui_tab_name_share") + ) + elif self.tab.mode == self.common.gui.MODE_RECEIVE: + self.tab.change_title.emit( + self.tab.tab_id, strings._("gui_tab_name_receive") + ) + elif self.tab.mode == self.common.gui.MODE_WEBSITE: + self.tab.change_title.emit( + self.tab.tab_id, strings._("gui_tab_name_website") + ) + elif self.tab.mode == self.common.gui.MODE_CHAT: + self.tab.change_title.emit( + self.tab.tab_id, strings._("gui_tab_name_chat") + ) + elif self.tab_mode == None: + pass + else: + self.settings.set("general", "title", self.title_lineedit.text()) + shortened_title = self.title_lineedit.text() + if len(shortened_title) > 11: + shortened_title = shortened_title[:10] + "..." + self.tab.change_title.emit(self.tab.tab_id, shortened_title) + def persistent_checkbox_clicked(self): self.settings.set("persistent", "enabled", self.persistent_checkbox.isChecked()) self.settings.set("persistent", "mode", self.tab.mode) diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py index 5cc72201..7e3fda47 100644 --- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py @@ -106,6 +106,11 @@ class ReceiveMode(Mode): self.hide_webhook_url() self.mode_settings_widget.mode_specific_layout.addLayout(webhook_url_layout) + # Set title placeholder + self.mode_settings_widget.title_lineedit.setPlaceholderText( + strings._("gui_tab_name_receive") + ) + # Server status self.server_status.set_mode("receive") self.server_status.server_started_finished.connect(self.update_primary_action) diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py index 74a4e2c2..05038e20 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py @@ -77,6 +77,11 @@ class ShareMode(Mode): for filename in self.filenames: self.file_selection.file_list.add_file(filename) + # Set title placeholder + self.mode_settings_widget.title_lineedit.setPlaceholderText( + strings._("gui_tab_name_share") + ) + # Server status self.server_status.set_mode("share", self.file_selection) self.server_status.server_started.connect(self.file_selection.server_started) diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py index 6aa83de0..f7cfa758 100644 --- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py @@ -77,6 +77,11 @@ class WebsiteMode(Mode): for filename in self.filenames: self.file_selection.file_list.add_file(filename) + # Set title placeholder + self.mode_settings_widget.title_lineedit.setPlaceholderText( + strings._("gui_tab_name_website") + ) + # Server status self.server_status.set_mode("website", self.file_selection) self.server_status.server_started.connect(self.file_selection.server_started) diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index b9a70011..94f51616 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -176,6 +176,10 @@ class TabWidget(QtWidgets.QTabWidget): ) tab.init(mode_settings) + + # Make sure the title is set + tab.get_mode().mode_settings_widget.title_editing_finished() + # If it's persistent, set the persistent image in the tab self.change_persistent(tab.tab_id, tab.settings.get("persistent", "enabled")) -- cgit v1.2.3-54-g00ecf From 67724312201b0943209728097baaae00c2dc07e5 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 13 Apr 2021 18:18:44 -0400 Subject: Put the title and persistent options at the top of the options widget, above mode-specific options --- desktop/src/onionshare/tab/mode/mode_settings_widget.py | 2 +- desktop/src/onionshare/tab_widget.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index 990e1a92..f93f37bf 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -171,9 +171,9 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.advanced_widget.hide() layout = QtWidgets.QVBoxLayout() - layout.addLayout(self.mode_specific_layout) layout.addLayout(title_layout) layout.addWidget(self.persistent_checkbox) + layout.addLayout(self.mode_specific_layout) layout.addWidget(self.public_checkbox) layout.addWidget(self.advanced_widget) layout.addWidget(self.toggle_advanced_button) diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index 94f51616..3df924d3 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -178,7 +178,8 @@ class TabWidget(QtWidgets.QTabWidget): tab.init(mode_settings) # Make sure the title is set - tab.get_mode().mode_settings_widget.title_editing_finished() + if tab.get_mode(): + tab.get_mode().mode_settings_widget.title_editing_finished() # If it's persistent, set the persistent image in the tab self.change_persistent(tab.tab_id, tab.settings.get("persistent", "enabled")) -- cgit v1.2.3-54-g00ecf From 3c76f3403d32d6ecd1c4eedc6283e530af580dd6 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 13 Apr 2021 18:28:00 -0400 Subject: Add tooltips to tabs, so you can tell what even long titles are --- desktop/src/onionshare/tab/mode/mode_settings_widget.py | 8 +++----- desktop/src/onionshare/tab_widget.py | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index f93f37bf..777987a8 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -236,11 +236,9 @@ class ModeSettingsWidget(QtWidgets.QWidget): elif self.tab_mode == None: pass else: - self.settings.set("general", "title", self.title_lineedit.text()) - shortened_title = self.title_lineedit.text() - if len(shortened_title) > 11: - shortened_title = shortened_title[:10] + "..." - self.tab.change_title.emit(self.tab.tab_id, shortened_title) + title = self.title_lineedit.text() + self.settings.set("general", "title", title) + self.tab.change_title.emit(self.tab.tab_id, title) def persistent_checkbox_clicked(self): self.settings.set("persistent", "enabled", self.persistent_checkbox.isChecked()) diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index 3df924d3..a955ea53 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -188,8 +188,13 @@ class TabWidget(QtWidgets.QTabWidget): self.bring_to_front.emit() def change_title(self, tab_id, title): + shortened_title = title + if len(shortened_title) > 11: + shortened_title = shortened_title[:10] + "..." + index = self.indexOf(self.tabs[tab_id]) - self.setTabText(index, title) + self.setTabText(index, shortened_title) + self.setTabToolTip(index, title) def change_icon(self, tab_id, icon_path): index = self.indexOf(self.tabs[tab_id]) -- cgit v1.2.3-54-g00ecf From e48878e55813200206a6939f7c50d0710b0504f9 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 25 Apr 2021 17:49:06 -0400 Subject: Rename "Title" to "Custom title", move it into advanced settings, and make whitespace title default to not setting a title --- desktop/src/onionshare/resources/locale/en.json | 2 +- .../onionshare/tab/mode/mode_settings_widget.py | 27 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index 679ff965..a3489698 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -165,7 +165,7 @@ "gui_quit_warning_cancel": "Cancel", "mode_settings_advanced_toggle_show": "Show advanced settings", "mode_settings_advanced_toggle_hide": "Hide advanced settings", - "mode_settings_title_label": "Title", + "mode_settings_title_label": "Custom title", "mode_settings_persistent_checkbox": "Save this tab, and automatically open it when I open OnionShare", "mode_settings_public_checkbox": "Don't use a password", "mode_settings_autostart_timer_checkbox": "Start onion service at scheduled time", diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index 777987a8..ef59f37e 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -39,16 +39,6 @@ class ModeSettingsWidget(QtWidgets.QWidget): # Downstream Mode need to fill in this layout with its settings self.mode_specific_layout = QtWidgets.QVBoxLayout() - # Title - title_label = QtWidgets.QLabel(strings._("mode_settings_title_label")) - self.title_lineedit = QtWidgets.QLineEdit() - self.title_lineedit.editingFinished.connect(self.title_editing_finished) - if self.settings.get("general", "title"): - self.title_lineedit.setText(self.settings.get("general", "title")) - title_layout = QtWidgets.QHBoxLayout() - title_layout.addWidget(title_label) - title_layout.addWidget(self.title_lineedit) - # Persistent self.persistent_checkbox = QtWidgets.QCheckBox() self.persistent_checkbox.clicked.connect(self.persistent_checkbox_clicked) @@ -67,6 +57,16 @@ class ModeSettingsWidget(QtWidgets.QWidget): else: self.public_checkbox.setCheckState(QtCore.Qt.Unchecked) + # Title + title_label = QtWidgets.QLabel(strings._("mode_settings_title_label")) + self.title_lineedit = QtWidgets.QLineEdit() + self.title_lineedit.editingFinished.connect(self.title_editing_finished) + if self.settings.get("general", "title"): + self.title_lineedit.setText(self.settings.get("general", "title")) + title_layout = QtWidgets.QHBoxLayout() + title_layout.addWidget(title_label) + title_layout.addWidget(self.title_lineedit) + # Whether or not to use an auto-start timer self.autostart_timer_checkbox = QtWidgets.QCheckBox() self.autostart_timer_checkbox.clicked.connect( @@ -162,6 +162,7 @@ class ModeSettingsWidget(QtWidgets.QWidget): # Advanced group itself advanced_layout = QtWidgets.QVBoxLayout() advanced_layout.setContentsMargins(0, 0, 0, 0) + advanced_layout.addLayout(title_layout) advanced_layout.addLayout(autostart_timer_layout) advanced_layout.addLayout(autostop_timer_layout) advanced_layout.addWidget(self.legacy_checkbox) @@ -171,9 +172,8 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.advanced_widget.hide() layout = QtWidgets.QVBoxLayout() - layout.addLayout(title_layout) - layout.addWidget(self.persistent_checkbox) layout.addLayout(self.mode_specific_layout) + layout.addWidget(self.persistent_checkbox) layout.addWidget(self.public_checkbox) layout.addWidget(self.advanced_widget) layout.addWidget(self.toggle_advanced_button) @@ -215,7 +215,8 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.client_auth_checkbox.hide() def title_editing_finished(self): - if self.title_lineedit.text() == "": + if self.title_lineedit.text().strip() == "": + self.title_lineedit.setText("") self.settings.set("general", "title", None) if self.tab.mode == self.common.gui.MODE_SHARE: self.tab.change_title.emit( -- cgit v1.2.3-54-g00ecf From dac508d06e25529e115e3769c66199aa5308a5b0 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 25 Apr 2021 19:23:10 -0400 Subject: Prettier ASCII art --- cli/onionshare_cli/__init__.py | 78 ++++++++++++++++-------------------------- cli/onionshare_cli/common.py | 3 ++ 2 files changed, 33 insertions(+), 48 deletions(-) diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 42ec9673..79c149f9 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -46,54 +46,36 @@ def main(cwd=None): # Display OnionShare banner print(f"OnionShare {common.version} | https://onionshare.org/") - reset = "\033[0m" - purple = "\33[95m" - print(purple) - print(" @@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ___ _ " - ) - print( - " @@@@@@ @@@@@@@@@@@@@ / _ \\ (_) " - ) - print( - " @@@@ @ @@@@@@@@@@@ | | | |_ __ _ ___ _ __ " - ) - print( - " @@@@@@@@ @@@@@@@@@@ | | | | '_ \\| |/ _ \\| '_ \\ " - ) - print( - " @@@@@@@@@@@@ @@@@@@@@@@ \\ \\_/ / | | | | (_) | | | | " - ) - print( - " @@@@@@@@@@@@@@@@ @@@@@@@@@ \\___/|_| |_|_|\\___/|_| |_| " - ) - print( - " @@@@@@@@@ @@@@@@@@@@@@@@@@ _____ _ " - ) - print( - " @@@@@@@@@@ @@@@@@@@@@@@ / ___| | " - ) - print( - " @@@@@@@@@@ @@@@@@@@ \\ `--.| |__ __ _ _ __ ___ " - ) - print( - " @@@@@@@@@@@ @ @@@@ `--. \\ '_ \\ / _` | '__/ _ \\" - ) - print( - " @@@@@@@@@@@@@ @@@@@@ /\\__/ / | | | (_| | | | __/" - ) - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \\____/|_| |_|\\__,_|_| \\___|" - ) - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@ ") - print(reset) + print(common.C_DARKPURPLE) + print(" ▄▄█████████▄▄ ") + print(" ▄███████████████████▄ ") + print(" ▄█████████████████████████▄ ") + print(" █████████████████████████████ ") + print(" ▀████████████████████████████▄ ") + print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") + print(" ▄████▄ ▀█▀ ▀███████████ ") + print(" ▄████████▄ ██████████ ") + print(" ▄████████████▄ ██████████ ") + print(" ▄████████████████▄ █████████ ") + print(" █████████ ▀████████████████▀ ") + print(" ██████████ ▀████████████▀ ") + print(" ██████████ ▀████████▀ ") + print(" ███████████▄ ▄█▄ ▀████▀ ") + print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") + print(" █████████████████████████████▄ ") + print(" ▀█████████████████████████████ ") + print(" ▀█████████████████████████ ") + print(" ▀███████████████████ ") + print(" ▀▀█████████▀▀ ") + print("") + print(common.C_LIGHTPURPLE) + print(" ▄██▄ ███ █ ") + print(" █ █ █▀ █ ") + print(" █ █ ▀ █▄▄ █ ") + print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") + print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") + print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") + print(common.C_RESET) # OnionShare CLI in OSX needs to change current working directory (#132) if common.platform == "Darwin": diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index e812aa98..b317b33f 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -44,8 +44,11 @@ class Common: """ C_RESET = "\033[0m" + C_BOLD = "\033[01m" C_LIGHTGRAY = "\033[37m" C_DARKGRAY = "\033[90m" + C_LIGHTPURPLE = "\033[95m" + C_DARKPURPLE = "\033[35m" def __init__(self, verbose=False): self.verbose = verbose -- cgit v1.2.3-54-g00ecf From ee3761af6cdc7d2a71e194415902063e016e761c Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 26 Apr 2021 19:29:18 -0700 Subject: Move graphical banner into common, and display it in GUI too --- cli/onionshare_cli/__init__.py | 34 +--------------------------------- cli/onionshare_cli/common.py | 33 +++++++++++++++++++++++++++++++++ desktop/src/onionshare/__init__.py | 4 +--- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 79c149f9..a44f816c 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -43,39 +43,7 @@ def main(cwd=None): onionshare uses. """ common = Common() - - # Display OnionShare banner - print(f"OnionShare {common.version} | https://onionshare.org/") - print(common.C_DARKPURPLE) - print(" ▄▄█████████▄▄ ") - print(" ▄███████████████████▄ ") - print(" ▄█████████████████████████▄ ") - print(" █████████████████████████████ ") - print(" ▀████████████████████████████▄ ") - print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") - print(" ▄████▄ ▀█▀ ▀███████████ ") - print(" ▄████████▄ ██████████ ") - print(" ▄████████████▄ ██████████ ") - print(" ▄████████████████▄ █████████ ") - print(" █████████ ▀████████████████▀ ") - print(" ██████████ ▀████████████▀ ") - print(" ██████████ ▀████████▀ ") - print(" ███████████▄ ▄█▄ ▀████▀ ") - print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") - print(" █████████████████████████████▄ ") - print(" ▀█████████████████████████████ ") - print(" ▀█████████████████████████ ") - print(" ▀███████████████████ ") - print(" ▀▀█████████▀▀ ") - print("") - print(common.C_LIGHTPURPLE) - print(" ▄██▄ ███ █ ") - print(" █ █ █▀ █ ") - print(" █ █ ▀ █▄▄ █ ") - print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") - print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") - print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") - print(common.C_RESET) + common.display_banner() # OnionShare CLI in OSX needs to change current working directory (#132) if common.platform == "Darwin": diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index b317b33f..41085f48 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -62,6 +62,39 @@ class Common: with open(self.get_resource_path("version.txt")) as f: self.version = f.read().strip() + def display_banner(self): + print(f"OnionShare {self.version} | https://onionshare.org/") + print(self.C_DARKPURPLE) + print(" ▄▄█████████▄▄ ") + print(" ▄███████████████████▄ ") + print(" ▄█████████████████████████▄ ") + print(" █████████████████████████████ ") + print(" ▀████████████████████████████▄ ") + print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") + print(" ▄████▄ ▀█▀ ▀███████████ ") + print(" ▄████████▄ ██████████ ") + print(" ▄████████████▄ ██████████ ") + print(" ▄████████████████▄ █████████ ") + print(" █████████ ▀████████████████▀ ") + print(" ██████████ ▀████████████▀ ") + print(" ██████████ ▀████████▀ ") + print(" ███████████▄ ▄█▄ ▀████▀ ") + print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") + print(" █████████████████████████████▄ ") + print(" ▀█████████████████████████████ ") + print(" ▀█████████████████████████ ") + print(" ▀███████████████████ ") + print(" ▀▀█████████▀▀ ") + print("") + print(self.C_LIGHTPURPLE) + print(" ▄██▄ ███ █ ") + print(" █ █ █▀ █ ") + print(" █ █ ▀ █▄▄ █ ") + print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") + print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") + print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") + print(self.C_RESET) + def load_settings(self, config=None): """ Loading settings, optionally from a custom config json file. diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index 744f6979..1c69ffa5 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -75,14 +75,12 @@ def main(): The main() function implements all of the logic that the GUI version of onionshare uses. """ common = Common() + common.display_banner() # Required for macOS Big Sur: https://stackoverflow.com/a/64878899 if common.platform == "Darwin": os.environ["QT_MAC_WANTS_LAYER"] = "1" - # Display OnionShare banner - print(f"OnionShare {common.version} | https://onionshare.org/") - # Start the Qt app global qtapp qtapp = Application(common) -- cgit v1.2.3-54-g00ecf From fe64d40e45941a3c8668f36788b73fd27f3d4a75 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Wed, 28 Apr 2021 15:45:37 +1000 Subject: Use XDG_CONFIG_HOME environment variable if it is present, otherwise fall back to ~/.config --- cli/onionshare_cli/common.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index e812aa98..072babd1 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -133,13 +133,21 @@ class Common: except: # If for some reason we don't have the 'APPDATA' environment variable # (like running tests in Linux while pretending to be in Windows) - onionshare_data_dir = os.path.expanduser("~/.config/onionshare") + try: + xdg_config_home = os.environ["XDG_CONFIG_HOME"] + onionshare_data_dir = f"{xdg_config_home}/onionshare" + except: + onionshare_data_dir = os.path.expanduser("~/.config/onionshare") elif self.platform == "Darwin": onionshare_data_dir = os.path.expanduser( "~/Library/Application Support/OnionShare" ) else: - onionshare_data_dir = os.path.expanduser("~/.config/onionshare") + try: + xdg_config_home = os.environ["XDG_CONFIG_HOME"] + onionshare_data_dir = f"{xdg_config_home}/onionshare" + except: + onionshare_data_dir = os.path.expanduser("~/.config/onionshare") # Modify the data dir if running tests if getattr(sys, "onionshare_test_mode", False): -- cgit v1.2.3-54-g00ecf From ffe820398d9bba128176f29f9e4ef3ae51594107 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 28 Apr 2021 16:08:20 -0700 Subject: Level up the ASCII art --- cli/onionshare_cli/common.py | 255 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 222 insertions(+), 33 deletions(-) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 41085f48..c264f79f 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -44,7 +44,9 @@ class Common: """ C_RESET = "\033[0m" + C_BG_PURPLE = "\033[45m" C_BOLD = "\033[01m" + C_WHITE = "\033[97m" C_LIGHTGRAY = "\033[37m" C_DARKGRAY = "\033[90m" C_LIGHTPURPLE = "\033[95m" @@ -63,37 +65,224 @@ class Common: self.version = f.read().strip() def display_banner(self): - print(f"OnionShare {self.version} | https://onionshare.org/") - print(self.C_DARKPURPLE) - print(" ▄▄█████████▄▄ ") - print(" ▄███████████████████▄ ") - print(" ▄█████████████████████████▄ ") - print(" █████████████████████████████ ") - print(" ▀████████████████████████████▄ ") - print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") - print(" ▄████▄ ▀█▀ ▀███████████ ") - print(" ▄████████▄ ██████████ ") - print(" ▄████████████▄ ██████████ ") - print(" ▄████████████████▄ █████████ ") - print(" █████████ ▀████████████████▀ ") - print(" ██████████ ▀████████████▀ ") - print(" ██████████ ▀████████▀ ") - print(" ███████████▄ ▄█▄ ▀████▀ ") - print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") - print(" █████████████████████████████▄ ") - print(" ▀█████████████████████████████ ") - print(" ▀█████████████████████████ ") - print(" ▀███████████████████ ") - print(" ▀▀█████████▀▀ ") - print("") - print(self.C_LIGHTPURPLE) - print(" ▄██▄ ███ █ ") - print(" █ █ █▀ █ ") - print(" █ █ ▀ █▄▄ █ ") - print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") - print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") - print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") - print(self.C_RESET) + """ + Raw ASCII art example: + ╭──────────────────────────────────────────╮ + │ * ▄▄████▄▄ * │ + │ ▄████▀▀████▄ * │ + │ ▀▀█▀ ▀██▄ │ + │ * ▄█▄ ▀██▄ │ + │ ▄█████▄ ███ -+- │ + │ ███ ▀█████▀ │ + │ ▀██▄ ▀█▀ │ + │ * ▀██▄ ▄█▄▄ * │ + │ * ▀████▄▄████▀ │ + │ ▀▀████▀▀ │ + │ -+- * │ + │ ▄▀▄ ▄▀▀ █ │ + │ █ █ ▀ ▀▄ █ │ + │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ + │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ + │ │ + │ v2.3.1 https://onionshare.org/ │ + ╰──────────────────────────────────────────╯ + """ + + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╭──────────────────────────────────────────╮" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▄▄████▄▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄████▀▀████▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▀█▀ ▀██▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▄█▄ ▀██▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄█████▄ ███" + + self.C_LIGHTPURPLE + + " -+- " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ███ ▀█████▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀██▄ ▀█▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▀██▄ ▄█▄▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▀████▄▄████▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▀████▀▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " -+- * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄▀▄ ▄▀▀ █ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " █ █ ▀ ▀▄ █ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│ │" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTGRAY + + f" v{self.version}{' '*(16-len(self.version))}https://onionshare.org/ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╰──────────────────────────────────────────╯" + + self.C_RESET + ) + print() def load_settings(self, config=None): """ @@ -166,7 +355,7 @@ class Common: try: appdata = os.environ["APPDATA"] onionshare_data_dir = f"{appdata}\\OnionShare" - except: + except Exception: # If for some reason we don't have the 'APPDATA' environment variable # (like running tests in Linux while pretending to be in Windows) onionshare_data_dir = os.path.expanduser("~/.config/onionshare") @@ -293,7 +482,7 @@ class Common: try: tmpsock.bind(("127.0.0.1", random.randint(min_port, max_port))) break - except OSError as e: + except OSError: pass _, port = tmpsock.getsockname() return port -- cgit v1.2.3-54-g00ecf From 330e6026940a7de78d6ac6165fb56d20516a996f Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 29 Apr 2021 10:09:44 +1000 Subject: Update the Content-Security-Policy: remove style-src and script-src which are inherited by default-src. Add frame-ancestors, form-action and base-uri which do not inherit default-src --- cli/onionshare_cli/web/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index ab47195c..7c2e4256 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -310,7 +310,7 @@ class Web: if not self.settings.get("website", "disable_csp") or self.mode != "website": r.headers.set( "Content-Security-Policy", - "default-src 'self'; style-src 'self'; script-src 'self'; img-src 'self' data:;", + "default-src 'self'; frame-ancestors 'none'; form-action 'self'; base-uri 'self'; img-src 'self' data:;", ) return r -- cgit v1.2.3-54-g00ecf From b8d43ab8ceeda36f41c7b8a837696699078cd535 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 28 Apr 2021 20:25:42 -0700 Subject: Center the version and URL --- cli/onionshare_cli/common.py | 98 +++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index c264f79f..f0c562ca 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -67,31 +67,33 @@ class Common: def display_banner(self): """ Raw ASCII art example: - ╭──────────────────────────────────────────╮ - │ * ▄▄████▄▄ * │ - │ ▄████▀▀████▄ * │ - │ ▀▀█▀ ▀██▄ │ - │ * ▄█▄ ▀██▄ │ - │ ▄█████▄ ███ -+- │ - │ ███ ▀█████▀ │ - │ ▀██▄ ▀█▀ │ - │ * ▀██▄ ▄█▄▄ * │ - │ * ▀████▄▄████▀ │ - │ ▀▀████▀▀ │ - │ -+- * │ - │ ▄▀▄ ▄▀▀ █ │ - │ █ █ ▀ ▀▄ █ │ - │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ - │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ - │ │ - │ v2.3.1 https://onionshare.org/ │ - ╰──────────────────────────────────────────╯ + ╭───────────────────────────────────────────╮ + │ * ▄▄█████▄▄ * │ + │ ▄████▀▀▀████▄ * │ + │ ▀▀█▀ ▀██▄ │ + │ * ▄█▄ ▀██▄ │ + │ ▄█████▄ ███ -+- │ + │ ███ ▀█████▀ │ + │ ▀██▄ ▀█▀ │ + │ * ▀██▄ ▄█▄▄ * │ + │ * ▀████▄▄▄████▀ │ + │ ▀▀█████▀▀ │ + │ -+- * │ + │ ▄▀▄ ▄▀▀ █ │ + │ █ █ ▀ ▀▄ █ │ + │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ + │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ + │ │ + │ v2.3.1 │ + │ │ + │ https://onionshare.org/ │ + ╰───────────────────────────────────────────╯ """ print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "╭──────────────────────────────────────────╮" + + "╭───────────────────────────────────────────╮" + self.C_RESET ) print( @@ -101,7 +103,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▄▄████▄▄" + + "▄▄█████▄▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -113,7 +115,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄████▀▀████▄" + + " ▄████▀▀▀████▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -125,7 +127,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▀█▀ ▀██▄ " + + " ▀▀█▀ ▀██▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -137,7 +139,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▄█▄ ▀██▄ " + + "▄█▄ ▀██▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -147,7 +149,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄█████▄ ███" + + " ▄█████▄ ███" + self.C_LIGHTPURPLE + " -+- " + self.C_LIGHTGRAY @@ -159,7 +161,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ███ ▀█████▀ " + + " ███ ▀█████▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -169,7 +171,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀██▄ ▀█▀ " + + " ▀██▄ ▀█▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -181,7 +183,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▀██▄ ▄█▄▄" + + "▀██▄ ▄█▄▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -195,7 +197,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▀████▄▄████▀ " + + "▀████▄▄▄████▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -205,7 +207,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▀████▀▀ " + + " ▀▀█████▀▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -215,7 +217,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_LIGHTPURPLE - + " -+- * " + + " -+- * " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -225,7 +227,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄▀▄ ▄▀▀ █ " + + " ▄▀▄ ▄▀▀ █ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -235,7 +237,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " █ █ ▀ ▀▄ █ " + + " █ █ ▀ ▀▄ █ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -245,7 +247,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -255,7 +257,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -263,15 +265,19 @@ class Common: print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "│ │" + + "│ │" + self.C_RESET ) + left_spaces = (43 - len(self.version) - 1) // 2 + right_spaces = left_spaces + if left_spaces + len(self.version) + right_spaces < 43: + right_spaces += 1 print( self.C_BG_PURPLE + self.C_LIGHTGRAY + "│" + self.C_LIGHTGRAY - + f" v{self.version}{' '*(16-len(self.version))}https://onionshare.org/ " + + f"{' '*left_spaces}v{self.version}{' '*right_spaces}" + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -279,7 +285,23 @@ class Common: print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "╰──────────────────────────────────────────╯" + + "│ │" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTGRAY + + " https://onionshare.org/ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╰───────────────────────────────────────────╯" + self.C_RESET ) print() -- cgit v1.2.3-54-g00ecf