[pim/libksieve] /: Use LoadDialogSizeUtils::loadDialogSizeScaled

Git commit 2ea6f241cc5497e8ed708e3d804aed8e5680a284 by Laurent Montel.
Committed on 04/08/2026 at 11:47.
Pushed by mlaurent into branch 'master'.

Use LoadDialogSizeUtils::loadDialogSizeScaled

M  +1    -1    CMakeLists.txt
M  +2    -4    src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
M  +2    -4    src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
M  +3    -5    src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
M  +2    -3    src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
M  +2    -4    src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
M  +2    -4    src/ksieveui/debug/sievedebugdialog.cpp
M  +4    -6    src/ksieveui/editor/sieveeditor.cpp
M  +3    -5    src/ksieveui/editor/sieveinfodialog.cpp
M  +4    -6    src/ksieveui/scriptsparsing/parsingresultdialog.cpp
M  +4    -5    src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
M  +3    -6    src/ksieveui/templates/sievetemplateeditdialog.cpp
M  +4    -6    src/ksieveui/vacation/multiimapvacationdialog.cpp

https://invent.kde.org/pim/libksieve/-/commit/2ea6f241cc5497e8ed708e3d804aed8e5680a284

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3367ffbb..5c34049c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ file(
 )
 ecm_check_outbound_license(LICENSES GPL-2.0-only  FILES ${ALL_SOURCE_FILES})
 
-set(KTEXTADDONS_MIN_VERSION "2.1.1")
+set(KTEXTADDONS_MIN_VERSION "2.1.2")
 set(KTEXTADDONS_WITH_TEXTAUTOGENERATETEXT_VERSION "${KTEXTADDONS_MIN_VERSION}")
 
 set(IDENTITYMANAGEMENT_LIB_VERSION "6.7.40")
diff --git a/src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp b/src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
index 225b6317..ad3ce3ff 100644
--- a/src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
+++ b/src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
@@ -16,6 +16,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 using namespace KSieveUi;
 namespace
@@ -73,10 +74,7 @@ QString AutoCreateScriptDialog::script(QStringList &required) const
 void AutoCreateScriptDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(800, 600));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myAutoCreateScriptDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myAutoCreateScriptDialogGroupName), 800, 600);
 }
 
 void AutoCreateScriptDialog::writeConfig()
diff --git a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
index 9e921909..c63557b8 100644
--- a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
@@ -12,6 +12,7 @@
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <QLineEdit>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 #include <KWindowConfig>
 #include <QDialogButtonBox>
@@ -55,10 +56,7 @@ SelectFlagsListDialog::~SelectFlagsListDialog()
 void SelectFlagsListDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(300, 200));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySelectFlagsListDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySelectFlagsListDialogGroupName), 300, 200);
 }
 
 void SelectFlagsListDialog::writeConfig()
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
index 7baf3e78..adadff1b 100644
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
@@ -4,7 +4,6 @@
    SPDX-License-Identifier: LGPL-2.0-or-later
 */
 #include "selectheadertypecombobox.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "autocreatescripts/autocreatescriptutil_p.h"
 #include <KLineEditEventHandler>
@@ -23,11 +22,13 @@ using namespace Qt::Literals::StringLiterals;
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 using namespace KSieveUi;
 namespace
 {
 static const char mySelectFlagsListDialogGroupName[] = "SelectHeadersDialog";
 }
+using namespace Qt::Literals::StringLiterals;
 const KLazyLocalizedString selectMultipleHeaders = kli18n("Select multiple headers…");
 SelectHeadersDialog::SelectHeadersDialog(QWidget *parent)
     : QDialog(parent)
@@ -91,10 +92,7 @@ SelectHeadersDialog::~SelectHeadersDialog()
 void SelectHeadersDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(400, 300));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySelectFlagsListDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySelectFlagsListDialogGroupName), 400, 300);
 }
 
 void SelectHeadersDialog::writeConfig()
diff --git a/src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp b/src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
index 2ac71bb5..49c8b533 100644
--- a/src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
+++ b/src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
@@ -16,6 +16,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 using namespace Qt::Literals::StringLiterals;
 using namespace KSieveUi;
@@ -62,9 +63,7 @@ void SieveScriptDescriptionDialog::readConfig()
 {
     create(); // ensure a window is created
     windowHandle()->resize(QSize(800, 600));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveScriptDescriptionDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveScriptDescriptionDialogGroupName), 800, 600);
 }
 
 void SieveScriptDescriptionDialog::writeConfig()
diff --git a/src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp b/src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
index f368a8b2..98ea643c 100644
--- a/src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
+++ b/src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
@@ -11,6 +11,7 @@
 
 #include <KLocalizedString>
 #include <KSharedConfig>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 #include <KConfigGroup>
 #include <KWindowConfig>
@@ -63,10 +64,7 @@ void SieveScriptParsingErrorDialog::setError(QString script, QString error)
 void SieveScriptParsingErrorDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(800, 600));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveScriptParsingErrorDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveScriptParsingErrorDialogGroupName), 800, 600);
 }
 
 void SieveScriptParsingErrorDialog::writeConfig()
diff --git a/src/ksieveui/debug/sievedebugdialog.cpp b/src/ksieveui/debug/sievedebugdialog.cpp
index 068d23b8..7a35cb62 100644
--- a/src/ksieveui/debug/sievedebugdialog.cpp
+++ b/src/ksieveui/debug/sievedebugdialog.cpp
@@ -28,6 +28,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 using namespace KSieveUi;
 using namespace Qt::Literals::StringLiterals;
@@ -85,10 +86,7 @@ SieveDebugDialog::~SieveDebugDialog()
 void SieveDebugDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(640, 480));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveDebugDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveDebugDialogGroupName), 640, 480);
 }
 
 void SieveDebugDialog::writeConfig()
diff --git a/src/ksieveui/editor/sieveeditor.cpp b/src/ksieveui/editor/sieveeditor.cpp
index 1b960e3f..6ad1e10b 100644
--- a/src/ksieveui/editor/sieveeditor.cpp
+++ b/src/ksieveui/editor/sieveeditor.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "sieveeditor.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "sieveeditorwidget.h"
 
@@ -19,8 +18,10 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 using namespace KSieveUi;
+using namespace Qt::Literals::StringLiterals;
 class KSieveUi::SieveEditorPrivate
 {
 public:
@@ -31,7 +32,7 @@ public:
 };
 namespace
 {
-static const char mySieveEditorGroupName[] = "SieveEditor";
+const char mySieveEditorGroupName[] = "SieveEditor";
 }
 SieveEditor::SieveEditor(QWidget *parent)
     : QDialog(parent)
@@ -108,10 +109,7 @@ void SieveEditor::slotEnableButtonOk(bool b)
 void SieveEditor::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(800, 600));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveEditorGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveEditorGroupName), 800, 600);
 }
 
 void SieveEditor::writeConfig()
diff --git a/src/ksieveui/editor/sieveinfodialog.cpp b/src/ksieveui/editor/sieveinfodialog.cpp
index bb6085d1..bc9396f1 100644
--- a/src/ksieveui/editor/sieveinfodialog.cpp
+++ b/src/ksieveui/editor/sieveinfodialog.cpp
@@ -15,10 +15,11 @@
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
 namespace
 {
-static const char myConfigGroupName[] = "SieveInfoDialog";
+const char myConfigGroupName[] = "SieveInfoDialog";
 }
 
 using namespace Qt::Literals::StringLiterals;
@@ -54,10 +55,7 @@ void SieveInfoDialog::setServerInfo(const QStringList &serverInfos)
 void SieveInfoDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(400, 300));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myConfigGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myConfigGroupName), 400, 300);
 }
 
 void SieveInfoDialog::writeConfig()
diff --git a/src/ksieveui/scriptsparsing/parsingresultdialog.cpp b/src/ksieveui/scriptsparsing/parsingresultdialog.cpp
index 00719443..a535c4bf 100644
--- a/src/ksieveui/scriptsparsing/parsingresultdialog.cpp
+++ b/src/ksieveui/scriptsparsing/parsingresultdialog.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "parsingresultdialog.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include <PimCommon/PimUtil>
 #include <TextCustomEditor/PlainTextEditor>
@@ -23,11 +22,13 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace KSieveUi;
 namespace
 {
-static const char myParsingResultDialogGroupName[] = "ParsingResultDialog";
+const char myParsingResultDialogGroupName[] = "ParsingResultDialog";
 }
 ParsingResultDialog::ParsingResultDialog(QWidget *parent)
     : QDialog(parent)
@@ -67,10 +68,7 @@ void ParsingResultDialog::setResultParsing(const QString &result)
 void ParsingResultDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(800, 600));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myParsingResultDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myParsingResultDialogGroupName), 800, 600);
 }
 
 void ParsingResultDialog::writeConfig()
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
index 3f7c79be..f7f4e1ad 100644
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "sievescriptdebuggerdialog.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "sievescriptdebuggerwidget.h"
 
@@ -19,11 +18,13 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace KSieveUi;
 namespace
 {
-static const char mySieveScriptDebuggerDialog[] = "SieveScriptDebuggerDialog";
+const char mySieveScriptDebuggerDialog[] = "SieveScriptDebuggerDialog";
 }
 SieveScriptDebuggerDialog::SieveScriptDebuggerDialog(QWidget *parent)
     : QDialog(parent)
@@ -106,10 +107,8 @@ QString SieveScriptDebuggerDialog::script() const
 void SieveScriptDebuggerDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(800, 600));
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveScriptDebuggerDialog), 800, 600);
     KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveScriptDebuggerDialog));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
     const QList<int> size{100, 400};
     mSieveScriptDebuggerWidget->setSplitterSizes(group.readEntry("Splitter", size));
 }
diff --git a/src/ksieveui/templates/sievetemplateeditdialog.cpp b/src/ksieveui/templates/sievetemplateeditdialog.cpp
index 32f0ed3c..1715d0ef 100644
--- a/src/ksieveui/templates/sievetemplateeditdialog.cpp
+++ b/src/ksieveui/templates/sievetemplateeditdialog.cpp
@@ -29,12 +29,12 @@
 #if HAVE_KTEXTADDONS_TEXT_TO_SPEECH_SUPPORT
 #include <TextEditTextToSpeech/TextToSpeechContainerWidget>
 #endif
-
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 using namespace Qt::Literals::StringLiterals;
 using namespace KSieveUi;
 namespace
 {
-static const char mySieveTemplateEditDialogGroupName[] = "SieveTemplateEditDialog";
+const char mySieveTemplateEditDialogGroupName[] = "SieveTemplateEditDialog";
 }
 SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTemplate)
     : QDialog(parent)
@@ -114,10 +114,7 @@ SieveTemplateEditDialog::~SieveTemplateEditDialog()
 void SieveTemplateEditDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(600, 400));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(mySieveTemplateEditDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(mySieveTemplateEditDialogGroupName), 600, 400);
 }
 
 void SieveTemplateEditDialog::writeConfig()
diff --git a/src/ksieveui/vacation/multiimapvacationdialog.cpp b/src/ksieveui/vacation/multiimapvacationdialog.cpp
index 5593b82f..4de89845 100644
--- a/src/ksieveui/vacation/multiimapvacationdialog.cpp
+++ b/src/ksieveui/vacation/multiimapvacationdialog.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "multiimapvacationdialog.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "vacationpagewidget.h"
 #include <KSieveCore/MultiImapVacationManager>
@@ -25,11 +24,13 @@ using namespace Qt::Literals::StringLiterals;
 #include <QTabBar>
 #include <QVBoxLayout>
 #include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace KSieveUi;
 namespace
 {
-static const char myMultiImapVacationDialogGroupName[] = "MultiImapVacationDialog";
+char myMultiImapVacationDialogGroupName[] = "MultiImapVacationDialog";
 }
 class KSieveUi::MultiImapVacationDialogPrivate
 {
@@ -186,10 +187,7 @@ void MultiImapVacationDialog::createPage(const QString &serverName, const KSieve
 void MultiImapVacationDialog::readConfig()
 {
     create(); // ensure a window is created
-    windowHandle()->resize(QSize(600, 400));
-    KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myMultiImapVacationDialogGroupName));
-    KWindowConfig::restoreWindowSize(windowHandle(), group);
-    resize(windowHandle()->size()); // workaround for QTBUG-40584
+    TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myMultiImapVacationDialogGroupName), 600, 400);
 }
 
 void MultiImapVacationDialog::writeConfig()