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

Update all dependencies (#208)

Browse Source
This commit is contained in:
Philip Kristoffersen
2022-08-21 16:07:57 +02:00
committed by GitHub
parent 05cd76d552
commit 97f706a2be
9 changed files with 508 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+469 -249
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+8 -8
View File
@@ -5,31 +5,31 @@ version = "1.4.4"
[dependencies]
base64 = "^0.13.0"
chrono = "^0.4.19"
chrono = "^0.4.22"
config = "^0.13.2"
copypasta = "^0.8.1"
flate2 = "^1.0.24"
is_executable = "^1.0.1"
nom = "^7.1.1"
rusty-leveldb = "^1.0.3"
rusty-leveldb = "^1.0.4"
serde_json = "^1.0.83"
sqlite = "^0.27.0"
steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.0"
sysinfo = "^0.25.1"
steamgriddb_api = "^0.3.1"
sysinfo = "^0.25.2"
[dependencies.dashmap]
features = ["serde"]
version = "^5.3.4"
[dependencies.eframe]
version = "^0.18.0"
version = "^0.19.0"
[dependencies.egui]
version = "^0.18.1"
version = "^0.19.0"
[dependencies.futures]
version = "^0.3.21"
version = "^0.3.23"
[dependencies.image]
features = ["png"]
@@ -41,7 +41,7 @@ version = "^0.11.11"
[dependencies.serde]
features = ["derive"]
version = "^1.0.142"
version = "^1.0.144"
[dependencies.tokio]
features = ["full"]
src/main.rs
+3 -5
View File
@@ -16,18 +16,16 @@ mod steamgriddb;
mod sync;
mod ui;
mod uplay;
use std::error::Error;
fn main() -> Result<(), Box<dyn Error>> {
fn main(){
ensure_config_folder();
migration::migrate_config();
let args: Vec<String> = std::env::args().collect();
if args.contains(&"--no-ui".to_string()) {
ui::run_sync();
Ok(())
ui::run_sync();
} else {
ui::run_ui(args)
ui::run_ui(args);
}
}
src/ui/ui_backup.rs
+1 -1
View File
@@ -41,7 +41,7 @@ impl MyEguiApp {
ui.label("No backups found, they will be created every time you run import");
} else {
ScrollArea::vertical()
.stick_to_right()
.stick_to_right(true)
.auto_shrink([false, true])
.show(ui, |ui| {
for backup_path in available_backups {
src/ui/ui_disconnect.rs
+1 -1
View File
@@ -47,7 +47,7 @@ impl MyEguiApp {
let mut redraw = 0;
set_scroll_style(ui);
ScrollArea::vertical()
.stick_to_right()
.stick_to_right(true)
.auto_shrink([false, true])
.show(ui, |ui| {
ui.reset_style();
src/ui/ui_image_download.rs
+20 -13
View File
@@ -264,7 +264,11 @@ impl MyEguiApp {
//Need to load
let image_data = load_image_from_path(&image.thumbnail_path);
if let Some(image_data) = image_data {
let handle = ui.ctx().load_texture(&image_key, image_data);
let handle = ui.ctx().load_texture(
&image_key,
image_data,
egui::TextureFilter::Linear,
);
*state.value_mut() = TextureState::Loaded(handle);
}
ui.ctx().request_repaint();
@@ -327,17 +331,16 @@ impl MyEguiApp {
}
fn ensure_steam_users_loaded(&mut self) {
if self.image_selected_state.settings_error.is_none() && self.image_selected_state.steam_users.is_none() {
if self.image_selected_state.settings_error.is_none()
&& self.image_selected_state.steam_users.is_none()
{
let paths = get_shortcuts_paths(&self.settings.steam);
match paths{
Ok(paths) => {
self.image_selected_state.steam_users = Some(paths)
},
Err(err) => {
match paths {
Ok(paths) => self.image_selected_state.steam_users = Some(paths),
Err(err) => {
self.image_selected_state.settings_error = Some(format!("Could not find user steam location, error message: {} , try to clear the steam location field in settings to let BoilR find it itself",err));
},
}
}
}
}
@@ -345,14 +348,14 @@ impl MyEguiApp {
self.ensure_games_loaded();
self.ensure_steam_users_loaded();
if let Some(error_message) = &self.image_selected_state.settings_error{
if let Some(error_message) = &self.image_selected_state.settings_error {
ui.label(error_message);
return;
}
let mut action = UserAction::NoAction;
ScrollArea::vertical()
.stick_to_right()
.stick_to_right(true)
.auto_shrink([false, true])
.show(ui, |ui| {
ui.reset_style();
@@ -479,7 +482,9 @@ impl MyEguiApp {
if !loaded && path.exists() {
let image = load_image_from_path(&path);
if let Some(image) = image {
let texture = ui.ctx().load_texture(&key, image);
let texture = ui
.ctx()
.load_texture(&key, image, egui::TextureFilter::Linear);
state
.image_handles
.insert(key, TextureState::Loaded(texture));
@@ -603,7 +608,9 @@ impl MyEguiApp {
let (path, key) = shortcut.key(image_type, Path::new(&user.steam_user_data_folder));
let image = load_image_from_path(&path);
if let Some(image) = image {
let texture = ui.ctx().load_texture(&key, image);
let texture = ui
.ctx()
.load_texture(&key, image, egui::TextureFilter::Linear);
state
.image_handles
.insert(key, TextureState::Loaded(texture));
src/ui/ui_import_games.rs
+1 -1
View File
@@ -55,7 +55,7 @@ impl MyEguiApp {
scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR;
ScrollArea::vertical()
.stick_to_right()
.stick_to_right(true)
.auto_shrink([false,true])
.show(ui,|ui| {
ui.reset_style();
src/ui/ui_settings.rs
+1 -1
View File
@@ -23,7 +23,7 @@ impl MyEguiApp {
scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR;
ScrollArea::vertical()
.stick_to_right()
.stick_to_right(true)
.auto_shrink([false, true])
.show(ui, |ui| {
ui.reset_style();
src/ui/uiapp.rs
+4 -4
View File
@@ -243,21 +243,21 @@ impl MyEguiApp {
fn get_import_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.import_button.get_or_insert_with(|| {
// Load the texture only once.
ui.ctx().load_texture("import_image", get_import_image())
ui.ctx().load_texture("import_image", get_import_image(),egui::TextureFilter::Linear)
})
}
fn get_save_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.save_button.get_or_insert_with(|| {
// Load the texture only once.
ui.ctx().load_texture("save_image", get_save_image())
ui.ctx().load_texture("save_image", get_save_image(),egui::TextureFilter::Linear)
})
}
fn get_logo_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.logo_32.get_or_insert_with(|| {
// Load the texture only once.
ui.ctx().load_texture("logo32", get_logo())
ui.ctx().load_texture("logo32", get_logo(),egui::TextureFilter::Linear)
})
}
}
@@ -275,7 +275,7 @@ pub fn run_sync() {
app.run_sync(true);
}
pub fn run_ui(args: Vec<String>) -> Result<(), Box<dyn Error>> {
pub fn run_ui(args: Vec<String>){
let app = MyEguiApp::new();
let no_v_sync = args.contains(&"--no-vsync".to_string());
let native_options = eframe::NativeOptions {