From 489ec3cfda9f21c5d818dd19750063514c09cf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:58:33 +0100 Subject: [PATCH] Split files to different folders (#575) --- czkawka_gui/src/compute_results.rs | 2 +- .../connect_about_buttons.rs | 2 +- .../connect_button_compare.rs | 2 +- .../connect_button_delete.rs | 2 +- .../connect_button_hardlink.rs | 2 +- .../connect_button_move.rs | 2 +- .../connect_button_save.rs | 2 +- .../connect_button_search.rs | 2 +- .../connect_button_select.rs | 4 +- .../connect_button_stop.rs | 2 +- .../connect_change_language.rs | 0 .../connect_duplicate_buttons.rs | 2 +- .../connect_header_buttons.rs | 2 +- .../connect_notebook_tabs.rs | 2 +- .../{ => connect_things}/connect_popovers.rs | 4 +- .../connect_progress_window.rs | 4 +- .../connect_selection_of_directories.rs | 2 +- .../{ => connect_things}/connect_settings.rs | 2 +- .../connect_show_hide_ui.rs | 2 +- .../connect_similar_image_size_change.rs | 2 +- czkawka_gui/src/connect_things/mod.rs | 19 +++++ .../src/{ => gui_structs}/gui_about.rs | 4 +- .../{ => gui_structs}/gui_bottom_buttons.rs | 2 +- .../{ => gui_structs}/gui_compare_images.rs | 2 +- czkawka_gui/src/{ => gui_structs}/gui_data.rs | 22 +++--- .../src/{ => gui_structs}/gui_header.rs | 2 +- .../{ => gui_structs}/gui_main_notebook.rs | 2 +- .../src/{ => gui_structs}/gui_popovers.rs | 6 +- .../{ => gui_structs}/gui_progress_dialog.rs | 4 +- .../src/{ => gui_structs}/gui_settings.rs | 4 +- .../{ => gui_structs}/gui_upper_notebook.rs | 2 +- czkawka_gui/src/gui_structs/mod.rs | 10 +++ czkawka_gui/src/initialize_gui.rs | 2 +- czkawka_gui/src/main.rs | 71 ++++++------------- czkawka_gui/src/saving_loading.rs | 6 +- 35 files changed, 102 insertions(+), 100 deletions(-) rename czkawka_gui/src/{ => connect_things}/connect_about_buttons.rs (97%) rename czkawka_gui/src/{ => connect_things}/connect_button_compare.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_delete.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_hardlink.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_move.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_save.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_search.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_button_select.rs (97%) rename czkawka_gui/src/{ => connect_things}/connect_button_stop.rs (96%) rename czkawka_gui/src/{ => connect_things}/connect_change_language.rs (100%) rename czkawka_gui/src/{ => connect_things}/connect_duplicate_buttons.rs (95%) rename czkawka_gui/src/{ => connect_things}/connect_header_buttons.rs (91%) rename czkawka_gui/src/{ => connect_things}/connect_notebook_tabs.rs (94%) rename czkawka_gui/src/{ => connect_things}/connect_popovers.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_progress_window.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_selection_of_directories.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_settings.rs (99%) rename czkawka_gui/src/{ => connect_things}/connect_show_hide_ui.rs (96%) rename czkawka_gui/src/{ => connect_things}/connect_similar_image_size_change.rs (98%) create mode 100644 czkawka_gui/src/connect_things/mod.rs rename czkawka_gui/src/{ => gui_structs}/gui_about.rs (97%) rename czkawka_gui/src/{ => gui_structs}/gui_bottom_buttons.rs (99%) rename czkawka_gui/src/{ => gui_structs}/gui_compare_images.rs (97%) rename czkawka_gui/src/{ => gui_structs}/gui_data.rs (92%) rename czkawka_gui/src/{ => gui_structs}/gui_header.rs (96%) rename czkawka_gui/src/{ => gui_structs}/gui_main_notebook.rs (99%) rename czkawka_gui/src/{ => gui_structs}/gui_popovers.rs (96%) rename czkawka_gui/src/{ => gui_structs}/gui_progress_dialog.rs (96%) rename czkawka_gui/src/{ => gui_structs}/gui_settings.rs (99%) rename czkawka_gui/src/{ => gui_structs}/gui_upper_notebook.rs (99%) create mode 100644 czkawka_gui/src/gui_structs/mod.rs diff --git a/czkawka_gui/src/compute_results.rs b/czkawka_gui/src/compute_results.rs index c1d74e8..02e548f 100644 --- a/czkawka_gui/src/compute_results.rs +++ b/czkawka_gui/src/compute_results.rs @@ -13,7 +13,7 @@ use czkawka_core::same_music::MusicSimilarity; use czkawka_core::similar_images; use crate::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_combo_box::IMAGES_HASH_SIZE_COMBO_BOX; use crate::help_functions::*; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_about_buttons.rs b/czkawka_gui/src/connect_things/connect_about_buttons.rs similarity index 97% rename from czkawka_gui/src/connect_about_buttons.rs rename to czkawka_gui/src/connect_things/connect_about_buttons.rs index 378c2ad..cbac84b 100644 --- a/czkawka_gui/src/connect_about_buttons.rs +++ b/czkawka_gui/src/connect_things/connect_about_buttons.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; const SPONSOR_SITE: &str = "https://github.com/sponsors/qarmin"; const REPOSITORY_SITE: &str = "https://github.com/qarmin/czkawka"; diff --git a/czkawka_gui/src/connect_button_compare.rs b/czkawka_gui/src/connect_things/connect_button_compare.rs similarity index 99% rename from czkawka_gui/src/connect_button_compare.rs rename to czkawka_gui/src/connect_things/connect_button_compare.rs index 356599c..4d46eb3 100644 --- a/czkawka_gui/src/connect_button_compare.rs +++ b/czkawka_gui/src/connect_things/connect_button_compare.rs @@ -8,7 +8,7 @@ use image::DynamicImage; use std::cell::RefCell; use std::rc::Rc; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::{ count_number_of_groups, get_full_name_from_path_name, get_image_path_temporary, get_max_file_name, resize_dynamic_image_dimension, NotebookObject, HEADER_ROW_COLOR, NOTEBOOKS_INFOS, diff --git a/czkawka_gui/src/connect_button_delete.rs b/czkawka_gui/src/connect_things/connect_button_delete.rs similarity index 99% rename from czkawka_gui/src/connect_button_delete.rs rename to czkawka_gui/src/connect_things/connect_button_delete.rs index 8ecf4ab..bc56f6b 100644 --- a/czkawka_gui/src/connect_button_delete.rs +++ b/czkawka_gui/src/connect_things/connect_button_delete.rs @@ -7,7 +7,7 @@ use gtk::{Align, CheckButton, Dialog, ResponseType, TextView}; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::*; use crate::localizer::generate_translation_hashmap; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_button_hardlink.rs b/czkawka_gui/src/connect_things/connect_button_hardlink.rs similarity index 99% rename from czkawka_gui/src/connect_button_hardlink.rs rename to czkawka_gui/src/connect_things/connect_button_hardlink.rs index b0cb1f1..2672480 100644 --- a/czkawka_gui/src/connect_button_hardlink.rs +++ b/czkawka_gui/src/connect_things/connect_button_hardlink.rs @@ -7,7 +7,7 @@ use gtk::{Align, CheckButton, Dialog, ResponseType, TextView, TreeIter, TreePath use czkawka_core::duplicate::make_hard_link; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::*; use crate::localizer::generate_translation_hashmap; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_button_move.rs b/czkawka_gui/src/connect_things/connect_button_move.rs similarity index 99% rename from czkawka_gui/src/connect_button_move.rs rename to czkawka_gui/src/connect_things/connect_button_move.rs index 67321fb..d18bfae 100644 --- a/czkawka_gui/src/connect_button_move.rs +++ b/czkawka_gui/src/connect_things/connect_button_move.rs @@ -5,7 +5,7 @@ use gtk::{ResponseType, TreePath}; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::*; use crate::localizer::generate_translation_hashmap; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_button_save.rs b/czkawka_gui/src/connect_things/connect_button_save.rs similarity index 99% rename from czkawka_gui/src/connect_button_save.rs rename to czkawka_gui/src/connect_things/connect_button_save.rs index 69f63f4..5d2ca3c 100644 --- a/czkawka_gui/src/connect_button_save.rs +++ b/czkawka_gui/src/connect_things/connect_button_save.rs @@ -8,7 +8,7 @@ use gtk::{Button, Entry}; use czkawka_core::common_traits::SaveResults; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::localizer::generate_translation_hashmap; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_button_search.rs b/czkawka_gui/src/connect_things/connect_button_search.rs similarity index 99% rename from czkawka_gui/src/connect_button_search.rs rename to czkawka_gui/src/connect_things/connect_button_search.rs index 2204a90..7dce456 100644 --- a/czkawka_gui/src/connect_button_search.rs +++ b/czkawka_gui/src/connect_things/connect_button_search.rs @@ -18,7 +18,7 @@ use czkawka_core::similar_videos::SimilarVideos; use czkawka_core::temporary::Temporary; use czkawka_core::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_combo_box::{ DUPLICATES_CHECK_METHOD_COMBO_BOX, DUPLICATES_HASH_TYPE_COMBO_BOX, IMAGES_HASH_SIZE_COMBO_BOX, IMAGES_HASH_TYPE_COMBO_BOX, IMAGES_RESIZE_ALGORITHM_COMBO_BOX, }; diff --git a/czkawka_gui/src/connect_button_select.rs b/czkawka_gui/src/connect_things/connect_button_select.rs similarity index 97% rename from czkawka_gui/src/connect_button_select.rs rename to czkawka_gui/src/connect_things/connect_button_select.rs index aba1b92..28cc5b8 100644 --- a/czkawka_gui/src/connect_button_select.rs +++ b/czkawka_gui/src/connect_things/connect_button_select.rs @@ -1,7 +1,7 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; -use crate::gui_popovers::GuiPopovers; +use crate::gui_structs::gui_data::GuiData; +use crate::gui_structs::gui_popovers::GuiPopovers; use crate::help_functions::{PopoverTypes, NOTEBOOKS_INFOS}; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_button_stop.rs b/czkawka_gui/src/connect_things/connect_button_stop.rs similarity index 96% rename from czkawka_gui/src/connect_button_stop.rs rename to czkawka_gui/src/connect_things/connect_button_stop.rs index 4bc16b3..43c02c0 100644 --- a/czkawka_gui/src/connect_button_stop.rs +++ b/czkawka_gui/src/connect_things/connect_button_stop.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::KEY_ENTER; pub fn connect_button_stop(gui_data: &GuiData) { diff --git a/czkawka_gui/src/connect_change_language.rs b/czkawka_gui/src/connect_things/connect_change_language.rs similarity index 100% rename from czkawka_gui/src/connect_change_language.rs rename to czkawka_gui/src/connect_things/connect_change_language.rs diff --git a/czkawka_gui/src/connect_duplicate_buttons.rs b/czkawka_gui/src/connect_things/connect_duplicate_buttons.rs similarity index 95% rename from czkawka_gui/src/connect_duplicate_buttons.rs rename to czkawka_gui/src/connect_things/connect_duplicate_buttons.rs index 687be7a..975fffe 100644 --- a/czkawka_gui/src/connect_duplicate_buttons.rs +++ b/czkawka_gui/src/connect_things/connect_duplicate_buttons.rs @@ -2,7 +2,7 @@ use gtk::prelude::*; use czkawka_core::common_dir_traversal::CheckingMethod; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_combo_box::DUPLICATES_CHECK_METHOD_COMBO_BOX; pub fn connect_duplicate_combo_box(gui_data: &GuiData) { diff --git a/czkawka_gui/src/connect_header_buttons.rs b/czkawka_gui/src/connect_things/connect_header_buttons.rs similarity index 91% rename from czkawka_gui/src/connect_header_buttons.rs rename to czkawka_gui/src/connect_things/connect_header_buttons.rs index 341f284..fb36723 100644 --- a/czkawka_gui/src/connect_header_buttons.rs +++ b/czkawka_gui/src/connect_things/connect_header_buttons.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; pub fn connect_button_about(gui_data: &GuiData) { let about_dialog = gui_data.about.about_dialog.clone(); diff --git a/czkawka_gui/src/connect_notebook_tabs.rs b/czkawka_gui/src/connect_things/connect_notebook_tabs.rs similarity index 94% rename from czkawka_gui/src/connect_notebook_tabs.rs rename to czkawka_gui/src/connect_things/connect_notebook_tabs.rs index ee996d2..2266385 100644 --- a/czkawka_gui/src/connect_notebook_tabs.rs +++ b/czkawka_gui/src/connect_things/connect_notebook_tabs.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::*; use crate::notebook_enums::*; diff --git a/czkawka_gui/src/connect_popovers.rs b/czkawka_gui/src/connect_things/connect_popovers.rs similarity index 99% rename from czkawka_gui/src/connect_popovers.rs rename to czkawka_gui/src/connect_things/connect_popovers.rs index b2949fa..f3b5ca6 100644 --- a/czkawka_gui/src/connect_popovers.rs +++ b/czkawka_gui/src/connect_things/connect_popovers.rs @@ -4,9 +4,9 @@ use regex::Regex; use czkawka_core::common::Common; -use crate::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::*; +use czkawka_core::fl; // File length variable allows users to choose duplicates which have shorter file name // e.g. 'tar.gz' will be selected instead 'tar.gz (copy)' etc. diff --git a/czkawka_gui/src/connect_progress_window.rs b/czkawka_gui/src/connect_things/connect_progress_window.rs similarity index 99% rename from czkawka_gui/src/connect_progress_window.rs rename to czkawka_gui/src/connect_things/connect_progress_window.rs index a3f2b13..078d146 100644 --- a/czkawka_gui/src/connect_progress_window.rs +++ b/czkawka_gui/src/connect_things/connect_progress_window.rs @@ -3,10 +3,10 @@ use gtk::prelude::*; use czkawka_core::{big_file, broken_files, common_dir_traversal, similar_images, similar_videos, temporary}; -use crate::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::localizer::generate_translation_hashmap; use crate::taskbar_progress::tbp_flags::TBPF_INDETERMINATE; +use czkawka_core::fl; #[allow(clippy::too_many_arguments)] pub fn connect_progress_window( diff --git a/czkawka_gui/src/connect_selection_of_directories.rs b/czkawka_gui/src/connect_things/connect_selection_of_directories.rs similarity index 99% rename from czkawka_gui/src/connect_selection_of_directories.rs rename to czkawka_gui/src/connect_things/connect_selection_of_directories.rs index f07c63a..c130557 100644 --- a/czkawka_gui/src/connect_selection_of_directories.rs +++ b/czkawka_gui/src/connect_things/connect_selection_of_directories.rs @@ -7,7 +7,7 @@ use gtk::{ResponseType, TreeView, Window}; use czkawka_core::common::Common; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::{get_dialog_box_child, get_list_store, ColumnsExcludedDirectory, ColumnsIncludedDirectory}; pub fn connect_selection_of_directories(gui_data: &GuiData) { diff --git a/czkawka_gui/src/connect_settings.rs b/czkawka_gui/src/connect_things/connect_settings.rs similarity index 99% rename from czkawka_gui/src/connect_settings.rs rename to czkawka_gui/src/connect_things/connect_settings.rs index 0e49c71..f1eef58 100644 --- a/czkawka_gui/src/connect_settings.rs +++ b/czkawka_gui/src/connect_things/connect_settings.rs @@ -11,7 +11,7 @@ use czkawka_core::common_messages::Messages; use czkawka_core::duplicate::HashType; use czkawka_core::fl; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_functions::get_dialog_box_child; use crate::saving_loading::{load_configuration, reset_configuration, save_configuration}; diff --git a/czkawka_gui/src/connect_show_hide_ui.rs b/czkawka_gui/src/connect_things/connect_show_hide_ui.rs similarity index 96% rename from czkawka_gui/src/connect_show_hide_ui.rs rename to czkawka_gui/src/connect_things/connect_show_hide_ui.rs index 6df2625..348e32a 100644 --- a/czkawka_gui/src/connect_show_hide_ui.rs +++ b/czkawka_gui/src/connect_things/connect_show_hide_ui.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; pub fn connect_show_hide_ui(gui_data: &GuiData) { let check_button_settings_show_text_view = gui_data.settings.check_button_settings_show_text_view.clone(); diff --git a/czkawka_gui/src/connect_similar_image_size_change.rs b/czkawka_gui/src/connect_things/connect_similar_image_size_change.rs similarity index 98% rename from czkawka_gui/src/connect_similar_image_size_change.rs rename to czkawka_gui/src/connect_things/connect_similar_image_size_change.rs index 2588eb8..b900df7 100644 --- a/czkawka_gui/src/connect_similar_image_size_change.rs +++ b/czkawka_gui/src/connect_things/connect_similar_image_size_change.rs @@ -2,7 +2,7 @@ use gtk::prelude::*; use czkawka_core::similar_images::{get_string_from_similarity, Similarity, SIMILAR_VALUES}; -use crate::gui_data::GuiData; +use crate::gui_structs::gui_data::GuiData; use crate::help_combo_box::IMAGES_HASH_SIZE_COMBO_BOX; pub fn connect_similar_image_size_change(gui_data: &GuiData) { diff --git a/czkawka_gui/src/connect_things/mod.rs b/czkawka_gui/src/connect_things/mod.rs new file mode 100644 index 0000000..29ab8d6 --- /dev/null +++ b/czkawka_gui/src/connect_things/mod.rs @@ -0,0 +1,19 @@ +pub mod connect_about_buttons; +pub mod connect_button_compare; +pub mod connect_button_delete; +pub mod connect_button_hardlink; +pub mod connect_button_move; +pub mod connect_button_save; +pub mod connect_button_search; +pub mod connect_button_select; +pub mod connect_button_stop; +pub mod connect_change_language; +pub mod connect_duplicate_buttons; +pub mod connect_header_buttons; +pub mod connect_notebook_tabs; +pub mod connect_popovers; +pub mod connect_progress_window; +pub mod connect_selection_of_directories; +pub mod connect_settings; +pub mod connect_show_hide_ui; +pub mod connect_similar_image_size_change; diff --git a/czkawka_gui/src/gui_about.rs b/czkawka_gui/src/gui_structs/gui_about.rs similarity index 97% rename from czkawka_gui/src/gui_about.rs rename to czkawka_gui/src/gui_structs/gui_about.rs index d8c737f..1963068 100644 --- a/czkawka_gui/src/gui_about.rs +++ b/czkawka_gui/src/gui_structs/gui_about.rs @@ -2,7 +2,7 @@ use gdk::gdk_pixbuf::Pixbuf; use gtk::prelude::*; use gtk::{Builder, Window}; -use crate::fl; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiAbout { @@ -16,7 +16,7 @@ pub struct GuiAbout { impl GuiAbout { pub fn create_from_builder(window_main: &Window, logo: &Pixbuf) -> Self { - let glade_src = include_str!("../ui/about_dialog.glade").to_string(); + let glade_src = include_str!("../../ui/about_dialog.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let about_dialog: gtk::AboutDialog = builder.object("about_dialog").unwrap(); diff --git a/czkawka_gui/src/gui_bottom_buttons.rs b/czkawka_gui/src/gui_structs/gui_bottom_buttons.rs similarity index 99% rename from czkawka_gui/src/gui_bottom_buttons.rs rename to czkawka_gui/src/gui_structs/gui_bottom_buttons.rs index f5234f0..5b47187 100644 --- a/czkawka_gui/src/gui_bottom_buttons.rs +++ b/czkawka_gui/src/gui_structs/gui_bottom_buttons.rs @@ -1,8 +1,8 @@ use gtk::prelude::*; use gtk::{Bin, Widget}; -use crate::fl; use crate::help_functions::get_custom_label_from_button_with_image; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiBottomButtons { diff --git a/czkawka_gui/src/gui_compare_images.rs b/czkawka_gui/src/gui_structs/gui_compare_images.rs similarity index 97% rename from czkawka_gui/src/gui_compare_images.rs rename to czkawka_gui/src/gui_structs/gui_compare_images.rs index bd9fb5f..0efda03 100644 --- a/czkawka_gui/src/gui_compare_images.rs +++ b/czkawka_gui/src/gui_structs/gui_compare_images.rs @@ -30,7 +30,7 @@ pub struct GuiCompareImages { impl GuiCompareImages { pub fn create_from_builder(window_main: >k::Window) -> Self { - let glade_src = include_str!("../ui/compare_images.glade").to_string(); + let glade_src = include_str!("../../ui/compare_images.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let window_compare: gtk::Window = builder.object("window_compare").unwrap(); diff --git a/czkawka_gui/src/gui_data.rs b/czkawka_gui/src/gui_structs/gui_data.rs similarity index 92% rename from czkawka_gui/src/gui_data.rs rename to czkawka_gui/src/gui_structs/gui_data.rs index 257f136..496bbf8 100644 --- a/czkawka_gui/src/gui_data.rs +++ b/czkawka_gui/src/gui_structs/gui_data.rs @@ -19,19 +19,19 @@ use czkawka_core::similar_images::SimilarImages; use czkawka_core::similar_videos::SimilarVideos; use czkawka_core::temporary::Temporary; -use crate::gui_about::GuiAbout; -use crate::gui_bottom_buttons::GuiBottomButtons; -use crate::gui_compare_images::GuiCompareImages; -use crate::gui_header::GuiHeader; -use crate::gui_main_notebook::GuiMainNotebook; -use crate::gui_popovers::GuiPopovers; -use crate::gui_progress_dialog::GuiProgressDialog; -use crate::gui_settings::GuiSettings; -use crate::gui_upper_notebook::GuiUpperNotebook; +use crate::gui_structs::gui_about::GuiAbout; +use crate::gui_structs::gui_bottom_buttons::GuiBottomButtons; +use crate::gui_structs::gui_compare_images::GuiCompareImages; +use crate::gui_structs::gui_header::GuiHeader; +use crate::gui_structs::gui_main_notebook::GuiMainNotebook; +use crate::gui_structs::gui_popovers::GuiPopovers; +use crate::gui_structs::gui_progress_dialog::GuiProgressDialog; +use crate::gui_structs::gui_settings::GuiSettings; +use crate::gui_structs::gui_upper_notebook::GuiUpperNotebook; use crate::notebook_enums::*; use crate::taskbar_progress::TaskbarProgress; -const ICON_ABOUT: &[u8; 4458] = include_bytes!("../../snap/gui/czkawka.png"); +const ICON_ABOUT: &[u8; 4458] = include_bytes!("../../../snap/gui/czkawka.png"); #[derive(Clone)] pub struct GuiData { @@ -87,7 +87,7 @@ pub struct GuiData { impl GuiData { pub fn new_with_application(application: >k::Application) -> Self { //// Loading glade file content and build with it help UI - let glade_src = include_str!("../ui/main_window.glade").to_string(); + let glade_src = include_str!("../../ui/main_window.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); //// Windows diff --git a/czkawka_gui/src/gui_header.rs b/czkawka_gui/src/gui_structs/gui_header.rs similarity index 96% rename from czkawka_gui/src/gui_header.rs rename to czkawka_gui/src/gui_structs/gui_header.rs index d8198da..bd8fb36 100644 --- a/czkawka_gui/src/gui_header.rs +++ b/czkawka_gui/src/gui_structs/gui_header.rs @@ -1,6 +1,6 @@ use gtk::prelude::*; -use crate::fl; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiHeader { diff --git a/czkawka_gui/src/gui_main_notebook.rs b/czkawka_gui/src/gui_structs/gui_main_notebook.rs similarity index 99% rename from czkawka_gui/src/gui_main_notebook.rs rename to czkawka_gui/src/gui_structs/gui_main_notebook.rs index eafc107..385f3e6 100644 --- a/czkawka_gui/src/gui_main_notebook.rs +++ b/czkawka_gui/src/gui_structs/gui_main_notebook.rs @@ -4,9 +4,9 @@ use gtk::{EventControllerKey, TreeView}; use czkawka_core::similar_images::{get_string_from_similarity, Similarity, SIMILAR_VALUES}; -use crate::fl; use crate::help_combo_box::{DUPLICATES_CHECK_METHOD_COMBO_BOX, IMAGES_HASH_SIZE_COMBO_BOX}; use crate::notebook_enums::{NotebookMainEnum, NUMBER_OF_NOTEBOOK_MAIN_TABS}; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiMainNotebook { diff --git a/czkawka_gui/src/gui_popovers.rs b/czkawka_gui/src/gui_structs/gui_popovers.rs similarity index 96% rename from czkawka_gui/src/gui_popovers.rs rename to czkawka_gui/src/gui_structs/gui_popovers.rs index 3f19342..89c06a5 100644 --- a/czkawka_gui/src/gui_popovers.rs +++ b/czkawka_gui/src/gui_structs/gui_popovers.rs @@ -1,7 +1,7 @@ use gtk::prelude::*; use gtk::Builder; -use crate::fl; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiPopovers { @@ -31,7 +31,7 @@ pub struct GuiPopovers { impl GuiPopovers { pub fn create_from_builder() -> Self { - let glade_src = include_str!("../ui/popover_select.glade").to_string(); + let glade_src = include_str!("../../ui/popover_select.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let buttons_popover_select_all: gtk::Button = builder.object("buttons_popover_select_all").unwrap(); @@ -54,7 +54,7 @@ impl GuiPopovers { let popover_select: gtk::Popover = builder.object("popover_select").unwrap(); // Popover right click(not implemented for now) - let glade_src = include_str!("../ui/popover_right_click.glade").to_string(); + let glade_src = include_str!("../../ui/popover_right_click.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let buttons_popover_right_click_open_file: gtk::Button = builder.object("buttons_popover_right_click_open_file").unwrap(); diff --git a/czkawka_gui/src/gui_progress_dialog.rs b/czkawka_gui/src/gui_structs/gui_progress_dialog.rs similarity index 96% rename from czkawka_gui/src/gui_progress_dialog.rs rename to czkawka_gui/src/gui_structs/gui_progress_dialog.rs index cc9844e..2f2d499 100644 --- a/czkawka_gui/src/gui_progress_dialog.rs +++ b/czkawka_gui/src/gui_structs/gui_progress_dialog.rs @@ -1,8 +1,8 @@ use gtk::prelude::*; use gtk::{Bin, Builder, EventControllerKey, Window}; -use crate::fl; use crate::help_functions::get_custom_label_from_button_with_image; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiProgressDialog { @@ -24,7 +24,7 @@ pub struct GuiProgressDialog { impl GuiProgressDialog { pub fn create_from_builder(window_main: &Window) -> Self { - let glade_src = include_str!("../ui/progress.glade").to_string(); + let glade_src = include_str!("../../ui/progress.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let window_progress: gtk::Dialog = builder.object("window_progress").unwrap(); diff --git a/czkawka_gui/src/gui_settings.rs b/czkawka_gui/src/gui_structs/gui_settings.rs similarity index 99% rename from czkawka_gui/src/gui_settings.rs rename to czkawka_gui/src/gui_structs/gui_settings.rs index 8c8c266..55c525d 100644 --- a/czkawka_gui/src/gui_settings.rs +++ b/czkawka_gui/src/gui_structs/gui_settings.rs @@ -1,7 +1,7 @@ use gtk::prelude::*; use gtk::{Builder, Window}; -use crate::fl; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiSettings { @@ -53,7 +53,7 @@ pub struct GuiSettings { impl GuiSettings { pub fn create_from_builder(window_main: &Window) -> Self { - let glade_src = include_str!("../ui/settings.glade").to_string(); + let glade_src = include_str!("../../ui/settings.glade").to_string(); let builder = Builder::from_string(glade_src.as_str()); let window_settings: gtk::Window = builder.object("window_settings").unwrap(); diff --git a/czkawka_gui/src/gui_upper_notebook.rs b/czkawka_gui/src/gui_structs/gui_upper_notebook.rs similarity index 99% rename from czkawka_gui/src/gui_upper_notebook.rs rename to czkawka_gui/src/gui_structs/gui_upper_notebook.rs index b6c9755..b7146a8 100644 --- a/czkawka_gui/src/gui_upper_notebook.rs +++ b/czkawka_gui/src/gui_structs/gui_upper_notebook.rs @@ -1,9 +1,9 @@ use gtk::prelude::*; use gtk::{Bin, EventControllerKey, TreeView}; -use crate::fl; use crate::help_functions::get_custom_label_from_button_with_image; use crate::notebook_enums::NotebookUpperEnum; +use czkawka_core::fl; #[derive(Clone)] pub struct GuiUpperNotebook { diff --git a/czkawka_gui/src/gui_structs/mod.rs b/czkawka_gui/src/gui_structs/mod.rs new file mode 100644 index 0000000..8cd1e69 --- /dev/null +++ b/czkawka_gui/src/gui_structs/mod.rs @@ -0,0 +1,10 @@ +mod gui_about; +mod gui_bottom_buttons; +mod gui_compare_images; +pub mod gui_data; +mod gui_header; +pub mod gui_main_notebook; +pub mod gui_popovers; +mod gui_progress_dialog; +pub mod gui_settings; +pub mod gui_upper_notebook; diff --git a/czkawka_gui/src/initialize_gui.rs b/czkawka_gui/src/initialize_gui.rs index 1f1c5a6..70d3e2e 100644 --- a/czkawka_gui/src/initialize_gui.rs +++ b/czkawka_gui/src/initialize_gui.rs @@ -17,7 +17,7 @@ use czkawka_core::similar_videos::MAX_TOLERANCE; use crate::create_tree_view::*; use crate::delete_things; -use crate::gui_data::*; +use crate::gui_structs::gui_data::*; use crate::help_combo_box::{ DUPLICATES_CHECK_METHOD_COMBO_BOX, DUPLICATES_HASH_TYPE_COMBO_BOX, IMAGES_HASH_SIZE_COMBO_BOX, IMAGES_HASH_TYPE_COMBO_BOX, IMAGES_RESIZE_ALGORITHM_COMBO_BOX, }; diff --git a/czkawka_gui/src/main.rs b/czkawka_gui/src/main.rs index 60f796a..ce11a19 100644 --- a/czkawka_gui/src/main.rs +++ b/czkawka_gui/src/main.rs @@ -9,62 +9,35 @@ use gtk::prelude::*; use czkawka_core::*; use crate::compute_results::*; -use crate::connect_about_buttons::*; -use crate::connect_button_compare::*; -use crate::connect_button_delete::*; -use crate::connect_button_hardlink::*; -use crate::connect_button_move::*; -use crate::connect_button_save::*; -use crate::connect_button_search::*; -use crate::connect_button_select::*; -use crate::connect_button_stop::*; -use crate::connect_change_language::*; -use crate::connect_duplicate_buttons::connect_duplicate_combo_box; -use crate::connect_header_buttons::*; -use crate::connect_notebook_tabs::*; -use crate::connect_popovers::*; -use crate::connect_progress_window::*; -use crate::connect_selection_of_directories::*; -use crate::connect_settings::*; -use crate::connect_show_hide_ui::*; -use crate::connect_similar_image_size_change::*; -use crate::gui_data::*; use crate::initialize_gui::*; use crate::language_functions::LANGUAGES_ALL; use crate::saving_loading::*; use crate::tests::validate_notebook_data; +use connect_things::connect_about_buttons::*; +use connect_things::connect_button_compare::*; +use connect_things::connect_button_delete::*; +use connect_things::connect_button_hardlink::*; +use connect_things::connect_button_move::*; +use connect_things::connect_button_save::*; +use connect_things::connect_button_search::*; +use connect_things::connect_button_select::*; +use connect_things::connect_button_stop::*; +use connect_things::connect_change_language::*; +use connect_things::connect_duplicate_buttons::connect_duplicate_combo_box; +use connect_things::connect_header_buttons::*; +use connect_things::connect_notebook_tabs::*; +use connect_things::connect_popovers::*; +use connect_things::connect_progress_window::*; +use connect_things::connect_selection_of_directories::*; +use connect_things::connect_settings::*; +use connect_things::connect_show_hide_ui::*; +use connect_things::connect_similar_image_size_change::*; +use gui_structs::gui_data::*; mod compute_results; -mod connect_about_buttons; -mod connect_button_compare; -mod connect_button_delete; -mod connect_button_hardlink; -mod connect_button_move; -mod connect_button_save; -mod connect_button_search; -mod connect_button_select; -mod connect_button_stop; -mod connect_change_language; -mod connect_duplicate_buttons; -mod connect_header_buttons; -mod connect_notebook_tabs; -mod connect_popovers; -mod connect_progress_window; -mod connect_selection_of_directories; -mod connect_settings; -mod connect_show_hide_ui; -mod connect_similar_image_size_change; +mod connect_things; mod create_tree_view; -mod gui_about; -mod gui_bottom_buttons; -mod gui_compare_images; -mod gui_data; -mod gui_header; -mod gui_main_notebook; -mod gui_popovers; -mod gui_progress_dialog; -mod gui_settings; -mod gui_upper_notebook; +mod gui_structs; mod help_combo_box; mod help_functions; mod initialize_gui; diff --git a/czkawka_gui/src/saving_loading.rs b/czkawka_gui/src/saving_loading.rs index 32808f5..da60e98 100644 --- a/czkawka_gui/src/saving_loading.rs +++ b/czkawka_gui/src/saving_loading.rs @@ -8,11 +8,11 @@ use directories_next::ProjectDirs; use gtk::prelude::*; use gtk::{ComboBoxText, ScrolledWindow, TextView}; -use crate::gui_main_notebook::GuiMainNotebook; +use crate::gui_structs::gui_main_notebook::GuiMainNotebook; use czkawka_core::fl; -use crate::gui_settings::GuiSettings; -use crate::gui_upper_notebook::GuiUpperNotebook; +use crate::gui_structs::gui_settings::GuiSettings; +use crate::gui_structs::gui_upper_notebook::GuiUpperNotebook; use crate::help_functions::*; use crate::language_functions::{get_language_from_combo_box_text, LANGUAGES_ALL}; use crate::localizer::generate_translation_hashmap;