>>569

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

diff --git a/kita/src/kitathreadtabwidget.cpp b/kita/src/kitathreadtabwidget.cpp
index d81ab4c..cc30ada 100644 (file)
--- a/kita/src/kitathreadtabwidget.cpp
+++ b/kita/src/kitathreadtabwidget.cpp
@@ -758,7 +758,7 @@ KitaThreadTabWidget* KitaThreadDock::setupAsMainView()
 
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( signalCollection, SIGNAL( switchToThread() ),
-            SLOT( slotShowDock() ) );
+            SLOT( slotShowThreadDock() ) );
     
     return m_threadTab;
 }
@@ -785,7 +785,7 @@ KitaThreadTabWidget* KitaThreadDock::setupAsKitaNavi()
 
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( signalCollection, SIGNAL( switchToKitanavi() ),
-            SLOT( slotShowDock() ) );
+            SLOT( slotShowThreadDock() ) );
     
     return m_threadTab;
 }
@@ -811,6 +811,17 @@ void KitaThreadDock::connectNaviSignals()
 }
 
 
+/* show Thread Dock */ /* private slot */
+void KitaThreadDock::slotShowThreadDock()
+{
+    QWidget* topWidget = topLevelWidget();
+    if ( topWidget->isMinimized() ) topWidget->showNormal();
+    topWidget->raise();
+    topWidget->setActiveWindow();
+
+    slotShowDock();
+}
+
 /* show res */  /* private slot */
 void KitaThreadDock::slotShowKitaNavi( const KURL& datURL, int startnum, int endnum )
 {

diff --git a/kita/src/kitathreadtabwidget.h b/kita/src/kitathreadtabwidget.h
index b1a3445..98e1993 100644 (file)
--- a/kita/src/kitathreadtabwidget.h
+++ b/kita/src/kitathreadtabwidget.h
@@ -140,6 +140,8 @@ public:
     void  connectNaviSignals();
 
 private slots:
+    void slotShowThreadDock();
+    
     void slotShowKitaNavi( const KURL& datURL, int startnum, int endnum);
     void slotShowKitaNaviByID( const KURL& datURL, QString strid);
     void slotShowKitaNaviByWord( const KURL& datURL, QString query);

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 1e081ee..c141e86 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -316,13 +316,7 @@ void KitaThreadView::focusSearchCombo()
 void KitaThreadView::setFocus()
 {
     emit activateThreadView( m_datURL );
-
     showStatusBar( QString::null );
-
-    QWidget* topWidget = topLevelWidget();
-    if ( topWidget->isMinimized() ) topWidget->showNormal();
-    topWidget->raise();
-    topWidget->setActiveWindow();
     m_threadPart->view() ->setFocus();
 }