[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=05b7550

The following commit has been merged in the master branch:
commit 05b7550389b8e75832323e0f0e5133bf357d5c8b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Apr 3 01:52:22 2012 +0100

    Entity filter in the log viewer
    
    REVIEW: 104055
    BUG: 294651
---
 logviewer/log-viewer.cpp |  7 ++++++-
 logviewer/log-viewer.h   |  2 ++
 logviewer/log-viewer.ui  | 39 ++++-----------------------------------
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 3c664d9..3ffdc65 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -31,6 +31,8 @@
 #include <glib-object.h>
 #include <QGlib/Init>
 
+#include <QSortFilterProxyModel>
+
 #include "entity-model.h"
 
 LogViewer::LogViewer(QWidget *parent) :
@@ -46,8 +48,11 @@ LogViewer::LogViewer(QWidget *parent) :
     m_accountManager = Tp::AccountManager::create();
 
     m_entityModel = new EntityModel(this);
+    m_filterModel = new QSortFilterProxyModel(this);
+    m_filterModel->setSourceModel(m_entityModel);
 
-    ui->entityList->setModel(m_entityModel);
+    ui->entityList->setModel(m_filterModel);
+    ui->entityFilter->setProxy(m_filterModel);
 
     //TODO parse command line args and update all views as appropriate
 
diff --git a/logviewer/log-viewer.h b/logviewer/log-viewer.h
index 13a2504..04820fd 100644
--- a/logviewer/log-viewer.h
+++ b/logviewer/log-viewer.h
@@ -28,6 +28,7 @@ namespace Ui {
 }
 
 class EntityModel;
+class QSortFilterProxyModel;
 
 class LogViewer : public QWidget
 {
@@ -48,6 +49,7 @@ private:
     Ui::LogViewer *ui;
     Tp::AccountManagerPtr m_accountManager;
     EntityModel *m_entityModel;
+    QSortFilterProxyModel *m_filterModel;
 };
 
 #endif // LOGVIEWER_H
diff --git a/logviewer/log-viewer.ui b/logviewer/log-viewer.ui
index 64b3f9d..039f0b1 100644
--- a/logviewer/log-viewer.ui
+++ b/logviewer/log-viewer.ui
@@ -17,36 +17,10 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="KComboBox" name="kcombobox">
-       <item>
-        <property name="text">
-         <string>Contact</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Rooms</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>All</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
       <widget class="QListView" name="entityList"/>
      </item>
      <item>
-      <widget class="KLineEdit" name="klineedit">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
+      <widget class="KFilterProxySearchLine" name="entityFilter"/>
      </item>
      <item>
       <widget class="ConversationDatePicker" name="datePicker" native="true">
@@ -68,14 +42,9 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
+   <class>KFilterProxySearchLine</class>
+   <extends>QWidget</extends>
+   <header>kfilterproxysearchline.h</header>
   </customwidget>
   <customwidget>
    <class>MessageView</class>

-- 
ktp-text-ui packaging