refactoring.

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

diff --git a/kita/src/htmlpart.cpp b/kita/src/htmlpart.cpp
index 106943e..662765c 100644 (file)
--- a/kita/src/htmlpart.cpp
+++ b/kita/src/htmlpart.cpp
@@ -165,13 +165,11 @@ void KitaHTMLPart::connectSignals()
 
     /* popup */
     connect( this, SIGNAL( onURL( const QString& ) ), SLOT( slotOnURL( const QString& ) ) );
-    connect( this, SIGNAL( isKitaActive() ), signalCollection, SIGNAL( isKitaActive() ) );
 
     connect( view(), SIGNAL( leave() ), SLOT( slotLeave() ) );
     connect( view(), SIGNAL( verticalSliderReleased() ), SLOT( slotVSliderReleased() ) );
     connect( view(), SIGNAL( horizontalSliderReleased() ), SLOT( slotHSliderReleased() ) );
 
-    connect( signalCollection, SIGNAL( kitaIsActive() ), SLOT( slotKitaIsActive() ) );
     connect( signalCollection, SIGNAL( windowDeactivated() ), SLOT( slotHideChildPopup() ) );
 
     /* click */
@@ -1548,17 +1546,6 @@ void KitaHTMLPart::slotHideChildPopup()
 }
 
 
-
-/*------------------------------------------*/
-/* called back when kita is active .
-   see also an explanation in slotOnURL.    */ /* private slot */
-void KitaHTMLPart::slotKitaIsActive()
-{
-    m_kitaIsActive = TRUE;
-}
-
-
-
 /*---------------------------------------------------*/
 /* This slot is called when mouse moves onto the URL */ /* private slot */
 void KitaHTMLPart::slotOnURL( const QString& url )
@@ -1576,14 +1563,8 @@ void KitaHTMLPart::slotOnURL( const QString& url )
     if ( url.isEmpty() ) return ;
     if ( url.left( 7 ) == "mailto:" ) return ;
 
-    /* Is Kita active now ?
-
-       emit SIGNAL( isKitaActive() ) to KitaMainWindow, KitaNavi, etc. ,
-       and if one of them is active, then slotKitaIsActive() is called
-       back, and m_kitaIsActive is set to TRUE.   */
-    m_kitaIsActive = FALSE;
-    emit isKitaActive();
-    if ( !m_kitaIsActive ) return ;
+    /* Is Kita active now ? */
+    if( ViewMediator::getInstance()->isKitaActive() == FALSE ) return;
 
     /* get reference */
     QString refstr;

diff --git a/kita/src/htmlpart.h b/kita/src/htmlpart.h
index fda3faa..85fe0af 100644 (file)
--- a/kita/src/htmlpart.h
+++ b/kita/src/htmlpart.h
@@ -76,8 +76,6 @@ class KitaHTMLPart : public KHTMLPart
 
     /* res popup */
     bool m_multiPopup;
-    bool m_kitaIsActive;
-
 
 public:
 
@@ -180,7 +178,6 @@ private slots:
     void slotVSliderReleased();
     void slotHSliderReleased();
     void slotHideChildPopup();
-    void slotKitaIsActive();
     void slotOnURL( const QString& url );
 
 
@@ -194,7 +191,6 @@ signals:
 
     /* res popup */
     void hideChildPopup();
-    void isKitaActive();
 
     /* write dock */
     void activateThreadView( const KURL& );

diff --git a/kita/src/kitaui/tabwidgetbase.cpp b/kita/src/kitaui/tabwidgetbase.cpp
index 321c6c8..c436260 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.cpp
+++ b/kita/src/kitaui/tabwidgetbase.cpp
@@ -404,15 +404,6 @@ KitaDockWidgetBase::KitaDockWidgetBase( KDockManager* dockManager,
     /* emit when this widget is deactivated */
     connect( this, SIGNAL( windowDeactivated() ),
              signalCollection, SIGNAL( windowDeactivated() ) );
-
-    /* If this widget is active and receives
-       signal isKitaActive, then emit signal kitaIsActive. */
-    /* see also KitaHTMLPart::slotOnURL                    */
-    connect( signalCollection, SIGNAL( isKitaActive() ),
-             this, SLOT( slotIsKitaActive() ) );
-
-    connect( this, SIGNAL( kitaIsActive() ),
-             signalCollection, SIGNAL( kitaIsActive() ) );
 }
 
 
@@ -609,11 +600,3 @@ void KitaDockWidgetBase::customEvent( QCustomEvent * e )
         showDock( sde->getActivate(), sde->getForce() );
     }
 }
-
-
-/* see also KitaHTMLPart::slotOnURL */  /* private slot */
-void KitaDockWidgetBase::slotIsKitaActive()
-{
-    if ( isActiveWindow() ) emit kitaIsActive();
-}
-

diff --git a/kita/src/kitaui/tabwidgetbase.h b/kita/src/kitaui/tabwidgetbase.h
index dfab0c6..e9e45c6 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.h
+++ b/kita/src/kitaui/tabwidgetbase.h
@@ -139,13 +139,9 @@ protected:
 private slots:
     void slotSaveDocStatus();
     void slotHeaderCloseButtonClicked();
-    void slotIsKitaActive();
-
 
 signals:
     void windowDeactivated();
-    void isKitaActive();
-    void kitaIsActive();
     void checkToggleAction( bool );
 };
 

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index 121fc94..57255a2 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -56,14 +56,6 @@ namespace Kita
         /* to  : KitaHTMLPart                  */
         /* see also KitaHTMLPart::slotOnURL    */
         void windowDeactivated();
-        void kitaIsActive();
-
-        /* from: KitaHTMLPart                  */
-        /* to  : KitaDockWidgetBase            */
-        /* see also KitaHTMLPart::slotOnURL    */
-        void isKitaActive();
-
-        /*--------------------------------*/
 
         /* to : KitaHTMLPart */
         void redrawAllHTMLPart( bool force );

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 230feb7..554a50e 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -527,12 +527,14 @@ void KitaMainWindow::setupView()
     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 ) ) );
 
     /* Board View */
     m_bbsDock = new KitaBBSDock( manager(), "board", 0L, 0L, i18n( "board" ), i18n( "board" ) );
     m_bbsTab = m_bbsDock->setup();
+    ViewMediator::getInstance()->setBBSDock( m_bbsDock );
     connect( m_bbsDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckBoardToggleAction( bool ) ) );
 
     /* Thread View */

diff --git a/kita/src/previewpart.cpp b/kita/src/previewpart.cpp
index 9a44067..eb0669d 100644 (file)
--- a/kita/src/previewpart.cpp
+++ b/kita/src/previewpart.cpp
@@ -18,6 +18,7 @@
 
 #include "respopup.h"
 #include "htmlpart.h"
+#include "viewmediator.h"
 
 #include "kitaui/htmlview.h"
 
@@ -86,13 +87,11 @@ void KitaPreviewPart::connectSignals()
 
     /* popup */
     connect( this, SIGNAL( onURL( const QString& ) ), SLOT( slotOnURL( const QString& ) ) );
-    connect( this, SIGNAL( isKitaActive() ), signalCollection, SIGNAL( isKitaActive() ) );
 
     connect( view(), SIGNAL( leave() ), SLOT( slotLeave() ) );
     connect( view(), SIGNAL( verticalSliderReleased() ), SLOT( slotVSliderReleased() ) );
     connect( view(), SIGNAL( horizontalSliderReleased() ), SLOT( slotHSliderReleased() ) );
 
-    connect( signalCollection, SIGNAL( kitaIsActive() ), SLOT( slotKitaIsActive() ) );
     connect( signalCollection, SIGNAL( windowDeactivated() ), SLOT( slotHideChildPopup() ) );
 
     /* click */
@@ -356,15 +355,6 @@ void KitaPreviewPart::slotHideChildPopup()
 }
 
 /*
- * called back when kita is active.
- * see also an explanation in slotOnURL.
- */
-void KitaPreviewPart::slotKitaIsActive()
-{
-    m_kitaIsActive = TRUE;
-}
-
-/*
  * This slot is called when mouse moves onto the URL
  */
 void KitaPreviewPart::slotOnURL( const QString& url )
@@ -378,14 +368,8 @@ void KitaPreviewPart::slotOnURL( const QString& url )
     if ( url.isEmpty() ) return ;
     if ( url.left( 7 ) == "mailto:" ) return ;
 
-    /* Is Kita active now ?
-
-       emit SIGNAL( isKitaActive() ) to KitaMainWindow, KitaNavi, etc. ,
-       and if one of them is active, then slotKitaIsActive() is called
-       back, and m_kitaIsActive is set to TRUE.   */
-    m_kitaIsActive = FALSE;
-    emit isKitaActive();
-    if ( !m_kitaIsActive ) return ;
+    /* Is Kita active now ? */
+    if ( ViewMediator::getInstance()->isKitaActive() == FALSE ) return;
 
     /* get reference */
     QString refstr;

diff --git a/kita/src/previewpart.h b/kita/src/previewpart.h
index fa1101b..39d0551 100644 (file)
--- a/kita/src/previewpart.h
+++ b/kita/src/previewpart.h
@@ -35,7 +35,6 @@ class KitaPreviewPart : public KHTMLPart
 
     /* res popup */
     bool m_multiPopup;
-    bool m_kitaIsActive;
 
 public:
 
@@ -87,16 +86,12 @@ private slots:
     void slotVSliderReleased();
     void slotHSliderReleased();
     void slotHideChildPopup();
-    void slotKitaIsActive();
     void slotOnURL( const QString& url );
 
 signals:
 
     void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
     void mousePressed(); /* to KitaThreadView */
-
-    /* res popup */
-    void isKitaActive();
 };
 
 #endif

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 8793dae..45f1bb1 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -82,3 +82,18 @@ void ViewMediator::bookmark( const QString& datURL, bool on )
 
     m_mainWindow->bookmark( datURL, on );
 }
+
+bool ViewMediator::isKitaActive()
+{
+    Q_ASSERT( m_writeDock );
+    Q_ASSERT( m_boardDock );
+    Q_ASSERT( m_bbsDock );
+    Q_ASSERT( m_threadDock );
+
+    if( m_writeDock->isActiveWindow() )  return TRUE;
+    if( m_boardDock->isActiveWindow() )  return TRUE;
+    if( m_bbsDock->isActiveWindow() )    return TRUE;
+    if( m_threadDock->isActiveWindow() ) return TRUE;
+
+    return FALSE;
+}

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index 198b0e3..d6deb00 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -13,6 +13,7 @@
 #include "threadtabwidget.h"
 #include "writetabwidget.h"
 #include "boardtabwidget.h"
+#include "bbstabwidget.h"
 #include "mainwindow.h"
 
 /**
@@ -22,8 +23,10 @@ class ViewMediator {
     static ViewMediator* instance;
     KitaThreadTabWidget* m_threadTabWidget;
     KitaBoardTabWidget* m_boardTabWidget;
+    KitaBoardDock* m_boardDock;
     KitaWriteDock* m_writeDock;
     KitaThreadDock* m_threadDock;
+    KitaBBSDock* m_bbsDock;
     KitaMainWindow* m_mainWindow;
 
     ViewMediator();
@@ -34,8 +37,10 @@ public:
 
     void setThreadTabWidget( KitaThreadTabWidget* threadTabWidget ) { m_threadTabWidget = threadTabWidget; }
     void setBoardTabWidget( KitaBoardTabWidget* boardTabWidget ) { m_boardTabWidget = boardTabWidget; }
+    void setBoardDockWidget( KitaBoardDock* boardDock ) { m_boardDock = boardDock; }
     void setWriteDock( KitaWriteDock* writeDock ) { m_writeDock = writeDock; }
     void setThreadDock( KitaThreadDock* threadDock ) { m_threadDock = threadDock; }
+    void setBBSDock( KitaBBSDock* bbsDock ) { m_bbsDock = bbsDock; }
     void setMainWindow( KitaMainWindow* mainWindow ) { m_mainWindow = mainWindow; }
 
     void closeThreadTab( const KURL& url );
@@ -46,6 +51,7 @@ public:
     void setMainURLLine( const KURL& url );
     void setMainCaption( const QString& str );
     void bookmark( const QString& datURL, bool on );
+    bool isKitaActive();
 };
 
 #endif