pool/gmic
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.1.6

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=77
This commit is contained in:
Christophe Giboudeaux 2022-09-02 08:02:55 +00:00 committed by Git OBS Bridge
parent 03b7ff84ee
commit 09a2df5ee4
5 changed files with 90 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gmic.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 2 07:08:01 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 3.1.6
* HiDPI support added to gmic-qt
- Rebase krita5.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 25 07:44:24 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr> Thu Aug 25 07:44:24 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

2
gmic.spec
View File

@ -40,7 +40,7 @@
%define gmic_datadir %{_datadir}/gmic %define gmic_datadir %{_datadir}/gmic
Name: gmic Name: gmic
Version: 3.1.5 Version: 3.1.6
Release: 0 Release: 0
Summary: GREYC's Magick for Image Computing (denoise and others) 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 # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are

3
gmic_3.1.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa77e85b3a39638008515ac525f23f0ed7a45b63c463c0ba6292c87f5e88e30d
size 10782647

3
gmic_3.1.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
size 10843311

38
krita5.patch
View File

@ -148,7 +148,7 @@ index 0000000..579d427
+Categories=Qt;KDE;Graphics; +Categories=Qt;KDE;Graphics;
+StartupNotify=false +StartupNotify=false
diff --git a/gmic-qt/src/DialogSettings.cpp b/gmic-qt/src/DialogSettings.cpp diff --git a/gmic-qt/src/DialogSettings.cpp b/gmic-qt/src/DialogSettings.cpp
index 5f49314..2bc8b9b 100644 index e89eafb..051122e 100644
--- a/gmic-qt/src/DialogSettings.cpp --- a/gmic-qt/src/DialogSettings.cpp
+++ b/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 @@ -56,11 +56,7 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D
@ -178,7 +178,7 @@ index 5f49314..2bc8b9b 100644
ui->cbNativeColorDialogs->setChecked(Settings::nativeColorDialogs()); ui->cbNativeColorDialogs->setChecked(Settings::nativeColorDialogs());
ui->cbNativeColorDialogs->setToolTip(tr("Check to use Native/OS color dialog, uncheck to use Qt's")); ui->cbNativeColorDialogs->setToolTip(tr("Check to use Native/OS color dialog, uncheck to use Qt's"));
ui->cbShowLogos->setChecked(Settings::visibleLogos()); ui->cbShowLogos->setChecked(Settings::visibleLogos());
@@ -93,22 +92,41 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D @@ -94,23 +93,42 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D
connect(ui->pbOk, &QPushButton::clicked, this, &DialogSettings::onOk); connect(ui->pbOk, &QPushButton::clicked, this, &DialogSettings::onOk);
connect(ui->rbLeftPreview, &QRadioButton::toggled, this, &DialogSettings::onRadioLeftPreviewToggled); connect(ui->rbLeftPreview, &QRadioButton::toggled, this, &DialogSettings::onRadioLeftPreviewToggled);
@ -208,6 +208,7 @@ index 5f49314..2bc8b9b 100644
+#else +#else
connect(ui->cbNotifyFailedUpdate, &QCheckBox::toggled, this, &DialogSettings::onNotifyStartupUpdateFailedToggle); connect(ui->cbNotifyFailedUpdate, &QCheckBox::toggled, this, &DialogSettings::onNotifyStartupUpdateFailedToggle);
+#endif +#endif
connect(ui->cbHighDPI, &QCheckBox::toggled, this, &DialogSettings::onHighDPIToggled);
+#ifdef _GMIC_QT_DISABLE_TRANSLATION_ +#ifdef _GMIC_QT_DISABLE_TRANSLATION_
+ ui->languageSelector->setEnabled(false); + ui->languageSelector->setEnabled(false);
@ -220,15 +221,15 @@ index 5f49314..2bc8b9b 100644
if (Settings::darkThemeEnabled()) { if (Settings::darkThemeEnabled()) {
QPalette p = ui->cbNativeColorDialogs->palette(); QPalette p = ui->cbNativeColorDialogs->palette();
p.setColor(QPalette::Text, Settings::CheckBoxTextColor); p.setColor(QPalette::Text, Settings::CheckBoxTextColor);
@@ -123,6 +141,7 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D @@ -126,6 +144,7 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D
ui->cbShowLogos->setPalette(p);
ui->cbNotifyFailedUpdate->setPalette(p); ui->cbNotifyFailedUpdate->setPalette(p);
ui->cbHighDPI->setPalette(p);
} }
+#endif +#endif
ui->pbOk->setFocus(); ui->pbOk->setFocus();
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
} }
@@ -139,7 +158,7 @@ void DialogSettings::onOk() @@ -142,7 +161,7 @@ void DialogSettings::onOk()
void DialogSettings::done(int r) void DialogSettings::done(int r)
{ {
@ -344,10 +345,10 @@ index 7ea2564..0719e17 100644
} }
} }
diff --git a/gmic-qt/src/Globals.h b/gmic-qt/src/Globals.h diff --git a/gmic-qt/src/Globals.h b/gmic-qt/src/Globals.h
index 9d38982..782a732 100644 index 0515a52..7781e4b 100644
--- a/gmic-qt/src/Globals.h --- a/gmic-qt/src/Globals.h
+++ b/gmic-qt/src/Globals.h +++ b/gmic-qt/src/Globals.h
@@ -55,7 +55,13 @@ const char WarningPrefix = '!'; @@ -56,7 +56,13 @@ const char WarningPrefix = '!';
#define ONE_WEEK_HOURS (7 * 24) #define ONE_WEEK_HOURS (7 * 24)
#define TWO_WEEKS_HOURS (14 * 24) #define TWO_WEEKS_HOURS (14 * 24)
#define ONE_MONTH_HOURS (30 * 24) #define ONE_MONTH_HOURS (30 * 24)
@ -361,7 +362,7 @@ index 9d38982..782a732 100644
#define PREVIEW_MAX_ZOOM_FACTOR 40.0 #define PREVIEW_MAX_ZOOM_FACTOR 40.0
@@ -64,4 +70,17 @@ const char WarningPrefix = '!'; @@ -65,4 +71,17 @@ const char WarningPrefix = '!';
#define KEYPOINTS_INTERACTIVE_MIDDLE_DELAY_MS ((KEYPOINTS_INTERACTIVE_LOWER_DELAY_MS + KEYPOINTS_INTERACTIVE_UPPER_DELAY_MS) / 2) #define KEYPOINTS_INTERACTIVE_MIDDLE_DELAY_MS ((KEYPOINTS_INTERACTIVE_LOWER_DELAY_MS + KEYPOINTS_INTERACTIVE_UPPER_DELAY_MS) / 2)
#define KEYPOINTS_INTERACTIVE_AVERAGING_COUNT 6 #define KEYPOINTS_INTERACTIVE_AVERAGING_COUNT 6
@ -408,7 +409,7 @@ index caf4c2f..55f8a2a 100644
const cimg_library::CImg<float> & previewImage() const; const cimg_library::CImg<float> & previewImage() const;
diff --git a/gmic-qt/src/GmicQt.cpp b/gmic-qt/src/GmicQt.cpp diff --git a/gmic-qt/src/GmicQt.cpp b/gmic-qt/src/GmicQt.cpp
index 646aac1..ab889fa 100644 index 080514f..7bbc877 100644
--- a/gmic-qt/src/GmicQt.cpp --- a/gmic-qt/src/GmicQt.cpp
+++ b/gmic-qt/src/GmicQt.cpp +++ b/gmic-qt/src/GmicQt.cpp
@@ -90,7 +90,7 @@ RunParameters lastAppliedFilterRunParameters(ReturnedRunParametersFlag flag) @@ -90,7 +90,7 @@ RunParameters lastAppliedFilterRunParameters(ReturnedRunParametersFlag flag)
@ -429,7 +430,7 @@ index 646aac1..ab889fa 100644
mainWindow.showMaximized(); mainWindow.showMaximized();
} else { } else {
mainWindow.show(); mainWindow.show();
@@ -548,10 +548,12 @@ namespace @@ -548,9 +548,11 @@ namespace
void configureApplication() void configureApplication()
{ {
@ -437,11 +438,10 @@ index 646aac1..ab889fa 100644
QCoreApplication::setOrganizationName(GMIC_QT_ORGANISATION_NAME); QCoreApplication::setOrganizationName(GMIC_QT_ORGANISATION_NAME);
QCoreApplication::setOrganizationDomain(GMIC_QT_ORGANISATION_DOMAIN); QCoreApplication::setOrganizationDomain(GMIC_QT_ORGANISATION_DOMAIN);
QCoreApplication::setApplicationName(GMIC_QT_APPLICATION_NAME); QCoreApplication::setApplicationName(GMIC_QT_APPLICATION_NAME);
QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif +#endif
} QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
if (QSettings().value(HIGHDPI_KEY, false).toBool()) {
void disableModes(const std::list<GmicQt::InputMode> & disabledInputModes, // QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff --git a/gmic-qt/src/HeadlessProcessor.cpp b/gmic-qt/src/HeadlessProcessor.cpp diff --git a/gmic-qt/src/HeadlessProcessor.cpp b/gmic-qt/src/HeadlessProcessor.cpp
index 0f88b32..c7ed61b 100644 index 0f88b32..c7ed61b 100644
--- a/gmic-qt/src/HeadlessProcessor.cpp --- a/gmic-qt/src/HeadlessProcessor.cpp
@ -1276,10 +1276,10 @@ index 8e5bc09..abd9727 100644
public slots: public slots:
diff --git a/gmic-qt/src/Settings.cpp b/gmic-qt/src/Settings.cpp diff --git a/gmic-qt/src/Settings.cpp b/gmic-qt/src/Settings.cpp
index 4ca42ef..72461e9 100644 index 18b24f8..79ed316 100644
--- a/gmic-qt/src/Settings.cpp --- a/gmic-qt/src/Settings.cpp
+++ b/gmic-qt/src/Settings.cpp +++ b/gmic-qt/src/Settings.cpp
@@ -66,7 +66,7 @@ QString Settings::NegativeSign('-'); @@ -67,7 +67,7 @@ QString Settings::NegativeSign('-');
void Settings::load(UserInterfaceMode userInterfaceMode) void Settings::load(UserInterfaceMode userInterfaceMode)
{ {
@ -1288,7 +1288,7 @@ index 4ca42ef..72461e9 100644
_visibleLogos = settings.value("LogosAreVisible", true).toBool(); _visibleLogos = settings.value("LogosAreVisible", true).toBool();
_darkThemeEnabled = settings.value(DARK_THEME_KEY, GmicQtHost::DarkThemeIsDefault).toBool(); _darkThemeEnabled = settings.value(DARK_THEME_KEY, GmicQtHost::DarkThemeIsDefault).toBool();
_languageCode = settings.value(LANGUAGE_CODE_KEY, QString()).toString(); _languageCode = settings.value(LANGUAGE_CODE_KEY, QString()).toString();
@@ -107,7 +107,11 @@ void Settings::setVisibleLogos(bool on) @@ -109,7 +109,11 @@ void Settings::setVisibleLogos(bool on)
bool Settings::darkThemeEnabled() bool Settings::darkThemeEnabled()
{ {
@ -1300,7 +1300,7 @@ index 4ca42ef..72461e9 100644
} }
void Settings::setDarkThemeEnabled(bool on) void Settings::setDarkThemeEnabled(bool on)
@@ -210,8 +214,10 @@ void Settings::save(QSettings & settings) @@ -222,8 +226,10 @@ void Settings::save(QSettings & settings)
removeObsoleteKeys(settings); removeObsoleteKeys(settings);
settings.setValue("LogosAreVisible", _visibleLogos); settings.setValue("LogosAreVisible", _visibleLogos);
settings.setValue(DARK_THEME_KEY, _darkThemeEnabled); settings.setValue(DARK_THEME_KEY, _darkThemeEnabled);
@ -1405,7 +1405,7 @@ index 2fe13cd..d1c67ad 100644
public slots: public slots:
void onCancelClicked(bool); void onCancelClicked(bool);
diff --git a/gmic-qt/ui/dialogsettings.ui b/gmic-qt/ui/dialogsettings.ui diff --git a/gmic-qt/ui/dialogsettings.ui b/gmic-qt/ui/dialogsettings.ui
index 8345152..17d8bb8 100644 index 3ce2ecc..ab5f10e 100644
--- a/gmic-qt/ui/dialogsettings.ui --- a/gmic-qt/ui/dialogsettings.ui
+++ b/gmic-qt/ui/dialogsettings.ui +++ b/gmic-qt/ui/dialogsettings.ui
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@