Alez/Babylonia-terminal
1
0
Fork 0
mirror of https://github.com/ALEZ-DEV/Babylonia-terminal.git synced 2025-12-16 09:28:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some correction

Browse Source
This commit is contained in:
ALEZ-DEV 2025-04-07 18:25:31 +02:00
parent cde2c99e2d
commit 2d9fac062a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
babylonia-terminal-gui/src/ui/pages/steps/choose_game_directory.rs
View File

@ -47,6 +47,7 @@ impl SimpleAsyncComponent for ChooseGameDirectoryPage {
}, },
add = &adw::PreferencesGroup { add = &adw::PreferencesGroup {
set_width_request: 500,
set_valign: gtk::Align::Center, set_valign: gtk::Align::Center,
set_vexpand: true, set_vexpand: true,

19
babylonia-terminal-gui/src/ui/pages/steps/download_components.rs
View File

@ -6,6 +6,7 @@ use babylonia_terminal_sdk::{
dxvk_component::{self, DXVKComponent}, dxvk_component::{self, DXVKComponent},
proton_component::{self, ProtonComponent}, proton_component::{self, ProtonComponent},
}, },
game_config::GameConfig,
game_state::GameState, game_state::GameState,
utils::{ utils::{
github_requester::{GithubRelease, GithubRequester}, github_requester::{GithubRelease, GithubRequester},
@ -60,6 +61,7 @@ pub struct DownloadComponentsPage {
dxvk_versions: Vec<GithubRelease>, dxvk_versions: Vec<GithubRelease>,
selected_proton_version: Option<GithubRelease>, selected_proton_version: Option<GithubRelease>,
selected_dxvk_version: Option<GithubRelease>, selected_dxvk_version: Option<GithubRelease>,
game_config: GameConfig,
//progress_bar //progress_bar
progress_bar_reporter: std::sync::Arc<DownloadComponentProgressBarReporter>, progress_bar_reporter: std::sync::Arc<DownloadComponentProgressBarReporter>,
@ -101,6 +103,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
}, },
add = &adw::PreferencesGroup { add = &adw::PreferencesGroup {
set_width_request: 500,
set_valign: gtk::Align::Center, set_valign: gtk::Align::Center,
set_vexpand: true, set_vexpand: true,
@ -150,6 +153,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
set_visible: model.currently_installing != CurrentlyInstalling::None, set_visible: model.currently_installing != CurrentlyInstalling::None,
add = &adw::PreferencesGroup { add = &adw::PreferencesGroup {
set_width_request: 500,
set_valign: gtk::Align::Center, set_valign: gtk::Align::Center,
set_vexpand: true, set_vexpand: true,
@ -172,7 +176,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
}, },
#[watch] #[watch]
set_icon_name: if model.currently_installing == CurrentlyInstalling::Proton { Some("process-working") } else { Some("emblem-ok-symbolic") }, set_icon_name: if model.currently_installing != CurrentlyInstalling::Proton && model.game_config.is_wine_installed { Some("emblem-ok-symbolic") } else { None },
add_prefix = &gtk::Spinner { add_prefix = &gtk::Spinner {
set_spinning: true, set_spinning: true,
@ -191,7 +195,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
}, },
#[watch] #[watch]
set_icon_name: if model.currently_installing == CurrentlyInstalling::DXVK { Some("process-working") } else { Some("emblem-ok-symbolic") }, set_icon_name: if model.currently_installing != CurrentlyInstalling::DXVK && model.game_config.is_dxvk_installed { Some("emblem-ok-symbolic") } else { None },
add_prefix = &gtk::Spinner { add_prefix = &gtk::Spinner {
set_spinning: true, set_spinning: true,
@ -207,7 +211,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
set_subtitle: "Arial", set_subtitle: "Arial",
#[watch] #[watch]
set_icon_name: if model.currently_installing == CurrentlyInstalling::Fonts { Some("process-working") } else { Some("emblem-ok-symbolic") }, set_icon_name: if model.currently_installing != CurrentlyInstalling::Fonts && model.game_config.is_font_installed { Some("emblem-ok-symbolic") } else { None },
add_prefix = &gtk::Spinner { add_prefix = &gtk::Spinner {
set_spinning: true, set_spinning: true,
@ -219,11 +223,11 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
adw::ActionRow { adw::ActionRow {
#[watch] #[watch]
set_title: "vcrun2022", set_title: "Denpendecies",
set_subtitle: "Denpendecies", set_subtitle: "vcrun2022",
#[watch] #[watch]
set_icon_name: if model.currently_installing == CurrentlyInstalling::Denpendecies { Some("process-working") } else { Some("emblem-ok-symbolic") }, set_icon_name: if model.currently_installing != CurrentlyInstalling::Denpendecies && model.game_config.is_dependecies_installed { Some("emblem-ok-symbolic") } else { None },
add_prefix = &gtk::Spinner { add_prefix = &gtk::Spinner {
set_spinning: true, set_spinning: true,
@ -301,6 +305,7 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
dxvk_versions: dxvk_releases, dxvk_versions: dxvk_releases,
selected_proton_version: None, selected_proton_version: None,
selected_dxvk_version: None, selected_dxvk_version: None,
game_config: GameConfig::get_config().await,
progress_bar_reporter: DownloadComponentProgressBarReporter::create(sender.clone()), progress_bar_reporter: DownloadComponentProgressBarReporter::create(sender.clone()),
progress_bar_message: String::new(), progress_bar_message: String::new(),
@ -358,6 +363,8 @@ impl SimpleAsyncComponent for DownloadComponentsPage {
} }
} }
DownloadComponentsMsg::UpdateCurrentlyInstalling(currently_installing) => { DownloadComponentsMsg::UpdateCurrentlyInstalling(currently_installing) => {
self.game_config = GameConfig::get_config().await;
self.currently_installing = currently_installing; self.currently_installing = currently_installing;
} }
DownloadComponentsMsg::ShowError(message) => { DownloadComponentsMsg::ShowError(message) => {