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
6b069ca8
Commit
6b069ca8
authored
Sep 13, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deactivate skins2 in simple preferences and installer...
parent
70d1cb5f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
extras/package/win32/vlc.win32.nsi.in
extras/package/win32/vlc.win32.nsi.in
+3
-3
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+5
-0
No files found.
extras/package/win32/vlc.win32.nsi.in
View file @
6b069ca8
...
@@ -409,7 +409,7 @@ Section $Name_Section01 SEC01
...
@@ -409,7 +409,7 @@ Section $Name_Section01 SEC01
!insertmacro InstallFolder plugins
!insertmacro InstallFolder plugins
!insertmacro InstallFolder locale
!insertmacro InstallFolder locale
!insertmacro InstallFolder osdmenu
!insertmacro InstallFolder osdmenu
!insertmacro InstallFolder skins
;
!insertmacro InstallFolder skins
!insertmacro InstallFolder http
!insertmacro InstallFolder http
!insertmacro InstallFolder lua
!insertmacro InstallFolder lua
...
@@ -458,8 +458,8 @@ Section $Name_Section02a SEC02a
...
@@ -458,8 +458,8 @@ Section $Name_Section02a SEC02a
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \
"$INSTDIR\vlc.exe" "--aout waveout --save-config vlc://quit"
"$INSTDIR\vlc.exe" "--aout waveout --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
;
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
"$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit"
;
"$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Qt (default).lnk" \
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Qt (default).lnk" \
"$INSTDIR\vlc.exe" "-I qt --save-config vlc://quit"
"$INSTDIR\vlc.exe" "-I qt --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"
...
...
modules/gui/qt4/components/simple_preferences.cpp
View file @
6b069ca8
...
@@ -467,6 +467,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
...
@@ -467,6 +467,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui
.
assoButton
->
hide
();
ui
.
assoButton
->
hide
();
#endif
#endif
#ifndef WIN32
/* interface */
/* interface */
char
*
psz_intf
=
config_GetPsz
(
p_intf
,
"intf"
);
char
*
psz_intf
=
config_GetPsz
(
p_intf
,
"intf"
);
if
(
psz_intf
)
if
(
psz_intf
)
...
@@ -477,6 +478,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
...
@@ -477,6 +478,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui
.
qt4
->
setChecked
(
true
);
ui
.
qt4
->
setChecked
(
true
);
}
}
free
(
psz_intf
);
free
(
psz_intf
);
#else
ui
.
qt4
->
setChecked
(
true
);
ui
.
skins
->
setEnabled
(
false
);
#endif
optionWidgets
.
append
(
ui
.
skins
);
optionWidgets
.
append
(
ui
.
skins
);
optionWidgets
.
append
(
ui
.
qt4
);
optionWidgets
.
append
(
ui
.
qt4
);
...
...
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