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

List:       kde-commits
Subject:    [okteta/kf5-port] kasten/controllers/view/structures/settings: Port Advanced Selection dialog from K
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2013-12-24 10:38:31
Message-ID: E1VvPNf-0004Mi-9d () scm ! kde ! org
[Download RAW message or body]

Git commit 65c1e5815fd7d3766e29ad9245f2e462cddafca9 by Friedrich W. H. Kossebau.
Committed on 24/12/2013 at 10:38.
Pushed by kossebau into branch 'kf5-port'.

Port Advanced Selection dialog from KDialog to QDialog

M  +1    -0    kasten/controllers/view/structures/settings/structureaddremovewidget.cpp
 M  +12   -3    kasten/controllers/view/structures/settings/structuresmanagerview.cpp

http://commits.kde.org/okteta/65c1e5815fd7d3766e29ad9245f2e462cddafca9

diff --git a/kasten/controllers/view/structures/settings/structureaddremovewidget.cpp \
b/kasten/controllers/view/structures/settings/structureaddremovewidget.cpp index \
                abedef6..a9acc9d 100644
--- a/kasten/controllers/view/structures/settings/structureaddremovewidget.cpp
+++ b/kasten/controllers/view/structures/settings/structureaddremovewidget.cpp
@@ -46,6 +46,7 @@ StructureAddRemoveWidget::StructureAddRemoveWidget(const \
QStringList& selected,  QVBoxLayout* upDownLayout;
 
     baseLayout = new QHBoxLayout();
+    baseLayout->setMargin(0);
 
     tree1Layout = new QVBoxLayout();
     mTree1Label = new QLabel(i18nc("@info:label", "Installed structures:"), this);
diff --git a/kasten/controllers/view/structures/settings/structuresmanagerview.cpp \
b/kasten/controllers/view/structures/settings/structuresmanagerview.cpp index \
                8eff04c..1840249 100644
--- a/kasten/controllers/view/structures/settings/structuresmanagerview.cpp
+++ b/kasten/controllers/view/structures/settings/structuresmanagerview.cpp
@@ -33,10 +33,11 @@
 #include <KConfigDialogManager>
 #include <KPluginInfo>
 #include <KLocalizedString>
-#include <KDialog>
 //KNS
 #include <KNS3/KNewStuffButton>
 // Qt
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QDialogButtonBox>
 #include <QPushButton>
 #include <QListWidgetItem>
 #include <QLayout>
@@ -104,8 +105,16 @@ QStringList StructuresManagerView::values()
 void StructuresManagerView::advancedSelection()
 {
     StructureAddRemoveWidget* advancedSelectionWidget = new \
                StructureAddRemoveWidget(mSelectedStructures, mTool, this);
-    QPointer<KDialog> dlg = new KDialog(this); //the dlg-on-heap-variant
-    dlg->setMainWidget(advancedSelectionWidget);
+    QPointer<QDialog> dlg = new QDialog(this); //the dlg-on-heap-variant
+    QVBoxLayout* layout = new QVBoxLayout;
+    QDialogButtonBox* dialogButtonBox = new QDialogButtonBox;
+    dialogButtonBox->addButton(QDialogButtonBox::Ok);
+    connect(dialogButtonBox, &QDialogButtonBox::accepted, dlg.data(), \
&QDialog::accept); +    dialogButtonBox->addButton(QDialogButtonBox::Cancel);
+    connect(dialogButtonBox, &QDialogButtonBox::rejected, dlg.data(), \
&QDialog::reject); +    layout->addWidget(advancedSelectionWidget);
+    layout->addWidget(dialogButtonBox);
+    dlg->setLayout(layout);
     if (dlg->exec() == QDialog::Accepted) {
         QStringList newVals = advancedSelectionWidget->values();
         if (newVals != mSelectedStructures) {


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