CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-05-14 17:33:48 +12:00
Code Issues Projects Releases Wiki Activity

Fixes not visible colors in light theme

Browse source
This commit is contained in:
Rafał Mikrut 2020-10-01 15:25:58 +02:00
parent 000e4ad46b
commit f05bce615a
2 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
czkawka_gui/src/help_functions.rs
View file

@ -9,20 +9,21 @@ pub enum ColumnsDuplicates {
Modification,
ModificationAsSecs,
Color,
TextColor,
}
pub enum ColumnsEmpty {
// Columns for duplicate and empty folder treeview
Name = 0,
Path,
Modification,
Color,
}
pub enum ColumnsDirectory {
// Columns for Included and Excluded Directories in upper Notebook
Path = 0,
Color,
}
pub const TEXT_COLOR: &str = "#ffffff";
pub const MAIN_ROW_COLOR: &str = "#343434";
pub const HEADER_ROW_COLOR: &str = "#272727";
//pub const MAIN_ROW_COLOR: &str = "#f4f434"; // TEST
@ -37,6 +38,7 @@ pub fn create_tree_view_duplicates(tree_view_duplicate_finder: &mut gtk::TreeVie
name_column.set_min_width(50);
name_column.add_attribute(&renderer, "text", ColumnsDuplicates::Name as i32);
name_column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32);
name_column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32);
tree_view_duplicate_finder.append_column(&name_column);
let renderer = gtk::CellRendererText::new();
@ -47,6 +49,7 @@ pub fn create_tree_view_duplicates(tree_view_duplicate_finder: &mut gtk::TreeVie
path_column.set_min_width(100);
path_column.add_attribute(&renderer, "text", ColumnsDuplicates::Path as i32);
path_column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32);
path_column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32);
tree_view_duplicate_finder.append_column(&path_column);
let renderer = gtk::CellRendererText::new();
@ -57,6 +60,7 @@ pub fn create_tree_view_duplicates(tree_view_duplicate_finder: &mut gtk::TreeVie
modification_date_column.set_min_width(100);
modification_date_column.add_attribute(&renderer, "text", ColumnsDuplicates::Modification as i32);
modification_date_column.add_attribute(&renderer, "background", ColumnsDuplicates::Color as i32);
modification_date_column.add_attribute(&renderer, "foreground", ColumnsDuplicates::TextColor as i32);
tree_view_duplicate_finder.append_column(&modification_date_column);
tree_view_duplicate_finder.set_vexpand(true);
@ -70,7 +74,6 @@ pub fn create_tree_view_empty_folders(tree_view_empty_folder_finder: &mut gtk::T
name_column.set_resizable(true);
name_column.set_min_width(50);
name_column.add_attribute(&renderer, "text", ColumnsEmpty::Name as i32);
name_column.add_attribute(&renderer, "background", ColumnsEmpty::Color as i32);
tree_view_empty_folder_finder.append_column(&name_column);
let renderer = gtk::CellRendererText::new();
@ -80,7 +83,6 @@ pub fn create_tree_view_empty_folders(tree_view_empty_folder_finder: &mut gtk::T
path_column.set_resizable(true);
path_column.set_min_width(100);
path_column.add_attribute(&renderer, "text", ColumnsEmpty::Path as i32);
path_column.add_attribute(&renderer, "background", ColumnsEmpty::Color as i32);
tree_view_empty_folder_finder.append_column(&path_column);
let renderer = gtk::CellRendererText::new();
@ -90,7 +92,6 @@ pub fn create_tree_view_empty_folders(tree_view_empty_folder_finder: &mut gtk::T
modification_date_column.set_resizable(true);
modification_date_column.set_min_width(100);
modification_date_column.add_attribute(&renderer, "text", ColumnsEmpty::Modification as i32);
modification_date_column.add_attribute(&renderer, "background", ColumnsEmpty::Color as i32);
tree_view_empty_folder_finder.append_column(&modification_date_column);
tree_view_empty_folder_finder.set_vexpand(true);
@ -101,7 +102,6 @@ pub fn create_tree_view_directories(tree_view_directories: &mut gtk::TreeView) {
let name_column: gtk::TreeViewColumn = TreeViewColumn::new();
name_column.pack_start(&renderer, true);
name_column.add_attribute(&renderer, "text", ColumnsDirectory::Path as i32);
name_column.add_attribute(&renderer, "background", ColumnsDirectory::Color as i32);
tree_view_directories.append_column(&name_column);
tree_view_directories.set_headers_visible(false);

56
czkawka_gui/src/main.rs
View file

@ -149,7 +149,14 @@ fn main() {
{
// Duplicate Files
{
let col_types: [glib::types::Type; 5] = [glib::types::Type::String, glib::types::Type::String, glib::types::Type::String, glib::types::Type::U64, glib::types::Type::String];
let col_types: [glib::types::Type; 6] = [
glib::types::Type::String,
glib::types::Type::String,
glib::types::Type::String,
glib::types::Type::U64,
glib::types::Type::String,
glib::types::Type::String,
];
let list_store: gtk::ListStore = gtk::ListStore::new(&col_types);
let mut tree_view: gtk::TreeView = TreeView::with_model(&list_store);
@ -191,7 +198,15 @@ fn main() {
let col_indices = [0, 1];
let values: [&dyn ToValue; 2] = [&("/home/rafal/Pulpit"), &(MAIN_ROW_COLOR.to_string())];
let current_dir: String = match env::current_dir() {
Ok(t) => t.to_str().unwrap().to_string(),
Err(_) => {
println!("Failed to read current directory, setting /home instead");
"/home".to_string()
}
};
let values: [&dyn ToValue; 2] = [&current_dir, &(MAIN_ROW_COLOR.to_string())];
list_store.set(&list_store.append(), &col_indices, &values);
scrolled_window_included_directories.add(&tree_view_included_directory);
@ -210,7 +225,7 @@ fn main() {
let col_indices = [0, 1];
for i in ["/proc", "/dev"].iter() {
for i in ["/proc", "/dev", "/sys"].iter() {
let values: [&dyn ToValue; 2] = [&i, &(MAIN_ROW_COLOR.to_string())];
list_store.set(&list_store.append(), &col_indices, &values);
}
@ -387,7 +402,7 @@ fn main() {
.unwrap();
list_store.clear();
let col_indices = [0, 1, 2, 3, 4];
let col_indices = [0, 1, 2, 3, 4, 5];
match check_method {
CheckingMethod::Hash | CheckingMethod::HashMB => {
@ -395,24 +410,26 @@ fn main() {
for (size, vectors_vector) in btreemap.iter().rev() {
for vector in vectors_vector {
let values: [&dyn ToValue; 5] = [
let values: [&dyn ToValue; 6] = [
&(vector.len().to_string() + " x " + size.to_string().as_str()),
&("(".to_string() + ((vector.len() - 1) as u64 * *size as u64).to_string().as_str() + ")"),
&"Bytes lost".to_string(),
&(0), // Not used
&(0), // Not used here
&(HEADER_ROW_COLOR.to_string()),
&(TEXT_COLOR.to_string()),
];
list_store.set(&list_store.append(), &col_indices, &values);
for entry in vector {
let path = &entry.path;
let index = path.rfind('/').unwrap();
let values: [&dyn ToValue; 5] = [
let values: [&dyn ToValue; 6] = [
&(path[index + 1..].to_string()),
&(path[..index].to_string()),
&(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()),
&(entry.modified_date),
&(MAIN_ROW_COLOR.to_string()),
&(TEXT_COLOR.to_string()),
];
list_store.set(&list_store.append(), &col_indices, &values);
}
@ -423,22 +440,26 @@ fn main() {
let btreemap = df.get_files_sorted_by_size();
for (size, vector) in btreemap.iter().rev() {
let values: [&dyn ToValue; 4] = [
let values: [&dyn ToValue; 6] = [
&(vector.len().to_string() + " x " + size.to_string().as_str()),
&("(".to_string() + ((vector.len() - 1) as u64 * *size as u64).to_string().as_str() + ")"),
&"Bytes lost".to_string(),
&(0), // Not used here
&(HEADER_ROW_COLOR.to_string()),
&(TEXT_COLOR.to_string()),
];
list_store.set(&list_store.append(), &col_indices, &values);
for entry in vector {
let path = &entry.path;
let index = path.rfind('/').unwrap();
let values: [&dyn ToValue; 4] = [
let values: [&dyn ToValue; 6] = [
&(path[index + 1..].to_string()),
&(path[..index].to_string()),
&(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()),
&(entry.modified_date),
&(MAIN_ROW_COLOR.to_string()),
&(TEXT_COLOR.to_string()),
];
list_store.set(&list_store.append(), &col_indices, &values);
}
@ -504,19 +525,14 @@ fn main() {
.unwrap();
list_store.clear();
let col_indices = [0, 1, 2, 3];
let col_indices = [0, 1, 2];
let hashmap = ef.get_empty_folder_list();
for (name, entry) in hashmap {
let name: String = name[..(name.len() - 1)].to_string();
let index = name.rfind('/').unwrap();
let values: [&dyn ToValue; 4] = [
&(name[index + 1..].to_string()),
&(name[..index].to_string()),
&(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()),
&(MAIN_ROW_COLOR.to_string()),
];
let values: [&dyn ToValue; 3] = [&(name[index + 1..].to_string()), &(name[..index].to_string()), &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string())];
list_store.set(&list_store.append(), &col_indices, &values);
}
print_text_messages_to_text_view(&text_messages, &text_view_errors);
@ -993,9 +1009,9 @@ fn main() {
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 col_indices = [0, 1];
let col_indices = [0];
let values: [&dyn ToValue; 2] = [&folder, &(MAIN_ROW_COLOR.to_string())];
let values: [&dyn ToValue; 1] = [&folder];
list_store.set(&list_store.append(), &col_indices, &values);
}
chooser.close();
@ -1020,9 +1036,9 @@ fn main() {
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 col_indices = [0, 1];
let col_indices = [0];
let values: [&dyn ToValue; 2] = [&folder, &(MAIN_ROW_COLOR.to_string())];
let values: [&dyn ToValue; 1] = [&folder];
list_store.set(&list_store.append(), &col_indices, &values);
}
chooser.close();