[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=3074d36

The following commit has been merged in the master branch:
commit 3074d36b22d0be79ea877e2ac7e7b2736e2dedcb
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Oct 14 14:07:19 2011 +0200

    Use click message for the presence combobox
    
    Reviewd-by: David Edmundson
    REVIEW: 102861
    BUG: 283801
---
 dialogs/custom-presence-dialog.cpp | 11 +++++++++++
 dialogs/custom-presence-dialog.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 2d9dcfc..94e2f75 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -35,6 +35,7 @@
 #include <KDE/KSharedConfigPtr>
 
 #include <TelepathyQt4/Presence>
+#include <QLineEdit>
 
 class FilteredModel : public QSortFilterProxyModel {
 public:
@@ -85,6 +86,9 @@ void CustomPresenceDialog::setupDialog()
     m_statusMessage->setAutoCompletion(false);
     m_statusMessage->show();
 
+    m_statusMessage->lineEdit()->setPlaceholderText(m_statusMessage->currentText());
+    m_statusMessage->lineEdit()->setText(QString());
+
     QPushButton *addStatus = new QPushButton(KIcon("list-add"), i18n("Add Presence"), mainDialogWidget);
     QPushButton *removeStatus = new QPushButton(KIcon("list-remove"), i18n("Remove Presence"), mainDialogWidget);
 
@@ -107,6 +111,7 @@ void CustomPresenceDialog::setupDialog()
     connect(addStatus, SIGNAL(clicked()), SLOT(addCustomPresence()));
     connect(removeStatus, SIGNAL(clicked()), SLOT(removeCustomPresence()));
     connect(m_statusMessage, SIGNAL(returnPressed()), SLOT(addCustomPresence()));
+    connect(m_statusMessage, SIGNAL(currentIndexChanged(QString)), SLOT(comboboxIndexChanged(QString)));
 }
 
 void CustomPresenceDialog::addCustomPresence()
@@ -127,3 +132,9 @@ void CustomPresenceDialog::removeCustomPresence()
     Tp::Presence presence = m_listView->currentIndex().data(PresenceModel::PresenceRole).value<Tp::Presence>();
     m_model->removePresence(presence);
 }
+
+void CustomPresenceDialog::comboboxIndexChanged(const QString& text)
+{
+    m_statusMessage->lineEdit()->setText(QString());
+    m_statusMessage->lineEdit()->setPlaceholderText(text);
+}
diff --git a/dialogs/custom-presence-dialog.h b/dialogs/custom-presence-dialog.h
index cfb2774..4a764a9 100644
--- a/dialogs/custom-presence-dialog.h
+++ b/dialogs/custom-presence-dialog.h
@@ -40,6 +40,7 @@ public:
 private Q_SLOTS:
     void addCustomPresence();
     void removeCustomPresence();
+    void comboboxIndexChanged(const QString &text);
 
 private:
     ///Setup the initial dialog

-- 
ktp-contact-list packaging