From c44060196bc385ee26a6ec3d501ae057a6d83b13 Mon Sep 17 00:00:00 2001
From: RivinHD <58261670+RivinHD@users.noreply.github.com>
Date: Thu, 29 Jul 2021 22:39:37 +0200
Subject: [PATCH 01/67] Update gimp.py
- fixed prints
- fixed subprocess.Popen -> Cyan doesn't get launched
---
res/gimp.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/res/gimp.py b/res/gimp.py
index 12561cc0..30186cfd 100755
--- a/res/gimp.py
+++ b/res/gimp.py
@@ -17,7 +17,7 @@ def plugin_maketempfile( image, src ):
tempimage = pdb.gimp_image_duplicate( image )
if not tempimage:
- print "Could not create temporary image file."
+ print("Could not create temporary image file.")
return None, None, None
tempfilename = pdb.gimp_temp_name( "tif" )
@@ -48,7 +48,7 @@ def plugin_export( image, src):
pdb.gimp_image_undo_group_start(image)
pdb.gimp_progress_pulse()
- child = subprocess.Popen( cyanbin + " " + tempfilename, stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True )
+ child = subprocess.Popen( [cyanbin, tempfilename], stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True )
pdb.gimp_progress_set_text( "Waiting on Cyan ..." )
while child.poll() is None:
@@ -67,7 +67,7 @@ def plugin_import(image,src):
pdb.gimp_image_undo_group_start(image)
pdb.gimp_progress_pulse()
- child = subprocess.Popen( cyanbin + " -o " + tempfilename, stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True )
+ child = subprocess.Popen( [cyanbin, "-o", tempfilename], stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True )
pdb.gimp_progress_set_text( "Waiting on Cyan ..." )
while child.poll() is None:
@@ -96,7 +96,7 @@ def plugin_saveresult( image, dest, tempfilename, tempimage ):
gimp.Display( newimage )
except:
- print "Could not load tmep file as new image."
+ print("Could not load tmep file as new image.")
elif dest == 1:
# Replace current layer
@@ -110,7 +110,7 @@ def plugin_saveresult( image, dest, tempfilename, tempimage ):
image.add_layer( newlayer, pos )
except:
- print "Could not load temp file into existing layer."
+ print("Could not load temp file into existing layer.")
elif dest == 2:
# Add as a new layer in the opened image
@@ -119,7 +119,7 @@ def plugin_saveresult( image, dest, tempfilename, tempimage ):
image.add_layer( newlayer,0 )
except:
- print "Could not load temp file into new layer."
+ print("Could not load temp file into new layer.")
# cleanup
plugin_tidyup( tempfilename )
From 354f03a97eaaba6681c1d93f6ed20da566a7d4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?=
Date: Sun, 26 Sep 2021 17:27:07 +0200
Subject: [PATCH 02/67] qmake win32 fix
---
cyan.pro | 4 ++--
tests.pro | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cyan.pro b/cyan.pro
index d9e55b97..71910a54 100644
--- a/cyan.pro
+++ b/cyan.pro
@@ -68,7 +68,7 @@ PKG_CONFIG_BIN = pkg-config
!isEmpty(CUSTOM_PKG_CONFIG): PKG_CONFIG_BIN = $${CUSTOM_PKG_CONFIG}
PKGCONFIG += $${MAGICK_CONFIG}
-LIBS += `$${PKG_CONFIG_BIN} --libs --static $${MAGICK_CONFIG}`
+#LIBS += `$${PKG_CONFIG_BIN} --libs --static $${MAGICK_CONFIG}`
isEmpty(PREFIX): PREFIX = /usr/local
isEmpty(DOCDIR): DOCDIR = $$PREFIX/share/doc
@@ -136,5 +136,5 @@ mac {
win32 {
RC_ICONS += res/cyan.ico
- LIBS += -lpthread
+ #LIBS += -lpthread
}
diff --git a/tests.pro b/tests.pro
index 5f815167..615dd4cc 100644
--- a/tests.pro
+++ b/tests.pro
@@ -43,7 +43,7 @@ MOC_DIR = $${DESTDIR}/.moc
RCC_DIR = $${DESTDIR}/.qrc
unix:QMAKE_POST_LINK = ./build/$${TARGET}
-win32-g++:QMAKE_POST_LINK = "wine64 build/$${TARGET}.exe"
+#win32-g++:QMAKE_POST_LINK = "wine64 build/$${TARGET}.exe"
CONFIG += c++11
QT_CONFIG -= no-pkg-config
@@ -55,7 +55,7 @@ PKG_CONFIG_BIN = pkg-config
!isEmpty(CUSTOM_PKG_CONFIG): PKG_CONFIG_BIN = $${CUSTOM_PKG_CONFIG}
PKGCONFIG += $${MAGICK_CONFIG}
-LIBS += `$${PKG_CONFIG_BIN} --libs --static $${MAGICK_CONFIG}`
+#LIBS += `$${PKG_CONFIG_BIN} --libs --static $${MAGICK_CONFIG}`
mac {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
@@ -63,4 +63,4 @@ mac {
QMAKE_LFLAGS += -fopenmp
}
-win32-g++: LIBS += -lpthread
+#win32-g++: LIBS += -lpthread
From d018593523397eee652fd0eb7d5a1bf545de9f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?=
Date: Tue, 5 Oct 2021 18:57:49 +0200
Subject: [PATCH 03/67] ui fixes
---
src/cyan.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/cyan.cpp b/src/cyan.cpp
index 8871dcb9..d3e6041e 100644
--- a/src/cyan.cpp
+++ b/src/cyan.cpp
@@ -58,11 +58,11 @@
#include "helpdialog.h"
#include "openlayerdialog.h"
-#ifdef Q_OS_MAC
+/*#ifdef Q_OS_MAC
#define CYAN_FONT_SIZE 10
#else
#define CYAN_FONT_SIZE 8
-#endif
+#endif*/
Cyan::Cyan(QWidget *parent)
: QMainWindow(parent)
@@ -123,7 +123,7 @@ Cyan::Cyan(QWidget *parent)
palette.setColor(QPalette::Disabled, QPalette::Text, Qt::darkGray);
palette.setColor(QPalette::Disabled, QPalette::ButtonText, Qt::darkGray);
qApp->setPalette(palette);
- setStyleSheet(QString("*{ font-size: %1pt; }").arg(QString::number(CYAN_FONT_SIZE)));
+ //setStyleSheet(QString("*{ font-size: %1pt; }").arg(QString::number(CYAN_FONT_SIZE)));
}
setWindowTitle(qApp->applicationName());
setWindowIcon(QIcon(":/cyan.png"));
@@ -147,7 +147,7 @@ Cyan::Cyan(QWidget *parent)
mainBar->setAllowedAreas(Qt::LeftToolBarArea);
mainBar->setFloatable(false);
mainBar->setMovable(false);
- mainBar->setIconSize(QSize(22,22));
+ //mainBar->setIconSize(QSize(22,22));
convertBar->setObjectName("ColorConverter");
convertBar->setWindowTitle(tr("Color Converter"));
@@ -245,7 +245,7 @@ Cyan::Cyan(QWidget *parent)
QLabel *bitDepthLabel = new QLabel(tr("Depth"), this);
QLabel *qualityLabel = new QLabel(tr("Quality"), this);
- if (!nativeStyle) {
+ /*if (!nativeStyle) {
QString padding = "margin-right:5px;";
inputLabel->setStyleSheet(padding);
outputLabel->setStyleSheet(padding);
@@ -257,7 +257,7 @@ Cyan::Cyan(QWidget *parent)
grayLabel->setStyleSheet(padding);
bitDepthLabel->setStyleSheet(padding);
qualityLabel->setStyleSheet(padding);
- }
+ }*/
inputLabel->setToolTip(tr("Input profile for image"));
outputLabel->setToolTip(tr("Profile used to convert image"));
@@ -335,7 +335,7 @@ Cyan::Cyan(QWidget *parent)
menuBar->addMenu(fileMenu);
menuBar->addMenu(helpMenu);
- menuBar->setMaximumHeight(20);
+ //menuBar->setMaximumHeight(20);
QAction *aboutAction = new QAction(tr("About %1")
.arg(qApp->applicationName()), this);
From 26c3c886b961ac3e11ad8d772d4066bd8b4f866d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?=
Date: Tue, 5 Oct 2021 19:07:20 +0200
Subject: [PATCH 04/67] bump version etc
---
CMakeLists.txt | 4 ++--
cyan.pro | 8 ++++----
docs/ChangeLog | 7 +++++++
docs/cyan.html | 4 ----
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4786645..910246be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@
cmake_minimum_required(VERSION 3.1)
enable_testing()
-project(Cyan VERSION 1.2.2)
+project(Cyan VERSION 1.2.3)
if(NOT PROJECT_VERSION_TWEAK)
set(PROJECT_VERSION_TWEAK 0)
@@ -64,7 +64,7 @@ endif()
if(APPLE)
set(ICON_FILE ${RESOURCE_FOLDER}/${PROJECT_NAME}.icns)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
+ #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
set_source_files_properties(${PROJECT_NAME}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
diff --git a/cyan.pro b/cyan.pro
index 71910a54..21fcc9ac 100644
--- a/cyan.pro
+++ b/cyan.pro
@@ -29,7 +29,7 @@
# knowledge of the CeCILL license and that you accept its terms.
TARGET = Cyan
-VERSION = 1.2.2
+VERSION = 1.2.3
SOURCES += \
src/main.cpp \
@@ -129,9 +129,9 @@ unix:!mac {
mac {
ICON = res/Cyan.icns
QMAKE_INFO_PLIST = res/Info.plist
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
- QMAKE_CXXFLAGS += -fopenmp
- QMAKE_LFLAGS += -fopenmp
+ #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
+ #QMAKE_CXXFLAGS += -fopenmp
+ #QMAKE_LFLAGS += -fopenmp
}
win32 {
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 486f6682..b182da86 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,10 @@
+## 1.2.3 - 20211106
+
+ * UI fixes
+ * Windows fixes
+ * Gimp fixes
+ * Downgraded to ImageMagick 6
+
## 1.2.2 - 20191103
* Added support for output compression quality
diff --git a/docs/cyan.html b/docs/cyan.html
index c5a26355..db8dce31 100644
--- a/docs/cyan.html
+++ b/docs/cyan.html
@@ -106,9 +106,5 @@ Open Source
_3RDPARTY_
-Hosted on Github and Sourceforge. Travis CI is used to build and deploy the binaries.
-
-
-