GTK 4 Port #466

qarmin · 2021-11-26T08:56:42Z

Why?

It should work better(better HiDPi support, wayland etc.)
App will live longer(I think that first distros can drop GTK 3 even in 2025)

I don't expect any big changes in logic or app design.
Sadly this port will(at least for now) have little less usability - e.g. not working middle mouse button - gtk-rs/gtk4-rs#1043

Bumps minimal version of OS to Ubuntu 22.04 or similar
Also GTK 4.6 is required

Fix #716
Fix #12
Fix #142
Accidentally fix #646

qarmin · 2021-12-18T15:23:15Z

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 "scrolled_window.add(&tree_view)" "scrolled_window.set_child(Some(&tree_view))" czkawka_gui/src/*.rs
sd -s ".add(" ".append(" 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(move |window|" czkawka_gui/src/*.rs
sd -s "connect_delete_event(move |_, _|" "connect_close_request(move |_|" 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 Menubutton don't have connect_clicked
sd -s "buttons_select.connect_clicked" "buttons_select.connect_activate" 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
missing resize, what should I do?
- change upper window from paned to normal box, because paned behave strange

…windows CI

qarmin force-pushed the test_gtk4_branch branch from f8e958c to 812d06e Compare November 30, 2021 14:56

qarmin force-pushed the test_gtk4_branch branch 3 times, most recently from 864078b to 367a33c Compare December 17, 2021 19:42

qarmin added 8 commits May 17, 2022 19:17

AAA

cbf5636

Again

51f43c9

Agga

965828e

Kolejno

9cdec39

ABCD

b05bd52

Hardest part

1d64285

ABD

837dc38

Not yet

48dd82a

qarmin force-pushed the test_gtk4_branch branch from 67af469 to 48dd82a Compare May 18, 2022 16:44

qarmin changed the title ~~Trying to compile app with GTK 4 - NOT TO MERGE~~ Trying to compile app with GTK 4 May 18, 2022

qarmin added 9 commits May 19, 2022 21:02

Ikony

4f9c65a

About Dialog

9b5fd6d

Progress Dialog

41d21e3

Settings

ec887c1

CI

f60ee46

Bump version

2c84de5

Dialog

3c15b72

Change check if it is header to bool from string

24635a0

Proper popup opening

4a3293b

qarmin changed the title ~~Trying to compile app with GTK 4~~ GTK 4 Port May 21, 2022

qarmin added 5 commits May 21, 2022 09:33

CI Linux without clippy

c930e90

Compare window partial fixes

da5e526

Double click works in included/excluded directories

ebfdade

Preview and remove old ui files

e563784

MAC CI

d2da7be

qarmin added 2 commits May 22, 2022 09:30

Fix deleting single item

daeb872

Fix deleting single item, fix stop button, smaller windows, disabled …

7dd86e1

…windows CI

qarmin merged commit 6d8b33d into master May 22, 2022

qarmin deleted the test_gtk4_branch branch May 22, 2022 08:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GTK 4 Port #466

GTK 4 Port #466

qarmin commented Nov 26, 2021 •

edited

qarmin commented Dec 18, 2021

GTK 4 Port #466

GTK 4 Port #466

Conversation

qarmin commented Nov 26, 2021 • edited

qarmin commented Dec 18, 2021

qarmin commented Nov 26, 2021 •

edited