Revert busybox for CM7 compatibility, add exclamation point to format data
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index d0973b2..62b0456 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -39,6 +39,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
+ <resource name="exclamation" type="image" filename="exclamation400" />
</resources>
<variables>
@@ -159,6 +160,8 @@
<variable name="row_dst_text_y" value="720" />
<variable name="row_offset_text_y" value="770" />
<variable name="row_offset_medium_y" value="840" />
+ <variable name="exclamation_x" value="160" />
+ <variable name="exclamation_y" value="400" />
</variables>
<templates>
@@ -798,6 +801,7 @@
<action function="set">tw_has_cancel=0</action>
<action function="set">tw_cancel_action=</action>
<action function="set">tw_cancel_param=</action>
+ <action function="set">tw_show_exclamation=0</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -805,6 +809,12 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="image">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <image resource="exclamation" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -831,7 +841,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row10_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row15_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1157,11 +1167,13 @@
<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=Format Data? (This wipes all media</action>
+ <action function="set">tw_text1=Format Data? (This wipes all internal storage</action>
<action function="set">tw_text2=including backups & removes encryption)</action>
+ <action function="set">tw_text3=Most of the time you do not need to do this.</action>
<action function="set">tw_action_text1=Formatting Data...</action>
<action function="set">tw_complete_text1=Data Format Complete</action>
<action function="set">tw_slider_text=Swipe to Format</action>
+ <action function="set">tw_show_exclamation=1</action>
<action function="page">confirm_action</action>
</actions>
</object>