>>58

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

diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am
index 6c4dd55..72d8cee 100644 (file)
--- a/kita/src/Makefile.am
+++ b/kita/src/Makefile.am
@@ -18,7 +18,7 @@ kita_la_LIBADD = $(LIB_KFILE) $(LIB_KDEPRINT) ./part/libkitapart.la ./libkita/li
 kita_LDADD = kita.la
 
 # which sources should be compiled for kita
-kita_la_SOURCES = main.cpp kita.cpp pref.cpp kitaiface.skel kitasubjectview.h kitasubjectview.cpp kitaboardview.h kitaboardview.cpp threadlistviewbase.ui kitaboardviewbase.ui kitafontprefbase.ui favoritelistview.h favoritelistview.cpp kitathreadtabwidget.h kitathreadtabwidget.cpp kitasubjecttabwidget.h kitasubjecttabwidget.cpp kitacolorprefbase.ui threadlistview.cpp asciiartprefbase.ui debugprefbase.ui uiprefbase.ui aboneprefbase.ui aboneprefpage.cpp aboneprefpage.h loginprefbase.ui loginprefpage.h loginprefpage.cpp kitatabwidgetbase.cpp kitatabwidgetbase.h kitaimgtabwidget.cpp kitimgtabwidget.h kitawritetabwidget.cpp kitawritetabwidget.h
+kita_la_SOURCES = main.cpp kita.cpp pref.cpp kitaiface.skel kitasubjectview.h kitasubjectview.cpp kitaboardview.h kitaboardview.cpp threadlistviewbase.ui kitaboardviewbase.ui kitafontprefbase.ui favoritelistview.h favoritelistview.cpp kitathreadtabwidget.h kitathreadtabwidget.cpp kitasubjecttabwidget.h kitasubjecttabwidget.cpp kitacolorprefbase.ui threadlistview.cpp asciiartprefbase.ui debugprefbase.ui uiprefbase.ui aboneprefbase.ui aboneprefpage.cpp aboneprefpage.h loginprefbase.ui loginprefpage.h loginprefpage.cpp kitatabwidgetbase.cpp kitatabwidgetbase.h kitaimgtabwidget.cpp kitimgtabwidget.h kitawritetabwidget.cpp kitawritetabwidget.h kitaboardtabwidget.cpp kitaboardtabwidget.h
 
 kita_SOURCES = dummy.cpp
 

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index f66a811..c9a4ddd 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -15,6 +15,7 @@
 #include "kitaboardview.h"
 #include "libkita/threadinfo.h"
 #include "libkita/favoriteboards.h"
+#include "kitaboardtabwidget.h"
 #include "kitathreadtabwidget.h"
 #include "kitasubjecttabwidget.h"
 #include "kitaimgtabwidget.h"
@@ -141,7 +142,10 @@ KitaMainWindow::KitaMainWindow()
 
     connect( signalCollection, SIGNAL( switchSubjectView() ),
              SLOT( slotSwitchSubjectView() ));
-
+    
+    connect( signalCollection, SIGNAL( switchToSubject() ),
+             SLOT( slotSwitchSubjectView() ));
+    
     connect( signalCollection, SIGNAL( bookmarked( const QString&, bool ) ),
              SLOT( bookmark( const QString&, bool ) ) );
 
@@ -164,23 +168,23 @@ KitaMainWindow::KitaMainWindow()
     connect( settingsPopup, SIGNAL( aboutToShow() ),
              SLOT( settingsMenuAboutToShow() ) );
 
-    m_boardView->loadBoardList();
-    m_boardView->setFocus();
-
     // dummy code to activate toggle actions
-    m_boardListAction->activate();
     m_subjectListAction->activate(); 
+    
+    // load boad list & show board dock
+    m_boardTab->loadBoardList();
+    m_boardDock->slotShowDock();
 }
 
 KitaMainWindow::~KitaMainWindow()
 {
-    makeDockVisible( m_boardDock );
     makeDockVisible( m_subjectDock );
 
-    m_threadDock->slotShowDock();
-    m_naviDock->slotShowDock();
-    m_imgDock->slotShowDock();
-    m_writeDock->slotShowDock();
+    m_boardDock->showDock( FALSE );
+    m_threadDock->showDock( FALSE );
+    m_naviDock->showDock( FALSE );
+    m_imgDock->showDock( FALSE );
+    m_writeDock->showDock( FALSE );
     
     saveAboneIDList();
     saveAboneNameList();
@@ -204,10 +208,11 @@ KitaMainWindow::~KitaMainWindow()
     KConfig dockConfig( dockConfigPath );
     writeDockConfig( &dockConfig );
 
+    delete m_boardDock;
     delete m_threadDock;
     delete m_naviDock;
     delete m_imgDock;
-    delete  m_writeDock;
+    delete m_writeDock;
 }
 
 void KitaMainWindow::load( const KURL& url )
@@ -251,8 +256,8 @@ void KitaMainWindow::setupActions()
 
     m_boardListAction = new KToggleAction( i18n( "Show board list" ),
                                            0,
-                                           this,
-                                           SLOT( windowShowBoardlist() ),
+                                           m_boardDock,
+                                           SLOT( slotToggleShowHide() ),
                                            actionCollection(),
                                            "window_show_board_list" );
 
@@ -263,7 +268,7 @@ void KitaMainWindow::setupActions()
                           actionCollection(),
                           "window_show_subject_list" );
     
-    m_showImgViewAction = new KToggleAction( i18n( "Show Imgage Viewer" ),
+    m_showImgViewAction = new KToggleAction( i18n( "Show Image Viewer" ),
                       0,
                       m_imgDock,
                       SLOT( slotToggleShowHide() ),
@@ -277,6 +282,14 @@ void KitaMainWindow::setupActions()
                       actionCollection(),
                       "window_show_kitanavi" );
 
+    m_showWriteDockAction = new KToggleAction( i18n( "Show Write Dock" ),
+                      0,
+                      m_writeDock,
+                      SLOT( slotToggleShowHide() ),
+                      actionCollection(),
+                      "window_show_writedock" );
+    
+    
     m_urlLine = new KLineEdit( "", 0 );
     new KWidgetAction( m_urlLine,
                        i18n( "URL Line" ),
@@ -291,7 +304,7 @@ void KitaMainWindow::setupActions()
 
     new KAction( i18n( "Load BoardList" ),
                  0,
-                 m_boardView,
+                 m_boardTab,
                  SLOT( loadBoardList() ),
                  actionCollection(),
                  "load_board_list" );
@@ -328,10 +341,12 @@ void KitaMainWindow::setupActions()
     
     setXMLFile( "kitaui.rc" );
     KMainWindow::createGUI();
+    factory()->addClient( m_boardTab );    
     factory()->addClient( m_threadTab );
     factory()->addClient( m_imgTab );
-    factory()->addClient( m_naviTab );    
-}
+    factory()->addClient( m_naviTab );
+    factory()->addClient( m_writeTab );
+ }
 
 void KitaMainWindow::slotURLLine()
 {
@@ -441,18 +456,6 @@ void KitaMainWindow::newToolbarConfig()
     applyMainWindowSettings( KGlobal::config(), "MainWindow" );
 }
 
-void KitaMainWindow::windowShowBoardlist()
-{
-    if ( m_boardListAction->isChecked() )
-    {
-        makeDockVisible( m_boardDock );
-    }
-    else
-    {
-        makeDockInvisible( m_boardDock );
-    }
-}
-
 void KitaMainWindow::windowShowSubjectlist()
 {
     if ( m_subjectListAction->isChecked() )
@@ -495,6 +498,7 @@ void KitaMainWindow::resetWindows()
     if( m_subjectListAction ) m_subjectListAction->setChecked( TRUE );
     if( m_showImgViewAction ) m_showImgViewAction->setChecked( TRUE );
     if( m_showNaviAction ) m_showNaviAction->setChecked( TRUE );
+    if( m_showWriteDockAction ) m_showWriteDockAction->setChecked( TRUE );    
 }
 
 
@@ -556,12 +560,9 @@ void KitaMainWindow::setupView()
     connect( m_subjectDock, SIGNAL( iMBeingClosed() ), SLOT( closeSubjectView() ) );
 
     /* Board View */
-    m_boardDock = createDockWidget( "board", 0L, 0L, i18n( "board" ), i18n( "board" ) );
-    m_boardView = new KitaBoardView( m_boardDock );
-    m_boardDock->setWidget( m_boardView );
-    m_boardDock->setDockSite( KDockWidget::DockNone );
-    connect( m_boardDock, SIGNAL( headerCloseButtonClicked() ), SLOT( closeBoardView() ) );
-    connect( m_boardDock, SIGNAL( iMBeingClosed() ), SLOT( closeBoardView() ) );
+    m_boardDock = new KitaBoardDock( manager(),  "board", 0L, 0L, i18n( "board" ), i18n( "board" ) );
+    m_boardTab = m_boardDock->setup();
+    connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckBoardToggleAction( bool ) ) );    
 
     /* Thread View */
     m_threadDock = new KitaThreadDock( manager(), "Thread", 0L, 0L, i18n( "Thread" ), i18n( "Thread" ) );
@@ -583,13 +584,15 @@ void KitaMainWindow::setupView()
 
     /* write dock */
     m_writeDock = new KitaWriteDock( manager(),  "Write", 0L, 0L, i18n( "Write" ), i18n( "Write" ) );
-    m_writeDock->setup();
+    m_writeTab = m_writeDock->setup();
+    connect( m_writeDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckWriteToggleAction( bool ) ) );    
     
     /* reset dock status */
     m_boardListAction = NULL;
     m_subjectListAction = NULL;
     m_showImgViewAction = NULL;
     m_showNaviAction = NULL;
+    m_showWriteDockAction = NULL;
     resetWindows();
 }
 
@@ -598,9 +601,9 @@ void KitaMainWindow::closeSubjectView()
     m_subjectListAction->setChecked( FALSE );
 }
 
-void KitaMainWindow::closeBoardView()
+void KitaMainWindow::slotCheckBoardToggleAction( bool check )
 {
-    m_boardListAction->setChecked( FALSE );
+    if( m_boardListAction ) m_boardListAction->setChecked( check );
 }
 
 void KitaMainWindow::slotCheckNaviToggleAction( bool check )
@@ -613,6 +616,13 @@ void KitaMainWindow::slotCheckImgToggleAction( bool check )
     if( m_showImgViewAction ) m_showImgViewAction->setChecked( check );
 }
 
+
+void KitaMainWindow::slotCheckWriteToggleAction( bool check )
+{
+    if( m_showWriteDockAction ) m_showWriteDockAction->setChecked( check );
+}
+
+
 void KitaMainWindow::slotOpenURLRequest( const KURL& url, const KParts::URLArgs& args )
 {
     kdDebug() << QString( "Requested OpenURL: \"%1\"" ).arg( url.url() ) << endl;
@@ -697,7 +707,7 @@ void KitaMainWindow::saveCache()
 void KitaMainWindow::setFont( const QFont& font )
 {
     m_subjectTab->setFont( font );
-    m_boardView->setFont( font );
+    m_boardTab->setFont( font );
 }
 
 

diff --git a/kita/src/kita.h b/kita/src/kita.h
index 3666010..71b489b 100644 (file)
--- a/kita/src/kita.h
+++ b/kita/src/kita.h
@@ -21,15 +21,17 @@
 class KPrinter;
 class KToggleAction;
 class KURL;
-class KitaThreadTabWidget;
-class KitaBoardView;
-class KitaSubjectTabWidget;
 class KLineEdit;
+
+class KitaBoardDock;
+class KitaBoardTabWidget;
+class KitaSubjectTabWidget;
 class KitaThreadDock;
+class KitaThreadTabWidget;
 class KitaImgDock;
 class KitaImgTabWidget;
-class KitaNavi;
 class KitaWriteDock;
+class KitaWriteTabWidget;
 
 namespace KParts
 {
@@ -92,16 +94,16 @@ private slots:
     void optionsConfigureToolbars();
     void optionsPreferences();
     void newToolbarConfig();
-    void windowShowBoardlist();
     void windowShowSubjectlist();
     void windowToggleView();
     void settingsMenuAboutToShow();
     void slotEditCopy();
     void resetWindows();
     void closeSubjectView();
-    void closeBoardView();
+    void slotCheckBoardToggleAction( bool check );
     void slotCheckNaviToggleAction( bool check );
     void slotCheckImgToggleAction( bool check );
+    void slotCheckWriteToggleAction( bool check );    
     void login();
 
     void slotSetMainStatusbar( const QString& statusStr );
@@ -123,10 +125,11 @@ private:
     KToggleAction* m_subjectListAction;
     KToggleAction* m_showImgViewAction;
     KToggleAction* m_showNaviAction;
+    KToggleAction* m_showWriteDockAction;
     KAction* m_toggleViewAction;
 
     KDockWidget* m_dummyDock; /* dummy MainDockWidget */
-    KDockWidget* m_boardDock;
+    KitaBoardDock* m_boardDock;
     KDockWidget* m_subjectDock;
     KitaThreadDock* m_threadDock;
     KitaThreadDock* m_naviDock;
@@ -134,10 +137,11 @@ private:
     KitaWriteDock* m_writeDock;
 
     KitaThreadTabWidget* m_threadTab;
-    KitaBoardView* m_boardView;
+    KitaBoardTabWidget* m_boardTab;
     KitaSubjectTabWidget* m_subjectTab;
     KitaImgTabWidget* m_imgTab;
     KitaThreadTabWidget* m_naviTab;
+    KitaWriteTabWidget* m_writeTab;
     
     void setupAccel();
     void setupActions();

diff --git a/kita/src/kitaboardtabwidget.cpp b/kita/src/kitaboardtabwidget.cpp
new file mode 100644 (file)
index 0000000..c19ca1e
--- /dev/null
+++ b/kita/src/kitaboardtabwidget.cpp
@@ -0,0 +1,79 @@
+/***************************************************************************
+*   Copyright (C) 2004 by Hideki Ikemoto , (c) 2004 by 421                *
+*   ikemo@users.sourceforge.jp                                            *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+***************************************************************************/
+
+#include "kitaboardtabwidget.h"
+#include "kitaboardview.h"
+#include "libkita/signalcollection.h"
+
+#include <klocale.h>
+
+/*--------------------------------------------------------------*/
+
+
+KitaBoardTabWidget::KitaBoardTabWidget( QWidget* parent, const char* name, WFlags fl )
+    :KitaTabWidgetBase( parent, name, fl )
+{
+    KitaBoardView* view = new KitaBoardView( this );
+    addTab( view, i18n( "board name" ) );
+}
+
+
+KitaBoardTabWidget::~KitaBoardTabWidget(){}
+
+
+/* public slot */
+void KitaBoardTabWidget::loadBoardList()
+{
+    static_cast < KitaBoardView* > ( page( 0 ) )->loadBoardList();
+}
+    
+/* public slot */
+void KitaBoardTabWidget::setFont( const QFont& font )
+{
+    static_cast < KitaBoardView* > ( page( 0 ) )->setFont( font );
+}
+
+
+/* protected */ /* virtual */
+void KitaBoardTabWidget::deleteWidget( QWidget* w ){}
+
+
+/*--------------------------------------------------------------*/
+
+
+KitaBoardDock::KitaBoardDock( KDockManager* dockManager,
+                   const char* name,
+                   const QPixmap &pixmap,
+                   QWidget* parent,
+                   const QString& strCaption,
+                   const QString& strTabPageLabel,
+                   WFlags f )
+    :KitaDockWidgetBase( dockManager, name, pixmap, parent, strCaption, strTabPageLabel, f ){}
+
+
+KitaBoardDock::~KitaBoardDock()
+{
+    if( m_boardTab ) delete m_boardTab;
+}
+
+
+/* setup & create KitaBoardDock */ /* public */
+KitaBoardTabWidget* KitaBoardDock::setup()
+{
+    /* create KitaNaviTabWidget */
+    m_boardTab = new KitaBoardTabWidget( this, "Board" );
+    setWidget( m_boardTab );
+
+    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
+    connect( signalCollection, SIGNAL( switchToBoard() ),
+            SLOT( slotShowDock() ) );
+    
+    return m_boardTab;
+}

diff --git a/kita/src/kitaboardtabwidget.h b/kita/src/kitaboardtabwidget.h
new file mode 100644 (file)
index 0000000..1f5d210
--- /dev/null
+++ b/kita/src/kitaboardtabwidget.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+*   Copyright (C) 2004 by Hideki Ikemoto , (c) 2004 by 421                *
+*   ikemo@users.sourceforge.jp                                            *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+***************************************************************************/
+
+#ifndef KITABOARDTABWIDGET_H
+#define KITABOARDTABWIDGET_H
+
+#include "kitatabwidgetbase.h"
+
+class KitaBoardView;
+class QFont;
+
+/*------------------------------------------------*/
+
+
+class KitaBoardTabWidget : public KitaTabWidgetBase
+{
+    Q_OBJECT
+    
+public:
+    KitaBoardTabWidget( QWidget* parent, const char* name = 0, WFlags fl = 0 );
+    ~KitaBoardTabWidget();
+    
+public slots:
+    void loadBoardList();
+    void setFont( const QFont& font );
+    
+protected:
+    virtual void deleteWidget( QWidget* w );
+};
+
+
+/*--------------------------------------------------*/
+
+
+class KitaBoardDock : public KitaDockWidgetBase{
+
+    Q_OBJECT
+       KitaBoardTabWidget* m_boardTab;
+public:
+    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);
+    ~KitaBoardDock();
+
+    KitaBoardTabWidget* setup();
+};
+
+
+
+#endif

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index 0a545f5..9ea7d24 100644 (file)
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -214,6 +214,13 @@ void KitaBoardView::setFont( const QFont& font )
     m_boardList->setFont( font );
 }
 
+/* public slot :*/ /* virtual */
+void KitaBoardView::setFocus()
+{
+    m_boardList->setFocus();
+}
+
+
 void KitaBoardView::slotContextMenuRequested( QListViewItem* item, const QPoint& point, int )
 {
     if ( item == 0 ) {

diff --git a/kita/src/kitaboardview.h b/kita/src/kitaboardview.h
index 5c67973..cab43ab 100644 (file)
--- a/kita/src/kitaboardview.h
+++ b/kita/src/kitaboardview.h
@@ -53,6 +53,7 @@ public:
 public slots:
     void loadBoardList();
     void setFont( const QFont& font );
+    virtual void setFocus();    
 
 signals:
     void openBoardRequested( const QString& boardURL, bool withNewTab );

diff --git a/kita/src/kitaimgtabwidget.cpp b/kita/src/kitaimgtabwidget.cpp
index e4cfcec..e93c62a 100644 (file)
--- a/kita/src/kitaimgtabwidget.cpp
+++ b/kita/src/kitaimgtabwidget.cpp
@@ -11,6 +11,7 @@
 /* Kita Image Viewer */
 
 #include "kitaimgtabwidget.h"
+#include "libkita/signalcollection.h"
 
 #include <klibloader.h>
 #include <kapplication.h>
@@ -289,6 +290,10 @@ KitaImgTabWidget* KitaImgDock::setup()
     m_imgTab = new KitaImgTabWidget( this, "Image Viewer" );
     setWidget( m_imgTab );
 
+    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
+    connect( signalCollection, SIGNAL( switchToImgview() ),
+            SLOT( slotShowDock() ) );
+    
     return m_imgTab;
 }
 

diff --git a/kita/src/kitathreadtabwidget.cpp b/kita/src/kitathreadtabwidget.cpp
index 630eb96..a9a2202 100644 (file)
--- a/kita/src/kitathreadtabwidget.cpp
+++ b/kita/src/kitathreadtabwidget.cpp
@@ -714,6 +714,10 @@ KitaThreadTabWidget* KitaThreadDock::setupAsMainView()
     m_threadTab = new KitaThreadTabWidget( TABMODE_THREADVIEW, this, "Thread View" );
     setWidget( m_threadTab );
 
+    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
+    connect( signalCollection, SIGNAL( switchToThread() ),
+            SLOT( slotShowDock() ) );
+    
     return m_threadTab;
 }
 
@@ -737,6 +741,10 @@ KitaThreadTabWidget* KitaThreadDock::setupAsKitaNavi()
     m_threadTab = new KitaThreadTabWidget( TABMODE_KITANAVI, this, "Kita Navi");
     setWidget( m_threadTab );
 
+    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
+    connect( signalCollection, SIGNAL( switchToKitanavi() ),
+            SLOT( slotShowDock() ) );
+    
     return m_threadTab;
 }
 

diff --git a/kita/src/kitaui.rc b/kita/src/kitaui.rc
index e573401..e2d2483 100644 (file)
--- a/kita/src/kitaui.rc
+++ b/kita/src/kitaui.rc
@@ -19,6 +19,7 @@
     <Action name="window_show_threadview" />
     <Action name="window_show_kitanavi" />
     <Action name="window_show_imgviewer" />
+    <Action name="window_show_writedock" />
     <Separator/>
     <Action name="reset_win" />
   </Menu>

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index d64f459..e4cc502 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -55,6 +55,8 @@ namespace Kita
        void setMainURLLine( const KURL& url );
        void setMainCaption( const QString& captionStr );
        void setMainStatusbar( const QString& statusStr );
+       void switchToBoard();
+       void switchToSubject();
        
        /* from: KitaDockWidgetBase            */
        /* to  : KitaHTMLPart                  */
@@ -83,9 +85,15 @@ namespace Kita
        void showKitaNaviByName( const KURL& , QString);
        void showKitaNaviResTree( const KURL&,  int );
        void showKitaNaviRevResTree( const KURL&,  int );
+       void switchToThread();
+       void switchToKitanavi();
 
+       /* to: KitaImgDock */
+       void switchToImgview();
+       
        /* to : KitaWriteDock */
        void showWriteView( const KURL& , const QString&,const QString& );
+       void switchToWritedock();       
     };
 
 }

diff --git a/kita/src/part/kitahtmlpart.cpp b/kita/src/part/kitahtmlpart.cpp
index e1bf810..bf63de1 100644 (file)
--- a/kita/src/part/kitahtmlpart.cpp
+++ b/kita/src/part/kitahtmlpart.cpp
@@ -1165,6 +1165,8 @@ void KitaHTMLPart::showPopupMenu( const KURL& kurl )
 /* protected */
 void KitaHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent* e )
 {
+    emit mousePressed(); /* to KitaThreadView to focus this view. */
+    
     KURL kurl;
     if( e->url().string() != QString::null )
         kurl = KURL( Kita::DatManager::boardURL( m_datURL ), e->url().string() );

diff --git a/kita/src/part/kitahtmlpart.h b/kita/src/part/kitahtmlpart.h
index e1d8213..5011427 100644 (file)
--- a/kita/src/part/kitahtmlpart.h
+++ b/kita/src/part/kitahtmlpart.h
@@ -188,6 +188,7 @@ signals:
     void openWriteDialog( QString );
     void openURLRequest( const KURL& url, const KParts::URLArgs &args = KParts::URLArgs() );
     void redrawHTMLPart( const KURL& url, bool force );
+    void mousePressed(); /* to KitaThreadView */
 
     /* cache */
     void receiveData();

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 4dac3d6..edc67b5 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -105,6 +105,9 @@ KitaThreadView::KitaThreadView( QWidget* parent, const char* name )
              SLOT( slotUpdateInfo() ) );
     connect( m_threadPart, SIGNAL( nodeActivated( const DOM::Node& ) ),
              SLOT( slotDOMNodeActivated( const DOM::Node& ) ) );
+    connect( m_threadPart, SIGNAL( mousePressed() ),
+             SLOT( setFocus() ) );
+    
     connect( BookmarkButton, SIGNAL( toggled( bool ) ),
              SLOT( slotBookmarkButtonClicked( bool ) ) );
     connect( SearchButton, SIGNAL( clicked() ),
@@ -183,8 +186,6 @@ const KURL KitaThreadView::datURL() const
 
 void KitaThreadView::slotDOMNodeActivated( const DOM::Node& node )
 {
-    setFocus();
-
     { //process Anchor tags. Anchor tags not proccessed here cause 'emit KParts::BrowserExtention::openURLRequest()'
         DOM::HTMLAnchorElement anchor = node;