don't force caption update, qt already handles that

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3161 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 3 insertions, 17 deletions

diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index aff49b130..4569affac 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -83,6 +83,8 @@
 // FIXME: #warning "When a toolbar is moved , MdiManager is resized but does not update the MdiChild backgrounds"
 #endif
 
+#define KVI_DEFAULT_FRAME_CAPTION "KVIrc " KVI_VERSION " " KVI_RELEASE_NAME
+
 // Declared and managed by KviApp (kvi_app.cpp)
 extern KviConfig * g_pWinPropertiesConfig;
 KVIRC_API KviFrame * g_pFrame = 0; // the one and only frame object
@@ -93,6 +95,7 @@ KviFrame::KviFrame()
 	g_pFrame = this;
 
 	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))));
+	setWindowTitle(KVI_DEFAULT_FRAME_CAPTION);
 
 	m_pWinList  = new KviPointerList<KviWindow>;
 	m_pWinList->setAutoDelete(false);
@@ -800,7 +803,6 @@ void KviFrame::childWindowActivated(KviWindow *wnd)
 	bool bActiveContextChanged = (m_pActiveContext != wnd->context());
 	m_pActiveContext = wnd->context();
 
-	if(wnd->isMaximized() && wnd->mdiParent())updateCaption();
 	m_pWindowList->setActiveItem(wnd->windowListItem());
 
 	//wnd->gainedActiveWindowStatus(); // <-- atm unused
@@ -840,15 +842,6 @@ void KviFrame::windowActivationChange(bool bOldActive)
 	}
 }
 
-#define KVI_DEFAULT_FRAME_CAPTION "KVIrc " KVI_VERSION " " KVI_RELEASE_NAME
-
-void KviFrame::updateCaption()
-{
-	//the caption of an eventual maximized mdichild is already appended by qt
-	setWindowTitle(KVI_DEFAULT_FRAME_CAPTION);
-}
-
-
 void KviFrame::closeEvent(QCloseEvent *e)
 {
 	//check if the user just want us to minimize in tray; if we're not the sender
@@ -951,7 +944,6 @@ void KviFrame::applyOptions()
 {
 	m_pMdi->update();
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())wnd->applyOptions();
-	updateCaption();
 
 	m_pWindowList->applyOptions();
 	g_pTextIconManager->applyOptions();
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index 3a08de66b..66e9205db 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -153,10 +153,6 @@ public:
 	// returns the dockExtension applet. Useful for calling refresh() when
 	// some particular event happens
 	KviDockExtension * dockExtension(){ return m_pDockExtension; };
-	// Updates the main window caption.
-	// Should be called when the active window changes
-	// and the active irc context changes state
-	void updateCaption();
 	// helper for saving the window properties
 	void saveWindowProperties(KviWindow * wnd,const QString &szSection);
 	// finds the module extension toolbar with the specified identifier
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 78314bb2a..525a37126 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -658,8 +658,6 @@ void KviWindow::updateCaption()
 	else
 		setWindowTitle(plainTextCaption());
 	if(m_pWindowListItem)m_pWindowListItem->captionChanged();
-	if(mdiParent() && isMaximized() && (g_pActiveWindow == this))
-		g_pFrame->updateCaption();
 }
 
 void KviWindow::updateCaptionListItem()