Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-24 06:49:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move graphical banner into common, and display it in GUI too

Browse Source
This commit is contained in:
Micah Lee 2021-04-26 19:29:18 -07:00
parent dac508d06e
commit ee3761af6c
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cli/onionshare_cli/__init__.py
View File

@ -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":

33
cli/onionshare_cli/common.py
View File

@ -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.

4
desktop/src/onionshare/__init__.py
View File

@ -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)