[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=74a9e00

The following commit has been merged in the master branch:
commit 74a9e00e3bd8955a2ce3ef3463d6c465497f8176
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 9 19:06:01 2012 +0100

    Disable Ok button when no contact is selected
---
 mainwindow.cpp | 15 ++++++++++++++-
 mainwindow.h   |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6d4e394..551b9aa 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -31,7 +31,7 @@
 #include <KLineEdit>
 #include <KIO/PreviewJob>
 
-#include <QtGui/QAbstractButton>
+#include <QtGui/QPushButton>
 
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/PendingChannelRequest>
@@ -110,6 +110,11 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
     m_contactGridWidget->filter()->setCapabilityFilterFlags(AccountsFilterModel::FilterByFileTransferCapability);
     ui->recipientVLayout->addWidget(m_contactGridWidget);
 
+    connect(m_contactGridWidget,
+            SIGNAL(selectionChanged(Tp::AccountPtr,Tp::ContactPtr)),
+            SLOT(onContactSelectionChanged(Tp::AccountPtr,Tp::ContactPtr)));
+
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
     connect(ui->buttonBox, SIGNAL(accepted()), SLOT(onDialogAccepted()));
     connect(ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
 }
@@ -159,6 +164,14 @@ void MainWindow::onDialogAccepted()
     }
 }
 
+void MainWindow::onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact)
+{
+    Q_UNUSED(account)
+    Q_UNUSED(contact)
+
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_contactGridWidget->hasSelection());
+}
+
 void MainWindow::slotFileTransferFinished(Tp::PendingOperation* op)
 {
     if (op->isError()) {
diff --git a/mainwindow.h b/mainwindow.h
index 569d9c1..358537c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -48,11 +48,12 @@ public:
     explicit MainWindow(const KUrl &url, QWidget *parent = 0);
     ~MainWindow();
 
-private slots:
+private Q_SLOTS:
     void onAccountManagerReady();
     void onDialogAccepted();
     void onPreviewLoaded(const KFileItem &item, const QPixmap &preview);
     void onPreviewFailed(const KFileItem &item);
+    void onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact);
     void slotFileTransferFinished(Tp::PendingOperation *op);
 
 private:

-- 
ktp-send-file packaging