From 5aa29ab3c79be328574a34bd3aef33fc382609f9 Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Wed, 25 Feb 2015 23:50:55 -0600
Subject: GUI: Terminal command: minor improvements

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

Change-Id: I5f383cd8d19959a49d2ae0b18f839b86e4145693
---
 gui/action.cpp                          | 4 ++++
 gui/devices/landscape/res/landscape.xml | 1 +
 gui/devices/portrait/res/portrait.xml   | 1 +
 gui/devices/watch/res/watch.xml         | 1 +
 4 files changed, 7 insertions(+)

(limited to 'gui')

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>
-- 
cgit v1.2.3