From 4b6cf4bc9d475cd85d42680891a00f62f362aa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Tue, 9 May 2023 17:38:33 +0200 Subject: [PATCH] Simplify creating tree_view --- czkawka_core/src/bad_extensions.rs | 1 + czkawka_gui/src/create_tree_view.rs | 548 +++++----------------------- 2 files changed, 101 insertions(+), 448 deletions(-) diff --git a/czkawka_core/src/bad_extensions.rs b/czkawka_core/src/bad_extensions.rs index 215a318..a3f7968 100644 --- a/czkawka_core/src/bad_extensions.rs +++ b/czkawka_core/src/bad_extensions.rs @@ -124,6 +124,7 @@ const WORKAROUNDS: &[(&str, &str)] = &[ ("xml", "vbox"), // VirtualBox ("xml", "vbox-prev"), // VirtualBox ("xml", "vcproj"), // VisualStudio + ("xml", "vcxproj"), // VisualStudio ("xml", "xba"), // Libreoffice ("xml", "xcd"), // Libreoffice files ("zip", "apk"), // Android apk diff --git a/czkawka_gui/src/create_tree_view.rs b/czkawka_gui/src/create_tree_view.rs index 604b9f1..b724d6e 100644 --- a/czkawka_gui/src/create_tree_view.rs +++ b/czkawka_gui/src/create_tree_view.rs @@ -1,5 +1,4 @@ use gtk4::prelude::*; -use gtk4::subclass::tree_view; use gtk4::{CellRendererText, CellRendererToggle, ListStore, TreeView, TreeViewColumn}; use crate::help_functions::*; @@ -9,466 +8,119 @@ use crate::help_functions::*; pub fn create_tree_view_included_directories(tree_view: &TreeView) { let model = get_list_store(tree_view); - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.set_title("Folders to check"); - column.pack_start(&renderer, true); - column.add_attribute(&renderer, "text", ColumnsIncludedDirectory::Path as i32); - tree_view.append_column(&column); - - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsIncludedDirectory::ReferenceButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsIncludedDirectory::ReferenceButton as u32, &fixed.to_value()); - }); - renderer.set_activatable(true); - let column = TreeViewColumn::new(); - column.set_title("Reference folder"); - column.pack_start(&renderer, true); - column.add_attribute(&renderer, "active", ColumnsIncludedDirectory::ReferenceButton as i32); - tree_view.append_column(&column); + create_default_column(tree_view, ColumnsIncludedDirectory::Path as i32, None, None); + create_default_selection_button_column(tree_view, ColumnsIncludedDirectory::ReferenceButton as i32, model, None); } pub fn create_tree_view_excluded_directories(tree_view: &TreeView) { - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.add_attribute(&renderer, "text", ColumnsExcludedDirectory::Path as i32); - tree_view.append_column(&column); - tree_view.set_headers_visible(false); + create_default_column(tree_view, ColumnsExcludedDirectory::Path as i32, None, None); } pub fn create_tree_view_duplicates(tree_view: &TreeView) { - let model = get_list_store(tree_view); - - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsDuplicates::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsDuplicates::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "activatable", ColumnsDuplicates::ActivatableSelectButton as i32); - column.add_attribute(&renderer, "active", ColumnsDuplicates::SelectionButton as i32); - column.add_attribute(&renderer, "cell-background", ColumnsDuplicates::Color as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Size"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsDuplicates::Size as i32); - column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsDuplicates::Name as i32); - column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsDuplicates::Path as i32); - column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsDuplicates::Modification as i32); - column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32); - tree_view.append_column(&column); - tree_view.set_vexpand(true); + + let model = get_list_store(tree_view); + let columns_colors = (ColumnsDuplicates::Color as i32, ColumnsDuplicates::TextColor as i32); + let activatable_colors = (ColumnsDuplicates::ActivatableSelectButton as i32, ColumnsDuplicates::Color as i32); + + create_default_selection_button_column(tree_view, ColumnsDuplicates::SelectionButton as i32, model, Some(activatable_colors)); + + create_default_column(tree_view, ColumnsDuplicates::Size as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsDuplicates::Name as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsDuplicates::Path as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsDuplicates::Modification as i32, None, Some(columns_colors)); } pub fn create_tree_view_empty_folders(tree_view: &TreeView) { + tree_view.set_vexpand(true); + let model = get_list_store(tree_view); - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsEmptyFolders::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsEmptyFolders::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "active", ColumnsEmptyFolders::SelectionButton as i32); - tree_view.append_column(&column); + create_default_selection_button_column(tree_view, ColumnsEmptyFolders::SelectionButton as i32, model, None); - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Folder Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFolders::Name as i32); - column.set_sort_column_id(ColumnsEmptyFolders::Name as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFolders::Path as i32); - column.set_sort_column_id(ColumnsEmptyFolders::Path as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFolders::Modification as i32); - column.set_sort_column_id(ColumnsEmptyFolders::ModificationAsSecs as i32); - tree_view.append_column(&column); - - tree_view.set_vexpand(true); + create_default_column(tree_view, ColumnsEmptyFolders::Name as i32, None, None); + create_default_column(tree_view, ColumnsEmptyFolders::Path as i32, None, None); + create_default_column( + tree_view, + ColumnsEmptyFolders::Modification as i32, + Some(ColumnsEmptyFolders::ModificationAsSecs as i32), + None, + ); } pub fn create_tree_view_big_files(tree_view: &TreeView) { + tree_view.set_vexpand(true); + let model = get_list_store(tree_view); - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsBigFiles::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsBigFiles::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "active", ColumnsBigFiles::SelectionButton as i32); - tree_view.append_column(&column); + create_default_selection_button_column(tree_view, ColumnsBigFiles::SelectionButton as i32, model, None); - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Size"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsBigFiles::Size as i32); - column.set_sort_column_id(ColumnsBigFiles::SizeAsBytes as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsBigFiles::Name as i32); - column.set_sort_column_id(ColumnsBigFiles::Name as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsBigFiles::Path as i32); - column.set_sort_column_id(ColumnsBigFiles::Path as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsBigFiles::Modification as i32); - column.set_sort_column_id(ColumnsBigFiles::ModificationAsSecs as i32); - tree_view.append_column(&column); - - tree_view.set_vexpand(true); + create_default_column(tree_view, ColumnsBigFiles::Size as i32, None, None); + create_default_column(tree_view, ColumnsBigFiles::Name as i32, None, None); + create_default_column(tree_view, ColumnsBigFiles::Path as i32, None, None); + create_default_column(tree_view, ColumnsBigFiles::Modification as i32, Some(ColumnsBigFiles::ModificationAsSecs as i32), None); } pub fn create_tree_view_temporary_files(tree_view: &TreeView) { + tree_view.set_vexpand(true); + let model = get_list_store(tree_view); - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsTemporaryFiles::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsTemporaryFiles::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "active", ColumnsTemporaryFiles::SelectionButton as i32); - tree_view.append_column(&column); + create_default_selection_button_column(tree_view, ColumnsTemporaryFiles::SelectionButton as i32, model, None); - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsTemporaryFiles::Name as i32); - column.set_sort_column_id(ColumnsTemporaryFiles::Name as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsTemporaryFiles::Path as i32); - column.set_sort_column_id(ColumnsTemporaryFiles::Path as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsTemporaryFiles::Modification as i32); - column.set_sort_column_id(ColumnsTemporaryFiles::ModificationAsSecs as i32); - tree_view.append_column(&column); - - tree_view.set_vexpand(true); + create_default_column(tree_view, ColumnsTemporaryFiles::Name as i32, None, None); + create_default_column(tree_view, ColumnsTemporaryFiles::Path as i32, None, None); + create_default_column( + tree_view, + ColumnsTemporaryFiles::Modification as i32, + Some(ColumnsTemporaryFiles::ModificationAsSecs as i32), + None, + ); } pub fn create_tree_view_empty_files(tree_view: &TreeView) { + tree_view.set_vexpand(true); + let model = get_list_store(tree_view); - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsEmptyFiles::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsEmptyFiles::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "active", ColumnsEmptyFiles::SelectionButton as i32); - tree_view.append_column(&column); + create_default_selection_button_column(tree_view, ColumnsEmptyFiles::SelectionButton as i32, model, None); - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFiles::Name as i32); - column.set_sort_column_id(ColumnsEmptyFiles::Name as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFiles::Path as i32); - column.set_sort_column_id(ColumnsEmptyFiles::Path as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsEmptyFiles::Modification as i32); - column.set_sort_column_id(ColumnsEmptyFiles::ModificationAsSecs as i32); - tree_view.append_column(&column); - - tree_view.set_vexpand(true); + create_default_column(tree_view, ColumnsEmptyFiles::Name as i32, None, None); + create_default_column(tree_view, ColumnsEmptyFiles::Path as i32, None, None); + create_default_column(tree_view, ColumnsEmptyFiles::Modification as i32, Some(ColumnsEmptyFiles::ModificationAsSecs as i32), None); } pub fn create_tree_view_similar_images(tree_view: &TreeView) { - let model = get_list_store(tree_view); - - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsSimilarImages::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsSimilarImages::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "activatable", ColumnsSimilarImages::ActivatableSelectButton as i32); - column.add_attribute(&renderer, "active", ColumnsSimilarImages::SelectionButton as i32); - column.add_attribute(&renderer, "cell-background", ColumnsSimilarImages::Color as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Similarity"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Similarity as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Size"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Size as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Dimensions"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Dimensions as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Name as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Path as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarImages::Modification as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarImages::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarImages::TextColor as i32); - tree_view.append_column(&column); - tree_view.set_vexpand(true); + + let model = get_list_store(tree_view); + let columns_colors = (ColumnsSimilarImages::Color as i32, ColumnsSimilarImages::TextColor as i32); + let activatable_colors = (ColumnsSimilarImages::ActivatableSelectButton as i32, ColumnsSimilarImages::Color as i32); + + create_default_selection_button_column(tree_view, ColumnsSimilarImages::SelectionButton as i32, model, Some(activatable_colors)); + + create_default_column(tree_view, ColumnsSimilarImages::Similarity as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarImages::Size as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarImages::Dimensions as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarImages::Name as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarImages::Path as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarImages::Modification as i32, None, Some(columns_colors)); } pub fn create_tree_view_similar_videos(tree_view: &TreeView) { - let model = get_list_store(tree_view); - - let renderer = CellRendererToggle::new(); - renderer.connect_toggled(move |_r, path| { - let iter = model.iter(&path).unwrap(); - let mut fixed = model.get::(&iter, ColumnsSimilarVideos::SelectionButton as i32); - fixed = !fixed; - model.set_value(&iter, ColumnsSimilarVideos::SelectionButton as u32, &fixed.to_value()); - }); - let column = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_resizable(false); - column.set_fixed_width(30); - column.add_attribute(&renderer, "activatable", ColumnsSimilarVideos::ActivatableSelectButton as i32); - column.add_attribute(&renderer, "active", ColumnsSimilarVideos::SelectionButton as i32); - column.add_attribute(&renderer, "cell-background", ColumnsSimilarVideos::Color as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Size"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarVideos::Size as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarVideos::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarVideos::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("File Name"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarVideos::Name as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarVideos::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarVideos::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Path"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarVideos::Path as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarVideos::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarVideos::TextColor as i32); - tree_view.append_column(&column); - - let renderer = CellRendererText::new(); - let column: TreeViewColumn = TreeViewColumn::new(); - column.pack_start(&renderer, true); - column.set_title("Modification Date"); - column.set_resizable(true); - column.set_min_width(50); - column.add_attribute(&renderer, "text", ColumnsSimilarVideos::Modification as i32); - column.add_attribute(&renderer, "background", ColumnsSimilarVideos::Color as i32); - column.add_attribute(&renderer, "foreground", ColumnsSimilarVideos::TextColor as i32); - tree_view.append_column(&column); - tree_view.set_vexpand(true); + + let model = get_list_store(tree_view); + let columns_colors = (ColumnsSimilarVideos::Color as i32, ColumnsSimilarVideos::TextColor as i32); + let activatable_colors = (ColumnsSimilarVideos::ActivatableSelectButton as i32, ColumnsSimilarVideos::Color as i32); + + create_default_selection_button_column(tree_view, ColumnsSimilarVideos::SelectionButton as i32, model, Some(activatable_colors)); + + create_default_column(tree_view, ColumnsSimilarVideos::Size as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarVideos::Name as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarVideos::Path as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSimilarVideos::Modification as i32, None, Some(columns_colors)); } pub fn create_tree_view_same_music(tree_view: &TreeView) { @@ -478,18 +130,18 @@ pub fn create_tree_view_same_music(tree_view: &TreeView) { let columns_colors = (ColumnsSameMusic::Color as i32, ColumnsSameMusic::TextColor as i32); let activatable_colors = (ColumnsSameMusic::ActivatableSelectButton as i32, ColumnsSameMusic::Color as i32); - create_default_selection_button_column(&tree_view, ColumnsSameMusic::SelectionButton as i32, model, Some(activatable_colors)); + create_default_selection_button_column(tree_view, ColumnsSameMusic::SelectionButton as i32, model, Some(activatable_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Size as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Name as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Title as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Artist as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Year as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Bitrate as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Length as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Genre as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Path as i32, None, Some(columns_colors)); - create_default_column(&tree_view, ColumnsSameMusic::Modification as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Size as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Name as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Title as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Artist as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Year as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Bitrate as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Length as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Genre as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Path as i32, None, Some(columns_colors)); + create_default_column(tree_view, ColumnsSameMusic::Modification as i32, None, Some(columns_colors)); } pub fn create_tree_view_invalid_symlinks(tree_view: &TreeView) { @@ -497,14 +149,14 @@ pub fn create_tree_view_invalid_symlinks(tree_view: &TreeView) { let model = get_list_store(tree_view); - create_default_selection_button_column(&tree_view, ColumnsInvalidSymlinks::SelectionButton as i32, model, None); + create_default_selection_button_column(tree_view, ColumnsInvalidSymlinks::SelectionButton as i32, model, None); - create_default_column(&tree_view, ColumnsInvalidSymlinks::Name as i32, None, None); - create_default_column(&tree_view, ColumnsInvalidSymlinks::Path as i32, None, None); - create_default_column(&tree_view, ColumnsInvalidSymlinks::DestinationPath as i32, None, None); - create_default_column(&tree_view, ColumnsInvalidSymlinks::TypeOfError as i32, None, None); + create_default_column(tree_view, ColumnsInvalidSymlinks::Name as i32, None, None); + create_default_column(tree_view, ColumnsInvalidSymlinks::Path as i32, None, None); + create_default_column(tree_view, ColumnsInvalidSymlinks::DestinationPath as i32, None, None); + create_default_column(tree_view, ColumnsInvalidSymlinks::TypeOfError as i32, None, None); create_default_column( - &tree_view, + tree_view, ColumnsInvalidSymlinks::Modification as i32, Some(ColumnsInvalidSymlinks::ModificationAsSecs as i32), None, @@ -516,13 +168,13 @@ pub fn create_tree_view_broken_files(tree_view: &TreeView) { let model = get_list_store(tree_view); - create_default_selection_button_column(&tree_view, ColumnsBrokenFiles::SelectionButton as i32, model, None); + create_default_selection_button_column(tree_view, ColumnsBrokenFiles::SelectionButton as i32, model, None); - create_default_column(&tree_view, ColumnsBrokenFiles::Name as i32, None, None); - create_default_column(&tree_view, ColumnsBrokenFiles::Path as i32, None, None); - create_default_column(&tree_view, ColumnsBrokenFiles::ErrorType as i32, None, None); + create_default_column(tree_view, ColumnsBrokenFiles::Name as i32, None, None); + create_default_column(tree_view, ColumnsBrokenFiles::Path as i32, None, None); + create_default_column(tree_view, ColumnsBrokenFiles::ErrorType as i32, None, None); create_default_column( - &tree_view, + tree_view, ColumnsBrokenFiles::Modification as i32, Some(ColumnsBrokenFiles::ModificationAsSecs as i32), None, @@ -534,12 +186,12 @@ pub fn create_tree_view_bad_extensions(tree_view: &TreeView) { let model = get_list_store(tree_view); - create_default_selection_button_column(&tree_view, ColumnsBadExtensions::SelectionButton as i32, model, None); + create_default_selection_button_column(tree_view, ColumnsBadExtensions::SelectionButton as i32, model, None); - create_default_column(&tree_view, ColumnsBadExtensions::Name as i32, None, None); - create_default_column(&tree_view, ColumnsBadExtensions::Path as i32, None, None); - create_default_column(&tree_view, ColumnsBadExtensions::CurrentExtension as i32, None, None); - create_default_column(&tree_view, ColumnsBadExtensions::ValidExtensions as i32, None, None); + create_default_column(tree_view, ColumnsBadExtensions::Name as i32, None, None); + create_default_column(tree_view, ColumnsBadExtensions::Path as i32, None, None); + create_default_column(tree_view, ColumnsBadExtensions::CurrentExtension as i32, None, None); + create_default_column(tree_view, ColumnsBadExtensions::ValidExtensions as i32, None, None); } fn create_default_selection_button_column(