icons for File menu

editor/src/menu/file.rs

@@ -34,7 +34,7 @@ use crate::{
             BuildContext, UiNode, UserInterface,
         },
     },
-    make_save_file_selector,
+    load_image, make_save_file_selector,
     menu::{create_menu_item, create_menu_item_shortcut, create_root_menu_item},
     message::MessageSender,
     scene::{container::EditorSceneEntry, GameScene},
@@ -128,7 +128,7 @@ impl FileMenu {
                 {
                     new_scene = create_menu_item_shortcut(
                         "New Scene",
-                        None,
+                        load_image!("../../resources/game_scene.png"),
                         Self::NEW_SCENE,
                         "Ctrl+N",
                         vec![],
@@ -137,14 +137,20 @@ impl FileMenu {
                     new_scene
                 },
                 {
-                    new_ui_scene =
-                        create_menu_item("New UI Scene", Self::NEW_UI_SCENE, vec![], ctx);
+                    new_ui_scene = create_menu_item_shortcut(
+                        "New UI Scene",
+                        load_image!("../../resources/ui_scene.png"),
+                        Self::NEW_UI_SCENE,
+                        "",
+                        vec![],
+                        ctx,
+                    );
                     new_ui_scene
                 },
                 {
                     load = create_menu_item_shortcut(
                         "Load Scene...",
-                        None,
+                        load_image!("../../resources/open-folder.png"),
                         Self::LOAD_SCENE,
                         "Ctrl+L",
                         vec![],
@@ -153,9 +159,11 @@ impl FileMenu {
                     load
                 },
                 {
-                    recent_files_container = create_menu_item(
+                    recent_files_container = create_menu_item_shortcut(
                         "Open Recent Scene",
+                        load_image!("../../resources/recent.png"),
                         Self::OPEN_RECENT,
+                        "",
                         recent_files.clone(),
                         ctx,
                     );
@@ -165,7 +173,7 @@ impl FileMenu {
                 {
                     save = create_menu_item_shortcut(
                         "Save Scene",
-                        None,
+                        load_image!("../../resources/save.png"),
                         Self::SAVE_SCENE,
                         "Ctrl+S",
                         vec![],
@@ -176,7 +184,7 @@ impl FileMenu {
                 {
                     save_as = create_menu_item_shortcut(
                         "Save Scene As...",
-                        None,
+                        load_image!("../../resources/save-as.png"),
                         Self::SAVE_SCENE_AS,
                         "Ctrl+Shift+S",
                         vec![],
@@ -187,7 +195,7 @@ impl FileMenu {
                 {
                     save_all = create_menu_item_shortcut(
                         "Save All",
-                        None,
+                        load_image!("../../resources/save_all.png"),
                         Self::SAVE_ALL,
                         "Ctrl+Alt+S",
                         vec![],
@@ -199,7 +207,7 @@ impl FileMenu {
                 {
                     close_scene = create_menu_item_shortcut(
                         "Close Current Scene",
-                        None,
+                        load_image!("../../resources/close.png"),
                         Self::CLOSE_SCENE,
                         "Ctrl+Q",
                         vec![],
@@ -208,9 +216,11 @@ impl FileMenu {
                     close_scene
                 },
                 {
-                    open_scene_settings = create_menu_item(
+                    open_scene_settings = create_menu_item_shortcut(
                         "Current Scene Settings...",
+                        load_image!("../../resources/rename.png"),
                         Self::SCENE_SETTINGS,
+                        "",
                         vec![],
                         ctx,
                     );

editor/src/menu/mod.rs

@@ -136,7 +136,7 @@ pub fn create_menu_item_shortcut(
         Some(icon) => MenuItemContent::text_with_shortcut_and_icon(
             text,
             shortcut,
-            ImageBuilder::new(WidgetBuilder::new().with_margin(Thickness::uniform(5.0)))
+            ImageBuilder::new(WidgetBuilder::new().with_margin(Thickness::uniform(4.0)))
                 .with_keep_aspect_ratio(true)
                 .with_texture(icon)
                 .build(ctx),

editor/src/plugins/settings.rs

@@ -20,6 +20,7 @@
 
 //! Settings window plugin.
 
+use crate::menu::create_menu_item_shortcut;
 use crate::{
     fyrox::{
         asset::manager::ResourceManager,
@@ -54,7 +55,7 @@ use crate::{
         renderer::QualitySettings,
         renderer::{BloomSettings, CsmSettings, ShadowMapPrecision},
     },
-    menu::create_menu_item,
+    load_image,
     message::MessageSender,
     plugin::EditorPlugin,
     settings::{
@@ -452,7 +453,14 @@ impl EditorPlugin for SettingsPlugin {
     fn on_start(&mut self, editor: &mut Editor) {
         let ui = editor.engine.user_interfaces.first_mut();
         let ctx = &mut ui.build_ctx();
-        self.open_settings = create_menu_item("Editor Settings...", Self::SETTINGS, vec![], ctx);
+        self.open_settings = create_menu_item_shortcut(
+            "Editor Settings...",
+            load_image!("../../resources/settings.png"),
+            Self::SETTINGS,
+            "",
+            vec![],
+            ctx,
+        );
         ui.send(
             editor.menu.file_menu.menu,
             MenuItemMessage::AddItem(self.open_settings),