* small script to move the preferences to Trash. You can change it by editing 'Delete...

diff --git a/Makefile.am b/Makefile.am
index dab015ae2f9e2010f66d62e61b425b7c2fb04dd1..860e6c8ab393a356cb11d0aec5772bda2907aba6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1069,7 +1069,7 @@ package-macosx:
 
 # Copy relevant files 
        cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
-       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
+       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -r extras/MacOSX/Delete\ Preferences.app $(top_builddir)/tmp/
 
 # Create disk image 
        $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp

diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf
index 1b241011f03304c9f88418a0d1b706296bff6693..2f6b881d29c679fd3cf3190886f1e840df27331c 100644 (file)
--- a/README.MacOSX.rtf
+++ b/README.MacOSX.rtf
@@ -36,6 +36,7 @@ The following frequently asked questions are answered below :\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
 \f1\b \cf0 \ul \ulc0 13. I have a problem or a feature request \
+14. VLC does not start anymore or does strange things \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
 \f0\b0 \cf0 \ulnone \
@@ -82,7 +83,7 @@ If VLC media player is slow on your G4 system, try to quit or hide all running a
 
 \f1\b \cf0 \ul 5. How do I remove VLC media player ?
 \f0\b0 \ulnone \
-Simply drag VLC from the place where you had installed it, to the Trash.\
+Simply drag VLC from the place where you had installed it, to the Trash. If you want, you can delete the preferences as well (see 14.), but keeping them won't have a negative effect either.\
 \
 \
 
@@ -155,6 +156,15 @@ Change this from default to "CoreAudio output". This is the module that was also
 
 \f0\b0 \cf0 \ulnone Your first stop is \ul http://www.videolan.org/doc\ulnone . The documentation on this page can usually help you with your problems. If you cannot find an aswer there then please visit \ul http://forum.videolan.org.\ulnone  Use the Search function there and see if someone else might have already answered your question or run into your problem. Feature requests can also be made in the Request forum.\
 \
+\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
+
+\f1\b \cf0 \ul 14. VLC does not start anymore or does strange things \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
+
+\f0\b0 \cf0 \ulnone Delete your preferences and try again. You can use the script "Delete Preferences.app" on the disk-image to do that. If you want to do it by hand, delete "org.videolan.vlc.plist" and a folder called "VLC" in ~/Library/Preferences (your personal preferences-folder inside the library of your HOME). If this does not help, see 13.\
+\
+\
 For additional information and support, please see: \ul http://www.videolan.org/support\ulnone \
 -- \
 Derk-Jan Hartman for the VideoLAN team.\

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/Info.plist b/extras/MacOSX/Delete Preferences.app/Contents/Info.plist
new file mode 100644 (file)
index 0000000..73f56cf
--- /dev/null
+++ b/extras/MacOSX/Delete Preferences.app/Contents/Info.plist
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleAllowMixedLocalizations</key>
+       <true/>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>applet</string>
+       <key>CFBundleIconFile</key>
+       <string>applet</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>Untitled</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleSignature</key>
+       <string>aplt</string>
+       <key>LSRequiresCarbon</key>
+       <true/>
+       <key>WindowState</key>
+       <dict>
+               <key>name</key>
+               <string>ScriptWindowState</string>
+               <key>positionOfDivider</key>
+               <real>282</real>
+               <key>savedFrame</key>
+               <string>7 405 526 468 0 0 1440 878 </string>
+               <key>selectedTabView</key>
+               <string>description</string>
+       </dict>
+</dict>
+</plist>

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/MacOS/applet b/extras/MacOSX/Delete Preferences.app/Contents/MacOS/applet
new file mode 100755 (executable)
index 0000000..d07649a
Binary files /dev/null and b/extras/MacOSX/Delete Preferences.app/Contents/MacOS/applet differ

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/PkgInfo b/extras/MacOSX/Delete Preferences.app/Contents/PkgInfo
new file mode 100644 (file)
index 0000000..3253614
--- /dev/null
+++ b/extras/MacOSX/Delete Preferences.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPLaplt
\ No newline at end of file

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/Resources/Scripts/main.scpt b/extras/MacOSX/Delete Preferences.app/Contents/Resources/Scripts/main.scpt
new file mode 100644 (file)
index 0000000..567ec69
Binary files /dev/null and b/extras/MacOSX/Delete Preferences.app/Contents/Resources/Scripts/main.scpt differ

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.icns b/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.icns
new file mode 100644 (file)
index 0000000..fcc1f09
Binary files /dev/null and b/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.icns differ

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.rsrc b/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.rsrc
new file mode 100644 (file)
index 0000000..fb22cf4
Binary files /dev/null and b/extras/MacOSX/Delete Preferences.app/Contents/Resources/applet.rsrc differ

diff --git a/extras/MacOSX/Delete Preferences.app/Contents/Resources/description.rtfd/TXT.rtf b/extras/MacOSX/Delete Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
new file mode 100644 (file)
index 0000000..a977b74
--- /dev/null
+++ b/extras/MacOSX/Delete Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
@@ -0,0 +1,8 @@
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\tx7280\tx7840\tx8400\tx8960\tx9520\tx10080\tx10640\tx11200\tx11760\tx12320\tx12880\tx13440\tx14000\tx14560\tx15120\tx15680\tx16240\tx16800\tx17360\tx17920\tx18480\tx19040\tx19600\tx20160\tx20720\tx21280\tx21840\tx22400\tx22960\tx23520\tx24080\tx24640\tx25200\tx25760\tx26320\tx26880\tx27440\tx28000\tx28560\tx29120\tx29680\tx30240\tx30800\tx31360\tx31920\tx32480\tx33040\tx33600\tx34160\tx34720\tx35280\tx35840\tx36400\tx36960\tx37520\tx38080\tx38640\tx39200\tx39760\tx40320\tx40880\tx41440\tx42000\tx42560\tx43120\tx43680\tx44240\tx44800\tx45360\tx45920\tx46480\tx47040\tx47600\tx48160\tx48720\tx49280\tx49840\tx50400\tx50960\tx51520\tx52080\tx52640\tx53200\tx53760\tx54320\tx54880\tx55440\tx56000\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 \CocoaLigature0 This script moves VLC's preferences files to the trash, so the user does not need to search for them. It does not empty your trash, but requires the user to do so afterwards.\
+\
+This script is published under the same license as the VLC package.}
\ No newline at end of file