From 8f219472016d0a93b4e59d5f958b61f1c62dd7df Mon Sep 17 00:00:00 2001
From: cramdal <cramdal@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Jun 2005 13:29:58 +0000
Subject: [PATCH] Fix UI Add a date filter Change the date format in the
 listview

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@420815 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kopete/plugins/history/historydialog.cpp |  10 +-
 kopete/plugins/history/historyviewer.ui  | 155 ++++++++++++++++---------------
 2 files changed, 89 insertions(+), 76 deletions(-)

diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index dcd01a3a3..c57ebac5e 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -70,7 +70,7 @@ private:
 
 
 KListViewDateItem::KListViewDateItem(KListView* parent, QDate date, Kopete::MetaContact *mc)
-		: KListViewItem(parent, date.toString(), mc->displayName())
+		: KListViewItem(parent, date.toString(Qt::LocalDate), mc->displayName())
 {
 	mDate = date;
 	mMetaContact = mc;
@@ -122,6 +122,8 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, QWidget* parent,
 	if (mMetaContact)
 		mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.find(mMetaContact)+1);
 
+	mMainWidget->dateSearchLine->setListView(mMainWidget->dateListView);
+
 	setMainWidget(mMainWidget);
 
 	// Initializing HTML Part
@@ -202,7 +204,8 @@ void HistoryDialog::slotLoadDays()
 		if(mInit.dateMCList.isEmpty())
 		{
 				if (!mMainWidget->searchLine->text().isEmpty())
-				QTimer::singleShot(0, this, SLOT(slotSearch()));
+					QTimer::singleShot(0, this, SLOT(slotSearch()));
+				doneProgressBar();
 				return;
 		}
 		
@@ -302,7 +305,7 @@ void HistoryDialog::dateSelected(QListViewItem* it)
 
 	if (!item) return;
 
-	QDate chosenDate = QDate::fromString(item->text(0));
+	QDate chosenDate = item->date();
 
 	mLogger= new HistoryLogger(item->metaContact(), this);
 	QValueList<Kopete::Message> msgs=mLogger->readMessages(chosenDate);
@@ -381,6 +384,7 @@ void HistoryDialog::slotSearchTextChanged(const QString& searchText)
 	if (searchText.isEmpty())
 	{
 		mMainWidget->searchButton->setEnabled(false);
+		slotSearchErase();
 	}
 	else
 	{
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index 354b85691..e4d53eeba 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -33,7 +33,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -62,7 +62,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout6</cstring>
             </property>
@@ -101,7 +101,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout8</cstring>
             </property>
@@ -169,85 +169,93 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QSplitter" row="1" column="0">
+        <widget class="QFrame" row="1" column="1" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>splitter3</cstring>
+                <cstring>htmlFrame</cstring>
             </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>5</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
             </property>
-            <widget class="KListView">
-                <column>
-                    <property name="text">
-                        <string>Date</string>
-                    </property>
-                    <property name="clickable">
-                        <bool>true</bool>
-                    </property>
-                    <property name="resizable">
-                        <bool>true</bool>
-                    </property>
-                </column>
-                <column>
-                    <property name="text">
-                        <string>Contact</string>
-                    </property>
-                    <property name="clickable">
-                        <bool>true</bool>
-                    </property>
-                    <property name="resizable">
-                        <bool>true</bool>
-                    </property>
-                </column>
-                <property name="name">
-                    <cstring>dateListView</cstring>
-                </property>
-                <property name="sizePolicy">
-                    <sizepolicy>
-                        <hsizetype>5</hsizetype>
-                        <vsizetype>7</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                    </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                    <size>
-                        <width>0</width>
-                        <height>0</height>
-                    </size>
-                </property>
-                <property name="rootIsDecorated">
-                    <bool>false</bool>
-                </property>
-                <property name="shadeSortColumn">
-                    <bool>false</bool>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+        </widget>
+        <widget class="KListView" row="2" column="0">
+            <column>
+                <property name="text">
+                    <string>Date</string>
                 </property>
-            </widget>
-            <widget class="QFrame">
-                <property name="name">
-                    <cstring>htmlFrame</cstring>
+                <property name="clickable">
+                    <bool>true</bool>
                 </property>
-                <property name="sizePolicy">
-                    <sizepolicy>
-                        <hsizetype>7</hsizetype>
-                        <vsizetype>5</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                    </sizepolicy>
+                <property name="resizable">
+                    <bool>true</bool>
                 </property>
-                <property name="minimumSize">
-                    <size>
-                        <width>0</width>
-                        <height>0</height>
-                    </size>
+            </column>
+            <column>
+                <property name="text">
+                    <string>Contact</string>
                 </property>
-                <property name="frameShape">
-                    <enum>WinPanel</enum>
+                <property name="clickable">
+                    <bool>true</bool>
                 </property>
-                <property name="frameShadow">
-                    <enum>Sunken</enum>
+                <property name="resizable">
+                    <bool>true</bool>
                 </property>
-            </widget>
+            </column>
+            <property name="name">
+                <cstring>dateListView</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>7</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property name="rootIsDecorated">
+                <bool>false</bool>
+            </property>
+            <property name="shadeSortColumn">
+                <bool>false</bool>
+            </property>
+        </widget>
+        <widget class="KListViewSearchLine" row="1" column="0">
+            <property name="name">
+                <cstring>dateSearchLine</cstring>
+            </property>
+            <property name="enabled">
+                <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
         </widget>
     </grid>
 </widget>
@@ -259,5 +267,6 @@
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klistview.h</includehint>
+    <includehint>klistviewsearchline.h</includehint>
 </includehints>
 </UI>
-- 
2.11.4.GIT