d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 04:24:23 +00:00
Code Issues Projects Releases Wiki Activity

FEATURE: Added auto-suspend upon downloads completion feature

Browse Source
This commit is contained in:
Christophe Dumez 2010-12-31 13:36:32 +00:00
parent 6d241270b5
commit 1b08c087c0
9 changed files with 126 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -10,6 +10,7 @@
- FEATURE: Search engine results can now be opened in a Web browser
- FEATURE: Added a search engine plugin to extratorrent.com
- FEATURE: Added a search engine plugin for kickasstorrents.com
- FEATURE: Added auto-suspend upon downloads completion feature
- COSMETIC: Same deletion confirmation dialog in the GUI and Web UI
- COSMETIC: Simplified the top toolbar
- COSMETIC: Display execution log as a tab instead of a modal window

44
src/mainwindow.cpp
View File

@ -124,6 +124,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
actionStart->setIcon(misc::getIcon("media-playback-start"));
actionStart_All->setIcon(misc::getIcon("media-playback-start"));
action_Import_Torrent->setIcon(misc::getIcon("document-import"));
menuAuto_Shutdown_on_downloads_completion->setIcon(misc::getIcon("application-exit"));
QMenu *startAllMenu = new QMenu(this);
startAllMenu->addAction(actionStart_All);
@ -220,8 +221,19 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
displaySearchTab(actionSearch_engine->isChecked());
displayRSSTab(actionRSS_Reader->isChecked());
on_actionExecution_Logs_triggered(actionExecution_Logs->isChecked());
actionShutdown_when_downloads_complete->setChecked(pref.shutdownWhenDownloadsComplete());
actionShutdown_qBittorrent_when_downloads_complete->setChecked(pref.shutdownqBTWhenDownloadsComplete());
// Auto shutdown actions
QActionGroup * autoShutdownGroup = new QActionGroup(this);
autoShutdownGroup->setExclusive(true);
autoShutdownGroup->addAction(actionAutoShutdown_Disabled);
autoShutdownGroup->addAction(actionAutoExit_qBittorrent);
autoShutdownGroup->addAction(actionAutoShutdown_system);
autoShutdownGroup->addAction(actionAutoSuspend_system);
actionAutoExit_qBittorrent->setChecked(pref.shutdownqBTWhenDownloadsComplete());
actionAutoShutdown_system->setChecked(pref.shutdownWhenDownloadsComplete());
actionAutoSuspend_system->setChecked(pref.suspendWhenDownloadsComplete());
if(!autoShutdownGroup->checkedAction())
actionAutoShutdown_Disabled->setChecked(true);
show();
@ -1179,16 +1191,6 @@ void MainWindow::on_actionTop_tool_bar_triggered() {
Preferences().setToolbarDisplayed(is_visible);
}
void MainWindow::on_actionShutdown_when_downloads_complete_triggered() {
bool is_checked = static_cast<QAction*>(sender())->isChecked();
Preferences().setShutdownWhenDownloadsComplete(is_checked);
}
void MainWindow::on_actionShutdown_qBittorrent_when_downloads_complete_triggered() {
bool is_checked = static_cast<QAction*>(sender())->isChecked();
Preferences().setShutdownqBTWhenDownloadsComplete(is_checked);
}
void MainWindow::on_actionSpeed_in_title_bar_triggered() {
displaySpeedInTitle = static_cast<QAction*>(sender())->isChecked();
Preferences().showSpeedInTitleBar(displaySpeedInTitle);
@ -1279,3 +1281,21 @@ void MainWindow::on_actionExecution_Logs_triggered(bool checked)
}
Preferences().setExecutionLogEnabled(checked);
}
void MainWindow::on_actionAutoExit_qBittorrent_toggled(bool enabled)
{
qDebug() << Q_FUNC_INFO << enabled;
Preferences().setShutdownqBTWhenDownloadsComplete(enabled);
}
void MainWindow::on_actionAutoSuspend_system_toggled(bool enabled)
{
qDebug() << Q_FUNC_INFO << enabled;
Preferences().setSuspendWhenDownloadsComplete(enabled);
}
void MainWindow::on_actionAutoShutdown_system_toggled(bool enabled)
{
qDebug() << Q_FUNC_INFO << enabled;
Preferences().setShutdownWhenDownloadsComplete(enabled);
}

5
src/mainwindow.h
View File

@ -187,11 +187,12 @@ private slots:
void on_actionRSS_Reader_triggered();
void on_actionSpeed_in_title_bar_triggered();
void on_actionTop_tool_bar_triggered();
void on_actionShutdown_when_downloads_complete_triggered();
void on_actionShutdown_qBittorrent_when_downloads_complete_triggered();
void on_action_Import_Torrent_triggered();
void on_actionDonate_money_triggered();
void on_actionExecution_Logs_triggered(bool checked);
void on_actionAutoExit_qBittorrent_toggled(bool );
void on_actionAutoSuspend_system_toggled(bool );
void on_actionAutoShutdown_system_toggled(bool );
};
#endif

63
src/mainwindow.ui
View File

@ -59,12 +59,20 @@
<property name="title">
<string>&amp;Tools</string>
</property>
<widget class="QMenu" name="menuAuto_Shutdown_on_downloads_completion">
<property name="title">
<string>Auto-Shutdown on downloads completion</string>
</property>
<addaction name="actionAutoShutdown_Disabled"/>
<addaction name="actionAutoExit_qBittorrent"/>
<addaction name="actionAutoSuspend_system"/>
<addaction name="actionAutoShutdown_system"/>
</widget>
<addaction name="actionCreate_torrent"/>
<addaction name="separator"/>
<addaction name="actionOptions"/>
<addaction name="separator"/>
<addaction name="actionShutdown_when_downloads_complete"/>
<addaction name="actionShutdown_qBittorrent_when_downloads_complete"/>
<addaction name="menuAuto_Shutdown_on_downloads_completion"/>
</widget>
<widget class="QMenu" name="menu_File">
<property name="title">
@ -287,17 +295,6 @@
<string>Search &amp;engine</string>
</property>
</action>
<action name="actionShutdown_when_downloads_complete">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Shutdown computer when downloads complete</string>
</property>
<property name="toolTip">
<string>Shutdown computer when downloads complete</string>
</property>
</action>
<action name="actionLock_qBittorrent">
<property name="text">
<string>Lock qBittorrent</string>
@ -309,14 +306,6 @@
<string>Ctrl+L</string>
</property>
</action>
<action name="actionShutdown_qBittorrent_when_downloads_complete">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Shutdown qBittorrent when downloads complete</string>
</property>
</action>
<action name="action_Import_Torrent">
<property name="text">
<string>Import existing torrent...</string>
@ -354,6 +343,38 @@
<string>Execution Log</string>
</property>
</action>
<action name="actionAutoExit_qBittorrent">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Exit qBittorrent</string>
</property>
</action>
<action name="actionAutoSuspend_system">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Suspend system</string>
</property>
</action>
<action name="actionAutoShutdown_system">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Shutdown system</string>
</property>
</action>
<action name="actionAutoShutdown_Disabled">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Disabled</string>
</property>
</action>
</widget>
<resources>
<include location="icons.qrc"/>

33
src/misc.cpp
View File

@ -46,6 +46,7 @@
#ifdef Q_WS_WIN
#include <shlobj.h>
#include <windows.h>
#include <PowrProf.h>
const int UNLEN = 256;
#else
#include <unistd.h>
@ -194,15 +195,34 @@ long long misc::freeDiskSpaceOnPath(QString path) {
#endif
}
void misc::shutdownComputer() {
void suspendComputer() {
#ifdef Q_WS_X11
// Use dbus to power off the system
// dbus-send --print-reply --system --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown
QDBusInterface computer("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", QDBusConnection::systemBus());
computer.call("Shutdown");
computer.call("Suspend", 5);
#endif
#ifdef Q_WS_MAC
AEEventID EventToSend = kAEShutDown;
#endif
}
void misc::shutdownComputer(bool sleep) {
#ifdef Q_WS_X11
// Use dbus to power off the system
// dbus-send --print-reply --system --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown
QDBusInterface computer("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", QDBusConnection::systemBus());
if(sleep)
computer.call("Suspend", 5);
else
computer.call("Shutdown");
#endif
#ifdef Q_WS_MAC
AEEventID EventToSend;
if(sleep)
EventToSend = kAESleep;
else
EventToSend = kAEShutDown;
AEAddressDesc targetDesc;
static const ProcessSerialNumber kPSNOfSystemProcess = { 0, kSystemProcess };
AppleEvent eventReply = {typeNull, NULL};
@ -259,8 +279,11 @@ void misc::shutdownComputer() {
if (GetLastError() != ERROR_SUCCESS)
return;
bool ret = InitiateSystemShutdownA(0, tr("qBittorrent will shutdown the computer now because all downloads are complete.").toLocal8Bit().data(), 10, true, false);
qDebug("ret: %d", (int)ret);
bool ret;
if(sleep)
SetSuspendState(false, false, false);
else
InitiateSystemShutdownA(0, tr("qBittorrent will shutdown the computer now because all downloads are complete.").toLocal8Bit().data(), 10, true, false);
// Disable shutdown privilege.
tkp.Privileges[0].Attributes = 0;

2
src/misc.h
View File

@ -137,7 +137,7 @@ public:
return extension;
}
static void shutdownComputer();
static void shutdownComputer(bool sleep=false);
static bool safeRemove(QString file_path) {
QFile MyFile(file_path);

8
src/preferences/preferences.h
View File

@ -739,6 +739,14 @@ public:
setValue(QString::fromUtf8("Preferences/Downloads/AutoShutDownOnCompletion"), shutdown);
}
bool suspendWhenDownloadsComplete() const {
return value(QString::fromUtf8("Preferences/Downloads/AutoSuspendOnCompletion"), false).toBool();
}
void setSuspendWhenDownloadsComplete(bool suspend) {
setValue(QString::fromUtf8("Preferences/Downloads/AutoSuspendOnCompletion"), suspend);
}
bool shutdownqBTWhenDownloadsComplete() const {
return value(QString::fromUtf8("Preferences/Downloads/AutoShutDownqBTOnCompletion"), false).toBool();
}

15
src/qtlibtorrent/qbtsession.cpp
View File

@ -1950,8 +1950,10 @@ void QBtSession::readAlerts() {
qDebug("Emitting finishedTorrent() signal");
emit finishedTorrent(h);
qDebug("Received finished alert for %s", qPrintable(h.name()));
bool will_shutdown = (pref.shutdownWhenDownloadsComplete() || pref.shutdownqBTWhenDownloadsComplete())
&& !hasDownloadingTorrents();
bool will_shutdown = (pref.shutdownWhenDownloadsComplete() ||
pref.shutdownqBTWhenDownloadsComplete() ||
pref.suspendWhenDownloadsComplete())
&& !hasDownloadingTorrents();
// AutoRun program
if(pref.isAutoRunEnabled())
autoRunExternalProgram(h, will_shutdown);
@ -1960,10 +1962,13 @@ void QBtSession::readAlerts() {
sendNotificationEmail(h);
// Auto-Shutdown
if(will_shutdown) {
if(pref.shutdownWhenDownloadsComplete()) {
bool suspend = pref.suspendWhenDownloadsComplete();
bool shutdown = pref.shutdownWhenDownloadsComplete();
if(suspend || shutdown) {
qDebug("Preparing for auto-shutdown because all downloads are complete!");
// Disabling it for next time
pref.setShutdownWhenDownloadsComplete(false);
pref.setSuspendWhenDownloadsComplete(false);
#if LIBTORRENT_VERSION_MINOR < 15
saveDHTEntry();
#endif
@ -1971,8 +1976,8 @@ void QBtSession::readAlerts() {
saveSessionState();
qDebug("Saving fast resume data");
saveFastResumeData();
qDebug("Sending computer shutdown signal");
misc::shutdownComputer();
qDebug("Sending computer shutdown/suspend signal");
misc::shutdownComputer(suspend);
}
qDebug("Exiting the application");
qApp->exit();

1
winconf.pri
View File

@ -49,6 +49,7 @@ debug {
LIBS += advapi32.lib shell32.lib
LIBS += libeay32MD.lib ssleay32MD.lib
LIBS += PowrProf.lib
DEFINES += WITH_GEOIP_EMBEDDED
message("On Windows, GeoIP database must be embedded.")