search for favorites

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@754 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 7b19eee..8818711 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -40,6 +40,13 @@ FavoriteListView::~FavoriteListView()
 
 void FavoriteListView::update()
 {
+  // FIXME: KitaSubjectView::loadBoard()¤Ë¥³¥Ô¡¼
+  {
+    m_hitList.clear();
+    m_nextHitIndex = 0;
+    m_prevquery = "";
+  }
+  
   const QDict<Kita::Thread>& threads = FavoriteThreads::getInstance()->threads();
 //  FavoriteThreads::const_iterator it;
 

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 7583404..5ee2d05 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -39,9 +39,6 @@
 KitaSubjectView::KitaSubjectView(QWidget *parent, const char *name)
   : Kita::ThreadListView(parent, name)
 {
-  connect( SearchButton, SIGNAL( clicked() ), SLOT( slotSearchButton() ) );
-  connect( SearchCombo, SIGNAL( activated(int) ), SLOT( slotSearchButton() ) );
-  connect( HideButton, SIGNAL( toggled(bool) ), SLOT( slotHideButton(bool) ) );
   connect( subjectList, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ),
                         SLOT( slotContextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
   connect( subjectList, SIGNAL( clicked( QListViewItem* ) ),
@@ -58,11 +55,6 @@ void KitaSubjectView::reloadSubject()
 {
 }
 
-void KitaSubjectView::loadThread( int, QListViewItem* item )
-{
-    loadThread( item );
-}
-
 void KitaSubjectView::loadThread( QListViewItem* item )
 {
   if( ! item ) return;
@@ -82,6 +74,7 @@ void KitaSubjectView::loadThread( QListViewItem* item )
 void KitaSubjectView::loadBoard(const Kita::Board* board)
 {
   // reset member variables.
+  // FIXME: FavoriteListView::update()¤Ë¥³¥Ô¡¼
   {
     m_hitList.clear();
     m_nextHitIndex = 0;
@@ -129,96 +122,6 @@ void KitaSubjectView::loadBoard(const Kita::Board* board)
   subjectList->setFocus();
 }
 
-void KitaSubjectView::slotSearchButton()
-{
-  insertSearchCombo();
-  QStringList list = parseSearchQuery( SearchCombo->currentText() );
-  searchNext( list );
-}
-
-void KitaSubjectView::insertSearchCombo()
-{
-  int count;
-  bool found = false;
-
-  for( count = 0; count < SearchCombo->count(); ++count ) {
-    if ( SearchCombo->text( count ) ==  SearchCombo->currentText() ) {
-      found = true;
-      break;
-    }
-  }
-  if ( ! found ) SearchCombo->insertItem( SearchCombo->currentText() );
-}
-
-QStringList KitaSubjectView::parseSearchQuery(const QString &input)
-{
-  QStringList tmp = QStringList::split( ' ', input );
-  QStringList ret_list;
-  QRegExp truncSpace("\\s*$");
-  QStringList::iterator it = tmp.begin();
-  for( ; it != tmp.end(); ++it )
-    ret_list += (*it).replace( truncSpace, "" );
-  return ret_list;
-}
-
-void KitaSubjectView::searchNext(const QStringList &query)
-{
-  if ( query.isEmpty() ) return;
-
-  if ( query != m_prevquery ) {
-    searchAll( query );
-    slotHideButton( HideButton->isOn() );
-    m_nextHitIndex = 0; //A next jump-search target reset to '0'.
-    return;
-  }
-
-  if(m_nextHitIndex >= m_hitList.size()) return;
-
-  KListViewItem* item = m_hitList[m_nextHitIndex];
-  subjectList->ensureItemVisible(item);
-  subjectList->setSelected(item, true);
-  m_nextHitIndex++;
-  if(m_nextHitIndex >= m_hitList.size()) m_nextHitIndex = 0;
-}
-
-void KitaSubjectView::searchAll(const QStringList &query)
-{
-  m_hitList.clear();
-  m_prevquery = query;
-
-  QListViewItemIterator listIt( subjectList );
-  while( listIt.current() != 0 ) {
-    KListViewItem* item = static_cast<KListViewItem*>(listIt.current());
-    item->setPixmap(Row_Icon, 0);
-
-    QStringList::const_iterator queryIt = query.begin();
-    for( ; queryIt != query.end(); ++queryIt ) {
-      if( item->text( Row_Subject ).contains( *queryIt, false ) ) {
-        item->setPixmap(Row_Icon, SmallIcon("find") );
-        m_hitList.append(item);
-        break;
-      }
-    }
-    ++listIt;
-  }
-}
-
-void KitaSubjectView::slotHideButton(bool on)
-{
-  if(m_hitList.empty()) return;
-
-  QListViewItemIterator listIt( subjectList );
-  while( listIt.current() != 0 ) {
-    KListViewItem* item = static_cast<KListViewItem*>(listIt.current());
-    if( on && ! item->pixmap(Row_Icon)) {
-      item->setVisible(false);
-    } else {
-      item->setVisible(true);
-    }
-    ++listIt;
-  }
-}
-
 void KitaSubjectView::setFont( const QFont& font )
 {
   subjectList->setFont(font);

diff --git a/kita/src/kitasubjectview.h b/kita/src/kitasubjectview.h
index 778755e..3fe73dc 100644 (file)
--- a/kita/src/kitasubjectview.h
+++ b/kita/src/kitasubjectview.h
@@ -39,20 +39,9 @@ public slots:
 
 private:
   const Kita::Board* m_board;
-  QStringList m_prevquery;
-  unsigned m_nextHitIndex;
-  QValueList<KListViewItem*> m_hitList;
-
-  void insertSearchCombo();
-  QStringList parseSearchQuery(const QString &input);
-  void searchNext(const QStringList &input);
-  void searchAll(const QStringList &query);
 
 private slots:
-  void loadThread( int, QListViewItem* item );
   void loadThread( QListViewItem* item );
-  void slotSearchButton();
-  void slotHideButton(bool on);
   void slotContextMenuRequested( QListViewItem*, const QPoint&, int );
 
 signals:

diff --git a/kita/src/threadlistview.cpp b/kita/src/threadlistview.cpp
index aa10564..359466a 100644 (file)
--- a/kita/src/threadlistview.cpp
+++ b/kita/src/threadlistview.cpp
@@ -14,6 +14,8 @@
 #include <klocale.h>
 
 #include <qtoolbutton.h>
+#include <qcombobox.h>
+#include <qregexp.h>
 
 namespace Kita {
 
@@ -35,6 +37,10 @@ ThreadListView::ThreadListView(QWidget *parent, const char *name)
 
     subjectList->setColumnWidth( Row_Subject, 400 );
     subjectList->setColumnWidthMode( Row_Subject, QListView::Manual );
+
+    connect( SearchButton, SIGNAL( clicked() ), SLOT( slotSearchButton() ) );
+    connect( SearchCombo, SIGNAL( activated(int) ), SLOT( slotSearchButton() ) );
+    connect( HideButton, SIGNAL( toggled(bool) ), SLOT( slotHideButton(bool) ) );
 }
 
 
@@ -42,6 +48,95 @@ ThreadListView::~ThreadListView()
 {
 }
 
+void ThreadListView::slotSearchButton()
+{
+  insertSearchCombo();
+  QStringList list = parseSearchQuery( SearchCombo->currentText() );
+  searchNext( list );
+}
+
+void ThreadListView::insertSearchCombo()
+{
+  int count;
+  bool found = false;
+
+  for( count = 0; count < SearchCombo->count(); ++count ) {
+    if ( SearchCombo->text( count ) ==  SearchCombo->currentText() ) {
+      found = true;
+      break;
+    }
+  }
+  if ( ! found ) SearchCombo->insertItem( SearchCombo->currentText() );
+}
+
+QStringList ThreadListView::parseSearchQuery(const QString &input)
+{
+  QStringList tmp = QStringList::split( ' ', input );
+  QStringList ret_list;
+  QRegExp truncSpace("\\s*$");
+  QStringList::iterator it = tmp.begin();
+  for( ; it != tmp.end(); ++it )
+    ret_list += (*it).replace( truncSpace, "" );
+  return ret_list;
+}
+
+void ThreadListView::searchNext(const QStringList &query)
+{
+  if ( query.isEmpty() ) return;
+
+  if ( query != m_prevquery ) {
+    searchAll( query );
+    slotHideButton( HideButton->isOn() );
+    m_nextHitIndex = 0; //A next jump-search target reset to '0'.
+    return;
+  }
+
+  if(m_nextHitIndex >= m_hitList.size()) return;
+
+  KListViewItem* item = m_hitList[m_nextHitIndex];
+  subjectList->ensureItemVisible(item);
+  subjectList->setSelected(item, true);
+  m_nextHitIndex++;
+  if(m_nextHitIndex >= m_hitList.size()) m_nextHitIndex = 0;
+}
+
+void ThreadListView::searchAll(const QStringList &query)
+{
+  m_hitList.clear();
+  m_prevquery = query;
+
+  QListViewItemIterator listIt( subjectList );
+  while( listIt.current() != 0 ) {
+    KListViewItem* item = static_cast<KListViewItem*>(listIt.current());
+    item->setPixmap(Row_Icon, 0);
+
+    QStringList::const_iterator queryIt = query.begin();
+    for( ; queryIt != query.end(); ++queryIt ) {
+      if( item->text( Row_Subject ).contains( *queryIt, false ) ) {
+        item->setPixmap(Row_Icon, SmallIcon("find") );
+        m_hitList.append(item);
+        break;
+      }
+    }
+    ++listIt;
+  }
+}
+
+void ThreadListView::slotHideButton(bool on)
+{
+  if(m_hitList.empty()) return;
+
+  QListViewItemIterator listIt( subjectList );
+  while( listIt.current() != 0 ) {
+    KListViewItem* item = static_cast<KListViewItem*>(listIt.current());
+    if( on && ! item->pixmap(Row_Icon)) {
+      item->setVisible(false);
+    } else {
+      item->setVisible(true);
+    }
+    ++listIt;
+  }
+}
 
 };
 #include "threadlistview.moc"

diff --git a/kita/src/threadlistview.h b/kita/src/threadlistview.h
index 5d830dd..361104e 100644 (file)
--- a/kita/src/threadlistview.h
+++ b/kita/src/threadlistview.h
@@ -10,7 +10,9 @@
 #ifndef KITATHREADLISTVIEW_H
 #define KITATHREADLISTVIEW_H
 
-#include <threadlistviewbase.h>
+#include "threadlistviewbase.h"
+
+#include <klistview.h>
 
 enum ThreadListViewRows {
   Row_Mark,
@@ -35,9 +37,23 @@ class ThreadListView : public Kita::ThreadListViewBase
 Q_OBJECT
 public:
     ThreadListView(QWidget *parent = 0, const char *name = 0);
-
     ~ThreadListView();
 
+protected:
+    QStringList m_prevquery;
+    unsigned m_nextHitIndex;
+    QValueList<KListViewItem*> m_hitList;
+
+    void insertSearchCombo();
+    QStringList parseSearchQuery(const QString &input);
+    void searchNext(const QStringList &input);
+    void searchAll(const QStringList &query);
+
+protected slots:
+    void slotHideButton(bool on);
+
+private slots:
+    void slotSearchButton();
 };
 
 };