[vlc-devel] commit: Revert "Deactivate skins2 in simple preferences and installer..." ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sat Sep 13 11:34:10 2008 -0700| [74011e3eba793cbbd20754c4238264b52a4b409e] | committer: Jean-Baptiste Kempf 

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

This reverts commit 6b069ca8adb1f911fb5ee2c53abe4506215f5ef5.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=74011e3eba793cbbd20754c4238264b52a4b409e
---

 extras/package/win32/vlc.win32.nsi.in             |    6 +++---
 modules/gui/qt4/components/simple_preferences.cpp |    5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 49d9261..daec099 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -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"
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 1a1a462..87076b7 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -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 );