[vlc-devel] commit: 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 01:36:10 2008 -0700| [6b069ca8adb1f911fb5ee2c53abe4506215f5ef5] | committer: Jean-Baptiste Kempf 

Deactivate skins2 in simple preferences and installer...

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

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

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