Update to master

czkawka_gui/gtk3togtk4migration.md

@@ -0,0 +1,145 @@
+sd -s "window_progress.resize(1, 1);" "" czkawka_gui/src/*.rs # resize is missing in GTK
+
+
+
+# TODO convert also ui files to GTK 4
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/settings.glade > czkawka_gui/ui/settings2.glade
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/about_dialog.glade > czkawka_gui/ui/about_dialog2.glade
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/main_window.glade > czkawka_gui/ui/main_window2.glade
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/popover_right_click.glade > czkawka_gui/ui/popover_right_click2.glade
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/popover_select.glade > czkawka_gui/ui/popover_select2.glade
+gtk4-builder-tool simplify --3to4 czkawka_gui/ui/progress.glade > czkawka_gui/ui/progress2.glade
+mv czkawka_gui/ui/settings2.glade czkawka_gui/ui/settings.glade
+mv czkawka_gui/ui/about_dialog2.glade czkawka_gui/ui/about_dialog.glade
+mv czkawka_gui/ui/main_window2.glade czkawka_gui/ui/main_window.glade
+mv czkawka_gui/ui/popover_right_click2.glade czkawka_gui/ui/popover_right_click.glade
+mv czkawka_gui/ui/popover_select2.glade czkawka_gui/ui/popover_select.glade
+mv czkawka_gui/ui/progress2.glade czkawka_gui/ui/progress.glade
+
+sd -s "ButtonBox" "Box" czkawka_gui/ui/*.glade 
+
+sd "\n[ ]+<property name=\"shadow-type\">[a-z]+</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"caps-lock-warning\">False</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"resize-mode\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"window-position\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"window-position\">center</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"type-hint\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"type-hint\">dialog</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"layout-style\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"layout-style\">end</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"action_area\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"layout-style\">queue</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"layout-style\">end</property>" "" czkawka_gui/ui/*.glade 
+sd "\n[ ]+<property name=\"gravity\">center</property>" "" czkawka_gui/ui/*.glade 
+
+sd -s "<child internal-child=\"vbox\">" "<child>" czkawka_gui/ui/*.glade 
+sd -s "<child internal-child=\"action_area\">" "<child>" czkawka_gui/ui/*.glade 
+
+
+sd -s "show_all" "show" czkawka_gui/src/*.rs
+
+sd -s "Some(Box::new(select_function_duplicates))" "select_function_duplicates" czkawka_gui/src/*.rs
+sd -s "Some(Box::new(select_function_similar_images))" "select_function_similar_images" czkawka_gui/src/*.rs
+sd -s "Some(Box::new(select_function_similar_videos))" "select_function_similar_videos" czkawka_gui/src/*.rs
+sd -s "Some(Box::new(select_function_same_music))" "select_function_same_music" czkawka_gui/src/*.rs
+
+
+sd -s ".add(" ".append(" czkawka_gui/src/*.rs
+sd -s "scrolled_window_duplicate_finder.append(&tree_view)" "scrolled_window_duplicate_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_empty_folder_finder.append(&tree_view)" "scrolled_window_empty_folder_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_empty_files_finder.append(&tree_view)" "scrolled_window_empty_files_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_temporary_files_finder.append(&tree_view)" "scrolled_window_temporary_files_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_big_files_finder.append(&tree_view)" "scrolled_window_big_files_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_similar_images_finder.append(&tree_view)" "scrolled_window_similar_images_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_similar_videos_finder.append(&tree_view)" "scrolled_window_similar_videos_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_same_music_finder.append(&tree_view)" "scrolled_window_same_music_finder.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_invalid_symlinks.append(&tree_view)" "scrolled_window_invalid_symlinks.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_broken_files.append(&tree_view)" "scrolled_window_broken_files.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_included_directories.append(&tree_view)" "scrolled_window_included_directories.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+sd -s "scrolled_window_excluded_directories.append(&tree_view)" "scrolled_window_excluded_directories.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
+
+sd -s "gtk::" "gtk4::" czkawka_gui/src/*.rs
+sd -s "gdk::" "gdk4::" czkawka_gui/src/*.rs
+sd -s "use gtk4::prelude::*;" "use gtk4::prelude::*;use gtk4::Inhibit;" czkawka_gui/src/*.rs
+
+
+sd -s ".value(" ".get(" czkawka_gui/src/*.rs
+sd -s "scale_similarity_similar_images.get()" "scale_similarity_similar_images.value()" czkawka_gui/src/*.rs
+sd -s "scale_similarity_similar_videos.get()" "scale_similarity_similar_videos.value()" czkawka_gui/src/*.rs
+
+sd -s ".buffer().unwrap()" ".buffer()" czkawka_gui/src/*.rs
+
+sd -s ".path(&iter).unwrap()" ".path(&iter)" czkawka_gui/src/*.rs
+sd -s "model.path(&current_iter).unwrap()" "model.path(&current_iter)" czkawka_gui/src/*.rs
+sd -s "model.path(&next_iter).unwrap()" "model.path(&next_iter)" czkawka_gui/src/*.rs
+
+sd -s "window_main.set_title(\"Czkawka\")" "window_main.set_title(Some(\"Czkawka\"))" czkawka_gui/src/*.rs
+sd -s "window_progress.set_title(\"Czkawka\")" "window_progress.set_title(Some(\"Czkawka\"))" czkawka_gui/src/*.rs
+
+# NOT WORKING # sd "connect_delete_event\(([^,^\n]+), _" "connect_delete_event(${1" czkawka_gui/src/*.rs
+sd -s "connect_delete_event(|dialog, _|" "connect_close_request(|dialog|" czkawka_gui/src/*.rs
+sd -s "connect_delete_event(move |window, _|" "connect_close_request(|window|" czkawka_gui/src/*.rs
+sd -s "connect_delete_event(move |_, _|" "connect_close_request(|_|" czkawka_gui/src/*.rs
+
+# GTK BIN not exists, probably widget or button is better 
+sd -s "{Bin," "{" czkawka_gui/src/*.rs 
+sd -s "gtk4::Bin" "gtk4::Button" czkawka_gui/src/*.rs 
+sd -s ".upcast::<Bin>()" "" czkawka_gui/src/*.rs 
+
+# Checkbuttons set_label have now "Some"
+sd -s 'label(&fl!("music_title_checkbox")' 'label(Some(&fl!("music_title_checkbox"))' czkawka_gui/src/*.rs  czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("music_artist_checkbox")' 'label(Some(&fl!("music_artist_checkbox"))' czkawka_gui/src/*.rs  czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("music_album_title_checkbox")' 'label(Some(&fl!("music_album_title_checkbox"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("music_album_artist_checkbox")' 'label(Some(&fl!("music_album_artist_checkbox"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("music_year_checkbox")' 'label(Some(&fl!("music_year_checkbox"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("music_comparison_checkbox")' 'label(Some(&fl!("music_comparison_checkbox"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("check_button_general_same_size")' 'label(Some(&fl!("check_button_general_same_size"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("check_button_general_same_size")' 'label(Some(&fl!("check_button_general_same_size"))' czkawka_gui/src/*.rs 
+
+sd -s 'label(&fl!("settings_save_at_exit_button")' 'label(Some(&fl!("settings_save_at_exit_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_load_at_start_button")' 'label(Some(&fl!("settings_load_at_start_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_confirm_deletion_button")' 'label(Some(&fl!("settings_confirm_deletion_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_confirm_link_button")' 'label(Some(&fl!("settings_confirm_link_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_confirm_group_deletion_button")' 'label(Some(&fl!("settings_confirm_group_deletion_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_show_text_view_button")' 'label(Some(&fl!("settings_show_text_view_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_use_cache_button")' 'label(Some(&fl!("settings_use_cache_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_use_trash_button")' 'label(Some(&fl!("settings_use_trash_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_duplicates_hide_hard_link_button")' 'label(Some(&fl!("settings_duplicates_hide_hard_link_button"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_multiple_image_preview_checkbutton")' 'label(Some(&fl!("settings_multiple_image_preview_checkbutton"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_multiple_delete_outdated_cache_checkbutton")' 'label(Some(&fl!("settings_multiple_delete_outdated_cache_checkbutton"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_duplicates_prehash_checkbutton")' 'label(Some(&fl!("settings_duplicates_prehash_checkbutton"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_multiple_image_preview_checkbutton")' 'label(Some(&fl!("settings_multiple_image_preview_checkbutton"))' czkawka_gui/src/*.rs 
+sd -s 'label(&fl!("settings_multiple_delete_outdated_cache_checkbutton")' 'label(Some(&fl!("settings_multiple_delete_outdated_cache_checkbutton"))' czkawka_gui/src/*.rs 
+
+sd -s 'label(&fl!("upper_recursive_button")' 'label(Some(&fl!("upper_recursive_button"))' czkawka_gui/src/*.rs 
+
+
+# TODO double click not working
+sd -s "tree_view.connect_button_press_event(opening_double_click_function);" "//tree_view.connect_button_press_event(opening_double_click_function);" czkawka_gui/src/*.rs 
+
+# TODO what is instead filenames?
+sd -s "folders = file_chooser.filenames();" "mut folders = Vec::new();folders.push(Path::new(\"\").to_path_buf());" czkawka_gui/src/*.rs 
+sd -s "folder = chooser.filenames();" "mut folder = Vec::new();folder.push(Path::new(\"\").to_path_buf());" czkawka_gui/src/*.rs 
+
+# TODO Menubutton don't have connect_clicked
+sd -s "buttons_select.connect_clicked" "buttons_select.connect_activate" czkawka_gui/src/*.rs 
+
+# Needs to add controller
+sd "EventControllerKey::new\([^\)]+\)" "EventControllerKey::new()" czkawka_gui/src/*.rs
+
+
+# Errors Manual
+
+`buffer.text()` -> `` returns valid text, so `match` can be removed around such statements
+
+
+# TODO 
+get_custom_label_from_label_with_image - takes bin, but should also takes widget or menubutton
+connect_button_release_event is missing  - button_stop_in_dialog.connect_button_release_event
+self.notebook_upper.children() - children are not visible
+tree_view.connect_button_release_event(move |tree_view, _event| - is missing 
+missing move in closures above - save_configuration(false, &gui_data.upper_notebook and below et stop_sender = gui_data.stop_sender.clone();
+missing resize, what should I do?
+
+
+

czkawka_gui/src/compute_results.rs

@@ -5,7 +5,7 @@ use std::rc::Rc;
 
 use chrono::NaiveDateTime;
 use glib::Receiver;
-use gtk::prelude::*;
+use gtk4::prelude::*;use gtk4::Inhibit;
 use humansize::{file_size_opts as options, FileSize};
 
 use crate::fl;

czkawka_gui/src/connect_about_buttons.rs

@@ -1,4 +1,4 @@
-use gtk::prelude::*;
+use gtk4::prelude::*;use gtk4::Inhibit;
 
 use crate::gui_data::GuiData;