[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/sysadmin/muon/src
From: Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date: 2010-06-30 22:57:57
Message-ID: 20100630225757.CA350AC8E2 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1144826 by jmthomas:
A more event-based method of deciding when the app should quit.
M +4 -5 MainWindow.cpp
M +1 -0 MainWindow.h
--- trunk/playground/sysadmin/muon/src/MainWindow.cpp #1144825:1144826
@@ -59,6 +59,7 @@
, m_downloadWidget(0)
, m_commitWidget(0)
, m_powerInhibitor(0)
+ , m_canExit(true)
{
initGUI();
@@ -175,13 +176,9 @@
bool MainWindow::queryExit()
{
// We don't want to quit during the middle of a commit
- if (m_commitWidget) {
- return false;
+ return m_canExit;
}
- return true;
-}
-
void MainWindow::markUpgrade()
{
m_backend->markPackagesForUpgrade();
@@ -213,6 +210,7 @@
case QApt::CacheUpdateFinished:
case QApt::CommitChangesFinished:
Solid::PowerManagement::stopSuppressingSleep(m_powerInhibitor);
+ m_canExit = true;
reload();
returnFromPreview();
break;
@@ -223,6 +221,7 @@
connect(m_downloadWidget, SIGNAL(cancelDownload()), m_backend, SLOT(cancelDownload()));
break;
case QApt::CommitChangesStarted:
+ m_canExit = false;
m_commitWidget->setHeaderText(i18nc("@info", "<title>Committing Changes</title>"));
m_stack->setCurrentWidget(m_commitWidget);
break;
--- trunk/playground/sysadmin/muon/src/MainWindow.h #1144825:1144826
@@ -84,6 +84,7 @@
StatusWidget *m_statusWidget;
int m_powerInhibitor;
+ bool m_canExit;
private Q_SLOTS:
void initGUI();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic