[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core/utilities: polish QDialog flags
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-20 18:27:10
Message-ID: E1g33fS-0005a1-GL () code ! kde ! org
[Download RAW message or body]

Git commit 676d2c54497be646f1290f1247942be85d2c789f by Maik Qualmann.
Committed on 20/09/2018 at 18:26.
Pushed by mqualmann into branch 'master'.

polish QDialog flags

M  +5    -3    core/utilities/advancedrename/advancedrenamedialog.cpp
M  +5    -0    core/utilities/assistants/webservices/common/wstooldialog.cpp
M  +5    -3    core/utilities/geolocation/editor/dialog/geolocationedit.cpp
M  +1    -0    core/utilities/maintenance/maintenancedlg.cpp
M  +5    -3    core/utilities/mediaserver/dmediaserverdlg.cpp
M  +5    -3    core/utilities/metadataedit/dialog/metadataedit.cpp
M  +5    -3    core/utilities/setup/setup.cpp

https://commits.kde.org/digikam/676d2c54497be646f1290f1247942be85d2c789f

diff --git a/core/utilities/advancedrename/advancedrenamedialog.cpp \
b/core/utilities/advancedrename/advancedrenamedialog.cpp index 1c91c38787..c79b4f3838 \
                100644
--- a/core/utilities/advancedrename/advancedrenamedialog.cpp
+++ b/core/utilities/advancedrename/advancedrenamedialog.cpp
@@ -201,9 +201,11 @@ AdvancedRenameDialog::AdvancedRenameDialog(QWidget* const \
parent)  : QDialog(parent),
       d(new Private)
 {
-    setWindowFlags((windowFlags() & ~Qt::Dialog) | Qt::Window |
-                                                   Qt::WindowCloseButtonHint |
-                                                   Qt::WindowMinMaxButtonsHint);
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     setModal(true);
     setupWidgets();
     setupConnections();
diff --git a/core/utilities/assistants/webservices/common/wstooldialog.cpp \
b/core/utilities/assistants/webservices/common/wstooldialog.cpp index \
                69790bbbef..aad98ac542 100644
--- a/core/utilities/assistants/webservices/common/wstooldialog.cpp
+++ b/core/utilities/assistants/webservices/common/wstooldialog.cpp
@@ -64,6 +64,11 @@ WSToolDialog::WSToolDialog(QWidget* const parent)
     : QDialog(parent),
       d(new Private)
 {
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     d->buttonBox   = new QDialogButtonBox(QDialogButtonBox::Close, this);
     d->startButton = new QPushButton(i18nc("@action:button", "&Start"), this);
     d->startButton->setIcon(QIcon::fromTheme(QLatin1String("media-playback-start")));
                
diff --git a/core/utilities/geolocation/editor/dialog/geolocationedit.cpp \
b/core/utilities/geolocation/editor/dialog/geolocationedit.cpp index \
                9eeb8abfce..94ebe4396e 100644
--- a/core/utilities/geolocation/editor/dialog/geolocationedit.cpp
+++ b/core/utilities/geolocation/editor/dialog/geolocationedit.cpp
@@ -267,9 +267,11 @@ GeolocationEdit::GeolocationEdit(QAbstractItemModel* const \
externTagModel,  : QDialog(parent),
       d(new Private)
 {
-    setWindowFlags((windowFlags() & ~Qt::Dialog) | Qt::Window |
-                                                   Qt::WindowCloseButtonHint |
-                                                   Qt::WindowMinMaxButtonsHint);
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     setAttribute(Qt::WA_DeleteOnClose, true);
     setWindowTitle(i18n("Geolocation Editor"));
     setMinimumSize(300, 400);
diff --git a/core/utilities/maintenance/maintenancedlg.cpp \
b/core/utilities/maintenance/maintenancedlg.cpp index c64bf100b7..9c9be666b7 100644
--- a/core/utilities/maintenance/maintenancedlg.cpp
+++ b/core/utilities/maintenance/maintenancedlg.cpp
@@ -186,6 +186,7 @@ MaintenanceDlg::MaintenanceDlg(QWidget* const parent)
                    Qt::Window                    |
                    Qt::WindowCloseButtonHint     |
                    Qt::WindowMinMaxButtonsHint);
+
     setWindowTitle(i18n("Maintenance"));
     setModal(true);
 
diff --git a/core/utilities/mediaserver/dmediaserverdlg.cpp \
b/core/utilities/mediaserver/dmediaserverdlg.cpp index 94f4b2915c..014a75791a 100644
--- a/core/utilities/mediaserver/dmediaserverdlg.cpp
+++ b/core/utilities/mediaserver/dmediaserverdlg.cpp
@@ -98,9 +98,11 @@ DMediaServerDlg::DMediaServerDlg(QObject* const /*parent*/,
     : QDialog(),
       d(new Private)
 {
-    setWindowFlags((windowFlags() & ~Qt::Dialog) | Qt::Window |
-                                                   Qt::WindowCloseButtonHint |
-                                                   Qt::WindowMinMaxButtonsHint);
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     setWindowTitle(i18nc("@title:window", "Share Files with DLNA Media Server"));
 
     d->iface                 = iface;
diff --git a/core/utilities/metadataedit/dialog/metadataedit.cpp \
b/core/utilities/metadataedit/dialog/metadataedit.cpp index e1f9e9e793..57e56f6675 \
                100644
--- a/core/utilities/metadataedit/dialog/metadataedit.cpp
+++ b/core/utilities/metadataedit/dialog/metadataedit.cpp
@@ -95,9 +95,11 @@ MetadataEditDialog::MetadataEditDialog(QWidget* const parent, \
const QList<QUrl>&  : QDialog(parent),
       d(new Private)
 {
-    setWindowFlags((windowFlags() & ~Qt::Dialog) | Qt::Window |
-                                                   Qt::WindowCloseButtonHint |
-                                                   Qt::WindowMinMaxButtonsHint);
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     setWindowTitle(i18n("Metadata Editor"));
     setModal(true);
 
diff --git a/core/utilities/setup/setup.cpp b/core/utilities/setup/setup.cpp
index d2636e1315..8d3a6bb346 100644
--- a/core/utilities/setup/setup.cpp
+++ b/core/utilities/setup/setup.cpp
@@ -129,9 +129,11 @@ Setup::Setup(QWidget* const parent)
     : DConfigDlg(parent),
       d(new Private)
 {
-    setWindowFlags((windowFlags() & ~Qt::Dialog) | Qt::Window |
-                                                   Qt::WindowCloseButtonHint |
-                                                   Qt::WindowMinMaxButtonsHint);
+    setWindowFlags((windowFlags() & ~Qt::Dialog) |
+                   Qt::Window                    |
+                   Qt::WindowCloseButtonHint     |
+                   Qt::WindowMinMaxButtonsHint);
+
     setWindowTitle(i18n("Configure"));
     setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel);  button(QDialogButtonBox::Ok)->setDefault(true);


[prev in list] [next in list] [prev in thread] [next in thread]