Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
01c12214
Commit
01c12214
authored
May 19, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: uniformize sprefs margins
parent
9480c83c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
138 deletions
+87
-138
modules/gui/qt4/ui/sprefs_interface.ui
modules/gui/qt4/ui/sprefs_interface.ui
+12
-3
modules/gui/qt4/ui/sprefs_video.ui
modules/gui/qt4/ui/sprefs_video.ui
+75
-135
No files found.
modules/gui/qt4/ui/sprefs_interface.ui
View file @
01c12214
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
<rect>
<rect>
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
686
</width>
<width>
700
</width>
<height>
6
63
</height>
<height>
6
40
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
...
@@ -49,6 +49,9 @@
...
@@ -49,6 +49,9 @@
<string>
Look and feel
</string>
<string>
Look and feel
</string>
</property>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"4"
>
<item
row=
"0"
column=
"4"
>
<widget
class=
"QRadioButton"
name=
"skins"
>
<widget
class=
"QRadioButton"
name=
"skins"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -174,6 +177,9 @@
...
@@ -174,6 +177,9 @@
<property
name=
"topMargin"
>
<property
name=
"topMargin"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item
row=
"1"
column=
"2"
colspan=
"2"
>
<item
row=
"1"
column=
"2"
colspan=
"2"
>
<widget
class=
"QCheckBox"
name=
"resizingBox"
>
<widget
class=
"QCheckBox"
name=
"resizingBox"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -463,6 +469,9 @@
...
@@ -463,6 +469,9 @@
<string>
Privacy / Network Interaction
</string>
<string>
Privacy / Network Interaction
</string>
</property>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_5"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_5"
>
<property
name=
"bottomMargin"
>
<number>
4
</number>
</property>
<item
row=
"1"
column=
"3"
>
<item
row=
"1"
column=
"3"
>
<widget
class=
"QSpinBox"
name=
"updatesDays"
>
<widget
class=
"QSpinBox"
name=
"updatesDays"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
...
@@ -644,7 +653,7 @@
...
@@ -644,7 +653,7 @@
<property
name=
"sizeHint"
stdset=
"0"
>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<size>
<width>
20
</width>
<width>
20
</width>
<height>
4
0
</height>
<height>
0
</height>
</size>
</size>
</property>
</property>
</spacer>
</spacer>
...
...
modules/gui/qt4/ui/sprefs_video.ui
View file @
01c12214
...
@@ -45,51 +45,43 @@
...
@@ -45,51 +45,43 @@
<property
name=
"title"
>
<property
name=
"title"
>
<string>
Display
</string>
<string>
Display
</string>
</property>
</property>
<layout
class=
"QGridLayout"
>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"leftMargin"
>
<item
row=
"0"
column=
"0"
>
<number>
9
</number>
</property>
<property
name=
"topMargin"
>
<number>
9
</number>
</property>
<property
name=
"rightMargin"
>
<number>
9
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
9
</number>
</property>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"0"
column=
"0"
colspan=
"2"
>
<widget
class=
"QCheckBox"
name=
"fullscreen"
>
<widget
class=
"QCheckBox"
name=
"fullscreen"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Fullscreen
</string>
<string>
Fullscreen
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"
2"
column=
"2
"
>
<item
row=
"
1"
column=
"0
"
>
<widget
class=
"QCheckBox"
name=
"
windowDecorations
"
>
<widget
class=
"QCheckBox"
name=
"
overlay
"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Window decorations
</string>
<string>
Accelerated video output (Overlay)
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"1"
column=
"
2
"
>
<item
row=
"1"
column=
"
1
"
>
<widget
class=
"QCheckBox"
name=
"hwYUVBox"
>
<widget
class=
"QCheckBox"
name=
"hwYUVBox"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Use hardware YUV-
>
RGB conversions
</string>
<string>
Use hardware YUV-
>
RGB conversions
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"
1"
column=
"0"
colspan=
"2
"
>
<item
row=
"
2"
column=
"0
"
>
<widget
class=
"QCheckBox"
name=
"
overlay
"
>
<widget
class=
"QCheckBox"
name=
"
alwaysOnTop
"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
A
ccelerated video output (Overlay)
</string>
<string>
A
lways on top
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"8"
column=
"0"
>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QCheckBox"
name=
"windowDecorations"
>
<property
name=
"text"
>
<string>
Window decorations
</string>
</property>
</widget>
</item>
<item
row=
"3"
column=
"0"
>
<widget
class=
"QLabel"
name=
"voutLabel"
>
<widget
class=
"QLabel"
name=
"voutLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Output
</string>
<string>
Output
</string>
...
@@ -99,14 +91,7 @@
...
@@ -99,14 +91,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"2"
column=
"0"
colspan=
"2"
>
<item
row=
"3"
column=
"1"
>
<widget
class=
"QCheckBox"
name=
"alwaysOnTop"
>
<property
name=
"text"
>
<string>
Always on top
</string>
</property>
</widget>
</item>
<item
row=
"8"
column=
"1"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"outputModule"
>
<widget
class=
"QComboBox"
name=
"outputModule"
>
<property
name=
"maxVisibleItems"
>
<property
name=
"maxVisibleItems"
>
<number>
15
</number>
<number>
15
</number>
...
@@ -121,25 +106,7 @@
...
@@ -121,25 +106,7 @@
<property
name=
"title"
>
<property
name=
"title"
>
<string>
DirectX
</string>
<string>
DirectX
</string>
</property>
</property>
<layout
class=
"QGridLayout"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_4"
>
<property
name=
"leftMargin"
>
<number>
9
</number>
</property>
<property
name=
"topMargin"
>
<number>
9
</number>
</property>
<property
name=
"rightMargin"
>
<number>
9
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
9
</number>
</property>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"0"
column=
"1"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"dXdisplayDevice"
/>
</item>
<item
row=
"0"
column=
"0"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"dxDeviceLabel"
>
<widget
class=
"QLabel"
name=
"dxDeviceLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -150,6 +117,9 @@
...
@@ -150,6 +117,9 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"dXdisplayDevice"
/>
</item>
</layout>
</layout>
</widget>
</widget>
</item>
</item>
...
@@ -158,22 +128,14 @@
...
@@ -158,22 +128,14 @@
<property
name=
"title"
>
<property
name=
"title"
>
<string>
KVA
</string>
<string>
KVA
</string>
</property>
</property>
<layout
class=
"QGridLayout"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_3"
>
<property
name=
"leftMargin"
>
<item
row=
"0"
column=
"0"
>
<number>
9
</number>
<widget
class=
"QCheckBox"
name=
"kvaFixT23"
>
</property>
<property
name=
"text"
>
<property
name=
"topMargin"
>
<string>
Enable a workaround for T23
</string>
<number>
9
</number>
</property>
</property>
</widget>
<property
name=
"rightMargin"
>
</item>
<number>
9
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
9
</number>
</property>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"1"
column=
"0"
>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"kvaVideoModeLabel"
>
<widget
class=
"QLabel"
name=
"kvaVideoModeLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -184,14 +146,7 @@
...
@@ -184,14 +146,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"0"
column=
"0"
colspan=
"2"
>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QCheckBox"
name=
"kvaFixT23"
>
<property
name=
"text"
>
<string>
Enable a workaround for T23
</string>
</property>
</widget>
</item>
<item
row=
"1"
column=
"1"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"kvaVideoMode"
/>
<widget
class=
"QComboBox"
name=
"kvaVideoMode"
/>
</item>
</item>
</layout>
</layout>
...
@@ -213,16 +168,6 @@
...
@@ -213,16 +168,6 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"arLabel"
>
<property
name=
"text"
>
<string>
Force Aspect Ratio
</string>
</property>
<property
name=
"buddy"
>
<cstring>
arLine
</cstring>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"deinterlaceBox"
>
<widget
class=
"QComboBox"
name=
"deinterlaceBox"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
...
@@ -262,6 +207,16 @@
...
@@ -262,6 +207,16 @@
<item
row=
"1"
column=
"1"
colspan=
"3"
>
<item
row=
"1"
column=
"1"
colspan=
"3"
>
<widget
class=
"QLineEdit"
name=
"arLine"
/>
<widget
class=
"QLineEdit"
name=
"arLine"
/>
</item>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"arLabel"
>
<property
name=
"text"
>
<string>
Force Aspect Ratio
</string>
</property>
<property
name=
"buddy"
>
<cstring>
arLine
</cstring>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</widget>
</item>
</item>
...
@@ -270,32 +225,7 @@
...
@@ -270,32 +225,7 @@
<property
name=
"title"
>
<property
name=
"title"
>
<string>
Video snapshots
</string>
<string>
Video snapshots
</string>
</property>
</property>
<layout
class=
"QGridLayout"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<property
name=
"leftMargin"
>
<number>
9
</number>
</property>
<property
name=
"topMargin"
>
<number>
9
</number>
</property>
<property
name=
"rightMargin"
>
<number>
9
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
9
</number>
</property>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"0"
column=
"2"
colspan=
"2"
>
<widget
class=
"QLineEdit"
name=
"snapshotsDirectory"
/>
</item>
<item
row=
"0"
column=
"4"
>
<widget
class=
"QPushButton"
name=
"snapshotsDirectoryBrowse"
>
<property
name=
"text"
>
<string>
Browse...
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"0"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"dirLabel"
>
<widget
class=
"QLabel"
name=
"dirLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -306,6 +236,32 @@
...
@@ -306,6 +236,32 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"0"
column=
"1"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Preferred
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
60
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"0"
column=
"2"
>
<widget
class=
"QLineEdit"
name=
"snapshotsDirectory"
/>
</item>
<item
row=
"0"
column=
"3"
>
<widget
class=
"QPushButton"
name=
"snapshotsDirectoryBrowse"
>
<property
name=
"text"
>
<string>
Browse...
</string>
</property>
</widget>
</item>
<item
row=
"1"
column=
"0"
>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"prefixLabel"
>
<widget
class=
"QLabel"
name=
"prefixLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -323,6 +279,13 @@
...
@@ -323,6 +279,13 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"1"
column=
"3"
>
<widget
class=
"QCheckBox"
name=
"snapshotsSequentialNumbering"
>
<property
name=
"text"
>
<string>
Sequential numbering
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"0"
>
<item
row=
"2"
column=
"0"
>
<widget
class=
"QLabel"
name=
"formatLabel"
>
<widget
class=
"QLabel"
name=
"formatLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -333,29 +296,6 @@
...
@@ -333,29 +296,6 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"1"
column=
"3"
colspan=
"2"
>
<widget
class=
"QCheckBox"
name=
"snapshotsSequentialNumbering"
>
<property
name=
"text"
>
<string>
Sequential numbering
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Preferred
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"2"
column=
"2"
>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QComboBox"
name=
"snapshotsFormat"
/>
<widget
class=
"QComboBox"
name=
"snapshotsFormat"
/>
</item>
</item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment