[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=468098e

The following commit has been merged in the master branch:
commit 468098e4f9d4cc4eba9a4105e71185686fb2de9e
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Aug 5 15:35:54 2010 +0000

    Set some icons and clean widgets naming style
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1159548
---
 main-widget.cpp | 4 +++-
 main-widget.h   | 4 +++-
 main-widget.ui  | 9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 645644f..0d39532 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -145,6 +145,8 @@ MainWidget::MainWidget(QWidget *parent)
     }
 
     setupUi(this);
+    setWindowIcon(KIcon("telepathy"));
+    m_actionAdd_contact->setIcon(KIcon("list-add-user"));
 
     // Initialize Telepathy
     TelepathyBridge::instance()->init();
@@ -165,7 +167,7 @@ MainWidget::MainWidget(QWidget *parent)
     m_contactsListView->setItemDelegate(new ContactDelegate(this));
     connect(m_contactsListView, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(onCustomContextMenuRequested(QPoint)));
-    connect(actionAdd_contact, SIGNAL(triggered(bool)),
+    connect(m_actionAdd_contact, SIGNAL(triggered(bool)),
             this, SLOT(onAddContactRequest(bool)));
 
     // Get 'me' as soon as possible
diff --git a/main-widget.h b/main-widget.h
index 50349bb..058fe22 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -60,15 +60,17 @@ private:
 
 public slots:
     void onCustomContextMenuRequested(const QPoint &point);
+//Menu actions
     void onStartChat(bool);
     void onRequestRemoveFromGroup(bool);
     void onContactRemovalRequest(bool);
     void onContactBlockRequest(bool);
     void onHandlerReady(bool);
     void onRequestAddToGroup(bool);
-    void onAddContactRequest(bool);
     void onAddToMetaContact(bool);
     void onRemoveFromMetacontact(bool);
+//Toolbar actions
+    void onAddContactRequest(bool);
 };
 
 
diff --git a/main-widget.ui b/main-widget.ui
index f3a5c60..b4e38ae 100644
--- a/main-widget.ui
+++ b/main-widget.ui
@@ -18,15 +18,18 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QToolBar" name="widget">
-     <addaction name="actionAdd_contact"/>
+    <widget class="QToolBar" name="m_toolBar">
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonTextBesideIcon</enum>
+     </property>
+     <addaction name="m_actionAdd_contact"/>
     </widget>
    </item>
    <item>
     <widget class="QTreeView" name="m_contactsListView"/>
    </item>
   </layout>
-  <action name="actionAdd_contact">
+  <action name="m_actionAdd_contact">
    <property name="text">
     <string>Add contact</string>
    </property>

-- 
ktp-contact-list packaging