From b2d7a1203372d19cb8e8949a4c08a41cc5f35494 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Fri, 12 Jun 2026 09:02:53 +0200 Subject: [PATCH] wait for mesh (#1063) * wait for mesh * more * more --- data/translations/de/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- data/translations/es/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- data/translations/fr/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- data/translations/gopher64.pot | 47 ++++++++++--------- data/translations/ja/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- data/translations/nl/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- .../pt_BR/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- data/translations/ru/LC_MESSAGES/gopher64.po | 47 ++++++++++--------- src/ui/gui/appwindow.slint | 2 + src/ui/gui/netplay_wait.slint | 6 ++- src/ui/netplay.rs | 9 +++- 11 files changed, 222 insertions(+), 171 deletions(-) diff --git a/data/translations/de/LC_MESSAGES/gopher64.po b/data/translations/de/LC_MESSAGES/gopher64.po index 4fcff50..3606da5 100644 --- a/data/translations/de/LC_MESSAGES/gopher64.po +++ b/data/translations/de/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: \n" "Language-Team: German\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Spenden (über GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Lokales Spiel" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Controller-Konfiguration" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Netplay" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Cheats" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Einstellungen" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "Über" @@ -345,67 +345,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Feedback geben" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Netplay: Warteraum" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Sitzungsname:" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Spielname:" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Spieler 1:" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Spieler 2:" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Spieler 3:" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Spieler 4:" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Chatnachricht eingeben" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Nachricht senden" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Lokale Eingabeverzögerung:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Empfohlen: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Spiel starten" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "Warten auf P2P-Mesh " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Abbrechen" diff --git a/data/translations/es/LC_MESSAGES/gopher64.po b/data/translations/es/LC_MESSAGES/gopher64.po index 88a317a..943dd63 100644 --- a/data/translations/es/LC_MESSAGES/gopher64.po +++ b/data/translations/es/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: Gemini\n" "Language-Team: Spanish (Spain)\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Donar (a través de GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Juego local" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Config. del mando" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Netplay" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Trucos" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Ajustes" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "Acerca de" @@ -345,67 +345,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Enviar comentarios" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Netplay: Sala de espera" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Nombre de la sesión:" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Nombre del juego:" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Jugador 1:" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Jugador 2:" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Jugador 3:" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Jugador 4:" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Escribe un mensaje en el chat" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Enviar mensaje" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Retardo de entrada local:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Recomendado: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Iniciar juego" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "Esperando malla P2P " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Cancelar" diff --git a/data/translations/fr/LC_MESSAGES/gopher64.po b/data/translations/fr/LC_MESSAGES/gopher64.po index 5f3d8d8..d53b84a 100644 --- a/data/translations/fr/LC_MESSAGES/gopher64.po +++ b/data/translations/fr/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: \n" "Language-Team: French (France)\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Faire un don (via GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Jeu local" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Configuration manette" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Netplay" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Triche" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Paramètres" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "À propos" @@ -346,67 +346,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Donner votre avis" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Netplay : salle d'attente" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Nom de la session :" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Nom du jeu :" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Joueur 1 :" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Joueur 2 :" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Joueur 3 :" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Joueur 4 :" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Saisir un message" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Envoyer" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Délai d'entrée local :" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Recommandé : " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Lancer la partie" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "En attente du maillage P2P " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Annuler" diff --git a/data/translations/gopher64.pot b/data/translations/gopher64.pot index aed46a1..59e39f8 100644 --- a/data/translations/gopher64.pot +++ b/data/translations/gopher64.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "" @@ -343,67 +343,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "" -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "" + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "" diff --git a/data/translations/ja/LC_MESSAGES/gopher64.po b/data/translations/ja/LC_MESSAGES/gopher64.po index 9a9fb29..fe8d677 100644 --- a/data/translations/ja/LC_MESSAGES/gopher64.po +++ b/data/translations/ja/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: \n" "Language-Team: Japanese\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "GitHubで寄付" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "ローカルゲーム" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "コントローラー設定" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "ネットプレイ" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "チート" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "設定" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "バージョン情報" @@ -343,67 +343,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "フィードバックを送る" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "ネットプレイ：待機室" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "セッション名：" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "ゲーム名：" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "プレイヤー1：" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "プレイヤー2：" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "プレイヤー3：" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "プレイヤー4：" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "チャットメッセージを入力" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "送信" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "ローカル入力遅延:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "推奨: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "ゲーム開始" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "P2Pメッシュ接続待機中 " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "キャンセル" diff --git a/data/translations/nl/LC_MESSAGES/gopher64.po b/data/translations/nl/LC_MESSAGES/gopher64.po index c415cb2..6d38a76 100644 --- a/data/translations/nl/LC_MESSAGES/gopher64.po +++ b/data/translations/nl/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: \n" "Language-Team: Dutch (Netherlands)\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Doneren (via GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Lokaal spel" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Controllerconfiguratie" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Netplay" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Cheats" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Instellingen" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "Over" @@ -345,67 +345,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Feedback geven" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Netplay: wachtruimte" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Sessienaam:" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Spelnaam:" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Speler 1:" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Speler 2:" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Speler 3:" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Speler 4:" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Chatbericht invoeren" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Bericht verzenden" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Lokale invoervertraging:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Aanbevolen: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Spel starten" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "Wachten op P2P-mesh " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Annuleren" diff --git a/data/translations/pt_BR/LC_MESSAGES/gopher64.po b/data/translations/pt_BR/LC_MESSAGES/gopher64.po index 688cb9c..a749394 100644 --- a/data/translations/pt_BR/LC_MESSAGES/gopher64.po +++ b/data/translations/pt_BR/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 18:11-3000\n" "Last-Translator: EDUARDO CARVALHO \n" "Language-Team: LANGUAGE \n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Doações (via GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Jogo Local" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Configurar Controle" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Netplay" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Trapaças" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Configurações" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "Sobre" @@ -346,67 +346,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Fornecer Feedback" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Netplay: Aguardando Sala" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Nome da Sessão:" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Nome do Jogo:" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Jogador 1" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Jogador 2:" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Jogador 3:" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Jogador 4:" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Escrever mensagem no chat" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Enviar Mensagem" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Atraso de entrada local:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Recomendado: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Iniciar jogo" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "Aguardando malha P2P " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Cancelar" diff --git a/data/translations/ru/LC_MESSAGES/gopher64.po b/data/translations/ru/LC_MESSAGES/gopher64.po index 78f8ccf..b1a83dc 100644 --- a/data/translations/ru/LC_MESSAGES/gopher64.po +++ b/data/translations/ru/LC_MESSAGES/gopher64.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gopher64\n" -"POT-Creation-Date: 2026-06-05 12:03+0000\n" +"POT-Creation-Date: 2026-06-12 06:51+0000\n" "PO-Revision-Date: 2026-05-11 12:00+0000\n" "Last-Translator: \n" "Language-Team: Russian\n" @@ -47,37 +47,37 @@ msgctxt "About" msgid "Donate (via GitHub)" msgstr "Пожертвовать (через GitHub)" -#: src/ui/gui/appwindow.slint:147 +#: src/ui/gui/appwindow.slint:148 msgctxt "Menu" msgid "Local Game" msgstr "Локальная игра" -#: src/ui/gui/appwindow.slint:151 +#: src/ui/gui/appwindow.slint:152 msgctxt "Menu" msgid "Controller Config" msgstr "Настройка контроллера" -#: src/ui/gui/appwindow.slint:155 +#: src/ui/gui/appwindow.slint:156 msgctxt "Menu" msgid "Netplay" msgstr "Сетевая игра" -#: src/ui/gui/appwindow.slint:159 +#: src/ui/gui/appwindow.slint:160 msgctxt "Menu" msgid "Cheats" msgstr "Читы" -#: src/ui/gui/appwindow.slint:163 +#: src/ui/gui/appwindow.slint:164 msgctxt "Menu" msgid "RetroAchievements" msgstr "RetroAchievements" -#: src/ui/gui/appwindow.slint:167 +#: src/ui/gui/appwindow.slint:168 msgctxt "Menu" msgid "Settings" msgstr "Настройки" -#: src/ui/gui/appwindow.slint:171 +#: src/ui/gui/appwindow.slint:172 msgctxt "Menu" msgid "About" msgstr "О программе" @@ -344,67 +344,72 @@ msgctxt "Netplay" msgid "Provide Feedback" msgstr "Оставить отзыв" -#: src/ui/gui/netplay_wait.slint:16 +#: src/ui/gui/netplay_wait.slint:17 msgctxt "NetplayWait" msgid "Netplay: Waiting Room" msgstr "Сетевая игра: Комната ожидания" -#: src/ui/gui/netplay_wait.slint:28 +#: src/ui/gui/netplay_wait.slint:29 msgctxt "NetplayWait" msgid "Session Name:" msgstr "Имя сессии:" -#: src/ui/gui/netplay_wait.slint:34 +#: src/ui/gui/netplay_wait.slint:35 msgctxt "NetplayWait" msgid "Game Name:" msgstr "Название игры:" -#: src/ui/gui/netplay_wait.slint:44 +#: src/ui/gui/netplay_wait.slint:45 msgctxt "NetplayWait" msgid "Player 1:" msgstr "Игрок 1:" -#: src/ui/gui/netplay_wait.slint:48 +#: src/ui/gui/netplay_wait.slint:49 msgctxt "NetplayWait" msgid "Player 2:" msgstr "Игрок 2:" -#: src/ui/gui/netplay_wait.slint:54 +#: src/ui/gui/netplay_wait.slint:55 msgctxt "NetplayWait" msgid "Player 3:" msgstr "Игрок 3:" -#: src/ui/gui/netplay_wait.slint:58 +#: src/ui/gui/netplay_wait.slint:59 msgctxt "NetplayWait" msgid "Player 4:" msgstr "Игрок 4:" -#: src/ui/gui/netplay_wait.slint:72 +#: src/ui/gui/netplay_wait.slint:73 msgctxt "NetplayWait" msgid "Enter chat message" msgstr "Введите сообщение чата" -#: src/ui/gui/netplay_wait.slint:83 +#: src/ui/gui/netplay_wait.slint:84 msgctxt "NetplayWait" msgid "Send Message" msgstr "Отправить сообщение" -#: src/ui/gui/netplay_wait.slint:100 +#: src/ui/gui/netplay_wait.slint:101 msgctxt "NetplayWait" msgid "Local Input Delay:" msgstr "Локальная задержка ввода:" -#: src/ui/gui/netplay_wait.slint:115 +#: src/ui/gui/netplay_wait.slint:117 msgctxt "NetplayWait" msgid "Recommended: " msgstr "Рекомендуется: " -#: src/ui/gui/netplay_wait.slint:123 +#: src/ui/gui/netplay_wait.slint:126 msgctxt "NetplayWait" msgid "Start Game" msgstr "Начать игру" -#: src/ui/gui/netplay_wait.slint:131 +#: src/ui/gui/netplay_wait.slint:126 +msgctxt "NetplayWait" +msgid "Waiting for P2P mesh " +msgstr "Ожидание P2P-сети " + +#: src/ui/gui/netplay_wait.slint:134 msgctxt "NetplayWait" msgid "Cancel" msgstr "Отмена" diff --git a/src/ui/gui/appwindow.slint b/src/ui/gui/appwindow.slint index c3eeed4..3785be9 100644 --- a/src/ui/gui/appwindow.slint +++ b/src/ui/gui/appwindow.slint @@ -119,6 +119,7 @@ export component AppWindow inherits Window { in-out property netplay_input_delay <=> NetplayWaitData.input_delay; in-out property netplay_recommended_delay <=> NetplayWaitData.recommended_delay; in-out property netplay_game_pal <=> NetplayWaitData.game_pal; + in-out property netplay_connected_peers_count <=> NetplayWaitData.connected_peers_count; private property popup_message; private property popup_has_close; @@ -381,6 +382,7 @@ export component AppWindow inherits Window { NetplayWaitData.input_delay = 0; NetplayWaitData.recommended_delay = 0; NetplayWaitData.players = []; + NetplayWaitData.connected_peers_count = 0; NetplayData.pending_session = false; NetplayData.pending_refresh = false; } diff --git a/src/ui/gui/netplay_wait.slint b/src/ui/gui/netplay_wait.slint index f4ffc49..5887bcd 100644 --- a/src/ui/gui/netplay_wait.slint +++ b/src/ui/gui/netplay_wait.slint @@ -10,6 +10,7 @@ export global NetplayWaitData { in-out property input_delay; in-out property recommended_delay; in-out property game_pal; + in-out property connected_peers_count; } export component NetplayWait inherits Page { @@ -121,8 +122,9 @@ export component NetplayWait inherits Page { HorizontalBox { alignment: center; Button { - text: @tr("Start Game"); - enabled: NetplayWaitData.players[0] == NetplayData.player_name && NetplayWaitData.can_start && NetplayWaitData.recommended_delay != 0; + property mesh_complete: NetplayWaitData.players.length == (NetplayWaitData.connected_peers_count + 1); + text: mesh_complete ? @tr("Start Game") : @tr("Waiting for P2P mesh ") + (NetplayWaitData.connected_peers_count + 1) + "/" + NetplayWaitData.players.length; + enabled: NetplayWaitData.players[0] == NetplayData.player_name && NetplayWaitData.can_start && NetplayWaitData.recommended_delay != 0 && mesh_complete; clicked => { NetplayWaitData.can_start = false; begin_game(NetplayWaitData.input_delay); diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs index a3118f5..f793df0 100644 --- a/src/ui/netplay.rs +++ b/src/ui/netplay.rs @@ -412,9 +412,16 @@ fn update_ping( let (mut write, mut read) = channel.split(); let mut write_clone = write.clone(); let mut close_ping_rx_clone = close_ping_rx.resubscribe(); + let weak_app_clone = weak_app.clone(); tokio::spawn(async move { loop { socket.update_peers(); + let peers_count = socket.connected_peers().count(); + weak_app_clone + .upgrade_in_event_loop(move |handle| { + handle.set_netplay_connected_peers_count(peers_count as i32); + }) + .unwrap(); for peer in socket.connected_peers() { let now = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -423,7 +430,7 @@ fn update_ping( let ping_message = NetplayPingMessage { message_type: PingType::Ping, timestamp: now, - num_of_peers: socket.connected_peers().count(), + num_of_peers: peers_count, }; let data = postcard::to_stdvec(&ping_message).unwrap(); let _ = write.send((peer, data.into())).await;