[pim/pimcommon] /: Use LoadDialogSizeUtils
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 18aebb59367b6f35f3638442d61ccab063317cfd by Laurent Montel.
Committed on 04/08/2026 at 06:58.
Pushed by mlaurent into branch 'master'.
Use LoadDialogSizeUtils
M +1 -1 CMakeLists.txt
M +2 -4 src/pimcommon/configureplugins/configureplugindialog.cpp
M +2 -4 src/pimcommon/templatewidgets/templateeditdialog.cpp
M +2 -5 src/pimcommonakonadi/addressline/completionconfiguredialog/completionconfiguredialog.cpp
M +2 -4 src/pimcommonakonadi/folderdialog/selectmulticollectiondialog.cpp
https://invent.kde.org/pim/pimcommon/-/commit/18aebb59367b6f35f3638442d61ccab063317cfd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9874fddc..23568924 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ option(ENABLE_PCH "Enable Precompiled Headers support" ON)
set(PIMCOMMON_LIB_VERSION ${PIM_VERSION})
set(LIBKDEPIM_LIB_VERSION "6.7.40")
-set(KTEXTADDONS_MIN_VERSION "2.1.1")
+set(KTEXTADDONS_MIN_VERSION "2.1.2")
set(KIMAP_LIB_VERSION "6.7.40")
set(KLDAP_LIB_VERSION "6.7.40")
diff --git a/src/pimcommon/configureplugins/configureplugindialog.cpp b/src/pimcommon/configureplugins/configureplugindialog.cpp
index 7d5f0f68..1967b31e 100644
--- a/src/pimcommon/configureplugins/configureplugindialog.cpp
+++ b/src/pimcommon/configureplugins/configureplugindialog.cpp
@@ -15,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QPushButton>
#include <QVBoxLayout>
#include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
using namespace PimCommon;
namespace
@@ -89,10 +90,7 @@ void ConfigurePluginDialog::slotAccepted()
void ConfigurePluginDialog::readConfig()
{
create(); // ensure a window is created
- windowHandle()->resize(QSize(600, 400));
- KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myConfigurePluginDialogGroupName));
- KWindowConfig::restoreWindowSize(windowHandle(), group);
- resize(windowHandle()->size()); // workaround for QTBUG-40584
+ TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myConfigurePluginDialogGroupName), 600, 400);
}
void ConfigurePluginDialog::saveConfig()
diff --git a/src/pimcommon/templatewidgets/templateeditdialog.cpp b/src/pimcommon/templatewidgets/templateeditdialog.cpp
index bf03daa3..d774d799 100644
--- a/src/pimcommon/templatewidgets/templateeditdialog.cpp
+++ b/src/pimcommon/templatewidgets/templateeditdialog.cpp
@@ -11,6 +11,7 @@
#include <KLocalizedString>
#include <QLineEdit>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
#include <KConfigGroup>
#include <KSharedConfig>
@@ -88,10 +89,7 @@ TemplateEditDialog::~TemplateEditDialog()
void TemplateEditDialog::readConfig()
{
create(); // ensure a window is created
- windowHandle()->resize(QSize(300, 200));
- KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myTemplateEditDialogConfigGroupName));
- KWindowConfig::restoreWindowSize(windowHandle(), group);
- resize(windowHandle()->size()); // workaround for QTBUG-40584
+ TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myTemplateEditDialogConfigGroupName), 300, 200);
}
void TemplateEditDialog::writeConfig()
diff --git a/src/pimcommonakonadi/addressline/completionconfiguredialog/completionconfiguredialog.cpp b/src/pimcommonakonadi/addressline/completionconfiguredialog/completionconfiguredialog.cpp
index 6a1af1f3..a409d970 100644
--- a/src/pimcommonakonadi/addressline/completionconfiguredialog/completionconfiguredialog.cpp
+++ b/src/pimcommonakonadi/addressline/completionconfiguredialog/completionconfiguredialog.cpp
@@ -6,7 +6,6 @@
*/
#include "completionconfiguredialog.h"
-
#include <KConfigGroup>
#include <KLDAPCore/LdapClientSearch>
#include <KLocalizedString>
@@ -17,6 +16,7 @@
#include <QTabWidget>
#include <QVBoxLayout>
#include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
#include "addressline/completionorder/completionorderwidget.h"
#include <config-akonadi-search.h>
@@ -87,10 +87,7 @@ CompletionConfigureDialog::~CompletionConfigureDialog()
void CompletionConfigureDialog::readConfig()
{
create(); // ensure a window is created
- windowHandle()->resize(QSize(600, 400));
- KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myCompletionConfigureDialogGroupName));
- KWindowConfig::restoreWindowSize(windowHandle(), group);
- resize(windowHandle()->size()); // workaround for QTBUG-40584
+ TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myCompletionConfigureDialogGroupName), 600, 400);
}
void CompletionConfigureDialog::writeConfig()
diff --git a/src/pimcommonakonadi/folderdialog/selectmulticollectiondialog.cpp b/src/pimcommonakonadi/folderdialog/selectmulticollectiondialog.cpp
index 8b20dd10..a88d9b4a 100644
--- a/src/pimcommonakonadi/folderdialog/selectmulticollectiondialog.cpp
+++ b/src/pimcommonakonadi/folderdialog/selectmulticollectiondialog.cpp
@@ -15,6 +15,7 @@
#include <QPushButton>
#include <QVBoxLayout>
#include <QWindow>
+#include <TextAddonsWidgets/LoadDialogSizeUtils>
using namespace PimCommon;
@@ -76,10 +77,7 @@ void SelectMultiCollectionDialog::writeConfig()
void SelectMultiCollectionDialog::readConfig()
{
create(); // ensure a window is created
- windowHandle()->resize(QSize(800, 600));
- KConfigGroup group(KSharedConfig::openStateConfig(), QLatin1StringView(myConfigSelectMultiCollectionDialog));
- KWindowConfig::restoreWindowSize(windowHandle(), group);
- resize(windowHandle()->size()); // workaround for QTBUG-40584
+ TextAddonsWidgets::LoadDialogSizeUtils::loadDialogSizeScaled(this, QLatin1StringView(myConfigSelectMultiCollectionDialog), 800, 600);
}
QList<Akonadi::Collection> SelectMultiCollectionDialog::selectedCollection() const