d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #5179 from Chocobo1/fix_ui 

Cleanup Connection page
adaptive-webui-19844
sledgehammer999 8 years ago
parent
fd996f15f0 5efc45190a
commit
6d4f46c8ae
9 changed files with 1864 additions and 1934 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/gui/CMakeLists.txt
  2. 6
      src/gui/gui.pri
  3. 4
      src/gui/mainwindow.cpp
  4. 4
      src/gui/mainwindow.h
  5. 1668
      src/gui/options_imp.cpp
  6. 1667
      src/gui/optionsdlg.cpp
  7. 28
      src/gui/optionsdlg.h
  8. 413
      src/gui/optionsdlg.ui
  9. 2
      src/gui/transferlistwidget.cpp

6
src/gui/CMakeLists.txt
Unescape View File

@ -43,7 +43,7 @@ ico.h @@ -43,7 +43,7 @@ ico.h
loglistwidget.h
mainwindow.h
messageboxraised.h
options_imp.h
optionsdlg.h
previewlistdelegate.h
previewselect.h
scanfoldersdelegate.h
@ -79,7 +79,7 @@ ico.cpp @@ -79,7 +79,7 @@ ico.cpp
loglistwidget.cpp
mainwindow.cpp
messageboxraised.cpp
options_imp.cpp
optionsdlg.cpp
previewselect.cpp
scanfoldersdelegate.cpp
shutdownconfirmdlg.cpp
@ -121,7 +121,7 @@ executionlog.ui @@ -121,7 +121,7 @@ executionlog.ui
addnewtorrentdialog.ui
autoexpandabledialog.ui
statsdialog.ui
options.ui
optionsdlg.ui
torrentcreatordlg.ui
shutdownconfirmdlg.ui
)

6
src/gui/gui.pri
Unescape View File

@ -36,7 +36,7 @@ HEADERS += \ @@ -36,7 +36,7 @@ HEADERS += \
$$PWD/autoexpandabledialog.h \
$$PWD/statsdialog.h \
$$PWD/messageboxraised.h \
$$PWD/options_imp.h \
$$PWD/optionsdlg.h \
$$PWD/advancedsettings.h \
$$PWD/shutdownconfirmdlg.h \
$$PWD/torrentmodel.h \
@ -77,7 +77,7 @@ SOURCES += \ @@ -77,7 +77,7 @@ SOURCES += \
$$PWD/statusbar.cpp \
$$PWD/advancedsettings.cpp \
$$PWD/trackerlogin.cpp \
$$PWD/options_imp.cpp \
$$PWD/optionsdlg.cpp \
$$PWD/shutdownconfirmdlg.cpp \
$$PWD/torrentmodel.cpp \
$$PWD/torrentcreatordlg.cpp \
@ -110,7 +110,7 @@ FORMS += \ @@ -110,7 +110,7 @@ FORMS += \
$$PWD/addnewtorrentdialog.ui \
$$PWD/autoexpandabledialog.ui \
$$PWD/statsdialog.ui \
$$PWD/options.ui \
$$PWD/optionsdlg.ui \
$$PWD/torrentcreatordlg.ui \
$$PWD/search/searchwidget.ui \
$$PWD/search/pluginselectdlg.ui \

4
src/gui/mainwindow.cpp
Unescape View File

@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
#include "statusbar.h"
#include "rss_imp.h"
#include "about_imp.h"
#include "options_imp.h"
#include "optionsdlg.h"
#include "trackerlogin.h"
#include "lineedit.h"
#include "executionlog.h"
@ -1452,7 +1452,7 @@ void MainWindow::on_actionOptions_triggered() @@ -1452,7 +1452,7 @@ void MainWindow::on_actionOptions_triggered()
if (m_options)
m_options->setFocus();
else
m_options = new options_imp(this);
m_options = new OptionsDialog(this);
}
void MainWindow::on_actionTopToolBar_triggered()

4
src/gui/mainwindow.h
Unescape View File

@ -46,7 +46,7 @@ class downloadFromURL; @@ -46,7 +46,7 @@ class downloadFromURL;
class SearchWidget;
class RSSImp;
class about;
class options_imp;
class OptionsDialog;
class TransferListWidget;
class TransferListFiltersWidget;
class PropertiesWidget;
@ -208,7 +208,7 @@ private: @@ -208,7 +208,7 @@ private:
bool m_posInitialized;
QTabWidget *m_tabs;
StatusBar *m_statusBar;
QPointer<options_imp> m_options;
QPointer<OptionsDialog> m_options;
QPointer<about> m_aboutDlg;
QPointer<StatsDialog> m_statsDlg;
QPointer<TorrentCreatorDlg> m_createTorrentDlg;

1668
src/gui/options_imp.cpp
View File

File diff suppressed because it is too large Load Diff

1667
src/gui/optionsdlg.cpp
View File

File diff suppressed because it is too large Load Diff

28
src/gui/options_imp.h → src/gui/optionsdlg.h
Unescape View File

@ -28,10 +28,16 @@ @@ -28,10 +28,16 @@
* Contact : chris@qbittorrent.org
*/
#ifndef OPTIONS_IMP_H
#define OPTIONS_IMP_H
#ifndef OPTIONSDLG_H
#define OPTIONSDLG_H
#include "ui_options.h"
#include <QButtonGroup>
#include <QDialog>
class QAbstractButton;
class QCloseEvent;
class QListWidgetItem;
class AdvancedSettings;
// actions on double-click on torrents
enum DoubleClickAction
@ -41,13 +47,12 @@ enum DoubleClickAction @@ -41,13 +47,12 @@ enum DoubleClickAction
NO_ACTION
};
class AdvancedSettings;
QT_BEGIN_NAMESPACE
class QCloseEvent;
QT_END_NAMESPACE
namespace Ui
{
class OptionsDialog;
}
class options_imp: public QDialog, private Ui_Preferences
class OptionsDialog: public QDialog
{
Q_OBJECT
private:
@ -64,8 +69,8 @@ private: @@ -64,8 +69,8 @@ private:
public:
// Constructor / Destructor
options_imp(QWidget *parent = 0);
~options_imp();
OptionsDialog(QWidget *parent = 0);
~OptionsDialog();
public slots:
void showConnectionTab();
@ -167,6 +172,7 @@ private: @@ -167,6 +172,7 @@ private:
bool webUIAuthenticationOk();
private:
Ui::OptionsDialog *m_ui;
QButtonGroup choiceLanguage;
QAbstractButton *applyButton;
AdvancedSettings *advancedSettings;

413
src/gui/options.ui → src/gui/optionsdlg.ui
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Preferences</class>
<widget class="QDialog" name="Preferences">
<class>OptionsDialog</class>
<widget class="QDialog" name="OptionsDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -114,8 +114,8 @@ @@ -114,8 +114,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>514</width>
<height>968</height>
<width>497</width>
<height>880</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@ -670,34 +670,18 @@ @@ -670,34 +670,18 @@
<rect>
<x>0</x>
<y>0</y>
<width>470</width>
<height>926</height>
<width>586</width>
<height>1118</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="torrentAdditionBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>When adding a torrent</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="bottomMargin">
<number>9</number>
</property>
<item row="1" column="0">
<widget class="QCheckBox" name="checkStartPaused">
<property name="text">
<string comment="The torrent will be added to download list in pause state">Do not start the download automatically</string>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="torrentAdditionBoxLayout">
<item>
<widget class="QGroupBox" name="checkAdditionDialog">
<property name="title">
<string>Display torrent content and some options</string>
@ -705,8 +689,11 @@ @@ -705,8 +689,11 @@
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_18">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkAdditionDialogFront">
<property name="text">
<string>Bring torrent dialog to the front</string>
@ -719,7 +706,14 @@ @@ -719,7 +706,14 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<item>
<widget class="QCheckBox" name="checkStartPaused">
<property name="text">
<string comment="The torrent will be added to download list in pause state">Do not start the download automatically</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="deleteTorrentBox">
<property name="toolTip">
<string>Should the .torrent file be deleted after adding it</string>
@ -733,7 +727,7 @@ @@ -733,7 +727,7 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
<layout class="QVBoxLayout" name="deleteTorrentBoxLayout">
<item>
<widget class="QCheckBox" name="deleteCancelledTorrentBox">
<property name="toolTip">
@ -745,7 +739,7 @@ @@ -745,7 +739,7 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<layout class="QHBoxLayout" name="deleteTorrentWarningLayout">
<item>
<widget class="QLabel" name="deleteTorrentWarningIcon">
<property name="sizePolicy">
@ -761,12 +755,6 @@ @@ -761,12 +755,6 @@
</item>
<item>
<widget class="QLabel" name="deleteTorrentWarningLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Warning! Data loss possible!</string>
</property>
@ -782,16 +770,10 @@ @@ -782,16 +770,10 @@
</item>
<item>
<widget class="QGroupBox" name="groupSavingManagement">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Saving Management</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
<layout class="QVBoxLayout" name="groupSavingManagementLayout">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
@ -1339,7 +1321,7 @@ @@ -1339,7 +1321,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tabOptionPage3">
<widget class="QWidget" name="tabConnectionPage">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="leftMargin">
<number>0</number>
@ -1364,83 +1346,79 @@ @@ -1364,83 +1346,79 @@
<x>0</x>
<y>0</y>
<width>457</width>
<height>713</height>
<height>672</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_20">
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QGroupBox" name="ListeningPortBox">
<property name="title">
<string>Listening Port</string>
</property>
<layout class="QVBoxLayout">
<widget class="QGroupBox" name="ListeningPortBox">
<property name="title">
<string>Listening Port</string>
</property>
<layout class="QVBoxLayout" name="listeningPortLayout">
<item>
<layout class="QHBoxLayout" name="listeningPortLayout2">
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="lbl_ports">
<property name="text">
<string>Port used for incoming connections:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinPort">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>8999</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="randomButton">
<property name="text">
<string>Random</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<widget class="QLabel" name="lbl_ports">
<property name="text">
<string>Port used for incoming connections:</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkUPnP">
<property name="text">
<string>Use UPnP / NAT-PMP port forwarding from my router</string>
<widget class="QSpinBox" name="spinPort">
<property name="minimum">
<number>1</number>
</property>
<property name="checked">
<bool>true</bool>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>8999</number>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkRandomPort">
<widget class="QPushButton" name="randomButton">
<property name="text">
<string>Use different port on each startup</string>
<string>Random</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<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>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkUPnP">
<property name="text">
<string>Use UPnP / NAT-PMP port forwarding from my router</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkRandomPort">
<property name="text">
<string>Use different port on each startup</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="nbConnecBox">
@ -1448,6 +1426,26 @@ @@ -1448,6 +1426,26 @@
<string>Connections Limits</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="1">
<widget class="QSpinBox" name="spinMaxUploadsPerTorrent">
<property name="maximum">
<number>500</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkMaxConnecsPerTorrent">
<property name="text">
<string>Maximum number of connections per torrent:</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkMaxConnecs">
<property name="text">
@ -1474,17 +1472,7 @@ @@ -1474,17 +1472,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkMaxConnecsPerTorrent">
<property name="text">
<string>Maximum number of connections per torrent:</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QSpinBox" name="spinMaxConnecPerTorrent">
<property name="minimum">
<number>2</number>
@ -1497,7 +1485,7 @@ @@ -1497,7 +1485,7 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="QCheckBox" name="checkMaxUploadsPerTorrent">
<property name="text">
<string>Maximum number of upload slots per torrent:</string>
@ -1507,56 +1495,7 @@ @@ -1507,56 +1495,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="spinMaxUploadsPerTorrent">
<property name="maximum">
<number>500</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<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 row="2" column="2">
<spacer name="horizontalSpacer_4">
<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 row="4" 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>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QCheckBox" name="checkMaxUploads">
<property name="text">
<string>Global maximum number of upload slots:</string>
@ -1566,7 +1505,7 @@ @@ -1566,7 +1505,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QSpinBox" name="spinMaxUploads">
<property name="maximum">
<number>2000</number>
@ -1576,8 +1515,8 @@ @@ -1576,8 +1515,8 @@
</property>
</widget>
</item>
<item row="3" column="2">
<spacer name="horizontalSpacer_15">
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@ -1602,7 +1541,7 @@ @@ -1602,7 +1541,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_29">
<item>
<layout class="QHBoxLayout" name="_2">
<layout class="QHBoxLayout" name="proxyTypeLayout">
<item>
<widget class="QLabel" name="ProxyType_lbl">
<property name="text">
@ -1652,12 +1591,6 @@ @@ -1652,12 +1591,6 @@
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>75</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
</widget>
</item>
<item>
@ -1749,17 +1682,7 @@ @@ -1749,17 +1682,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="textProxyUsername">
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>1000</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
</widget>
<widget class="QLineEdit" name="textProxyUsername"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblProxyPassword">
@ -1770,12 +1693,6 @@ @@ -1770,12 +1693,6 @@
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="textProxyPassword">
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>1000</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
@ -1807,53 +1724,48 @@ @@ -1807,53 +1724,48 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_14">
<item row="1" column="0">
<widget class="QLabel" name="lblFilterPath">
<property name="text">
<string>Filter path (.dat, .p2p, .p2b):</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="textFilterPath"/>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="browseFilterButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>27</height>
</size>
</property>
<property name="text">
<string notr="true">...</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="IpFilterRefreshBtn">
<property name="minimumSize">
<size>
<width>28</width>
<height>27</height>
</size>
</property>
<property name="toolTip">
<string>Reload the filter</string>
</property>
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLabel" name="lblFilterPath">
<property name="text">
<string>Filter path (.dat, .p2p, .p2b):</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="textFilterPath"/>
</item>
<item>
<widget class="QToolButton" name="browseFilterButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="text">
<string notr="true">...</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="IpFilterRefreshBtn">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>Reload the filter</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<item>
<widget class="QCheckBox" name="checkIpFilterTrackers">
<property name="text">
<string>Apply to trackers</string>
@ -1863,6 +1775,19 @@ @@ -1863,6 +1775,19 @@
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<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>
@ -1893,8 +1818,8 @@ @@ -1893,8 +1818,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<height>484</height>
<width>388</width>
<height>452</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
@ -2280,8 +2205,8 @@ @@ -2280,8 +2205,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>587</width>
<height>578</height>
<width>574</width>
<height>534</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
@ -2677,8 +2602,8 @@ @@ -2677,8 +2602,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>460</width>
<height>562</height>
<width>438</width>
<height>543</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">

2
src/gui/transferlistwidget.cpp
Unescape View File

@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
#include "previewselect.h"
#include "speedlimitdlg.h"
#include "updownratiodlg.h"
#include "options_imp.h"
#include "optionsdlg.h"
#include "mainwindow.h"
#include "base/preferences.h"
#include "torrentmodel.h"

Write Preview
Loading…
Cancel
Save