improv: menu item icons

Author: edfloreshz

Cargo.lock

@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use crate::calculation::Calculation;
 use crate::config;
 use crate::config::CONFIG_VERSION;
+use crate::core::{icons, key_binds::key_binds};
 use crate::fl;
 use crate::operator::Operator;
 use cosmic::app::context_drawer;
@@ -19,7 +20,7 @@ use cosmic::iced::{
     Alignment, Event, Length, Subscription,
 };
 use cosmic::widget::about::About;
-use cosmic::widget::menu::Action;
+use cosmic::widget::menu::{Action, ItemHeight, ItemWidth};
 use cosmic::widget::{self, menu, nav_bar, ToastId};
 use cosmic::{cosmic_config, cosmic_theme, theme, Application, ApplicationExt, Element};
 
@@ -59,14 +60,6 @@ pub enum ContextPage {
     About,
 }
 
-impl ContextPage {
-    fn _title(&self) -> String {
-        match self {
-            Self::About => fl!("about"),
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub struct Flags {
     pub config_handler: Option<cosmic_config::Config>,
@@ -167,7 +160,7 @@ impl Application for Calculator {
             core,
             about,
             context_page: ContextPage::default(),
-            key_binds: HashMap::new(),
+            key_binds: key_binds(),
             nav,
             modifiers: Modifiers::empty(),
             config_handler: flags.config_handler,
@@ -191,11 +184,22 @@ impl Application for Calculator {
             menu::items(
                 &self.key_binds,
                 vec![
-                    menu::Item::Button(fl!("clear-history"), MenuAction::ClearHistory),
-                    menu::Item::Button(fl!("about"), MenuAction::About),
+                    menu::Item::Button(
+                        fl!("clear-history"),
+                        Some(icons::get_handle("large-brush-symbolic", 14)),
+                        MenuAction::ClearHistory,
+                    ),
+                    menu::Item::Button(
+                        fl!("about"),
+                        Some(icons::get_handle("settings-symbolic", 14)),
+                        MenuAction::About,
+                    ),
                 ],
             ),
-        )]);
+        )])
+        .item_height(ItemHeight::Dynamic(40))
+        .item_width(ItemWidth::Uniform(240))
+        .spacing(4.0);
 
         vec![menu_bar.into()]
     }
@@ -208,6 +212,7 @@ impl Application for Calculator {
             &HashMap::new(),
             vec![cosmic::widget::menu::Item::Button(
                 fl!("delete"),
+                Some(icons::get_handle("user-trash-symbolic", 14)),
                 NavMenuAction::Delete(id),
             )],
         ))

res/icons/bundled/info-outline-symbolic.svg

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+use cosmic::widget::icon;
+use std::collections::HashMap;
+use std::sync::{Mutex, OnceLock};
+
+pub(crate) static ICON_CACHE: OnceLock<Mutex<IconCache>> = OnceLock::new();
+
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub struct IconCacheKey {
+    name: &'static str,
+    size: u16,
+}
+
+pub struct IconCache {
+    cache: HashMap<IconCacheKey, icon::Handle>,
+}
+
+impl IconCache {
+    pub fn new() -> Self {
+        let mut cache = HashMap::new();
+
+        macro_rules! bundle {
+            ($name:expr, $size:expr) => {
+                let data: &'static [u8] =
+                    include_bytes!(concat!("../../res/icons/bundled/", $name, ".svg"));
+                cache.insert(
+                    IconCacheKey {
+                        name: $name,
+                        size: $size,
+                    },
+                    icon::from_svg_bytes(data).symbolic(true),
+                );
+            };
+        }
+
+        bundle!("large-brush-symbolic", 14);
+        bundle!("info-outline-symbolic", 14);
+        bundle!("settings-symbolic", 14);
+        bundle!("user-trash-symbolic", 14);
+
+        Self { cache }
+    }
+
+    pub fn get(&mut self, name: &'static str, size: u16) -> icon::Icon {
+        let handle = self
+            .cache
+            .entry(IconCacheKey { name, size })
+            .or_insert_with(|| icon::from_name(name).size(size).handle())
+            .clone();
+        icon::icon(handle).size(size)
+    }
+
+    pub fn get_handle(&mut self, name: &'static str, size: u16) -> icon::Handle {
+        let handle = self
+            .cache
+            .entry(IconCacheKey { name, size })
+            .or_insert_with(|| icon::from_name(name).size(size).handle())
+            .clone();
+        handle
+    }
+}
+
+pub fn get_icon(name: &'static str, size: u16) -> icon::Icon {
+    let mut icon_cache = ICON_CACHE.get().unwrap().lock().unwrap();
+    icon_cache.get(name, size)
+}
+
+pub fn get_handle(name: &'static str, size: u16) -> icon::Handle {
+    let mut icon_cache = ICON_CACHE.get().unwrap().lock().unwrap();
+    icon_cache.get_handle(name, size)
+}

res/icons/bundled/large-brush-symbolic.svg

@@ -0,0 +1,28 @@
+use std::collections::HashMap;
+
+use cosmic::iced::keyboard::Key;
+use cosmic::widget::menu::key_bind::KeyBind;
+use cosmic::widget::menu::key_bind::Modifier;
+
+use crate::app::MenuAction;
+
+pub fn key_binds() -> HashMap<KeyBind, MenuAction> {
+    let mut key_binds = HashMap::new();
+
+    macro_rules! bind {
+        ([$($modifier:ident),* $(,)?], $key:expr, $action:ident) => {{
+            key_binds.insert(
+                KeyBind {
+                    modifiers: vec![$(Modifier::$modifier),*],
+                    key: $key,
+                },
+                MenuAction::$action,
+            );
+        }};
+    }
+
+    bind!([Ctrl, Shift], Key::Character("C".into()), ClearHistory);
+    bind!([Ctrl], Key::Character("i".into()), About);
+
+    key_binds
+}

res/icons/bundled/settings-symbolic.svg

@@ -37,7 +37,7 @@ pub fn localizer() -> Box<dyn Localizer> {
     Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations))
 }
 
-pub fn set_localization() {
+pub fn localize() {
     let localizer = localizer();
     let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
 

res/icons/bundled/user-trash-symbolic.svg

@@ -1,3 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+pub mod icons;
+pub mod key_binds;
 pub mod localization;

src/app.rs

@@ -9,6 +9,7 @@ mod operator;
 mod settings;
 
 fn main() -> cosmic::iced::Result {
-    let (settings, flags) = settings::init();
+    settings::init();
+    let (settings, flags) = (settings::settings(), settings::flags());
     cosmic::app::run::<Calculator>(settings, flags)
 }