From aed8afbcfb7e296930fea1b232269df2659497d0 Mon Sep 17 00:00:00 2001 From: ikemo Date: Tue, 31 Jan 2006 13:54:41 +0000 Subject: [PATCH] refactoring. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1766 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/mainwindow.cpp | 48 ++++++++++++++++++++++++------------------------ kita/src/mainwindow.h | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp index 3ed1091..8bf5fd6 100644 --- a/kita/src/mainwindow.cpp +++ b/kita/src/mainwindow.cpp @@ -114,7 +114,7 @@ KitaMainWindow::KitaMainWindow() m_boardDock->loadSession(); m_threadDock->loadSession(); m_naviDock->loadSession(); - m_imgDock->loadSession(); + m_imageDock->loadSession(); m_writeDock->loadSession(); QString dockConfigPath = locateLocal( "appdata", "dock.conf" ); KConfig dockConfig( dockConfigPath ); @@ -135,7 +135,7 @@ KitaMainWindow::KitaMainWindow() m_showNaviAction->setChecked( FALSE ); // hide imageviewer - makeDockInvisible( m_imgDock ); + makeDockInvisible( m_imageDock ); m_showImgViewAction->setChecked( FALSE ); @@ -219,7 +219,7 @@ KitaMainWindow::~KitaMainWindow() m_boardDock->saveSession(); m_threadDock->saveSession(); m_naviDock->saveSession(); - m_imgDock->saveSession(); + m_imageDock->saveSession(); m_writeDock->saveSession(); saveAboneIDList(); @@ -249,7 +249,7 @@ KitaMainWindow::~KitaMainWindow() delete m_bbsDock; delete m_threadDock; delete m_naviDock; - delete m_imgDock; + delete m_imageDock; delete m_writeDock; Kita::DatManager::deleteAllDatInfo(); @@ -309,7 +309,7 @@ void KitaMainWindow::setupActions() m_showImgViewAction = new KToggleAction( i18n( "Show Image Viewer" ), 0, - m_imgDock, + m_imageDock, SLOT( slotToggleShowHide() ), actionCollection(), "window_show_imgviewer" ); @@ -517,26 +517,26 @@ void KitaMainWindow::resetWindowsDef3() { resetWindows( 3 ); } void KitaMainWindow::resetWindows( int pattern ) { if ( !m_dummyDock || !m_threadDock || !m_bbsDock - || !m_boardDock || !m_naviDock || !m_imgDock || !m_writeDock ) return ; + || !m_boardDock || !m_naviDock || !m_imageDock || !m_writeDock ) return ; makeDockVisible( m_threadDock ); makeDockVisible( m_bbsDock ); makeDockVisible( m_boardDock ); makeDockVisible( m_naviDock ); - makeDockVisible( m_imgDock ); + makeDockVisible( m_imageDock ); makeDockVisible( m_writeDock ); makeDockInvisible( m_threadDock ); makeDockInvisible( m_bbsDock ); makeDockInvisible( m_boardDock ); makeDockInvisible( m_naviDock ); - makeDockInvisible( m_imgDock ); + makeDockInvisible( m_imageDock ); makeDockInvisible( m_writeDock ); m_threadDock->manualDock( m_dummyDock, KDockWidget::DockTop, 100 ); m_bbsDock->manualDock( m_threadDock, KDockWidget::DockLeft, 20 ); m_boardDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 ); - m_imgDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 ); + m_imageDock->manualDock( m_threadDock, KDockWidget::DockTop, 25 ); m_writeDock->manualDock( m_threadDock, KDockWidget::DockBottom, 75 ); m_naviDock->manualDock( m_threadDock, KDockWidget::DockBottom, 50 ); @@ -549,7 +549,7 @@ void KitaMainWindow::resetWindows( int pattern ) m_threadDock ->setSession( TRUE, FALSE ); m_bbsDock ->setSession( TRUE, FALSE ); m_boardDock->setSession( TRUE, FALSE ); - m_imgDock ->setSession( TRUE, FALSE ); + m_imageDock ->setSession( TRUE, FALSE ); m_writeDock ->setSession( TRUE, FALSE ); m_naviDock ->setSession( TRUE, FALSE ); @@ -564,11 +564,11 @@ void KitaMainWindow::resetWindows( int pattern ) /*----------------------------------------*/ case 1: - m_imgDock->toDesktop(); + m_imageDock->toDesktop(); m_writeDock->toDesktop(); m_naviDock->toDesktop(); - makeDockInvisible( m_imgDock ); + makeDockInvisible( m_imageDock ); makeDockInvisible( m_writeDock ); makeDockInvisible( m_naviDock ); @@ -576,7 +576,7 @@ void KitaMainWindow::resetWindows( int pattern ) m_threadDock ->setSession( TRUE, FALSE ); m_bbsDock ->setSession( TRUE, FALSE ); m_boardDock->setSession( TRUE, FALSE ); - m_imgDock ->setSession( FALSE, FALSE ); + m_imageDock ->setSession( FALSE, FALSE ); m_writeDock ->setSession( FALSE, FALSE ); m_naviDock ->setSession( FALSE, FALSE ); @@ -593,11 +593,11 @@ void KitaMainWindow::resetWindows( int pattern ) m_boardDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 ); - m_imgDock->toDesktop(); + m_imageDock->toDesktop(); m_writeDock->toDesktop(); m_naviDock->toDesktop(); - makeDockInvisible( m_imgDock ); + makeDockInvisible( m_imageDock ); makeDockInvisible( m_writeDock ); makeDockInvisible( m_naviDock ); @@ -605,7 +605,7 @@ void KitaMainWindow::resetWindows( int pattern ) m_threadDock ->setSession( TRUE, TRUE ); m_bbsDock ->setSession( TRUE, FALSE ); m_boardDock->setSession( TRUE, TRUE ); - m_imgDock ->setSession( FALSE, FALSE ); + m_imageDock ->setSession( FALSE, FALSE ); m_writeDock ->setSession( FALSE, FALSE ); m_naviDock ->setSession( FALSE, FALSE ); @@ -622,9 +622,9 @@ void KitaMainWindow::resetWindows( int pattern ) m_boardDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 ); m_naviDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 ); - m_imgDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 ); + m_imageDock->manualDock( m_threadDock, KDockWidget::DockCenter, 0 ); - makeDockInvisible( m_imgDock ); + makeDockInvisible( m_imageDock ); makeDockInvisible( m_writeDock ); makeDockInvisible( m_naviDock ); @@ -632,7 +632,7 @@ void KitaMainWindow::resetWindows( int pattern ) m_threadDock ->setSession( TRUE, TRUE ); m_bbsDock ->setSession( TRUE, FALSE ); m_boardDock->setSession( TRUE, TRUE ); - m_imgDock ->setSession( TRUE, TRUE ); + m_imageDock ->setSession( TRUE, TRUE ); m_writeDock ->setSession( TRUE, FALSE ); m_naviDock ->setSession( TRUE, TRUE ); @@ -720,9 +720,9 @@ void KitaMainWindow::setupView() else m_naviDock->connectNaviSignals(); /* KitaImgViewer */ - m_imgDock = new KitaImgDock( manager(), "imgviewer", 0L, 0L, i18n( "Kita Image Viewer" ), i18n( "Image" ) ); - m_imgTab = m_imgDock->setup(); - connect( m_imgDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckImgToggleAction( bool ) ) ); + m_imageDock = new KitaImgDock( manager(), "imgviewer", 0L, 0L, i18n( "Kita Image Viewer" ), i18n( "Image" ) ); + m_imgTab = 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" ) ); @@ -856,8 +856,8 @@ void KitaMainWindow::slotOpenURLRequestExt( if ( KitaConfig::useImageViewer() ) { if ( Kita::ImgManager::isImgFile( url, FALSE ) ) { - if ( !usr1 ) m_imgDock->slotHideDock(); - m_imgDock->slotOpenURL( url, usrUrl1, usr1 ); + if ( !usr1 ) m_imageDock->slotHideDock(); + m_imageDock->slotOpenURL( url, usrUrl1, usr1 ); return ; } } diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h index 6d6dbb5..ebf955e 100644 --- a/kita/src/mainwindow.h +++ b/kita/src/mainwindow.h @@ -142,7 +142,7 @@ private: KitaBoardDock* m_boardDock; KitaThreadDock* m_threadDock; KitaThreadDock* m_naviDock; - KitaImgDock* m_imgDock; + KitaImgDock* m_imageDock; KitaWriteDock* m_writeDock; KitaThreadTabWidget* m_threadTab; -- 2.11.0