From 8c3f146aa1b0a503b386455c52dfba3440cdcfb5 Mon Sep 17 00:00:00 2001 From: ikemo Date: Thu, 11 Mar 2004 15:25:54 +0000 Subject: [PATCH] refactoring. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@917 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/kita.cpp | 63 +++++++++++++++++------------------------- kita/src/kita.h | 6 ++-- kita/src/kitathreadtabwidget.h | 2 +- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp index 98fa8a6..146d27f 100644 --- a/kita/src/kita.cpp +++ b/kita/src/kita.cpp @@ -88,38 +88,38 @@ KitaMainWindow::KitaMainWindow() setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect( m_threadView, SIGNAL( signalChangeStatusbar( const QString& ) ), + connect( m_threadTab, SIGNAL( signalChangeStatusbar( const QString& ) ), SLOT( changeStatusbar( const QString& ) ) ); connect( m_boardView, SIGNAL( clicked( const Kita::Board* ) ), - m_subjectView, SLOT( loadBoard( const Kita::Board* ) ) ); + m_subjectTab, SLOT( loadBoard( const Kita::Board* ) ) ); connect( m_boardView, SIGNAL( openBoardRequested( const Kita::Board*, bool ) ), - m_subjectView, SLOT( loadBoard( const Kita::Board*, bool ) ) ); + m_subjectTab, SLOT( loadBoard( const Kita::Board*, bool ) ) ); - connect( m_subjectView, SIGNAL( signalShowThread( const Kita::Thread* ) ), - m_threadView, SLOT( showThread( const Kita::Thread* ) ) ); + connect( m_subjectTab, SIGNAL( signalShowThread( const Kita::Thread* ) ), + m_threadTab, SLOT( showThread( const Kita::Thread* ) ) ); // ad-hoc - connect( m_subjectView, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ), - m_threadView, SLOT( showThreadWithNewTab( const Kita::Thread* ) ) ); + connect( m_subjectTab, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ), + m_threadTab, SLOT( showThreadWithNewTab( const Kita::Thread* ) ) ); - connect( m_threadView, SIGNAL( thread( const Kita::Thread* ) ), - m_subjectView, SLOT( updateThread( const Kita::Thread* ) ) ); + connect( m_threadTab, SIGNAL( thread( const Kita::Thread* ) ), + m_subjectTab, SLOT( updateThread( const Kita::Thread* ) ) ); - connect( m_threadView, SIGNAL( thread( const Kita::Thread* ) ), + connect( m_threadTab, SIGNAL( thread( const Kita::Thread* ) ), SLOT( slotThread( const Kita::Thread* ) ) ); - connect( m_threadView, SIGNAL( writeSucceeded() ), + connect( m_threadTab, SIGNAL( writeSucceeded() ), SLOT( slotWriteSucceeded() ) ); - connect( m_threadView, SIGNAL( showThreadCompleted( const KURL& ) ), + connect( m_threadTab, SIGNAL( showThreadCompleted( const KURL& ) ), SLOT( setUrl( const KURL& ) ) ); - connect( m_subjectView, SIGNAL( loadBoardCompleted( const KURL& ) ), + connect( m_subjectTab, SIGNAL( loadBoardCompleted( const KURL& ) ), SLOT( setUrl( const KURL& ) ) ); - connect( m_threadView, SIGNAL( bookmarked( const Kita::Thread*, bool ) ), + connect( m_threadTab, SIGNAL( bookmarked( const Kita::Thread*, bool ) ), SLOT( bookmark( const Kita::Thread*, bool ) ) ); connect( m_urlLine, SIGNAL( returnPressed() ), @@ -186,7 +186,7 @@ void KitaMainWindow::setupActions() KStdAction::openNew( this, SLOT( fileNew() ), actionCollection() ); KStdAction::quit( this, SLOT( close() ), actionCollection() ); KStdAction::copy( this, SLOT( slotEditCopy() ), actionCollection() ); - KStdAction::find( this, SLOT( slotEditFind() ), actionCollection() ); + KStdAction::find( m_threadTab, SLOT( focusSearchCombo() ), actionCollection() ); m_toolbarAction = KStdAction::showToolbar( this, SLOT( optionsShowToolbar() ), @@ -238,8 +238,8 @@ void KitaMainWindow::setupActions() new KAction( i18n( "Reload" ), KStdAccel::reload(), - this, - SLOT( slotViewReload() ), + m_threadTab, + SLOT( reloadThread(); ), actionCollection(), "reload" ); @@ -257,7 +257,7 @@ void KitaMainWindow::slotUrlLine() { QString text = m_urlLine->text(); QString datURL = Kita::threadToDat( text ); - m_threadView->showThread( datURL ); + m_threadTab->showThread( datURL ); } void KitaMainWindow::writeConfig( KConfig* config ) @@ -422,7 +422,7 @@ void KitaMainWindow::windowMenuAboutToShow() void KitaMainWindow::windowCloseTab() { - m_threadView->closeCurrentTab(); + m_threadTab->closeCurrentTab(); } void KitaMainWindow::settingsMenuAboutToShow() @@ -470,17 +470,16 @@ void KitaMainWindow::setupView() { KDockWidget * mainDock; mainDock = createDockWidget( "main", 0L, 0L, i18n( "main" ) ); - m_threadView = new KitaThreadTabWidget( mainDock ); - mainDock->setWidget( m_threadView ); + m_threadTab = new KitaThreadTabWidget( mainDock ); + mainDock->setWidget( m_threadTab ); mainDock->setDockSite( KDockWidget::DockFullSite ); mainDock->setEnableDocking( KDockWidget::DockNone ); - connect( m_threadView, SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + connect( m_threadTab, SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), SLOT( slotOpenURLRequest( const KURL&, const KParts::URLArgs& ) ) ); m_subjectDock = createDockWidget( "subject", 0L, 0L, i18n( "subject" ) ); - // m_subjectView = new KitaSubjectView( m_subjectDock ); - m_subjectView = new KitaSubjectTabWidget( m_subjectDock ); - m_subjectDock->setWidget( m_subjectView ); + m_subjectTab = new KitaSubjectTabWidget( m_subjectDock ); + m_subjectDock->setWidget( m_subjectTab ); m_subjectDock->setDockSite( KDockWidget::DockFullSite ); m_boardDock = createDockWidget( "board", 0L, 0L, i18n( "board" ) ); @@ -529,14 +528,14 @@ void KitaMainWindow::saveCache() void KitaMainWindow::setFont( const QFont& font ) { KitaConfig::setFont( font ); - m_subjectView->setFont( font ); + m_subjectTab->setFont( font ); m_boardView->setFont( font ); } void KitaMainWindow::setThreadFont( const QFont& font ) { KitaConfig::setThreadFont( font ); - m_threadView->setFont( font ); + m_threadTab->setFont( font ); } void KitaMainWindow::slotWriteSucceeded() @@ -677,14 +676,4 @@ void KitaMainWindow::slotEditCopy() } } -void KitaMainWindow::slotEditFind() -{ - m_threadView->focusSearchCombo(); -} - -void KitaMainWindow::slotViewReload() -{ - m_threadView->reloadThread(); -} - #include "kita.moc" diff --git a/kita/src/kita.h b/kita/src/kita.h index 679eb67..cdb3764 100644 --- a/kita/src/kita.h +++ b/kita/src/kita.h @@ -101,8 +101,6 @@ private slots: void settingsMenuAboutToShow(); void settingsShowMailAddress(); void slotEditCopy(); - void slotEditFind(); - void slotViewReload(); void changeStatusbar( const QString& text ); void changeCaption( const QString& text ); @@ -116,9 +114,9 @@ private slots: void slotThread( const Kita::Thread* thread ); private: - KitaThreadTabWidget* m_threadView; + KitaThreadTabWidget* m_threadTab; KitaBoardView* m_boardView; - KitaSubjectTabWidget* m_subjectView; + KitaSubjectTabWidget* m_subjectTab; KLineEdit* m_urlLine; KPrinter *m_printer; diff --git a/kita/src/kitathreadtabwidget.h b/kita/src/kitathreadtabwidget.h index 0e08615..c6184fe 100644 --- a/kita/src/kitathreadtabwidget.h +++ b/kita/src/kitathreadtabwidget.h @@ -35,7 +35,6 @@ public: KitaThreadTabWidget( QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); ~KitaThreadTabWidget(); void focusSearchCombo(); - void reloadThread(); void closeCurrentTab(); public slots: @@ -43,6 +42,7 @@ public slots: void showThread( const QString& datURL, bool withNewTab = false ); void showThreadWithNewTab( const Kita::Thread* thread ); // ad-hoc void deleteView( KitaThreadView* ); + void reloadThread(); private: void connectSignals( KitaThreadView* ); -- 2.11.0