CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-05-01 02:54:05 +12:00
Code Issues Projects Releases Wiki Activity

Simplify a little code (#184)

Browse source
This commit is contained in:
Rafał Mikrut 2021-01-07 22:10:11 +01:00 committed by GitHub
parent 784b5be06a
commit 4bbdbd078d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
czkawka_gui/src/connect_button_delete.rs
View file

@ -97,14 +97,14 @@ pub fn connect_button_delete(gui_data: &GuiData) {
pub fn empty_folder_remover(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
let text_view_errors = gui_data.text_view_errors.clone();
let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let tree_view = get_tree_view(&scrolled_window);
let selection = tree_view.get_selection();
let (selection_rows, tree_model) = selection.get_selected_rows();
if selection_rows.is_empty() {
return;
}
let list_store = tree_model.clone().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window);
// let new_tree_model = TreeModel::new(); // TODO - maybe create new model when inserting a new data, because this seems to be not optimal when using thousands of rows
@ -183,14 +183,14 @@ pub fn empty_folder_remover(scrolled_window: &gtk::ScrolledWindow, column_file_n
pub fn basic_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
let text_view_errors = gui_data.text_view_errors.clone();
let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let tree_view = get_tree_view(&scrolled_window);
let selection = tree_view.get_selection();
let (selection_rows, tree_model) = selection.get_selected_rows();
if selection_rows.is_empty() {
return;
}
let list_store = tree_model.clone().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window);
// let new_tree_model = TreeModel::new(); // TODO - maybe create new model when inserting a new data, because this seems to be not optimal when using thousands of rows
@ -218,14 +218,14 @@ pub fn basic_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32
pub fn tree_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, column_color: i32, gui_data: &GuiData) {
let text_view_errors = gui_data.text_view_errors.clone();
let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let tree_view = get_tree_view(&scrolled_window);
let selection = tree_view.get_selection();
let (selection_rows, tree_model) = selection.get_selected_rows();
if selection_rows.is_empty() {
return;
}
let list_store = tree_model.clone().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window);
// let new_tree_model = TreeModel::new(); // TODO - maybe create new model when inserting a new data, because this seems to be not optimal when using thousands of rows

6
czkawka_gui/src/connect_popovers.rs
View file

@ -453,10 +453,8 @@ fn popover_unselect_custom(popover: &gtk::Popover, gui_data: &GuiData, scrolled_
grid.attach(&entry_name, 1, 2, 1, 1);
grid.attach(&entry_name_path, 1, 3, 1, 1);
for widgets in confirmation_dialog_delete.get_children() {
// By default GtkBox is child of dialog, so we can easily add other things to it
widgets.downcast::<gtk::Box>().unwrap().add(&grid);
}
let box_widget = get_dialog_box_child(&confirmation_dialog_delete);
box_widget.add(&grid);
confirmation_dialog_delete.show_all();

12
czkawka_gui/src/connect_selection_of_directories.rs
View file

@ -31,8 +31,7 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
let text = Common::normalize_windows_path(text).to_string_lossy().to_string();
if !text.is_empty() {
let tree_view = scrolled_window_included_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window_included_directories);
let col_indices = [0];
@ -75,8 +74,7 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
let text = Common::normalize_windows_path(text).to_string_lossy().to_string();
if !text.is_empty() {
let tree_view = scrolled_window_excluded_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window_excluded_directories);
let col_indices = [0];
@ -108,8 +106,7 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
if response_type == gtk::ResponseType::Ok {
let folder = chooser.get_filenames();
let tree_view = scrolled_window_included_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window_included_directories);
let col_indices = [0];
for file_entry in &folder {
@ -138,8 +135,7 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
if response_type == gtk::ResponseType::Ok {
let folder = chooser.get_filenames();
let tree_view = scrolled_window_excluded_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
let list_store = get_list_store(&scrolled_window_excluded_directories);
let col_indices = [0];

3
czkawka_gui/src/help_functions.rs
View file

@ -279,6 +279,9 @@ pub fn get_tree_view(scrolled_window: &gtk::ScrolledWindow) -> TreeView {
tree_view
}
pub fn get_dialog_box_child(dialog: &gtk::Dialog) -> gtk::Box {
dialog.get_children()[0].clone().downcast::<gtk::Box>().unwrap()
}
pub fn change_dimension_to_krotka(dimensions: String) -> (u64, u64) {
#[allow(clippy::single_char_pattern)]