From 0b8ca753b8dd5b13bc06eaf6800fc6e6bac7173d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 1 Mar 2024 09:18:57 -0700 Subject: [PATCH] Update libcosmic and adjust dialog size --- Cargo.lock | 20 ++------------------ Cargo.toml | 3 ++- src/app.rs | 16 +++++----------- src/dialog.rs | 2 +- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e27b59b..e2bc161 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1127,7 +1127,6 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1144,7 +1143,6 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "quote", "syn 1.0.109", @@ -1206,7 +1204,6 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "almost", "cosmic-config", @@ -2597,7 +2594,6 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_accessibility", "iced_core", @@ -2612,7 +2608,6 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "accesskit", "accesskit_winit", @@ -2621,7 +2616,6 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "bitflags 1.3.2", "log", @@ -2638,7 +2632,6 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "futures", "iced_core", @@ -2651,7 +2644,6 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2675,7 +2667,6 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2687,7 +2678,6 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_core", "iced_futures", @@ -2697,7 +2687,6 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_core", "once_cell", @@ -2707,7 +2696,6 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "bytemuck", "cosmic-text", @@ -2724,7 +2712,6 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2743,7 +2730,6 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_renderer", "iced_runtime", @@ -2757,7 +2743,6 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "iced_graphics", "iced_runtime", @@ -3101,7 +3086,6 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae" dependencies = [ "apply", "ashpd", @@ -3881,9 +3865,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.2" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eedff767bc49d336bff300224f73307ae36963c843e38dc9312a22171b012cbc" +checksum = "1f2588edf622de56e7a1fed57bf203344f63c03f3d43472ba0434a92373c8f27" dependencies = [ "is-wsl", "libc", diff --git a/Cargo.toml b/Cargo.toml index 17c5a21..30bd3b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,8 @@ i18n-embed-fl = "0.7" rust-embed = "8" [dependencies.libcosmic] -git = "https://github.com/pop-os/libcosmic.git" +#git = "https://github.com/pop-os/libcosmic.git" +path = "../libcosmic" default-features = false features = ["multi-window", "tokio", "winit"] diff --git a/src/app.rs b/src/app.rs index 1cb06c0..9f0fa9e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -294,14 +294,10 @@ impl App { } fn update_title(&mut self) -> Command { - let (header_title, window_title) = match self.tab_model.text(self.tab_model.active()) { - Some(tab_title) => ( - tab_title.to_string(), - format!("{tab_title} — COSMIC File Manager"), - ), - None => (String::new(), "COSMIC File Manager".to_string()), + let window_title = match self.tab_model.text(self.tab_model.active()) { + Some(tab_title) => format!("{tab_title} — {}", fl!("cosmic-files")), + None => fl!("cosmic-files"), }; - self.set_header_title(header_title); self.set_window_title(window_title, window::Id::MAIN) } @@ -480,8 +476,7 @@ impl App { ..tab_config }) }) - .step(25u16) - .width(Length::Fixed(100.0)), + .step(25u16), ) }) .add({ @@ -499,8 +494,7 @@ impl App { ..tab_config }) }) - .step(25u16) - .width(Length::Fixed(100.0)), + .step(25u16), ) }) .into(), diff --git a/src/dialog.rs b/src/dialog.rs index 3053348..727c2fd 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -96,7 +96,7 @@ impl Dialog { settings.transparent = true; //TODO: allow resize! - settings.size = Size::new(800.0, 600.0); + settings.size = Size::new(1024.0, 640.0); settings.resizable = false; #[cfg(target_os = "linux")]