[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=ad2fdfa

The following commit has been merged in the master branch:
commit ad2fdfadf13d89782674de702d9996a2e05ffbd9
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 10 23:57:41 2011 +0100

    Added animated QFrame to display some messages (info, errors etc) to user
---
 main-widget.cpp | 45 +++++++++++++++++++++++++++++++++++++++------
 main-widget.h   |  2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 070c0d7..aa44882 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -371,18 +371,15 @@ void MainWidget::onAccountReady(Tp::PendingOperation* op)
     }
     
     Tp::PendingReady *pendingReady = qobject_cast<Tp::PendingReady*>(op);
-    Q_ASSERT(pendingReady);
-    //Tp::AccountPtr account = Tp::AccountPtr::dynamicCast(pendingReady->object());
-    //account->deref(); //remove extra reference added in onAccountCreated()
-    
-
-    
+    Q_ASSERT(pendingReady);   
 }
 
 void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
 {   
     //TODO: Add some handling
     kDebug() << "Connection status is" << status;
+    if(status == Tp::ConnectionStatusConnecting)
+        showMessageToUser(i18n("Connecting..."));
 }
 
 void MainWidget::onConnectionChanged(const Tp::ConnectionPtr& connection)
@@ -456,6 +453,42 @@ void MainWidget::onHandlerReady(bool ready)
     }
 }
 
+void MainWidget::showMessageToUser(const QString& text)
+{
+    QFrame *msgFrame = new QFrame(m_contactsListView);
+    msgFrame->setAttribute(Qt::WA_DeleteOnClose);
+    msgFrame->setMinimumSize(QSize(m_contactsListView->width(), 150));
+    msgFrame->setFrameShape(QFrame::StyledPanel);
+    msgFrame->setFrameShadow(QFrame::Plain);
+    msgFrame->setAutoFillBackground(true);
+    
+    QLabel *message = new QLabel(text, msgFrame);
+    
+    msgFrame->show();
+    
+    //QTimeLine *tl = new QTimeLine(4000);
+    
+    QPropertyAnimation *a = new QPropertyAnimation(msgFrame, "pos");
+    a->setParent(msgFrame);
+    a->setDuration(4000);
+    a->setEasingCurve(QEasingCurve::OutExpo);
+    a->setStartValue(QPointF(m_contactsListView->pos().x(), m_contactsListView->pos().y()+m_contactsListView->height()));
+    a->setEndValue(QPointF(m_contactsListView->pos().x(), m_contactsListView->pos().y()+m_contactsListView->height()-100));
+    a->start();
+    
+//     m_anim = new Animation(msgFrame, "pos");
+//     m_anim->setEasingCurve(QEasingCurve::OutExpo);
+    
+//     m_anim->setStartValue(QPointF(m_contactsListView->pos().x(), m_contactsListView->pos().y()+m_contactsListView->height()));
+//     m_anim->setEndValue(QPointF(m_contactsListView->pos().x(), m_contactsListView->pos().y()+m_contactsListView->height()-100));
+//     m_anim->setDuration(4000);
+//     m_anim->setLoopCount(1);
+//     m_anim->start();
+    
+    QTimer::singleShot(4500, msgFrame, SLOT(close()));
+    
+}
+
 void MainWidget::onCustomContextMenuRequested(const QPoint& point)
 {
 //     QModelIndex proxyIdx = m_contactsListView->indexAt(point);
diff --git a/main-widget.h b/main-widget.h
index cd69184..9f17f4e 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -75,6 +75,7 @@ public Q_SLOTS:
     void onAccountReady(Tp::PendingOperation *op);
     void onAccountConnectionStatusChanged(Tp::ConnectionStatus status);
     void loadContactsFromAccount(const Tp::AccountPtr &account);
+    void showMessageToUser(const QString &text);
     //    void startAudioChannel();
     //    void startVideoChannel();
     
@@ -100,7 +101,6 @@ private:
     AccountsListModel*      m_accountsListModel;
     KMenu*                  m_accountMenu;
     KSelectAction*          m_setStatusAction;
-
     
 //     KTelepathy::GroupedContactsProxyModel *m_groupedContactsProxyModel;
 //     Nepomuk::PersonContact m_mePersonContact;

-- 
ktp-contact-list packaging