[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=60d575c

The following commit has been merged in the master branch:
commit 60d575c986c24ef8b2b2307edf86bc8fc4c0f0b2
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Apr 10 13:56:49 2011 +0200

    Make the "Load from file..." menu item look the same as the other entries.
    Reviewed by: David Edmundson
    REVIEW: 101077
    BUG: 270423
---
 main-widget.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index a24ccf0..7fe200c 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -80,7 +80,23 @@ MainWidget::MainWidget(QWidget *parent)
     m_userAccountIconButton->setPopupMode(QToolButton::InstantPopup);
 
     m_avatarButtonMenu = new KMenu(m_userAccountIconButton);
-    m_avatarButtonMenu->addAction(i18n("Load from file..."), this, SLOT(loadAvatarFromFile()));
+
+    QToolButton *loadFromFileButton = new QToolButton(this);
+    loadFromFileButton->setIcon(KIcon("document-open-folder"));
+    loadFromFileButton->setIconSize(QSize(48, 48));
+    loadFromFileButton->setText(i18n("Load from file..."));
+    loadFromFileButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+    QWidgetAction *loadFromFileAction = new QWidgetAction(this);
+    loadFromFileAction->setDefaultWidget(loadFromFileButton);
+
+    connect(loadFromFileButton, SIGNAL(clicked(bool)),
+            loadFromFileAction, SIGNAL(triggered(bool)));
+
+    connect(loadFromFileAction, SIGNAL(triggered(bool)),
+            this, SLOT(loadAvatarFromFile()));
+
+    m_avatarButtonMenu->addAction(loadFromFileAction);
 
     m_userAccountIconButton->setMenu(m_avatarButtonMenu);
 

-- 
ktp-contact-list packaging