[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=476a49d

The following commit has been merged in the master branch:
commit 476a49d3a55186e8548abe7737103efdc2614b4d
Author: Nicolas Lécureuil <neoclust.kde at free.fr>
Date:   Thu Apr 14 15:36:15 2011 +0200

    Use KAction instead of QAction
    Use KDE Std shortcut for Find
    Review: https://git.reviewboard.kde.org/r/101121/
---
 main-widget.cpp | 24 ++++++++++++++++++++----
 main-widget.h   |  6 +++++-
 main-widget.ui  | 45 ---------------------------------------------
 3 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 7fe200c..4550ded 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -47,6 +47,7 @@
 #include <KSharedConfig>
 #include <KFileDialog>
 #include <KMessageBox>
+#include <KStandardShortcut>
 
 #include "main-widget.h"
 #include "ui_main-widget.h"
@@ -114,23 +115,38 @@ MainWidget::MainWidget(QWidget *parent)
     m_toolBar->addSeparator();
     m_toolBar->addWidget(settingsButton);
 
-    m_actionAdd_contact->setIcon(KIcon("list-add-user"));
+    m_actionAdd_contact = new KAction(KIcon("list-add-user"), i18n("Add contact"), this);
     m_actionAdd_contact->setText(QString());
     m_actionAdd_contact->setToolTip(i18n("Add new contacts.."));
 
-    m_actionGroup_contacts->setIcon(KIcon("user-group-properties"));
+    m_toolBar->addAction(m_actionAdd_contact);
+
+    m_actionGroup_contacts = new KAction(KIcon("user-group-properties"), i18n("Group contacts"), this);
     m_actionGroup_contacts->setText(QString());
+    m_actionGroup_contacts->setCheckable(true);
+    m_actionGroup_contacts->setChecked(true);
     //TODO: Toggle the tooltip with the button? eg. once its Show, after click its Hide .. ?
     m_actionGroup_contacts->setToolTip(i18n("Show/Hide groups"));
 
-    m_actionHide_offline->setIcon(KIcon("meeting-attending-tentative"));
+    m_toolBar->addAction(m_actionGroup_contacts);
+
+    m_actionHide_offline = new KAction(KIcon("meeting-attending-tentative"), i18n("Hide offline"), this);
     m_actionHide_offline->setText(QString());
+    m_actionHide_offline->setCheckable(true);
+    m_actionHide_offline->setChecked(true);
     m_actionHide_offline->setToolTip(i18n("Show/Hide offline users"));
 
-    m_actionSearch_contact->setIcon(KIcon("edit-find-user"));
+    m_toolBar->addAction(m_actionHide_offline);
+
+    m_actionSearch_contact = new KAction(KIcon("edit-find-user"), i18n("Search contacts"), this );
+    m_actionSearch_contact->setShortcut(KStandardShortcut::find());
+    m_actionSearch_contact->setCheckable(true);
+    m_actionSearch_contact->setChecked(false);
     m_actionSearch_contact->setText(QString());
     m_actionSearch_contact->setToolTip(i18n("Find contact"));
 
+    m_toolBar->addAction(m_actionSearch_contact);
+
     // Start setting up the Telepathy AccountManager.
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
                                                                        Tp::Features() << Tp::Account::FeatureCore
diff --git a/main-widget.h b/main-widget.h
index 18f97ee..cc97b12 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -29,7 +29,7 @@
 #include <TelepathyQt4/AccountManager>
 
 #include <KXmlGuiWindow>
-
+#include <KAction>
 #include "ui_main-widget.h"
 
 class KMenu;
@@ -103,6 +103,10 @@ private:
     KMenu                  *m_avatarButtonMenu;
     KSelectAction          *m_setStatusAction;
     ContactDelegate        *m_delegate;
+    KAction                *m_actionAdd_contact;
+    KAction                *m_actionGroup_contacts;
+    KAction                *m_actionHide_offline;
+    KAction                *m_actionSearch_contact;
 };
 
 
diff --git a/main-widget.ui b/main-widget.ui
index d000b9b..cf1dee4 100644
--- a/main-widget.ui
+++ b/main-widget.ui
@@ -88,10 +88,6 @@
       <property name="toolButtonStyle">
        <enum>Qt::ToolButtonIconOnly</enum>
       </property>
-      <addaction name="m_actionAdd_contact"/>
-      <addaction name="m_actionGroup_contacts"/>
-      <addaction name="m_actionHide_offline"/>
-      <addaction name="m_actionSearch_contact"/>
      </widget>
     </item>
     <item>
@@ -102,47 +98,6 @@
     </item>
    </layout>
   </widget>
-  <action name="m_actionAdd_contact">
-   <property name="text">
-    <string>Add contact</string>
-   </property>
-  </action>
-  <action name="m_actionGroup_contacts">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Group contacts</string>
-   </property>
-  </action>
-  <action name="m_actionHide_offline">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Hide offline</string>
-   </property>
-  </action>
-  <action name="m_actionSearch_contact">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Search contacts</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+I</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>

-- 
ktp-contact-list packaging