From c62617df30b63c859e10eed7a69f4f1f900c9305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Mon, 9 Nov 2020 15:50:28 +0100 Subject: [PATCH] Release 1.4.0 --- Cargo.lock | 32 ++++++++++++------------ Changelog.md | 8 ++++++ czkawka_cli/Cargo.toml | 2 +- czkawka_core/Cargo.toml | 2 +- czkawka_gui/Cargo.toml | 2 +- czkawka_gui/src/connect_button_delete.rs | 10 +++++--- czkawka_gui_orbtk/Cargo.toml | 2 +- misc/cargo/PublishCore.sh | 2 +- misc/cargo/PublishOther.sh | 2 +- 9 files changed, 36 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c8bc1b..e2e9e54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" [[package]] name = "approx" @@ -118,9 +118,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base-x" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] name = "base64" @@ -233,9 +233,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" [[package]] name = "cfg-if" @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "czkawka_cli" -version = "1.3.0" +version = "1.4.0" dependencies = [ "czkawka_core", "structopt", @@ -411,7 +411,7 @@ dependencies = [ [[package]] name = "czkawka_core" -version = "1.3.0" +version = "1.4.0" dependencies = [ "audiotags", "bitflags", @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "czkawka_gui" -version = "1.3.0" +version = "1.4.0" dependencies = [ "chrono", "crossbeam-channel 0.4.4", @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "czkawka_gui_orbtk" -version = "1.3.0" +version = "1.4.0" dependencies = [ "czkawka_core", "orbtk", @@ -1270,9 +1270,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6d5f418879385b213d905f7cf5bf4aa553d4c380f0152d1d4f2749186fa9" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -2258,18 +2258,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", diff --git a/Changelog.md b/Changelog.md index b308651..4eaf2d6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,11 @@ +## Version 1.4.0 - 09.11.2020r +- Multithreading Support to most modules - [#98](https://github.com/qarmin/czkawka/pull/98) [#99](https://github.com/qarmin/czkawka/pull/99) [#100](https://github.com/qarmin/czkawka/pull/100) [#101](https://github.com/qarmin/czkawka/pull/101) +- Simplify GUI code [#96](https://github.com/qarmin/czkawka/pull/96) +- Group similar images - [#97](https://github.com/qarmin/czkawka/pull/97) +- Add select buttons to each type of mode - [#102](https://github.com/qarmin/czkawka/pull/102) +- Fix GUI behavior in GUI when deleting similar image - [#103](https://github.com/qarmin/czkawka/pull/103) +- Add new similarity level - [#104](https://github.com/qarmin/czkawka/pull/104) + ## Version 1.3.0 - 02.11.2020r - Appimage support - [#77](https://github.com/qarmin/czkawka/pull/77) - Removed warnings about non existend excluded directories - [#79](https://github.com/qarmin/czkawka/pull/79) diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml index d66a789..19d9b79 100644 --- a/czkawka_cli/Cargo.toml +++ b/czkawka_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_cli" -version = "1.3.0" +version = "1.4.0" authors = ["Rafał Mikrut "] edition = "2018" description = "CLI frontend of Czkawka" diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index 3b62c96..57f9d8f 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_core" -version = "1.3.0" +version = "1.4.0" authors = ["Rafał Mikrut "] edition = "2018" description = "Core of Czkawka app" diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 976398a..1b90d7f 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_gui" -version = "1.3.0" +version = "1.4.0" authors = ["Rafał Mikrut "] edition = "2018" description = "GTK frontend of Czkawka" diff --git a/czkawka_gui/src/connect_button_delete.rs b/czkawka_gui/src/connect_button_delete.rs index 973cdba..6320313 100644 --- a/czkawka_gui/src/connect_button_delete.rs +++ b/czkawka_gui/src/connect_button_delete.rs @@ -275,13 +275,13 @@ fn tree_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, colu next_iter = current_iter.clone(); if !list_store.iter_next(&next_iter) { - // There is only single header + // There is only single header left (H1 -> END) -> (NOTHING) vec_tree_path_to_delete.push(list_store.get_path(¤t_iter).unwrap()); break 'main; } if tree_model.get_value(&next_iter, column_color).get::().unwrap().unwrap() == HEADER_ROW_COLOR { - // Only two headers + // There are two headers each others(we remove just first) -> (H1 -> H2) -> (H2) vec_tree_path_to_delete.push(list_store.get_path(¤t_iter).unwrap()); current_iter = next_iter.clone(); continue 'main; @@ -289,14 +289,14 @@ fn tree_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, colu next_next_iter = next_iter.clone(); if !list_store.iter_next(&next_next_iter) { - // There is only one child or two headers + // There is only one child of header left, so we remove it with header (H1 -> C1 -> END) -> (NOTHING) vec_tree_path_to_delete.push(list_store.get_path(¤t_iter).unwrap()); vec_tree_path_to_delete.push(list_store.get_path(&next_iter).unwrap()); break 'main; } if tree_model.get_value(&next_next_iter, column_color).get::().unwrap().unwrap() == HEADER_ROW_COLOR { - // Only one child or two headers - but still are later files + // One child between two headers, we can remove them (H1 -> C1 -> H2) -> (H2) vec_tree_path_to_delete.push(list_store.get_path(¤t_iter).unwrap()); vec_tree_path_to_delete.push(list_store.get_path(&next_iter).unwrap()); current_iter = next_next_iter.clone(); @@ -304,9 +304,11 @@ fn tree_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, colu } loop { + // (H1 -> C1 -> C2 -> Cn -> END) -> (NO CHANGE, BECAUSE IS GOOD) if !list_store.iter_next(&next_next_iter) { break 'main; } + // Move to next header if tree_model.get_value(&next_next_iter, column_color).get::().unwrap().unwrap() == HEADER_ROW_COLOR { current_iter = next_next_iter.clone(); continue 'main; diff --git a/czkawka_gui_orbtk/Cargo.toml b/czkawka_gui_orbtk/Cargo.toml index 61452b5..051b1b4 100644 --- a/czkawka_gui_orbtk/Cargo.toml +++ b/czkawka_gui_orbtk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "czkawka_gui_orbtk" -version = "1.3.0" +version = "1.4.0" authors = ["Rafał Mikrut "] edition = "2018" description = "Orbtk frontend of Czkawka" diff --git a/misc/cargo/PublishCore.sh b/misc/cargo/PublishCore.sh index ec694f4..ed819c2 100755 --- a/misc/cargo/PublishCore.sh +++ b/misc/cargo/PublishCore.sh @@ -1,5 +1,5 @@ #!/bin/bash -NUMBER="1.3.0" +NUMBER="1.4.0" CZKAWKA_PATH="/home/rafal" cd "$CZKAWKA_PATH" diff --git a/misc/cargo/PublishOther.sh b/misc/cargo/PublishOther.sh index 465547b..77deaa4 100755 --- a/misc/cargo/PublishOther.sh +++ b/misc/cargo/PublishOther.sh @@ -1,5 +1,5 @@ #!/bin/bash -NUMBER="1.3.0" +NUMBER="1.4.0" CZKAWKA_PATH="/home/rafal" cd "$CZKAWKA_PATH"