Unify portrait layouts again
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index c98c1c4..de7304a 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -11,7 +11,7 @@
<resources>
<resource name="font" type="font" filename="Roboto-Regular-20" />
- <resource name="condensedfont" type="font" filename="Roboto-Regular-20" />
+ <resource name="mediumfont" type="font" filename="Roboto-Regular-20" />
<resource name="filelist" type="font" filename="Roboto-Regular-20" />
<resource name="top_bar" type="image" filename="top-bar.jpg" />
<resource name="main_button" type="image" filename="menu-button" />
@@ -42,7 +42,6 @@
</resources>
<variables>
- <variable name="backgroundcolor" value="#000000FF" />
<variable name="col1_x" value="10" />
<variable name="col2_x" value="240" />
<variable name="col_center_x" value="128" />
@@ -65,13 +64,13 @@
<variable name="row9_text_y" value="380" />
<variable name="row10_text_y" value="410" />
<variable name="row11_text_y" value="440" />
- <variable name="row12_text_y" value="480" />
- <variable name="row13_text_y" value="510" />
- <variable name="row14_text_y" value="540" />
- <variable name="row15_text_y" value="570" />
- <variable name="row16_text_y" value="600" />
- <variable name="row17_text_y" value="630" />
- <variable name="row18_text_y" value="660" />
+ <variable name="row12_text_y" value="470" />
+ <variable name="row13_text_y" value="500" />
+ <variable name="row14_text_y" value="530" />
+ <variable name="row15_text_y" value="560" />
+ <variable name="row16_text_y" value="590" />
+ <variable name="row17_text_y" value="620" />
+ <variable name="row18_text_y" value="650" />
<variable name="zip_status_y" value="585" />
<variable name="tz_selected_y" value="110" />
<variable name="tz_set_y" value="580" />
@@ -138,10 +137,10 @@
<variable name="listbox_spacing" value="18" />
<variable name="sd_plus_x" value="280" />
<variable name="sdext_text_x" value="84" />
- <variable name="sdext_text_y" value="150" />
+ <variable name="sdext_text_y" value="145" />
<variable name="sdswap_button_y" value="185" />
<variable name="sdswap_text_x" value="84" />
- <variable name="sdswap_text_y" value="195" />
+ <variable name="sdswap_text_y" value="190" />
<variable name="sdfilesystem_text_y" value="240" />
<variable name="sdfilesystem_button_y" value="280" />
<variable name="lock_x" value="40" />
@@ -152,6 +151,9 @@
<variable name="terminal_console_height" value="370" />
<variable name="terminal_text_y" value="390" />
<variable name="terminal_button_y" value="380" />
+ <variable name="row_dst_text_y" value="440" />
+ <variable name="row_offset_text_y" value="480" />
+ <variable name="row_offset_medium_y" value="505" />
</variables>
<templates>
@@ -442,7 +444,7 @@
<object type="button">
<placement x="%col1_x%" y="%row1_text_y%" />
- <font resource="font" color="%text_color%" />
+ <font resource="mediumfont" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
<condition var1="tw_use_external_storage" var2="1" />
@@ -454,7 +456,7 @@
<object type="button">
<placement x="%col1_x%" y="%row1_text_y%" />
- <font resource="font" color="%text_color%" />
+ <font resource="mediumfont" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
<condition var1="tw_use_external_storage" var2="0" />
@@ -466,7 +468,7 @@
<object type="button">
<placement x="%col2_x%" y="%row1_text_y%" />
- <font resource="font" color="%text_color%" />
+ <font resource="mediumfont" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
<condition var1="tw_use_external_storage" var2="1" />
@@ -478,7 +480,7 @@
<object type="button">
<placement x="%col2_x%" y="%row1_text_y%" />
- <font resource="font" color="%text_color%" />
+ <font resource="mediumfont" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
<condition var1="tw_use_external_storage" var2="0" />
@@ -548,7 +550,7 @@
</object>
<object type="text" color="%text_color%">
- <font resource="font" />
+ <font resource="mediumfont" />
<placement x="%center_x%" y="%row4_text_y%" placement="5" />
<text>%tw_zip_location%</text>
</object>
@@ -560,7 +562,7 @@
</object>
<object type="text" color="%text_color%">
- <font resource="font" />
+ <font resource="mediumfont" />
<placement x="%center_x%" y="%row6_text_y%" placement="5" />
<text>%tw_file%</text>
</object>
@@ -574,7 +576,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row8_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Zip file signature verification?</text>
+ <text>Zip file signature verification.</text>
<data variable="tw_signed_zip_verify" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -582,7 +584,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row9_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Force MD5 check on all zips?</text>
+ <text>Force MD5 check on all zips.</text>
<data variable="tw_force_md5_check" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -591,14 +593,14 @@
<condition var1="tw_has_injecttwrp" var2="1" />
<placement x="%col1_x%" y="%row10_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Inject TWRP after install?</text>
+ <text>Inject TWRP after install.</text>
<data variable="tw_inject_after_zip" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row12_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row11_text_y%" placement="5" />
<text>File %tw_zip_queue_count% of max of 10</text>
</object>
@@ -666,7 +668,7 @@
</object>
<object type="text" color="%text_color%">
- <font resource="font" />
+ <font resource="mediumfont" />
<placement x="%center_x%" y="%row18_text_y%" placement="5" />
<text>%tw_filename%</text>
</object>
@@ -1105,7 +1107,7 @@
<action function="set">tw_has_action2=1</action>
<action function="set">tw_action2=set</action>
<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
- <action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+ <action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
<action function="set">tw_action_text1=Wiping External Storage...</action>
<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1300,7 +1302,7 @@
<object type="checkbox">
<condition var1="tw_sp1_name" op=">" var2="" />
- <placement x="%col1_x%" y="%row10_text_y%" />
+ <placement x="%col1_x%" y="%row9_text_y%" />
<font resource="font" color="%text_color%" />
<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
<data variable="tw_backup_sp1" />
@@ -1309,7 +1311,7 @@
<object type="checkbox">
<condition var1="tw_sp2_name" op=">" var2="" />
- <placement x="%col1_x%" y="%row11_text_y%" />
+ <placement x="%col1_x%" y="%row10_text_y%" />
<font resource="font" color="%text_color%" />
<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
<data variable="tw_backup_sp2" />
@@ -1318,7 +1320,7 @@
<object type="checkbox">
<condition var1="tw_sp3_name" op=">" var2="" />
- <placement x="%col1_x%" y="%row12_text_y%" />
+ <placement x="%col1_x%" y="%row11_text_y%" />
<font resource="font" color="%text_color%" />
<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
<data variable="tw_backup_sp3" />
@@ -1327,28 +1329,28 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%col1_x%" y="%row14_text_y%" />
+ <placement x="%col1_x%" y="%row13_text_y%" />
<text>Free Space: %tw_storage_free_size% MB</text>
</object>
<object type="checkbox">
- <placement x="%col1_x%" y="%row15_text_y%" />
+ <placement x="%col1_x%" y="%row14_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Enable Compression (Requires more time)</text>
+ <text>Enable compression.</text>
<data variable="tw_use_compression" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
<object type="checkbox">
- <placement x="%col1_x%" y="%row16_text_y%" />
+ <placement x="%col1_x%" y="%row15_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Skip MD5 generation on backups</text>
+ <text>Skip MD5 generation during backup.</text>
<data variable="tw_skip_md5_generate" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
<object type="button">
- <placement x="%col1_x%" y="%row17_text_y%" />
+ <placement x="%col1_x%" y="%row16_text_y%" />
<font resource="font" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
@@ -1360,7 +1362,7 @@
</object>
<object type="button">
- <placement x="%col1_x%" y="%row17_text_y%" />
+ <placement x="%col1_x%" y="%row16_text_y%" />
<font resource="font" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
@@ -1372,7 +1374,7 @@
</object>
<object type="button">
- <placement x="%col2_x%" y="%row17_text_y%" />
+ <placement x="%col2_x%" y="%row16_text_y%" />
<font resource="font" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
@@ -1384,7 +1386,7 @@
</object>
<object type="button">
- <placement x="%col2_x%" y="%row17_text_y%" />
+ <placement x="%col2_x%" y="%row16_text_y%" />
<font resource="font" color="%text_color%" />
<conditions>
<condition var1="tw_has_dual_storage" var2="1" />
@@ -1734,7 +1736,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row14_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Enable MD5 checking of backup files</text>
+ <text>Enable MD5 verification of backup files.</text>
<data variable="tw_skip_md5_check" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -1933,7 +1935,7 @@
<condition var1="tw_has_external" var2="1" />
<condition var1="mounted" op="!=" var2="EXTERNAL" />
</conditions>
- <text>Mount SDCard</text>
+ <text>Mount SD Card</text>
<image resource="checkbox_false" />
<action function="mount">EXTERNAL</action>
</object>
@@ -1945,7 +1947,7 @@
<condition var1="tw_has_external" var2="1" />
<condition var1="mounted" op="=" var2="EXTERNAL" />
</conditions>
- <text>Unmount SDCard</text>
+ <text>Unmount SD Card</text>
<image resource="checkbox_true" />
<action function="umount">EXTERNAL</action>
</object>
@@ -2272,7 +2274,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row1_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Zip file signature verification?</text>
+ <text>Zip file signature verification.</text>
<data variable="tw_signed_zip_verify" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2280,7 +2282,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row2_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Force MD5 check on all zips?</text>
+ <text>Force MD5 check on all zips.</text>
<data variable="tw_force_md5_check" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2288,7 +2290,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row3_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Use rm -rf instead of formatting?</text>
+ <text>Use rm -rf instead of formatting.</text>
<data variable="tw_rm_rf" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2296,7 +2298,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row4_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Skip MD5 generation on backups</text>
+ <text>Skip MD5 generation during backup.</text>
<data variable="tw_skip_md5_generate" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2304,7 +2306,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row5_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Enable MD5 checking of backup files</text>
+ <text>Enable MD5 verification of backup files.</text>
<data variable="tw_skip_md5_check" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2312,7 +2314,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Ignore image size errors during backup</text>
+ <text>Ignore image size errors during backup.</text>
<data variable="tw_ignore_image_size" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2320,7 +2322,7 @@
<object type="checkbox">
<placement x="%col1_x%" y="%row7_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Simulate most actions for theme testing</text>
+ <text>Simulate actions for theme testing.</text>
<data variable="tw_simulate_actions" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2329,7 +2331,7 @@
<condition var1="tw_simulate_actions" var2="1" />
<placement x="%col1_x%" y="%row8_text_y%" />
<font resource="font" color="%text_color%" />
- <text>Simulate failure for actions</text>
+ <text>Simulate failure for actions.</text>
<data variable="tw_simulate_fail" />
<image checked="checkbox_true" unchecked="checkbox_false" />
</object>
@@ -2405,7 +2407,7 @@
</object>
<object type="checkbox">
- <placement x="%col1_x%" y="%row11_text_y%" />
+ <placement x="%col1_x%" y="%row_dst_text_y%" />
<font resource="font" color="%text_color%" />
<text>Do you use daylight savings time (DST)?</text>
<data variable="tw_time_zone_guidst" />
@@ -2414,12 +2416,12 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row12_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
</object>
<object type="button">
- <placement x="%col1_medium_x%" y="%row6_medium_y%" />
+ <placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
<font resource="font" color="%button_text_color%" />
<text>None</text>
<image resource="medium_button" />
@@ -2427,7 +2429,7 @@
</object>
<object type="button">
- <placement x="%col2_medium_x%" y="%row6_medium_y%" />
+ <placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
<font resource="font" color="%button_text_color%" />
<text>15</text>
<image resource="medium_button" />
@@ -2435,7 +2437,7 @@
</object>
<object type="button">
- <placement x="%col3_medium_x%" y="%row6_medium_y%" />
+ <placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
<font resource="font" color="%button_text_color%" />
<text>30</text>
<image resource="medium_button" />
@@ -2443,7 +2445,7 @@
</object>
<object type="button">
- <placement x="%col4_medium_x%" y="%row6_medium_y%" />
+ <placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
<font resource="font" color="%button_text_color%" />
<text>45</text>
<image resource="medium_button" />