diff --git a/0001-Do-not-build-all-host-code-by-default.patch b/0001-Do-not-build-all-host-code-by-default.patch deleted file mode 100644 index 9111dad..0000000 --- a/0001-Do-not-build-all-host-code-by-default.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5d5d01864c6d508217316fcb2f0adf0add7033a2 Mon Sep 17 00:00:00 2001 -From: Lily Foster -Date: Fri, 17 Mar 2023 14:37:08 -0400 -Subject: [PATCH] Do not build all host code by default - -This is problematic because some host code, like 8bf, require Qt6 and -that prevents building other host code with Qt5 at all. ---- - gmic-qt/CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt -index a91d26a..9aa0568 100644 ---- a/gmic-qt/CMakeLists.txt -+++ b/gmic-qt/CMakeLists.txt -@@ -433,8 +433,6 @@ set (gmic_qt_SRCS - src/GmicStdlib.h - src/HeadlessProcessor.h - src/Host/GmicQtHost.h -- src/Host/None/ImageDialog.h -- src/Host/None/JpegQualityDialog.h - src/HtmlTranslator.h - src/IconLoader.h - src/ImageTools.h -@@ -524,12 +522,6 @@ set(gmic_qt_SRCS - src/GmicQt.cpp - src/GmicStdlib.cpp - src/HeadlessProcessor.cpp -- src/Host/8bf/host_8bf.cpp -- src/Host/Gimp/host_gimp.cpp -- src/Host/None/host_none.cpp -- src/Host/None/ImageDialog.cpp -- src/Host/None/JpegQualityDialog.cpp -- src/Host/PaintDotNet/host_paintdotnet.cpp - src/HtmlTranslator.cpp - src/IconLoader.cpp - src/ImageTools.cpp --- -2.40.0 - diff --git a/0001-Find-the-local-gmic-library.patch b/0001-Find-the-local-gmic-library.patch index 9cd6798..2d9d217 100644 --- a/0001-Find-the-local-gmic-library.patch +++ b/0001-Find-the-local-gmic-library.patch @@ -1,38 +1,57 @@ -From 66475044c5ebed112d75cb51af925f9643b20d18 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Sat, 30 Apr 2022 09:23:31 +0200 +From 117f2d84d1baf454f8eeef05c0779f7011be8102 Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Mon, 17 Apr 2023 16:07:00 +0200 Subject: [PATCH] Find the local gmic library GMic's working build system was replaced by a Makefile for unknown reasons -(the gmic author doesn't add messages to his commits). -To keep using CMake in gmic-qt, we need to teach it where the libgmic library is located. +To keep using CMake in gmic-qt, we need to find the locally built gmic library. --- - gmic-qt/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + gmic-qt/CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt -index d720221..7425466 100644 +index 9aa0568..7763df7 100644 --- a/gmic-qt/CMakeLists.txt +++ b/gmic-qt/CMakeLists.txt -@@ -120,8 +120,10 @@ if (NOT ENABLE_SYSTEM_GMIC) - if (NOT(${GMIC_VERSION} EQUAL ${CIMG_VERSION})) - message(FATAL_ERROR "\nVersion numbers of files 'gmic.h' (" ${GMIC_VERSION} ") and 'CImg.h' (" ${CIMG_VERSION} ") mismatch") - endif() --endif() +@@ -142,7 +142,13 @@ endif() + # Gmic + # + if (ENABLE_SYSTEM_GMIC) +- find_package(Gmic REQUIRED CONFIG) ++ find_library(GMIC_LIBRARY gmic PATHS ${CMAKE_SOURCE_DIR}/../src) ++ find_path(GMIC_INCLUDE_DIR gmic.h PATHS ${CMAKE_SOURCE_DIR}/../src) ++ add_library(GMic::GMic UNKNOWN IMPORTED) ++ set_target_properties(GMic::GMic PROPERTIES ++ IMPORTED_LOCATION "${GMIC_LIBRARY}" ++ INTERFACE_INCLUDE_DIRECTORIES "${GMIC_INCLUDE_DIR}" ++ ) + endif (ENABLE_SYSTEM_GMIC) -+ # find the 'gmic' library built using 'make lib' in the top folder -+ find_library(gmic NAMES gmic PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../src") -+endif() - - option(PRERELEASE "Set to ON makes this a prelease build") - if (${PRERELEASE}) -@@ -593,7 +595,7 @@ if(ENABLE_DYNAMIC_LINKING) - elseif(GMIC_LIB_PATH) + # +@@ -577,10 +583,10 @@ if(ENABLE_DYNAMIC_LINKING) + ${gmic_qt_LIBRARIES} + libgmicstatic + ) +- elseif(TARGET libgmic) ++ elseif(TARGET GMic::GMic) set(gmic_qt_LIBRARIES ${gmic_qt_LIBRARIES} -- "gmic" -+ ${gmic} +- libgmic ++ GMic::GMic ) - else() - message(FATAL_ERROR "No G'MIC library is available for linking. Please build libgmic as a static library.") + elseif(GMIC_LIB_PATH) + set(gmic_qt_LIBRARIES +@@ -612,9 +618,6 @@ if(ENABLE_DYNAMIC_LINKING) + ${CURL_LIBRARIES} + ${EXTRA_LIBRARIES}) + endif() +- else() +- # Inject the G'MIC CImg plugin. +- include_directories(../src) + endif() + else(ENABLE_DYNAMIC_LINKING) + set(gmic_qt_SRCS +-- +2.40.0 + diff --git a/0001-Fix-Qt-form-paths-in-CMakeLists.patch b/0001-Fix-Qt-form-paths-in-CMakeLists.patch deleted file mode 100644 index 1fa483c..0000000 --- a/0001-Fix-Qt-form-paths-in-CMakeLists.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f7cfa7887d0dbba7d31cca9a8058f578749beae3 Mon Sep 17 00:00:00 2001 -From: Lily Foster -Date: Fri, 17 Mar 2023 14:14:23 -0400 -Subject: [PATCH] Fix Qt form paths in CMakeLists - ---- - gmic-qt/CMakeLists.txt | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt -index d720221..a91d26a 100644 ---- a/gmic-qt/CMakeLists.txt -+++ b/gmic-qt/CMakeLists.txt -@@ -560,18 +560,18 @@ set(gmic_qt_SRCS - ) - - set (gmic_qt_FORMS -- dialogsettings.ui -- filtersview.ui -- headlessprogressdialog.ui -- inoutpanel.ui -- languageselectionwidget.ui -- mainwindow.ui -- multilinetextparameterwidget.ui -- progressinfowidget.ui -- progressinfowindow.ui -- SearchFieldWidget.ui -- sourceswidget.ui -- zoomlevelselector.ui -+ ui/dialogsettings.ui -+ ui/filtersview.ui -+ ui/headlessprogressdialog.ui -+ ui/inoutpanel.ui -+ ui/languageselectionwidget.ui -+ ui/mainwindow.ui -+ ui/multilinetextparameterwidget.ui -+ ui/progressinfowidget.ui -+ ui/progressinfowindow.ui -+ ui/SearchFieldWidget.ui -+ ui/sourceswidget.ui -+ ui/zoomlevelselector.ui - ) - - if(ENABLE_DYNAMIC_LINKING) --- -2.40.0 - diff --git a/_constraints b/_constraints index 465c5ba..2724b40 100644 --- a/_constraints +++ b/_constraints @@ -1,9 +1,17 @@ - - - 2200 - - 3 + + 9 + + + + ppc64le + + + + 7 + + + diff --git a/gmic.changes b/gmic.changes index 92af7eb..6b8394c 100644 --- a/gmic.changes +++ b/gmic.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 17 09:31:24 UTC 2023 - Christophe Marin + +- Update to 3.2.3. No changelog +- Drop patches, merged upstream: + * 0001-Fix-Qt-form-paths-in-CMakeLists.patch + * 0001-Do-not-build-all-host-code-by-default.patch +- Rework 0001-Find-the-local-gmic-library.patch to speed up build + and fix failures on Leap + ------------------------------------------------------------------- Mon Mar 20 13:14:26 UTC 2023 - Christophe Marin diff --git a/gmic.spec b/gmic.spec index a2f99b1..9b6104b 100644 --- a/gmic.spec +++ b/gmic.spec @@ -35,12 +35,12 @@ %define hostapps gimp%{?gimp_suffix} krita %endif -%define gmic_qt_options -DENABLE_SYSTEM_GMIC=OFF -DENABLE_DYNAMIC_LINKING=ON +%define gmic_qt_options -DENABLE_SYSTEM_GMIC=ON -DENABLE_DYNAMIC_LINKING=ON %define gmic_datadir %{_datadir}/gmic Name: gmic -Version: 3.2.2 +Version: 3.2.3 Release: 0 Summary: GREYC's Magick for Image Computing (denoise and others) # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are @@ -53,9 +53,6 @@ Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz Patch0: krita5.patch # PATCH-FEATURE-OPENSUSE Patch1: 0001-Find-the-local-gmic-library.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-Qt-form-paths-in-CMakeLists.patch -Patch3: 0001-Do-not-build-all-host-code-by-default.patch # # SECTION pkg_vcmp # @@ -160,9 +157,8 @@ BuildArch: noarch This package contains shared data files for the various gmic frontends. %prep -%setup -q -dos2unix src/{gmic_libc.*,use_libcgmic.c} -%autopatch -p1 +%autosetup -p1 +dos2unix src/gmic_libc.* %build # Build gmic @@ -178,7 +174,9 @@ sed -i 's# -Wl,-rpath,.##' src/Makefile # The file is moved post-install in a directory not owned by gimp sed -i 's#/usr/lib/gimp/2.0/plug-ins#%{gmic_datadir}#' src/gmic_stdlib.gmic -EXTRA_CFLAGS='%{optflags}' NOSTRIP=1 make lib cli_shared +# There's no concept of build order in the crappy Makefile provided +EXTRA_CFLAGS='%{optflags}' NOSTRIP=1 %__make lib %{?_smp_mflags} +EXTRA_CFLAGS='%{optflags}' NOSTRIP=1 %__make cli_shared %{?_smp_mflags} # Build gmic{_gimp|_krita}_qt pushd gmic-qt @@ -246,8 +244,7 @@ install -m 0755 build/gmic_qt %{buildroot}%{_bindir}/gmic_qt install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt popd -%post -n libgmic3 -p /sbin/ldconfig -%postun -n libgmic3 -p /sbin/ldconfig +%ldconfig_scriptlets -n libgmic3 %files %doc README gmic-qt/README.md diff --git a/gmic_3.2.2.tar.gz b/gmic_3.2.2.tar.gz deleted file mode 100644 index 03622a0..0000000 --- a/gmic_3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c747496c8eece456f0e3404daca1b99ee94ddb694770970f220e2a62de803a58 -size 11321544 diff --git a/gmic_3.2.3.tar.gz b/gmic_3.2.3.tar.gz new file mode 100644 index 0000000..7e4eed8 --- /dev/null +++ b/gmic_3.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8444f0aae428a5ed555ddd809c9a4b144b4c9bb29f81057393893c34b1ac0e4 +size 11332026 diff --git a/krita5.patch b/krita5.patch index ac7befe..a14e8f1 100644 --- a/krita5.patch +++ b/krita5.patch @@ -24,16 +24,16 @@ Rebased for gmic 3.2.2 gmic-qt/src/Host/KritaPlugin/host.cpp | 195 +++++++++++++++ gmic-qt/src/Host/None/JpegQualityDialog.cpp | 6 +- gmic-qt/src/LanguageSettings.cpp | 9 +- - gmic-qt/src/MainWindow.cpp | 50 +++- + gmic-qt/src/MainWindow.cpp | 52 +++- gmic-qt/src/MainWindow.h | 2 + - gmic-qt/src/Settings.cpp | 8 +- + gmic-qt/src/Settings.cpp | 10 +- gmic-qt/src/Tags.cpp | 5 +- gmic-qt/src/Widgets/InOutPanel.cpp | 2 + gmic-qt/src/Widgets/InOutPanel.h | 2 + gmic-qt/src/Widgets/ProgressInfoWindow.cpp | 4 + gmic-qt/src/Widgets/ProgressInfoWindow.h | 2 + gmic-qt/ui/dialogsettings.ui | 2 +- - 29 files changed, 712 insertions(+), 31 deletions(-) + 29 files changed, 715 insertions(+), 32 deletions(-) create mode 100644 gmic-qt/gmic_krita_qt.desktop create mode 100644 gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.cpp create mode 100644 gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.h @@ -41,7 +41,7 @@ Rebased for gmic 3.2.2 create mode 100644 gmic-qt/src/Host/KritaPlugin/host.cpp diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt -index 3375b72..d720221 100644 +index 8e4bd38..9aa0568 100644 --- a/gmic-qt/CMakeLists.txt +++ b/gmic-qt/CMakeLists.txt @@ -22,7 +22,7 @@ endif() @@ -53,7 +53,7 @@ index 3375b72..d720221 100644 if (${GMIC_QT_HOST} STREQUAL "none") message("Building standalone version.") else() -@@ -666,6 +666,70 @@ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3") +@@ -658,6 +658,70 @@ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3") ) install(TARGETS gmic_gimp_qt RUNTIME DESTINATION "${GIMP_PKGLIBDIR}/plug-ins/gmic_gimp_qt") @@ -124,7 +124,7 @@ index 3375b72..d720221 100644 elseif (${GMIC_QT_HOST} STREQUAL "none") set (gmic_qt_SRCS ${gmic_qt_SRCS} -@@ -718,7 +782,7 @@ elseif (${GMIC_QT_HOST} STREQUAL "8bf") +@@ -710,7 +774,7 @@ elseif (${GMIC_QT_HOST} STREQUAL "8bf") ) else() @@ -149,7 +149,7 @@ index 0000000..579d427 +Categories=Qt;KDE;Graphics; +StartupNotify=false diff --git a/gmic-qt/src/DialogSettings.cpp b/gmic-qt/src/DialogSettings.cpp -index a30c403..afee14c 100644 +index 6c1e6b9..29328c4 100644 --- a/gmic-qt/src/DialogSettings.cpp +++ b/gmic-qt/src/DialogSettings.cpp @@ -56,11 +56,7 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D @@ -388,10 +388,10 @@ index dc5ef70..a6db8fb 100644 + #endif // GMIC_QT_GLOBALS_H diff --git a/gmic-qt/src/GmicProcessor.cpp b/gmic-qt/src/GmicProcessor.cpp -index 2ade8bf..1ea0a9f 100644 +index b35b4a5..e2db770 100644 --- a/gmic-qt/src/GmicProcessor.cpp +++ b/gmic-qt/src/GmicProcessor.cpp -@@ -190,6 +190,11 @@ bool GmicProcessor::isIdle() const +@@ -200,6 +200,11 @@ bool GmicProcessor::isIdle() const return !_filterThread; } @@ -404,7 +404,7 @@ index 2ade8bf..1ea0a9f 100644 { if (_filterThread) { diff --git a/gmic-qt/src/GmicProcessor.h b/gmic-qt/src/GmicProcessor.h -index 2d61079..49baa8b 100644 +index 0c65a62..1271e16 100644 --- a/gmic-qt/src/GmicProcessor.h +++ b/gmic-qt/src/GmicProcessor.h @@ -91,6 +91,7 @@ public: @@ -1062,10 +1062,10 @@ index 7e74667..0c92a47 100644 } } diff --git a/gmic-qt/src/MainWindow.cpp b/gmic-qt/src/MainWindow.cpp -index 7cbe3bd..4998ee3 100644 +index 285b674..2af1aee 100644 --- a/gmic-qt/src/MainWindow.cpp +++ b/gmic-qt/src/MainWindow.cpp -@@ -186,8 +186,12 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent), ui(new Ui::MainW +@@ -187,8 +187,12 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent), ui(new Ui::MainW updateShortcutF5->setContext(Qt::ApplicationShortcut); QShortcut * updateShortcutCtrlR = new QShortcut(QKeySequence("Ctrl+R"), this); updateShortcutCtrlR->setContext(Qt::ApplicationShortcut); @@ -1078,7 +1078,7 @@ index 7cbe3bd..4998ee3 100644 ui->tbUpdateFilters->setToolTip(updateText); } -@@ -275,6 +279,7 @@ void MainWindow::setIcons() +@@ -272,6 +276,7 @@ void MainWindow::setIcons() ui->tbExpandCollapse->setIcon(_expandIcon); } @@ -1086,7 +1086,7 @@ index 7cbe3bd..4998ee3 100644 void MainWindow::setDarkTheme() { // SHOW(QStyleFactory::keys()); -@@ -328,6 +333,7 @@ void MainWindow::setDarkTheme() +@@ -325,6 +330,7 @@ void MainWindow::setDarkTheme() ui->vSplitterLine->setStyleSheet("QFrame{ border-top: 0px none #a0a0a0; border-bottom: 1px solid rgb(160,160,160);}"); Settings::UnselectedFilterTextColor = Settings::UnselectedFilterTextColor.darker(150); } @@ -1094,16 +1094,26 @@ index 7cbe3bd..4998ee3 100644 void MainWindow::setPluginParameters(const RunParameters & parameters) { -@@ -382,7 +388,7 @@ void MainWindow::buildFiltersTree() +@@ -359,7 +365,9 @@ void MainWindow::onUpdateDownloadsFinished(int status) + } + + buildFiltersTree(); ++#ifndef _GMIC_QT_DISABLE_UPDATES_ + ui->tbUpdateFilters->setEnabled(true); ++#endif + if (_filtersPresenter->currentFilter().hash.isEmpty()) { + setNoFilter(); + } else { +@@ -381,7 +389,7 @@ void MainWindow::buildFiltersTree() _filtersPresenter->importGmicGTKFaves(); _filtersPresenter->saveFaves(); _gtkFavesShouldBeImported = false; - QSettings().setValue(FAVES_IMPORT_KEY, true); + GMIC_SETTINGS_INLINE.setValue(FAVES_IMPORT_KEY, true); } - _filtersPresenter->toggleSelectionMode(withVisibility); -@@ -498,7 +504,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status) + } +@@ -489,7 +497,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status) } else if (status == (int)Updater::UpdateStatus::NotNecessary) { } @@ -1112,7 +1122,7 @@ index 7cbe3bd..4998ee3 100644 _gtkFavesShouldBeImported = false; } else { _gtkFavesShouldBeImported = askUserForGTKFavesImport(); -@@ -515,7 +521,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status) +@@ -507,7 +515,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status) } // Retrieve and select previously selected filter @@ -1121,7 +1131,7 @@ index 7cbe3bd..4998ee3 100644 if (_newSession || !_lastExecutionOK) { hash.clear(); } -@@ -580,7 +586,9 @@ void MainWindow::onEscapeKeyPressed() +@@ -572,7 +580,9 @@ void MainWindow::onEscapeKeyPressed() } else { _processor.cancel(); ui->previewWidget->displayOriginalImage(); @@ -1131,7 +1141,7 @@ index 7cbe3bd..4998ee3 100644 } } } -@@ -696,7 +704,9 @@ void MainWindow::onPreviewUpdateRequested(bool synchronous) +@@ -689,7 +699,9 @@ void MainWindow::onPreviewUpdateRequested(bool synchronous) ui->previewWidget->displayOriginalImage(); return; } @@ -1141,17 +1151,14 @@ index 7cbe3bd..4998ee3 100644 const FiltersPresenter::Filter currentFilter = _filtersPresenter->currentFilter(); GmicProcessor::FilterContext context; -@@ -759,7 +769,9 @@ void MainWindow::onPreviewImageAvailable() +@@ -752,14 +764,26 @@ void MainWindow::onPreviewImageAvailable() } ui->previewWidget->setPreviewImage(_processor.previewImage()); ui->previewWidget->enableRightClick(); +#ifndef _GMIC_QT_DISABLE_UPDATES_ ui->tbUpdateFilters->setEnabled(true); +#endif - if (_pendingActionAfterCurrentProcessing == ProcessingAction::Close) { - close(); - } -@@ -767,9 +779,19 @@ void MainWindow::onPreviewImageAvailable() + } void MainWindow::onPreviewError(const QString & message) { @@ -1168,10 +1175,10 @@ index 7cbe3bd..4998ee3 100644 +#ifndef _GMIC_QT_DISABLE_UPDATES_ ui->tbUpdateFilters->setEnabled(true); +#endif - if (_pendingActionAfterCurrentProcessing == ProcessingAction::Close) { - close(); - } -@@ -851,12 +873,16 @@ void MainWindow::onVeryFirstShowEvent() + } + + void MainWindow::onParametersChanged() +@@ -840,12 +864,16 @@ void MainWindow::onVeryFirstShowEvent() Updater::setOutputMessageMode(Settings::outputMessageMode()); int ageLimit; { @@ -1190,7 +1197,7 @@ index 7cbe3bd..4998ee3 100644 } void MainWindow::setZoomConstraint() -@@ -1022,7 +1048,7 @@ void MainWindow::saveCurrentParameters() +@@ -980,7 +1008,7 @@ void MainWindow::saveCurrentParameters() void MainWindow::saveSettings() { @@ -1199,7 +1206,7 @@ index 7cbe3bd..4998ee3 100644 _filtersPresenter->saveSettings(settings); -@@ -1064,7 +1090,7 @@ void MainWindow::saveSettings() +@@ -1022,7 +1050,7 @@ void MainWindow::saveSettings() void MainWindow::loadSettings() { @@ -1208,7 +1215,7 @@ index 7cbe3bd..4998ee3 100644 _filtersPresenter->loadSettings(settings); _lastExecutionOK = settings.value("LastExecution/ExitedNormally", true).toBool(); _newSession = host_app_pid() != settings.value("LastExecution/HostApplicationID", 0).toUInt(); -@@ -1079,9 +1105,11 @@ void MainWindow::loadSettings() +@@ -1037,9 +1065,11 @@ void MainWindow::loadSettings() if (settings.value("Config/PreviewPosition", "Left").toString() == "Left") { setPreviewPosition(PreviewPosition::Left); } @@ -1220,7 +1227,7 @@ index 7cbe3bd..4998ee3 100644 if (!Settings::visibleLogos()) { ui->logosLabel->hide(); } -@@ -1125,7 +1153,7 @@ void MainWindow::loadSettings() +@@ -1083,7 +1113,7 @@ void MainWindow::loadSettings() ui->splitter->setSizes(sizes); } @@ -1229,7 +1236,7 @@ index 7cbe3bd..4998ee3 100644 } void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position) -@@ -1187,7 +1215,7 @@ void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position) +@@ -1145,7 +1175,7 @@ void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position) void MainWindow::adjustVerticalSplitter() { QList sizes; @@ -1238,7 +1245,7 @@ index 7cbe3bd..4998ee3 100644 sizes.push_back(settings.value(QString("Config/ParamsVerticalSplitterSizeTop"), -1).toInt()); sizes.push_back(settings.value(QString("Config/ParamsVerticalSplitterSizeBottom"), -1).toInt()); const int splitterHeight = ui->verticalSplitter->height(); -@@ -1316,17 +1344,19 @@ bool MainWindow::askUserForGTKFavesImport() +@@ -1274,17 +1304,19 @@ bool MainWindow::askUserForGTKFavesImport() QMessageBox::Yes | QMessageBox::No, this); messageBox.setDefaultButton(QMessageBox::Yes); QCheckBox * cb = new QCheckBox(tr("Don't ask again")); @@ -1260,7 +1267,7 @@ index 7cbe3bd..4998ee3 100644 return false; } diff --git a/gmic-qt/src/MainWindow.h b/gmic-qt/src/MainWindow.h -index dcc76e6..545bac0 100644 +index fb5977c..df5736a 100644 --- a/gmic-qt/src/MainWindow.h +++ b/gmic-qt/src/MainWindow.h @@ -71,7 +71,9 @@ public: @@ -1274,7 +1281,7 @@ index dcc76e6..545bac0 100644 public slots: diff --git a/gmic-qt/src/Settings.cpp b/gmic-qt/src/Settings.cpp -index 00ec64b..2b2cd41 100644 +index c50020c..08c1c89 100644 --- a/gmic-qt/src/Settings.cpp +++ b/gmic-qt/src/Settings.cpp @@ -75,7 +75,7 @@ QString Settings::NegativeSign('-'); @@ -1290,18 +1297,19 @@ index 00ec64b..2b2cd41 100644 bool Settings::darkThemeEnabled() { +- return _darkThemeEnabled; +#ifdef _GMIC_QT_DISABLE_THEMING_ + return GmicQtHost::DarkThemeIsDefault; +#else - return _darkThemeEnabled; ++ return _darkThemeEnabled; +#endif } void Settings::setDarkThemeEnabled(bool on) -@@ -272,8 +276,10 @@ void Settings::save(QSettings & settings) +@@ -271,8 +275,10 @@ void Settings::save(QSettings & settings) + { removeObsoleteKeys(settings); settings.setValue("LogosAreVisible", _visibleLogos); - settings.setValue(DARK_THEME_KEY, _darkThemeEnabled); +#ifndef _GMIC_QT_DISABLE_TRANSLATION_ settings.setValue(LANGUAGE_CODE_KEY, _languageCode); settings.setValue(ENABLE_FILTER_TRANSLATION, _filterTranslationEnabled); @@ -1326,7 +1334,7 @@ index fae4d99..6b721ce 100644 QString TagAssets::colorName(TagColor color) diff --git a/gmic-qt/src/Widgets/InOutPanel.cpp b/gmic-qt/src/Widgets/InOutPanel.cpp -index 6d77179..4fc20cd 100644 +index 2a30f99..535ba84 100644 --- a/gmic-qt/src/Widgets/InOutPanel.cpp +++ b/gmic-qt/src/Widgets/InOutPanel.cpp @@ -157,10 +157,12 @@ void InOutPanel::onResetButtonClicked() @@ -1336,7 +1344,7 @@ index 6d77179..4fc20cd 100644 +#ifndef _GMIC_QT_DISABLE_THEMING_ void InOutPanel::setDarkTheme() { - ui->tbReset->setIcon(LOAD_ICON("view-refresh")); + ui->tbReset->setIcon(IconLoader::load("view-refresh")); } +#endif @@ -1417,4 +1425,3 @@ index 10b7ec8..f03ef4c 100644 -- 2.40.0 -