remove kitanavi & imagedock

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

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 662d4bf..e5d13e4 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -123,8 +123,6 @@ KitaMainWindow::KitaMainWindow()
     m_bbsDock->loadSession();
     m_boardDock->loadSession();
     m_threadDock->loadSession();
-    m_naviDock->loadSession();
-    m_imageDock->loadSession();
     m_writeDock->loadSession();
     QString dockConfigPath = locateLocal( "appdata", "dock.conf" );
     KConfig dockConfig( dockConfigPath );
@@ -138,15 +136,6 @@ KitaMainWindow::KitaMainWindow()
 
     // hide writedock
     makeDockInvisible( m_writeDock );
-    m_showImgViewAction->setChecked( FALSE );
-
-    // hide kitanavi
-    makeDockInvisible( m_naviDock );
-    m_showNaviAction->setChecked( FALSE );
-
-    // hide imageviewer
-    makeDockInvisible( m_imageDock );
-    m_showImgViewAction->setChecked( FALSE );
 
     // for compativility
     loadCompletion();
@@ -231,8 +220,6 @@ KitaMainWindow::~KitaMainWindow()
     m_bbsDock->saveSession();
     m_boardDock->saveSession();
     m_threadDock->saveSession();
-    m_naviDock->saveSession();
-    m_imageDock->saveSession();
     m_writeDock->saveSession();
 
     Kita::AboneConfig::self()->writeConfig();
@@ -258,8 +245,6 @@ KitaMainWindow::~KitaMainWindow()
 
     delete m_bbsDock;
     delete m_threadDock;
-    delete m_naviDock;
-    delete m_imageDock;
     delete m_writeDock;
 
     Kita::DatManager::deleteAllDatInfo();
@@ -395,16 +380,6 @@ void KitaMainWindow::slotCheckSubjectToggleAction( bool check )
     if ( m_subjectListAction ) m_subjectListAction->setChecked( check );
 }
 
-void KitaMainWindow::slotCheckNaviToggleAction( bool check )
-{
-    if ( m_showNaviAction ) m_showNaviAction->setChecked( check );
-}
-
-void KitaMainWindow::slotCheckImgToggleAction( bool check )
-{
-    if ( m_showImgViewAction ) m_showImgViewAction->setChecked( check );
-}
-
 void KitaMainWindow::slotCheckWriteToggleAction( bool check )
 {
     if ( m_showWriteDockAction ) m_showWriteDockAction->setChecked( check );
@@ -493,37 +468,11 @@ void KitaMainWindow::slotOpenURLRequestExt(
         return ;
     }
 
-    /* open with image viewer */
-    /* if usr1 == 0, image viewer is hidden. */
-    /* usrUrl1 is datURL.                    */
-    if ( Kita::Config::useImageViewer() ) {
-        if ( Kita::ImgManager::isImgFile( url, FALSE ) ) {
-
-            if ( !usr1 ) m_imageDock->slotHideDock();
-            m_imageDock->slotOpenURL( url, usrUrl1, usr1 );
-            return ;
-        }
-    }
-
     if ( mimetype == QString::null ) {
         mimetype = KIO::NetAccess::mimetype( url , this );
     }
     kdDebug() << QString( "queried MIME type: \"%1\"" ).arg( mimetype ) << endl;
 
-    /* open with kpart */
-    if ( Kita::Config::usePart() ) {
-        if ( Kita::Config::partMimeList().find( mimetype ) != Kita::Config::partMimeList().end() ) {
-            KService::Ptr service = KServiceTypeProfile::preferredService( mimetype, "KParts/ReadOnlyPart" );
-            if ( service ) {
-                QString libName = QFile::encodeName( service->library() );
-
-                if ( !Kita::Config::useKitaNavi() ) m_threadDock->slotShowPart( url, libName, mimetype );
-                else m_naviDock ->slotShowPart( url, libName, mimetype );
-                return ;
-            }
-        }
-    }
-
     KRun::runURL( url, mimetype );
 }
 
@@ -576,20 +525,6 @@ void KitaMainWindow::setupActions()
                           actionCollection(),
                           "window_show_subject_list" );
 
-    m_showImgViewAction = new KToggleAction( i18n( "Show Image Viewer" ),
-                          0,
-                          m_imageDock,
-                          SLOT( slotToggleShowHide() ),
-                          actionCollection(),
-                          "window_show_imgviewer" );
-
-    m_showNaviAction = new KToggleAction( i18n( "Show KitaNavi" ),
-                                          0,
-                                          m_naviDock,
-                                          SLOT( slotToggleShowHide() ),
-                                          actionCollection(),
-                                          "window_show_kitanavi" );
-
     m_showWriteDockAction = new KToggleAction( i18n( "Show Write Dock" ),
                             0,
                             m_writeDock,
@@ -637,8 +572,6 @@ void KitaMainWindow::setupActions()
     factory() ->addClient( m_bbsTab );
     factory() ->addClient( m_boardTab );
     factory() ->addClient( m_threadTab );
-    factory() ->addClient( m_imageTab );
-    factory() ->addClient( m_naviTab );
     factory() ->addClient( m_writeTab );
 }
 
@@ -667,22 +600,6 @@ void KitaMainWindow::setupView()
     m_threadTab = m_threadDock->setupAsMainView();
     m_threadDock->setDockSite( KDockWidget::DockFullSite );
 
-    /* KitaNavi */
-    m_naviDock = new KitaThreadDock( manager(), "kitanavi", 0L, 0L, i18n( "KitaNavi" ), i18n( "Navi" ) );
-    m_naviTab = m_naviDock->setupAsKitaNavi();
-    connect( m_naviDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckNaviToggleAction( bool ) ) );
-
-    if ( !Kita::Config::useKitaNavi() ) m_threadDock ->connectNaviSignals();
-    else m_naviDock->connectNaviSignals();
-
-    /* KitaImgViewer */
-    m_imageDock = new KitaImgDock( manager(), "imgviewer", 0L, 0L, i18n( "Kita Image Viewer" ), i18n( "Image" ) );
-    m_imageTab = new KitaImgTabWidget( m_imageDock, "Image Viewer" );
-    m_imageDock->setWidget( m_imageTab );
-    m_imageDock->setImageTabWidget( m_imageTab );
-    m_imageDock->setup();
-    connect( m_imageDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckImgToggleAction( bool ) ) );
-
     /* write dock */
     m_writeDock = new KitaWriteDock( manager(), "Write", 0L, 0L, i18n( "Write" ), i18n( "Write" ) );
     m_writeTab = new KitaWriteTabWidget( m_writeDock, "Write View" );
@@ -694,8 +611,6 @@ void KitaMainWindow::setupView()
     /* reset dock status */
     m_boardListAction = NULL;
     m_subjectListAction = NULL;
-    m_showImgViewAction = NULL;
-    m_showNaviAction = NULL;
     m_showWriteDockAction = NULL;
 }
 

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index c0c6195..26bfff5 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -75,8 +75,6 @@ private slots:
 
     void slotCheckBoardToggleAction( bool check );
     void slotCheckSubjectToggleAction( bool check );
-    void slotCheckNaviToggleAction( bool check );
-    void slotCheckImgToggleAction( bool check );
     void slotCheckWriteToggleAction( bool check );
     void slotEditCopy();
     void slotOpenURLRequest( const KURL& url, const KParts::URLArgs& );
@@ -95,8 +93,6 @@ private:
     KToggleAction *m_statusbarAction;
     KToggleAction *m_boardListAction;
     KToggleAction* m_subjectListAction;
-    KToggleAction* m_showImgViewAction;
-    KToggleAction* m_showNaviAction;
     KToggleAction* m_showWriteDockAction;
     KAction* m_toggleViewAction;
 
@@ -104,15 +100,11 @@ private:
     KitaBBSDock* m_bbsDock;
     KitaBoardDock* m_boardDock;
     KitaThreadDock* m_threadDock;
-    KitaThreadDock* m_naviDock;
-    KitaImgDock* m_imageDock;
     KitaWriteDock* m_writeDock;
 
     KitaThreadTabWidget* m_threadTab;
     KitaBBSTabWidget* m_bbsTab;
     KitaBoardTabWidget* m_boardTab;
-    KitaImgTabWidget* m_imageTab;
-    KitaThreadTabWidget* m_naviTab;
     KitaWriteTabWidget* m_writeTab;
 
     void setupActions();