refactoring.

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

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index c43c746..7b19eee 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -25,31 +25,9 @@
 #include <kdebug.h>
 #include <klistview.h>
 
-enum FavoriteListViewRows {
-  Row_Board,
-  Row_Icon,
-  Row_Subject,
-  Row_ResNum,
-  Row_Read,
-  Row_Unread,
-  Row_DatName,
-  Row_DatURL
-};
-
 FavoriteListView::FavoriteListView(QWidget* parent, const char *name)
  : Kita::ThreadListView(parent, name)
 {
-  subjectList->addColumn( i18n( "Board" ) );
-  subjectList->addColumn( "" );
-  subjectList->addColumn( i18n( "Title" ) );
-  subjectList->addColumn( i18n( "ResNum" ) );
-  subjectList->addColumn( i18n( "ReadNum" ) );
-  subjectList->addColumn( i18n( "Unread" ) );
-  subjectList->addColumn( i18n( "Dat" ) );
-
-  subjectList->setColumnWidth(Row_Subject, 400);
-  subjectList->setColumnWidthMode(Row_Subject, QListView::Manual);
-
   connect( subjectList, SIGNAL( clicked( QListViewItem* ) ),
                  SLOT( loadThread( QListViewItem* ) ) );
   connect( subjectList, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ),

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 7f0a273..8a69776 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -36,33 +36,9 @@
 #include "libkita/thread.h"
 #include "libkita/kita_misc.h"
 
-enum SubjectViewRows {
-  Row_Mark,
-  Row_ID,
-  Row_Icon,
-  Row_Subject,
-  Row_ResNum,
-  Row_Read,
-  Row_Unread,
-  Row_DatName,
-  Row_DatURL
-};
-
 KitaSubjectView::KitaSubjectView(QWidget *parent, const char *name)
   : Kita::ThreadListView(parent, name)
 {
-  subjectList->addColumn("");
-  subjectList->addColumn(i18n("No."));
-  subjectList->addColumn("");
-  subjectList->addColumn(i18n("Title"));
-  subjectList->addColumn(i18n("ResNum"));
-  subjectList->addColumn(i18n("ReadNum"));
-  subjectList->addColumn(i18n("Unread"));
-  subjectList->addColumn(i18n("Dat"));
-
-  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) ) );
@@ -132,6 +108,7 @@ void KitaSubjectView::loadBoard(const Kita::Board* board)
     item->setText( Row_ResNum, QString("%1").arg( resNum, 4 ) );
     item->setText( Row_Read, (readNum > 0) ? QString("%1").arg( readNum, 4 ) : QString("") );
     item->setText( Row_Unread, (readNum > 0 && resNum != readNum) ? QString("%1").arg( resNum - readNum, 4 ) : QString("") );
+    item->setText( Row_Board, thread->boardName() );
     item->setText( Row_DatName, KURL( thread->datURL() ).fileName() );
     item->setText( Row_DatURL, thread->datURL() );