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 #4059 from Chocobo1/prop_cleanup 

Properties widget cleanup
adaptive-webui-19844
sledgehammer999 9 years ago
parent
8df192e8dd b2bf1b3425
commit
797861a9c0
4 changed files with 88 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/gui/mainwindow.cpp
  2. 36
      src/gui/mainwindow.ui
  3. 5
      src/gui/properties/propertieswidget.cpp
  4. 146
      src/gui/properties/propertieswidget.ui

2
src/gui/mainwindow.cpp
Unescape View File

@ -215,7 +215,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(BitTorrent::Session::instance(), SIGNAL(trackerError(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerError(BitTorrent::TorrentHandle *const, const QString &))); connect(BitTorrent::Session::instance(), SIGNAL(trackerError(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerError(BitTorrent::TorrentHandle *const, const QString &)));
connect(BitTorrent::Session::instance(), SIGNAL(trackerWarning(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerWarning(BitTorrent::TorrentHandle *const, const QString &))); connect(BitTorrent::Session::instance(), SIGNAL(trackerWarning(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerWarning(BitTorrent::TorrentHandle *const, const QString &)));
vboxLayout->addWidget(tabs); centralWidgetLayout->addWidget(tabs);
prioSeparator = toolBar->insertSeparator(actionTopPriority); prioSeparator = toolBar->insertSeparator(actionTopPriority);
prioSeparatorMenu = menu_Edit->insertSeparator(actionTopPriority); prioSeparatorMenu = menu_Edit->insertSeparator(actionTopPriority);

36
src/gui/mainwindow.ui
Unescape View File

@ -13,11 +13,17 @@
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="windowTitle"> <widget class="QWidget" name="centralWidget">
<string/> <layout class="QVBoxLayout" name="centralWidgetLayout">
</property> <property name="leftMargin">
<widget class="QWidget" name="centralwidget"> <number>7</number>
<layout class="QVBoxLayout"> </property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -29,7 +35,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>914</width> <width>914</width>
<height>20</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menu_Edit"> <widget class="QMenu" name="menu_Edit">
@ -152,17 +158,11 @@
<property name="text"> <property name="text">
<string>E&amp;xit</string> <string>E&amp;xit</string>
</property> </property>
<property name="toolTip">
<string>Exit</string>
</property>
</action> </action>
<action name="actionOptions"> <action name="actionOptions">
<property name="text"> <property name="text">
<string>&amp;Options...</string> <string>&amp;Options...</string>
</property> </property>
<property name="iconText">
<string>Options</string>
</property>
</action> </action>
<action name="actionAbout"> <action name="actionAbout">
<property name="text"> <property name="text">
@ -173,25 +173,16 @@
<property name="text"> <property name="text">
<string>&amp;Resume</string> <string>&amp;Resume</string>
</property> </property>
<property name="iconText">
<string>Resume</string>
</property>
</action> </action>
<action name="actionPause"> <action name="actionPause">
<property name="text"> <property name="text">
<string>&amp;Pause</string> <string>&amp;Pause</string>
</property> </property>
<property name="iconText">
<string>Pause</string>
</property>
</action> </action>
<action name="actionDelete"> <action name="actionDelete">
<property name="text"> <property name="text">
<string>&amp;Delete</string> <string>&amp;Delete</string>
</property> </property>
<property name="iconText">
<string>Delete</string>
</property>
</action> </action>
<action name="actionDownload_from_URL"> <action name="actionDownload_from_URL">
<property name="text"> <property name="text">
@ -319,9 +310,6 @@
<property name="iconText"> <property name="iconText">
<string>Lock</string> <string>Lock</string>
</property> </property>
<property name="toolTip">
<string>Lock qBittorrent</string>
</property>
<property name="shortcut"> <property name="shortcut">
<string notr="true">Ctrl+L</string> <string notr="true">Ctrl+L</string>
</property> </property>

5
src/gui/properties/propertieswidget.cpp
Unescape View File

@ -79,8 +79,9 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
// Torrent content filtering // Torrent content filtering
m_contentFilterLine = new LineEdit(this); m_contentFilterLine = new LineEdit(this);
m_contentFilterLine->setPlaceholderText(tr("Filter files...")); m_contentFilterLine->setPlaceholderText(tr("Filter files..."));
m_contentFilterLine->setMaximumSize(300, m_contentFilterLine->size().height());
connect(m_contentFilterLine, SIGNAL(textChanged(QString)), this, SLOT(filterText(QString))); connect(m_contentFilterLine, SIGNAL(textChanged(QString)), this, SLOT(filterText(QString)));
contentFilterLayout->insertWidget(4, m_contentFilterLine); contentFilterLayout->insertWidget(3, m_contentFilterLine);
// SIGNAL/SLOTS // SIGNAL/SLOTS
connect(filesList, SIGNAL(clicked(const QModelIndex&)), filesList, SLOT(edit(const QModelIndex&))); connect(filesList, SIGNAL(clicked(const QModelIndex&)), filesList, SLOT(edit(const QModelIndex&)));
@ -126,7 +127,9 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
// Tracker list // Tracker list
trackerList = new TrackerList(this); trackerList = new TrackerList(this);
trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up")); trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up"));
trackerUpButton->setIconSize(Utils::Misc::smallIconSize());
trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down")); trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down"));
trackerDownButton->setIconSize(Utils::Misc::smallIconSize());
connect(trackerUpButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionUp())); connect(trackerUpButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionUp()));
connect(trackerDownButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionDown())); connect(trackerDownButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionDown()));
horizontalLayout_trackers->insertWidget(0, trackerList); horizontalLayout_trackers->insertWidget(0, trackerList);

146
src/gui/properties/propertieswidget.ui
Unescape View File

@ -11,9 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -31,11 +28,8 @@
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="pageInfos"> <widget class="QWidget" name="pageGeneral">
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -912,6 +906,18 @@
</widget> </widget>
<widget class="QWidget" name="pageTrackers"> <widget class="QWidget" name="pageTrackers">
<layout class="QHBoxLayout" name="horizontalLayout_trackers"> <layout class="QHBoxLayout" name="horizontalLayout_trackers">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<item> <item>
@ -928,54 +934,10 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="trackerUpButton"> <widget class="QPushButton" name="trackerUpButton"/>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>31</horstretch>
<verstretch>27</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>31</width>
<height>27</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>31</width>
<height>27</height>
</size>
</property>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="trackerDownButton"> <widget class="QPushButton" name="trackerDownButton"/>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>31</horstretch>
<verstretch>27</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>31</width>
<height>27</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>31</width>
<height>27</height>
</size>
</property>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
@ -994,11 +956,36 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_5"> <widget class="QWidget" name="pagePeers">
<layout class="QVBoxLayout" name="peerpage_layout"/> <layout class="QVBoxLayout" name="peerpage_layout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget> </widget>
<widget class="QWidget" name="page_3"> <widget class="QWidget" name="pageSources">
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QListWidget" name="listWebSeeds"> <widget class="QListWidget" name="listWebSeeds">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -1011,8 +998,20 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_4"> <widget class="QWidget" name="pageContents">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="contentFilterLayout"> <layout class="QHBoxLayout" name="contentFilterLayout">
<item> <item>
@ -1042,22 +1041,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="label_11">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Torrent content:</string>
</property>
<property name="alignment">
<set>Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -1078,8 +1061,21 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="speed_page"> <widget class="QWidget" name="pageSpeed">
<layout class="QVBoxLayout" name="speed_layout"/> <layout class="QVBoxLayout" name="speed_layout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

Write Preview
Loading…
Cancel
Save