Revert busybox for CM7 compatibility, add exclamation point to format data
diff --git a/gui/devices/800x480/res/images/exclamation150.png b/gui/devices/800x480/res/images/exclamation150.png
new file mode 100644
index 0000000..6e05987
--- /dev/null
+++ b/gui/devices/800x480/res/images/exclamation150.png
Binary files differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 4454ffe..7832ebb 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -41,6 +41,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="exclamation150" />
</resources>
<variables>
@@ -170,6 +171,8 @@
<variable name="terminal_text_y" value="247" />
<variable name="terminal_button_y" value="237" />
<variable name="terminal_input_width" value="551" />
+ <variable name="exclamation_x" value="325" />
+ <variable name="exclamation_y" value="120" />
</variables>
<templates>
@@ -822,6 +825,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>
@@ -829,6 +833,14 @@
<page name="confirm_action">
<object type="template" name="header" />
+ <object type="button">
+ <condition var1="tw_show_exclamation" var2="1" />
+ <placement x="%exclamation_x%" y="%exclamation_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text></text>
+ <image resource="exclamation" />
+ </object>
+
<object type="text" color="%text_color%">
<font resource="font" />
<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -855,7 +867,7 @@
<object type="text" color="%text_color%">
<font resource="font" />
- <placement x="%center_x%" y="%row8_text_y%" placement="5" />
+ <placement x="%center_x%" y="%row12_text_y%" placement="5" />
<text>Press back button to cancel.</text>
</object>
@@ -1575,9 +1587,11 @@
<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_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>
