diff --git a/src/ui/gui/appwindow.slint b/src/ui/gui/appwindow.slint index 0d3b16d0..e3af4506 100644 --- a/src/ui/gui/appwindow.slint +++ b/src/ui/gui/appwindow.slint @@ -54,6 +54,7 @@ export component AppWindow inherits Window { in-out property ra_challenge <=> RAData.challenge; in-out property ra_leaderboard <=> RAData.leaderboard; in-out property ra_softcore_only <=> RAData.ra_softcore_only; + out property ra_not_logged_in <=> RAData.not_logged_in; in-out property integer_scaling <=> SettingsData.integer_scaling; in-out property ssaa <=> SettingsData.ssaa; in-out property fullscreen <=> SettingsData.fullscreen; @@ -83,12 +84,12 @@ export component AppWindow inherits Window { in-out property cheats <=> CheatsData.cheats; preferred-width: 700px; preferred-height: 500px; - title: @tr("Gopher64"); + title: "Gopher64"; icon: @image-url("../../../data/icon/gopher64.png"); HorizontalLayout { side-bar := SideBar { - title: @tr("Gopher64"); + title: "Gopher64"; model: [ @tr("Menu" => "Local Game"), @tr("Menu" => "Controller Config"), diff --git a/src/ui/gui/netplay_create.slint b/src/ui/gui/netplay_create.slint index 76884a26..da204804 100644 --- a/src/ui/gui/netplay_create.slint +++ b/src/ui/gui/netplay_create.slint @@ -125,6 +125,6 @@ export component NetplayCreate inherits Window { export component DispatcherDialog inherits Dialog { title: @tr("Creating Server"); Text { - text: "Creating server, please wait...This may take about 30 seconds."; + text: @tr("Creating server, please wait...This may take about 30 seconds."); } } diff --git a/src/ui/gui/netplay_join.slint b/src/ui/gui/netplay_join.slint index fbf28653..b73c888f 100644 --- a/src/ui/gui/netplay_join.slint +++ b/src/ui/gui/netplay_join.slint @@ -44,7 +44,7 @@ export component NetplayJoin inherits Window { } LineEdit { - placeholder-text: @tr("example.com:45000"); + placeholder-text: "example.com:45000"; text: NetplayData.custom_server_url; edited(text) => { NetplayData.custom_server_url = text; @@ -70,11 +70,11 @@ export component NetplayJoin inherits Window { } StandardTableView { columns: [ - { title: "Server" }, - { title: "Session Name" }, - { title: "Game Name" }, - { title: "Password" }, - { title: "Cheats" } + { title: @tr("Server") }, + { title: @tr("Session Name") }, + { title: @tr("Game Name") }, + { title: @tr("Password") }, + { title: @tr("Cheats") } ]; rows: NetplayData.sessions; current-row: NetplayData.current_session; diff --git a/src/ui/gui/netplay_wait.slint b/src/ui/gui/netplay_wait.slint index 2460768b..2d70058f 100644 --- a/src/ui/gui/netplay_wait.slint +++ b/src/ui/gui/netplay_wait.slint @@ -47,21 +47,21 @@ export component NetplayWait inherits Window { GridBox { Row { Text { - text: "Player 1: " + players[0]; + text: @tr("Player 1: ") + players[0]; } Text { - text: "Player 2: " + players[1]; + text: @tr("Player 2: ") + players[1]; } } Row { Text { - text: "Player 3: " + players[2]; + text: @tr("Player 3: ") + players[2]; } Text { - text: "Player 4: " + players[3]; + text: @tr("Player 4: ") + players[3]; } } } diff --git a/src/ui/gui/retroachievements_page.slint b/src/ui/gui/retroachievements_page.slint index a55f5d12..0bb47632 100644 --- a/src/ui/gui/retroachievements_page.slint +++ b/src/ui/gui/retroachievements_page.slint @@ -15,6 +15,7 @@ export global RAData { in-out property ra_username; in-out property ra_password; in-out property current_user_message; + out property not_logged_in: @tr("Not currently logged in"); } export component RetroAchievements inherits Page { @@ -37,7 +38,7 @@ export component RetroAchievements inherits Page { RAData.ra_username = ""; username_widget.text = ""; password_widget.text = ""; - RAData.current_user_message = "Not currently logged in"; + RAData.current_user_message = RAData.not_logged_in; RAData.ra_show_profile = false; } ra_toggled(RAData.enabled,RAData.hardcore,RAData.challenge,RAData.leaderboard); diff --git a/src/ui/retroachievements.rs b/src/ui/retroachievements.rs index 1d052a4d..82aacf43 100644 --- a/src/ui/retroachievements.rs +++ b/src/ui/retroachievements.rs @@ -27,7 +27,7 @@ pub fn ra_window(app: &ui::gui::AppWindow) { retroachievements::login_token_user(app.get_ra_username().to_string(), token, tx); set_current_user_message(app, rx); } else { - app.set_ra_current_user_message("Not currently logged in".into()); + app.set_ra_current_user_message(app.get_ra_not_logged_in()); } let weak_app2 = app.as_weak();