From ab5c7efce81bfdac4eacb008da33f5b2ae93b50b Mon Sep 17 00:00:00 2001 From: Jaby Date: Thu, 13 Mar 2025 19:58:51 +0100 Subject: [PATCH 1/6] Create GUI for project tab --- src/Tools/tim_tool/ui/tab/file-tab.slint | 64 +++++++++++++++++++++--- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/src/Tools/tim_tool/ui/tab/file-tab.slint b/src/Tools/tim_tool/ui/tab/file-tab.slint index bb0a78ba..32b04c15 100644 --- a/src/Tools/tim_tool/ui/tab/file-tab.slint +++ b/src/Tools/tim_tool/ui/tab/file-tab.slint @@ -1,4 +1,4 @@ -import { Button, TabWidget, LineEdit, GroupBox, ComboBox } from "std-widgets.slint"; +import { Button, TabWidget, LineEdit, GroupBox, ComboBox, CheckBox } from "std-widgets.slint"; export enum State { Project, @@ -6,11 +6,63 @@ export enum State { } component ProjectWidget inherits Rectangle { - Text { - text: "Projects not supported yet"; - color: #FF0000; - font-size: 30pt; - font-weight: 800; + background: #D0D0D0; + + VerticalLayout { + alignment: start; + padding: 4px; + GroupBox { + title: "Open Project"; + VerticalLayout { + alignment: start; + Text { + text: "Select a project to open. Any existing changes will be dropped"; + } + HorizontalLayout { + alignment: start; + LineEdit { + width: 300pt; + } + Button { + text: "Browse"; + } + } + HorizontalLayout { + alignment: start; + Button { + text: "Load"; + } + } + } + } + GroupBox { + title: "Save Project"; + VerticalLayout { + alignment: start; + padding: 4px; + Text { + text: "Save the current project"; + } + HorizontalLayout { + alignment: start; + LineEdit { + width: 300pt; + } + Button { + text: "Browse"; + } + } + CheckBox { + text: "Use relative path for files"; + } + HorizontalLayout { + alignment: start; + Button { + text: "Save"; + } + } + } + } } } From eb29237f248e9ff92617df7ed0fa08fa7de77d9f Mon Sep 17 00:00:00 2001 From: Jaby Date: Thu, 13 Mar 2025 20:29:48 +0100 Subject: [PATCH 2/6] Create connections --- src/Tools/tim_tool/ui/app-window.slint | 17 +++++-- src/Tools/tim_tool/ui/tab/file-tab.slint | 60 ++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/Tools/tim_tool/ui/app-window.slint b/src/Tools/tim_tool/ui/app-window.slint index 6d58590e..5d16b2c0 100644 --- a/src/Tools/tim_tool/ui/app-window.slint +++ b/src/Tools/tim_tool/ui/app-window.slint @@ -5,12 +5,19 @@ import { TabWidget } from "std-widgets.slint"; export component MainWindow inherits Window { // Main Tab values - in-out property main_tab_vram_bg <=> main_tab.vram_bg; - in-out property main_tab_vram_file_list <=> main_tab.vram_files; - in-out property main_tab_vram_images <=> main_tab.vram_images; + in-out property main_tab_vram_bg <=> main_tab.vram_bg; + in-out property main_tab_vram_file_list <=> main_tab.vram_files; + in-out property main_tab_vram_images <=> main_tab.vram_images; + callback main_tab_remove_file_clicked <=> main_tab.remove_file_clicked; + callback move_vram_image <=> main_tab.move_vram_image; - callback main_tab_remove_file_clicked <=> main_tab.remove_file_clicked; - callback move_vram_image <=> main_tab.move_vram_image; + // Project widget values + in-out property project_widget-open_project_path <=> file_tab.project_widget-open_project_path; + in-out property project_widget-save_project_path <=> file_tab.project_widget-save_project_path; + callback project_widget-load_project_clicked <=> file_tab.project_widget-load_project_clicked; + callback project_widget-save_project_clicked <=> file_tab.project_widget-save_project_clicked; + callback project_widget-browse_open_project_clicked <=> file_tab.project_widget-browse_open_project_clicked; + callback project_widget-browse_save_project_clicked <=> file_tab.project_widget-browse_save_project_clicked; // Convert Image values in-out property file_tab-encoding_options <=> file_tab.conv-encoding_options; diff --git a/src/Tools/tim_tool/ui/tab/file-tab.slint b/src/Tools/tim_tool/ui/tab/file-tab.slint index 32b04c15..48670657 100644 --- a/src/Tools/tim_tool/ui/tab/file-tab.slint +++ b/src/Tools/tim_tool/ui/tab/file-tab.slint @@ -6,6 +6,14 @@ export enum State { } component ProjectWidget inherits Rectangle { + in-out property open_project_path; + in-out property save_project_path; + + callback load_project_clicked(); + callback save_project_clicked(); + callback browse_open_project_clicked(); + callback browse_save_project_clicked(); + background: #D0D0D0; VerticalLayout { @@ -22,15 +30,22 @@ component ProjectWidget inherits Rectangle { alignment: start; LineEdit { width: 300pt; + text: root.open_project_path; } Button { text: "Browse"; + clicked => { + root.browse_open_project_clicked(); + } } } HorizontalLayout { alignment: start; Button { text: "Load"; + clicked => { + root.load_project_clicked(); + } } } } @@ -47,9 +62,13 @@ component ProjectWidget inherits Rectangle { alignment: start; LineEdit { width: 300pt; + text: root.save_project_path; } Button { text: "Browse"; + clicked => { + root.browse_save_project_clicked(); + } } } CheckBox { @@ -59,6 +78,9 @@ component ProjectWidget inherits Rectangle { alignment: start; Button { text: "Save"; + clicked => { + root.save_project_clicked(); + } } } } @@ -256,6 +278,16 @@ component ConvertImageWidget inherits Rectangle { } export component FileTab inherits Rectangle { + in-out property state; + // For project widget + in-out property project_widget-open_project_path; + in-out property project_widget-save_project_path; + callback project_widget-load_project_clicked(); + callback project_widget-save_project_clicked(); + callback project_widget-browse_open_project_clicked(); + callback project_widget-browse_save_project_clicked(); + + // For image conversion widget in-out property <[string]> conv-encoding_options; in-out property conv-image_path; in-out property conv-image_name; @@ -267,12 +299,12 @@ export component FileTab inherits Rectangle { in-out property conv-palette_height; in-out property conv-selected_encoding; in-out property conv-palette_enable; - in-out property conv-enable_view; + in-out property conv-enable_view; + callback conv-image_update_palette_size(int, int); + callback conv-image_browse_clicked; + callback conv-image_add_clicked; + - in-out property state; - callback conv-image_update_palette_size(int, int); - callback conv-image_browse_clicked; - callback conv-image_add_clicked; x: 0px; y: 0px; @@ -302,6 +334,24 @@ export component FileTab inherits Rectangle { padding: 4px; alignment: start; if root.state == State.Project : ProjectWidget { + open_project_path <=> root.project_widget-open_project_path; + save_project_path <=> root.project_widget-save_project_path; + + load_project_clicked() => { + root.project_widget-load_project_clicked(); + } + + save_project_clicked() => { + root.project_widget-save_project_clicked(); + } + + browse_open_project_clicked() => { + root.project_widget-browse_open_project_clicked(); + } + + browse_save_project_clicked() => { + root.project_widget-save_project_clicked(); + } } if root.state == State.ConvertImage : ConvertImageWidget { From c114745a8ebf42910616eb9a67d6f68272f4f13f Mon Sep 17 00:00:00 2001 From: Jaby Date: Sat, 15 Mar 2025 16:19:47 +0100 Subject: [PATCH 3/6] Rework callbacks --- .../tim_tool/src/gui/file_tab/callbacks.rs | 63 ++++++++++++++ .../src/gui/{file_tab.rs => file_tab/mod.rs} | 68 +++++++-------- src/Tools/tim_tool/src/gui/gui_elements.rs | 18 ++-- .../tim_tool/src/gui/main_tab/callbacks.rs | 23 +++++ .../src/gui/{main_tab.rs => main_tab/mod.rs} | 37 ++++---- src/Tools/tim_tool/src/main.rs | 85 ++----------------- 6 files changed, 156 insertions(+), 138 deletions(-) create mode 100644 src/Tools/tim_tool/src/gui/file_tab/callbacks.rs rename src/Tools/tim_tool/src/gui/{file_tab.rs => file_tab/mod.rs} (76%) create mode 100644 src/Tools/tim_tool/src/gui/main_tab/callbacks.rs rename src/Tools/tim_tool/src/gui/{main_tab.rs => main_tab/mod.rs} (81%) diff --git a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs new file mode 100644 index 00000000..d9b66694 --- /dev/null +++ b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs @@ -0,0 +1,63 @@ +use crate::{gui::{main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH},MainWindow}; +use super::FileTab; +use rfd::FileDialog; +use slint::SharedString; +use std::{rc::Rc, sync::Mutex}; +use tim_tool::logic::{tim::types::Encoding, TIMManager}; +use tool_helper::Error; + +pub type MutexTIMManager = Rc>; + +pub fn on_browse_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { + return move |file_tab, main_window| -> Result<(), Error> { + let file = FileDialog::new() + .add_filter("PNG image (.png)", &["png"]) + .set_title("PNG image file") + .pick_file(); + + if let Some(file) = file { + if let Some(file_path) = file.to_str() { + main_window.set_file_tab_browse_path(SharedString::from(file_path)); + } + + let file_name = if let Some(name) = file.file_name() {Some(name.to_string_lossy().to_string())} else {None}; + + let (image, palette) = tim_manager.lock().expect("VRAM already locked").load_unadded_tim(&file)?; + + let img_size = image.size(); + if img_size.width > VRAM_WIDTH as u32 || img_size.height > VRAM_HEIGHT as u32 { + return Err(Error::from_text(format!("Image size ({}; {}) is to big for VRAM ({}, {})", img_size.width, img_size.height, VRAM_WIDTH, VRAM_HEIGHT))); + } + return file_tab.update_new_loaded_file(file_name, image, palette); + } + + Ok(()) + }; +} + +pub fn on_update_palette_size(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow, u32, u32) -> Result<(), Error> + 'static { + return move |file_tab, _main_window, width, height| -> Result<(), Error> { + file_tab.update_palette(tim_manager.lock().expect("VRAM already locked").change_unadded_tim_palette_size(width, height)?); + Ok(()) + }; +} + +pub fn on_add_image(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &mut MainTab, &MainWindow) -> Result<(), Error> + 'static { + return move |file_tab, main_tab, main_window| { + let file_name = file_tab.get_file_name(); + let encoding = file_tab.get_encoding()?; + let mut tim_mgr = tim_manager.lock().expect("VRAM already locked"); + let (image, palette_image) = tim_mgr.get_converted_unadded_tim_image(encoding)?; + let (full_image, _) = tim_mgr.get_converted_unadded_tim_image(Encoding::FullColor)?; + + let images_created = main_tab.add_new_vram_file(&file_name, full_image, image, encoding, palette_image); + if let Err(error) = tim_mgr.add_unadded_tim(images_created) { + main_tab.pop_vram_files(images_created); + return Err(error); + } + + file_tab.clear_load(); + main_window.invoke_change_to_main(); + Ok(()) + }; +} \ No newline at end of file diff --git a/src/Tools/tim_tool/src/gui/file_tab.rs b/src/Tools/tim_tool/src/gui/file_tab/mod.rs similarity index 76% rename from src/Tools/tim_tool/src/gui/file_tab.rs rename to src/Tools/tim_tool/src/gui/file_tab/mod.rs index 1e42318b..72003ecb 100644 --- a/src/Tools/tim_tool/src/gui/file_tab.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/mod.rs @@ -1,15 +1,23 @@ +mod callbacks; + use crate::MainWindow; +use super::main_tab::SharedMainTab; use super::{GUIElements, GUIElementsRef, MainWindowRef, display_error}; use slint::{Image, SharedString}; +use std::cell::RefCell; use std::rc::Rc; use tim_tool::logic::tim::types::Encoding; use tool_helper::Error; +pub use callbacks::MutexTIMManager; + pub struct FileTab { main_window: MainWindowRef, encoding_options: Rc> } +pub type SharedFileTab = Rc>; + impl FileTab { fn update_encoding_options(&self, width: u32, height: u32, has_palette: bool) -> Result<&str, Error> { self.encoding_options.clear(); @@ -40,11 +48,34 @@ impl FileTab { } } - pub fn new(main_window: MainWindowRef) -> FileTab { + pub fn new(main_window: MainWindowRef, main_tab: SharedMainTab, tim_manager: MutexTIMManager) -> SharedFileTab { let encoding_options = Rc::new(slint::VecModel::from(Vec::::new())); - main_window.borrow().set_file_tab_encoding_options(encoding_options.clone().into()); - FileTab{main_window, encoding_options} + + let object = Rc::new(RefCell::new(FileTab{main_window: main_window.clone(), encoding_options})); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_browse_file(tim_manager.clone())); + main_window.borrow().on_file_tab_browse_convert_image(move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Loading file failed", &error.to_string()); + } + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_update_palette_size(tim_manager.clone())); + main_window.borrow().on_file_tab_update_palette_size(move |width, height| { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow(), width as u32, height as u32) { + display_error("Loadind file failed", &error.to_string()); + } + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_add_image(tim_manager.clone())); + main_window.borrow().on_file_tab_add_convert_image(move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &mut main_tab.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Adding file failed", &error.to_string()); + } + }); + + object } pub fn clear_load(&self) { @@ -128,35 +159,4 @@ impl FileTab { Err(Error::from_str("Failed to obtain encoding")) } } - - pub fn on_browse_file(&self, gui_elements: GUIElementsRef, mut function: impl FnMut(&mut GUIElements, &MainWindow) -> Result<(), Error> + 'static) { - let main_window_cloned = self.main_window.clone(); - let gui_cloned = gui_elements.clone(); - - self.main_window.borrow().on_file_tab_browse_convert_image(move || { - if let Err(error) = function(&mut gui_cloned.borrow_mut(), &main_window_cloned.borrow()) { - display_error("Loadind file failed", &error.to_string()); - } - }); - } - - pub fn on_update_palette_size(&self, gui_elements: GUIElementsRef, mut function: impl FnMut(&mut GUIElements, &MainWindow, u32, u32) -> Result<(), Error> + 'static) { - let main_window_cloned = self.main_window.clone(); - - self.main_window.borrow().on_file_tab_update_palette_size(move |width, height| { - if let Err(error) = function(&mut gui_elements.borrow_mut(), &main_window_cloned.borrow(), width as u32, height as u32) { - display_error("Loadind file failed", &error.to_string()); - } - }); - } - - pub fn on_add_image(&self, gui_elements: GUIElementsRef, mut function: impl FnMut(&mut GUIElements, &MainWindow) -> Result<(), Error> + 'static) { - let main_window_cloned = self.main_window.clone(); - - self.main_window.borrow().on_file_tab_add_convert_image(move || { - if let Err(error) = function(&mut gui_elements.borrow_mut(), &main_window_cloned.borrow()) { - display_error("Adding file failed", &error.to_string()); - } - }); - } } \ No newline at end of file diff --git a/src/Tools/tim_tool/src/gui/gui_elements.rs b/src/Tools/tim_tool/src/gui/gui_elements.rs index da0036e2..39e1048b 100644 --- a/src/Tools/tim_tool/src/gui/gui_elements.rs +++ b/src/Tools/tim_tool/src/gui/gui_elements.rs @@ -1,17 +1,25 @@ +use std::cell::RefCell; +use std::rc::Rc; + use super::create_vram_bg; +use super::main_tab::SharedMainTab; use super::MainWindowRef; -use super::{file_tab::FileTab, main_tab::MainTab}; +use super::{file_tab::{FileTab, SharedFileTab, MutexTIMManager}, main_tab::MainTab}; pub struct GUIElements { - pub file_tab: FileTab, - pub main_tab: MainTab, + pub file_tab: SharedFileTab, + pub main_tab: SharedMainTab, } impl GUIElements { - pub fn new(main_window: MainWindowRef) -> Result { + pub fn new(main_window: MainWindowRef, tim_manager: MutexTIMManager) -> Result { main_window.borrow().set_main_tab_vram_bg(GUIElements::create_bg()?); - Ok(GUIElements{file_tab: FileTab::new(main_window.clone()), main_tab: MainTab::new(main_window.clone())}) + + let main_tab = MainTab::new(main_window.clone(), tim_manager.clone()); + let file_tab = FileTab::new(main_window.clone(), main_tab.clone(), tim_manager); + + Ok(GUIElements{file_tab, main_tab}) } fn create_bg() -> Result { diff --git a/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs new file mode 100644 index 00000000..838b60fd --- /dev/null +++ b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs @@ -0,0 +1,23 @@ +use crate::{gui::{VRAM_HEIGHT, VRAM_WIDTH}, MainWindow, display_information}; +use super::MainTab; +use std::{rc::Rc, sync::Mutex}; +use tim_tool::logic::{tim::types::Encoding, TIMManager}; + +pub type MutexTIMManager = Rc>; + +pub fn on_move_vram_image() -> impl FnMut(&mut MainTab, &MainWindow, i32, i32, i32) + 'static { + return move |main_tab, _main_window, idx, dx, dy| { + main_tab.move_vram_image(idx as usize, dx, dy); + } +} + +pub fn on_remove_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut MainTab, &MainWindow, i32) + 'static { + return move |main_tab, _main_window, idx| { + if idx >= 0 { + match main_tab.remove_vram_file(idx as usize) { + Ok(range) => tim_manager.lock().expect("VRAM already locked").remove_added_tim(range), + Err(error) => display_information("Removing VRAM file", error) + } + } + } +} \ No newline at end of file diff --git a/src/Tools/tim_tool/src/gui/main_tab.rs b/src/Tools/tim_tool/src/gui/main_tab/mod.rs similarity index 81% rename from src/Tools/tim_tool/src/gui/main_tab.rs rename to src/Tools/tim_tool/src/gui/main_tab/mod.rs index 48efeb74..b1ee3f03 100644 --- a/src/Tools/tim_tool/src/gui/main_tab.rs +++ b/src/Tools/tim_tool/src/gui/main_tab/mod.rs @@ -1,9 +1,11 @@ +mod callbacks; + use crate::{gui::{VRAM_HEIGHT, VRAM_WIDTH}, MainWindow, VRAMImage}; use super::{GUIElementsRef, MainWindowRef}; use slint::{Model, SharedString}; use tim_tool::logic::tim::types::Encoding; -use std::{ops::RangeInclusive, rc::Rc, sync::{Arc, Mutex}}; +use std::{cell::RefCell, ops::RangeInclusive, rc::Rc, sync::{Arc, Mutex}}; struct VRAM { count: usize, @@ -34,8 +36,10 @@ pub struct MainTab { vram: Arc>, } +pub type SharedMainTab = Rc>; + impl MainTab { - pub fn new(main_window: MainWindowRef) -> MainTab { + pub fn new(main_window: MainWindowRef, tim_manager: callbacks::MutexTIMManager) -> SharedMainTab { let vram_file_list:Vec = main_window.borrow().get_main_tab_vram_file_list().iter().collect(); let vram_file_list = Rc::new(slint::VecModel::from(vram_file_list)); let vram_image_list = Rc::new(slint::VecModel::from(Vec::::new())); @@ -43,7 +47,18 @@ impl MainTab { main_window.borrow().set_main_tab_vram_file_list(vram_file_list.clone().into()); main_window.borrow().set_main_tab_vram_images(vram_image_list.clone().into()); - MainTab{main_window, vram: Arc::new(Mutex::new(VRAM{count: 0, file_list: vram_file_list, image_list: vram_image_list}))} + let object = SharedMainTab::new(MainTab{main_window: main_window.clone(), vram: Arc::new(Mutex::new(VRAM{count: 0, file_list: vram_file_list, image_list: vram_image_list}))}.into()); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_move_vram_image()); + main_window.borrow().on_move_vram_image(move |idx, dx, dy| { + function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow(), idx, dx, dy); + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_remove_file(tim_manager)); + main_window.borrow().on_main_tab_remove_file_clicked(move |idx| { + function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow(), idx); + }); + object } pub fn add_new_vram_file(&mut self, file_name: &String, full_image: slint::Image, image: slint::Image, encoding: Encoding, image_palette: Option) -> usize { @@ -137,20 +152,4 @@ impl MainTab { vram_data.image_list.set_row_data(idx, vram_info); } } - - pub fn on_move_vram_image(&self, gui_elements: GUIElementsRef, mut function: impl FnMut(&mut MainTab, &MainWindow, i32, i32, i32) + 'static) { - let main_window_cloned = self.main_window.clone(); - - self.main_window.borrow().on_move_vram_image(move |idx, dx, dy| { - function(&mut gui_elements.borrow_mut().main_tab, &main_window_cloned.borrow(), idx, dx, dy); - }); - } - - pub fn on_remove_file(&self, gui_elements: GUIElementsRef, mut function: impl FnMut(&mut MainTab, &MainWindow, i32) + 'static) { - let main_window_cloned = self.main_window.clone(); - - self.main_window.borrow().on_main_tab_remove_file_clicked(move |idx| { - function(&mut gui_elements.borrow_mut().main_tab, &main_window_cloned.borrow(), idx); - }); - } } \ No newline at end of file diff --git a/src/Tools/tim_tool/src/main.rs b/src/Tools/tim_tool/src/main.rs index a2bdcf68..4a6b05f8 100644 --- a/src/Tools/tim_tool/src/main.rs +++ b/src/Tools/tim_tool/src/main.rs @@ -20,16 +20,16 @@ struct Application { impl Application { fn new() -> Result { let main_window = Rc::new(RefCell::new(MainWindow::new()?)); + let tim_manager = Rc::new(Mutex::new(TIMManager::new())); + Ok(Application{ main_window: main_window.clone(), - gui_elements: Rc::new(RefCell::new(GUIElements::new(main_window.clone())?)), - tim_manager: Rc::new(Mutex::new(TIMManager::new())) + gui_elements: Rc::new(RefCell::new(GUIElements::new(main_window.clone(), tim_manager.clone())?)), + tim_manager: tim_manager, }) } fn setup(&self) { - self.setup_main_tab(); - self.setup_file_tab(); self.setup_about_tab(); } @@ -37,82 +37,7 @@ impl Application { let main_window = self.main_window.borrow(); main_window.run() } - - fn setup_main_tab(&self) { - self.gui_elements.borrow().main_tab.on_move_vram_image(self.gui_elements.clone(), move |main_tab, _main_window, idx, dx, dy| { - main_tab.move_vram_image(idx as usize, dx, dy); - }); - - let tim_manager = self.tim_manager.clone(); - self.gui_elements.borrow().main_tab.on_remove_file(self.gui_elements.clone(), move |main_tab, _main_window, idx| { - if idx >= 0 { - match main_tab.remove_vram_file(idx as usize) { - Ok(range) => tim_manager.lock().expect("VRAM already locked").remove_added_tim(range), - Err(error) => display_information("Removing VRAM file", error) - } - } - }); - } - - fn setup_file_tab(&self) { - let tim_manager = self.tim_manager.clone(); - self.gui_elements.borrow().file_tab.on_update_palette_size(self.gui_elements.clone(), move |gui_elements, _main_window, width, height| -> Result<(), Error> { - let file_tab = &gui_elements.file_tab; - - file_tab.update_palette(tim_manager.lock().expect("VRAM already locked").change_unadded_tim_palette_size(width, height)?); - Ok(()) - }); - - let tim_manager = self.tim_manager.clone(); - self.gui_elements.borrow().file_tab.on_browse_file(self.gui_elements.clone(), move |gui_elements, main_window| -> Result<(), Error> { - let file = FileDialog::new() - .add_filter("PNG image (.png)", &["png"]) - .set_title("PNG image file") - .pick_file(); - - if let Some(file) = file { - if let Some(file_path) = file.to_str() { - main_window.set_file_tab_browse_path(SharedString::from(file_path)); - } - - let file_tab = &gui_elements.file_tab; - let file_name = if let Some(name) = file.file_name() {Some(name.to_string_lossy().to_string())} else {None}; - - let (image, palette) = tim_manager.lock().expect("VRAM already locked").load_unadded_tim(&file)?; - - let img_size = image.size(); - if img_size.width > VRAM_WIDTH as u32 || img_size.height > VRAM_HEIGHT as u32 { - return Err(Error::from_text(format!("Image size ({}; {}) is to big for VRAM ({}, {})", img_size.width, img_size.height, VRAM_WIDTH, VRAM_HEIGHT))); - } - return file_tab.update_new_loaded_file(file_name, image, palette); - } - - Ok(()) - }); - - let tim_manager = self.tim_manager.clone(); - self.gui_elements.borrow().file_tab.on_add_image(self.gui_elements.clone(), move |gui_elements, main_window| { - let main_tab = &mut gui_elements.main_tab; - let file_tab = &gui_elements.file_tab; - - let file_name = file_tab.get_file_name(); - let encoding = file_tab.get_encoding()?; - let mut tim_mgr = tim_manager.lock().expect("VRAM already locked"); - let (image, palette_image) = tim_mgr.get_converted_unadded_tim_image(encoding)?; - let (full_image, _) = tim_mgr.get_converted_unadded_tim_image(Encoding::FullColor)?; - - let images_created = main_tab.add_new_vram_file(&file_name, full_image, image, encoding, palette_image); - if let Err(error) = tim_mgr.add_unadded_tim(images_created) { - main_tab.pop_vram_files(images_created); - return Err(error); - } - - file_tab.clear_load(); - main_window.invoke_change_to_main(); - Ok(()) - }); - } - + fn setup_about_tab(&self) { const VERSION: &str = env!("CARGO_PKG_VERSION"); From a4fe26f1121c4370f32a3c9a7b329444d4ef67cd Mon Sep 17 00:00:00 2001 From: Jaby Date: Sat, 15 Mar 2025 17:00:35 +0100 Subject: [PATCH 4/6] Clean up references --- .../tim_tool/src/gui/file_tab/callbacks.rs | 6 ++---- src/Tools/tim_tool/src/gui/file_tab/mod.rs | 10 +++------- src/Tools/tim_tool/src/gui/gui_elements.rs | 20 +++++++++---------- .../tim_tool/src/gui/main_tab/callbacks.rs | 6 +----- src/Tools/tim_tool/src/gui/main_tab/mod.rs | 14 ++++++------- src/Tools/tim_tool/src/gui/mod.rs | 1 - src/Tools/tim_tool/src/main.rs | 16 +++++++-------- 7 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs index d9b66694..7a2ca220 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs @@ -1,12 +1,10 @@ -use crate::{gui::{main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH},MainWindow}; +use crate::{gui::{gui_elements::MutexTIMManager, main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH}, MainWindow}; use super::FileTab; use rfd::FileDialog; use slint::SharedString; -use std::{rc::Rc, sync::Mutex}; -use tim_tool::logic::{tim::types::Encoding, TIMManager}; +use tim_tool::logic::tim::types::Encoding; use tool_helper::Error; -pub type MutexTIMManager = Rc>; pub fn on_browse_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { return move |file_tab, main_window| -> Result<(), Error> { diff --git a/src/Tools/tim_tool/src/gui/file_tab/mod.rs b/src/Tools/tim_tool/src/gui/file_tab/mod.rs index 72003ecb..6af74e3e 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/mod.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/mod.rs @@ -1,16 +1,12 @@ mod callbacks; -use crate::MainWindow; -use super::main_tab::SharedMainTab; -use super::{GUIElements, GUIElementsRef, MainWindowRef, display_error}; +use crate::gui::gui_elements::MutexTIMManager; +use super::{main_tab::SharedMainTab, MainWindowRef, display_error}; use slint::{Image, SharedString}; -use std::cell::RefCell; -use std::rc::Rc; +use std::{cell::RefCell, rc::Rc}; use tim_tool::logic::tim::types::Encoding; use tool_helper::Error; -pub use callbacks::MutexTIMManager; - pub struct FileTab { main_window: MainWindowRef, encoding_options: Rc> diff --git a/src/Tools/tim_tool/src/gui/gui_elements.rs b/src/Tools/tim_tool/src/gui/gui_elements.rs index 39e1048b..a05f349e 100644 --- a/src/Tools/tim_tool/src/gui/gui_elements.rs +++ b/src/Tools/tim_tool/src/gui/gui_elements.rs @@ -1,25 +1,25 @@ -use std::cell::RefCell; -use std::rc::Rc; - use super::create_vram_bg; - use super::main_tab::SharedMainTab; use super::MainWindowRef; -use super::{file_tab::{FileTab, SharedFileTab, MutexTIMManager}, main_tab::MainTab}; +use super::{file_tab::{FileTab, SharedFileTab}, main_tab::MainTab}; +use std::{rc::Rc, sync::Mutex}; +use tim_tool::logic::TIMManager; + +pub type MutexTIMManager = Rc>; pub struct GUIElements { - pub file_tab: SharedFileTab, - pub main_tab: SharedMainTab, + _file_tab: SharedFileTab, + _main_tab: SharedMainTab, } impl GUIElements { pub fn new(main_window: MainWindowRef, tim_manager: MutexTIMManager) -> Result { main_window.borrow().set_main_tab_vram_bg(GUIElements::create_bg()?); - let main_tab = MainTab::new(main_window.clone(), tim_manager.clone()); - let file_tab = FileTab::new(main_window.clone(), main_tab.clone(), tim_manager); + let _main_tab = MainTab::new(main_window.clone(), tim_manager.clone()); + let _file_tab = FileTab::new(main_window.clone(), _main_tab.clone(), tim_manager); - Ok(GUIElements{file_tab, main_tab}) + Ok(GUIElements{_file_tab, _main_tab}) } fn create_bg() -> Result { diff --git a/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs index 838b60fd..274a3cc0 100644 --- a/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs +++ b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs @@ -1,9 +1,5 @@ -use crate::{gui::{VRAM_HEIGHT, VRAM_WIDTH}, MainWindow, display_information}; +use crate::{gui::gui_elements::MutexTIMManager, MainWindow, display_information}; use super::MainTab; -use std::{rc::Rc, sync::Mutex}; -use tim_tool::logic::{tim::types::Encoding, TIMManager}; - -pub type MutexTIMManager = Rc>; pub fn on_move_vram_image() -> impl FnMut(&mut MainTab, &MainWindow, i32, i32, i32) + 'static { return move |main_tab, _main_window, idx, dx, dy| { diff --git a/src/Tools/tim_tool/src/gui/main_tab/mod.rs b/src/Tools/tim_tool/src/gui/main_tab/mod.rs index b1ee3f03..a4bc4007 100644 --- a/src/Tools/tim_tool/src/gui/main_tab/mod.rs +++ b/src/Tools/tim_tool/src/gui/main_tab/mod.rs @@ -1,11 +1,10 @@ mod callbacks; -use crate::{gui::{VRAM_HEIGHT, VRAM_WIDTH}, MainWindow, VRAMImage}; -use super::{GUIElementsRef, MainWindowRef}; - +use crate::{gui::{gui_elements::MutexTIMManager, VRAM_HEIGHT, VRAM_WIDTH}, VRAMImage}; +use super::MainWindowRef; use slint::{Model, SharedString}; -use tim_tool::logic::tim::types::Encoding; use std::{cell::RefCell, ops::RangeInclusive, rc::Rc, sync::{Arc, Mutex}}; +use tim_tool::logic::tim::types::Encoding; struct VRAM { count: usize, @@ -32,14 +31,13 @@ impl VRAM { } pub struct MainTab { - main_window: MainWindowRef, - vram: Arc>, + vram: Arc>, } pub type SharedMainTab = Rc>; impl MainTab { - pub fn new(main_window: MainWindowRef, tim_manager: callbacks::MutexTIMManager) -> SharedMainTab { + pub fn new(main_window: MainWindowRef, tim_manager: MutexTIMManager) -> SharedMainTab { let vram_file_list:Vec = main_window.borrow().get_main_tab_vram_file_list().iter().collect(); let vram_file_list = Rc::new(slint::VecModel::from(vram_file_list)); let vram_image_list = Rc::new(slint::VecModel::from(Vec::::new())); @@ -47,7 +45,7 @@ impl MainTab { main_window.borrow().set_main_tab_vram_file_list(vram_file_list.clone().into()); main_window.borrow().set_main_tab_vram_images(vram_image_list.clone().into()); - let object = SharedMainTab::new(MainTab{main_window: main_window.clone(), vram: Arc::new(Mutex::new(VRAM{count: 0, file_list: vram_file_list, image_list: vram_image_list}))}.into()); + let object = SharedMainTab::new(MainTab{vram: Arc::new(Mutex::new(VRAM{count: 0, file_list: vram_file_list, image_list: vram_image_list}))}.into()); let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_move_vram_image()); main_window.borrow().on_move_vram_image(move |idx, dx, dy| { diff --git a/src/Tools/tim_tool/src/gui/mod.rs b/src/Tools/tim_tool/src/gui/mod.rs index 438d75fd..639727b5 100644 --- a/src/Tools/tim_tool/src/gui/mod.rs +++ b/src/Tools/tim_tool/src/gui/mod.rs @@ -14,7 +14,6 @@ pub const VRAM_WIDTH:usize = 1024; pub const VRAM_HEIGHT:usize = 512; type MainWindowRef = Rc>; -type GUIElementsRef = Rc>; pub fn display_information(title: impl Into, text: impl Into) { MessageDialog::new().set_title(title).set_level(rfd::MessageLevel::Info).set_description(text).show(); diff --git a/src/Tools/tim_tool/src/main.rs b/src/Tools/tim_tool/src/main.rs index 4a6b05f8..ed0ec90d 100644 --- a/src/Tools/tim_tool/src/main.rs +++ b/src/Tools/tim_tool/src/main.rs @@ -2,30 +2,28 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] mod gui; -use gui::{GUIElements, VRAM_WIDTH, VRAM_HEIGHT, display_information}; -use rfd::FileDialog; +use gui::{GUIElements, display_information}; use std::{cell::RefCell, rc::Rc, sync::Mutex}; use slint::SharedString; -use tim_tool::logic::{tim::types::Encoding, TIMManager}; -use tool_helper::Error; +use tim_tool::logic::TIMManager; slint::include_modules!(); struct Application { main_window: Rc>, - gui_elements: Rc>, - tim_manager: Rc>, + _gui_elements: Rc>, + _tim_manager: Rc>, } impl Application { fn new() -> Result { let main_window = Rc::new(RefCell::new(MainWindow::new()?)); - let tim_manager = Rc::new(Mutex::new(TIMManager::new())); + let _tim_manager = Rc::new(Mutex::new(TIMManager::new())); Ok(Application{ main_window: main_window.clone(), - gui_elements: Rc::new(RefCell::new(GUIElements::new(main_window.clone(), tim_manager.clone())?)), - tim_manager: tim_manager, + _gui_elements: Rc::new(RefCell::new(GUIElements::new(main_window.clone(), _tim_manager.clone())?)), + _tim_manager, }) } From aaeeaf97c5c09a6fa235faea33dad39122bbb7ef Mon Sep 17 00:00:00 2001 From: Jaby Date: Sat, 15 Mar 2025 17:10:54 +0100 Subject: [PATCH 5/6] Merge gui_elements into gui --- .../tim_tool/src/gui/file_tab/callbacks.rs | 2 +- src/Tools/tim_tool/src/gui/file_tab/mod.rs | 2 +- src/Tools/tim_tool/src/gui/gui_elements.rs | 28 ----------------- .../tim_tool/src/gui/main_tab/callbacks.rs | 2 +- src/Tools/tim_tool/src/gui/main_tab/mod.rs | 2 +- src/Tools/tim_tool/src/gui/mod.rs | 31 ++++++++++++++++--- 6 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 src/Tools/tim_tool/src/gui/gui_elements.rs diff --git a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs index 7a2ca220..b62bed77 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs @@ -1,4 +1,4 @@ -use crate::{gui::{gui_elements::MutexTIMManager, main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH}, MainWindow}; +use crate::{gui::{MutexTIMManager, main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH}, MainWindow}; use super::FileTab; use rfd::FileDialog; use slint::SharedString; diff --git a/src/Tools/tim_tool/src/gui/file_tab/mod.rs b/src/Tools/tim_tool/src/gui/file_tab/mod.rs index 6af74e3e..ca6fc286 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/mod.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/mod.rs @@ -1,6 +1,6 @@ mod callbacks; -use crate::gui::gui_elements::MutexTIMManager; +use crate::gui::MutexTIMManager; use super::{main_tab::SharedMainTab, MainWindowRef, display_error}; use slint::{Image, SharedString}; use std::{cell::RefCell, rc::Rc}; diff --git a/src/Tools/tim_tool/src/gui/gui_elements.rs b/src/Tools/tim_tool/src/gui/gui_elements.rs deleted file mode 100644 index a05f349e..00000000 --- a/src/Tools/tim_tool/src/gui/gui_elements.rs +++ /dev/null @@ -1,28 +0,0 @@ -use super::create_vram_bg; -use super::main_tab::SharedMainTab; -use super::MainWindowRef; -use super::{file_tab::{FileTab, SharedFileTab}, main_tab::MainTab}; -use std::{rc::Rc, sync::Mutex}; -use tim_tool::logic::TIMManager; - -pub type MutexTIMManager = Rc>; - -pub struct GUIElements { - _file_tab: SharedFileTab, - _main_tab: SharedMainTab, -} - -impl GUIElements { - pub fn new(main_window: MainWindowRef, tim_manager: MutexTIMManager) -> Result { - main_window.borrow().set_main_tab_vram_bg(GUIElements::create_bg()?); - - let _main_tab = MainTab::new(main_window.clone(), tim_manager.clone()); - let _file_tab = FileTab::new(main_window.clone(), _main_tab.clone(), tim_manager); - - Ok(GUIElements{_file_tab, _main_tab}) - } - - fn create_bg() -> Result { - Ok(slint::Image::from_rgba8_premultiplied(create_vram_bg(320, 256).ok_or(slint::PlatformError::Other("Failed creating VRAM background image".to_string()))?)) - } -} \ No newline at end of file diff --git a/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs index 274a3cc0..b1c4724b 100644 --- a/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs +++ b/src/Tools/tim_tool/src/gui/main_tab/callbacks.rs @@ -1,4 +1,4 @@ -use crate::{gui::gui_elements::MutexTIMManager, MainWindow, display_information}; +use crate::{gui::MutexTIMManager, MainWindow, display_information}; use super::MainTab; pub fn on_move_vram_image() -> impl FnMut(&mut MainTab, &MainWindow, i32, i32, i32) + 'static { diff --git a/src/Tools/tim_tool/src/gui/main_tab/mod.rs b/src/Tools/tim_tool/src/gui/main_tab/mod.rs index a4bc4007..00748d63 100644 --- a/src/Tools/tim_tool/src/gui/main_tab/mod.rs +++ b/src/Tools/tim_tool/src/gui/main_tab/mod.rs @@ -1,6 +1,6 @@ mod callbacks; -use crate::{gui::{gui_elements::MutexTIMManager, VRAM_HEIGHT, VRAM_WIDTH}, VRAMImage}; +use crate::{gui::{MutexTIMManager, VRAM_HEIGHT, VRAM_WIDTH}, VRAMImage}; use super::MainWindowRef; use slint::{Model, SharedString}; use std::{cell::RefCell, ops::RangeInclusive, rc::Rc, sync::{Arc, Mutex}}; diff --git a/src/Tools/tim_tool/src/gui/mod.rs b/src/Tools/tim_tool/src/gui/mod.rs index 639727b5..00397052 100644 --- a/src/Tools/tim_tool/src/gui/mod.rs +++ b/src/Tools/tim_tool/src/gui/mod.rs @@ -1,19 +1,42 @@ mod file_tab; -mod gui_elements; mod main_tab; use crate::MainWindow; +use file_tab::{FileTab, SharedFileTab}; +use main_tab::{MainTab, SharedMainTab}; use rfd::MessageDialog; -use std::{cell::RefCell, rc::Rc}; +use std::{cell::RefCell, rc::Rc, sync::Mutex}; use slint::{Rgba8Pixel, SharedPixelBuffer}; +use tim_tool::logic::TIMManager; use tiny_skia::{Rect, Transform}; -pub use gui_elements::GUIElements; +type MainWindowRef = Rc>; + +pub type MutexTIMManager = Rc>; pub const VRAM_WIDTH:usize = 1024; pub const VRAM_HEIGHT:usize = 512; -type MainWindowRef = Rc>; +pub struct GUIElements { + _file_tab: SharedFileTab, + _main_tab: SharedMainTab, +} + +impl GUIElements { + pub fn new(main_window: MainWindowRef, tim_manager: MutexTIMManager) -> Result { + main_window.borrow().set_main_tab_vram_bg(GUIElements::create_bg()?); + + let _main_tab = MainTab::new(main_window.clone(), tim_manager.clone()); + let _file_tab = FileTab::new(main_window.clone(), _main_tab.clone(), tim_manager); + + Ok(GUIElements{_file_tab, _main_tab}) + } + + fn create_bg() -> Result { + Ok(slint::Image::from_rgba8_premultiplied(create_vram_bg(320, 256).ok_or(slint::PlatformError::Other("Failed creating VRAM background image".to_string()))?)) + } +} + pub fn display_information(title: impl Into, text: impl Into) { MessageDialog::new().set_title(title).set_level(rfd::MessageLevel::Info).set_description(text).show(); From 2b6fb4c090447f4709a0cdceb53c320bbe659965 Mon Sep 17 00:00:00 2001 From: Jaby Date: Sat, 15 Mar 2025 17:45:00 +0100 Subject: [PATCH 6/6] Connect project gui components --- .../tim_tool/src/gui/file_tab/callbacks.rs | 33 ++++++++++++++++--- src/Tools/tim_tool/src/gui/file_tab/mod.rs | 32 +++++++++++++++++- src/Tools/tim_tool/ui/tab/file-tab.slint | 4 +-- 3 files changed, 60 insertions(+), 9 deletions(-) diff --git a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs index b62bed77..f1d11052 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/callbacks.rs @@ -1,12 +1,11 @@ -use crate::{gui::{MutexTIMManager, main_tab::MainTab, VRAM_HEIGHT, VRAM_WIDTH}, MainWindow}; +use crate::{gui::{main_tab::MainTab, MutexTIMManager, VRAM_HEIGHT, VRAM_WIDTH}, MainWindow}; use super::FileTab; use rfd::FileDialog; use slint::SharedString; use tim_tool::logic::tim::types::Encoding; use tool_helper::Error; - -pub fn on_browse_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { +pub(super) fn on_browse_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { return move |file_tab, main_window| -> Result<(), Error> { let file = FileDialog::new() .add_filter("PNG image (.png)", &["png"]) @@ -33,14 +32,14 @@ pub fn on_browse_file(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, }; } -pub fn on_update_palette_size(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow, u32, u32) -> Result<(), Error> + 'static { +pub(super) fn on_update_palette_size(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &MainWindow, u32, u32) -> Result<(), Error> + 'static { return move |file_tab, _main_window, width, height| -> Result<(), Error> { file_tab.update_palette(tim_manager.lock().expect("VRAM already locked").change_unadded_tim_palette_size(width, height)?); Ok(()) }; } -pub fn on_add_image(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &mut MainTab, &MainWindow) -> Result<(), Error> + 'static { +pub(super) fn on_add_image(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &mut MainTab, &MainWindow) -> Result<(), Error> + 'static { return move |file_tab, main_tab, main_window| { let file_name = file_tab.get_file_name(); let encoding = file_tab.get_encoding()?; @@ -58,4 +57,28 @@ pub fn on_add_image(tim_manager: MutexTIMManager) -> impl FnMut(&mut FileTab, &m main_window.invoke_change_to_main(); Ok(()) }; +} + +pub(super) fn on_load_project_clicked() -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { + move |_file_tab, _main_window| { + Err(Error::not_implemented("on_load_project_clicked")) + } +} + +pub(super) fn on_save_project_clicked() -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { + move |_file_tab, _main_window| { + Err(Error::not_implemented("on_save_project_clicked")) + } +} + +pub(super) fn on_browse_open_project_clicked() -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { + move |_file_tab, _main_window| { + Err(Error::not_implemented("on_browse_open_project_clicked")) + } +} + +pub(super) fn on_browse_save_project_clicked() -> impl FnMut(&mut FileTab, &MainWindow) -> Result<(), Error> + 'static { + move |_file_tab, _main_window| { + Err(Error::not_implemented("on_browse_save_project_clicked")) + } } \ No newline at end of file diff --git a/src/Tools/tim_tool/src/gui/file_tab/mod.rs b/src/Tools/tim_tool/src/gui/file_tab/mod.rs index ca6fc286..21f3bb4e 100644 --- a/src/Tools/tim_tool/src/gui/file_tab/mod.rs +++ b/src/Tools/tim_tool/src/gui/file_tab/mod.rs @@ -50,6 +50,7 @@ impl FileTab { let object = Rc::new(RefCell::new(FileTab{main_window: main_window.clone(), encoding_options})); + // Image conv functions let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_browse_file(tim_manager.clone())); main_window.borrow().on_file_tab_browse_convert_image(move || { if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { @@ -60,7 +61,7 @@ impl FileTab { let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_update_palette_size(tim_manager.clone())); main_window.borrow().on_file_tab_update_palette_size(move |width, height| { if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow(), width as u32, height as u32) { - display_error("Loadind file failed", &error.to_string()); + display_error("Updating palette failed", &error.to_string()); } }); @@ -71,6 +72,35 @@ impl FileTab { } }); + // Project functions + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_load_project_clicked()); + main_window.borrow().on_project_widget_load_project_clicked(move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Loading project failed", &error.to_string()); + } + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_save_project_clicked()); + main_window.borrow().on_project_widget_save_project_clicked (move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Saving project failed", &error.to_string()); + } + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_browse_open_project_clicked()); + main_window.borrow().on_project_widget_browse_open_project_clicked (move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Browsing project failed", &error.to_string()); + } + }); + + let (cloned_object, cloned_main_window, mut function) = (object.clone(), main_window.clone(), callbacks::on_browse_save_project_clicked()); + main_window.borrow().on_project_widget_browse_save_project_clicked(move || { + if let Err(error) = function(&mut cloned_object.borrow_mut(), &cloned_main_window.borrow()) { + display_error("Browsing save location failed", &error.to_string()); + } + }); + object } diff --git a/src/Tools/tim_tool/ui/tab/file-tab.slint b/src/Tools/tim_tool/ui/tab/file-tab.slint index 48670657..600f0d8f 100644 --- a/src/Tools/tim_tool/ui/tab/file-tab.slint +++ b/src/Tools/tim_tool/ui/tab/file-tab.slint @@ -304,8 +304,6 @@ export component FileTab inherits Rectangle { callback conv-image_browse_clicked; callback conv-image_add_clicked; - - x: 0px; y: 0px; @@ -350,7 +348,7 @@ export component FileTab inherits Rectangle { } browse_save_project_clicked() => { - root.project_widget-save_project_clicked(); + root.project_widget-browse_save_project_clicked(); } }