diff options
| author |  Fabio Bas | 2009-05-12 17:26:33 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-05-12 17:26:33 +0000 |
| commit | 4baa7a0ae0edca58d3efc7f0ee4ad82991323d2d (patch) | |
| tree | 795f16b9930c71e9ac7ebb64de31ae139787c9ee /src | |
| parent | small addition to previous patch (diff) | |
| download | KVIrc-4baa7a0ae0edca58d3efc7f0ee4ad82991323d2d.tar.gz KVIrc-4baa7a0ae0edca58d3efc7f0ee4ad82991323d2d.tar.bz2 KVIrc-4baa7a0ae0edca58d3efc7f0ee4ad82991323d2d.zip | |
fixed a bug where queries would always open up as undocked
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3213 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_window.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_window.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 1eb05e0b0..5efd7b0bc 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -446,9 +446,9 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const QString &szSection) // The following line should NOT be needed...but just to be sure... g_pWinPropertiesConfig->setGroup(szSection); - g_pWinPropertiesConfig->writeEntry("IsDocked",wnd->mdiParent()); + g_pWinPropertiesConfig->writeEntry("IsDocked",wnd->isDocked()); - if (wnd->mdiParent()) + if (!wnd->isDocked() && wnd->mdiParent()) { g_pWinPropertiesConfig->writeEntry("IsMaximized",wnd->mdiParent()->isMaximized()); } else { diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 9cf9c6288..fa88c4b05 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -122,6 +122,7 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * m_pTextEncodingButton = 0; m_pHideToolsButton = 0; // m_pEditorsContainer = 0; + m_bIsDocked = false; #ifdef COMPILE_CRYPT_SUPPORT m_pCryptControllerButton = 0; @@ -912,6 +913,7 @@ void KviWindow::updateIcon() void KviWindow::youAreDocked() { + m_bIsDocked=true; ((KviMdiChild *)parent())->setIcon(*myIconPtr()); updateCaption(); connect(((KviMdiChild *)parent()),SIGNAL(systemPopupRequest(const QPoint &)),this,SLOT(systemPopupRequest(const QPoint &))); @@ -919,6 +921,7 @@ void KviWindow::youAreDocked() void KviWindow::youAreUndocked() { + m_bIsDocked=false; setWindowIcon(QIcon(*myIconPtr())); updateCaption(); } diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index db5ff4472..bce4ba51e 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -174,12 +174,14 @@ protected: // almost private: don't touch :D //unsigned int m_uTextEncoding; QTextCodec * m_pTextCodec; // KviToolWindowsContainer * m_pEditorsContainer; + bool m_bIsDocked; public: + inline bool isDocked() { return m_bIsDocked; } // The global ID of this window: unique in the application inline QString id(){ return QString("%1").arg(m_uId); }; inline unsigned long int numericId(){ return m_uId; }; KviTalPopupMenu * generatePopup(); -public: + // THIS is the function that should be used inline const QString & windowName(){ return m_szName; }; void setWindowName(const QString &szName); |