remove new thread view.

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

diff --git a/kita/src/board/boardtabwidget.cpp b/kita/src/board/boardtabwidget.cpp
index 9b647dc..95a5a71 100644 (file)
--- a/kita/src/board/boardtabwidget.cpp
+++ b/kita/src/board/boardtabwidget.cpp
@@ -127,13 +127,6 @@ void KitaBoardTabWidget::setupActions()
                  actionCollection(),
                  "subjectview_reload" );
 
-    new KAction( i18n( "New Thread" ),
-                 0,
-                 this,
-                 SLOT( slotNewThread() ),
-                 actionCollection(),
-                 "subjectview_newthread" );
-
     new KAction( i18n( "Show Old Logs" ),
                  0,
                  this,
@@ -164,14 +157,6 @@ void KitaBoardTabWidget::slotFocusSearchCombo()
 }
 
 /* public slot */
-void KitaBoardTabWidget::slotNewThread()
-{
-    KitaBoardView * view = isSubjectView( currentPage() );
-    if ( view ) view->slotCreateNewThread();
-}
-
-
-/* public slot */
 void KitaBoardTabWidget::slotShowOldLogs( int idx )
 {
     KitaBoardView * view;

diff --git a/kita/src/board/boardtabwidget.h b/kita/src/board/boardtabwidget.h
index 9d074d2..0839e3f 100644 (file)
--- a/kita/src/board/boardtabwidget.h
+++ b/kita/src/board/boardtabwidget.h
@@ -47,7 +47,6 @@ private:
 public slots:
     void slotReloadButton();
     void slotFocusSearchCombo();
-    void slotNewThread();
     void slotShowOldLogs( int idx = -1 );
     void slotShowTitleImg( int idx = -1 );
 };

diff --git a/kita/src/board/boardview.cpp b/kita/src/board/boardview.cpp
index 69fe2ba..cbd7324 100644 (file)
--- a/kita/src/board/boardview.cpp
+++ b/kita/src/board/boardview.cpp
@@ -230,13 +230,6 @@ void KitaBoardView::slotFocusSearchCombo()
     }
 }
 
-/* public slot */
-void KitaBoardView::slotCreateNewThread()
-{
-    emit createNewThread( m_boardURL );
-}
-
-
 void KitaBoardView::UpdateKindLabel()
 {
     QString fmtstr;

diff --git a/kita/src/board/boardview.h b/kita/src/board/boardview.h
index 50b31e8..6ecc2aa 100644 (file)
--- a/kita/src/board/boardview.h
+++ b/kita/src/board/boardview.h
@@ -36,7 +36,6 @@ public slots:
     virtual void setFocus();
     void slotFocusSearchCombo();
     void reloadSubject();
-    void slotCreateNewThread();
     void loadBoard( const KURL& url, bool online = TRUE );
     void setFont( const QFont& font );
     void slotUpdateSubject( const KURL& url );

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index 23fdf95..5e8a558 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -113,7 +113,6 @@ namespace Kita
 
         /* to : KitaWriteDock */
         void showWriteView( const KURL& , const QString& );
-        void createNewThread( const KURL& datURL );
         void switchToWritedock();
     };
 

diff --git a/kita/src/thread/threadview.cpp b/kita/src/thread/threadview.cpp
index ee1fcbc..c85dc64 100644 (file)
--- a/kita/src/thread/threadview.cpp
+++ b/kita/src/thread/threadview.cpp
@@ -527,11 +527,6 @@ void KitaThreadView::slotSearchButton()
             if ( act ) act->activate();
             return ;
         }
-        /* create new thread */
-        else if ( str.mid( 1, 3 ) == "new" ) {
-            emit createNewThread( m_datURL );
-            return ;
-        }
 
         /* jump */
         QString anc = str.mid( 1 );

diff --git a/kita/src/thread/threadview.h b/kita/src/thread/threadview.h
index 5d9a70a..191b6a2 100644 (file)
--- a/kita/src/thread/threadview.h
+++ b/kita/src/thread/threadview.h
@@ -132,7 +132,6 @@ signals:
                             const KURL& usrUrl1 = KURL() );
 
     void showWriteView( const KURL& , const QString& );
-    void createNewThread( const KURL& );
     void activateThreadView( const KURL& );
 };
 

diff --git a/kita/src/write/Makefile.am b/kita/src/write/Makefile.am
index baefd67..27ea240 100644 (file)
--- a/kita/src/write/Makefile.am
+++ b/kita/src/write/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = $(all_includes) -I..
 METASOURCES = AUTO
 noinst_HEADERS = writedialogbase.ui.h writetabwidget.h writeview.h \
-       newthreadwriteview.h previewpart.h
+       previewpart.h
 lib_LTLIBRARIES =  libkitawrite.la
 libkitawrite_la_LDFLAGS = $(all_libraries)
 libkitawrite_la_SOURCES = writetabwidget.cpp writeview.cpp writedialogbase.ui \
-       newthreadwriteview.cpp previewpart.cpp
+       previewpart.cpp
 # this is where the XML-GUI resource file goes
 rcdir = $(kde_datadir)/kita
 rc_DATA =  writetabwidgetui.rc

diff --git a/kita/src/write/writetabwidget.cpp b/kita/src/write/writetabwidget.cpp
index 589e156..185854c 100644 (file)
--- a/kita/src/write/writetabwidget.cpp
+++ b/kita/src/write/writetabwidget.cpp
@@ -14,7 +14,6 @@
 #include "libkita/boardmanager.h"
 #include "writetabwidget.h"
 #include "writeview.h"
-#include "newthreadwriteview.h"
 
 #include <kdebug.h>
 #include <kstdaccel.h>
@@ -50,13 +49,6 @@ void KitaWriteTabWidget::slotShowWriteView( const KURL& url,
 }
 
 
-/* public slot */
-void KitaWriteTabWidget::slotCreateNewThread( const KURL& url )
-{
-    openWriteView( WRITEMODE_NEWTHREAD, url );
-}
-
-
 /* private */
 void KitaWriteTabWidget::openWriteView( int mode, const KURL& url,
                                         const QString& resStr, const QString& subject )
@@ -89,27 +81,15 @@ void KitaWriteTabWidget::openWriteView( int mode, const KURL& url,
     // TODO: refactoring.
     /* create new write view & add it to tab */
     QString threadName;
-    if ( mode == WRITEMODE_NORMAL ) {
-        /* write res */
-        KitaWriteView* new_dlg;
-        threadName = Kita::DatManager::threadName( url );
-        new_dlg = new KitaWriteView( this, url );
-        new_dlg->setMessage( resStr );
-        connect( new_dlg, SIGNAL( closeCurrentTab() ), SLOT( slotCloseCurrentTab() ) );
-        addTab( new_dlg, threadName );
-        showPage( new_dlg );
-    } else {
-
-        /* create new thread */
-        KitaNewThreadWriteView* new_dlg;
-        threadName = i18n( "New Thread" );
-        new_dlg = new KitaNewThreadWriteView( this, url, subject );
-        new_dlg->setMessage( resStr );
-        connect( new_dlg, SIGNAL( closeCurrentTab() ), SLOT( slotCloseCurrentTab() ) );
-        addTab( new_dlg, threadName );
-        showPage( new_dlg );
-    }
 
+    /* write res */
+    KitaWriteView* new_dlg;
+    threadName = Kita::DatManager::threadName( url );
+    new_dlg = new KitaWriteView( this, url );
+    new_dlg->setMessage( resStr );
+    connect( new_dlg, SIGNAL( closeCurrentTab() ), SLOT( slotCloseCurrentTab() ) );
+    addTab( new_dlg, threadName );
+    showPage( new_dlg );
 }
 
 
@@ -273,8 +253,6 @@ void KitaWriteDock::setup()
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( signalCollection, SIGNAL( showWriteView( const KURL& , const QString& ) ),
              this, SLOT( slotShowWriteView( const KURL& , const QString& ) ) );
-    connect( signalCollection, SIGNAL( createNewThread( const KURL& ) ),
-             this, SLOT( slotCreateNewThread( const KURL& ) ) );
     connect( signalCollection, SIGNAL( switchToWritedock() ),
              this, SLOT( slotShowDock() ) );
 }
@@ -287,11 +265,3 @@ void KitaWriteDock::slotShowWriteView( const KURL& url, const QString& resStr )
     slotShowDock();
     m_writeTab->slotShowWriteView( url, resStr );
 }
-
-void KitaWriteDock::slotCreateNewThread( const KURL& url )
-{
-    if ( !m_writeTab ) return ;
-
-    slotShowDock();
-    m_writeTab->slotCreateNewThread( url );
-}

diff --git a/kita/src/write/writetabwidget.h b/kita/src/write/writetabwidget.h
index 7479439..a8dcf96 100644 (file)
--- a/kita/src/write/writetabwidget.h
+++ b/kita/src/write/writetabwidget.h
@@ -28,7 +28,6 @@ public:
 
 public slots:
     void slotShowWriteView( const KURL& url, const QString& resStr );
-    void slotCreateNewThread( const KURL& url );
     void slotCloseWriteTab( const KURL& url );
 
 private:
@@ -78,7 +77,6 @@ public:
 
 public slots:
     void slotShowWriteView( const KURL& url, const QString& resStr );
-    void slotCreateNewThread( const KURL& url );
 };