Merge branch '1409_clientauthv3_ux_improvements' of https://github.com/mig5/onionshare into mig5-1409_clientauthv3_ux_improvements

This commit is contained in:
Micah Lee 2021-09-03 13:28:35 -07:00
commit a27c89e574
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
41 changed files with 203 additions and 85 deletions

View File

@ -44,7 +44,7 @@ class MainWindow(QtWidgets.QMainWindow):
# Initialize the window
self.setMinimumWidth(1040)
self.setMinimumHeight(700)
self.setMinimumHeight(740)
self.setWindowTitle("OnionShare")
self.setWindowIcon(QtGui.QIcon(GuiCommon.get_resource_path("images/logo.png")))

View File

@ -230,7 +230,7 @@
"gui_settings_website_label": "اعدادات الموقع",
"gui_receive_flatpak_data_dir": "بسبب أنت قد ثبّت OnionShare باستخدام Flatpak، يجب عليك حفظ الملفات داخل مُجلد في المسار ~/OnionShare.",
"gui_qr_code_dialog_title": "OnionShare رمز الاستجابة السريعة",
"gui_show_url_qr_code": "إظهار رمز الاستجابة السريعة",
"gui_show_qr_code": "إظهار رمز الاستجابة السريعة",
"gui_chat_stop_server": "إيقاف خادم الدردشة",
"gui_chat_start_server": "ابدأ خادم الدردشة",
"gui_file_selection_remove_all": "إزالة الكُل",

View File

@ -269,7 +269,7 @@
"gui_tab_name_receive": "গ্রহণ",
"gui_tab_name_share": "শেয়ার",
"gui_qr_code_dialog_title": "অনিওনশেয়ার কিউআর কোড",
"gui_show_url_qr_code": "কিউআর কোড দেখাও",
"gui_show_qr_code": "কিউআর কোড দেখাও",
"gui_receive_flatpak_data_dir": "যেহেতু অনিওনশেয়ার ফ্ল্যাটপ্যাক দিয়ে ইন্সটল করেছো, তাই তোমাকে ~/OnionShare এ ফাইল সংরক্ষণ করতে হবে।",
"gui_rendezvous_cleanup": "তোমার ফাইলগুলি সফলভাবে স্থানান্তরিত হয়েছে তা নিশ্চিত হয়ে টর সার্কিট বন্ধের অপেক্ষা করা হচ্ছে।\n\nএটি কয়েক মিনিট সময় নিতে পারে।",
"gui_open_folder_error": "xdg-open দিয়ে ফোল্ডার খুলতে ব্যর্থ হয়েছে। ফাইলটি এখানে: {}",

View File

@ -267,7 +267,7 @@
"gui_new_tab_share_description": "Trieu els fitxers del vostre ordinador que voleu enviar a algú altre. La persona a qui voleu enviar els fitxers haurà d'usar el navegador Tor per a baixar-los del vostre equip.",
"gui_qr_code_description": "Escanegeu aquest codi amb un lector de QR, com ara la càmera del telèfon, per a facilitar la compartició de l'adreça de l'OnionShare amb altres.",
"gui_qr_code_dialog_title": "Codi QR de l'OnionShare",
"gui_show_url_qr_code": "Mostra el codi QR",
"gui_show_qr_code": "Mostra el codi QR",
"gui_receive_flatpak_data_dir": "Com que heu instal·lat l'OnionShare amb el Flatpak, heu de desar els fitxers en una carpeta dins ~/OnionShare.",
"gui_chat_stop_server": "Atura el servidor de xat",
"gui_chat_start_server": "Inicia el servidor de xat",

View File

@ -27,7 +27,7 @@
"gui_canceled": "Betal bû",
"gui_copied_url_title": "Malpera OnionShare kopî bû",
"gui_copied_url": "Malpera OnionShare lis ser taxtê kopî bû",
"gui_show_url_qr_code": "QR kod nîşan bide",
"gui_show_qr_code": "QR kod nîşan bide",
"gui_qr_code_dialog_title": "OnionShare QR kod",
"gui_waiting_to_start": "Pilankirî ye di {} destpê bike. Bitkîne ji bo betal bike.",
"gui_please_wait": "Destpê dike...Bitikîne ji bo betal bike.",

View File

@ -269,7 +269,7 @@
"gui_open_folder_error": "Kunne ikke åbne mappen med xdg-open. Filen er her: {}",
"gui_qr_code_description": "Skan QR-koden med en QR-læser såsom kameraet i din telefon for at gøre det lettere at dele OnionShare-adressen med andre.",
"gui_qr_code_dialog_title": "QR-kode til OnionShare",
"gui_show_url_qr_code": "Vis QR-kode",
"gui_show_qr_code": "Vis QR-kode",
"gui_receive_flatpak_data_dir": "Da du installerede OnionShare med Flatpak, så skal du gemme filer til en mappe i ~/OnionShare.",
"gui_chat_stop_server": "Stop chatserver",
"gui_chat_start_server": "Start chatserver",

View File

@ -273,7 +273,7 @@
"gui_remove": "Entfernen",
"gui_new_tab_chat_button": "Anonym chatten",
"gui_qr_code_dialog_title": "OnionShare QR-Code",
"gui_show_url_qr_code": "QR-Code anzeigen",
"gui_show_qr_code": "QR-Code anzeigen",
"gui_chat_stop_server": "Chatserver stoppen",
"gui_chat_start_server": "Chatserver starten",
"gui_main_page_chat_button": "Chat starten",

View File

@ -273,7 +273,7 @@
"gui_new_tab_tooltip": "Άνοιγμα νέας καρτέλας",
"gui_new_tab": "Νέα καρτέλα",
"gui_qr_code_dialog_title": "Κώδικας QR OnionShare",
"gui_show_url_qr_code": "Προβολή κώδικα QR",
"gui_show_qr_code": "Προβολή κώδικα QR",
"gui_file_selection_remove_all": "Αφαίρεση όλων",
"gui_remove": "Αφαίρεση",
"error_port_not_available": "Η θύρα OnionShare δεν είναι διαθέσιμη",

View File

@ -30,7 +30,7 @@
"gui_copied_url": "OnionShare address copied to clipboard",
"gui_copied_client_auth_title": "Copied Private Key",
"gui_copied_client_auth": "Private Key copied to clipboard",
"gui_show_url_qr_code": "Show QR Code",
"gui_show_qr_code": "Show QR Code",
"gui_qr_code_dialog_title": "OnionShare QR Code",
"gui_qr_label_url_title": "OnionShare Address",
"gui_qr_label_auth_string_title": "Private Key",
@ -100,6 +100,9 @@
"gui_url_label_stay_open": "This share will not auto-stop.",
"gui_url_label_onetime": "This share will stop after first completion.",
"gui_url_label_onetime_and_persistent": "This share will not auto-stop.<br><br>Every subsequent share will reuse the address. (To use one-time addresses, turn off \"Use persistent address\" in the settings.)",
"gui_url_instructions": "First, send the OnionShare address below:",
"gui_url_instructions_public_mode": "Send the OnionShare address below:",
"gui_client_auth_instructions": "Next, send the private key to allow access to your OnionShare service:",
"gui_status_indicator_share_stopped": "Ready to share",
"gui_status_indicator_share_working": "Starting…",
"gui_status_indicator_share_scheduled": "Scheduled…",

View File

@ -277,7 +277,7 @@
"gui_open_folder_error": "Fallo al abrir carpeta con xdg-open. El archivo está aquí: {}",
"gui_qr_code_description": "Escanea este código QR con un lector QR, como la cámara de tu teléfono para compartir la dirección OnionShare.",
"gui_qr_code_dialog_title": "Código QR de OnionShare",
"gui_show_url_qr_code": "Mostrar Código QR",
"gui_show_qr_code": "Mostrar Código QR",
"gui_receive_flatpak_data_dir": "Al instalar OnionShare usando Flatpak, debes guardar los archivos en una carpeta en ~/OnionShare.",
"gui_chat_stop_server": "Detener servidor de chat",
"gui_chat_start_server": "Iniciar servidor de chat",

View File

@ -258,7 +258,7 @@
"gui_chat_url_description": "<b>Kuka tahansa</b> tällä Onionshare-osoitteella voi <b>liittyä tähän keskusteluryhmään</b> käyttämällä <b>Tor-selainta</b>: <img src='{}' />",
"gui_please_wait_no_button": "Aloitetaan…",
"gui_qr_code_dialog_title": "OnionSharen QR-koodi",
"gui_show_url_qr_code": "Näytä QR-koodi",
"gui_show_qr_code": "Näytä QR-koodi",
"gui_receive_flatpak_data_dir": "Koska asensin OnionSharen käyttämällä Flatpakia, sinun täytyy tallentaa tiedostot kansioon sijainnissa ~/OnionShare.",
"gui_chat_stop_server": "Pysäytä chat-palvelin",
"gui_chat_start_server": "Perusta chat-palvelin"

View File

@ -272,7 +272,7 @@
"gui_open_folder_error": "Échec douverture du dossier avec xdg-open. Le fichier est ici : {}",
"gui_qr_code_description": "Balayez ce code QR avec un lecteur de code QR, tel que lappareil photo votre appareil, afin de partager plus facilement ladresse OnionShare avec quelquun.",
"gui_qr_code_dialog_title": "Code QR dOnionShare",
"gui_show_url_qr_code": "Afficher le code QR",
"gui_show_qr_code": "Afficher le code QR",
"gui_receive_flatpak_data_dir": "Comme vous avez installé OnionShare grâce à Flatpak, vous devez enregistrer vos fichiers dans un sous-dossier de ~/OnionShare.",
"gui_chat_stop_server": "Arrêter le serveur de dialogue en ligne",
"gui_chat_start_server": "Démarrer le serveur de dialogue en ligne",

View File

@ -27,7 +27,7 @@
"gui_canceled": "Cancelado",
"gui_copied_url_title": "Enderezo de OnionShare copiado",
"gui_copied_url": "Enderezo OnionShare copiado ó portapapeis",
"gui_show_url_qr_code": "Mostrar código QR",
"gui_show_qr_code": "Mostrar código QR",
"gui_qr_code_dialog_title": "Código QR OnionShare",
"gui_waiting_to_start": "Programado para comezar en {}. Fai clic para cancelar.",
"gui_please_wait": "Iniciando... Fai click para cancelar.",

View File

@ -181,7 +181,7 @@
"incorrect_password": "पासवर्ड गलत है",
"gui_settings_individual_downloads_label": "विशिष्ट फाइलों के डाउनलोड को मंजूरी देने के लिए अचिन्हित करें",
"gui_settings_csp_header_disabled_option": "सामग्री सुरक्षा नियम हेडर को अक्षम करें",
"gui_show_url_qr_code": "क्यूआर कोड दिखाएं",
"gui_show_qr_code": "क्यूआर कोड दिखाएं",
"gui_chat_stop_server": "चैट सर्वर बंद करें",
"gui_chat_start_server": "चैट सर्वर शुरू करें",
"gui_file_selection_remove_all": "सभी हटाएं",

View File

@ -215,7 +215,7 @@
"gui_tab_name_website": "Web-stranica",
"gui_tab_name_share": "Dijeli",
"gui_qr_code_dialog_title": "OnionShare QR-kod",
"gui_show_url_qr_code": "Prikaži QR-kod",
"gui_show_qr_code": "Prikaži QR-kod",
"gui_file_selection_remove_all": "Ukloni sve",
"gui_remove": "Ukloni",
"gui_main_page_chat_button": "Pokreni razgovor",

View File

@ -248,7 +248,7 @@
"systray_share_started_title": "Berbagi dimulai",
"gui_color_mode_changed_notice": "Mulai ulang OnionShare agar mode warna baru diterapkan.",
"gui_qr_code_dialog_title": "Kode QR OnionShare",
"gui_show_url_qr_code": "Tampilkan kode QR",
"gui_show_qr_code": "Tampilkan kode QR",
"error_port_not_available": "Port OnionShare tidak tersedia",
"gui_chat_stop_server": "Hentikan server obrolan",
"gui_chat_start_server": "Mulai server obrolan",

View File

@ -270,7 +270,7 @@
"gui_chat_stop_server_autostop_timer": "Stöðva spjallþjón ({})",
"gui_qr_code_dialog_title": "QR-kóði OnionShare",
"gui_file_selection_remove_all": "Fjarlægja allt",
"gui_show_url_qr_code": "Birta QR-kóða",
"gui_show_qr_code": "Birta QR-kóða",
"gui_new_tab_chat_button": "Spjalla nafnlaust",
"gui_main_page_chat_button": "Hefja spjall",
"gui_main_page_website_button": "Hefja hýsingu",

View File

@ -245,7 +245,7 @@
"gui_new_tab": "Nuova Scheda",
"gui_open_folder_error": "Impossibile aprire la cartella con xdg-open. Il file è qui: {}",
"gui_qr_code_dialog_title": "OnionShare QR Code",
"gui_show_url_qr_code": "Mostra QR Code",
"gui_show_qr_code": "Mostra QR Code",
"gui_receive_flatpak_data_dir": "Dato che hai installato OnionShare usando Flatpak, devi salvare i file nella cartella ~/OnionShare.",
"gui_chat_stop_server": "Arresta il server della chat",
"gui_file_selection_remove_all": "Rimuovi tutto",

View File

@ -266,7 +266,7 @@
"gui_open_folder_error": "xdg-openでフォルダー開くの失敗。ファイルはここにあります: {}",
"gui_qr_code_description": "より簡単にOnionShareアドレスを共有するため、スマホのカメラなどのQRリーダーでこのコードをスキャンして下さい。",
"gui_qr_code_dialog_title": "OnionShareのQRコード",
"gui_show_url_qr_code": "QRコードを表示",
"gui_show_qr_code": "QRコードを表示",
"gui_receive_flatpak_data_dir": "FlatpakでOnionShareをインストールしたため、ファイルを~/OnionShareの中のフォルダーに保存しなければなりません。",
"gui_chat_stop_server": "チャットサーバーを停止",
"gui_chat_start_server": "チャットサーバーを始動",

View File

@ -205,7 +205,7 @@
"gui_file_selection_remove_all": "Šalinti visus",
"gui_remove": "Šalinti",
"gui_qr_code_dialog_title": "OnionShare QR kodas",
"gui_show_url_qr_code": "Rodyti QR kodą",
"gui_show_qr_code": "Rodyti QR kodą",
"gui_open_folder_error": "Nepavyko atverti aplanko naudojant xdg-open. Failas yra čia: {}",
"gui_chat_stop_server": "Sustabdyti pokalbių serverį",
"gui_chat_start_server": "Pradėti pokalbių serverį",

View File

@ -279,7 +279,7 @@
"gui_new_tab_chat_button": "Sludre anonymt",
"gui_qr_code_description": "Skann denne QR-koden med en QR-kodeleser (f.eks. kameraprogrammet på enheten din) for enklere deling av OnionShare-adressen med noen.",
"gui_qr_code_dialog_title": "OnionShare-QR-kode",
"gui_show_url_qr_code": "Vis QR-kode",
"gui_show_qr_code": "Vis QR-kode",
"gui_main_page_chat_button": "Start sludring",
"gui_main_page_website_button": "Start vertsjening",
"gui_main_page_receive_button": "Start mottak",

View File

@ -274,7 +274,7 @@
"gui_new_tab": "Nieuw tabblad",
"gui_open_folder_error": "Niet gelukt om de map te openen met xdg-open. Het bestand staat hier: {}",
"gui_qr_code_dialog_title": "OnionShare QR Code",
"gui_show_url_qr_code": "Toon QR Code",
"gui_show_qr_code": "Toon QR Code",
"gui_receive_flatpak_data_dir": "Omdat je OnionShare installeerde met Flatpak, moet je bestanden opslaan in een folder in ~/OnionShare.",
"gui_chat_stop_server": "Stop chat server",
"gui_chat_start_server": "Start chat server",

View File

@ -246,7 +246,7 @@
"gui_open_folder_error": "Nie udało się otworzyć folderu za pomocą xdg-open. Plik jest tutaj: {}",
"gui_qr_code_description": "Zeskanuj ten kod QR za pomocą czytnika QR, takiego jak aparat w telefonie, aby łatwiej udostępnić komuś adres OnionShare.",
"gui_qr_code_dialog_title": "Kod QR OnionShare",
"gui_show_url_qr_code": "Pokaż kod QR",
"gui_show_qr_code": "Pokaż kod QR",
"gui_receive_flatpak_data_dir": "Ponieważ zainstalowałeś OnionShare przy użyciu Flatpak, musisz zapisywać pliki w folderze w ~ / OnionShare.",
"gui_chat_stop_server": "Zatrzymaj serwer czatu",
"gui_chat_start_server": "Uruchom serwer czatu",

View File

@ -269,7 +269,7 @@
"gui_open_folder_error": "Falha ao abrir a pasta com xdg-open. O arquivo está aqui: {}",
"gui_qr_code_description": "Leia este código QR com um leitor, como a câmera do seu celular, para compartilhar mais facilmente o endereço OnionShare com alguém.",
"gui_qr_code_dialog_title": "Código QR OnionShare",
"gui_show_url_qr_code": "Mostrar código QR",
"gui_show_qr_code": "Mostrar código QR",
"gui_receive_flatpak_data_dir": "Como você instalou o OnionShare usando o Flatpak, você deve salvar os arquivos em uma pasta em ~ / OnionShare.",
"gui_chat_stop_server": "Parar o servidor de conversas",
"gui_chat_start_server": "Iniciar um servidor de conversas",

View File

@ -267,7 +267,7 @@
"gui_new_tab_chat_button": "Converse Anónimamente",
"gui_open_folder_error": "Falhou a abrir a pasta com xdc-open. O ficheiro está aqui: {}",
"gui_qr_code_dialog_title": "OnionShare Código QR",
"gui_show_url_qr_code": "Mostrar código QR",
"gui_show_qr_code": "Mostrar código QR",
"gui_receive_flatpak_data_dir": "Como instalou o OnionShare utilizando Flatpak, deve guardar os ficheiros na pasta ~/OnionShare.",
"gui_chat_stop_server": "Para servidor de conversa",
"gui_chat_start_server": "Começar servidor de conversa",

View File

@ -266,7 +266,7 @@
"gui_open_folder_error": "Ошибка при попытке открыть папку с помощью xdg-open. Файл находится здесь: {}",
"gui_qr_code_description": "Сканируйте этот QR-код считывающим устройством, например камерой Вашего телефона, чтобы было удобнее поделиться ссылкой OnionShare с кем либо.",
"gui_qr_code_dialog_title": "Код QR OnionShare",
"gui_show_url_qr_code": "Показать код QR",
"gui_show_qr_code": "Показать код QR",
"gui_receive_flatpak_data_dir": "Так как Вы установили OnionShare с помощью Flatpak, Вы должны сохранять файлы в папке ~/OnionShare.",
"gui_chat_stop_server": "Остановить сервер чата",
"gui_chat_start_server": "Запустить сервер чата",

View File

@ -27,7 +27,7 @@
"gui_canceled": "",
"gui_copied_url_title": "",
"gui_copied_url": "",
"gui_show_url_qr_code": "",
"gui_show_qr_code": "",
"gui_qr_code_dialog_title": "",
"gui_waiting_to_start": "",
"gui_please_wait": "",

View File

@ -27,7 +27,7 @@
"gui_canceled": "Zrušené",
"gui_copied_url_title": "Skopírovaná OnionShare adresa",
"gui_copied_url": "OnionShare adresa bola skopírovaná do schránky",
"gui_show_url_qr_code": "Zobraziť QR kód",
"gui_show_qr_code": "Zobraziť QR kód",
"gui_qr_code_dialog_title": "OnionShare QR kód",
"gui_qr_code_description": "Naskenujte tento QR kód pomocou čítačky QR, napríklad fotoaparátom na telefóne, aby ste mohli jednoduchšie zdieľať adresu OnionShare s niekým.",
"gui_waiting_to_start": "Naplánované spustenie o {}. Kliknutím zrušíte.",

View File

@ -216,7 +216,7 @@
"gui_open_folder_error": "Neuspelo otvaranje fascikle sa xdg-open. Fajl je ovde: {}",
"gui_chat_url_description": "<b>Bilo ko</b> sa ovom OnionShare adresom može <b>pristupiti ovoj sobi za ćaskawe</b> koristeći <b>Tor pregledač</b>: <img src='{}' />",
"gui_qr_code_dialog_title": "OnionShare QR kod",
"gui_show_url_qr_code": "Prikaži QR kod",
"gui_show_qr_code": "Prikaži QR kod",
"gui_receive_flatpak_data_dir": "Pošto ste instalirali OnionShare koristeći Flatpak, morate čuvati fajlove u falcikli ~/OnionShare.",
"gui_chat_stop_server": "Zaustavi server za ćaskanje",
"gui_chat_start_server": "Pokreni server za ćaskanje",

View File

@ -266,7 +266,7 @@
"gui_new_tab": "Ny flik",
"gui_qr_code_description": "Skanna den här QR-koden med en QR-läsare, till exempel kameran på din telefon, för att lättare kunna dela OnionShare-adressen med någon.",
"gui_qr_code_dialog_title": "OnionShare QR-kod",
"gui_show_url_qr_code": "Visa QR-kod",
"gui_show_qr_code": "Visa QR-kod",
"gui_receive_flatpak_data_dir": "Eftersom du installerade OnionShare med Flatpak måste du spara filer i en mapp i ~/OnionShare.",
"gui_chat_stop_server": "Stoppa chattservern",
"gui_chat_start_server": "Starta chattservern",

View File

@ -233,7 +233,7 @@
"gui_chat_start_server": "Sohbet sunucusunu başlat",
"gui_chat_stop_server": "Sohbet sunucusunu durdur",
"gui_receive_flatpak_data_dir": "OnionShare'i Flatpak kullanarak kurduğunuz için, dosyaları ~/OnionShare içindeki bir klasöre kaydetmelisiniz.",
"gui_show_url_qr_code": "QR Kodu Göster",
"gui_show_qr_code": "QR Kodu Göster",
"gui_qr_code_dialog_title": "OnionShare QR Kodu",
"gui_qr_code_description": "OnionShare adresini bir başkasıyla daha kolay paylaşmak için bu QR kodunu telefonunuzdaki kamera gibi bir QR okuyucuyla tarayın.",
"gui_open_folder_error": "Klasör xdg-open ile açılamadı. Dosya burada: {}",

View File

@ -217,7 +217,7 @@
"gui_chat_start_server": "Запустити сервер чату",
"gui_chat_stop_server_autostop_timer": "Зупинити сервер чату ({})",
"gui_qr_code_dialog_title": "QR-код OnionShare",
"gui_show_url_qr_code": "Показати QR-код",
"gui_show_qr_code": "Показати QR-код",
"gui_main_page_share_button": "Поділитися",
"gui_main_page_chat_button": "Почати спілкуватися в чаті",
"gui_main_page_website_button": "Почати хостинг",

View File

@ -257,7 +257,7 @@
"gui_new_tab_share_button": "共享文件",
"gui_new_tab_tooltip": "打开一个新标签",
"gui_new_tab": "新建标签",
"gui_show_url_qr_code": "显示二维码",
"gui_show_qr_code": "显示二维码",
"gui_receive_flatpak_data_dir": "因为你用Flatpack安装的OnionShare你需要把文件储存到在~/OnionShare里的一个文件夹里。",
"gui_chat_stop_server": "停止言论服务器",
"gui_chat_start_server": "开始言论服务器",

View File

@ -254,7 +254,7 @@
"gui_main_page_share_button": "開始分享",
"gui_new_tab_website_button": "架設一個網站",
"gui_qr_code_dialog_title": "OnionShare QR Code",
"gui_show_url_qr_code": "顯示QR Code",
"gui_show_qr_code": "顯示QR Code",
"gui_chat_stop_server": "停止聊天伺服器",
"gui_chat_start_server": "開啟聊天伺服器",
"gui_file_selection_remove_all": "全部移除",

View File

@ -81,6 +81,13 @@ class ServerStatus(QtWidgets.QWidget):
self.url_description = QtWidgets.QLabel()
self.url_description.setWordWrap(True)
self.url_description.setMinimumHeight(50)
# URL sharing instructions, above the URL and Copy Address/QR Code buttons
self.url_instructions = QtWidgets.QLabel()
self.url_instructions.setWordWrap(True)
self.url_instructions.setMinimumHeight(50)
# The URL label itself
self.url = QtWidgets.QLabel()
self.url.setFont(url_font)
self.url.setWordWrap(True)
@ -90,16 +97,16 @@ class ServerStatus(QtWidgets.QWidget):
Qt.TextSelectableByMouse | Qt.TextSelectableByKeyboard
)
# Copy Onion Address button
self.copy_url_button = QtWidgets.QPushButton(strings._("gui_copy_url"))
self.copy_url_button.setStyleSheet(
self.common.gui.css["server_status_url_buttons"]
)
self.copy_url_button.clicked.connect(self.copy_url)
self.copy_client_auth_button = QtWidgets.QPushButton(
strings._("gui_copy_client_auth")
)
# Onion Address QR code button
self.show_url_qr_code_button = QtWidgets.QPushButton(
strings._("gui_show_url_qr_code")
strings._("gui_show_qr_code")
)
self.show_url_qr_code_button.hide()
self.show_url_qr_code_button.clicked.connect(
@ -109,22 +116,60 @@ class ServerStatus(QtWidgets.QWidget):
self.common.gui.css["server_status_url_buttons"]
)
# Client Auth sharing instructions, above the
# Copy Private Key/QR Code buttons
self.client_auth_instructions = QtWidgets.QLabel()
self.client_auth_instructions.setWordWrap(True)
self.client_auth_instructions.setMinimumHeight(50)
self.client_auth_instructions.setText(
strings._("gui_client_auth_instructions")
)
# Copy ClientAuth button
self.copy_client_auth_button = QtWidgets.QPushButton(
strings._("gui_copy_client_auth")
)
self.copy_client_auth_button.setStyleSheet(
self.common.gui.css["server_status_url_buttons"]
)
self.copy_client_auth_button.clicked.connect(self.copy_client_auth)
# ClientAuth QR code button
self.show_client_auth_qr_code_button = QtWidgets.QPushButton(
strings._("gui_show_qr_code")
)
self.show_client_auth_qr_code_button.hide()
self.show_client_auth_qr_code_button.clicked.connect(
self.show_client_auth_qr_code_button_clicked
)
self.show_client_auth_qr_code_button.setStyleSheet(
self.common.gui.css["server_status_url_buttons"]
)
# URL instructions layout
url_buttons_layout = QtWidgets.QHBoxLayout()
url_buttons_layout.addWidget(self.copy_url_button)
url_buttons_layout.addWidget(self.copy_client_auth_button)
url_buttons_layout.addWidget(self.show_url_qr_code_button)
url_buttons_layout.addStretch()
url_layout = QtWidgets.QVBoxLayout()
url_layout.addWidget(self.url_description)
url_layout.addWidget(self.url_instructions)
url_layout.addWidget(self.url)
url_layout.addLayout(url_buttons_layout)
# Add the widgets
# Private key instructions layout
client_auth_buttons_layout = QtWidgets.QHBoxLayout()
client_auth_buttons_layout.addWidget(self.copy_client_auth_button)
client_auth_buttons_layout.addWidget(self.show_client_auth_qr_code_button)
client_auth_buttons_layout.addStretch()
client_auth_layout = QtWidgets.QVBoxLayout()
client_auth_layout.addWidget(self.client_auth_instructions)
client_auth_layout.addLayout(client_auth_buttons_layout)
# Add the widgets and URL/ClientAuth layouts
# to the main ServerStatus layout
button_layout = QtWidgets.QHBoxLayout()
button_layout.addWidget(self.server_button)
button_layout.addStretch()
@ -132,6 +177,7 @@ class ServerStatus(QtWidgets.QWidget):
layout = QtWidgets.QVBoxLayout()
layout.addLayout(button_layout)
layout.addLayout(url_layout)
layout.addLayout(client_auth_layout)
self.setLayout(layout)
def set_mode(self, share_mode, file_selection=None):
@ -227,16 +273,26 @@ class ServerStatus(QtWidgets.QWidget):
else:
self.url_description.setToolTip(strings._("gui_url_label_stay_open"))
if self.settings.get("general", "public"):
self.url_instructions.setText(
strings._("gui_url_instructions_public_mode")
)
else:
self.url_instructions.setText(strings._("gui_url_instructions"))
self.url_instructions.show()
self.url.setText(self.get_url())
self.url.show()
self.copy_url_button.show()
self.show_url_qr_code_button.show()
if self.settings.get("general", "public"):
self.client_auth_instructions.hide()
self.copy_client_auth_button.hide()
self.show_client_auth_qr_code_button.hide()
else:
self.client_auth_instructions.show()
self.copy_client_auth_button.show()
self.show_client_auth_qr_code_button.show()
def update(self):
"""
@ -260,10 +316,13 @@ class ServerStatus(QtWidgets.QWidget):
)
else:
self.url_description.hide()
self.url_instructions.hide()
self.url.hide()
self.copy_url_button.hide()
self.copy_client_auth_button.hide()
self.show_url_qr_code_button.hide()
self.client_auth_instructions.hide()
self.copy_client_auth_button.hide()
self.show_client_auth_qr_code_button.hide()
self.mode_settings_widget.update_ui()
@ -411,11 +470,21 @@ class ServerStatus(QtWidgets.QWidget):
"""
Show a QR code of the onion URL.
"""
if self.settings.get("general", "public"):
self.qr_code_dialog = QRCodeDialog(self.common, self.get_url())
else:
# Make a QR Code for the ClientAuth too
self.qr_code_dialog = QRCodeDialog(self.common, self.get_url(), self.app.auth_string)
self.qr_code_dialog = QRCodeDialog(
self.common,
strings._("gui_qr_label_url_title"),
self.get_url()
)
def show_client_auth_qr_code_button_clicked(self):
"""
Show a QR code of the private key
"""
self.qr_code_dialog = QRCodeDialog(
self.common,
strings._("gui_qr_label_auth_string_title"),
self.app.auth_string
)
def start_server(self):
"""

View File

@ -130,47 +130,26 @@ class QRCodeDialog(QtWidgets.QDialog):
A dialog showing a QR code.
"""
def __init__(self, common, url, auth_string=None):
def __init__(self, common, title, text):
super(QRCodeDialog, self).__init__()
self.common = common
self.common.log("QrCode", "__init__")
self.qr_label_url = QtWidgets.QLabel(self)
self.qr_label_url.setPixmap(qrcode.make(url, image_factory=Image).pixmap())
self.qr_label_url.setScaledContents(True)
self.qr_label_url.setFixedSize(350, 350)
self.qr_label_url_title = QtWidgets.QLabel(self)
self.qr_label_url_title.setText(strings._("gui_qr_label_url_title"))
self.qr_label_url_title.setAlignment(QtCore.Qt.AlignCenter)
self.qr_label_title = QtWidgets.QLabel(self)
self.qr_label_title.setText(title)
self.qr_label_title.setAlignment(QtCore.Qt.AlignCenter)
self.qr_label = QtWidgets.QLabel(self)
self.qr_label.setPixmap(qrcode.make(text, image_factory=Image).pixmap())
self.qr_label.setScaledContents(True)
self.qr_label.setFixedSize(350, 350)
self.setWindowTitle(strings._("gui_qr_code_dialog_title"))
self.setWindowIcon(QtGui.QIcon(GuiCommon.get_resource_path("images/logo.png")))
layout = QtWidgets.QHBoxLayout(self)
url_layout = QtWidgets.QVBoxLayout(self)
url_layout.addWidget(self.qr_label_url_title)
url_layout.addWidget(self.qr_label_url)
url_code_with_label = QtWidgets.QWidget()
url_code_with_label.setLayout(url_layout)
layout.addWidget(url_code_with_label)
if auth_string:
self.qr_label_auth_string = QtWidgets.QLabel(self)
self.qr_label_auth_string.setPixmap(qrcode.make(auth_string, image_factory=Image).pixmap())
self.qr_label_auth_string.setScaledContents(True)
self.qr_label_auth_string.setFixedSize(350, 350)
self.qr_label_auth_string_title = QtWidgets.QLabel(self)
self.qr_label_auth_string_title.setText(strings._("gui_qr_label_auth_string_title"))
self.qr_label_auth_string_title.setAlignment(QtCore.Qt.AlignCenter)
auth_string_layout = QtWidgets.QVBoxLayout(self)
auth_string_layout.addWidget(self.qr_label_auth_string_title)
auth_string_layout.addWidget(self.qr_label_auth_string)
auth_string_code_with_label = QtWidgets.QWidget()
auth_string_code_with_label.setLayout(auth_string_layout)
layout.addWidget(auth_string_code_with_label)
layout = QtWidgets.QVBoxLayout(self)
layout.addWidget(self.qr_label_title)
layout.addWidget(self.qr_label)
self.exec_()

View File

@ -270,10 +270,32 @@ class GuiBaseTest(unittest.TestCase):
tab.get_mode().server_status.file_selection.add_button.isVisible()
)
def url_shown(self, tab):
"""Test that the URL is showing"""
self.assertTrue(tab.get_mode().server_status.url.isVisible())
def url_description_shown(self, tab):
"""Test that the URL label is showing"""
self.assertTrue(tab.get_mode().server_status.url_description.isVisible())
def url_instructions_shown(self, tab):
"""Test that the URL instructions for sharing are showing"""
self.assertTrue(tab.get_mode().server_status.url_instructions.isVisible())
def client_auth_instructions_shown(self, tab):
"""
Test that the Private Key instructions for sharing
are showing when not in public mode
"""
if not tab.settings.get("general", "public"):
self.assertTrue(
tab.get_mode().server_status.client_auth_instructions.isVisible()
)
else:
self.assertFalse(
tab.get_mode().server_status.client_auth_instructions.isVisible()
)
def have_copy_url_button(self, tab):
"""Test that the Copy URL button is shown and that the clipboard is correct"""
self.assertTrue(tab.get_mode().server_status.copy_url_button.isVisible())
@ -282,7 +304,7 @@ class GuiBaseTest(unittest.TestCase):
clipboard = tab.common.gui.qtapp.clipboard()
self.assertEqual(clipboard.text(), f"http://127.0.0.1:{tab.app.port}")
def have_show_qr_code_button(self, tab):
def have_show_url_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()
@ -296,6 +318,28 @@ class GuiBaseTest(unittest.TestCase):
QtCore.QTimer.singleShot(500, accept_dialog)
tab.get_mode().server_status.show_url_qr_code_button.click()
def have_show_client_auth_qr_code_button(self, tab):
"""
Test that the Show QR Code Client Auth button is shown when
not in public mode and that it loads a QR Code Dialog.
"""
if not tab.settings.get("general", "public"):
self.assertTrue(
tab.get_mode().server_status.show_client_auth_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_client_auth_qr_code_button.click()
else:
self.assertFalse(
tab.get_mode().server_status.show_client_auth_qr_code_button.isVisible()
)
def server_status_indicator_says_started(self, tab):
"""Test that the Server Status indicator shows we are started"""
if type(tab.get_mode()) == ReceiveMode:
@ -344,9 +388,16 @@ class GuiBaseTest(unittest.TestCase):
self.assertFalse(tab.get_mode().server_status.copy_url_button.isVisible())
self.assertFalse(tab.get_mode().server_status.url.isVisible())
self.assertFalse(tab.get_mode().server_status.url_description.isVisible())
self.assertFalse(tab.get_mode().server_status.url_instructions.isVisible())
self.assertFalse(
tab.get_mode().server_status.client_auth_instructions.isVisible()
)
self.assertFalse(
tab.get_mode().server_status.copy_client_auth_button.isVisible()
)
self.assertFalse(
tab.get_mode().server_status.show_client_auth_qr_code_button.isVisible()
)
def web_server_is_stopped(self, tab):
"""Test that the web server also stopped"""

View File

@ -37,8 +37,12 @@ class TestChat(GuiBaseTest):
self.server_is_started(tab, startup_time=500)
self.web_server_is_running(tab)
self.url_description_shown(tab)
self.url_instructions_shown(tab)
self.url_shown(tab)
self.have_copy_url_button(tab)
self.have_show_qr_code_button(tab)
self.have_show_url_qr_code_button(tab)
self.client_auth_instructions_shown(tab)
self.have_show_client_auth_qr_code_button(tab)
self.server_status_indicator_says_started(tab)
def run_all_chat_mode_stopping_tests(self, tab):

View File

@ -110,8 +110,12 @@ class TestReceive(GuiBaseTest):
self.server_is_started(tab)
self.web_server_is_running(tab)
self.url_description_shown(tab)
self.url_instructions_shown(tab)
self.url_shown(tab)
self.have_copy_url_button(tab)
self.have_show_qr_code_button(tab)
self.have_show_url_qr_code_button(tab)
self.client_auth_instructions_shown(tab)
self.have_show_client_auth_qr_code_button(tab)
self.server_status_indicator_says_started(tab)
def run_all_receive_mode_tests(self, tab):

View File

@ -182,8 +182,12 @@ class TestShare(GuiBaseTest):
self.server_is_started(tab, startup_time)
self.web_server_is_running(tab)
self.url_description_shown(tab)
self.url_instructions_shown(tab)
self.url_shown(tab)
self.have_copy_url_button(tab)
self.have_show_qr_code_button(tab)
self.have_show_url_qr_code_button(tab)
self.client_auth_instructions_shown(tab)
self.have_show_client_auth_qr_code_button(tab)
self.server_status_indicator_says_started(tab)
def run_all_share_mode_download_tests(self, tab):

View File

@ -46,8 +46,12 @@ class TestWebsite(GuiBaseTest):
self.server_is_started(tab, startup_time)
self.web_server_is_running(tab)
self.url_description_shown(tab)
self.url_instructions_shown(tab)
self.url_shown(tab)
self.have_copy_url_button(tab)
self.have_show_qr_code_button(tab)
self.have_show_url_qr_code_button(tab)
self.client_auth_instructions_shown(tab)
self.have_show_client_auth_qr_code_button(tab)
self.server_status_indicator_says_started(tab)
def run_all_website_mode_download_tests(self, tab):