Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package converseen for openSUSE:Factory checked in at 2021-03-10 08:56:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/converseen (Old) and /work/SRC/openSUSE:Factory/.converseen.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "converseen" Wed Mar 10 08:56:36 2021 rev:36 rq:877752 version:0.9.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2020-02-04 19:57:56.133481957 +0100 +++ /work/SRC/openSUSE:Factory/.converseen.new.2378/converseen.changes 2021-03-10 08:58:16.894952543 +0100 @@ -1,0 +2,9 @@ +Mon Mar 8 13:24:07 UTC 2021 - Kyrill Detinov <lazy.k...@opensuse.org> + +- Update to 0.9.9.0. + * Fixed random crash when all images are removed. + * Some translation updates. + * Various minor updates. + * Various bugfixes. + +------------------------------------------------------------------- Old: ---- converseen-0.9.8.1.tar.bz2 New: ---- converseen-0.9.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ converseen.spec ++++++ --- /var/tmp/diff_new_pack.uc43uP/_old 2021-03-10 08:58:17.454953121 +0100 +++ /var/tmp/diff_new_pack.uc43uP/_new 2021-03-10 08:58:17.458953124 +0100 @@ -1,7 +1,7 @@ # # spec file for package converseen # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: converseen -Version: 0.9.8.1 +Version: 0.9.9.0 Release: 0 Summary: Batch Image Conversion Tool License: GPL-3.0-or-later Group: Productivity/Graphics/Convertors -URL: http://converseen.fasterland.net/ +URL: https://converseen.fasterland.net/ Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: ImageMagick BuildRequires: cmake @@ -54,7 +54,7 @@ %lang_package %prep -%setup -q -n %{name} +%setup -q chmod -x README.md COPYING %build ++++++ converseen-0.9.8.1.tar.bz2 -> converseen-0.9.9.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/converseen.pro new/converseen-0.9.9.0/converseen.pro --- old/converseen/converseen.pro 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/converseen.pro 2021-02-15 13:36:48.000000000 +0100 @@ -70,13 +70,13 @@ } win32 { - INCLUDEPATH += "C:\Program Files (x86)\ImageMagick-7.0.8-Q16-HDRI\include" + INCLUDEPATH += "C:\Program Files (x86)\ImageMagick-7.0.10-Q16-HDRI\include" } else { INCLUDEPATH += /usr/include/ImageMagick-7 } win32 { - LIBS += -L"C:\Program Files (x86)\ImageMagick-7.0.8-Q16-HDRI\lib" -lCORE_RL_Magick++_ -lCORE_RL_MagickCore_ -lCORE_RL_MagickWand_ + LIBS += -L"C:\Program Files (x86)\ImageMagick-7.0.10-Q16-HDRI\lib" -lCORE_RL_Magick++_ -lCORE_RL_MagickCore_ -lCORE_RL_MagickWand_ } else { LIBS += -L/usr/lib -lMagick++-7.Q16HDRI -lMagickWand-7.Q16HDRI -lMagickCore-7.Q16HDRI } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/converseen.rc new/converseen-0.9.9.0/converseen.rc --- old/converseen/converseen.rc 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/converseen.rc 2021-02-15 13:36:48.000000000 +0100 @@ -61,8 +61,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,8,1 - PRODUCTVERSION 0,9,8,1 + FILEVERSION 0,9,9,0 + PRODUCTVERSION 0,9,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,13 +80,13 @@ VALUE "Comments", "The batch image converter and resizer" VALUE "CompanyName", "Francesco Mondello" VALUE "FileDescription", "Converseen - The batch converter and resizer" - VALUE "FileVersion", "0.9.8.1" + VALUE "FileVersion", "0.9.9.0" VALUE "InternalName", "Converseen" - VALUE "LegalCopyright", "(C) 2009 - 2020 Francesco Mondello GNU - GPL" - VALUE "LegalTrademarks", "(C) 2009 - 2020 Francesco Mondello GNU - GPL" + VALUE "LegalCopyright", "(C) 2009 - 2021 Francesco Mondello GNU - GPL" + VALUE "LegalTrademarks", "(C) 2009 - 2021 Francesco Mondello GNU - GPL" VALUE "OriginalFilename", "converseen.exe" VALUE "ProductName", "Converseen" - VALUE "ProductVersion", "0.9.8.1" + VALUE "ProductVersion", "0.9.9.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/converseen.vcxproj new/converseen-0.9.9.0/converseen.vcxproj --- old/converseen/converseen.vcxproj 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/converseen.vcxproj 2021-02-15 13:36:48.000000000 +0100 @@ -72,7 +72,7 @@ <ClCompile> <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions> <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>C:\Program Files (x86)\ImageMagick-7.0.9-Q16-HDRI\include;$(QTDIR)\include;build;..\Qt\4.8.2\mkspecs\win32-msvc2010;.;.\src;.\build;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>C:\Program Files (x86)\ImageMagick-7.0.10-Q16-HDRI\include;$(QTDIR)\include;build;..\Qt\4.8.2\mkspecs\win32-msvc2010;.;.\src;.\build;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>QT_NO_DEBUG;NDEBUG;_WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;_VISUALC_;NeedFunctionPrototypes;_DLL;_MAGICKMOD_;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessToFile>false</PreprocessToFile> <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> @@ -97,7 +97,7 @@ <AdditionalDependencies>qtmain.lib;CORE_RL_MagickCore_.lib;CORE_RL_Magick++_.lib;CORE_RL_MagickWand_.lib;odbc32.lib;odbccp32.lib;winmm.lib;wsock32.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>release\converseen.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> - <AdditionalLibraryDirectories>C:\Program Files (x86)\ImageMagick-7.0.9-Q16-HDRI\lib;$(QTDIR)\lib;D:\documents\Sviluppo\converseen\converseen;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:\Program Files (x86)\ImageMagick-7.0.10-Q16-HDRI\lib;$(QTDIR)\lib;D:\documents\Sviluppo\converseen\converseen;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>false</GenerateDebugInformation> <ProgramDatabaseFile> </ProgramDatabaseFile> @@ -1026,7 +1026,7 @@ </ImportGroup> <ProjectExtensions> <VisualStudio> - <UserProperties RccDir=".\GeneratedFiles" Qt5Version_x0020_Win32="msvc2017" QtVersion_x0020_Win32="4.8.6" /> + <UserProperties Qt5Version_x0020_Win32="msvc2019 32 bit" QtVersion_x0020_Win32="4.8.6" RccDir=".\GeneratedFiles" /> </VisualStudio> </ProjectExtensions> </Project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/loc/converseen_de_DE.ts new/converseen-0.9.9.0/loc/converseen_de_DE.ts --- old/converseen/loc/converseen_de_DE.ts 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/loc/converseen_de_DE.ts 2021-02-15 13:36:48.000000000 +0100 @@ -989,7 +989,7 @@ <message> <location filename="../src/mainwindowimpl.cpp" line="218"/> <source>Open Image</source> - <translation>??ffne Bild</translation> + <translation>Bild ??ffne</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="315"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/loc/converseen_it_IT.ts new/converseen-0.9.9.0/loc/converseen_it_IT.ts --- old/converseen/loc/converseen_it_IT.ts 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/loc/converseen_it_IT.ts 2021-02-15 13:36:48.000000000 +0100 @@ -523,7 +523,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p align="right" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#828282;">DImensioni:</span></p></body></html></translation> +<p align="right" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#828282;">Dimensioni:</span></p></body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/Modules/multipageconverter.cpp new/converseen-0.9.9.0/src/Modules/multipageconverter.cpp --- old/converseen/src/Modules/multipageconverter.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/Modules/multipageconverter.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/Modules/multipageconverter.h new/converseen-0.9.9.0/src/Modules/multipageconverter.h --- old/converseen/src/Modules/multipageconverter.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/Modules/multipageconverter.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/cachingsystem.cpp new/converseen-0.9.9.0/src/cachingsystem.cpp --- old/converseen/src/cachingsystem.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/cachingsystem.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/cachingsystem.h new/converseen-0.9.9.0/src/cachingsystem.h --- old/converseen/src/cachingsystem.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/cachingsystem.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/combofilters.cpp new/converseen-0.9.9.0/src/combofilters.cpp --- old/converseen/src/combofilters.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/combofilters.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/combofilters.h new/converseen-0.9.9.0/src/combofilters.h --- old/converseen/src/combofilters.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/combofilters.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/converter.cpp new/converseen-0.9.9.0/src/converter.cpp --- old/converseen/src/converter.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/converter.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -199,7 +199,9 @@ if (!m_overwrite) { emit requestOverwrite(m_newBaseName); + mutex.lock(); imageCondition.wait(&mutex); + mutex.unlock(); } return QString("%1/%2.%3").arg(fi.path()).arg(m_newBaseName).arg(fi.suffix()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/converter.h new/converseen-0.9.9.0/src/converter.h --- old/converseen/src/converter.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/converter.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogconversionstatus.cpp new/converseen-0.9.9.0/src/dialogconversionstatus.cpp --- old/converseen/src/dialogconversionstatus.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogconversionstatus.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogconversionstatus.h new/converseen-0.9.9.0/src/dialogconversionstatus.h --- old/converseen/src/dialogconversionstatus.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogconversionstatus.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialoginfo.cpp new/converseen-0.9.9.0/src/dialoginfo.cpp --- old/converseen/src/dialoginfo.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialoginfo.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialoginfo.h new/converseen-0.9.9.0/src/dialoginfo.h --- old/converseen/src/dialoginfo.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialoginfo.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogmultipageeditor.cpp new/converseen-0.9.9.0/src/dialogmultipageeditor.cpp --- old/converseen/src/dialogmultipageeditor.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogmultipageeditor.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogoptions.cpp new/converseen-0.9.9.0/src/dialogoptions.cpp --- old/converseen/src/dialogoptions.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogoptions.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogoptions.h new/converseen-0.9.9.0/src/dialogoptions.h --- old/converseen/src/dialogoptions.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogoptions.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogquality.cpp new/converseen-0.9.9.0/src/dialogquality.cpp --- old/converseen/src/dialogquality.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogquality.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/dialogquality.h new/converseen-0.9.9.0/src/dialogquality.h --- old/converseen/src/dialogquality.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/dialogquality.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/formats.cpp new/converseen-0.9.9.0/src/formats.cpp --- old/converseen/src/formats.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/formats.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/formats.h new/converseen-0.9.9.0/src/formats.h --- old/converseen/src/formats.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/formats.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/globals.cpp new/converseen-0.9.9.0/src/globals.cpp --- old/converseen/src/globals.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/globals.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Kawaii Emoji Messenger, a multiplatform Facebook client * based on the idea of bringing emoji on desktop. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/globals.h new/converseen-0.9.9.0/src/globals.h --- old/converseen/src/globals.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/globals.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,8 +41,8 @@ namespace globals { const QString PROGRAM_NAME = "Converseen"; - const int CURRENT_INTERNAL_VERSION = 981; - const QString VERSION = "0.9.8.1"; + const int CURRENT_INTERNAL_VERSION = 990; + const QString VERSION = "0.9.9.0"; class Globals { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/inisettings.cpp new/converseen-0.9.9.0/src/inisettings.cpp --- old/converseen/src/inisettings.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/inisettings.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/inisettings.h new/converseen-0.9.9.0/src/inisettings.h --- old/converseen/src/inisettings.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/inisettings.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/main.cpp new/converseen-0.9.9.0/src/main.cpp --- old/converseen/src/main.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/main.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ */ #include <QApplication> +#include <QLibraryInfo> #include <QTextCodec> #include <Magick++.h> #include "mainwindowimpl.h" @@ -37,6 +38,13 @@ QApplication app( argc, argv ); + // Default traslations for Qt apps + QTranslator qtTranslator; + qtTranslator.load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + app.installTranslator(&qtTranslator); + + // Converseen translations Translator T; app.installTranslator(T.translation()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/mainwindowimpl.cpp new/converseen-0.9.9.0/src/mainwindowimpl.cpp --- old/converseen/src/mainwindowimpl.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/mainwindowimpl.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -968,7 +968,7 @@ } } } - convertThread->mutex.unlock(); + //convertThread->mutex.unlock(); convertThread->setNewBasename(newBaseName, ok); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/mainwindowimpl.h new/converseen-0.9.9.0/src/mainwindowimpl.h --- old/converseen/src/mainwindowimpl.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/mainwindowimpl.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/mylabelpreviewer.cpp new/converseen-0.9.9.0/src/mylabelpreviewer.cpp --- old/converseen/src/mylabelpreviewer.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/mylabelpreviewer.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/mylabelpreviewer.h new/converseen-0.9.9.0/src/mylabelpreviewer.h --- old/converseen/src/mylabelpreviewer.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/mylabelpreviewer.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/pixtreewidget.cpp new/converseen-0.9.9.0/src/pixtreewidget.cpp --- old/converseen/src/pixtreewidget.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/pixtreewidget.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/pixtreewidget.h new/converseen-0.9.9.0/src/pixtreewidget.h --- old/converseen/src/pixtreewidget.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/pixtreewidget.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/pushcolorchooser.cpp new/converseen-0.9.9.0/src/pushcolorchooser.cpp --- old/converseen/src/pushcolorchooser.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/pushcolorchooser.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/pushcolorchooser.h new/converseen-0.9.9.0/src/pushcolorchooser.h --- old/converseen/src/pushcolorchooser.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/pushcolorchooser.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/sizeutil.cpp new/converseen-0.9.9.0/src/sizeutil.cpp --- old/converseen/src/sizeutil.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/sizeutil.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/sizeutil.h new/converseen-0.9.9.0/src/sizeutil.h --- old/converseen/src/sizeutil.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/sizeutil.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/thumbnailgeneratorthread.cpp new/converseen-0.9.9.0/src/thumbnailgeneratorthread.cpp --- old/converseen/src/thumbnailgeneratorthread.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/thumbnailgeneratorthread.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/thumbnailgeneratorthread.h new/converseen-0.9.9.0/src/thumbnailgeneratorthread.h --- old/converseen/src/thumbnailgeneratorthread.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/thumbnailgeneratorthread.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/translator.cpp new/converseen-0.9.9.0/src/translator.cpp --- old/converseen/src/translator.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/translator.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,8 @@ * */ +#include <QLibraryInfo> +#include <QLocale> #include <QDir> #include "translator.h" #include "whereiam.h" @@ -49,8 +51,14 @@ { QTranslator *transl = new QTranslator; QString translationFile = QString("%1/%2").arg(m_loc).arg(loadCurrentTranslationName()); + //QString translationFileQt = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "qt_" + QLocale::system().name(); transl->load(translationFile); + // + /*transl->load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath));*/ + + return(transl); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/translator.h new/converseen-0.9.9.0/src/translator.h --- old/converseen/src/translator.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/translator.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/updatechecker.cpp new/converseen-0.9.9.0/src/updatechecker.cpp --- old/converseen/src/updatechecker.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/updatechecker.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/updatechecker.h new/converseen-0.9.9.0/src/updatechecker.h --- old/converseen/src/updatechecker.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/updatechecker.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/whereiam.cpp new/converseen-0.9.9.0/src/whereiam.cpp --- old/converseen/src/whereiam.cpp 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/whereiam.cpp 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/whereiam.h new/converseen-0.9.9.0/src/whereiam.h --- old/converseen/src/whereiam.h 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/src/whereiam.h 2021-02-15 13:36:48.000000000 +0100 @@ -2,7 +2,7 @@ * This file is part of Converseen, an open-source batch image converter * and resizer. * -* (C) Francesco Mondello 2009 - 2020 +* (C) Francesco Mondello 2009 - 2021 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/ui/dialoginfo.ui new/converseen-0.9.9.0/ui/dialoginfo.ui --- old/converseen/ui/dialoginfo.ui 2020-02-02 23:56:46.000000000 +0100 +++ new/converseen-0.9.9.0/ui/dialoginfo.ui 2021-02-15 13:36:48.000000000 +0100 @@ -132,8 +132,8 @@ <rect> <x>0</x> <y>0</y> - <width>772</width> - <height>318</height> + <width>630</width> + <height>259</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -365,8 +365,8 @@ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2020 Francesco Mondello GNU - GPL v.3</span></p></body></html></string> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">(c) 2009 - 2021 Francesco Mondello GNU - GPL v.3</span></p></body></html></string> </property> </widget> </item>
