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
5a6d682c
Commit
5a6d682c
authored
Jan 18, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - SPrefs: add the option to embed the video in the interface In the Simple Preferences.
parent
6ff86dc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+2
-1
modules/gui/qt4/ui/sprefs_interface.ui
modules/gui/qt4/ui/sprefs_interface.ui
+13
-6
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
5a6d682c
...
...
@@ -303,7 +303,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
char
*
psz_vcddiscpath
=
config_GetPsz
(
p_intf
,
"vcd"
);
char
*
psz_cddadiscpath
=
config_GetPsz
(
p_intf
,
"cd-audio"
);
if
(
psz_dvddiscpath
&&
psz_vcddiscpath
&&
psz_cddadiscpath
)
if
(
!
strcmp
(
psz_cddadiscpath
,
psz_dvddiscpath
)
&&
if
(
!
strcmp
(
psz_cddadiscpath
,
psz_dvddiscpath
)
&&
!
strcmp
(
psz_dvddiscpath
,
psz_vcddiscpath
)
)
{
ui
.
DVDDevice
->
setText
(
qfu
(
psz_dvddiscpath
)
);
...
...
@@ -420,6 +420,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC
(
"fetch-meta"
,
Bool
,
NULL
,
metaFetcher
);
CONFIG_GENERIC
(
"qt-updates-notif"
,
Bool
,
NULL
,
qtUpdates
);
CONFIG_GENERIC
(
"qt-always-video"
,
Bool
,
NULL
,
qtAlwaysVideo
);
CONFIG_GENERIC
(
"embeded-video"
,
Bool
,
NULL
,
embedVideo
);
CONFIG_GENERIC_FILE
(
"skins2-last"
,
File
,
NULL
,
fileSkin
,
skinBrowse
);
#if defined( WIN32 ) || defined( HAVE_DBUS_3 )
...
...
modules/gui/qt4/ui/sprefs_interface.ui
View file @
5a6d682c
...
...
@@ -29,14 +29,14 @@
<string>_("Native or Skins")</string>
</property>
<layout class="QGridLayout" >
<item row="
2
" column="0" colspan="3" >
<item row="
3
" column="0" colspan="3" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="
3
" column="1" colspan="2" >
<item row="
4
" column="1" colspan="2" >
<widget class="QLabel" name="skinsLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
...
...
@@ -64,21 +64,21 @@
</property>
</widget>
</item>
<item row="
4
" column="2" >
<item row="
5
" column="2" >
<widget class="QPushButton" name="skinBrowse" >
<property name="text" >
<string>_("Browse...")</string>
</property>
</widget>
</item>
<item row="
4
" column="0" >
<item row="
5
" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>_("Skin File")</string>
</property>
</widget>
</item>
<item row="
4
" column="1" >
<item row="
5
" column="1" >
<widget class="QLineEdit" name="fileSkin" />
</item>
<item row="0" column="1" colspan="2" >
...
...
@@ -107,7 +107,7 @@
</property>
</widget>
</item>
<item row="
3
" column="0" >
<item row="
4
" column="0" >
<widget class="QRadioButton" name="skins" >
<property name="text" >
<string>_("Skins")</string>
...
...
@@ -121,6 +121,13 @@
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QCheckBox" name="embedVideo" >
<property name="text" >
<string>_("Integrate video in interface")</string>
</property>
</widget>
</item>
</layout>
</widget>
</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