[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=95e7e09

The following commit has been merged in the master branch:
commit 95e7e093c2bc235c5fce63ecd38cf5946c1198e8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 9 17:51:10 2011 +0000

    Use native image for expand/collapse of tree headers.
---
 build/telepathy-kde-contactlist_automoc.cpp |  10 +++
 build/ui_main-widget.h                      | 101 ++++++++++++++++++++++++++++
 contactdelegate.cpp                         |   9 ++-
 3 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/build/telepathy-kde-contactlist_automoc.cpp b/build/telepathy-kde-contactlist_automoc.cpp
new file mode 100644
index 0000000..07c3fba
--- /dev/null
+++ b/build/telepathy-kde-contactlist_automoc.cpp
@@ -0,0 +1,10 @@
+/* This file is autogenerated, do not edit
+-D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS -DKDE4_CMAKE_TOPLEVEL_DIR_LENGTH=30
+*/
+#include "moc_accountfiltermodel.cpp"
+#include "moc_contactdelegate.cpp"
+#include "moc_contact-model-item.cpp"
+#include "moc_accounts-model.cpp"
+#include "moc_accounts-model-item.cpp"
+#include "moc_accountbutton.cpp"
+#include "moc_tree-node.cpp"
diff --git a/build/ui_main-widget.h b/build/ui_main-widget.h
new file mode 100644
index 0000000..6c9de27
--- /dev/null
+++ b/build/ui_main-widget.h
@@ -0,0 +1,101 @@
+#include <kdialog.h>
+#include <klocale.h>
+
+/********************************************************************************
+** Form generated from reading UI file 'main-widget.ui'
+**
+** Created: Wed Mar 9 17:43:35 2011
+**      by: Qt User Interface Compiler version 4.7.0
+**
+** WARNING! All changes made in this file will be lost when recompiling UI file!
+********************************************************************************/
+
+#ifndef UI_MAIN_2D_WIDGET_H
+#define UI_MAIN_2D_WIDGET_H
+
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QToolBar>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWidget
+{
+public:
+    QAction *m_actionAdd_contact;
+    QAction *m_actionGroup_contacts;
+    QAction *m_actionHide_offline;
+    QVBoxLayout *verticalLayout;
+    QToolBar *m_toolBar;
+    QTreeView *m_contactsListView;
+    QHBoxLayout *m_accountButtonsLayout;
+
+    void setupUi(QWidget *MainWidget)
+    {
+        if (MainWidget->objectName().isEmpty())
+            MainWidget->setObjectName(QString::fromUtf8("MainWidget"));
+        MainWidget->resize(324, 618);
+        m_actionAdd_contact = new QAction(MainWidget);
+        m_actionAdd_contact->setObjectName(QString::fromUtf8("m_actionAdd_contact"));
+        m_actionGroup_contacts = new QAction(MainWidget);
+        m_actionGroup_contacts->setObjectName(QString::fromUtf8("m_actionGroup_contacts"));
+        m_actionGroup_contacts->setCheckable(true);
+        m_actionGroup_contacts->setChecked(true);
+        m_actionHide_offline = new QAction(MainWidget);
+        m_actionHide_offline->setObjectName(QString::fromUtf8("m_actionHide_offline"));
+        m_actionHide_offline->setCheckable(true);
+        m_actionHide_offline->setChecked(true);
+        verticalLayout = new QVBoxLayout(MainWidget);
+        verticalLayout->setContentsMargins(0, 0, 0, 0);
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+        m_toolBar = new QToolBar(MainWidget);
+        m_toolBar->setObjectName(QString::fromUtf8("m_toolBar"));
+        m_toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+        verticalLayout->addWidget(m_toolBar);
+
+        m_contactsListView = new QTreeView(MainWidget);
+        m_contactsListView->setObjectName(QString::fromUtf8("m_contactsListView"));
+
+        verticalLayout->addWidget(m_contactsListView);
+
+        m_accountButtonsLayout = new QHBoxLayout();
+        m_accountButtonsLayout->setObjectName(QString::fromUtf8("m_accountButtonsLayout"));
+
+        verticalLayout->addLayout(m_accountButtonsLayout);
+
+
+        m_toolBar->addAction(m_actionAdd_contact);
+        m_toolBar->addAction(m_actionGroup_contacts);
+        m_toolBar->addAction(m_actionHide_offline);
+
+        retranslateUi(MainWidget);
+
+        QMetaObject::connectSlotsByName(MainWidget);
+    } // setupUi
+
+    void retranslateUi(QWidget *MainWidget)
+    {
+        MainWidget->setWindowTitle(tr2i18n("Telepathy Contact List Prototype", 0));
+        m_actionAdd_contact->setText(tr2i18n("Add contact", 0));
+        m_actionGroup_contacts->setText(tr2i18n("Group contacts", 0));
+        m_actionHide_offline->setText(tr2i18n("Hide offline", 0));
+    } // retranslateUi
+
+};
+
+namespace Ui {
+    class MainWidget: public Ui_MainWidget {};
+} // namespace Ui
+
+QT_END_NAMESPACE
+
+#endif // MAIN_2D_WIDGET_H
+
diff --git a/contactdelegate.cpp b/contactdelegate.cpp
index 2790987..25fbabf 100644
--- a/contactdelegate.cpp
+++ b/contactdelegate.cpp
@@ -2,6 +2,7 @@
 
 #include <QtGui/QPainter>
 #include <QApplication>
+#include <QStyle>
 
 #include <KIconLoader>
 #include <KIcon>
@@ -153,11 +154,15 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
 
         painter->setPen(QColor(0, 0, 0));
         
+
+        QStyleOption expandSignOption = option;
+        expandSignOption.rect = expandSignRect;
+
         if(option.state & QStyle::State_Open) {
-            painter->drawText(expandSignRect, Qt::AlignVCenter, QString("-"));
+            style->drawPrimitive(QStyle::PE_IndicatorArrowDown, &expandSignOption, painter);
         }
         else {
-            painter->drawText(expandSignRect, Qt::AlignVCenter, QString("+"));
+            style->drawPrimitive(QStyle::PE_IndicatorArrowRight, &expandSignOption, painter);
         }
     }
 

-- 
ktp-contact-list packaging