Commit 74011e3e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "Deactivate skins2 in simple preferences and installer..."

This reverts commit 6b069ca8.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 15517d05
......@@ -409,7 +409,7 @@ Section $Name_Section01 SEC01
!insertmacro InstallFolder plugins
!insertmacro InstallFolder locale
!insertmacro InstallFolder osdmenu
; !insertmacro InstallFolder skins
!insertmacro InstallFolder skins
!insertmacro InstallFolder http
!insertmacro InstallFolder lua
......@@ -458,8 +458,8 @@ Section $Name_Section02a SEC02a
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \
"$INSTDIR\vlc.exe" "--aout waveout --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"
; CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
; "$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
"$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Qt (default).lnk" \
"$INSTDIR\vlc.exe" "-I qt --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"
......
......@@ -467,7 +467,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.assoButton->hide();
#endif
#ifndef WIN32
/* interface */
char *psz_intf = config_GetPsz( p_intf, "intf" );
if( psz_intf )
......@@ -478,10 +477,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.qt4->setChecked( true );
}
free( psz_intf );
#else
ui.qt4->setChecked( true );
ui.skins->setEnabled( false );
#endif
optionWidgets.append( ui.skins );
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