merge upstream master into feature/flatpak-manifest-ci-docs

Author: pablogventura

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     name: Build (Ubuntu)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install dependencies
         run: |

.github/workflows/clang-format.yml

@@ -18,60 +18,76 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    
+    - uses: actions/checkout@v5
+
     - name: Install dependencies
-      run: sudo apt install gcc g++ cmake libjpeg-dev libpng-dev libtiff5 libtiff5-dev libboost-test-dev qtbase5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libpthread-stubs0-dev rpm libfuse2
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --fix-missing \
+          gcc g++ cmake \
+          libjpeg-dev libpng-dev \
+          libtiff6 libtiff5-dev \
+          libboost-test-dev \
+          qtbase5-dev libqt5svg5-dev \
+          qttools5-dev qttools5-dev-tools \
+          libqt5opengl5-dev \
+          libpthread-stubs0-dev \
+          rpm libfuse2t64
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B "${{ github.workspace }}/build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
       # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake --build "${{ github.workspace }}/build" --config ${{env.BUILD_TYPE}}
 
     - name: Create DEB package
-      working-directory: ${{github.workspace}}/build
+      working-directory: "${{ github.workspace }}/build"
       run: |
         cpack -G "DEB"
         mv scantailor*.deb scantailor.deb
       
     - name: Create RPM package
-      working-directory: ${{github.workspace}}/build
+      working-directory: "${{ github.workspace }}/build"
       run: |
         cpack -G "RPM"
         mv scantailor*.rpm scantailor.rpm
         
     - name: Create AppImage package
-      working-directory: ${{github.workspace}}/build
+      working-directory: "${{ github.workspace }}/build"
       run: |
         wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
         chmod +x linuxdeploy-x86_64.AppImage
-        ./linuxdeploy-x86_64.AppImage --appdir AppDir --desktop-file ../src/resources/unix/scantailor.desktop --icon-file ../src/resources/ScanTailor.png --executable scantailor --output appimage
+        ./linuxdeploy-x86_64.AppImage \
+          --appdir AppDir \
+          --desktop-file "${{ github.workspace }}/build/scantailor.desktop" \
+          --icon-file "${{ github.workspace }}/src/resources/ScanTailor.png" \
+          --executable scantailor \
+          --output appimage
         mv ScanTailor*.AppImage scantailor.AppImage
       
     - name: Upload Linux bin
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: scantailor-linux-ubuntu-latest-qt5
         path: build/scantailor
 
     - name: Upload Linux DEB
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: scantailor-linux-ubuntu-latest-qt5-deb
         path: build/scantailor.deb
 
     - name: Upload Linux RPM
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: scantailor-linux-ubuntu-latest-qt5-rpm
         path: build/scantailor.rpm
 
     - name: Upload Linux AppImage
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: scantailor-linux-appimage
         path: build/scantailor.AppImage

.github/workflows/cmake.yml

@@ -12,7 +12,7 @@ jobs:
     name: clang-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -34,8 +34,12 @@ jobs:
             | grep -E '\.(cpp|h)$' \
             | grep -v '/translations/' \
             || true)
-          COUNT=$(echo "$SRC_FILES" | grep -c . || echo 0)
-          echo "count=$COUNT" >> $GITHUB_OUTPUT
+          if [ -z "$SRC_FILES" ]; then
+            COUNT=0
+          else
+            COUNT=$(echo "$SRC_FILES" | grep -c .)
+          fi
+          echo "count=${COUNT}" >> "$GITHUB_OUTPUT"
           if [ "$COUNT" = "0" ]; then
             echo "No changed source files to check."
             exit 0

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
     name: Build .deb
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set version from tag
         run: |
@@ -34,7 +34,7 @@ jobs:
         run: ./build-deb.sh build
 
       - name: Upload .deb artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: deb-package
           path: scantailor-advanced_*_amd64.deb
@@ -43,7 +43,7 @@ jobs:
     name: Build AppImage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set version from tag
         run: |

.github/workflows/release.yml

@@ -7,20 +7,22 @@ bin/
 lib/
 *.dir/
 
-# CMake
+# CMake (generated). Tracked helper modules live under cmake/.
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
 Makefile
 *.cmake
 !CMakeLists.txt
+!cmake/**/*.cmake
 *.cbp
 CTestTestfile.cmake
 _deps/
 install_manifest.txt
 compile_commands.json
+CMakeUserPresets.json
 
-# C/C++ compilado
+# C/C++ build artifacts
 *.o
 *.obj
 *.a
@@ -60,7 +62,8 @@ ui_*.h
 *.includes
 *.config
 
-# IDEs y editores
+# Editors / IDEs
+.cursor/
 .vscode/
 .idea/
 *.sublime-project
@@ -69,16 +72,25 @@ ui_*.h
 *.swp
 *.swo
 .*.sw?
+.clangd
+.cache/clangd/
+*.code-workspace
 
-# Sistema operativo
+# Visual Studio (CMake "Open Folder")
+.vs/
+CMakeSettings.json
+CppProperties.json
+
+# Operating system junk
 .DS_Store
 .DS_Store?
 ._*
 Thumbs.db
 ehthumbs.db
 Desktop.ini
+.directory
 
-# Depuradores y profiling
+# Debuggers / profiling
 *.core
 /core
 *.stackdump
@@ -91,36 +103,55 @@ Desktop.ini
 perf.data
 perf.data.old
 
-# Documentación generada
+# Ctags / cscope
+tags
+TAGS
+GTAGS
+GRTAGS
+GPATH
+cscope.out
+
+# Generated docs
 doc/html/
 doc/latex/
 docs/_build/
 *.dox
 
-# Tests y cobertura
+# Tests / coverage output
 Testing/
 test_results/
 coverage/
-*.gcov
 lcov.info
 
-# Empaquetado y distribución
+# Packaging / distribution artifacts
 *.tar
 *.tar.gz
 *.zip
 *.rar
 *.deb
 *.rpm
 *.msi
+*.AppImage
+*.flatpak
 packaging/build/
 
-# Variables de entorno / local
+# flatpak-builder output (local smoke builds / CI)
+.flatpak-builder/
+flatpak/.flatpak-builder/
+repo/
+build-dir/
+
+# Patch / merge leftovers
+*.orig
+*.rej
+
+# Local env / CMake overrides
 .env
 .env.local
 *.local
 local.cmake
 
-# Otros
+# Misc
 *.log
 *.tmp
 *.temp

.gitignore

@@ -70,6 +70,10 @@ Go to [this repository](https://github.com/ScanTailor-Advanced/scantailor-libs-b
 
 **Windows – large JPEG/PNG (issue #20):** If large-format JPEG or PNG files fail to load on Windows, ensure the build uses **libjpeg-turbo** (or libjpeg 9+) and a recent libpng. The [scantailor-libs-build](https://github.com/ScanTailor-Advanced/scantailor-libs-build) repository provides compatible libraries.
 
+**Windows – Visual C++ runtime (issue #101):** Pre-built binaries are linked with **Microsoft Visual C++** (MSVC) runtimes. If the application does not start and Windows reports missing **`VCRUNTIME*.dll`**, **`MSVCP*.dll`**, or similar, install the **latest supported x64 “Visual C++ Redistributable”** from Microsoft’s page: [Latest supported VC++ Redistributable downloads](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170). Match **x64** vs **x86** to the build you run.
+
+**Windows – supported OS versions (issue #101):** Release builds follow upstream **Qt** and **toolchain** support policies; **legacy Windows** (for example Windows 7) is **not** exercised in this project’s CI and is **best-effort only**. You may need an **older tagged release** or a **self-built** binary against an older Qt/MSVC stack. Community reports (including compatibility tips) are welcome in the issue tracker.
+
 **Linux – Wayland (issue #97):** If you see rendering issues (blank or corrupted windows) when running under Wayland, try starting the application with `QT_QPA_PLATFORM=xcb` to use the X11 compatibility layer.
 
 **Linux – Flatpak / Flathub ([issue #105](https://github.com/ScanTailor-Advanced/scantailor-advanced/issues/105)):**

README.md

@@ -106,7 +106,7 @@ MainWindow::MainWindow()
       m_interactiveQueue(std::make_unique<ProcessingTaskQueue>()),
       m_outOfMemoryDialog(std::make_unique<OutOfMemoryDialog>()),
       m_curFilter(0),
-      m_savedZoomLevel(1.0),
+      m_savedMainAreaViewState(),
       m_ignoreSelectionChanges(0),
       m_ignorePageOrderingChanges(0),
       m_debug(false),
@@ -710,6 +710,54 @@ void MainWindow::setOptionsWidget(FilterOptionsWidget* widget, const Ownership o
   connect(widget, SIGNAL(fixDpiRequested()), this, SLOT(fixDpiDialogRequested()));
 }  // MainWindow::setOptionsWidget
 
+ImageViewBase* MainWindow::findPrimaryImageView(QWidget* root) {
+  if (!root) {
+    return nullptr;
+  }
+  if (auto* tabs = qobject_cast<output::TabbedImageView*>(root)) {
+    QWidget* const page = tabs->currentWidget();
+    if (page) {
+      return Utils::castOrFindChild<ImageViewBase*>(page);
+    }
+    return nullptr;
+  }
+  return Utils::castOrFindChild<ImageViewBase*>(root);
+}
+
+void MainWindow::applySavedMainAreaViewState(ImageViewBase* view, const SavedMainAreaViewState& state) {
+  if (!view) {
+    return;
+  }
+  view->setZoomLevel(state.zoom);
+  if (!state.hasScrollNorm) {
+    return;
+  }
+  QScrollBar* const h = view->horizontalScrollBar();
+  QScrollBar* const v = view->verticalScrollBar();
+  const int hr = h->maximum() - h->minimum();
+  const int vr = v->maximum() - v->minimum();
+  if (hr <= 0 || vr <= 0) {
+    return;
+  }
+  const double nx = qBound(0.0, state.scrollNormX, 1.0);
+  const double ny = qBound(0.0, state.scrollNormY, 1.0);
+  h->setValue(h->minimum() + qRound(nx * hr));
+  v->setValue(v->minimum() + qRound(ny * vr));
+}
+
+void MainWindow::scheduleSavedMainAreaViewStateRestore(const QPointer<ImageViewBase>& view) {
+  if (view.isNull()) {
+    return;
+  }
+  const SavedMainAreaViewState state = m_savedMainAreaViewState;
+  QTimer::singleShot(0, this, [view, state]() {
+    if (view.isNull()) {
+      return;
+    }
+    MainWindow::applySavedMainAreaViewState(view.data(), state);
+  });
+}
+
 void MainWindow::setImageWidget(QWidget* widget, const Ownership ownership, DebugImages* debugImages, bool overlay) {
   if (isBatchProcessingInProgress() && (widget != m_batchProcessingWidget.get())) {
     if (ownership == TRANSFER_OWNERSHIP) {
@@ -720,8 +768,19 @@ void MainWindow::setImageWidget(QWidget* widget, const Ownership ownership, Debu
 
   if (!overlay && m_imageFrameLayout->count() > 0) {
     QWidget* oldW = m_imageFrameLayout->widget(0);
-    if (ImageViewBase* oldView = Utils::castOrFindChild<ImageViewBase*>(oldW)) {
-      m_savedZoomLevel = oldView->zoomLevel();
+    if (ImageViewBase* oldView = findPrimaryImageView(oldW)) {
+      m_savedMainAreaViewState.zoom = oldView->zoomLevel();
+      QScrollBar* const h = oldView->horizontalScrollBar();
+      QScrollBar* const v = oldView->verticalScrollBar();
+      const int hr = h->maximum() - h->minimum();
+      const int vr = v->maximum() - v->minimum();
+      if (hr > 0 && vr > 0) {
+        m_savedMainAreaViewState.hasScrollNorm = true;
+        m_savedMainAreaViewState.scrollNormX = double(h->value() - h->minimum()) / hr;
+        m_savedMainAreaViewState.scrollNormY = double(v->value() - v->minimum()) / vr;
+      } else {
+        m_savedMainAreaViewState.hasScrollNorm = false;
+      }
     }
   }
 
@@ -739,8 +798,8 @@ void MainWindow::setImageWidget(QWidget* widget, const Ownership ownership, Debu
       if (overlay) {
         m_imageFrameLayout->setCurrentWidget(widget);
       }
-      if (ImageViewBase* newView = Utils::castOrFindChild<ImageViewBase*>(widget)) {
-        newView->setZoomLevel(m_savedZoomLevel);
+      if (ImageViewBase* newView = findPrimaryImageView(widget)) {
+        scheduleSavedMainAreaViewStateRestore(QPointer<ImageViewBase>(newView));
       }
     }
   } else {