remove board dock.

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

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index e723b84..8d198eb 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -116,7 +116,7 @@ KitaMainWindow::KitaMainWindow()
 
     // read dock status
 //    m_bbsDock->loadSession();
-    m_boardDock->loadSession();
+//    m_boardDock->loadSession();
     m_threadDock->loadSession();
     m_writeDock->loadSession();
     QString dockConfigPath = locateLocal( "appdata", "dock.conf" );
@@ -124,7 +124,7 @@ KitaMainWindow::KitaMainWindow()
     readDockConfig( &dockConfig );
 
     // show subject dock
-    m_boardDock->slotShowDock();
+//    m_boardDock->slotShowDock();
 
     // show thread view
     m_threadDock->slotShowDock();
@@ -191,7 +191,7 @@ KitaMainWindow::~KitaMainWindow()
 {
     /* save dock status */
 //    m_bbsDock->saveSession();
-    m_boardDock->saveSession();
+//    m_boardDock->saveSession();
     m_threadDock->saveSession();
     m_writeDock->saveSession();
 
@@ -334,13 +334,13 @@ void KitaMainWindow::setUrl( const KURL& url )
 
 void KitaMainWindow::windowToggleView()
 {
-    //FIXME: m_boardDock->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_boardDock->isVisible()
             || !m_boardDock->isActiveWindow() ) m_boardDock->slotShowDock();
     else {
         m_threadDock->slotShowDock();
-    }
+    }*/
 }
 
 void KitaMainWindow::slotCheckSubjectToggleAction( bool check )
@@ -417,12 +417,12 @@ void KitaMainWindow::setupActions()
                         SLOT( optionsShowStatusbar() ),
                         actionCollection() );
 
-    m_subjectListAction = new KToggleAction( i18n( "Show subject list" ),
+/*    m_subjectListAction = new KToggleAction( i18n( "Show subject list" ),
                           0,
                           m_boardDock,
                           SLOT( slotToggleShowHide() ),
                           actionCollection(),
-                          "window_show_subject_list" );
+                          "window_show_subject_list" );*/
 
     m_showWriteDockAction = new KToggleAction( i18n( "Show Write Dock" ),
                             0,
@@ -480,19 +480,24 @@ void KitaMainWindow::setupView()
 
     QWidget* mainWidget = new QWidget( this );
     QBoxLayout* bl = new QVBoxLayout( mainWidget );
+
     m_bbsTab = new KitaBBSTabWidget( mainWidget, "Board" );
     bl->addWidget( m_bbsTab );
-    bl->addWidget( new QPushButton( mainWidget, "Subject" ) );
+
+    m_boardTab = new KitaBoardTabWidget( mainWidget, "Subject" );
+    bl->addWidget( m_boardTab );
+    ViewMediator::getInstance()->setBoardTabWidget( m_boardTab );
+
     bl->addWidget( new QPushButton( mainWidget, "Thread" ) );
     setView( mainWidget );
 
     /* Subject View */
-    m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
+/*    m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
     m_boardTab = new KitaBoardTabWidget( this, "Subject" );
     m_boardDock->setWidget( m_boardTab );
     ViewMediator::getInstance()->setBoardDockWidget( m_boardDock );
     ViewMediator::getInstance()->setBoardTabWidget( m_boardTab );
-    connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );
+    connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );*/
 
     /* Thread View */
     m_threadDock = new KitaThreadDock( manager(), "Thread", 0L, 0L, i18n( "Thread" ), i18n( "Thread" ) );

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 759610c..af0e10b 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -86,12 +86,12 @@ void ViewMediator::bookmark( const QString& datURL, bool on )
 bool ViewMediator::isKitaActive()
 {
     Q_ASSERT( m_writeDock );
-    Q_ASSERT( m_boardDock );
+//    Q_ASSERT( m_boardDock );
     Q_ASSERT( m_threadDock );
     Q_ASSERT( m_mainWindow );
 
     if( m_writeDock->isActiveWindow() )  return TRUE;
-    if( m_boardDock->isActiveWindow() )  return TRUE;
+//    if( m_boardDock->isActiveWindow() )  return TRUE;
     if( m_threadDock->isActiveWindow() ) return TRUE;
     if( m_mainWindow->isActiveWindow() ) return TRUE;
 

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index 08f83dd..05d026c 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -23,7 +23,7 @@ class ViewMediator {
     static ViewMediator* instance;
     KitaThreadTabWidget* m_threadTabWidget;
     KitaBoardTabWidget* m_boardTabWidget;
-    KitaBoardDock* m_boardDock;
+//    KitaBoardDock* m_boardDock;
     KitaWriteDock* m_writeDock;
     KitaWriteTabWidget* m_writeTabWidget;
     KitaThreadDock* m_threadDock;
@@ -38,7 +38,7 @@ public:
 
     void setThreadTabWidget( KitaThreadTabWidget* threadTabWidget ) { m_threadTabWidget = threadTabWidget; }
     void setBoardTabWidget( KitaBoardTabWidget* boardTabWidget ) { m_boardTabWidget = boardTabWidget; }
-    void setBoardDockWidget( KitaBoardDock* boardDock ) { m_boardDock = boardDock; }
+//    void setBoardDockWidget( KitaBoardDock* boardDock ) { m_boardDock = boardDock; }
     void setWriteDock( KitaWriteDock* writeDock ) { m_writeDock = writeDock; }
     void setWriteTabWidget( KitaWriteTabWidget* writeTabWidget ) { m_writeTabWidget = writeTabWidget; }
     void setThreadDock( KitaThreadDock* threadDock ) { m_threadDock = threadDock; }