LinGui: tidy up how combobox values are handled internally and stored in plists

fix a problem with storing max picture dims to presets plist


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

1 files changed, 17 insertions, 19 deletions

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 391ae20ae..19a7d4759 100644
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -10003,7 +10003,7 @@
 "			<key>x264_refs</key>\n"
 "			<integer>1</integer>\n"
 "			<key>x264_subme</key>\n"
-"			<integer>5</integer>\n"
+"			<integer>6</integer>\n"
 "			<key>x264_trellis</key>\n"
 "			<integer>0</integer>\n"
 "			<key>x264_weighted_bframes</key>\n"
@@ -10209,8 +10209,8 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-"
-"pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pski"
-"p:filter=2,2</string>\n"
+"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"
@@ -10294,8 +10294,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cab"
-"ac=0</string>\n"
+"			<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"
@@ -10519,8 +10519,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:dir"
-"ect=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip</str"
-"ing>\n"
+"ect=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<key>Classic</key>\n"
 "		<dict>\n"
@@ -10666,7 +10665,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filt"
-"er=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh</string>\n"
+"er=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>\n"
 "		</dict>\n"
 "		<key>Deux Six Quatre</key>\n"
 "		<dict>\n"
@@ -10888,7 +10887,7 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=2:bframes=2:subme=5:me=umh</string>\n"
+"			<string>ref=2:bframes=2:me=umh</string>\n"
 "		</dict>\n"
 "		<key>PS3</key>\n"
 "		<dict>\n"
@@ -10957,7 +10956,7 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>level=41:subme=5:me=umh</string>\n"
+"			<string>level=41:me=umh</string>\n"
 "		</dict>\n"
 "		<key>PSP</key>\n"
 "		<dict>\n"
@@ -11103,7 +11102,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me"
-"=umh:subme=5:analyse=all:trellis=1:no-fast-pskip</string>\n"
+"=umh:analyse=all:trellis=1:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<key>Television</key>\n"
 "		<dict>\n"
@@ -11177,8 +11176,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyrami"
-"d:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</str"
-"ing>\n"
+"d:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<key>Xbox 360</key>\n"
 "		<dict>\n"
@@ -11248,8 +11246,8 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direc"
-"t=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1<"
-"/string>\n"
+"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"
@@ -11322,8 +11320,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-ps"
-"kip=1:trellis=1</string>\n"
+"			<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"
@@ -11397,7 +11395,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsiz"
-"e=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1</string>\n"
+"e=2000:analyse=all:me=umh:no-fast-pskip=1</string>\n"
 "		</dict>\n"
 "		<key>iPod Low-Rez</key>\n"
 "		<dict>\n"
@@ -11472,7 +11470,7 @@
 "			<true />\n"
 "			<key>x264_options</key>\n"
 "			<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize"
-"=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1</string>\n"
+"=2000:analyse=all:me=umh:no-fast-pskip=1</string>\n"
 "		</dict>\n"
 "	</dict>\n"
 "	<key>widget-deps</key>\n"