Version 8.0.0 (#1366)

qarmin · Oct 11, 2024 · db164d3 · db164d3
1 parent 0f494da
commit db164d3
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 53 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,12 +9,12 @@ assignees: ''
 
 **Bug Description**
 
-
 **Steps to reproduce:**
 <!-- Please describe what you expected to see and what you saw instead. Also include screenshots or screencasts if needed. -->
 
 
 **Terminal output** (optional):
+
 ```
 <!--
 Add terminal output only if needed - if there are some errors or warnings or you have performance/freeze issues.  
@@ -30,10 +30,9 @@ Very helpful in this situation will be logs from czkawka run with RUST_LOG envir
 </details>
 ```
 
-
 **System**
 
-- Czkawka/Krokiet version: <!--  e.g. 7.0.0 cli/gui -->
+- Czkawka/Krokiet version: <!--  e.g. 8.0.0 cli/gui -->
 - OS version: <!--  e.g Ubuntu 22.04, Windows 11, Mac 15.1 ARM -->
 - Installation method: <!-- e.g. github binaries, snap, flatpak, msys2 -->
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,4 @@
-## Version 8.0.0 - ?
+## Version 8.0.0 - 11.10.2024r
 
 ### Breaking changes
 
@@ -63,6 +63,7 @@
 - Added option to use external libraries instead gtk pixbuf loader for
   previews - [#1358](https://github.com/qarmin/czkawka/pull/1358)
 - Using static runtime with zstd compression in appimage - [#1350](https://github.com/qarmin/czkawka/pull/1355)
+- Restoring flatpak builds - [#1275](https://github.com/qarmin/czkawka/pull/1275)
 - [External] Mac homebrew version of app - https://formulae.brew.sh/formula/czkawka
 
 ### CLI

diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ files from your computer.
     - Broken Files - Finds files that are invalid or corrupted
     - Bad Extensions - Lists files whose content not match with their extension
 
-![Czkawka](https://user-images.githubusercontent.com/41945903/145280350-506f7e94-4db0-4de7-a68d-6e7c26bbd2bf.gif)
+![Czkawka](https://github.com/user-attachments/assets/b0409515-1bec-4e13-8fac-7bdfa15f5848)
 
-![Krokiet](https://github.com/qarmin/czkawka/assets/41945903/52628a29-ecd6-4692-9ee4-8a680c889193)
+![Krokiet](https://github.com/user-attachments/assets/906cbbc3-f011-4306-81da-9e4e53b49a9f)
 
 Changelog and new releases can be found in [Github releases](https://github.com/qarmin/czkawka/releases) or
 in [CHANGELOG.md](CHANGELOG.md).

diff --git a/ci_tester/src/main.rs b/ci_tester/src/main.rs
@@ -35,7 +35,6 @@ fn main() {
     CZKAWKA_PATH.set(path_to_czkawka);
 
     test_args();
-    return;
     remove_test_dir();
     run_with_good_status(&["ls"], false);
     unzip_files();

diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "czkawka_cli"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Rafał Mikrut <[email protected]>"]
 edition = "2021"
 rust-version = "1.79.0"
@@ -18,7 +18,7 @@ image_hasher = "2.0"
 log = "0.4.22"
 handsome_logger = "0.8"
 fun_time = { version = "0.3", features = ["log"] }
-czkawka_core = { path = "../czkawka_core", version = "7.0.0", features = [] }
+czkawka_core = { path = "../czkawka_core", version = "8.0.0", features = [] }
 indicatif = "0.17"
 crossbeam-channel = { version = "0.5", features = [] }
 ctrlc = { version = "3.4", features = ["termination"] }

diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "czkawka_core"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Rafał Mikrut <[email protected]>"]
 edition = "2021"
 rust-version = "1.79.0"

diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "czkawka_gui"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Rafał Mikrut <[email protected]>"]
 edition = "2021"
 rust-version = "1.79.0"
@@ -52,7 +52,7 @@ handsome_logger = "0.8"
 fun_time = { version = "0.3", features = ["log"] }
 rayon = "1.10"
 
-czkawka_core = { path = "../czkawka_core", version = "7.0.0", features = [] }
+czkawka_core = { path = "../czkawka_core", version = "8.0.0", features = [] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] }

diff --git a/czkawka_gui/i18n/en/czkawka_gui.ftl b/czkawka_gui/i18n/en/czkawka_gui.ftl
@@ -286,6 +286,7 @@ bottom_symlink_button = Symlink
 bottom_hardlink_button = Hardlink
 bottom_move_button = Move
 bottom_sort_button = Sort
+bottom_compare_button = Compare
 
 bottom_search_button_tooltip = Start search
 bottom_select_button_tooltip = Select records. Only selected files/folders can be later processed.
@@ -310,6 +311,8 @@ bottom_move_button_tooltip =
         When trying to move two files with identical name to folder, second will fail and show error.
 bottom_sort_button_tooltip =
         Sorts files/folders according to selected method.
+bottom_compare_button_tooltip =
+        Compare images in the group.
 
 bottom_show_errors_tooltip = Show/Hide bottom text panel.
 bottom_show_upper_notebook_tooltip = Show/Hide upper notebook panel.

diff --git a/czkawka_gui/i18n/pl/czkawka_gui.ftl b/czkawka_gui/i18n/pl/czkawka_gui.ftl
@@ -244,6 +244,7 @@ bottom_delete_button = Usuń
 bottom_save_button = Zapisz
 bottom_symlink_button = Symlink
 bottom_hardlink_button = Hardlink
+bottom_compare_button = Porównaj
 bottom_move_button = Przenieś
 bottom_sort_button = Sortuj
 bottom_search_button_tooltip = Rozpocznij wyszukiwanie
@@ -267,6 +268,7 @@ bottom_move_button_tooltip =
     Przenosi pliki do wybranego katalogu.
     Kopiuje wszystkie pliki do katalogu bez zachowania struktury plików.
     Podczas próby przeniesienia dwóch plików o identycznej nazwie do folderu, drugi plik nie zostanie przeniesiony i pojawi się błąd.
+bottom_compare_button_tooltip = Porównuje pliki/foldery w grupach.
 bottom_sort_button_tooltip = Sortuje pliki/foldery zgodnie z wybraną metodą.
 bottom_show_errors_tooltip = Pokaż/Ukryj dolny panel tekstowy.
 bottom_show_upper_notebook_tooltip = Pokazuje/ukrywa górny panel.

diff --git a/czkawka_gui/src/gui_structs/gui_about.rs b/czkawka_gui/src/gui_structs/gui_about.rs
@@ -26,16 +26,15 @@ impl GuiAbout {
 
         about_dialog.set_logo(Picture::for_pixbuf(logo).paintable().as_ref());
 
-        // Taken from command - "git shortlog -s -n -e" - remember to remove duplicates
-        // First clean it with regex " \<[^\n]+" and next with " +[0-9]+\t" and at end replace "([^\n]+)" with ""$1","
+        // Taken from command - "git shortlog -s -n -e > a.txt" - remember to remove duplicates
+        // First clean it with regex " \<[^\n]+" and next with " +[0-9]+\t" and at end replace "([^\n]+)" with ""$1"," (or ""\0",")
         // This should be updated only before releasing new version
         about_dialog.set_authors(&[
             "Rafał Mikrut",
             "Alexis Lefebvre",
             "Thomas Andreas Jung",
             "Alexis Lefebvre",
             "Peter Blackson",
-            "qarmin",
             "TheEvilSkeleton",
             "Ben Bodenmiller",
             "ChihWei Wang",
@@ -52,6 +51,7 @@ impl GuiAbout {
             "Adam Boguszewski",
             "Alex",
             "Caduser2020",
+            "CalunVier",
             "Danny Kirkham",
             "Dariusz Niedoba",
             "Douman",
@@ -72,13 +72,17 @@ impl GuiAbout {
             "Nick Gallimore",
             "Nikita Karamov",
             "OMEGA_RAZER",
+            "Renner0E",
             "Rodrigo Torres",
+            "Samuel",
             "Sbgodin",
             "Spirit",
             "Stefan Seering",
             "Syfaro",
+            "Sébastien",
             "Tom Paine",
             "Tom Praschan",
+            "Torsten Homberger",
             "Yuri Slobodyanyuk",
             "alexdraconian",
             "bakeromso",

diff --git a/czkawka_gui/src/gui_structs/gui_bottom_buttons.rs b/czkawka_gui/src/gui_structs/gui_bottom_buttons.rs
@@ -125,6 +125,7 @@ impl GuiBottomButtons {
         get_custom_label_from_widget(&self.buttons_symlink.clone()).set_text(&flg!("bottom_symlink_button"));
         get_custom_label_from_widget(&self.buttons_move.clone()).set_text(&flg!("bottom_move_button"));
         get_custom_label_from_widget(&self.buttons_hardlink.clone()).set_text(&flg!("bottom_hardlink_button"));
+        get_custom_label_from_widget(&self.buttons_compare.clone()).set_text(&flg!("bottom_compare_button"));
         self.label_buttons_sort.set_text(&flg!("bottom_sort_button"));
 
         self.buttons_search.set_tooltip_text(Some(&flg!("bottom_search_button_tooltip")));
@@ -134,6 +135,7 @@ impl GuiBottomButtons {
         self.buttons_symlink.set_tooltip_text(Some(&flg!("bottom_symlink_button_tooltip")));
         self.buttons_move.set_tooltip_text(Some(&flg!("bottom_move_button_tooltip")));
         self.buttons_sort.set_tooltip_text(Some(&flg!("bottom_sort_button_tooltip")));
+        self.buttons_compare.set_tooltip_text(Some(&flg!("bottom_compare_button_tooltip")));
         if self.buttons_hardlink.is_sensitive() {
             self.buttons_hardlink.set_tooltip_text(Some(&flg!("bottom_hardlink_button_tooltip")));
         } else {

diff --git a/czkawka_gui/ui/about_dialog.ui b/czkawka_gui/ui/about_dialog.ui
@@ -10,6 +10,6 @@ This program is free to use and will always be.</property>
     <property name="license-type">mit-x11</property>
     <property name="logo-icon-name">help-about-symbolic</property>
     <property name="program-name">Czkawka</property>
-    <property name="version">7.0.0</property>
+    <property name="version">8.0.0</property>
   </object>
 </interface>
diff --git a/czkawka_gui/ui/czkawka.cmb b/czkawka_gui/ui/czkawka.cmb
@@ -348,7 +348,7 @@
 	(3,1,"GtkAboutDialog","license-type","mit-x11",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkAboutDialog","logo-icon-name","help-about-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkAboutDialog","program-name","Czkawka",None,None,None,None,None,None,None,None,None),
-	(3,1,"GtkAboutDialog","version","7.0.0",None,None,None,None,None,None,None,None,None),
+	(3,1,"GtkAboutDialog","version","8.0.0",None,None,None,None,None,None,None,None,None),
 	(4,2,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,2,"GtkWidget","vexpand","1",None,None,None,None,None,None,None,None,None),
 	(4,4,"GtkLabel","label","Group XD/PER XD (99 images in current group)",1,None,None,None,None,None,None,None,None),
@@ -687,7 +687,7 @@
 	(5,177,"GtkWidget","focusable","1",None,None,None,None,None,None,None,None,None),
 	(5,177,"GtkWidget","hexpand","1",None,None,None,None,None,None,None,None,None),
 	(5,178,"GtkEditable","editable","0",None,None,None,None,None,None,None,None,None),
-	(5,178,"GtkEditable","text","Czkawka 7.0.0",1,None,None,None,None,None,None,None,None),
+	(5,178,"GtkEditable","text","Czkawka 8.0.0",1,None,None,None,None,None,None,None,None),
 	(5,178,"GtkEditable","xalign","1",None,None,None,None,None,None,None,None,None),
 	(5,178,"GtkEntry","has-frame","0",None,None,None,None,None,None,None,None,None),
 	(5,178,"GtkWidget","focusable","1",None,None,None,None,None,None,None,None,None),

diff --git a/czkawka_gui/ui/main_window.ui b/czkawka_gui/ui/main_window.ui
@@ -1166,7 +1166,7 @@
                 <property name="editable">0</property>
                 <property name="focusable">1</property>
                 <property name="has-frame">0</property>
-                <property name="text" translatable="yes">Czkawka 7.0.0</property>
+                <property name="text" translatable="yes">Czkawka 8.0.0</property>
                 <property name="xalign">1</property>
               </object>
             </child>

diff --git a/data/com.github.qarmin.czkawka.metainfo.xml b/data/com.github.qarmin.czkawka.metainfo.xml
@@ -23,7 +23,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="7.0.0" date="2023-10-15"/>
+    <release version="8.0.0" date="2024-10-11"/>
   </releases>
   <content_rating type="oars-1.0"/>
   <developer_name>Rafał Mikrut</developer_name>

diff --git a/krokiet/Cargo.toml b/krokiet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "krokiet"
-version = "7.0.0"
+version = "8.0.0"
 authors = ["Rafał Mikrut <[email protected]>"]
 edition = "2021"
 rust-version = "1.79.0"
@@ -12,7 +12,7 @@ build = "build.rs"
 
 [dependencies]
 rand = "0.8"
-czkawka_core = { version = "7.0.0", path = "../czkawka_core" }
+czkawka_core = { version = "8.0.0", path = "../czkawka_core" }
 chrono = "0.4.38"
 open = "5.3"
 crossbeam-channel = "0.5"