Thread number

Author: qarmin

czkawka_cli/src/main.rs

@@ -6,7 +6,7 @@ use clap::Parser;
 
 use commands::Commands;
 use czkawka_core::big_file::SearchMode;
-use czkawka_core::common::set_default_number_of_threads;
+use czkawka_core::common::{get_number_of_threads, set_default_number_of_threads};
 #[allow(unused_imports)] // It is used in release for print_results().
 use czkawka_core::common_traits::*;
 use czkawka_core::similar_images::test_image_conversion_speed;
@@ -30,6 +30,7 @@ fn main() {
     let command = Commands::from_args();
 
     set_default_number_of_threads();
+    println!("Set thread number to {}", get_number_of_threads());
     #[cfg(debug_assertions)]
     println!("{:?}", command);
 

czkawka_gui/src/connect_things/connect_button_delete.rs

@@ -124,7 +124,7 @@ pub async fn check_if_can_delete_files(
         let (confirmation_dialog_delete, check_button) = create_dialog_ask_for_deletion(window_main, number_of_selected_items, number_of_selected_groups);
 
         let response_type = confirmation_dialog_delete.run_future().await;
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             if !check_button.is_active() {
                 check_button_settings_confirm_deletion.set_active(false);
             }
@@ -249,7 +249,7 @@ pub async fn check_if_deleting_all_files_in_group(
         let (confirmation_dialog_group_delete, check_button) = create_dialog_group_deletion(window_main);
 
         let response_type = confirmation_dialog_group_delete.run_future().await;
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             if !check_button.is_active() {
                 check_button_settings_confirm_group_deletion.set_active(false);
             }

czkawka_gui/src/connect_things/connect_button_hardlink.rs

@@ -318,7 +318,7 @@ pub async fn check_if_changing_one_item_in_group_and_continue(tree_view: &gtk4::
         let confirmation_dialog = create_dialog_non_group(window_main);
 
         let response_type = confirmation_dialog.run_future().await;
-        if response_type != gtk4::ResponseType::Ok {
+        if response_type != ResponseType::Ok {
             confirmation_dialog.hide();
             confirmation_dialog.close();
             return false;
@@ -355,7 +355,7 @@ pub async fn check_if_can_link_files(check_button_settings_confirm_link: &CheckB
         let (confirmation_dialog_link, check_button) = create_dialog_ask_for_linking(window_main);
 
         let response_type = confirmation_dialog_link.run_future().await;
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             if !check_button.is_active() {
                 check_button_settings_confirm_link.set_active(false);
             }

czkawka_gui/src/connect_things/connect_button_move.rs

@@ -91,7 +91,7 @@ fn move_things(
     let text_view_errors = text_view_errors.clone();
     let tree_view = tree_view.clone();
     chooser.connect_response(move |file_chooser, response_type| {
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             let mut folders: Vec<PathBuf> = Vec::new();
             let g_files = file_chooser.files();
             for index in 0..g_files.n_items() {

czkawka_gui/src/connect_things/connect_popovers.rs

@@ -373,7 +373,7 @@ fn popover_custom_select_unselect(
             #[cfg(target_family = "windows")]
             let path_wildcard = path_wildcard.replace("/", "\\");
 
-            if response_type == gtk4::ResponseType::Ok {
+            if response_type == ResponseType::Ok {
                 let check_path = check_button_path.is_active();
                 let check_name = check_button_name.is_active();
                 let check_regex = check_button_rust_regex.is_active();

czkawka_gui/src/connect_things/connect_selection_of_directories.rs

@@ -100,7 +100,7 @@ fn add_chosen_directories(window_main: &Window, tree_view: &TreeView, excluded_i
 
     let tree_view = tree_view.clone();
     file_chooser.connect_response(move |file_chooser, response_type| {
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             let mut folders: Vec<PathBuf> = Vec::new();
             let g_files = file_chooser.files();
             for index in 0..g_files.n_items() {
@@ -156,7 +156,7 @@ fn add_manually_directories(window_main: &Window, tree_view: &TreeView, excluded
 
     let tree_view = tree_view.clone();
     dialog.connect_response(move |dialog, response_type| {
-        if response_type == gtk4::ResponseType::Ok {
+        if response_type == ResponseType::Ok {
             for text in entry.text().split(';') {
                 let mut text = text.trim().to_string();
                 #[cfg(target_family = "windows")]

czkawka_gui/src/connect_things/connect_settings.rs

@@ -19,11 +19,10 @@ use crate::saving_loading::{load_configuration, reset_configuration, save_config
 pub fn connect_settings(gui_data: &GuiData) {
     // Connect scale
     {
-        gui_data.settings.label_restart_needed.hide();
         let label_restart_needed = gui_data.settings.label_restart_needed.clone();
         gui_data.settings.scale_settings_number_of_threads.connect_value_changed(move |_| {
-            if !label_restart_needed.is_visible() {
-                label_restart_needed.show();
+            if label_restart_needed.label().is_empty() {
+                label_restart_needed.set_label(&flg!("settings_label_restart"));
             }
         });
     }

czkawka_gui/src/gui_structs/gui_settings.rs

@@ -156,7 +156,6 @@ impl GuiSettings {
     pub fn update_language(&self) {
         self.window_settings.set_title(Some(&flg!("window_settings_title")));
 
-        self.label_restart_needed.set_label(&flg!("settings_label_restart"));
         self.check_button_settings_save_at_exit.set_label(Some(&flg!("settings_save_at_exit_button")));
         self.check_button_settings_load_at_start.set_label(Some(&flg!("settings_load_at_start_button")));
         self.check_button_settings_confirm_deletion.set_label(Some(&flg!("settings_confirm_deletion_button")));

czkawka_gui/src/help_functions.rs

@@ -763,8 +763,8 @@ pub fn check_if_list_store_column_have_all_same_values(list_store: &ListStore, c
 }
 
 pub fn scale_step_function(scale: &gtk4::Scale, _scroll_type: ScrollType, value: f64) -> Inhibit {
-    scale.set_round_digits(0);
     scale.set_increments(1_f64, 1_f64);
+    scale.set_round_digits(0);
     scale.set_fill_level(value.round());
     Inhibit(false)
 }

czkawka_gui/src/main.rs

@@ -32,7 +32,7 @@ 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 czkawka_core::common::set_number_of_threads;
+use czkawka_core::common::{get_number_of_threads, set_number_of_threads};
 use czkawka_core::*;
 use gui_structs::gui_data::*;
 
@@ -136,7 +136,8 @@ fn build_ui(application: &Application, arguments: Vec<OsString>) {
         &gui_data.scrolled_window_errors,
         arguments.clone(),
     );
-    set_number_of_threads(gui_data.settings.scale_settings_number_of_threads.value() as usize);
+    set_number_of_threads(gui_data.settings.scale_settings_number_of_threads.value().round() as usize);
+    println!("Set thread number to {}", get_number_of_threads());
 
     // Needs to run when entire GUI is initialized
     connect_change_language(&gui_data);

czkawka_gui/src/saving_loading.rs

@@ -625,7 +625,7 @@ pub fn save_configuration(manual_execution: bool, upper_notebook: &GuiUpperNoteb
     // Others
     saving_struct.save_var(
         hashmap_ls.get(&LoadText::ThreadNumber).unwrap().to_string(),
-        settings.scale_settings_number_of_threads.value(),
+        settings.scale_settings_number_of_threads.value().round(),
     );
     saving_struct.save_var(
         hashmap_ls.get(&LoadText::MinimalCacheSize).unwrap().to_string(),
@@ -960,8 +960,9 @@ pub fn load_configuration(
         main_notebook.scale_similarity_similar_images.set_value(similar_images_similarity as f64);
 
         settings.scale_settings_number_of_threads.set_range(0_f64, get_default_number_of_threads() as f64);
-        settings.scale_settings_number_of_threads.set_fill_level(thread_number as f64);
+        settings.scale_settings_number_of_threads.set_fill_level(get_default_number_of_threads() as f64);
         settings.scale_settings_number_of_threads.connect_change_value(scale_step_function);
+        settings.scale_settings_number_of_threads.set_value(thread_number as f64);
     } else {
         settings.check_button_settings_load_at_start.set_active(false);
     }

czkawka_gui/ui/czkawka.cmb

@@ -968,7 +968,6 @@
 	(9,58,"GtkWidget","focusable","1",None,None,None,None,None),
 	(9,58,"GtkWidget","hexpand","1",None,None,None,None,None),
 	(9,59,"GtkAccessible","accessible-role","menu-item-checkbox",None,None,None,None,None),
-	(9,59,"GtkLabel","label","You need to restart app to apply settings!",None,None,None,None,None),
 	(9,59,"GtkWidget","margin-bottom","4",None,None,None,None,None),
 	(9,59,"GtkWidget","margin-top","5",None,None,None,None,None)
   </object_property>

czkawka_gui/ui/settings.ui

@@ -142,7 +142,6 @@
                     <child>
                       <object class="GtkLabel" id="label_restart_needed">
                         <property name="accessible-role">menu-item-checkbox</property>
-                        <property name="label">You need to restart app to apply settings!</property>
                         <property name="margin-bottom">4</property>
                         <property name="margin-top">5</property>
                       </object>