Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
631f0bf4
Commit
631f0bf4
authored
Oct 29, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - SPrefs: save the interface value... Doesn't seem to work, so please review.
parent
af967f85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+10
-3
modules/gui/qt4/components/simple_preferences.hpp
modules/gui/qt4/components/simple_preferences.hpp
+3
-0
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
631f0bf4
...
@@ -247,7 +247,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
...
@@ -247,7 +247,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
volNormalizer
);
volNormalizer
);
CONFIG_GENERIC
(
"audio-visual"
,
Module
,
NULL
,
visualisation
);
CONFIG_GENERIC
(
"audio-visual"
,
Module
,
NULL
,
visualisation
);
CONFIG_GENERIC
(
"lastfm-username"
,
String
,
ui
.
lastfm_user_label
,
CONFIG_GENERIC
(
"lastfm-username"
,
String
,
ui
.
lastfm_user_label
,
lastfm_user_edit
);
lastfm_user_edit
);
CONFIG_GENERIC
(
"lastfm-password"
,
String
,
ui
.
lastfm_pass_label
,
CONFIG_GENERIC
(
"lastfm-password"
,
String
,
ui
.
lastfm_pass_label
,
...
@@ -323,9 +322,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
...
@@ -323,9 +322,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
}
}
if
(
p_config
->
value
.
psz
&&
strcmp
(
p_config
->
value
.
psz
,
"skins2"
))
if
(
p_config
->
value
.
psz
&&
strcmp
(
p_config
->
value
.
psz
,
"skins2"
))
{
{
ui
.
skins
->
setChecked
(
true
);
ui
.
skins
->
setChecked
(
true
);
}
}
//FIXME interface choice
skinInterfaceButton
=
ui
.
skins
;
qtInterfaceButton
=
ui
.
qt4
;
CONFIG_GENERIC
(
"qt-always-video"
,
Bool
,
NULL
,
qtAlwaysVideo
);
CONFIG_GENERIC
(
"qt-always-video"
,
Bool
,
NULL
,
qtAlwaysVideo
);
CONFIG_GENERIC_FILE
(
"skins2-last"
,
File
,
NULL
,
fileSkin
,
CONFIG_GENERIC_FILE
(
"skins2-last"
,
File
,
NULL
,
fileSkin
,
...
@@ -400,6 +400,7 @@ void SPrefsPanel::apply()
...
@@ -400,6 +400,7 @@ void SPrefsPanel::apply()
ConfigControl
*
c
=
qobject_cast
<
ConfigControl
*>
(
*
i
);
ConfigControl
*
c
=
qobject_cast
<
ConfigControl
*>
(
*
i
);
c
->
doApply
(
p_intf
);
c
->
doApply
(
p_intf
);
}
}
/* Devices */
/* Devices */
//FIXME is it qta or qtu ????
//FIXME is it qta or qtu ????
char
*
psz_devicepath
=
qtu
(
inputDevice
->
text
()
);
char
*
psz_devicepath
=
qtu
(
inputDevice
->
text
()
);
...
@@ -409,6 +410,12 @@ void SPrefsPanel::apply()
...
@@ -409,6 +410,12 @@ void SPrefsPanel::apply()
config_PutPsz
(
p_intf
,
"vcd"
,
psz_devicepath
);
config_PutPsz
(
p_intf
,
"vcd"
,
psz_devicepath
);
config_PutPsz
(
p_intf
,
"cd-audio"
,
psz_devicepath
);
config_PutPsz
(
p_intf
,
"cd-audio"
,
psz_devicepath
);
}
}
/* Interfaces */
if
(
skinInterfaceButton
->
isChecked
()
)
config_PutPsz
(
p_intf
,
"intf"
,
"skins2"
);
if
(
qtInterfaceButton
->
isChecked
()
)
config_PutPsz
(
p_intf
,
"intf"
,
"qt4"
);
}
}
void
SPrefsPanel
::
clean
()
void
SPrefsPanel
::
clean
()
...
...
modules/gui/qt4/components/simple_preferences.hpp
View file @
631f0bf4
...
@@ -42,6 +42,7 @@ enum {
...
@@ -42,6 +42,7 @@ enum {
class
ConfigControl
;
class
ConfigControl
;
class
QComboBox
;
class
QComboBox
;
class
QLineEdit
;
class
QLineEdit
;
class
QRadioButton
;
class
SPrefsCatList
:
public
QWidget
class
SPrefsCatList
:
public
QWidget
{
{
...
@@ -75,6 +76,8 @@ private:
...
@@ -75,6 +76,8 @@ private:
QWidget
*
file_options
;
QWidget
*
file_options
;
QComboBox
*
audioOutput
;
QComboBox
*
audioOutput
;
QLineEdit
*
inputDevice
;
QLineEdit
*
inputDevice
;
QRadioButton
*
skinInterfaceButton
;
QRadioButton
*
qtInterfaceButton
;
/* Display only the options for the selected audio output */
/* Display only the options for the selected audio output */
private
slots
:
private
slots
:
...
...
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