Commit 6b069ca8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Deactivate skins2 in simple preferences and installer...

parent 70d1cb5f
...@@ -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"
......
...@@ -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 );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment