From 5d04db513791b078b5a2304447bb39f9d0d67caa Mon Sep 17 00:00:00 2001 From: lappelhans Date: Fri, 12 Dec 2008 18:06:40 +0000 Subject: [PATCH] Fix saving of MainWindow-State BUG:177529 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@896154 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kget/core/transfergroup.cpp | 4 ++-- kget/mainwindow.cpp | 10 ++++++++++ kget/mainwindow.h | 4 +++- kget/ui/tray.cpp | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/kget/core/transfergroup.cpp b/kget/core/transfergroup.cpp index e2e626bed..167282c1e 100644 --- a/kget/core/transfergroup.cpp +++ b/kget/core/transfergroup.cpp @@ -327,7 +327,7 @@ void TransferGroup::transferChangedEvent(Transfer * transfer) void TransferGroup::save(QDomElement e) // krazy:exclude=passbyvalue { - kDebug(5001) << "TransferGroup::save() --> " << name(); + kDebug(5001) << " --> " << name(); e.setAttribute("Name", m_name); e.setAttribute("DefaultFolder", m_defaultFolder); @@ -341,7 +341,7 @@ void TransferGroup::save(QDomElement e) // krazy:exclude=passbyvalue for( ; it!=itEnd; ++it ) { - kDebug(5001) << "TransferGroup::save() -->" << name() << " transfer: " << ((Transfer *) *it)->source(); + kDebug(5001) << " --> " << name() << " transfer: " << ((Transfer *) *it)->source(); QDomElement t = e.ownerDocument().createElement("Transfer"); e.appendChild(t); ((Transfer *) *it)->save(t); diff --git a/kget/mainwindow.cpp b/kget/mainwindow.cpp index 9a8932361..80efdbcdf 100644 --- a/kget/mainwindow.cpp +++ b/kget/mainwindow.cpp @@ -843,6 +843,16 @@ void MainWindow::closeEvent( QCloseEvent * e ) } } +void MainWindow::hideEvent(QHideEvent *) +{ + Settings::setShowMain(false); +} + +void MainWindow::showEvent(QShowEvent *) +{ + Settings::setShowMain(true); +} + void MainWindow::dragEnterEvent(QDragEnterEvent * event) { event->setAccepted(KUrl::List::canDecode(event->mimeData()) diff --git a/kget/mainwindow.h b/kget/mainwindow.h index 26377e105..7844040bd 100644 --- a/kget/mainwindow.h +++ b/kget/mainwindow.h @@ -58,7 +58,9 @@ public slots: protected: // ignore/accept quit events - virtual void closeEvent( QCloseEvent * ); + virtual void closeEvent(QCloseEvent *); + virtual void hideEvent(QHideEvent *); + virtual void showEvent(QShowEvent *); // drag and drop virtual void dragEnterEvent(QDragEnterEvent *); diff --git a/kget/ui/tray.cpp b/kget/ui/tray.cpp index a2aab5bee..ad58c3c9e 100644 --- a/kget/ui/tray.cpp +++ b/kget/ui/tray.cpp @@ -92,10 +92,10 @@ void Tray::slotActivated( QSystemTrayIcon::ActivationReason reason ) if(!newtransfer.isEmpty()) KGet::addTransfer(KUrl(newtransfer), QString(), QString(), true); } - else if (reason == QSystemTrayIcon::Trigger) { + /*else if (reason == QSystemTrayIcon::Trigger) { // save the main window minimized state if it changes from the sys tray icon Settings::setShowMain(parentWidget()->isVisible()); - } + }*/ } // display blinking icon when downloading -- 2.11.4.GIT