[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=b61d910

The following commit has been merged in the master branch:
commit b61d910a949fd27c1c29470a16f515045388b118
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Nov 18 16:56:00 2014 +0100

    Add buttonbox to the advanced dialog
    
    CCMAIL: aleixpol at kde.org
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 52723bf..4fc6b59 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -38,6 +38,7 @@
 #include <QList>
 #include <QCheckBox>
 #include <QDialog>
+#include <QDialogButtonBox>
 
 class AccountEditWidget::Private
 {
@@ -220,7 +221,15 @@ void AccountEditWidget::onAdvancedClicked()
     AbstractAccountParametersWidget *advancedWidget;
     advancedWidget = d->accountUi->advancedOptionsWidget(d->parameterModel,
                                                          dialog.data());
-//     dialog.data()->setMainWidget(advancedWidget);
+
+    QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dialog.data());
+    connect(dbb, SIGNAL(accepted()), dialog.data(), SLOT(accept()));
+    connect(dbb, SIGNAL(rejected()), dialog.data(), SLOT(reject()));
+
+    QVBoxLayout *layout = new QVBoxLayout(dialog.data());
+    layout->addWidget(advancedWidget);
+    layout->addWidget(dbb);
+    dialog.data()->setLayout(layout);
 
     // loop until the entered values are ok or the user cancels the dialog
 

-- 
ktp-accounts-kcm packaging