Browse Source

Merge pull request #5020 from Chocobo1/rss_exec

Minor UI tweaks
adaptive-webui-19844
sledgehammer999 9 years ago
parent
commit
4c02bdb092
  1. 16
      src/gui/executionlog.ui
  2. 27
      src/gui/rss/rss.ui
  3. 69
      src/gui/rss/rsssettingsdlg.ui

16
src/gui/executionlog.ui

@ -14,6 +14,18 @@
<string notr="true">Form</string> <string notr="true">Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<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="QTabWidget" name="tabConsole"> <widget class="QTabWidget" name="tabConsole">
<property name="tabPosition"> <property name="tabPosition">
@ -26,13 +38,13 @@
<attribute name="title"> <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QVBoxLayout"/> <layout class="QVBoxLayout" name="tabGeneralLayout"/>
</widget> </widget>
<widget class="QWidget" name="tabBan"> <widget class="QWidget" name="tabBan">
<attribute name="title"> <attribute name="title">
<string>Blocked IPs</string> <string>Blocked IPs</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="_2"/> <layout class="QVBoxLayout" name="tabBanLayout"/>
</widget> </widget>
</widget> </widget>
</item> </item>

27
src/gui/rss/rss.ui

@ -21,12 +21,6 @@
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QToolButton" name="newFeedButton"> <widget class="QToolButton" name="newFeedButton">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="text"> <property name="text">
<string>New subscription</string> <string>New subscription</string>
</property> </property>
@ -37,12 +31,6 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="markReadButton"> <widget class="QToolButton" name="markReadButton">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Mark items read</string> <string>Mark items read</string>
</property> </property>
@ -53,12 +41,6 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="updateAllButton"> <widget class="QToolButton" name="updateAllButton">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Refresh RSS streams</string> <string>Refresh RSS streams</string>
</property> </property>
@ -77,14 +59,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer name="spacer1">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>0</width>
<height>20</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -137,9 +119,6 @@
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum> <enum>QAbstractItemView::ExtendedSelection</enum>
</property> </property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectItems</enum>
</property>
</widget> </widget>
<widget class="HtmlBrowser" name="textBrowser"> <widget class="HtmlBrowser" name="textBrowser">
<property name="openExternalLinks"> <property name="openExternalLinks">

69
src/gui/rss/rsssettingsdlg.ui

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>502</width> <width>415</width>
<height>137</height> <height>123</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -18,41 +18,26 @@
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../icons.qrc">:/icons/oxygen/application-rss+xml.png</pixmap> <pixmap resource="../icons.qrc">:/icons/oxygen/application-rss+xml.png</pixmap>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="1">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>RSS feeds refresh interval:</string> <string>RSS feeds refresh interval:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="2">
<widget class="QSpinBox" name="spinRSSRefresh"> <widget class="QSpinBox" name="spinRSSRefresh">
<property name="suffix">
<string> min</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -64,24 +49,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="1" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>minutes</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Maximum number of articles per feed:</string> <string>Maximum number of articles per feed:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="2">
<widget class="QSpinBox" name="spinRSSMaxArticlesPerFeed"> <widget class="QSpinBox" name="spinRSSMaxArticlesPerFeed">
<property name="maximum"> <property name="maximum">
<number>9999</number> <number>9999</number>
@ -91,21 +66,21 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<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> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">

Loading…
Cancel
Save