Skip to content
Snippets Groups Projects
Commit 2dffe303 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1821

parents 3056d205 489d0232
No related branches found
No related tags found
No related merge requests found
...@@ -28,22 +28,50 @@ ...@@ -28,22 +28,50 @@
tool_tip="width x height" tool_tip="width x height"
top_pad="5" top_pad="5"
width="179"> width="179">
<combo_box.item <combo_box.item
label="1000 x 700 (default)" label="1000 x 700 (default)"
name="item0" name="item1"
value="1000 x 700" /> value="1000 x 700" />
<combo_box.item <combo_box.item
label="1024 x 768" label="1024 x 768 (4:3 XGA)"
name="item1" name="item2"
value="1024 x 768" /> value="1024 x 768" />
<combo_box.item <combo_box.item
label="1280 x 720 (720p)" label="1280 x 720 (16:9 HDTV)"
name="item2" name="item3"
value="1280 x 720" /> value="1280 x 720" />
<combo_box.item <combo_box.item
label="1920 x 1080 (1080p)" label="1280 x 800 (5:8 WXGA)"
name="item3" name="item4"
value="1920 x 1080" /> value="1280 x 800" />
<combo_box.item
label="1280 x 1024 (5:4 SXGA)"
name="item5"
value="1280 x 1024" />
<combo_box.item
label="1440 x 900 (8:5 WSXGA)"
name="item7"
value="1440 x 900" />
<combo_box.item
label="1600 x 900 (16:9 HD+)"
name="item8"
value="1600 x 900" />
<combo_box.item
label="1600 x 1200 (4:3 UXGA)"
name="item9"
value="1600 x 1200" />
<combo_box.item
label="1680 x 1050 (8:5 WSXGA+)"
name="item10"
value="1680 x 1050" />
<combo_box.item
label="1920 x 1080 (16:9 HDTV)"
name="item11"
value="1920 x 1080" />
<combo_box.item
label="1920 x 1200 (8:5 WUXGA)"
name="item12"
value="1920 x 1200" />
</combo_box> </combo_box>
<button <button
follows="right|bottom" follows="right|bottom"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment