diff --git a/Cargo.lock b/Cargo.lock index 55b07de..616b532 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1080,7 +1080,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1099,7 +1099,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "quote", "syn 1.0.109", @@ -1188,7 +1188,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "almost", "cosmic-config", @@ -2607,7 +2607,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "dnd", "iced_accessibility", @@ -2625,7 +2625,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "accesskit", "accesskit_winit", @@ -2634,7 +2634,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "bitflags 2.6.0", "bytes", @@ -2657,7 +2657,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "futures", "iced_core", @@ -2683,7 +2683,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2705,7 +2705,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2717,7 +2717,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "bytes", "dnd", @@ -2731,7 +2731,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "bytemuck", "cosmic-text", @@ -2747,7 +2747,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -2778,7 +2778,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "dnd", "iced_renderer", @@ -2795,7 +2795,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "dnd", "iced_futures", @@ -3138,7 +3138,7 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a355a049d917823dafcd6669cad6afa6983bc6c6" +source = "git+https://github.com/pop-os/libcosmic.git#62b0c8a401c175ab956229b2901f2fdb8b96aeab" dependencies = [ "apply", "ashpd 0.9.1", diff --git a/res/icons/bundled/cross-small-square-filled-symbolic.svg b/res/icons/bundled/cross-small-square-filled-symbolic.svg new file mode 100644 index 0000000..4f83c5d --- /dev/null +++ b/res/icons/bundled/cross-small-square-filled-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/edit-symbolic.svg b/res/icons/bundled/edit-symbolic.svg new file mode 100644 index 0000000..51090b9 --- /dev/null +++ b/res/icons/bundled/edit-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/face-smile-big-symbolic.svg b/res/icons/bundled/face-smile-big-symbolic.svg new file mode 100644 index 0000000..986286d --- /dev/null +++ b/res/icons/bundled/face-smile-big-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/info-outline-symbolic.svg b/res/icons/bundled/info-outline-symbolic.svg new file mode 100644 index 0000000..254e7e8 --- /dev/null +++ b/res/icons/bundled/info-outline-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/plus-square-filled-symbolic.svg b/res/icons/bundled/plus-square-filled-symbolic.svg new file mode 100644 index 0000000..c15fccf --- /dev/null +++ b/res/icons/bundled/plus-square-filled-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/settings-symbolic.svg b/res/icons/bundled/settings-symbolic.svg new file mode 100644 index 0000000..408d7e5 --- /dev/null +++ b/res/icons/bundled/settings-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/res/icons/bundled/tabs-stack-symbolic.svg b/res/icons/bundled/tabs-stack-symbolic.svg new file mode 100644 index 0000000..387d854 --- /dev/null +++ b/res/icons/bundled/tabs-stack-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/src/app.rs b/src/app.rs index 9d47720..81ec86d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -24,7 +24,7 @@ use key_bind::key_binds; use pages::color_schemes::providers::cosmic_themes::CosmicTheme; use crate::{ - core::nav::Page, + core::{icons, nav::Page}, fl, pages::{ self, @@ -234,9 +234,17 @@ impl Application for TweakTool { menu::items( &self.key_binds, vec![ - menu::Item::Button(fl!("settings"), TweaksAction::Settings), + menu::Item::Button( + fl!("settings"), + Some(icons::get_handle("settings-symbolic", 14)), + TweaksAction::Settings, + ), menu::Item::Divider, - menu::Item::Button(fl!("about"), TweaksAction::About), + menu::Item::Button( + fl!("about"), + Some(icons::get_handle("info-outline-symbolic", 14)), + TweaksAction::About, + ), ], ), )]) diff --git a/src/core/icons.rs b/src/core/icons.rs index 95dc7b2..acef5be 100644 --- a/src/core/icons.rs +++ b/src/core/icons.rs @@ -33,6 +33,16 @@ impl IconCache { ); }; } + + // Menu items + bundle!("cross-small-square-filled-symbolic", 14); + bundle!("edit-symbolic", 14); + bundle!("face-smile-big-symbolic", 14); + bundle!("plus-square-filled-symbolic", 14); + bundle!("settings-symbolic", 14); + bundle!("tabs-stack-symbolic", 14); + bundle!("info-outline-symbolic", 14); + bundle!("size-horizontally-symbolic", 18); bundle!("dock-bottom-symbolic", 18); bundle!("dock-top-symbolic", 18);