[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=18f3cfb

The following commit has been merged in the master branch:
commit 18f3cfbda7cf8f46d961856ed30e4657a6aa0e83
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jan 12 19:22:20 2015 +0100

    [app] Port KDialog to QDialog
---
 app/invite-contact-dialog.cpp | 25 ++++++++++++++++---------
 app/invite-contact-dialog.h   |  7 +++++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index da9102b..ac4950c 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -24,8 +24,11 @@
 
 #include <QtCore/QPointer>
 
-#include <KLineEdit>
-#include <KPushButton>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+
 #include <KLocalizedString>
 
 #include <TelepathyQt/Contact>
@@ -38,10 +41,11 @@
 #include <KTp/Widgets/contact-grid-widget.h>
 
 InviteContactDialog::InviteContactDialog(const Tp::AccountManagerPtr &accountManager, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel, QWidget *parent) :
-    KDialog(parent),
+    QDialog(parent),
     m_account(account),
     m_channel(channel),
-    m_contactsModel(new KTp::ContactsListModel(this))
+    m_contactsModel(new KTp::ContactsListModel(this)),
+    m_buttonBox(new QDialogButtonBox(QDialogButtonBox::Ok, this))
 {
     resize(500,450);
 
@@ -53,17 +57,20 @@ InviteContactDialog::InviteContactDialog(const Tp::AccountManagerPtr &accountMan
     m_contactGridWidget->filter()->setAccountFilter(account);
     m_contactGridWidget->setSelectionMode(QAbstractItemView::MultiSelection);
 
-    setMainWidget(m_contactGridWidget);
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(m_contactGridWidget);
+    mainLayout->addWidget(m_buttonBox);
+
     setWindowTitle(i18n("Select Contacts to Invite to Group Chat"));
 
     connect(m_contactGridWidget,
             SIGNAL(selectionChanged(Tp::AccountPtr,KTp::ContactPtr)),
             SLOT(onChanged()));
 
-    button(KDialog::Ok)->setDisabled(true);
+    m_buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
 
-    connect(this, SIGNAL(okClicked()), SLOT(onOkClicked()));
-    connect(this, SIGNAL(rejected()), SLOT(close()));
+    connect(m_buttonBox->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &InviteContactDialog::onOkClicked);
+    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &InviteContactDialog::close);
 }
 
 Tp::AccountPtr InviteContactDialog::account() const
@@ -102,5 +109,5 @@ void InviteContactDialog::onOkClicked()
 
 void InviteContactDialog::onChanged()
 {
-    button(KDialog::Ok)->setEnabled(m_contactGridWidget->hasSelection());
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_contactGridWidget->hasSelection());
 }
diff --git a/app/invite-contact-dialog.h b/app/invite-contact-dialog.h
index 78d77f0..453a347 100644
--- a/app/invite-contact-dialog.h
+++ b/app/invite-contact-dialog.h
@@ -23,11 +23,13 @@
 #ifndef INVITECONTACTDIALOG_H
 #define INVITECONTACTDIALOG_H
 
-#include <KDialog>
+#include <QDialog>
+
 #include <TelepathyQt/Types>
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/Account>
 
+class QDialogButtonBox;
 namespace Tp {
 class PendingOperation;
 }
@@ -38,7 +40,7 @@ class ContactsListModel;
 }
 
 
-class InviteContactDialog : public KDialog
+class InviteContactDialog : public QDialog
 {
     Q_OBJECT
     Q_DISABLE_COPY(InviteContactDialog)
@@ -57,6 +59,7 @@ private:
     Tp::TextChannelPtr m_channel;
     KTp::ContactsListModel *m_contactsModel;
     KTp::ContactGridWidget *m_contactGridWidget;
+    QDialogButtonBox *m_buttonBox;
 };
 
 #endif // CONTACTDIALOG_H

-- 
ktp-text-ui packaging