From e994baf543a06aa6b7e414c045bfd3e6683ea75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <mikrutrafal@protonmail.com>
Date: Sat, 25 Feb 2023 21:13:46 +0100
Subject: [PATCH] 4.8

---
 .github/workflows/windows.yml                        |  6 +++---
 .../connect_selection_of_directories.rs              |  2 +-
 instructions/Compilation.md                          | 12 ++++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3c660dd..c9d8c7d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -60,7 +60,7 @@ jobs:
           find package -iname "*.dll" -or -iname "*.exe" -type f -exec mingw-strip {} +
 
           cd package/share
-          wget2 https://github.com/qarmin/czkawka/files/8880216/gtk4_theme.zip
+          wget2 https://github.com/qarmin/czkawka/files/10832192/gtk4_theme.zip
           unzip gtk4_theme.zip
           rm gtk4_theme.zip
           cd ../..
@@ -76,7 +76,7 @@ jobs:
   container_cli:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/piegamesde/gtk4-cross:gtk-4.6
+      image: ghcr.io/piegamesde/gtk4-cross:gtk-4.8
     steps:
       - uses: actions/checkout@v1
       - name: Install additional dependencies
@@ -126,7 +126,7 @@ jobs:
           find package -iname "*.dll" -or -iname "*.exe" -type f -exec mingw-strip {} +
 
           cd package/share
-          wget2 https://github.com/qarmin/czkawka/files/8880216/gtk4_theme.zip
+          wget2 https://github.com/qarmin/czkawka/files/10832192/gtk4_theme.zip
           unzip gtk4_theme.zip
           rm gtk4_theme.zip
           cd ../..
diff --git a/czkawka_gui/src/connect_things/connect_selection_of_directories.rs b/czkawka_gui/src/connect_things/connect_selection_of_directories.rs
index 68f6402..47c6a5a 100644
--- a/czkawka_gui/src/connect_things/connect_selection_of_directories.rs
+++ b/czkawka_gui/src/connect_things/connect_selection_of_directories.rs
@@ -48,7 +48,7 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
             file_dialog_include_exclude_folder_selection.set_title(&flg!("exclude_folders_dialog_title"));
         });
     }
-    // Conect
+    // Connect
     {
         let notebook_upper = gui_data.upper_notebook.notebook_upper.clone();
         let tree_view_included_directories = gui_data.upper_notebook.tree_view_included_directories.clone();
diff --git a/instructions/Compilation.md b/instructions/Compilation.md
index 32512ec..c00c1a5 100644
--- a/instructions/Compilation.md
+++ b/instructions/Compilation.md
@@ -8,6 +8,7 @@ FFmpeg is not included here because it is not needed to build - it is dynamicall
 
 Support for heif images is optional and require to install libheif library.
 
+New versions of GTK fixes some bugs, so e.g. middle button selection will work only with GTK >=4.8.
 
 | Program | Min    | What for                                                                             |
 |---------|--------|--------------------------------------------------------------------------------------|
@@ -33,19 +34,14 @@ You need to install Rust via Homebrew, GTK Libraries and optionally heif library
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 brew install rustup
 rustup-init
-brew install gtk4 adwaita-icon-theme librsvg libheif
+brew install gtk4 adwaita-icon-theme librsvg libheif webp-pixbuf-loader
 ```
 
 ### Windows
 
-*Will be available in the future*
+Compiling Czkawka on Windows is possible, but due using GTK is very hard.
 
-For Linux-to-Windows cross-building instruction look at the CI.
-
-<!-- First you need to install Visual C++ components from Visual Studio installer - https://visualstudio.microsoft.com/downloads/
-Next install Rust from site https://rustup.rs/
-After that the latest GTK 4 runtime must be installed from(not available yet for GTK 4) https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases
--->
+In CI we use cross compilation which simplify a lot of things, so for now there is no instruction how to compile native binaries on Windows.
 
 ### Docker