[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=48f4e33

The following commit has been merged in the master branch:
commit 48f4e33fa8c5ba1a9ffc7f1f5da7e9205930d337
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Nov 21 17:03:22 2012 +0100

    Add 'Open Log Viewer' action to contact overlay
    
    REVIEW: 107404
---
 contact-list-widget.cpp |  7 +++++++
 contact-overlays.cpp    | 12 ++++++++++++
 contact-overlays.h      | 10 ++++++++++
 3 files changed, 29 insertions(+)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 5a0f96d..564f368 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -217,12 +217,14 @@ void ContactListWidget::addOverlayButtons()
 
     FileTransferContactOverlay *fileOverlay  = new FileTransferContactOverlay(this);
     DesktopSharingContactOverlay *desktopOverlay = new DesktopSharingContactOverlay(this);
+    LogViewerOverlay *logViewerOverlay = new LogViewerOverlay(this);
 
     d->delegate->installOverlay(textOverlay);
     d->delegate->installOverlay(audioOverlay);
     d->delegate->installOverlay(videoOverlay);
     d->delegate->installOverlay(fileOverlay);
     d->delegate->installOverlay(desktopOverlay);
+    d->delegate->installOverlay(logViewerOverlay);
 
     d->delegate->setViewOnAllOverlays(this);
     d->delegate->setAllOverlaysActive(true);
@@ -249,6 +251,8 @@ void ContactListWidget::addOverlayButtons()
     connect(desktopOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPtr)),
             this, SLOT(startDesktopSharing(Tp::AccountPtr, Tp::ContactPtr)));
 
+    connect(logViewerOverlay, SIGNAL(activated(Tp::AccountPtr,Tp::ContactPtr)),
+	    this, SLOT(startLogViewer(Tp::AccountPtr, Tp::ContactPtr)));
 
     connect(this, SIGNAL(enableOverlays(bool)),
             textOverlay, SLOT(setActive(bool)));
@@ -264,6 +268,9 @@ void ContactListWidget::addOverlayButtons()
 
     connect(this, SIGNAL(enableOverlays(bool)),
             desktopOverlay, SLOT(setActive(bool)));
+
+    connect(this, SIGNAL(enableOverlays(bool)),
+	    logViewerOverlay, SLOT(setActive(bool)));
 }
 
 void ContactListWidget::toggleGroups(bool show)
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index bc2671b..bd601f9 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -188,5 +188,17 @@ DesktopSharingContactOverlay::DesktopSharingContactOverlay(QObject *parent)
 {
 }
 
+//-------------------------------------------------------------------------
+
+LogViewerOverlay::LogViewerOverlay(QObject* parent)
+    : StartChannelContactOverlay(
+	parent,
+	KGuiItem(i18n("Open Log Viewer"), "documentation",
+		 i18n("Open Log Viewer"), i18n("Show conversation logs")),
+	Qt::DisplayRole,	/* Always display the logviewer action */
+	IconSize(KIconLoader::Dialog) + spacing * 7 + IconSize(KIconLoader::Small) * 5)
+{
+}
+
 
 #include "contact-overlays.moc"
diff --git a/contact-overlays.h b/contact-overlays.h
index c93d462..6b64d90 100644
--- a/contact-overlays.h
+++ b/contact-overlays.h
@@ -112,4 +112,14 @@ public:
     DesktopSharingContactOverlay(QObject *parent);
 };
 
+// ---------------------------------------------------------------------
+
+class LogViewerOverlay: public StartChannelContactOverlay
+{
+    Q_OBJECT
+
+public:
+    LogViewerOverlay(QObject *parent);
+};
+
 #endif // VERSIONSOVERLAYS_H

-- 
ktp-contact-list packaging