LinGui: change the top level structure that contains presets from a dictionary

to an array.  Dictionaries are unordered sets, so this new structure
allows greater flexibility in how the presets may be ordered.
Is backwards compatible.  Old structure is read and converted to new.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1804 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 38 insertions, 20 deletions

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 63e6ece92..379b1d826 100644
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -10134,8 +10134,7 @@
 "		</dict>\n"
 "	</dict>\n"
 "	<key>standard-presets</key>\n"
-"	<dict>\n"
-"		<key>Animation</key>\n"
+"	<array>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10185,6 +10184,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for cartoons, anime, and CGI.</str"
 "ing>\n"
+"			<key>preset_name</key>\n"
+"			<string>Animation</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10208,7 +10209,6 @@
 "pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter"
 "=2,2</string>\n"
 "		</dict>\n"
-"		<key>AppleTV</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10271,6 +10271,8 @@
 "			<string>HandBrake&apos;s settings for the AppleTV, including Dolby D"
 "igital 5.1 AC3 sound. Provides a good balance between quality and file "
 "size, and optimizes performance.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>AppleTV</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10291,7 +10293,6 @@
 "			<string>bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0</st"
 "ring>\n"
 "		</dict>\n"
-"		<key>Bedlam</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10342,6 +10343,8 @@
 "			<string>HandBrake&apos;s settings maxed out for slowest encoding and"
 " highest quality. Use at your own risk. So slow it&apos;s not just insa"
 "ne...it&apos;s a trip to the looney bin.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Bedlam</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10365,7 +10368,6 @@
 "b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fa"
 "st-pskip:no-dct-decimate:filter=-2,-1</string>\n"
 "		</dict>\n"
-"		<key>Blind</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -10415,6 +10417,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s preset for impatient people who don&apos;t "
 "care about picture quality.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Blind</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10436,7 +10440,6 @@
 "			<key>x264_options</key>\n"
 "			<string></string>\n"
 "		</dict>\n"
-"		<key>Broke</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -10487,6 +10490,8 @@
 "			<string>HandBrake&apos;s preset for people without a lot of money to"
 " waste on hard drives. Tries to maximize quality for burning to CDs, so"
 " you can party like it&apos;s 1999.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Broke</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10509,7 +10514,6 @@
 "			<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:dir"
 "ect=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
 "		</dict>\n"
-"		<key>Classic</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -10559,6 +10563,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s traditional, faster, lower-quality settings"
 ".</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Classic</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10578,7 +10584,6 @@
 "			<key>x264_options</key>\n"
 "			<string></string>\n"
 "		</dict>\n"
-"		<key>Constant Quality Rate</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10629,6 +10634,8 @@
 "			<string>HandBrake&apos;s preset for consistently excellent quality i"
 "n one pass, with the downside of entirely unpredictable file sizes and "
 "bitrates.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Constant Quality Rate</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10651,7 +10658,6 @@
 "			<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filt"
 "er=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>\n"
 "		</dict>\n"
-"		<key>Deux Six Quatre</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10703,6 +10709,8 @@
 "A good balance of quality and speed, based on community standards found"
 " in the wild. This preset will give you a much better sense of x264&apo"
 "s;s capabilities than vanilla main profile.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Deux Six Quatre</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10725,7 +10733,6 @@
 "			<string>ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=u"
 "mh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
 "		</dict>\n"
-"		<key>Film</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10774,6 +10781,8 @@
 "			</array>\n"
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s preset for feature films.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Film</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10797,7 +10806,6 @@
 "pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip</stri"
 "ng>\n"
 "		</dict>\n"
-"		<key>Normal</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10846,6 +10854,8 @@
 "			</array>\n"
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s normal, default settings.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>Normal</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10867,7 +10877,6 @@
 "			<key>x264_options</key>\n"
 "			<string>ref=2:bframes=2:me=umh</string>\n"
 "		</dict>\n"
-"		<key>PS3</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -10915,6 +10924,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for the Sony PlayStation 3.</strin"
 "g>\n"
+"			<key>preset_name</key>\n"
+"			<string>PS3</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -10934,7 +10945,6 @@
 "			<key>x264_options</key>\n"
 "			<string>level=41:me=umh</string>\n"
 "		</dict>\n"
-"		<key>PSP</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -10984,6 +10994,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for the Sony PlayStation Portable."
 "</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>PSP</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11003,7 +11015,6 @@
 "			<key>x264_options</key>\n"
 "			<string></string>\n"
 "		</dict>\n"
-"		<key>QuickTime</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -11054,6 +11065,8 @@
 "			<string>HandBrake&apos;s high quality settings for use with QuickTim"
 "e. It can be slow, so use it when the Normal preset doesn&apos;t look g"
 "ood enough.</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>QuickTime</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11076,7 +11089,6 @@
 "			<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me"
 "=umh:analyse=all:trellis=1:no-fast-pskip</string>\n"
 "		</dict>\n"
-"		<key>Television</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -11126,6 +11138,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for video from television.</string"
 ">\n"
+"			<key>preset_name</key>\n"
+"			<string>Television</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11148,7 +11162,6 @@
 "			<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyrami"
 "d:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>\n"
 "		</dict>\n"
-"		<key>Xbox 360</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<true />\n"
@@ -11196,6 +11209,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for the Microsoft Xbox 360.</strin"
 "g>\n"
+"			<key>preset_name</key>\n"
+"			<string>Xbox 360</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11217,7 +11232,6 @@
 "t=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>"
 "\n"
 "		</dict>\n"
-"		<key>iPhone / iPod Touch</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -11269,6 +11283,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s settings for the iPhone and iPod Touch.</st"
 "ring>\n"
+"			<key>preset_name</key>\n"
+"			<string>iPhone / iPod Touch</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11289,7 +11305,6 @@
 "			<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:tr"
 "ellis=1</string>\n"
 "		</dict>\n"
-"		<key>iPod High-Rez</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -11341,6 +11356,8 @@
 "			<key>preset_description</key>\n"
 "			<string>HandBrake&apos;s high resolution settings for the iPod. Good"
 " video quality, great for viewing on a TV using your iPod</string>\n"
+"			<key>preset_name</key>\n"
+"			<string>iPod High-Rez</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11361,7 +11378,6 @@
 "			<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsiz"
 "e=2000:analyse=all:me=umh:no-fast-pskip=1</string>\n"
 "		</dict>\n"
-"		<key>iPod Low-Rez</key>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
 "			<false />\n"
@@ -11414,6 +11430,8 @@
 "			<string>HandBrake&apos;s low resolution settings for the iPod. Optim"
 "ized for great playback on the iPod screen, with smaller file size.</st"
 "ring>\n"
+"			<key>preset_name</key>\n"
+"			<string>iPod Low-Rez</string>\n"
 "			<key>preset_type</key>\n"
 "			<integer>0</integer>\n"
 "			<key>subtitle_lang</key>\n"
@@ -11434,7 +11452,7 @@
 "			<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize"
 "=2000:analyse=all:me=umh:no-fast-pskip=1</string>\n"
 "		</dict>\n"
-"	</dict>\n"
+"	</array>\n"
 "	<key>widget-deps</key>\n"
 "	<dict>\n"
 "		<key>anamorphic</key>\n"