d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-09 06:17:58 +00:00
Code Issues Projects Releases Wiki Activity

Simplifying program options

Browse Source
This commit is contained in:
Christophe Dumez 2010-06-21 18:32:01 +00:00
parent 22b3d8d594
commit 8b5886cc6e
8 changed files with 245 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/GUI.cpp
View File

@ -82,13 +82,7 @@ using namespace libtorrent;
GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false) {
setupUi(this);
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))
#if defined(Q_WS_WIN)
+" [Windows]"
#elif defined(Q_WS_MAC)
+" [Mac OS X]"
#endif
);
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
// Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
@ -187,6 +181,10 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
setUnifiedTitleAndToolBarOnMac(true);
#endif
// View settings
actionTop_tool_bar->setChecked(Preferences::isToolbarDisplayed());
actionSpeed_in_title_bar->setChecked(Preferences::speedInTitleBar());
show();
// Load Window state and sizes
@ -781,12 +779,6 @@ void GUI::loadPreferences(bool configure_session) {
}
#endif
// General
const bool new_displaySpeedInTitle = Preferences::speedInTitleBar();
if(!new_displaySpeedInTitle && new_displaySpeedInTitle != displaySpeedInTitle) {
// Reset title
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent vx.x").arg(QString::fromUtf8(VERSION)));
}
displaySpeedInTitle = new_displaySpeedInTitle;
if(Preferences::isToolbarDisplayed()) {
toolBar->setVisible(true);
toolBar->layout()->setSpacing(7);
@ -1010,6 +1002,24 @@ void GUI::on_actionOptions_triggered() {
}
}
void GUI::on_actionTop_tool_bar_triggered() {
bool is_visible = static_cast<QAction*>(sender())->isChecked();
toolBar->setVisible(is_visible);
Preferences::setToolbarDisplayed(is_visible);
}
void GUI::on_actionSpeed_in_title_bar_triggered() {
displaySpeedInTitle = static_cast<QAction*>(sender())->isChecked();
Preferences::showSpeedInTitleBar(displaySpeedInTitle);
if(displaySpeedInTitle)
updateGUI();
else
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
}
/*****************************************************
* *
* HTTP Downloader *
@ -1024,4 +1034,3 @@ void GUI::on_actionDownload_from_URL_triggered() {
connect(downloadFromURLDialog, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), this, SLOT(downloadFromURLList(const QStringList&)));
}
}

4
src/GUI.h
View File

@ -164,6 +164,10 @@ private:
SearchEngine *searchEngine;
// RSS
QPointer<RSSImp> rssWidget;
private slots:
void on_actionSpeed_in_title_bar_triggered();
void on_actionTop_tool_bar_triggered();
};
#endif

14
src/options_imp.cpp
View File

@ -193,13 +193,11 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
// General tab
connect(comboI18n, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
connect(comboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
connect(checkSpeedInTitle, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkAltRowColors, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkNoSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkCloseToSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkMinimizeToSysTray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkStartMinimized, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkDisplayToolbar, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkNoSplash, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkDeleteTorrentFiles, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
// Downloads tab
@ -375,13 +373,11 @@ void options_imp::saveOptions(){
settings.beginGroup("General");
settings.setValue(QString::fromUtf8("Locale"), getLocale());
settings.setValue(QString::fromUtf8("Style"), getStyle());
settings.setValue(QString::fromUtf8("SpeedInTitleBar"), speedInTitleBar());
settings.setValue(QString::fromUtf8("AlternatingRowColors"), checkAltRowColors->isChecked());
settings.setValue(QString::fromUtf8("SystrayEnabled"), systrayIntegration());
settings.setValue(QString::fromUtf8("CloseToTray"), closeToTray());
settings.setValue(QString::fromUtf8("MinimizeToTray"), minimizeToTray());
settings.setValue(QString::fromUtf8("StartMinimized"), startMinimized());
settings.setValue(QString::fromUtf8("ToolbarDisplayed"), isToolbarDisplayed());
settings.setValue(QString::fromUtf8("NoSplashScreen"), isSlashScreenDisabled());
Preferences::setDeleteTorrentFilesAsDefault(checkDeleteTorrentFiles->isChecked());
// End General preferences
@ -604,10 +600,8 @@ void options_imp::loadOptions(){
// General preferences
setLocale(Preferences::getLocale());
setStyle(Preferences::getStyle());
checkSpeedInTitle->setChecked(Preferences::speedInTitleBar());
checkAltRowColors->setChecked(Preferences::useAlternatingRowColors());
checkNoSystray->setChecked(!Preferences::systrayIntegration());
checkDisplayToolbar->setChecked(Preferences::isToolbarDisplayed());
checkNoSplash->setChecked(Preferences::isSlashScreenDisabled());
checkDeleteTorrentFiles->setChecked(Preferences::deleteTorrentFilesAsDefault());
if(checkNoSystray->isChecked()) {
@ -1282,10 +1276,6 @@ bool options_imp::isSlashScreenDisabled() const {
return checkNoSplash->isChecked();
}
bool options_imp::speedInTitleBar() const {
return checkSpeedInTitle->isChecked();
}
bool options_imp::preAllocateAllFiles() const {
return checkPreallocateAll->isChecked();
}
@ -1502,10 +1492,6 @@ QString options_imp::getFilter() const{
return textFilterPath->text();
}
bool options_imp::isToolbarDisplayed() const {
return checkDisplayToolbar->isChecked();
}
// Web UI
void options_imp::enableWebUi(bool checkBoxValue){

2
src/options_imp.h
View File

@ -67,13 +67,11 @@ protected:
// General options
QString getLocale() const;
QString getStyle() const;
bool speedInTitleBar() const;
bool systrayIntegration() const;
bool minimizeToTray() const;
bool closeToTray() const;
bool startMinimized() const;
bool isSlashScreenDisabled() const;
bool isToolbarDisplayed() const;
// Downloads
QString getSavePath() const;
bool isTempPathEnabled() const;

10
src/preferences.h
View File

@ -97,6 +97,11 @@ public:
return settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool();
}
static void showSpeedInTitleBar(bool show) {
QSettings settings("qBittorrent", "qBittorrent");
settings.setValue(QString::fromUtf8("Preferences/General/SpeedInTitleBar"), show);
}
static bool speedInTitleBar() {
QSettings settings("qBittorrent", "qBittorrent");
return settings.value(QString::fromUtf8("Preferences/General/SpeedInTitleBar"), false).toBool();
@ -117,6 +122,11 @@ public:
settings.setValue(QString::fromUtf8("Preferences/General/SystrayEnabled"), enabled);
}
static void setToolbarDisplayed(bool displayed) {
QSettings settings("qBittorrent", "qBittorrent");
settings.setValue(QString::fromUtf8("Preferences/General/ToolbarDisplayed"), displayed);
}
static bool isToolbarDisplayed() {
QSettings settings("qBittorrent", "qBittorrent");
return settings.value(QString::fromUtf8("Preferences/General/ToolbarDisplayed"), true).toBool();

6
src/transferlistwidget.cpp
View File

@ -1036,11 +1036,11 @@ void TransferListWidget::displayListMenu(const QPoint&) {
connect(&actionPause, SIGNAL(triggered()), this, SLOT(pauseSelectedTorrents()));
QAction actionDelete(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")), tr("Delete"), 0);
connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents()));
QAction actionPreview_file(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")), tr("Preview file"), 0);
QAction actionPreview_file(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")), tr("Preview file..."), 0);
connect(&actionPreview_file, SIGNAL(triggered()), this, SLOT(previewSelectedTorrents()));
QAction actionSet_upload_limit(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")), tr("Limit upload rate"), 0);
QAction actionSet_upload_limit(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")), tr("Limit upload rate..."), 0);
connect(&actionSet_upload_limit, SIGNAL(triggered()), this, SLOT(setUpLimitSelectedTorrents()));
QAction actionSet_download_limit(QIcon(QString::fromUtf8(":/Icons/skin/download.png")), tr("Limit download rate"), 0);
QAction actionSet_download_limit(QIcon(QString::fromUtf8(":/Icons/skin/download.png")), tr("Limit download rate..."), 0);
connect(&actionSet_download_limit, SIGNAL(triggered()), this, SLOT(setDlLimitSelectedTorrents()));
QAction actionOpen_destination_folder(QIcon(QString::fromUtf8(":/Icons/oxygen/folder.png")), tr("Open destination folder"), 0);
connect(&actionOpen_destination_folder, SIGNAL(triggered()), this, SLOT(openSelectedTorrentsFolder()));

51
src/ui/mainwindow.ui
View File

@ -29,7 +29,7 @@
<x>0</x>
<y>0</y>
<width>914</width>
<height>26</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_Edit">
@ -58,10 +58,12 @@
</widget>
<widget class="QMenu" name="menu_Options">
<property name="title">
<string>Options</string>
<string>&amp;Tools</string>
</property>
<addaction name="actionOptions"/>
<addaction name="actionShow_console"/>
<addaction name="actionCreate_torrent"/>
<addaction name="separator"/>
<addaction name="actionOptions"/>
</widget>
<widget class="QMenu" name="menu_File">
<property name="title">
@ -69,11 +71,18 @@
</property>
<addaction name="actionOpen"/>
<addaction name="actionDownload_from_URL"/>
<addaction name="actionCreate_torrent"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
<string>&amp;View</string>
</property>
<addaction name="actionTop_tool_bar"/>
<addaction name="actionSpeed_in_title_bar"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Edit"/>
<addaction name="menuView"/>
<addaction name="menu_Options"/>
<addaction name="menu_Help"/>
</widget>
@ -125,17 +134,17 @@
<widget class="QStatusBar" name="statusBar"/>
<action name="actionOpen">
<property name="text">
<string>Open torrent</string>
<string>&amp;Add File...</string>
</property>
</action>
<action name="actionExit">
<property name="text">
<string>Exit</string>
<string>E&amp;xit</string>
</property>
</action>
<action name="actionOptions">
<property name="text">
<string>Preferences</string>
<string>&amp;Options...</string>
</property>
</action>
<action name="actionAbout">
@ -175,12 +184,12 @@
</action>
<action name="actionDownload_from_URL">
<property name="text">
<string>Download from URL</string>
<string>Add &amp;URL...</string>
</property>
</action>
<action name="actionCreate_torrent">
<property name="text">
<string>Create torrent</string>
<string>Torrent &amp;creator</string>
</property>
</action>
<action name="actionPreview_file">
@ -253,7 +262,7 @@
<normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
</property>
<property name="text">
<string>Console</string>
<string>&amp;Log viewer...</string>
</property>
<property name="toolTip">
<string>Log Window</string>
@ -268,6 +277,28 @@
<string>Use alternative speed limits</string>
</property>
</action>
<action name="actionTop_tool_bar">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Top &amp;tool bar</string>
</property>
<property name="toolTip">
<string>Display top tool bar</string>
</property>
</action>
<action name="actionSpeed_in_title_bar">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Speed in title bar</string>
</property>
<property name="toolTip">
<string>Show transfer speed in title bar</string>
</property>
</action>
</widget>
<resources>
<include location="../icons.qrc"/>

335
src/ui/options.ui
View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Preferences</string>
<string>Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@ -240,9 +240,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-109</y>
<width>506</width>
<height>515</height>
<y>0</y>
<width>524</width>
<height>406</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@ -252,6 +252,9 @@
<string>User interface</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout">
<item>
@ -335,16 +338,6 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkDisplayToolbar">
<property name="text">
<string>Display top toolbar</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkNoSplash">
<property name="text">
@ -352,13 +345,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkSpeedInTitle">
<property name="text">
<string>Display current speed in title bar</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkDeleteTorrentFiles">
<property name="text">
@ -366,174 +352,182 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Transfer list</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Transfer list</string>
<widget class="QCheckBox" name="checkAltRowColors">
<property name="text">
<string extracomment="In transfer list, one every two rows will have grey background.">Use alternating row colors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
<item>
<widget class="QCheckBox" name="checkAltRowColors">
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_7">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title">
<string>Action on double-click</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lblDlList_2">
<property name="text">
<string extracomment="In transfer list, one every two rows will have grey background.">Use alternating row colors</string>
</property>
<property name="checked">
<bool>true</bool>
<string>Downloading torrents:</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="ActDblClickBox">
<item row="0" column="1">
<widget class="QComboBox" name="actionTorrentDlOnDblClBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox::title {
font-weight: normal;
margin-left: -2px;
}
QGroupBox {
border-width: 0;
}</string>
<property name="currentIndex">
<number>0</number>
</property>
<property name="title">
<string comment="Action executed when doucle-clicking on an item in transfer (download/upload) list">Action on double click:</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="_4">
<item>
<widget class="QLabel" name="lblDlList_2">
<property name="text">
<string>Downloading:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="actionTorrentDlOnDblClBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Start/Stop</string>
</property>
</item>
<item>
<property name="text">
<string>Open folder</string>
</property>
</item>
<item>
<property name="text">
<string>No action</string>
</property>
</item>
</widget>
</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>
<item>
<widget class="QLabel" name="lblUploadList">
<property name="text">
<string>Completed:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="actionTorrentFnOnDblClBox">
<item>
<property name="text">
<string>Start/Stop</string>
</property>
</item>
<item>
<property name="text">
<string>Open folder</string>
</property>
</item>
<item>
<property name="text">
<string>No action</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
<item>
<property name="text">
<string>Start / Stop</string>
</property>
</item>
<item>
<property name="text">
<string>Open destination folder</string>
</property>
</item>
<item>
<property name="text">
<string>No action</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblUploadList">
<property name="text">
<string>Completed torrents:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="actionTorrentFnOnDblClBox">
<item>
<property name="text">
<string>Start / Stop</string>
</property>
</item>
<item>
<property name="text">
<string>Open destination folder</string>
</property>
</item>
<item>
<property name="text">
<string>No action</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_6">
<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>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QGroupBox" name="systrayBox">
<property name="title">
<string>System tray icon</string>
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="checkNoSystray">
<property name="text">
<string>Disable system tray icon</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkCloseToSystray">
<property name="text">
<string comment="i.e: The systray tray icon will still be visible when closing the main window.">Close to tray</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkMinimizeToSysTray">
<property name="text">
<string>Minimize to tray</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkStartMinimized">
<property name="text">
<string>Start minimized</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="systrayBox">
<property name="title">
<string>System tray icon</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkNoSystray">
<property name="text">
<string>Disable system tray icon</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkMinimizeToSysTray">
<property name="text">
<string>Minimize to tray</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkCloseToSystray">
<property name="text">
<string comment="i.e: The systray tray icon will still be visible when closing the main window.">Close to tray</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkStartMinimized">
<property name="text">
<string>Start minimized</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@ -3046,8 +3040,8 @@ QGroupBox {
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>62</width>
<height>18</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_36"/>
@ -3095,7 +3089,6 @@ QGroupBox {
<tabstop>tabOption</tabstop>
<tabstop>comboI18n</tabstop>
<tabstop>comboStyle</tabstop>
<tabstop>checkSpeedInTitle</tabstop>
<tabstop>checkNoSystray</tabstop>
<tabstop>checkCloseToSystray</tabstop>
<tabstop>checkMinimizeToSysTray</tabstop>