KitaSubjectDock -> KitaBoardDock

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

diff --git a/kita/src/board/boardtabwidget.cpp b/kita/src/board/boardtabwidget.cpp
index b910aed..0e72e42 100644 (file)
--- a/kita/src/board/boardtabwidget.cpp
+++ b/kita/src/board/boardtabwidget.cpp
@@ -292,7 +292,7 @@ void SubjectTabBar::showPopupMenu( int idx, QPoint global )
 /*--------------------------------------------------------------*/
 
 
-KitaSubjectDock::KitaSubjectDock( KDockManager* dockManager,
+KitaBoardDock::KitaBoardDock( KDockManager* dockManager,
                                   const char* name,
                                   const QPixmap &pixmap,
                                   QWidget* parent,
@@ -302,14 +302,14 @@ KitaSubjectDock::KitaSubjectDock( KDockManager* dockManager,
     : KitaDockWidgetBase( dockManager, name, pixmap, parent, strCaption, strTabPageLabel, f ) {}
 
 
-KitaSubjectDock::~KitaSubjectDock()
+KitaBoardDock::~KitaBoardDock()
 {
     if ( m_subjectTab ) delete m_subjectTab;
 }
 
 
-/* setup & create KitaSubjectDock */ /* public */
-KitaSubjectTabWidget* KitaSubjectDock::setup()
+/* setup & create KitaBoardDock */ /* public */
+KitaSubjectTabWidget* KitaBoardDock::setup()
 {
     /* create KitaNaviTabWidget */
     m_subjectTab = new KitaSubjectTabWidget( this, "Subject" );
@@ -323,7 +323,7 @@ KitaSubjectTabWidget* KitaSubjectDock::setup()
 }
 
 /* public slot */
-void KitaSubjectDock::slotLoadBoard( const KURL& boardURL, bool withNewTab )
+void KitaBoardDock::slotLoadBoard( const KURL& boardURL, bool withNewTab )
 {
     slotShowDock();
 

diff --git a/kita/src/board/boardtabwidget.h b/kita/src/board/boardtabwidget.h
index d79871f..0e91eaf 100644 (file)
--- a/kita/src/board/boardtabwidget.h
+++ b/kita/src/board/boardtabwidget.h
@@ -71,20 +71,20 @@ private:
 /*--------------------------------------------------*/
 
 
-class KitaSubjectDock : public KitaDockWidgetBase
+class KitaBoardDock : public KitaDockWidgetBase
 {
 
     Q_OBJECT
     KitaSubjectTabWidget* m_subjectTab;
 public:
-    KitaSubjectDock( KDockManager* dockManager,
+    KitaBoardDock( KDockManager* dockManager,
                      const char* name,
                      const QPixmap &pixmap,
                      QWidget* parent = 0L,
                      const QString& strCaption = QString::null,
                      const QString& strTabPageLabel = QString::fromLatin1( " " ),
                      WFlags f = 0 );
-    ~KitaSubjectDock();
+    ~KitaBoardDock();
 
     KitaSubjectTabWidget* setup();
 

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index 83b4d06..55dcbf0 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -107,7 +107,7 @@ namespace Kita
         /* to : KitaBoardView, FavoriteListView */
         void updateSubjectTab( const KURL& url );
 
-        /* to: KitaSubjectDock */
+        /* to: KitaBoardDock */
         void switchToSubject();
 
         /*--------------------------------*/

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index f91927f..3c7347a 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -111,7 +111,7 @@ KitaMainWindow::KitaMainWindow()
 
     // read dock status
     m_bbsDock->loadSession();
-    m_subjectDock->loadSession();
+    m_boardDock->loadSession();
     m_threadDock->loadSession();
     m_naviDock->loadSession();
     m_imgDock->loadSession();
@@ -121,7 +121,7 @@ KitaMainWindow::KitaMainWindow()
     readDockConfig( &dockConfig );
 
     // show subject dock
-    m_subjectDock->slotShowDock();
+    m_boardDock->slotShowDock();
 
     // show thread view
     m_threadDock->slotShowDock();
@@ -216,7 +216,7 @@ KitaMainWindow::~KitaMainWindow()
 {
     /* save dock status */
     m_bbsDock->saveSession();
-    m_subjectDock->saveSession();
+    m_boardDock->saveSession();
     m_threadDock->saveSession();
     m_naviDock->saveSession();
     m_imgDock->saveSession();
@@ -302,7 +302,7 @@ void KitaMainWindow::setupActions()
 
     m_subjectListAction = new KToggleAction( i18n( "Show subject list" ),
                           0,
-                          m_subjectDock,
+                          m_boardDock,
                           SLOT( slotToggleShowHide() ),
                           actionCollection(),
                           "window_show_subject_list" );
@@ -517,25 +517,25 @@ void KitaMainWindow::resetWindowsDef3() { resetWindows( 3 ); }
 void KitaMainWindow::resetWindows( int pattern )
 {
     if ( !m_dummyDock || !m_threadDock || !m_bbsDock
-            || !m_subjectDock || !m_naviDock || !m_imgDock || !m_writeDock ) return ;
+            || !m_boardDock || !m_naviDock || !m_imgDock || !m_writeDock ) return ;
 
     makeDockVisible( m_threadDock );
     makeDockVisible( m_bbsDock );
-    makeDockVisible( m_subjectDock );
+    makeDockVisible( m_boardDock );
     makeDockVisible( m_naviDock );
     makeDockVisible( m_imgDock );
     makeDockVisible( m_writeDock );
 
     makeDockInvisible( m_threadDock );
     makeDockInvisible( m_bbsDock );
-    makeDockInvisible( m_subjectDock );
+    makeDockInvisible( m_boardDock );
     makeDockInvisible( m_naviDock );
     makeDockInvisible( m_imgDock );
     makeDockInvisible( m_writeDock );
 
     m_threadDock->manualDock( m_dummyDock, KDockWidget::DockTop, 100 );
     m_bbsDock->manualDock( m_threadDock, KDockWidget::DockLeft, 20 );
-    m_subjectDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 );
+    m_boardDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 );
     m_imgDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 );
     m_writeDock->manualDock( m_threadDock, KDockWidget::DockBottom, 75 );
     m_naviDock->manualDock( m_threadDock, KDockWidget::DockBottom, 50 );
@@ -548,7 +548,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /* setSession( docked, tabbed ) */
         m_threadDock ->setSession( TRUE, FALSE );
         m_bbsDock ->setSession( TRUE, FALSE );
-        m_subjectDock->setSession( TRUE, FALSE );
+        m_boardDock->setSession( TRUE, FALSE );
         m_imgDock ->setSession( TRUE, FALSE );
         m_writeDock ->setSession( TRUE, FALSE );
         m_naviDock ->setSession( TRUE, FALSE );
@@ -575,7 +575,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /* setSession( docked, tabbed ) */
         m_threadDock ->setSession( TRUE, FALSE );
         m_bbsDock ->setSession( TRUE, FALSE );
-        m_subjectDock->setSession( TRUE, FALSE );
+        m_boardDock->setSession( TRUE, FALSE );
         m_imgDock ->setSession( FALSE, FALSE );
         m_writeDock ->setSession( FALSE, FALSE );
         m_naviDock ->setSession( FALSE, FALSE );
@@ -591,7 +591,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /*----------------------------------------*/
     case 2:
 
-        m_subjectDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
+        m_boardDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
 
         m_imgDock->toDesktop();
         m_writeDock->toDesktop();
@@ -604,7 +604,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /* setSession( docked, tabbed ) */
         m_threadDock ->setSession( TRUE, TRUE );
         m_bbsDock ->setSession( TRUE, FALSE );
-        m_subjectDock->setSession( TRUE, TRUE );
+        m_boardDock->setSession( TRUE, TRUE );
         m_imgDock ->setSession( FALSE, FALSE );
         m_writeDock ->setSession( FALSE, FALSE );
         m_naviDock ->setSession( FALSE, FALSE );
@@ -620,7 +620,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /*----------------------------------------*/
     case 3:
 
-        m_subjectDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
+        m_boardDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
         m_naviDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
         m_imgDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 );
 
@@ -631,7 +631,7 @@ void KitaMainWindow::resetWindows( int pattern )
         /* setSession( docked, tabbed ) */
         m_threadDock ->setSession( TRUE, TRUE );
         m_bbsDock ->setSession( TRUE, FALSE );
-        m_subjectDock->setSession( TRUE, TRUE );
+        m_boardDock->setSession( TRUE, TRUE );
         m_imgDock ->setSession( TRUE, TRUE );
         m_writeDock ->setSession( TRUE, FALSE );
         m_naviDock ->setSession( TRUE, TRUE );
@@ -651,10 +651,10 @@ void KitaMainWindow::resetWindows( int pattern )
 
 void KitaMainWindow::windowToggleView()
 {
-    //FIXME: m_subjectDock->dockSite() & KDockWidget::DockCenter != 0 igai no toki ha dousuru?
+    //FIXME: m_boardDock->dockSite() & KDockWidget::DockCenter != 0 igai no toki ha dousuru?
     kdDebug() << "Do toggle" << endl;
-    if ( !m_subjectDock->isVisible()
-            || !m_subjectDock->isActiveWindow() ) m_subjectDock->slotShowDock();
+    if ( !m_boardDock->isVisible()
+            || !m_boardDock->isActiveWindow() ) m_boardDock->slotShowDock();
     else {
         m_threadDock->slotShowDock();
     }
@@ -697,9 +697,9 @@ void KitaMainWindow::setupView()
     setMainDockWidget( m_dummyDock );
 
     /* Subject View */
-    m_subjectDock = new KitaSubjectDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
-    m_subjectTab = m_subjectDock->setup();
-    connect( m_subjectDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );
+    m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
+    m_subjectTab = m_boardDock->setup();
+    connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );
 
     /* Board View */
     m_bbsDock = new KitaBBSDock( manager(), "board", 0L, 0L, i18n( "board" ), i18n( "board" ) );
@@ -810,7 +810,7 @@ void KitaMainWindow::slotOpenURLRequestExt(
     /* if usr1 == 1, open the board with new tab. */
     if ( mimetype == "kita_open_2chboard" ) {
         bool withNewTab = ( usr1 == 1 );
-        m_subjectDock->slotLoadBoard( url, withNewTab );
+        m_boardDock->slotLoadBoard( url, withNewTab );
         return ;
     }
 

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index 9562b50..c91e97d 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -26,7 +26,7 @@ class KLineEdit;
 class KitaBBSDock;
 class KitaBBSTabWidget;
 class KitaSubjectTabWidget;
-class KitaSubjectDock;
+class KitaBoardDock;
 class KitaThreadDock;
 class KitaThreadTabWidget;
 class KitaImgDock;
@@ -139,7 +139,7 @@ private:
 
     KDockWidget* m_dummyDock; /* dummy MainDockWidget */
     KitaBBSDock* m_bbsDock;
-    KitaSubjectDock* m_subjectDock;
+    KitaBoardDock* m_boardDock;
     KitaThreadDock* m_threadDock;
     KitaThreadDock* m_naviDock;
     KitaImgDock* m_imgDock;