[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=690ea64

The following commit has been merged in the master branch:
commit 690ea6427a3e25f65285d603d86e04f12a54153c
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jan 13 17:28:59 2015 +0100

    [logviewer] Port KDialog to QDialog + QDialogButtonbox
---
 logviewer/logs-import-dialog.cpp | 35 +++++++++++++++++++++--------------
 logviewer/logs-import-dialog.h   | 13 ++++++++-----
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/logviewer/logs-import-dialog.cpp b/logviewer/logs-import-dialog.cpp
index 425587a..49a738c 100644
--- a/logviewer/logs-import-dialog.cpp
+++ b/logviewer/logs-import-dialog.cpp
@@ -24,6 +24,9 @@
 #include <QProgressBar>
 #include <QIcon>
 #include <KListWidget>
+#include <QDialogButtonBox>
+#include <QAbstractButton>
+#include <QPushButton>
 #include <KLocalizedString>
 #include <KTp/logs-importer.h>
 #include <TelepathyQt/Account>
@@ -31,18 +34,25 @@
 Q_DECLARE_METATYPE(Tp::AccountPtr);
 
 LogsImportDialog::LogsImportDialog(QObject *parent)
-    : KDialog()
+    : QDialog()
 {
     Q_UNUSED(parent);
 
+    m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Close, this);
+    m_buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("Import Logs"));
+
+    connect(m_buttonBox, &QDialogButtonBox::clicked, this, &LogsImportDialog::slotButtonClicked);
+    connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
     setWindowTitle(i18n("Import Kopete Logs"));
     setWindowIcon(QIcon::fromTheme(QLatin1String("telepathy-kde")));
 
     QWidget *mainWidget = new QWidget(this);
-    setMainWidget(mainWidget);
 
-    QVBoxLayout *layout = new QVBoxLayout();
-    mainWidget->setLayout(layout);
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    setLayout(layout);
+    layout->addWidget(mainWidget);
 
     QLabel *label = new QLabel(mainWidget);
     label->setText(i18n("We have found Kopete logs that seem to match some of your KDE Telepathy accounts.

"
@@ -61,8 +71,7 @@ LogsImportDialog::LogsImportDialog(QObject *parent)
     m_progressBar->setTextVisible(false);
     layout->addWidget(m_progressBar);
 
-    setButtons(Ok | Close);
-    setButtonText(Ok, i18n("Import Logs"));
+    layout->addWidget(m_buttonBox);
 
     setMinimumWidth(300);
 
@@ -90,20 +99,18 @@ void LogsImportDialog::importLogs(const QList< Tp::AccountPtr >& accounts)
     exec();
 }
 
-void LogsImportDialog::slotButtonClicked(int button)
+void LogsImportDialog::slotButtonClicked(QAbstractButton *button)
 {
-    if (button == Ok) {
+    if (m_buttonBox->standardButton(button) == QDialogButtonBox::Ok) {
         m_accountsList->setEnabled(false);
         m_progressBar->setVisible(true);
-        enableButton(Ok, false);
-        enableButton(Close, false);
+        m_buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+        m_buttonBox->button(QDialogButtonBox::Close)->setDisabled(true);
 
         m_row = 0;
         importFinished();
         return;
     }
-
-    KDialog::slotButtonClicked(button);
 }
 
 void LogsImportDialog::importFinished()
@@ -127,7 +134,7 @@ void LogsImportDialog::importFinished()
     } else {
         m_accountsList->item(m_row - 1)->setCheckState(Qt::Unchecked);
         m_progressBar->setVisible(false);
-        enableButton(Close, true);
-        setButtonText(Close, i18n("Done"));
+        m_buttonBox->button(QDialogButtonBox::Close)->setEnabled(true);
+        m_buttonBox->button(QDialogButtonBox::Close)->setText(i18n("Done"));
     }
 }
diff --git a/logviewer/logs-import-dialog.h b/logviewer/logs-import-dialog.h
index 7d2ad4d..85f374f 100644
--- a/logviewer/logs-import-dialog.h
+++ b/logviewer/logs-import-dialog.h
@@ -20,18 +20,20 @@
 #ifndef LOGSIMPORTDIALOG_H
 #define LOGSIMPORTDIALOG_H
 
-#include <KDialog>
+#include <QDialog>
 #include <TelepathyQt/Types>
 
 namespace KTp {
 class LogsImporter;
 }
 
+class QAbstractButton;
+class QDialogButtonBox;
 class QProgressBar;
-class KListWidget;
+class QListWidget;
 class LogsImportDialogPrivate;
 
-class LogsImportDialog : public KDialog
+class LogsImportDialog : public QDialog
 {
     Q_OBJECT
 
@@ -43,13 +45,14 @@ class LogsImportDialog : public KDialog
     void importLogs(const QList<Tp::AccountPtr> &accounts);
 
   protected Q_SLOTS:
-    virtual void slotButtonClicked(int button);
+    virtual void slotButtonClicked(QAbstractButton *button);
 
   private Q_SLOTS:
     void importFinished();
 
   private:
-    KListWidget *m_accountsList;
+    QDialogButtonBox *m_buttonBox;
+    QListWidget *m_accountsList;
     QProgressBar *m_progressBar;
     KTp::LogsImporter *m_importer;
     int m_row;

-- 
ktp-text-ui packaging