summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorMatt Mower <mowerm@gmail.com>2015-02-26 06:50:55 +0100
committerDees Troy <dees_troy@teamw.in>2015-03-05 04:20:53 +0100
commit5aa29ab3c79be328574a34bd3aef33fc382609f9 (patch)
tree1816aff61173d53aaa87c313cd8be05b29a6db11 /gui
parentGUI: Use valid XML syntax (diff)
downloadandroid_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar.gz
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar.bz2
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar.lz
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar.xz
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.tar.zst
android_bootable_recovery-5aa29ab3c79be328574a34bd3aef33fc382609f9.zip
Diffstat (limited to '')
-rw-r--r--gui/action.cpp4
-rw-r--r--gui/devices/landscape/res/landscape.xml1
-rw-r--r--gui/devices/portrait/res/portrait.xml1
-rw-r--r--gui/devices/watch/res/watch.xml1
4 files changed, 7 insertions, 0 deletions
diff --git a/gui/action.cpp b/gui/action.cpp
index f9de4e9d8..16a550ba1 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1321,6 +1321,10 @@ int GUIAction::terminalcommand(std::string arg)
if (simulate) {
simulate_progress_bar();
operation_end(op_status);
+ } else if (arg == "exit") {
+ LOGINFO("Exiting terminal\n");
+ operation_end(op_status);
+ page("main");
} else {
command = "cd \"" + cmdpath + "\" && " + arg + " 2>&1";;
LOGINFO("Actual command is: '%s'\n", command.c_str());
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index f6fb18993..aaa509e9c 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -3371,6 +3371,7 @@
<condition var1="tw_terminal_state" var2="0" />
<placement x="%input_x%" y="%terminal_text_y%" w="%terminal_input_width%" h="%input_height%" placement="0" />
<text>%tw_terminal_command%</text>
+ <font resource="fixed" color="%text_color%" />
<data name="tw_terminal_command" />
<restrict minlen="1" />
<action function="terminalcommand">%tw_terminal_command%</action>
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 369f95997..021e81df0 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -3398,6 +3398,7 @@
<condition var1="tw_terminal_state" var2="0" />
<placement x="%col1_x%" y="%terminal_text_y%" w="%input_width%" h="%input_height%" placement="0" />
<text>%tw_terminal_command%</text>
+ <font resource="fixed" color="%text_color%" />
<data name="tw_terminal_command" />
<restrict minlen="1" />
<action function="terminalcommand">%tw_terminal_command%</action>
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index a86b07c62..0169a99b4 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -3389,6 +3389,7 @@
<condition var1="tw_terminal_state" var2="0" />
<placement x="%col1_x%" y="%terminal_text_y%" w="%input_width%" h="%input_height%" placement="0" />
<text>%tw_terminal_command%</text>
+ <font resource="fixed" color="%text_color%" />
<data name="tw_terminal_command" />
<restrict minlen="1" />
<action function="terminalcommand">%tw_terminal_command%</action>