Version 0.12.2.0 Stable - Check the CHANGELOG for information on the …

…new version

CHANGELOG

@@ -1,3 +1,12 @@
+0.12.2.0 – 2024-03-10
+- Fixed problem with resolution settings when converting from PDF to image
+- Fixed bug with the resolution setting of PNG images
+- Fixed bug with displaying the resolution correctly in the UI
+- Fixed problem with program icon display in Wayland
+- Fixed problem with displaying dialogs in Wayland
+- Updated French translation
+- Various Bugfixes
+
 0.12.1.0 – 2024-02-06
 - Fixed an issue with setting the resolution accurately when supported by images
 - Fixed an issue with setting the correct resolution when converting PDF to image files

CMakeLists.txt

@@ -4,7 +4,7 @@ if(WIN32)
     cmake_policy(SET CMP0135 NEW)
 endif()
 
-set(CONVERSEEN_VERSION 0.12.1.0)
+set(CONVERSEEN_VERSION 0.12.2.0)
 
 project(
     converseen

converseen.appdata.xml

@@ -71,17 +71,20 @@
     <url type="help">https://converseen.fasterland.net/help/</url>
     <url type="contact">https://converseen.fasterland.net/contact-me/</url>
     <releases>
-        <release version="0.12.1.0" date="2024-02-06">
+        <release version="0.12.2.0" date="2024-03-10">
             <description>
                 <ol>
-                    <li>Fixed an issue with setting the resolution accurately when supported by images</li>
-                    <li>Fixed an issue with setting the correct resolution when converting PDF to image files</li>
-                    <li>Updated icon to modern design, aligning with contemporary styles</li>
+                    <li>Fixed problem with resolution settings when converting from PDF to image</li>
+                    <li>Fixed bug with the resolution setting of PNG images</li>
+                    <li>Fixed bug with displaying the resolution correctly in the UI</li>
+                    <li>Fixed problem with program icon display in Wayland</li>
+                    <li>Fixed problem with displaying dialogs in Wayland</li>
                     <li>Updated Italian translation</li>
                     <li>Various Bugfixes</li>
                 </ol>
             </description>
         </release>
+        <release version="0.12.1.0" date="2024-02-06" />
         <release version="0.12.0.2" date="2024-01-08" />
         <release version="0.12.0.1" date="2023-12-16" />
         <release version="0.12.0.0" date="2023-11-26" />

converseen.rc

@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "res\\converseen.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,12,1,0
- PRODUCTVERSION 0,12,1,0
+ FILEVERSION 0,12,2,0
+ PRODUCTVERSION 0,12,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,13 +80,13 @@ BEGIN
             VALUE "Comments", "The batch image converter and resizer"
             VALUE "CompanyName", "Francesco Mondello"
             VALUE "FileDescription", "Converseen - The batch converter and resizer"
-            VALUE "FileVersion", "0.12.1.0"
+            VALUE "FileVersion", "0.12.2.0"
             VALUE "InternalName", "Converseen"
             VALUE "LegalCopyright", "(C) 2009 - 2024 Francesco Mondello GNU - GPL"
             VALUE "LegalTrademarks", "(C) 2009 - 2024 Francesco Mondello GNU - GPL"
             VALUE "OriginalFilename", "converseen.exe"
             VALUE "ProductName", "Converseen"
-            VALUE "ProductVersion", "0.12.1.0"
+            VALUE "ProductVersion", "0.12.2.0"
         END
     END
     BLOCK "VarFileInfo"

package/AppImage/finalize-appimage.sh

@@ -4,7 +4,7 @@ set -x
 set -e
 
 PROGRAM_NAME="Converseen"
-PROGRAM_VERSION="0.12.1.0"
+PROGRAM_VERSION="0.12.2.0"
 BUILD_VERSION="1"
 ARCH=$(uname -m)
 

package/Snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: converseen
-version: '0.12.1.0'
+version: '0.12.2.0'
 summary: Converseen - A Batch Image Converter, Resizer and Processor for your Pictures!
 description: |
   Converseen is a free and cross-platform batch image processor that allows you to convert, resize, rotate, and flip an infinite number of images with a     mouse click. Converseen is also able to transform an entire PDF file into a group of images with the characteristics you prefer: you can choose one of the 100+ formats, set the size, resolution, and the filename.

package/Windows/version.txt

@@ -1 +1 @@
-0.12.1.0-2
+0.12.2.0-2

package/macOS/version.txt

@@ -1 +1 @@
-0.12.1.0-1
+0.12.2.0-1

src/converter.cpp

@@ -96,8 +96,6 @@ void Converter::run()
 
         if (m_resize)
             resize(my_image);
-        if (m_density)
-            changeDensity(my_image);
         if (m_rotation)
             rotate(my_image);
         if (m_flip)
@@ -200,17 +198,10 @@ void Converter::resize(Image &my_image)
 
 void Converter::setDensity(QString densityStr)
 {
-    m_densityString = densityStr;
+    m_densityString = densityStr;//.replace(".", ",");
     m_density = true;
 }
 
-void Converter::changeDensity(Image &my_image)
-{
-    QString n_den = QString(m_densityString);
-    my_image.resolutionUnits(PixelsPerInchResolution);
-    my_image.density(n_den.toStdString());
-}
-
 void Converter::setBackgroundColor(QString bg_color, bool changeBg_color)
 {
     m_bg_color = bg_color;
@@ -302,9 +293,8 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu
         bgImg.size(Magick::Geometry(my_image.columns(), my_image.rows()));
 
         if (m_density) {
-            bgImg.resolutionUnits(PixelsPerInchResolution);
-            QString n_den = QString(m_densityString);
-            bgImg.density(n_den.toStdString());
+            //bgImg.resolutionUnits(PixelsPerInchResolution);
+            bgImg.density(m_densityString.toStdString());
         }
 
         bgImg.read("xc:" + m_bg_color.toStdString());
@@ -318,14 +308,14 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu
 
     bool converted = false;
 
-    if (quality != -1)
-        my_image.quality(quality);
-
     if (m_removeMetadata) {
         my_image.strip();
         my_image.autoOrient();
     }
 
+    if (quality != -1)
+        my_image.quality(quality);
+
     if (!m_magickDefines.empty()) {
         for (int i = 0; i < m_magickDefines.count(); i++) {
             MagickDefine mDef = m_magickDefines.at(i);
@@ -334,6 +324,11 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu
         }
     }
 
+    if (m_density) {
+        //my_image.resolutionUnits(PixelsPerInchResolution);
+        my_image.density(m_densityString.toStdString());
+    }
+
     try {
         my_image.write(out.toStdString());
         converted = true;
@@ -351,7 +346,6 @@ Image Converter::convertPDFtoImage(const Image &my_image)
     // Transform PDF page to image
 
     Image ximage;
-
     ximage.magick(my_image.magick());
 
 #if MagickLibVersion < 0x700
@@ -362,10 +356,9 @@ Image Converter::convertPDFtoImage(const Image &my_image)
 
     ximage.quiet(false);
 
-    ximage.resolutionUnits(PixelsPerInchResolution);
+    //ximage.resolutionUnits(PixelsPerInchResolution);
     if (m_density) {
-        QString n_den = QString(m_densityString);
-        ximage.density(n_den.toStdString());
+        ximage.density(m_densityString.toStdString());
     }
     else {
         ximage.density("150x150");

src/converter.h

@@ -70,7 +70,6 @@ class Converter : public QThread
     QMutex mutex;
 private:
     void resize(Image &my_image);
-    void changeDensity(Image &my_image);
     void rotate(Image &my_image);
     void flip(Image &my_image);
     bool writeImage(Image &my_image, const QString &format, const int &quality, const QString &out, QString &error_status);

src/globals.h

@@ -41,8 +41,8 @@ using namespace std;
 namespace globals
 {
     const QString PROGRAM_NAME = "Converseen";
-    const int CURRENT_INTERNAL_VERSION = 1310;
-    const QString VERSION = "0.12.1.0";
+    const int CURRENT_INTERNAL_VERSION = 1320;
+    const QString VERSION = "0.12.2.0";
 
     class Globals
     {

src/main.cpp

@@ -51,6 +51,7 @@ int main(int argc, char ** argv)
 #endif
 
     QApplication app( argc, argv );
+    app.setDesktopFileName("net.fasterland.converseen");
 
     QCommandLineOption winMagickPathOption({{"m", "debugMagickWindowsPath"}, "Set the default ImageMagick path on Windows (for debug purpose only!).", "C:\\MagickInstallPath"});
     QCommandLineOption importTxtListOption({{"l", "list"}, "Reads a txt file with a list of files to be imported.", "list.txt"});

src/mainwindowimpl.cpp

@@ -45,7 +45,7 @@ MainWindowImpl::MainWindowImpl(QWidget * parent)
 
     iAList = new QList<ImageAttributes>;
     convertThread = new Converter(this);
-    dlgCStatus = new DialogConversionStatus();
+    dlgCStatus = new DialogConversionStatus(this);
 
     CachingSystem::init();
 
@@ -310,7 +310,7 @@ void MainWindowImpl::importPdfFile()
 
 void MainWindowImpl::openMultipageFile(QString fileName)
 {
-    DialogMultipageEditor *dlg = new DialogMultipageEditor();
+    DialogMultipageEditor *dlg = new DialogMultipageEditor(this);
 
     statusBar()->showMessage(tr("Analyzing the file. It may take a while, please wait..."));
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -505,8 +505,8 @@ void MainWindowImpl::startConversion()
     /* Change image density */
     if ((groupResolution->isChecked()) && ((m_xResolution != spin_resX->value()) || (m_yResolution != spin_resY->value()))) {
         QString densStr = QString("%1x%2")
-                .arg(spin_resX->value())
-                .arg(spin_resY->value());
+                              .arg(spin_resX->value())
+                              .arg(spin_resY->value());
 
         convertThread->setDensity(densStr);
     }
@@ -751,7 +751,7 @@ void MainWindowImpl::setQuality()
 {
     loadQuality();
 
-    DialogQuality *dlg = new DialogQuality();
+    DialogQuality *dlg = new DialogQuality(this);
     dlg->setInitValues(m_jpgQuality, m_pngQuality, m_resamplingFilter);
 
     dlg->setIsWebPLosslessCompression(m_isWebPLosslessCompression);
@@ -947,7 +947,7 @@ void MainWindowImpl::showPreviewAndInfos()
 
 void MainWindowImpl::editSettings()
 {
-    DialogOptions dlg;
+    DialogOptions dlg(this);
     dlg.exec();
 
     if (dlg.result() == 1) {
@@ -957,7 +957,7 @@ void MainWindowImpl::editSettings()
 
 void MainWindowImpl::about()
 {
-    DialogInfo dlg;
+    DialogInfo dlg(this);
     dlg.exec();
 }
 
@@ -1064,11 +1064,11 @@ void MainWindowImpl::resetDisplays()
     new_img_width = 0;
     new_img_height = 0;
 
-    m_xResolution = 96;
-    m_yResolution = 96;
+    m_xResolution = 0;
+    m_yResolution = 0;
 
-    spin_resX->setValue(96);
-    spin_resY->setValue(96);
+    spin_resX->setValue(0);
+    spin_resY->setValue(0);
 
     if (comboResizeValues->currentText() == "%") {
         spin_geoWidth->setValue(100);

src/thumbnailgeneratorthread.cpp

@@ -106,30 +106,34 @@ void ThumbnailGeneratorThread::createThumbnail()
     double img_dens_x = 0.0;
     double img_dens_y = 0.0;
 
+    my_image.quiet(true);
+
     if (Formats::isNativeReadable(m_fileName)) {
         tmpImage.load(m_fileName);
 
         img_width = tmpImage.width();
         img_height = tmpImage.height();
 
-        img_dens_x = tmpImage.logicalDpiX();
-        img_dens_y = tmpImage.logicalDpiY();
+        my_image.ping(m_fileName.toStdString());
+
+        img_dens_x = my_image.xResolution();
+        img_dens_y = my_image.yResolution();
 
         qreal scaleFactor = globals::Globals::scaleFactor();
 
         if (m_generateThumbnail) {
             thumbnail = tmpImage.scaled(QSize(MAX_THUMB_W, MAX_THUMB_H) * scaleFactor,
                                        Qt::KeepAspectRatio,
                                        Qt::SmoothTransformation);
-
         }
     }
     else {
         try
         {
-            my_image.quiet(true);
             my_image.read(m_fileName.toStdString());
 
+            my_image.resolutionUnits(PixelsPerInchResolution);
+
             img_width = my_image.columns();
             img_height = my_image.rows();