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
6c3405e7
Commit
6c3405e7
authored
Oct 30, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt, sprefs: use the Color Selector
parent
8dec3520
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+1
-1
modules/gui/qt4/ui/sprefs_subtitles.ui
modules/gui/qt4/ui/sprefs_subtitles.ui
+1
-7
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
6c3405e7
...
...
@@ -636,7 +636,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC
(
"sub-language"
,
String
,
ui
.
subLangLabel
,
preferredLanguage
);
CONFIG_GENERIC_NO_BOOL
(
"freetype-font"
,
Font
,
ui
.
fontLabel
,
font
);
CONFIG_GENERIC
(
"freetype-color"
,
IntegerList
,
ui
.
fontColorLabel
,
CONFIG_GENERIC
_NO_BOOL
(
"freetype-color"
,
Color
,
ui
.
fontColorLabel
,
fontColor
);
CONFIG_GENERIC
(
"freetype-rel-fontsize"
,
IntegerList
,
ui
.
fontSizeLabel
,
fontSize
);
...
...
modules/gui/qt4/ui/sprefs_subtitles.ui
View file @
6c3405e7
...
...
@@ -153,13 +153,7 @@
</widget>
</item>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"fontColor"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<widget
class=
"QPushButton"
name=
"fontColor"
>
</widget>
</item>
<item
row=
"2"
column=
"0"
>
...
...
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