From ce2fe779c028eeb198120b6d43e0a242a7113465 Mon Sep 17 00:00:00 2001
From: Dees_Troy <dees_troy@teamw.in>
Date: Fri, 28 Sep 2012 12:34:33 -0400
Subject: Revert busybox for CM7 compatibility, add exclamation point to format
 data

---
 gui/devices/1024x600/res/images/exclamation200.png  | Bin 0 -> 5260 bytes
 gui/devices/1024x600/res/ui.xml                     |  16 +++++++++++++++-
 gui/devices/1024x768/res/images/exclamation200.png  | Bin 0 -> 5260 bytes
 gui/devices/1024x768/res/ui.xml                     |  16 +++++++++++++++-
 gui/devices/1280x800/res/images/exclamation200.png  | Bin 0 -> 5260 bytes
 gui/devices/1280x800/res/ui.xml                     |  16 +++++++++++++++-
 gui/devices/1920x1200/res/images/exclamation400.png | Bin 0 -> 11295 bytes
 gui/devices/1920x1200/res/ui.xml                    |  16 +++++++++++++++-
 gui/devices/320x480/res/images/exclamation150.png   | Bin 0 -> 6460 bytes
 gui/devices/320x480/res/ui.xml                      |  18 ++++++++++++++++--
 gui/devices/480x800/res/images/exclamation200.png   | Bin 0 -> 5260 bytes
 gui/devices/480x800/res/ui.xml                      |  18 ++++++++++++++++--
 gui/devices/480x854/res/images/exclamation200.png   | Bin 0 -> 5260 bytes
 gui/devices/480x854/res/ui.xml                      |  18 ++++++++++++++++--
 gui/devices/540x960/res/images/exclamation300.png   | Bin 0 -> 13488 bytes
 gui/devices/540x960/res/ui.xml                      |  18 ++++++++++++++++--
 gui/devices/720x1280/res/ui.xml                     |  16 ++++++++++++++--
 gui/devices/800x1280/res/images/exclamation400.png  | Bin 0 -> 11295 bytes
 gui/devices/800x1280/res/ui.xml                     |  18 ++++++++++++++++--
 gui/devices/800x480/res/images/exclamation150.png   | Bin 0 -> 6460 bytes
 gui/devices/800x480/res/ui.xml                      |  16 +++++++++++++++-
 21 files changed, 169 insertions(+), 17 deletions(-)
 create mode 100644 gui/devices/1024x600/res/images/exclamation200.png
 create mode 100644 gui/devices/1024x768/res/images/exclamation200.png
 create mode 100644 gui/devices/1280x800/res/images/exclamation200.png
 create mode 100644 gui/devices/1920x1200/res/images/exclamation400.png
 create mode 100644 gui/devices/320x480/res/images/exclamation150.png
 create mode 100644 gui/devices/480x800/res/images/exclamation200.png
 create mode 100644 gui/devices/480x854/res/images/exclamation200.png
 create mode 100644 gui/devices/540x960/res/images/exclamation300.png
 create mode 100644 gui/devices/800x1280/res/images/exclamation400.png
 create mode 100644 gui/devices/800x480/res/images/exclamation150.png

(limited to 'gui/devices')

diff --git a/gui/devices/1024x600/res/images/exclamation200.png b/gui/devices/1024x600/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
Binary files /dev/null and b/gui/devices/1024x600/res/images/exclamation200.png differ
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 7a0bbd00d..7fcb75aa8 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/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="exclamation200" />
 	</resources>
 
 	<variables>
@@ -170,6 +171,8 @@
 		<variable name="terminal_text_y" value="307" />
 		<variable name="terminal_button_y" value="298" />
 		<variable name="terminal_input_width" value="775" />
+		<variable name="exclamation_x" value="412" />
+		<variable name="exclamation_y" value="200" />
 	</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>
diff --git a/gui/devices/1024x768/res/images/exclamation200.png b/gui/devices/1024x768/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
Binary files /dev/null and b/gui/devices/1024x768/res/images/exclamation200.png differ
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index cc9701ba1..596c320e1 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/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="exclamation200" />
 	</resources>
 
 	<variables>
@@ -170,6 +171,8 @@
 		<variable name="terminal_text_y" value="368" />
 		<variable name="terminal_button_y" value="358" />
 		<variable name="terminal_input_width" value="775" />
+		<variable name="exclamation_x" value="412" />
+		<variable name="exclamation_y" value="200" />
 	</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>
diff --git a/gui/devices/1280x800/res/images/exclamation200.png b/gui/devices/1280x800/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
Binary files /dev/null and b/gui/devices/1280x800/res/images/exclamation200.png differ
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 2e5b32905..4b06c0433 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/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="exclamation200" />
 	</resources>
 
 	<variables>
@@ -170,6 +171,8 @@
 		<variable name="terminal_text_y" value="368" />
 		<variable name="terminal_button_y" value="358" />
 		<variable name="terminal_input_width" value="1031" />
+		<variable name="exclamation_x" value="540" />
+		<variable name="exclamation_y" value="200" />
 	</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>
diff --git a/gui/devices/1920x1200/res/images/exclamation400.png b/gui/devices/1920x1200/res/images/exclamation400.png
new file mode 100644
index 000000000..f3a8aabb6
Binary files /dev/null and b/gui/devices/1920x1200/res/images/exclamation400.png differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 17ccfe922..6ff72d643 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/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="exclamation400" />
 	</resources>
 
 	<variables>
@@ -170,6 +171,8 @@
 		<variable name="terminal_text_y" value="624" />
 		<variable name="terminal_button_y" value="615" />
 		<variable name="terminal_input_width" value="1550" />
+		<variable name="exclamation_x" value="760" />
+		<variable name="exclamation_y" value="260" />
 	</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>
diff --git a/gui/devices/320x480/res/images/exclamation150.png b/gui/devices/320x480/res/images/exclamation150.png
new file mode 100644
index 000000000..6e05987c1
Binary files /dev/null and b/gui/devices/320x480/res/images/exclamation150.png differ
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index efa980ac4..a98165b4a 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/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="exclamation150" />
 	</resources>
 
 	<variables>
@@ -155,6 +156,8 @@
 		<variable name="row_dst_text_y" value="256" />
 		<variable name="row_offset_text_y" value="275" />
 		<variable name="row_offset_medium_y" value="303" />
+		<variable name="exclamation_x" value="85" />
+		<variable name="exclamation_y" value="165" />
 	</variables>
 
 	<templates>
@@ -794,6 +797,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>
@@ -801,6 +805,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" />
@@ -827,7 +839,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>
 
@@ -1153,11 +1165,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>
diff --git a/gui/devices/480x800/res/images/exclamation200.png b/gui/devices/480x800/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
Binary files /dev/null and b/gui/devices/480x800/res/images/exclamation200.png differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 435efb079..d348f3875 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/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="exclamation200" />
 	</resources>
 
 	<variables>
@@ -154,6 +155,8 @@
 		<variable name="row_dst_text_y" value="440" />
 		<variable name="row_offset_text_y" value="480" />
 		<variable name="row_offset_medium_y" value="505" />
+		<variable name="exclamation_x" value="140" />
+		<variable name="exclamation_y" value="300" />
 	</variables>
 
 	<templates>
@@ -793,6 +796,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>
@@ -800,6 +804,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" />
@@ -826,7 +838,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>
 
@@ -1152,11 +1164,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>
diff --git a/gui/devices/480x854/res/images/exclamation200.png b/gui/devices/480x854/res/images/exclamation200.png
new file mode 100644
index 000000000..96258a1c3
Binary files /dev/null and b/gui/devices/480x854/res/images/exclamation200.png differ
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index ff0035723..7badfd3e7 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/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="exclamation200" />
 	</resources>
 
 	<variables>
@@ -153,6 +154,8 @@
 		<variable name="row_dst_text_y" value="440" />
 		<variable name="row_offset_text_y" value="480" />
 		<variable name="row_offset_medium_y" value="505" />
+		<variable name="exclamation_x" value="140" />
+		<variable name="exclamation_y" value="300" />
 	</variables>
 
 	<templates>
@@ -792,6 +795,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>
@@ -799,6 +803,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" />
@@ -825,7 +837,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>
 
@@ -1151,11 +1163,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>
diff --git a/gui/devices/540x960/res/images/exclamation300.png b/gui/devices/540x960/res/images/exclamation300.png
new file mode 100644
index 000000000..1ac400d11
Binary files /dev/null and b/gui/devices/540x960/res/images/exclamation300.png differ
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index ca008d5ab..af8ea0d4d 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/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="exclamation300" />
 	</resources>
 
 	<variables>
@@ -154,6 +155,8 @@
 		<variable name="row_dst_text_y" value="540" />
 		<variable name="row_offset_text_y" value="580" />
 		<variable name="row_offset_medium_y" value="630" />
+		<variable name="exclamation_x" value="120" />
+		<variable name="exclamation_y" value="300" />
 	</variables>
 
 	<templates>
@@ -793,6 +796,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>
@@ -800,6 +804,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" />
@@ -826,7 +838,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>
 
@@ -1152,11 +1164,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>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index d0973b2ef..62b04568d 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>
diff --git a/gui/devices/800x1280/res/images/exclamation400.png b/gui/devices/800x1280/res/images/exclamation400.png
new file mode 100644
index 000000000..f3a8aabb6
Binary files /dev/null and b/gui/devices/800x1280/res/images/exclamation400.png differ
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index b7c1e0429..54bc5dbed 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/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>
@@ -155,6 +156,8 @@
 		<variable name="row_dst_text_y" value="720" />
 		<variable name="row_offset_text_y" value="800" />
 		<variable name="row_offset_medium_y" value="840" />
+		<variable name="exclamation_x" value="200" />
+		<variable name="exclamation_y" value="400" />
 	</variables>
 
 	<templates>
@@ -794,6 +797,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>
@@ -801,6 +805,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" />
@@ -827,7 +839,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>
 
@@ -1153,11 +1165,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>
diff --git a/gui/devices/800x480/res/images/exclamation150.png b/gui/devices/800x480/res/images/exclamation150.png
new file mode 100644
index 000000000..6e05987c1
Binary files /dev/null and b/gui/devices/800x480/res/images/exclamation150.png differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 4454ffefb..7832ebbc8 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>
-- 
cgit v1.2.3