squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 07:27:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added 'Shutdown now' button in shutdown confirmation dialog. Closes #969.

Browse Source 
Conflicts:
	src/qtlibtorrent/qbtsession.cpp
This commit is contained in:
sledgehammer999
2014-08-23 21:08:27 +03:00
parent f75f5616b1
commit 808a4d7e9b
3 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/qtlibtorrent/qbtsession.cpp
View File

@@ -2347,19 +2347,18 @@ void QBtSession::readAlerts() {
bool suspend = pref.suspendWhenDownloadsComplete();
bool hibernate = pref.hibernateWhenDownloadsComplete();
bool shutdown = pref.shutdownWhenDownloadsComplete();
shutDownAction action = NO_SHUTDOWN;
if (suspend)
action = SUSPEND_COMPUTER;
else if (hibernate)
action = HIBERNATE_COMPUTER;
else if (shutdown)
action = SHUTDOWN_COMPUTER;
// Confirm shutdown
QString confirm_msg;
if (suspend) {
confirm_msg = tr("The computer will now go to sleep mode unless you cancel within the next 15 seconds...");
} else if (hibernate) {
confirm_msg = tr("The computer will now go to hibernation mode unless you cancel within the next 15 seconds...");
} else if (shutdown) {
confirm_msg = tr("The computer will now be switched off unless you cancel within the next 15 seconds...");
} else {
confirm_msg = tr("qBittorrent will now exit unless you cancel within the next 15 seconds...");
}
if (!ShutdownConfirmDlg::askForConfirmation(confirm_msg))
if (!ShutdownConfirmDlg::askForConfirmation(action))
return;
// Actually shut down
if (suspend || hibernate || shutdown) {
qDebug("Preparing for auto-shutdown because all downloads are complete!");
@@ -2368,12 +2367,7 @@ void QBtSession::readAlerts() {
pref.setSuspendWhenDownloadsComplete(false);
pref.setHibernateWhenDownloadsComplete(false);
// Make sure preferences are synced before exiting
if (suspend)
m_shutdownAct = SUSPEND_COMPUTER;
else if (hibernate)
m_shutdownAct = HIBERNATE_COMPUTER;
else
m_shutdownAct = SHUTDOWN_COMPUTER;
m_shutdownAct = action;
}
qDebug("Exiting the application");
qApp->exit();