PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: Terminal command: minor improvements

Browse Source 
* Use mono font for terminal command input
* Recognize 'exit' command (go to main page)

Change-Id: I5f383cd8d19959a49d2ae0b18f839b86e4145693
This commit is contained in:
Matt Mower
2015-02-25 23:50:55 -06:00
committed by Dees Troy
parent 829315385f
commit 5aa29ab3c7
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/action.cpp
+4
View File
@@ -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());
gui/devices/landscape/res/landscape.xml
+1
View File
@@ -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>
gui/devices/portrait/res/portrait.xml
+1
View File
@@ -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>
gui/devices/watch/res/watch.xml
+1
View File
@@ -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>