1
0
Fork 0
mirror of synced 2024-06-02 10:35:02 +12:00
This commit is contained in:
Rafał Mikrut 2022-05-18 18:43:47 +02:00
parent 837dc38192
commit 48dd82a6a6
7 changed files with 43 additions and 38 deletions

View file

@ -1,7 +1,7 @@
use crate::flg;
use gdk4::gdk_pixbuf::{InterpType, Pixbuf};
use gtk4::prelude::*;
use gtk4::{CheckButton, Image, ListStore, Orientation, ScrolledWindow, TreeIter, TreeModel, TreePath, TreeSelection};
use gtk4::{CheckButton, Image, ListStore, Orientation, ScrolledWindow, TreeIter, TreeModel, TreePath, TreeSelection, Widget};
use std::cell::RefCell;
use std::rc::Rc;
@ -285,8 +285,8 @@ fn populate_groups_at_start(
let cache_all_images = generate_cache_for_results(all_vec);
// This is safe, because cache have at least 2 results
image_compare_left.set_from_pixbuf(cache_all_images[0].2.pixbuf().as_ref());
image_compare_right.set_from_pixbuf(cache_all_images[1].2.pixbuf().as_ref());
// image_compare_left.set_from_pixbuf(cache_all_images[0].2.pixbuf().as_ref()); // TODO GTK 4
// image_compare_right.set_from_pixbuf(cache_all_images[1].2.pixbuf().as_ref()); // TODO GTK 4
*shared_using_for_preview.borrow_mut() = (Some(cache_all_images[0].4.clone()), Some(cache_all_images[1].4.clone()));
@ -476,7 +476,7 @@ fn populate_similar_scrolled_view(
model: &TreeModel,
column_selection: i32,
) {
scrolled_window.set_child(None);
scrolled_window.set_child(None::<&Widget>);
scrolled_window.set_propagate_natural_height(true);
let all_gtk_box = gtk4::Box::new(Orientation::Horizontal, 5);
@ -506,7 +506,7 @@ fn populate_similar_scrolled_view(
button_left.connect_clicked(move |_button_left| {
shared_using_for_preview_clone.borrow_mut().0 = Some(tree_path_clone.clone());
update_bottom_buttons(&all_gtk_box_clone, shared_using_for_preview_clone.clone(), shared_image_cache_clone.clone());
image_compare_left.set_from_pixbuf(big_thumbnail_clone.pixbuf().as_ref());
// image_compare_left.set_from_pixbuf(big_thumbnail_clone.pixbuf().as_ref()); // TODO GTK 4
let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection);
check_button_left_preview_text_clone.set_active(is_active);
@ -525,7 +525,7 @@ fn populate_similar_scrolled_view(
button_right.connect_clicked(move |_button_right| {
shared_using_for_preview_clone.borrow_mut().1 = Some(tree_path_clone.clone());
update_bottom_buttons(&all_gtk_box_clone, shared_using_for_preview_clone.clone(), shared_image_cache_clone.clone());
image_compare_right.set_from_pixbuf(big_thumbnail_clone.pixbuf().as_ref());
// image_compare_right.set_from_pixbuf(big_thumbnail_clone.pixbuf().as_ref()); // TODO GTK 4
let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection);
check_button_right_preview_text_clone.set_active(is_active);

View file

@ -36,17 +36,17 @@ impl GuiBottomButtons {
let buttons_show_errors: gtk4::Button = builder.object("buttons_show_errors").unwrap();
let buttons_show_upper_notebook: gtk4::Button = builder.object("buttons_show_upper_notebook").unwrap();
set_icon_of_button(&buttons_search, CZK_ICON_SEARCH);
set_icon_of_menubutton(&buttons_select, CZK_ICON_SELECT);
set_icon_of_button(&buttons_delete, CZK_ICON_TRASH);
set_icon_of_button(&buttons_save, CZK_ICON_SAVE);
set_icon_of_button(&buttons_symlink, CZK_ICON_SYMLINK);
set_icon_of_button(&buttons_hardlink, CZK_ICON_HARDLINK);
set_icon_of_button(&buttons_move, CZK_ICON_MOVE);
set_icon_of_button(&buttons_compare, CZK_ICON_COMPARE);
set_icon_of_button(&buttons_show_errors, CZK_ICON_HIDE_DOWN);
set_icon_of_button(&buttons_show_upper_notebook, CZK_ICON_HIDE_UP);
// TODO GTK 4
// set_icon_of_button(&buttons_search, CZK_ICON_SEARCH);
// set_icon_of_menubutton(&buttons_select, CZK_ICON_SELECT);
// set_icon_of_button(&buttons_delete, CZK_ICON_TRASH);
// set_icon_of_button(&buttons_save, CZK_ICON_SAVE);
// set_icon_of_button(&buttons_symlink, CZK_ICON_SYMLINK);
// set_icon_of_button(&buttons_hardlink, CZK_ICON_HARDLINK);
// set_icon_of_button(&buttons_move, CZK_ICON_MOVE);
// set_icon_of_button(&buttons_compare, CZK_ICON_COMPARE);
// set_icon_of_button(&buttons_show_errors, CZK_ICON_HIDE_DOWN);
// set_icon_of_button(&buttons_show_upper_notebook, CZK_ICON_HIDE_UP);
let buttons_names = [
BottomButtonsEnum::Search,
@ -87,13 +87,14 @@ impl GuiBottomButtons {
}
}
pub fn update_language(&self) {
get_custom_label_from_button_with_image(&self.buttons_search.clone()).set_text(&flg!("bottom_search_button"));
get_custom_label_from_button_with_image(&self.buttons_select.clone()).set_text(&flg!("bottom_select_button"));
get_custom_label_from_button_with_image(&self.buttons_delete.clone()).set_text(&flg!("bottom_delete_button"));
get_custom_label_from_button_with_image(&self.buttons_save.clone()).set_text(&flg!("bottom_save_button"));
get_custom_label_from_button_with_image(&self.buttons_symlink.clone()).set_text(&flg!("bottom_symlink_button"));
get_custom_label_from_button_with_image(&self.buttons_hardlink.clone()).set_text(&flg!("bottom_hardlink_button"));
get_custom_label_from_button_with_image(&self.buttons_move.clone()).set_text(&flg!("bottom_move_button"));
// TODO GTK 4
// get_custom_label_from_button_with_image(&self.buttons_search.clone()).set_text(&flg!("bottom_search_button"));
// get_custom_label_from_button_with_image(&self.buttons_select.clone()).set_text(&flg!("bottom_select_button"));
// get_custom_label_from_button_with_image(&self.buttons_delete.clone()).set_text(&flg!("bottom_delete_button"));
// get_custom_label_from_button_with_image(&self.buttons_save.clone()).set_text(&flg!("bottom_save_button"));
// get_custom_label_from_button_with_image(&self.buttons_symlink.clone()).set_text(&flg!("bottom_symlink_button"));
// get_custom_label_from_button_with_image(&self.buttons_hardlink.clone()).set_text(&flg!("bottom_hardlink_button"));
// get_custom_label_from_button_with_image(&self.buttons_move.clone()).set_text(&flg!("bottom_move_button"));
self.buttons_search.set_tooltip_text(Some(&flg!("bottom_search_button_tooltip")));
self.buttons_select.set_tooltip_text(Some(&flg!("bottom_select_button_tooltip")));

View file

@ -58,8 +58,9 @@ impl GuiCompareImages {
let shared_image_cache = Rc::new(RefCell::new(Vec::new()));
let shared_using_for_preview = Rc::new(RefCell::new((None, None)));
set_icon_of_button(&button_go_previous_compare_group, CZK_ICON_LEFT);
set_icon_of_button(&button_go_next_compare_group, CZK_ICON_RIGHT);
// TODO GTK 4
// set_icon_of_button(&button_go_previous_compare_group, CZK_ICON_LEFT);
// set_icon_of_button(&button_go_next_compare_group, CZK_ICON_RIGHT);
Self {
window_compare,

View file

@ -14,8 +14,9 @@ impl GuiHeader {
let button_settings: gtk4::Button = builder.object("button_settings").unwrap();
let button_app_info: gtk4::Button = builder.object("button_app_info").unwrap();
set_icon_of_button(&button_settings, CZK_ICON_SETTINGS);
set_icon_of_button(&button_app_info, CZK_ICON_INFO);
// TODO GTK 4
// set_icon_of_button(&button_settings, CZK_ICON_SETTINGS);
// set_icon_of_button(&button_app_info, CZK_ICON_INFO);
Self { button_settings, button_app_info }
}

View file

@ -47,6 +47,7 @@ impl GuiProgressDialog {
let gc_button_stop_in_dialog = gtk4::GestureClick::new();
button_stop_in_dialog.add_controller(&gc_button_stop_in_dialog);
// TODO GTK 4
set_icon_of_button(&button_stop_in_dialog, CZK_ICON_STOP);
Self {

View file

@ -84,12 +84,13 @@ impl GuiUpperNotebook {
let label_general_min_size: gtk4::Label = builder.object("label_general_min_size").unwrap();
let label_general_max_size: gtk4::Label = builder.object("label_general_max_size").unwrap();
set_icon_of_button(&buttons_add_included_directory, CZK_ICON_ADD);
set_icon_of_button(&buttons_manual_add_included_directory, CZK_ICON_MANUAL_ADD);
set_icon_of_button(&buttons_remove_included_directory, CZK_ICON_DELETE);
set_icon_of_button(&buttons_add_excluded_directory, CZK_ICON_ADD);
set_icon_of_button(&buttons_manual_add_excluded_directory, CZK_ICON_MANUAL_ADD);
set_icon_of_button(&buttons_remove_excluded_directory, CZK_ICON_DELETE);
// TODO GTK 4
// set_icon_of_button(&buttons_add_included_directory, CZK_ICON_ADD);
// set_icon_of_button(&buttons_manual_add_included_directory, CZK_ICON_MANUAL_ADD);
// set_icon_of_button(&buttons_remove_included_directory, CZK_ICON_DELETE);
// set_icon_of_button(&buttons_add_excluded_directory, CZK_ICON_ADD);
// set_icon_of_button(&buttons_manual_add_excluded_directory, CZK_ICON_MANUAL_ADD);
// set_icon_of_button(&buttons_remove_excluded_directory, CZK_ICON_DELETE);
Self {
notebook_upper,

View file

@ -139,7 +139,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
tree_view.set_model(Some(&list_store));
tree_view.selection().set_mode(SelectionMode::Multiple);
tree_view.selection().set_select_function(Some(Box::new(select_function_duplicates)));
tree_view.selection().set_select_function(select_function_duplicates);
create_tree_view_duplicates(&tree_view);
@ -267,7 +267,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
tree_view.set_model(Some(&list_store));
tree_view.selection().set_mode(SelectionMode::Multiple);
tree_view.selection().set_select_function(Some(Box::new(select_function_similar_images)));
tree_view.selection().set_select_function(select_function_similar_images);
create_tree_view_similar_images(&tree_view);
@ -296,7 +296,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
tree_view.set_model(Some(&list_store));
tree_view.selection().set_mode(SelectionMode::Multiple);
tree_view.selection().set_select_function(Some(Box::new(select_function_similar_videos)));
tree_view.selection().set_select_function(select_function_similar_videos);
create_tree_view_similar_videos(&tree_view);
@ -332,7 +332,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
tree_view.set_model(Some(&list_store));
tree_view.selection().set_mode(SelectionMode::Multiple);
tree_view.selection().set_select_function(Some(Box::new(select_function_same_music)));
tree_view.selection().set_select_function(select_function_same_music);
create_tree_view_same_music(&tree_view);