mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-22 17:26:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)

Browse source 
Remove visual style settings
This commit is contained in:
Christophe Dumez 2011-02-06 14:27:34 +00:00
parent b45171ba43
commit 0f1473e212
16 changed files with 573 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -2,6 +2,7 @@
- FEATURE: Added auto-shutdown confirmation dialog - FEATURE: Added auto-shutdown confirmation dialog
- FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen) - FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
- FEATURE: IP address reported to trackers is now customizable - FEATURE: IP address reported to trackers is now customizable
- FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
- FEATURE: Use system icons (Linux, Qt >= 4.6) - FEATURE: Use system icons (Linux, Qt >= 4.6)

127
src/lang/qbittorrent_ru.ts
View file

@ -168,13 +168,9 @@ p, li { white-space: pre-wrap; }
<source>Use system icon theme</source> <source>Use system icon theme</source>
<translation>Использовать системные иконки</translation> <translation>Использовать системные иконки</translation>
</message> </message>
<message>
<source>Confirm torrent deletion</source>
<translation>Подтверждать удаление торрента</translation>
</message>
<message> <message>
<source>IP Address to report to trackers (requires restart)</source> <source>IP Address to report to trackers (requires restart)</source>
<translation type="unfinished"></translation> <translation>IP адрес для сообщения трекерам (требуется перезапуск)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -593,95 +589,95 @@ You should get this information from your Web browser preferences.</source>
<name>DownloadThread</name> <name>DownloadThread</name>
<message> <message>
<source>I/O Error</source> <source>I/O Error</source>
<translation>Ошибка ввода/вывода</translation> <translation type="obsolete">Ошибка ввода/вывода</translation>
</message> </message>
<message> <message>
<source>The remote host name was not found (invalid hostname)</source> <source>The remote host name was not found (invalid hostname)</source>
<translation>Удаленный хост не был найден (неправильное имя хоста)</translation> <translation type="obsolete">Удаленный хост не был найден (неправильное имя хоста)</translation>
</message> </message>
<message> <message>
<source>The operation was canceled</source> <source>The operation was canceled</source>
<translation>Операция была отменена</translation> <translation type="obsolete">Операция была отменена</translation>
</message> </message>
<message> <message>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed</source> <source>The remote server closed the connection prematurely, before the entire reply was received and processed</source>
<translation>Удаленный сервер закрыл соединение, прежде чем весь ответ был принят и обработан</translation> <translation type="obsolete">Удаленный сервер закрыл соединение, прежде чем весь ответ был принят и обработан</translation>
</message> </message>
<message> <message>
<source>The connection to the remote server timed out</source> <source>The connection to the remote server timed out</source>
<translation>Время соединения с удаленным сервером вышло</translation> <translation type="obsolete">Время соединения с удаленным сервером вышло</translation>
</message> </message>
<message> <message>
<source>SSL/TLS handshake failed</source> <source>SSL/TLS handshake failed</source>
<translation>Соединение SSL/TLS не удалось</translation> <translation type="obsolete">Соединение SSL/TLS не удалось</translation>
</message> </message>
<message> <message>
<source>The remote server refused the connection</source> <source>The remote server refused the connection</source>
<translation>Удаленный сервер отклонил соединение</translation> <translation type="obsolete">Удаленный сервер отклонил соединение</translation>
</message> </message>
<message> <message>
<source>The connection to the proxy server was refused</source> <source>The connection to the proxy server was refused</source>
<translation>Прокси-сервер отклонил соединение</translation> <translation type="obsolete">Прокси-сервер отклонил соединение</translation>
</message> </message>
<message> <message>
<source>The proxy server closed the connection prematurely</source> <source>The proxy server closed the connection prematurely</source>
<translation>Прокси-сервер преждевременно закрыл соединение</translation> <translation type="obsolete">Прокси-сервер преждевременно закрыл соединение</translation>
</message> </message>
<message> <message>
<source>The proxy host name was not found</source> <source>The proxy host name was not found</source>
<translation>Имя прокси-сервера не было найдено</translation> <translation type="obsolete">Имя прокси-сервера не было найдено</translation>
</message> </message>
<message> <message>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent</source> <source>The connection to the proxy timed out or the proxy did not reply in time to the request sent</source>
<translation>Подключение к прокси-серверу истекло или прокси-сервер не ответил на запрос</translation> <translation type="obsolete">Подключение к прокси-серверу истекло или прокси-сервер не ответил на запрос</translation>
</message> </message>
<message> <message>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered</source> <source>The proxy requires authentication in order to honour the request but did not accept any credentials offered</source>
<translation>Прокси-сервер требует аутентификации, но не принял указанные учетные данные</translation> <translation type="obsolete">Прокси-сервер требует аутентификации, но не принял указанные учетные данные</translation>
</message> </message>
<message> <message>
<source>The access to the remote content was denied (401)</source> <source>The access to the remote content was denied (401)</source>
<translation>В доступе к данным было отказано (401)</translation> <translation type="obsolete">В доступе к данным было отказано (401)</translation>
</message> </message>
<message> <message>
<source>The operation requested on the remote content is not permitted</source> <source>The operation requested on the remote content is not permitted</source>
<translation>В данной операции над данными отказано</translation> <translation type="obsolete">В данной операции над данными отказано</translation>
</message> </message>
<message> <message>
<source>The remote content was not found at the server (404)</source> <source>The remote content was not found at the server (404)</source>
<translation>Данные не были найдены на сервере (404)</translation> <translation type="obsolete">Данные не были найдены на сервере (404)</translation>
</message> </message>
<message> <message>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted</source> <source>The remote server requires authentication to serve the content but the credentials provided were not accepted</source>
<translation>Удаленный сервер требует аутентификацию для отдачи данных, но указанные учетные данные не были приняты</translation> <translation type="obsolete">Удаленный сервер требует аутентификацию для отдачи данных, но указанные учетные данные не были приняты</translation>
</message> </message>
<message> <message>
<source>The Network Access API cannot honor the request because the protocol is not known</source> <source>The Network Access API cannot honor the request because the protocol is not known</source>
<translation>API сетевого доступа не может выполнить запрос, потому что протокол не известен</translation> <translation type="obsolete">API сетевого доступа не может выполнить запрос, потому что протокол не известен</translation>
</message> </message>
<message> <message>
<source>The requested operation is invalid for this protocol</source> <source>The requested operation is invalid for this protocol</source>
<translation>Запрошенная операция не поддерживается данным протоколом</translation> <translation type="obsolete">Запрошенная операция не поддерживается данным протоколом</translation>
</message> </message>
<message> <message>
<source>An unknown network-related error was detected</source> <source>An unknown network-related error was detected</source>
<translation>Неизвестная сетевая ошибка</translation> <translation type="obsolete">Неизвестная сетевая ошибка</translation>
</message> </message>
<message> <message>
<source>An unknown proxy-related error was detected</source> <source>An unknown proxy-related error was detected</source>
<translation>Неизвестная ошибка прокси-сервера</translation> <translation type="obsolete">Неизвестная ошибка прокси-сервера</translation>
</message> </message>
<message> <message>
<source>An unknown error related to the remote content was detected</source> <source>An unknown error related to the remote content was detected</source>
<translation>Неизвестная ошибка данных</translation> <translation type="obsolete">Неизвестная ошибка данных</translation>
</message> </message>
<message> <message>
<source>A breakdown in protocol was detected</source> <source>A breakdown in protocol was detected</source>
<translation>Ошибка в протоколе</translation> <translation type="obsolete">Ошибка в протоколе</translation>
</message> </message>
<message> <message>
<source>Unknown error</source> <source>Unknown error</source>
<translation>Неизвестная ошибка</translation> <translation type="obsolete">Неизвестная ошибка</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2615,6 +2611,10 @@ Would you like to update qBittorrent to version %1?</source>
<source>Reload the filter</source> <source>Reload the filter</source>
<translation>Перезагрузить фильтр</translation> <translation>Перезагрузить фильтр</translation>
</message> </message>
<message>
<source>Prevent system from suspend</source>
<translation>Предотвращать переход в спящий режим</translation>
</message>
</context> </context>
<context> <context>
<name>PreviewSelect</name> <name>PreviewSelect</name>
@ -3190,19 +3190,7 @@ Would you like to update qBittorrent to version %1?</source>
</message> </message>
<message> <message>
<source>Reporting IP address %1 to trackers...</source> <source>Reporting IP address %1 to trackers...</source>
<translation type="unfinished"></translation> <translation>Сообщаю IP адрес %1 трекерам...</translation>
</message>
<message>
<source>The computer will now go to sleep mode unless you cancel within the next 15 seconds...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The computer will now be switched off unless you cancel within the next 15 seconds...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>qBittorrent will now exit unless you cancel within the next 15 seconds...</source>
<translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -3643,13 +3631,6 @@ Do you want to install it now?</source>
<translation>Поисковый движок</translation> <translation>Поисковый движок</translation>
</message> </message>
</context> </context>
<context>
<name>ShutdownConfirmDlg</name>
<message>
<source>Shutdown confirmation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>SpeedLimitDialog</name> <name>SpeedLimitDialog</name>
<message> <message>
@ -4808,95 +4789,95 @@ Do you want to install it now?</source>
<name>downloadThread</name> <name>downloadThread</name>
<message> <message>
<source>I/O Error</source> <source>I/O Error</source>
<translation type="obsolete">Ошибка ввода/вывода</translation> <translation>Ошибка ввода/вывода</translation>
</message> </message>
<message> <message>
<source>The remote host name was not found (invalid hostname)</source> <source>The remote host name was not found (invalid hostname)</source>
<translation type="obsolete">Удаленный хост не был найден (неправильное имя хоста)</translation> <translation>Имя удалённого хоста не было найдено (неправильное имя хоста)</translation>
</message> </message>
<message> <message>
<source>The operation was canceled</source> <source>The operation was canceled</source>
<translation type="obsolete">Операция была отменена</translation> <translation>Операция была отменена</translation>
</message> </message>
<message> <message>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed</source> <source>The remote server closed the connection prematurely, before the entire reply was received and processed</source>
<translation type="obsolete">Удаленный сервер закрыл соединение навсегда, прежде чем весь ответ был принят и обработан</translation> <translation>Удаленный сервер преждевременно закрыл соединение, прежде чем весь ответ был принят и обработан</translation>
</message> </message>
<message> <message>
<source>The connection to the remote server timed out</source> <source>The connection to the remote server timed out</source>
<translation type="obsolete">Время соединения с удаленным сервером вышло</translation> <translation>Время соединения с удаленным сервером вышло</translation>
</message> </message>
<message> <message>
<source>SSL/TLS handshake failed</source> <source>SSL/TLS handshake failed</source>
<translation type="obsolete">Соединение SSL/TLS не удалось</translation> <translation>Соединение SSL/TLS не удалось</translation>
</message> </message>
<message> <message>
<source>The remote server refused the connection</source> <source>The remote server refused the connection</source>
<translation type="obsolete">Удаленный сервер отклонил соединение</translation> <translation>Удаленный сервер отклонил соединение</translation>
</message> </message>
<message> <message>
<source>The connection to the proxy server was refused</source> <source>The connection to the proxy server was refused</source>
<translation type="obsolete">Прокси-сервер отклонил соединение</translation> <translation>Соединение с прокси-сервером отклонено</translation>
</message> </message>
<message> <message>
<source>The proxy server closed the connection prematurely</source> <source>The proxy server closed the connection prematurely</source>
<translation type="obsolete">Прокси-сервер закрыл соединение навсегда</translation> <translation>Прокси-сервер преждевременно закрыл соединение</translation>
</message> </message>
<message> <message>
<source>The proxy host name was not found</source> <source>The proxy host name was not found</source>
<translation type="obsolete">Имя прокси-сервера не найдено</translation> <translation>Имя прокси-сервера не было найдено</translation>
</message> </message>
<message> <message>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent</source> <source>The connection to the proxy timed out or the proxy did not reply in time to the request sent</source>
<translation type="obsolete">Подключение к прокси-серверу истекло или прокси-сервер не ответил на запрос</translation> <translation>Подключение к прокси-серверу истекло или прокси-сервер не ответил на запрос</translation>
</message> </message>
<message> <message>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered</source> <source>The proxy requires authentication in order to honour the request but did not accept any credentials offered</source>
<translation type="obsolete">Прокси-сервер требует аутентификации но не принял указанные учетные данные</translation> <translation>Прокси-сервер требует аутентификации, но не принял указанные учетные данные</translation>
</message> </message>
<message> <message>
<source>The access to the remote content was denied (401)</source> <source>The access to the remote content was denied (401)</source>
<translation type="obsolete">В доступе к данным было отказано (401)</translation> <translation>В доступе к данным было отказано (401)</translation>
</message> </message>
<message> <message>
<source>The operation requested on the remote content is not permitted</source> <source>The operation requested on the remote content is not permitted</source>
<translation type="obsolete">В данной операции над данными отказано</translation> <translation>Запрошенная операция над данными запрещена</translation>
</message> </message>
<message> <message>
<source>The remote content was not found at the server (404)</source> <source>The remote content was not found at the server (404)</source>
<translation type="obsolete">Данные не были найдены на сервере (404)</translation> <translation>Данные не были найдены на сервере (404)</translation>
</message> </message>
<message> <message>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted</source> <source>The remote server requires authentication to serve the content but the credentials provided were not accepted</source>
<translation type="obsolete">Удаленный сервер требует аутентификацию для отдачи данных, но указанные учетные данные не были приняты</translation> <translation>Удаленный сервер требует аутентификацию для отдачи данных, но указанные учетные данные не были приняты</translation>
</message> </message>
<message> <message>
<source>The Network Access API cannot honor the request because the protocol is not known</source> <source>The Network Access API cannot honor the request because the protocol is not known</source>
<translation type="obsolete">API сетевого доступа не может выполнить запрос потому что протокол не известен</translation> <translation>API сетевого доступа не может выполнить запрос, потому что протокол не известен</translation>
</message> </message>
<message> <message>
<source>The requested operation is invalid for this protocol</source> <source>The requested operation is invalid for this protocol</source>
<translation type="obsolete">Запрошенная операция не поддерживается данным протоколом</translation> <translation>Запрошенная операция не поддерживается данным протоколом</translation>
</message> </message>
<message> <message>
<source>An unknown network-related error was detected</source> <source>An unknown network-related error was detected</source>
<translation type="obsolete">Неизвестная сетевая ошибка</translation> <translation>Неизвестная сетевая ошибка</translation>
</message> </message>
<message> <message>
<source>An unknown proxy-related error was detected</source> <source>An unknown proxy-related error was detected</source>
<translation type="obsolete">Неизвестная ошибка прокси-сервера</translation> <translation>Неизвестная ошибка прокси-сервера</translation>
</message> </message>
<message> <message>
<source>An unknown error related to the remote content was detected</source> <source>An unknown error related to the remote content was detected</source>
<translation type="obsolete">Неизвестная ошибка данных</translation> <translation>Неизвестная ошибка данных</translation>
</message> </message>
<message> <message>
<source>A breakdown in protocol was detected</source> <source>A breakdown in protocol was detected</source>
<translation type="obsolete">Ошибка в протоколе</translation> <translation>Ошибка в протоколе</translation>
</message> </message>
<message> <message>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="obsolete">Неизвестная ошибка</translation> <translation>Неизвестная ошибка</translation>
</message> </message>
</context> </context>
<context> <context>
@ -5160,7 +5141,7 @@ However, those plugins were disabled.</source>
</message> </message>
<message> <message>
<source>Succesfully refreshed</source> <source>Succesfully refreshed</source>
<translation type="obsolete">Успешно обновлен</translation> <translation>Успешно обновлен</translation>
</message> </message>
<message> <message>
<source>Successfuly parsed the provided IP filter: %1 rules were applied.</source> <source>Successfuly parsed the provided IP filter: %1 rules were applied.</source>
@ -5169,7 +5150,7 @@ However, those plugins were disabled.</source>
</message> </message>
<message> <message>
<source>Successfully refreshed</source> <source>Successfully refreshed</source>
<translation>Успешно обновлён</translation> <translation type="obsolete">Успешно обновлён</translation>
</message> </message>
</context> </context>
<context> <context>

10
src/main.cpp
View file

@ -153,15 +153,6 @@ void sigabrtHandler(int) {
} }
#endif #endif
#ifndef DISABLE_GUI
void useStyle(QString style){
if(!style.isEmpty()) {
QApplication::setStyle(QStyleFactory::create(style));
}
Preferences().setStyle(QApplication::style()->objectName());
}
#endif
// Main // Main
int main(int argc, char *argv[]){ int main(int argc, char *argv[]){
// Create Application // Create Application
@ -286,7 +277,6 @@ int main(int argc, char *argv[]){
} }
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
useStyle(pref.getStyle());
app.setStyleSheet("QStatusBar::item { border-width: 0; }"); app.setStyleSheet("QStatusBar::item { border-width: 0; }");
#endif #endif

31
src/mainwindow.cpp
View file

@ -43,6 +43,9 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QShortcut> #include <QShortcut>
#include <QScrollBar> #include <QScrollBar>
#ifdef Q_WS_X11
#include <QDBusInterface>
#endif
#include "mainwindow.h" #include "mainwindow.h"
#include "transferlistwidget.h" #include "transferlistwidget.h"
@ -80,10 +83,12 @@ void qt_mac_set_dock_menu(QMenu *menu);
#if defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
#include "programupdater.h" #include "programupdater.h"
#endif #endif
#include "powermanagement.h"
using namespace libtorrent; using namespace libtorrent;
#define TIME_TRAY_BALLOON 5000 #define TIME_TRAY_BALLOON 5000
#define PREVENT_SUSPEND_INTERVAL 60000
/***************************************************** /*****************************************************
* * * *
@ -192,6 +197,10 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
connect(actionIncreasePriority, SIGNAL(triggered()), transferList, SLOT(increasePrioSelectedTorrents())); connect(actionIncreasePriority, SIGNAL(triggered()), transferList, SLOT(increasePrioSelectedTorrents()));
connect(actionDecreasePriority, SIGNAL(triggered()), transferList, SLOT(decreasePrioSelectedTorrents())); connect(actionDecreasePriority, SIGNAL(triggered()), transferList, SLOT(decreasePrioSelectedTorrents()));
m_pwr = new PowerManagement(this);
preventTimer = new QTimer(this);
connect(preventTimer, SIGNAL(timeout()), SLOT(checkForActiveTorrents()));
// Configure BT session according to options // Configure BT session according to options
loadPreferences(false); loadPreferences(false);
@ -290,13 +299,13 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
updater->checkForUpdates(); updater->checkForUpdates();
} }
#endif #endif
} }
void MainWindow::deleteBTSession() { void MainWindow::deleteBTSession() {
guiUpdater->stop(); guiUpdater->stop();
status_bar->stopTimer(); status_bar->stopTimer();
QBtSession::drop(); QBtSession::drop();
m_pwr->setActivityState(false);
QTimer::singleShot(0, this, SLOT(close())); QTimer::singleShot(0, this, SLOT(close()));
} }
@ -985,6 +994,17 @@ void MainWindow::loadPreferences(bool configure_session) {
search_filter->clear(); search_filter->clear();
toolBar->setVisible(false); toolBar->setVisible(false);
} }
if(pref.preventFromSuspend())
{
preventTimer->start(PREVENT_SUSPEND_INTERVAL);
}
else
{
preventTimer->stop();
m_pwr->setActivityState(false);
}
const uint new_refreshInterval = pref.getRefreshInterval(); const uint new_refreshInterval = pref.getRefreshInterval();
transferList->setRefreshInterval(new_refreshInterval); transferList->setRefreshInterval(new_refreshInterval);
transferList->setAlternatingRowColors(pref.useAlternatingRowColors()); transferList->setAlternatingRowColors(pref.useAlternatingRowColors());
@ -1313,3 +1333,12 @@ void MainWindow::on_actionAutoShutdown_system_toggled(bool enabled)
qDebug() << Q_FUNC_INFO << enabled; qDebug() << Q_FUNC_INFO << enabled;
Preferences().setShutdownWhenDownloadsComplete(enabled); Preferences().setShutdownWhenDownloadsComplete(enabled);
} }
void MainWindow::checkForActiveTorrents()
{
const TorrentStatusReport report = transferList->getSourceModel()->getTorrentStatusReport();
if(report.nb_active > 0) // Active torrents are present; prevent system from suspend
m_pwr->setActivityState(true);
else
m_pwr->setActivityState(false);
}

6
src/mainwindow.h
View file

@ -60,6 +60,7 @@ class HidableTabWidget;
class LineEdit; class LineEdit;
class QFileSystemWatcher; class QFileSystemWatcher;
class ExecutionLog; class ExecutionLog;
class PowerManagement;
class MainWindow : public QMainWindow, private Ui::MainWindow{ class MainWindow : public QMainWindow, private Ui::MainWindow{
Q_OBJECT Q_OBJECT
@ -182,6 +183,9 @@ private:
QPointer<RSSImp> rssWidget; QPointer<RSSImp> rssWidget;
// Execution Log // Execution Log
QPointer<ExecutionLog> m_executionLog; QPointer<ExecutionLog> m_executionLog;
// Power Management
PowerManagement *m_pwr;
QTimer *preventTimer;
private slots: private slots:
void on_actionSearch_engine_triggered(); void on_actionSearch_engine_triggered();
@ -194,6 +198,8 @@ private slots:
void on_actionAutoExit_qBittorrent_toggled(bool ); void on_actionAutoExit_qBittorrent_toggled(bool );
void on_actionAutoSuspend_system_toggled(bool ); void on_actionAutoSuspend_system_toggled(bool );
void on_actionAutoShutdown_system_toggled(bool ); void on_actionAutoShutdown_system_toggled(bool );
// Check for active torrents and set preventing from suspend state
void checkForActiveTorrents();
}; };
#endif #endif

90
src/powermanagement/powermanagement.cpp Normal file
View file

@ -0,0 +1,90 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2011 Vladimir Golovnev <glassez@yandex.ru>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#include <QtGlobal>
#ifdef Q_WS_X11
#include "powermanagement_x11.h"
#endif
#include "powermanagement.h"
#ifdef Q_WS_MAC
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
#ifdef Q_WS_WIN
#include <Windows.h>
#endif
PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false)
{
#ifdef Q_WS_X11
m_inhibitor = new PowerManagementInhibitor(this);
#endif
}
PowerManagement::~PowerManagement()
{
}
void PowerManagement::setActivityState(bool busy)
{
if(busy) setBusy();
else setIdle();
}
void PowerManagement::setBusy()
{
if(m_busy) return;
m_busy = true;
#ifdef Q_WS_WIN
SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
#elif defined(Q_WS_X11)
m_inhibitor->RequestBusy();
#elif defined(Q_WS_MAC)
IOReturn success = IOPMAssertionCreate(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &m_assertionID);
if(success != kIOReturnSuccess) m_busy = false;
#endif
}
void PowerManagement::setIdle()
{
if(!m_busy) return;
m_busy = false;
#ifdef Q_WS_WIN
SetThreadExecutionState(ES_CONTINUOUS);
#elif defined(Q_WS_X11)
m_inhibitor->RequestIdle();
#elif defined(Q_WS_MAC)
IOPMAssertionRelease(m_assertionID);
#endif
}

70
src/powermanagement/powermanagement.h Normal file
View file

@ -0,0 +1,70 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2011 Vladimir Golovnev <glassez@yandex.ru>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#ifndef POWERMANAGEMENT_H
#define POWERMANAGEMENT_H
#include <QObject>
#ifdef Q_WS_MAC
// Require Mac OS X >= 10.5
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
#ifdef Q_WS_X11
// Require DBus
class PowerManagementInhibitor;
#endif
class PowerManagement : public QObject
{
Q_OBJECT
public:
PowerManagement(QObject *parent = 0);
virtual ~PowerManagement();
void setActivityState(bool busy);
private:
bool m_busy;
void setBusy();
void setIdle();
#ifdef Q_WS_X11
PowerManagementInhibitor *m_inhibitor;
#endif
#ifdef Q_WS_MAC
IOPMAssertionID m_assertionID;
#endif
};
#endif // POWERMANAGEMENT_H

9
src/powermanagement/powermanagement.pri Normal file
View file

@ -0,0 +1,9 @@
INCLUDEPATH += $$PWD
HEADERS += $$PWD/powermanagement.h
SOURCES += $$PWD/powermanagement.cpp
unix:!macx {
HEADERS += $$PWD/powermanagement_x11.h
SOURCES += $$PWD/powermanagement_x11.cpp
}

185
src/powermanagement/powermanagement_x11.cpp Normal file
View file

@ -0,0 +1,185 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2011 Vladimir Golovnev <glassez@yandex.ru>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingCall>
#include <QDBusPendingReply>
#include "powermanagement_x11.h"
PowerManagementInhibitor::PowerManagementInhibitor(QObject *parent) : QObject(parent)
{
if(!QDBusConnection::sessionBus().isConnected())
{
qDebug("D-Bus: Could not connect to session bus");
m_state = error;
}
else
{
m_state = idle;
}
m_intended_state = idle;
m_cookie = 0;
m_use_gsm = false;
}
PowerManagementInhibitor::~PowerManagementInhibitor()
{
}
void PowerManagementInhibitor::RequestIdle()
{
m_intended_state = idle;
if (m_state == error || m_state == idle || m_state == request_idle || m_state == request_busy)
return;
qDebug("D-Bus: PowerManagementInhibitor: Requesting idle");
QDBusMessage call;
if (!m_use_gsm)
call = QDBusMessage::createMethodCall(
"org.freedesktop.PowerManagement",
"/org/freedesktop/PowerManagement/Inhibit",
"org.freedesktop.PowerManagement.Inhibit",
"UnInhibit");
else
call = QDBusMessage::createMethodCall(
"org.gnome.SessionManager",
"/org/gnome/SessionManager",
"org.gnome.SessionManager",
"Uninhibit");
m_state = request_idle;
QList<QVariant> args;
args << m_cookie;
call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
this, SLOT(OnAsyncReply(QDBusPendingCallWatcher*)));
}
void PowerManagementInhibitor::RequestBusy()
{
m_intended_state = busy;
if (m_state == error || m_state == busy || m_state == request_busy || m_state == request_idle)
return;
qDebug("D-Bus: PowerManagementInhibitor: Requesting busy");
QDBusMessage call;
if (!m_use_gsm)
call = QDBusMessage::createMethodCall(
"org.freedesktop.PowerManagement",
"/org/freedesktop/PowerManagement/Inhibit",
"org.freedesktop.PowerManagement.Inhibit",
"Inhibit");
else
call = QDBusMessage::createMethodCall(
"org.gnome.SessionManager",
"/org/gnome/SessionManager",
"org.gnome.SessionManager",
"Inhibit");
m_state = request_busy;
QList<QVariant> args;
args << "qBittorrent";
if (m_use_gsm) args << (uint)0;
args << "Active torrents are presented";
if (m_use_gsm) args << (uint)8;
call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
this, SLOT(OnAsyncReply(QDBusPendingCallWatcher*)));
}
void PowerManagementInhibitor::OnAsyncReply(QDBusPendingCallWatcher *call)
{
if (m_state == request_idle)
{
QDBusPendingReply<> reply = *call;
if(reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qPrintable(reply.error().message()));
m_state = error;
}
else
{
m_state = idle;
qDebug("D-Bus: PowerManagementInhibitor: Request successful");
if (m_intended_state == busy) RequestBusy();
}
}
else if (m_state == request_busy)
{
QDBusPendingReply<uint> reply = *call;
if(reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qPrintable(reply.error().message()));
if (!m_use_gsm)
{
qDebug("D-Bus: Falling back to org.gnome.SessionManager");
m_use_gsm = true;
m_state = idle;
if (m_intended_state == busy)
RequestBusy();
}
else
{
m_state = error;
}
}
else
{
m_state = busy;
m_cookie = reply.value();
qDebug("D-Bus: PowerManagementInhibitor: Request successful, cookie is %d", m_cookie);
if (m_intended_state == idle) RequestIdle();
}
}
else
{
qDebug("D-Bus: Unexpected reply in state %d", m_state);
m_state = error;
}
call->deleteLater();
}

69
src/powermanagement/powermanagement_x11.h Normal file
View file

@ -0,0 +1,69 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2011 Vladimir Golovnev <glassez@yandex.ru>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#ifndef POWERMANAGEMENTINHIBITOR_H
#define POWERMANAGEMENTINHIBITOR_H
#include <QObject>
class QDBusPendingCallWatcher;
class PowerManagementInhibitor : public QObject
{
Q_OBJECT
public:
PowerManagementInhibitor(QObject *parent = 0);
virtual ~PowerManagementInhibitor();
void RequestIdle();
void RequestBusy();
private slots:
void OnAsyncReply(QDBusPendingCallWatcher *call);
private:
enum _state
{
error,
idle,
request_busy,
busy,
request_idle
};
enum _state m_state;
enum _state m_intended_state;
unsigned int m_cookie;
bool m_use_gsm;
};
#endif // POWERMANAGEMENTINHIBITOR_H

2
src/preferences/advancedsettings.h
View file

@ -241,7 +241,7 @@ protected slots:
connect(txt_network_address, SIGNAL(textChanged(QString)), this, SLOT(emitSettingsChanged())); connect(txt_network_address, SIGNAL(textChanged(QString)), this, SLOT(emitSettingsChanged()));
setCellWidget(NETWORK_ADDRESS, VALUE, txt_network_address); setCellWidget(NETWORK_ADDRESS, VALUE, txt_network_address);
// Program notifications // Program notifications
setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification balloons"))); setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program on-screen notifications")));
cb_program_notifications = new QCheckBox(); cb_program_notifications = new QCheckBox();
connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged())); connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
cb_program_notifications->setChecked(pref.useProgramNotification()); cb_program_notifications->setChecked(pref.useProgramNotification());

105
src/preferences/options.ui
View file

@ -40,16 +40,10 @@
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>30</width> <width>32</width>
<height>30</height> <height>32</height>
</size> </size>
</property> </property>
<property name="textElideMode">
<enum>Qt::ElideNone</enum>
</property>
<property name="movement">
<enum>QListView::Static</enum>
</property>
<property name="flow"> <property name="flow">
<enum>QListView::LeftToRight</enum> <enum>QListView::LeftToRight</enum>
</property> </property>
@ -59,24 +53,18 @@
<property name="resizeMode"> <property name="resizeMode">
<enum>QListView::Adjust</enum> <enum>QListView::Adjust</enum>
</property> </property>
<property name="layoutMode">
<enum>QListView::SinglePass</enum>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="gridSize"> <property name="gridSize">
<size> <size>
<width>107</width> <width>110</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="viewMode"> <property name="viewMode">
<enum>QListView::IconMode</enum> <enum>QListView::IconMode</enum>
</property> </property>
<property name="uniformItemSizes">
<bool>false</bool>
</property>
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -88,10 +76,10 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string extracomment="User Interface">UI</string> <string>Behavior</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>User Interface</string> <string>Behavior</string>
</property> </property>
<property name="textAlignment"> <property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set> <set>AlignHCenter|AlignVCenter|AlignCenter</set>
@ -126,6 +114,9 @@
<property name="text"> <property name="text">
<string>Speed</string> <string>Speed</string>
</property> </property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
@ -153,6 +144,9 @@
<property name="text"> <property name="text">
<string>Advanced</string> <string>Advanced</string>
</property> </property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item> </item>
</widget> </widget>
<widget class="QStackedWidget" name="tabOption"> <widget class="QStackedWidget" name="tabOption">
@ -176,16 +170,16 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>-45</y>
<width>506</width> <width>499</width>
<height>430</height> <height>459</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<item> <item>
<widget class="QGroupBox" name="UISettingsBox"> <widget class="QGroupBox" name="UISettingsBox">
<property name="title"> <property name="title">
<string>Visual Appearance</string> <string>Language</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<property name="bottomMargin"> <property name="bottomMargin">
@ -193,13 +187,6 @@
</property> </property>
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="lblI18n">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QComboBox" name="comboI18n"> <widget class="QComboBox" name="comboI18n">
<property name="minimumSize"> <property name="minimumSize">
@ -247,33 +234,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="lblStyle">
<property name="text">
<string>Visual style:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboStyle"/>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -450,6 +410,22 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Power Management</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
<item>
<widget class="QCheckBox" name="checkPreventFromSuspend">
<property name="text">
<string>Inhibit system sleep when torrents are active</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer_4"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
@ -481,7 +457,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>506</width> <width>440</width>
<height>698</height> <height>698</height>
</rect> </rect>
</property> </property>
@ -924,7 +900,7 @@ QGroupBox {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>506</width> <width>447</width>
<height>457</height> <height>457</height>
</rect> </rect>
</property> </property>
@ -1404,8 +1380,8 @@ QGroupBox {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>524</width> <width>404</width>
<height>414</height> <height>334</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_33"> <layout class="QVBoxLayout" name="verticalLayout_33">
@ -1793,7 +1769,7 @@ QGroupBox {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>581</width> <width>542</width>
<height>422</height> <height>422</height>
</rect> </rect>
</property> </property>
@ -2176,7 +2152,7 @@ QGroupBox {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>377</width> <width>378</width>
<height>229</height> <height>229</height>
</rect> </rect>
</property> </property>
@ -2339,8 +2315,8 @@ QGroupBox {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>80</width>
<height>28</height> <height>18</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_36"/> <layout class="QVBoxLayout" name="verticalLayout_36"/>
@ -2387,7 +2363,6 @@ QGroupBox {
<tabstops> <tabstops>
<tabstop>tabOption</tabstop> <tabstop>tabOption</tabstop>
<tabstop>comboI18n</tabstop> <tabstop>comboI18n</tabstop>
<tabstop>comboStyle</tabstop>
<tabstop>checkCloseToSystray</tabstop> <tabstop>checkCloseToSystray</tabstop>
<tabstop>checkMinimizeToSysTray</tabstop> <tabstop>checkMinimizeToSysTray</tabstop>
<tabstop>textSavePath</tabstop> <tabstop>textSavePath</tabstop>

28
src/preferences/options_imp.cpp
View file

@ -36,7 +36,6 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QCloseEvent> #include <QCloseEvent>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QStyleFactory>
#include <QTranslator> #include <QTranslator>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
@ -88,7 +87,6 @@ options_imp::options_imp(QWidget *parent):
connect(scanFoldersView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(handleScanFolderViewSelectionChanged())); connect(scanFoldersView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(handleScanFolderViewSelectionChanged()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(applySettings(QAbstractButton*))); connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(applySettings(QAbstractButton*)));
comboStyle->addItems(QStyleFactory::keys());
// Languages supported // Languages supported
initializeLanguageCombo(); initializeLanguageCombo();
@ -126,13 +124,13 @@ options_imp::options_imp(QWidget *parent):
// Apply button is activated when a value is changed // Apply button is activated when a value is changed
// General tab // General tab
connect(comboI18n, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton())); connect(comboI18n, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
connect(comboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
connect(checkAltRowColors, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkAltRowColors, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkShowSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkShowSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkCloseToSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkCloseToSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkMinimizeToSysTray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkMinimizeToSysTray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkStartMinimized, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkStartMinimized, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkShowSplash, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton())); connect(checkShowSplash, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkPreventFromSuspend, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
// Downloads tab // Downloads tab
connect(textSavePath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton())); connect(textSavePath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
connect(textTempPath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton())); connect(textTempPath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
@ -251,10 +249,6 @@ void options_imp::changePage(QListWidgetItem *current, QListWidgetItem *previous
tabOption->setCurrentIndex(tabSelection->row(current)); tabOption->setCurrentIndex(tabSelection->row(current));
} }
void options_imp::useStyle() {
QApplication::setStyle(QStyleFactory::create(comboStyle->itemText(comboStyle->currentIndex())));
}
void options_imp::loadWindowState() { void options_imp::loadWindowState() {
QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
resize(settings.value(QString::fromUtf8("Preferences/State/size"), sizeFittingScreen()).toSize()); resize(settings.value(QString::fromUtf8("Preferences/State/size"), sizeFittingScreen()).toSize());
@ -308,8 +302,6 @@ QSize options_imp::sizeFittingScreen() {
void options_imp::saveOptions(){ void options_imp::saveOptions(){
applyButton->setEnabled(false); applyButton->setEnabled(false);
Preferences pref; Preferences pref;
// Apply style
useStyle();
// Load the translation // Load the translation
QString locale = getLocale(); QString locale = getLocale();
if(pref.getLocale() != locale) { if(pref.getLocale() != locale) {
@ -324,13 +316,13 @@ void options_imp::saveOptions(){
// General preferences // General preferences
pref.setLocale(locale); pref.setLocale(locale);
pref.setStyle(getStyle());
pref.setAlternatingRowColors(checkAltRowColors->isChecked()); pref.setAlternatingRowColors(checkAltRowColors->isChecked());
pref.setSystrayIntegration(systrayIntegration()); pref.setSystrayIntegration(systrayIntegration());
pref.setCloseToTray(closeToTray()); pref.setCloseToTray(closeToTray());
pref.setMinimizeToTray(minimizeToTray()); pref.setMinimizeToTray(minimizeToTray());
pref.setStartMinimized(startMinimized()); pref.setStartMinimized(startMinimized());
pref.setSplashScreenDisabled(isSlashScreenDisabled()); pref.setSplashScreenDisabled(isSlashScreenDisabled());
pref.setPreventFromSuspend(preventFromSuspend());
// End General preferences // End General preferences
// Downloads preferences // Downloads preferences
@ -455,16 +447,6 @@ int options_imp::getProxyType() const{
} }
} }
QString options_imp::getStyle() const{
return comboStyle->itemText(comboStyle->currentIndex());
}
void options_imp::setStyle(QString style) {
int index = comboStyle->findText(style, Qt::MatchFixedString);
if(index > 0)
comboStyle->setCurrentIndex(index);
}
void options_imp::loadOptions(){ void options_imp::loadOptions(){
int intValue; int intValue;
qreal floatValue; qreal floatValue;
@ -472,7 +454,6 @@ void options_imp::loadOptions(){
// General preferences // General preferences
const Preferences pref; const Preferences pref;
setLocale(pref.getLocale()); setLocale(pref.getLocale());
setStyle(pref.getStyle());
checkAltRowColors->setChecked(pref.useAlternatingRowColors()); checkAltRowColors->setChecked(pref.useAlternatingRowColors());
checkShowSystray->setChecked(pref.systrayIntegration()); checkShowSystray->setChecked(pref.systrayIntegration());
checkShowSplash->setChecked(!pref.isSlashScreenDisabled()); checkShowSplash->setChecked(!pref.isSlashScreenDisabled());
@ -484,6 +465,7 @@ void options_imp::loadOptions(){
checkMinimizeToSysTray->setChecked(pref.minimizeToTray()); checkMinimizeToSysTray->setChecked(pref.minimizeToTray());
checkStartMinimized->setChecked(pref.startMinimized()); checkStartMinimized->setChecked(pref.startMinimized());
} }
checkPreventFromSuspend->setChecked(pref.preventFromSuspend());
// End General preferences // End General preferences
// Downloads preferences // Downloads preferences
QString save_path = pref.getSavePath(); QString save_path = pref.getSavePath();
@ -928,6 +910,10 @@ bool options_imp::isSlashScreenDisabled() const {
return !checkShowSplash->isChecked(); return !checkShowSplash->isChecked();
} }
bool options_imp::preventFromSuspend() const {
return checkPreventFromSuspend->isChecked();
}
bool options_imp::preAllocateAllFiles() const { bool options_imp::preAllocateAllFiles() const {
return checkPreallocateAll->isChecked(); return checkPreallocateAll->isChecked();
} }

4
src/preferences/options_imp.h
View file

@ -60,7 +60,6 @@ protected slots:
void enableMaxConnecsLimitPerTorrent(bool checked); void enableMaxConnecsLimitPerTorrent(bool checked);
void enableMaxUploadsLimitPerTorrent(bool checked); void enableMaxUploadsLimitPerTorrent(bool checked);
void enableMaxRatio(bool checked); void enableMaxRatio(bool checked);
void setStyle(QString style);
void on_buttonBox_accepted(); void on_buttonBox_accepted();
void closeEvent(QCloseEvent *e); void closeEvent(QCloseEvent *e);
void on_buttonBox_rejected(); void on_buttonBox_rejected();
@ -85,7 +84,6 @@ protected slots:
public slots: public slots:
void setLocale(QString locale); void setLocale(QString locale);
void useStyle();
void showConnectionTab(); void showConnectionTab();
signals: signals:
@ -100,12 +98,12 @@ private:
static QString languageToLocalizedString(QLocale::Language language, const QString& country); static QString languageToLocalizedString(QLocale::Language language, const QString& country);
// General options // General options
QString getLocale() const; QString getLocale() const;
QString getStyle() const;
bool systrayIntegration() const; bool systrayIntegration() const;
bool minimizeToTray() const; bool minimizeToTray() const;
bool closeToTray() const; bool closeToTray() const;
bool startMinimized() const; bool startMinimized() const;
bool isSlashScreenDisabled() const; bool isSlashScreenDisabled() const;
bool preventFromSuspend() const;
// Downloads // Downloads
QString getSavePath() const; QString getSavePath() const;
bool isTempPathEnabled() const; bool isTempPathEnabled() const;

17
src/preferences/preferences.h
View file

@ -77,14 +77,6 @@ public:
setValue(QString::fromUtf8("Preferences/General/Locale"), locale); setValue(QString::fromUtf8("Preferences/General/Locale"), locale);
} }
QString getStyle() const {
return value(QString::fromUtf8("Preferences/General/Style"), "").toString();
}
void setStyle(const QString &style) {
setValue(QString::fromUtf8("Preferences/General/Style"), style);
}
bool useProgramNotification() const { bool useProgramNotification() const {
return value(QString::fromUtf8("Preferences/General/ProgramNotification"), true).toBool(); return value(QString::fromUtf8("Preferences/General/ProgramNotification"), true).toBool();
} }
@ -173,6 +165,15 @@ public:
setValue("Preferences/General/NoSplashScreen", b); setValue("Preferences/General/NoSplashScreen", b);
} }
// Preventing from system suspend while active torrents are presented.
bool preventFromSuspend() const {
return value(QString::fromUtf8("Preferences/General/PreventFromSuspend"), false).toBool();
}
void setPreventFromSuspend(bool b) {
setValue("Preferences/General/PreventFromSuspend", b);
}
// Downloads // Downloads
QString getSavePath() const { QString getSavePath() const {
#ifdef Q_WS_WIN #ifdef Q_WS_WIN

1
src/src.pro
View file

@ -87,6 +87,7 @@ include (preferences/preferences.pri)
include(rss/rss.pri) include(rss/rss.pri)
include(torrentcreator/torrentcreator.pri) include(torrentcreator/torrentcreator.pri)
include(geoip/geoip.pri) include(geoip/geoip.pri)
include(powermanagement/powermanagement.pri)
} }
HEADERS += misc.h \ HEADERS += misc.h \