djib/BoilR
1
0
Fork 0
mirror of https://github.com/djibux/BoilR.git synced 2026-09-01 05:53:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove "download all" and move import button (#287)

Browse Source 
* Remove download all on specific images

* Remove unusued id field

* Move import button to left menu to save on vertical space

* Update version to 1.7.9
This commit is contained in:
Philip Kristoffersen
2022-12-28 09:11:23 +01:00
committed by GitHub
parent df7f0e63a5
commit ffb9b659d5
5 changed files with 107 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/uiapp.rs
+65 -62
View File
@@ -90,6 +90,51 @@ impl MyEguiApp {
platforms,
}
}
fn render_import_button(&mut self, ui: &mut egui::Ui) {
let (status_string, syncing) = match &*self.status_reciever.borrow() {
SyncProgress::NotStarted => ("".to_string(), false),
SyncProgress::Starting => ("Starting Import".to_string(), true),
SyncProgress::FoundGames { games_found } => {
(format!("Found {} games to import", games_found), true)
}
SyncProgress::FindingImages => ("Searching for images".to_string(), true),
SyncProgress::DownloadingImages { to_download } => {
(format!("Downloading {} images ", to_download), true)
}
SyncProgress::Done => ("Done importing games".to_string(), false),
};
if syncing {
ui.ctx().request_repaint();
}
if !status_string.is_empty() {
if syncing {
ui.horizontal(|c| {
c.spinner();
c.label(&status_string);
});
} else {
ui.label(&status_string);
}
}
let all_ready = all_ready(&self.games_to_sync);
let texture = self.get_import_image(ui);
let size = texture.size_vec2();
let image_button = ImageButton::new(texture, size * 0.40);
if all_ready && !syncing{
if ui
.add(image_button)
.on_hover_text("Import your games into steam")
.clicked(){
save_settings(&self.settings, &self.platforms);
self.run_sync(false);
}
}else{
ui
.add(image_button)
.on_hover_text("Waiting for sync to finish");
}
}
}
fn get_rename_map() -> HashMap<u32, String> {
@@ -174,7 +219,11 @@ impl App for MyEguiApp {
|| ui
.selectable_value(&mut self.selected_menu, Menues::Disconnect, "Disconnect")
.changed();
if self.selected_menu == Menues::Import {
ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
self.render_import_button(ui);
});
}
if changed {
self.backup_state.available_backups = None;
}
@@ -187,66 +236,6 @@ impl App for MyEguiApp {
}
});
if self.selected_menu == Menues::Settings {
egui::TopBottomPanel::new(egui::panel::TopBottomSide::Bottom, "Bottom Panel")
.frame(frame)
.show(ctx, |ui| {
let texture = self.get_save_image(ui);
let size = texture.size_vec2();
let save_button = ImageButton::new(texture, size * 0.5);
if ui.add(save_button).on_hover_text("Save settings").clicked() {
save_settings(&self.settings, &self.platforms);
}
});
}
if self.selected_menu == Menues::Import {
egui::TopBottomPanel::new(egui::panel::TopBottomSide::Bottom, "Bottom Panel")
.frame(frame)
.show(ctx, |ui| {
let (status_string, syncing) = match &*self.status_reciever.borrow() {
SyncProgress::NotStarted => ("".to_string(), false),
SyncProgress::Starting => ("Starting Import".to_string(), true),
SyncProgress::FoundGames { games_found } => {
(format!("Found {} games to import", games_found), true)
}
SyncProgress::FindingImages => ("Searching for images".to_string(), true),
SyncProgress::DownloadingImages { to_download } => {
(format!("Downloading {} images ", to_download), true)
}
SyncProgress::Done => ("Done importing games".to_string(), false),
};
if syncing {
ui.ctx().request_repaint();
}
if !status_string.is_empty() {
if syncing {
ui.horizontal(|c| {
c.spinner();
c.label(&status_string);
});
} else {
ui.label(&status_string);
}
}
let all_ready = all_ready(&self.games_to_sync);
let texture = self.get_import_image(ui);
let size = texture.size_vec2();
let image_button = ImageButton::new(texture, size * 0.5);
if all_ready
&& ui
.add(image_button)
.on_hover_text("Import your games into steam")
.clicked()
&& !syncing
{
save_settings(&self.settings, &self.platforms);
self.run_sync(false);
}
});
}
egui::CentralPanel::default().show(ctx, |ui| {
match self.selected_menu {
Menues::Import => {
@@ -266,6 +255,20 @@ impl App for MyEguiApp {
}
};
});
if self.selected_menu == Menues::Settings {
egui::TopBottomPanel::new(egui::panel::TopBottomSide::Bottom, "Bottom Panel")
.frame(frame)
.show(ctx, |ui| {
let texture = self.get_save_image(ui);
let size = texture.size_vec2();
let save_button = ImageButton::new(texture, size * 0.5);
if ui.add(save_button).on_hover_text("Save settings").clicked() {
save_settings(&self.settings, &self.platforms);
}
});
}
}
}
@@ -353,7 +356,7 @@ pub fn run_ui(args: Vec<String>) {
let fullscreen = args.contains(&"--fullscreen".to_string());
let native_options = eframe::NativeOptions {
fullscreen,
maximized:true,
maximized: true,
//initial_window_size: Some(egui::Vec2 { x: 1280., y: 800. }),
icon_data: Some(get_logo_icon()),
vsync: !no_v_sync,