New upstream release (22.12.1).

.gitlab-ci.yml

@@ -5,3 +5,6 @@ include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml

CMakeLists.txt

@@ -1,15 +1,15 @@
+cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
+
 # KDE Application Version, managed by release script
 set(RELEASE_SERVICE_VERSION_MAJOR "22")
-set(RELEASE_SERVICE_VERSION_MINOR "08")
-set(RELEASE_SERVICE_VERSION_MICRO "3")
+set(RELEASE_SERVICE_VERSION_MINOR "12")
+set(RELEASE_SERVICE_VERSION_MICRO "1")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
-
 project(kolourpaint VERSION ${RELEASE_SERVICE_VERSION})
 
-set(QT_MIN_VERSION "5.11.0")
-set(KF5_MIN_VERSION "5.87.0")
+set(QT_MIN_VERSION "5.15.2")
+set(KF5_MIN_VERSION "5.90.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.84.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -215,7 +215,6 @@ set(kolourpaint_lib2_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowPixmapBase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolPen.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolSpraycan.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolAction.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolColorPicker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Drawing.cpp

commands/imagelib/effects/kpEffectCommandBase.cpp

@@ -34,6 +34,8 @@
 
 #include <KLocalizedString>
 
+#include <QCursor>
+
 //--------------------------------------------------------------------------------
 
 struct kpEffectCommandBasePrivate

commands/imagelib/effects/kpEffectCommandBase.h

@@ -30,7 +30,6 @@
 #define kpEffectCommandBase_H
 
 
-#include <QWidget>
 
 #include "commands/kpCommand.h"
 #include "imagelib/kpImage.h"

commands/imagelib/transforms/kpTransformResizeScaleCommand.h

@@ -30,7 +30,6 @@
 #define kpTransformResizeScaleCommand_H
 
 
-#include <QPixmap>
 
 #include "imagelib/kpColor.h"
 #include "commands/kpCommand.h"

commands/tools/selection/kpToolSelectionCreateCommand.cpp

@@ -44,15 +44,6 @@
 
 #include "kpLogCategories.h"
 
-#include <QApplication>
-#include <QBitmap>
-#include <QCursor>
-#include <QEvent>
-#include <QMenu>
-#include <QPainter>
-#include <QPixmap>
-#include <QPolygon>
-#include <QTimer>
 
 
 kpToolSelectionCreateCommand::kpToolSelectionCreateCommand (const QString &name,

commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp

@@ -41,7 +41,6 @@
 #include "kpLogCategories.h"
 
 #include <QApplication>
-#include <QCursor>
 #include <QTimer>
 
 #include <KLocalizedString>

debian/changelog

@@ -1,4 +1,10 @@
-kolourpaint (4:22.08.3-ok0build1) yangtze; urgency=medium
+kolourpaint (4:22.12.1-ok1) yangtze; urgency=medium
+
+  * New upstream release (22.12.1).
+
+ -- rtlhq <nobelxyz@163.com>  Sat, 07 Jan 2023 12:07:32 +0800
+
+kolourpaint (4:22.08.3-ok1) yangtze; urgency=medium
 
   * Build for openkylin.
 

debian/control

@@ -5,21 +5,21 @@ Maintainer: openKylin KDE SIG <kde@lists.openkylin.top>
 Uploaders: rtlhq <nobelxyz@163.com>,
 Build-Depends: cmake (>= 3.10.0~),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.92.0~),
+               extra-cmake-modules (>= 5.90.0~),
                gettext,
-               libkf5doctools-dev (>= 5.92.0~),
-               libkf5guiaddons-dev (>= 5.92.0~),
-               libkf5i18n-dev (>= 5.92.0~),
-               libkf5jobwidgets-dev (>= 5.92.0~),
-               libkf5kio-dev (>= 5.92.0~),
-               libkf5sane-dev (>= 22.08.1~),
-               libkf5textwidgets-dev (>= 5.92.0~),
-               libkf5widgetsaddons-dev (>= 5.92.0~),
-               libkf5xmlgui-dev (>= 5.92.0~),
+               libkf5doctools-dev (>= 5.90.0~),
+               libkf5guiaddons-dev (>= 5.90.0~),
+               libkf5i18n-dev (>= 5.90.0~),
+               libkf5jobwidgets-dev (>= 5.90.0~),
+               libkf5kio-dev (>= 5.90.0~),
+               libkf5sane-dev (>= 21.12~),
+               libkf5textwidgets-dev (>= 5.90.0~),
+               libkf5widgetsaddons-dev (>= 5.90.0~),
+               libkf5xmlgui-dev (>= 5.90.0~),
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.11.0~),
-Standards-Version: 4.6.0
+               qtbase5-dev (>= 5.15.2~),
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://apps.kde.org/en/kolourpaint
 Vcs-Browser: https://gitee.com/openkylin/kolourpaint
@@ -29,8 +29,8 @@ Package: kolourpaint
 Section: graphics
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kolourpaint4 (<< 4:21.04)
-Replaces: kolourpaint4 (<< 4:21.04)
+Breaks: kolourpaint4 (<< 4:17.04)
+Replaces: kolourpaint4 (<< 4:17.04)
 Description: simple image editor and drawing application
  KolourPaint is a simple drawing and image editing application for KDE.
  It aims to be easy to use, providing a level of functionality targeted towards

debian/salsa-ci.yml

@@ -1,8 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_BLHC: 'yes'
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'
-  SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'

debian/upstream/signing-key.asc

@@ -1,157 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-hC+sXh0NMOq4pxE=
-=Wqdv
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2
-l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd
-s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr
-4tzbn+Rfadybli61H2hc6/JJHe91i+V1ltgkHwGcs6MUCqXgSL0dUIJs49gSrla0
-gkrcJYF5MWyGxKlajbCjkMCJtN+8bhEmpc4Oe8NZ33arEWnlyh1RVgi5p3RTNApY
-Pxctcg57ExczbKn9R8VLYmPJ7Di3gX0cmotrABEBAAG0HkNocmlzdG9waCBGZWNr
-IDxjZmVja0BrZGUub3JnPokBTgQTAQgAOBYhBPIydeS/EK/B32kUptvSzok+LRyH
-BQJZUaRGAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJENvSzok+LRyHeWcH
-/A1E2d5UL2oHsrLIolIiWMmheRorcac+0Hgll1mMUQ5tfPH+LVzgrlMMG7g1Amky
-Hk1qZ5oszrXUg2H/28/cOF/WVlHgQcSGr7aQbHieUivPtZMua+lHUdILC3UV2l1V
-22Zz8HIDl4kxmK6EpoNIOK5Mo550S3e3AKYq5pa/FlckCV9/JoK9+thRCsoAAj3g
-oWwTx9RY5pmLPtklqyC5961Je7KHSIVqapJ/G5DX+yfOC1Psc+vIfyQVqnaefZPW
-dIxXQQhn46i6IRRimw94Gkwca+wslkimt/L/Z7ByZqBsXMyixSQPq+dtSO9CMgr0
-WxTX78wATkTGzh5oSwKCMga5AQ0EWVGkRgEIAMuUnfNfrdx8xn7Jjcm6MGkB/Yep
-XVysrlHxUUS6q7629JdSlVWnQo9GFO927GZClWI9rCGLQMfZZk/jfgKV/nkpLod3
-I51remOg7ohSkwRLAdwJ7xCuNrafhKntFh5/NxuaXxaVIY1muvZbTAsIRyks2jCE
-pUoK43Z8dr4/QPhBstssB8czDME1Tw4r7X+RwjFrQqDItFv6f0BIdEwR462khLEw
-vbXRN1nzs+6Y0foJbJCS3VDZC9scsrrMVMV+OEBF3DXp9ypSWsLnkuBPPIus6Y8G
-j7JvYUBtrUhKL5a7o5G3Te9YhwGgOKVqWlncs6ZLiOV6HnG0BO3xdPcn09cAEQEA
-AYkBNgQYAQgAIBYhBPIydeS/EK/B32kUptvSzok+LRyHBQJZUaRGAhsMAAoJENvS
-zok+LRyHaRMIAI5YaTfGeQDmR08I2LvztOEH/3YF63cNCP/Vp+WAtF/Kr8mMFpFS
-oTHJNMi7p964lHYTTPzPeQzLzV3ayiQjq+DHs6HFmYl73ukzlGGc7KDlyhugQjm6
-AqNtqqXAVykaixnFj8jf2WtQGl1hqpm8GhDRBmZycqMqne4tZokujhtpdC6suRvc
-AB0S+lRZUwrY05k6Nc1A8J8k/lxXXa9KzXNaqKsqppgBZoqKN3zS4146uEjvuLsh
-CarZ/6uUidvP0LBTR7HKye5A9Qdbjlg9qvtR7YF3hqy4g1PRNZWRlsQ1pkCdCTfN
-TA+HYUzK0ESVpY72lWvH49lNg+ufZ1bKvKI=
-=MZJ5
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=PVLg
------END PGP PUBLIC KEY BLOCK-----

dialogs/imagelib/kpDocumentMetaInfoDialog.cpp

@@ -743,7 +743,7 @@ void kpDocumentMetaInfoDialog::accept ()
     (void) metaInfo (&errorMessage);
     if (!errorMessage.isEmpty ())
     {
-        KMessageBox::sorry (this, errorMessage, i18nc ("@title:window", "Invalid Text Fields"));
+        KMessageBox::error (this, errorMessage, i18nc ("@title:window", "Invalid Text Fields"));
         return;
     }
 

dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp

@@ -32,12 +32,10 @@
 #include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
 
 #include <QApplication>
-#include <QBoxLayout>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLayout>
 #include <QPushButton>
 
 #include "kpLogCategories.h"

dialogs/imagelib/transforms/kpTransformPreviewDialog.h

@@ -31,7 +31,6 @@
 
 
 #include <QDialog>
-#include <QPixmap>
 
 
 class QLabel;

dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp

@@ -32,7 +32,6 @@
 #include "kpTransformResizeScaleDialog.h"
 
 
-#include <QBoxLayout>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
@@ -40,7 +39,6 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLayout>
 #include <QPixmap>
 #include <QSize>
 #include <QToolButton>

dialogs/imagelib/transforms/kpTransformRotateDialog.cpp

@@ -39,17 +39,14 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <QButtonGroup>
 #include <QGroupBox>
 #include <QIcon>
 #include <QLabel>
-#include <QLayout>
 #include <QSpinBox>
-#include <QPolygon>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QTransform>
-
+#include <QGridLayout>
 
 // private static
 int kpTransformRotateDialog::s_lastWidth = -1,

dialogs/imagelib/transforms/kpTransformRotateDialog.h

@@ -31,7 +31,6 @@
 
 
 #include <QImage>
-#include <QPoint>
 
 #include "imagelib/kpColor.h"
 #include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"

dialogs/imagelib/transforms/kpTransformSkewDialog.cpp

@@ -31,13 +31,10 @@
 
 #include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
 
-#include <QApplication>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLayout>
 #include <QPushButton>
-#include <QTransform>
 #include <QImage>
 #include <QSpinBox>
 

dialogs/kpColorSimilarityDialog.cpp

@@ -33,13 +33,12 @@
 #include <KLocalizedString>
 #include "../widgets/imagelib/effects/kpNumInput.h"
 
-#include <QBoxLayout>
 #include <QDialogButtonBox>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLayout>
 #include <QPushButton>
 #include <QWhatsThis>
+#include <QVBoxLayout>
 
 kpColorSimilarityDialog::kpColorSimilarityDialog (QWidget *parent)
     : QDialog (parent)

dialogs/kpDocumentSaveOptionsPreviewDialog.cpp

@@ -30,13 +30,10 @@
 
 #include "kpDocumentSaveOptionsPreviewDialog.h"
 
-#include <QEvent>
 #include <QGridLayout>
 #include <QLabel>
-#include <QLayout>
 #include <QPixmap>
 
-#include <KConfig>
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 

document/kpDocument.cpp

@@ -52,14 +52,9 @@
 #include <KIO/StatJob>
 
 #include <QColor>
-#include <QBrush>
-#include <QFile>
 #include <QImage>
-#include <QList>
-#include <QPainter>
 #include <QRect>
 #include <QSize>
-#include <QTransform>
 
 //---------------------------------------------------------------------
 

document/kpDocument.h

@@ -30,7 +30,6 @@
 #define KP_DOCUMENT_H
 
 
-#include <QBitmap>
 #include <QObject>
 #include <QString>
 #include <QUrl>

document/kpDocumentSaveOptions.cpp

@@ -37,7 +37,6 @@
 #include "kpLogCategories.h"
 #include <KSharedConfig>
 
-#include <QBitmap>
 #include <QImage>
 #include <QString>
 

document/kpDocument_Open.cpp

@@ -110,7 +110,7 @@ QImage kpDocument::getPixmapFromFile(const QUrl &url, bool suppressDoesntExistDi
             //       Or at least choose one consistently.
             //
             // TODO: Have captions for all dialogs in KolourPaint.
-            KMessageBox::sorry (parent,
+            KMessageBox::error (parent,
                                 i18n ("Could not open \"%1\".",
                                       kpUrlFormatter::PrettyFilename (url)));
         }
@@ -146,7 +146,7 @@ QImage kpDocument::getPixmapFromFile(const QUrl &url, bool suppressDoesntExistDi
 
     if (image.isNull ())
     {
-        KMessageBox::sorry (parent,
+        KMessageBox::error (parent,
                             i18n ("Could not open \"%1\" - unsupported image format.\n"
                                   "The file may be corrupt.",
                                   kpUrlFormatter::PrettyFilename (url)));

document/kpDocument_Save.cpp

@@ -32,18 +32,10 @@
 #include "kpDocumentPrivate.h"
 
 
-#include <QColor>
-#include <QBitmap>
-#include <QBrush>
 #include <QFile>
 #include <QImage>
-#include <QList>
-#include <QPainter>
-#include <QRect>
 #include <QSaveFile>
-#include <QSize>
 #include <QTemporaryFile>
-#include <QTransform>
 #include <QMimeDatabase>
 
 #include "kpLogCategories.h"

generic/widgets/kpResizeSignallingLabel.cpp

@@ -31,7 +31,6 @@
 
 #include "generic/widgets/kpResizeSignallingLabel.h"
 
-#include <QEvent>
 
 #include "kpLogCategories.h"
 

imagelib/effects/kpEffectHSV.cpp

@@ -31,7 +31,6 @@
 
 #include <cmath>
 
-#include <QBitmap>
 #include <QImage>
 
 #include "kpLogCategories.h"

imagelib/kpPainter.cpp

@@ -38,7 +38,6 @@
 #include <cstdio>
 
 #include <QPainter>
-#include <QPolygon>
 #include <QRandomGenerator>
 
 #include "kpLogCategories.h"

kpDefs.h

@@ -32,7 +32,6 @@
 
 #include <limits.h>
 
-#include <QtGlobal>
 #include <QPoint>
 #include <QSize>
 #include <QString>

kpViewScrollableContainer.cpp

@@ -29,11 +29,9 @@
 
 #include "kpViewScrollableContainer.h"
 
-#include <QBitmap>
 #include <QCursor>
 #include <QKeyEvent>
 #include <QPainter>
-#include <QPen>
 #include <QPixmap>
 #include <QTimer>
 #include <QScrollBar>

kpViewScrollableContainer.h

@@ -30,7 +30,6 @@
 #define KP_VIEW_SCROLLABLE_CONTAINER_H
 
 
-#include <QLabel>
 #include <QPoint>
 #include <QScrollArea>
 #include <QSize>

layers/selections/text/kpTextSelection_Cursor.cpp

@@ -40,7 +40,6 @@
 #include "kpLogCategories.h"
 
 #include <QFontMetrics>
-#include <QList>
 
 
 // public

layers/selections/text/kpTextSelection_Paint.cpp

@@ -41,7 +41,6 @@
 
 #include "kpLogCategories.h"
 
-#include <QBitmap>
 #include <QFont>
 #include <QList>
 #include <QPainter>

layers/tempImage/kpTempImage.cpp

@@ -31,7 +31,6 @@
 #include "pixmapfx/kpPixmapFX.h"
 #include "views/manager/kpViewManager.h"
 
-#include <QPainter>
 
 //---------------------------------------------------------------------
 

lgpl/generic/kpColorCollection.cpp

@@ -36,7 +36,6 @@
 #include <KLocalizedString>
 #include <KMessageBox>
 #include "kpLogCategories.h"
-#include <KStringHandler>
 
 #include <QDir>
 #include <QFile>
@@ -117,7 +116,7 @@ kpColorCollection::~kpColorCollection()
 
 static void CouldNotOpenDialog (const QUrl &url, QWidget *parent)
 {
-     KMessageBox::sorry (parent,
+     KMessageBox::error (parent,
         i18n ("Could not open color palette \"%1\".",
               kpUrlFormatter::PrettyFilename (url)));
 }
@@ -150,7 +149,7 @@ kpColorCollection::open(const QUrl &url, QWidget *parent)
   QString line = stream.readLine();
   if (line.indexOf(QLatin1String(" Palette")) == -1)
   {
-     KMessageBox::sorry (parent,
+     KMessageBox::error (parent,
         i18n ("Could not open color palette \"%1\" - unsupported format.\n"
               "The file may be corrupt.",
               kpUrlFormatter::PrettyFilename (url)));
@@ -210,7 +209,7 @@ kpColorCollection::open(const QUrl &url, QWidget *parent)
 
 static void CouldNotOpenKDEDialog (const QString &name, QWidget *parent)
 {
-     KMessageBox::sorry (parent,
+     KMessageBox::error (parent,
         i18n ("Could not open KDE color palette \"%1\".", name));
 }
 

lgpl/generic/kpColorCollection.h

@@ -35,7 +35,6 @@
 #include <kolourpaint_lgpl_export.h>
 
 #include <QColor>
-#include <QList>
 #include <QString>
 #include <QStringList>
 #include <QWidget>

mainWindow/kpMainWindow.cpp

@@ -51,9 +51,7 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 
-#include <QEvent>
 #include <QMenu>
-#include <QTimer>
 #include <QDropEvent>
 
 #include "kpLogCategories.h"

mainWindow/kpMainWindow_Colors.cpp

@@ -41,6 +41,7 @@
 
 #include <QFileDialog>
 #include <QAction>
+#include <kwidgetsaddons_version.h>
 
 //---------------------------------------------------------------------
 
@@ -196,7 +197,11 @@ bool kpMainWindow::queryCloseColors ()
 
     if (!colorCells ()->url ().isEmpty ())
     {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        result = KMessageBox::warningTwoActionsCancel(this,
+#else
         result = KMessageBox::warningYesNoCancel (this,
+#endif
             i18n ("The color palette \"%1\" has been modified.\n"
                   "Do you want to save it?",
                   kpUrlFormatter::PrettyFilename (colorCells ()->url ())),
@@ -208,7 +213,11 @@ bool kpMainWindow::queryCloseColors ()
         const QString name = colorCells ()->colorCollection ()->name ();
         if (!name.isEmpty ())
         {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+            result = KMessageBox::warningTwoActionsCancel(this,
+#else
             result = KMessageBox::warningYesNoCancel (this,
+#endif
                 i18n ("The KDE color palette \"%1\" has been modified.\n"
                       "Do you want to save it to a file?",
                       name),
@@ -217,7 +226,11 @@ bool kpMainWindow::queryCloseColors ()
         }
         else
         {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+            result = KMessageBox::warningTwoActionsCancel(this,
+#else
             result = KMessageBox::warningYesNoCancel (this,
+#endif
                 i18n ("The default color palette has been modified.\n"
                       "Do you want to save it to a file?"),
                 QString ()/*caption*/,
@@ -227,9 +240,17 @@ bool kpMainWindow::queryCloseColors ()
 
     switch (result)
     {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::ButtonCode::PrimaryAction:
+#else
     case KMessageBox::Yes:
+#endif
         return slotColorsSave ();  // close only if save succeeds
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::ButtonCode::SecondaryAction:
+#else
     case KMessageBox::No:
+#endif
         return true;  // close without saving
     default:
         return false;  // don't close current doc

mainWindow/kpMainWindow_Edit.cpp

@@ -35,8 +35,8 @@
 #include <QImage>
 #include <QList>
 #include <QMenu>
-#include <QDesktopWidget>
 #include <QScrollBar>
+#include <QScreen>
 
 #include "kpLogCategories.h"
 #include <KMessageBox>
@@ -500,8 +500,9 @@ void kpMainWindow::pasteText (const QString &text,
           width = std::max(width, fontMetrics.horizontalAdvance(str));
 
         // limit the size to avoid memory overflow
-        width = qMin(qMax(QApplication::desktop()->width(), d->document ? d->document->width() : 0), width);
-        height = qMin(qMax(QApplication::desktop()->height(), d->document ? d->document->height() : 0), height);
+        const QSize desktopSize = QApplication::primaryScreen()->virtualSize();
+        width = qMin(qMax(desktopSize.width(), d->document ? d->document->width() : 0), width);
+        height = qMin(qMax(desktopSize.height(), d->document ? d->document->height() : 0), height);
 
         const int selWidth = qMax (kpTextSelection::MinimumWidthForTextStyle (ts),
                                    width + kpTextSelection::TextBorderSize () * 2);
@@ -606,7 +607,7 @@ void kpMainWindow::slotPaste()
     {
         kpSetOverrideCursorSaver cursorSaver(Qt::ArrowCursor);
 
-        KMessageBox::sorry(this,
+        KMessageBox::error(this,
             i18n("<qt>KolourPaint cannot paste the contents of"
                  " the clipboard as it has an unknown format.</qt>"),
             i18n("Cannot Paste"));

mainWindow/kpMainWindow_File.cpp

@@ -31,8 +31,6 @@
 #include "kpMainWindowPrivate.h"
 
 #include <QAction>
-#include <QDataStream>
-#include <QDesktopWidget>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFileDialog>
@@ -41,7 +39,6 @@
 #include <QSize>
 #include <QPrinter>
 #include <QPrintDialog>
-#include <QScreen>
 #include <QApplication>
 #include <QTimer>
 #include <QLabel>
@@ -51,6 +48,7 @@
 #include <QImageWriter>
 #include <QMimeDatabase>
 #include <QPrintPreviewDialog>
+#include <QScreen>
 
 #include <KActionCollection>
 #include <KEMailClientLauncherJob>
@@ -78,6 +76,7 @@
 
 #if HAVE_KSANE
 #include "../scan/sanedialog.h"
+#include <kwidgetsaddons_version.h>
 #endif // HAVE_KSANE
 
 // private
@@ -543,7 +542,7 @@ void kpMainWindow::slotScan ()
         // No scanning support (kdegraphics/libkscan) installed?
         if (!d->scanDialog)
         {
-            KMessageBox::sorry (this,
+            KMessageBox::error (this,
                                 i18n("Failed to open scanning dialog."),
                                 i18nc("@title:window", "Scanning Failed"));
             return;
@@ -698,7 +697,7 @@ void kpMainWindow::slotScreenshot()
 void kpMainWindow::slotMakeScreenshot()
 {
   QCoreApplication::processEvents();
-  QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(QApplication::desktop()->winId());
+  QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(0 /* entire screen*/);
 
   auto *doc = new kpDocument(pixmap.width(), pixmap.height(), documentEnvironment());
   doc->setImage(pixmap.toImage());
@@ -1406,13 +1405,21 @@ void kpMainWindow::slotMail ()
         !(d->document->isFromExistingURL () && d->document->urlExists (d->document->url ())) ||
         d->document->isModified ()/*needs to be saved*/)
     {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        int result = KMessageBox::questionTwoActions(this,
+#else
         int result = KMessageBox::questionYesNo (this,
+#endif
                         i18n ("You must save this image before sending it.\n"
                               "Do you want to save it?"),
                         QString(),
                         KStandardGuiItem::save (), KStandardGuiItem::cancel ());
 
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        if (result == KMessageBox::ButtonCode::PrimaryAction)
+#else
         if (result == KMessageBox::Yes)
+#endif
         {
             if (!save ())
             {
@@ -1444,7 +1451,11 @@ bool kpMainWindow::queryCloseDocument ()
         return true;  // ok to close current doc
     }
 
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    int result = KMessageBox::warningTwoActionsCancel(this,
+#else
     int result = KMessageBox::warningYesNoCancel (this,
+#endif
                      i18n ("The document \"%1\" has been modified.\n"
                            "Do you want to save it?",
                            d->document->prettyFilename ()),
@@ -1453,9 +1464,17 @@ bool kpMainWindow::queryCloseDocument ()
 
     switch (result)
     {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::ButtonCode::PrimaryAction:
+#else
     case KMessageBox::Yes:
+#endif
         return slotSave ();  // close only if save succeeds
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::ButtonCode::SecondaryAction:
+#else
     case KMessageBox::No:
+#endif
         return true;  // close without saving
     default:
         return false;  // don't close current doc

mainWindow/kpMainWindow_Settings.cpp

@@ -40,7 +40,6 @@
 
 #include "kpDefs.h"
 #include "document/kpDocument.h"
-#include "tools/kpToolAction.h"
 #include "widgets/toolbars/kpToolToolBar.h"
 #include "environments/tools/kpToolEnvironment.h"
 

mainWindow/kpMainWindow_Tools.cpp

@@ -30,7 +30,6 @@
 #include "kpMainWindowPrivate.h"
 
 #include <QActionGroup>
-#include <QList>
 
 #include <KActionCollection>
 #include <KSharedConfig>
@@ -43,7 +42,6 @@
 #include "document/kpDocument.h"
 #include "layers/selections/image/kpImageSelectionTransparency.h"
 #include "tools/kpTool.h"
-#include "tools/kpToolAction.h"
 #include "tools/flow/kpToolBrush.h"
 #include "tools/flow/kpToolColorEraser.h"
 #include "tools/kpToolColorPicker.h"
@@ -242,7 +240,7 @@ void kpMainWindow::enableToolsDocumentActions (bool enable)
 
     for (auto *tool : d->tools)
     {
-      kpToolAction *action = tool->action();
+      KToggleAction *action = tool->action();
       if (!enable && action->isChecked()) {
           action->setChecked(false);
       }

mainWindow/kpMainWindow_View_Zoom.cpp

@@ -31,11 +31,11 @@
 #include "kpMainWindowPrivate.h"
 #include "kpLogCategories.h"
 
+#include <QRegularExpression>
 #include <QScrollBar>
 
 #include <KSelectAction>
 #include <KStandardAction>
-#include <KToggleAction>
 #include <KActionCollection>
 #include <KLocalizedString>
 
@@ -62,7 +62,7 @@ static int ZoomLevelFromString (const QString &stringIn)
     // 1. kdelibs adds accelerators to actions' text directly
     // 2. ',' is automatically added to change "1000%" to "1,000%"
     QString string = stringIn;
-    string.remove (QRegExp ("[^0-9]"));
+    string.remove(QRegularExpression(QStringLiteral("[^0-9]")));
 #if DEBUG_KP_MAIN_WINDOW
     qCDebug(kpLogMainWindow) << "\twithout non-digits='" << string << "'";
 #endif

org.kde.kolourpaint.appdata.xml

@@ -23,6 +23,7 @@
   <name xml:lang="hu">KolourPaint</name>
   <name xml:lang="ia">KolourPaint</name>
   <name xml:lang="id">KolourPaint</name>
+  <name xml:lang="is">KolourPaint</name>
   <name xml:lang="it">KolourPaint</name>
   <name xml:lang="ka">KolourPaint</name>
   <name xml:lang="ko">KolourPaint</name>
@@ -64,6 +65,7 @@
   <summary xml:lang="hu">Rajzolóprogram</summary>
   <summary xml:lang="ia">Programma per pinger</summary>
   <summary xml:lang="id">Program Lukis</summary>
+  <summary xml:lang="is">Myndmálunarforrit</summary>
   <summary xml:lang="it">Programma di disegno</summary>
   <summary xml:lang="ka">სახატავი პროგრამა</summary>
   <summary xml:lang="ko">그리기 프로그램</summary>
@@ -108,6 +110,7 @@
     <p xml:lang="hu">A KolourPaint egy egyszerű rajzolóprogram raszteres képek gyors létrehozásához. Hasznos retusálóeszközként és egyszerű képszerkesztő feladatokhoz.</p>
     <p xml:lang="ia">KolourPAint es un simple programma per pinger o designar  per crear rapidemente imagines raster. Il es utile como instrumento de retocco e per cargas simplice de modificar imagines.</p>
     <p xml:lang="id">KolourPaint adalah program melukis sederhana untuk membuat gambar raster dengan cepat. Ini berguna sebagai alat bantu dan tugas pengeditan gambar sederhana.</p>
+    <p xml:lang="is">KolourPaint er einfalt myndmálunarforrit sem gefur kost á að útbúa rastamyndir í snatri. Það nýtist vel í einfaldar lagfæringar og minni háttar myndvinnsluaðgerðir.</p>
     <p xml:lang="it">KolourPaint è un semplice programma di disegno per la creazione rapida di immagini. È utile come strumento da usare «al volo» e per effettuare semplici modifiche alle immagini.</p>
     <p xml:lang="ko">KolourPaint는 래스터 그림을 빠르게 만드는 프로그램입니다. 간단한 보정 도구 및 편집 도구로 사용할 수 있습니다.</p>
     <p xml:lang="nb">KolourPaint er et enkelt maleprogram som kjapt kan lage rasterbilder. Det er et nyttig verktøy for retusjering og enkle redigeringsoppgaver.</p>
@@ -147,8 +150,9 @@
     <p xml:lang="hu">Szolgáltatások:</p>
     <p xml:lang="ia">Characteristicas:</p>
     <p xml:lang="id">Fitur:</p>
+    <p xml:lang="is">Eiginleikar:</p>
     <p xml:lang="it">Caratteristiche:</p>
-    <p xml:lang="ka">თვისებები:</p>
+    <p xml:lang="ka">ფუნქციები:</p>
     <p xml:lang="ko">기능:</p>
     <p xml:lang="lt">Galimybės:</p>
     <p xml:lang="nb">Funksjoner:</p>
@@ -162,6 +166,7 @@
     <p xml:lang="sk">Funkcie:</p>
     <p xml:lang="sl">Zmožnosti:</p>
     <p xml:lang="sv">Funktioner:</p>
+    <p xml:lang="ta">அம்சங்கள்:</p>
     <p xml:lang="tok">ken pali:</p>
     <p xml:lang="tr">Özellikler:</p>
     <p xml:lang="uk">Можливості:</p>
@@ -188,6 +193,7 @@
       <li xml:lang="hu">Különféle alakzatok rajzolásának támogatása - vonalak, téglalapok, lekerekített téglalapok, oválisok és sokszögek</li>
       <li xml:lang="ia">Supporto pro designar varie formas - lineas, rectangulos, rectangulos tundite, ovales e polygonos</li>
       <li xml:lang="id">Dukungan untuk menggambar berbagai bentuk - garis, persegi panjang, persegi panjang, bulat, oval dan poligon</li>
+      <li xml:lang="is">Stuðningur við að teikna ýmis form - línur, rétthyrninga, rúnnaða rétthyrninga, sporöskjur og marghyrninga</li>
       <li xml:lang="it">Supporto per il disegno di varie forme - linee, rettangoli, rettangoli arrotondati, ovali e poligoni</li>
       <li xml:lang="ko">다양한 도형 그리기 - 직선, 사각형, 둥근 사각형, 타원형, 다각형</li>
       <li xml:lang="nb">Støtte for å tegne mange former – linjer, rektangler, avrundede rektangler, ovaler og polygoner</li>
@@ -227,6 +233,7 @@
       <li xml:lang="hu">Görbék, vonalak és szöveg</li>
       <li xml:lang="ia">Curvas, lineas e texto</li>
       <li xml:lang="id">Lengkung, garis, dan teks</li>
+      <li xml:lang="is">Ferlar, línur og texti</li>
       <li xml:lang="it">Curve, linee e testo</li>
       <li xml:lang="ka">მრუდები, ხაზები და ტექსტი</li>
       <li xml:lang="ko">곡선, 직선 및 텍스트</li>
@@ -268,6 +275,7 @@
       <li xml:lang="hu">Színválasztó</li>
       <li xml:lang="ia">Selector de color</li>
       <li xml:lang="id">Penukil warna</li>
+      <li xml:lang="is">Litplokkari</li>
       <li xml:lang="it">Selettore del colore</li>
       <li xml:lang="ka">ფერების არჩევა</li>
       <li xml:lang="ko">색 선택기</li>
@@ -309,6 +317,7 @@
       <li xml:lang="hu">Kijelölések</li>
       <li xml:lang="ia">Selectiones</li>
       <li xml:lang="id">Pemilihan</li>
+      <li xml:lang="is">Myndval</li>
       <li xml:lang="it">Selezioni</li>
       <li xml:lang="ka">მონიშნულები</li>
       <li xml:lang="ko">선택</li>
@@ -349,6 +358,7 @@
       <li xml:lang="hu">Forgatás, fekete-fehér és egyéb speciális hatások</li>
       <li xml:lang="ia">Rotation, monochrome e altere effectos avantiate</li>
       <li xml:lang="id">Perotasian, monokrom, dan efek tingkat lanjut lainnya</li>
+      <li xml:lang="is">Snúningur, einlitur og aðrir þróaðir eiginleikar</li>
       <li xml:lang="it">Rotazione, monocromia e altri effetti avanzati</li>
       <li xml:lang="ka">მობრუნება, შავთეთრობა და სხვა დამატებითი ეფექტები</li>
       <li xml:lang="ko">회전, 흑백, 기타 고급 효과</li>
@@ -394,6 +404,7 @@
       <caption xml:lang="gl">Pintando en KolourPaint</caption>
       <caption xml:lang="ia">Pingente in KolourPaint</caption>
       <caption xml:lang="id">Melukis di KolourPaint</caption>
+      <caption xml:lang="is">Mála með KolourPaint</caption>
       <caption xml:lang="it">Dipingere in KolourPaint</caption>
       <caption xml:lang="ka">KolourPaint-ში ხატვა</caption>
       <caption xml:lang="ko">KolourPaint로 그림 그리기</caption>
@@ -421,9 +432,9 @@
     <binary>kolourpaint</binary>
   </provides>
   <releases>
+    <release version="22.12.1" date="2023-01-05"/>
+    <release version="22.12.0" date="2022-12-08"/>
     <release version="22.08.3" date="2022-11-03"/>
     <release version="22.08.2" date="2022-10-13"/>
-    <release version="22.08.1" date="2022-09-08"/>
-    <release version="22.08.0" date="2022-08-18"/>
   </releases>
 </component>

org.kde.kolourpaint.desktop

@@ -65,6 +65,7 @@ Name[sv]=Kolourpaint
 Name[ta]=நிற பெயின்ட் 
 Name[tg]=KolourPaint
 Name[th]=วาดภาพระบายสี-K
+Name[tok]=ilo KolourPaint
 Name[tr]=KolourPaint
 Name[ug]=KolourPaint
 Name[uk]=KolourPaint
@@ -140,6 +141,7 @@ GenericName[sv]=Ritprogram
 GenericName[ta]=பெயிண்ட் நிரலி
 GenericName[tg]=Муҳаррири графикӣ
 GenericName[th]=โปรแกรมวาดภาพ
+GenericName[tok]=ilo sitelen
 GenericName[tr]=Boyama Uygulaması
 GenericName[ug]=سىزىش پروگراممىسى
 GenericName[uk]=Програма для малювання
@@ -186,6 +188,7 @@ Comment[ru]=Простая в использовании программа дл
 Comment[sk]=Jednoduchý maľovací program
 Comment[sl]=Enostaven program za risanje
 Comment[sv]=Ett lättanvänt ritprogram
+Comment[tok]=ilo sitelen pona
 Comment[tr]=Kolay kullanılır bir boyama programı
 Comment[uk]=Проста у користуванні програма для малювання
 Comment[x-test]=xxAn easy-to-use paint programxx
@@ -203,4 +206,3 @@ StartupWMClass=kolourpaint
 MimeType=application/x-krita;application/x-navi-animation;image/avif;image/bmp;image/gif;image/heif;image/jpeg;image/jxl;image/openraster;image/png;image/svg+xml;image/svg+xml-compressed;image/tiff;image/vnd.adobe.photoshop;image/vnd.microsoft.icon;image/vnd.wap.wbmp;image/webp;image/x-eps;image/x-exr;image/x-hdr;image/x-icns;image/x-mng;image/x-pcx;image/x-pic;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
 
 Categories=Qt;KDE;Graphics;2DGraphics;RasterGraphics;
-Terminal=false

pixmapfx/kpPixmapFX.h

@@ -34,7 +34,6 @@
 
 
 #include <QRect>
-#include <QString>
 
 #include <KLocalizedString>
 

pixmapfx/kpPixmapFX_DrawShapes.cpp

@@ -33,9 +33,7 @@
 
 
 #include <QPainter>
-#include <QPainterPath>
 #include <QImage>
-#include <QPoint>
 #include <QPolygon>
 
 #include "kpLogCategories.h"