summaryrefslogtreecommitdiffstats
path: root/gui/theme/common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xgui/theme/common/landscape.xml366
-rwxr-xr-xgui/theme/common/portrait.xml185
-rwxr-xr-xgui/theme/common/watch.xml138
3 files changed, 484 insertions, 205 deletions
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 19cc6570f..6c91d0659 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -109,6 +109,12 @@
<font resource="fixed"/>
</style>
+ <style name="terminal">
+ <fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+ <background color="%background_color%"/>
+ <font resource="fixed" spacing="3" color="%text_color%"/>
+ </style>
+
<style name="fileselector">
<highlight color="%fileselector_highlight_color%"/>
<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3027,15 +3033,18 @@
</fill>
<listbox>
- <placement x="%indent%" y="%row3_y%" w="%fileselector_filemanager_height%" h="%listbox_settings_height%"/>
+ <placement x="%col1_x_left%" y="%row3_y%" w="%content_half_width%" h="%listbox_timezone_height%"/>
<text>{@select_language=Select Language:}</text>
<icon selected="radio_true" unselected="radio_false" />
<data name="tw_language" />
</listbox>
- <button style="main_button_half_width_low">
- <placement x="%col_button_right%" y="%row16a_y%"/>
+ <button>
+ <highlight color="%highlight_color%"/>
+ <placement x="%col2_x_right%" y="%row15a_y%"/>
+ <font resource="font_m" color="%text_button_color%"/>
<text>{@set_language_btn=Set Language}</text>
+ <image resource="main_button_half_width"/>
<action function="setlanguage"></action>
</button>
@@ -3094,7 +3103,7 @@
<button style="main_button">
<placement x="%col1_x_left%" y="%row11_y%"/>
<text>{@terminal_btn=Terminal}</text>
- <action function="page">terminalfolder</action>
+ <action function="page">terminalcommand</action>
</button>
<button style="main_button">
@@ -4011,47 +4020,6 @@
</action>
</page>
- <page name="terminalfolder">
- <template name="page"/>
-
- <text style="text_l">
- <placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{term_hdr=Terminal Command}</text>
- </text>
-
- <text style="text_m">
- <placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>{@term_sel_folder_hdr=Browse to Starting Folder}</text>
- </text>
-
- <template name="sort_options"/>
-
- <fileselector>
- <placement x="%col1_x_left%" y="%row1a_y%" w="%content_quarter_width%" h="%fileselector_filemanager_height%"/>
- <text>%tw_terminal_location%</text>
- <filter folders="1" files="0"/>
- <path name="tw_terminal_location" default="/"/>
- <data name="tw_terminal"/>
- <selection name="tw_terminal_selection"/>
- </fileselector>
-
- <button style="main_button_half_width_low">
- <placement x="%col_button_right%" y="%row16a_y%"/>
- <text>{@fm_sel_curr_folder=Select Current Folder}</text>
- <action function="page">terminalcommand</action>
- </button>
-
- <action>
- <touch key="home"/>
- <action function="page">main</action>
- </action>
-
- <action>
- <touch key="back"/>
- <action function="page">advanced</action>
- </action>
- </page>
-
<page name="terminalcommand">
<template name="page"/>
@@ -4059,41 +4027,303 @@
<placement x="0" y="%status_height%" w="%screen_width%" h="%header_height%"/>
</fill>
- <template name="console_terminal"/>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="0"/>
+ <placement x="0" y="%row3_header_y%" w="%screen_width%" h="%terminal_s_height%"/>
+ </terminal>
- <input>
- <placement x="%col1_x_left%" y="%row8_y%" w="%content_quarter_width%" h="%input_height%"/>
- <text>%tw_terminal_command%</text>
- <data name="tw_terminal_command"/>
- <restrict minlen="1"/>
- <action function="terminalcommand">%tw_terminal_command%</action>
- </input>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="1"/>
+ <placement x="0" y="%row3_header_y%" w="%screen_width%" h="%terminal_l_height%"/>
+ </terminal>
- <fill color="%accent_color%">
- <placement x="%col1_x_left%" y="row9_y" w="%content_quarter_width%" h="input_line_width" placement="1"/>
- </fill>
+ <template name="keyboardterminaltemplate"/>
- <button>
- <condition var1="tw_terminal_state" var2="1"/>
- <highlight color="%highlight_color%"/>
- <placement x="%btn4_col4_x_right%" y="%row7a_y%"/>
- <font resource="font_m" color="%text_button_color%"/>
- <text>{@term_kill_btn=Kill}</text>
- <image resource="tab_4"/>
- <action function="killterminal"/>
- </button>
+ <object type="fill" color="#000000">
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+ </object>
- <template name="keyboardtemplate"/>
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="home" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">home</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="0" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="home" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">home</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="1" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="home" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">home</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_navbar_button_position" op="=" var2="2" />
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
+ </object>
<action>
<touch key="home"/>
- <action function="page">main</action>
+ <actions>
+ <action function="page">main</action>
+ <action function="set">tw_hide_kb=0</action>
+ </actions>
</action>
<action>
<touch key="back"/>
- <action function="page">terminalfolder</action>
+ <actions>
+ <action function="page">advanced</action>
+ <action function="set">tw_hide_kb=0</action>
+ </actions>
</action>
+
+ <object type="action">
+ <touch key="power+voldown" />
+ <action function="screenshot" />
+ </object>
</page>
<page name="sideload">
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index b1ab160d1..251be75c6 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -80,6 +80,12 @@
<font resource="fixed"/>
</style>
+ <style name="terminal">
+ <fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+ <background color="%background_color%"/>
+ <font resource="fixed" spacing="3" color="%text_color%"/>
+ </style>
+
<style name="fileselector">
<highlight color="%fileselector_highlight_color%"/>
<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3167,7 +3173,7 @@
<button style="main_button">
<placement x="%indent%" y="%row13a_y%"/>
<text>{@terminal_btn=Terminal}</text>
- <action function="page">terminalfolder</action>
+ <action function="page">terminalcommand</action>
</button>
<button style="main_button">
@@ -4082,94 +4088,131 @@
</action>
</page>
- <page name="terminalfolder">
+ <page name="terminalcommand">
<template name="page"/>
- <text style="text_l">
- <placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{@term_hdr=Terminal Command}</text>
- </text>
-
- <text style="text_m">
- <placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>{@term_sel_folder_hdr=Browse to Starting Folder}</text>
- </text>
-
- <template name="sort_options"/>
-
- <fileselector>
- <placement x="%indent%" y="%row3_y%" w="%content_width%" h="%fileselector_filemanager_height%"/>
- <text>%tw_terminal_location%</text>
- <filter folders="1" files="0"/>
- <path name="tw_terminal_location" default="/"/>
- <data name="tw_terminal"/>
- <selection name="tw_terminal_selection"/>
- </fileselector>
-
- <button style="fab">
- <image resource="fab_selectfolder"/>
- <action function="page">terminalcommand</action>
- </button>
-
- <action>
- <touch key="home"/>
- <action function="page">main</action>
- </action>
-
- <action>
- <touch key="back"/>
- <action function="page">advanced</action>
- </action>
- </page>
+ <fill color="%background_color%">
+ <placement x="0" y="%row2_header_y%" w="%screen_width%" h="%slideout_bg_height%"/>
+ </fill>
- <page name="terminalcommand">
- <template name="page"/>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="0"/>
+ <placement x="0" y="%row3_header_y%" w="%screen_width%" h="%console_terminal_height%"/>
+ </terminal>
- <text style="text_l">
- <placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{term_hdr=Terminal Command}</text>
- </text>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="1"/>
+ <placement x="0" y="%row3_header_y%" w="%screen_width%" h="%slideout_height%"/>
+ </terminal>
- <text style="text_m">
- <placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>%tw_terminal_location%</text>
- </text>
+ <template name="keyboardterminaltemplate"/>
- <template name="console_terminal"/>
+ <template name="keyboardtemplate"/>
- <input>
- <placement x="%indent%" y="%row11a_y%" w="%content_width%" h="%input_height%"/>
- <text>%tw_terminal_command%</text>
- <data name="tw_terminal_command"/>
- <restrict minlen="1"/>
- <action function="terminalcommand">%tw_terminal_command%</action>
- </input>
+ <object type="fill" color="#000000">
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+ </object>
- <fill color="%accent_color%">
- <placement x="%indent%" y="row12a_y" w="%content_width%" h="input_line_width" placement="1"/>
- </fill>
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">back</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
- <button>
- <condition var1="tw_terminal_state" var2="1"/>
- <highlight color="%highlight_color%"/>
- <placement x="%btn4_col4_x%" y="%row12a_y%"/>
- <font resource="font_m" color="%text_button_color%"/>
- <text>{@term_kill_btn=Kill}</text>
- <image resource="tab_4"/>
- <action function="killterminal"/>
- </button>
+ <object type="button">
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="home" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">home</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="0" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="!=" var2="1" />
+ <condition var1="tw_hide_kb" op="=" var2="1" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
- <template name="keyboardtemplate"/>
+ <object type="button">
+ <condition var1="tw_samsung_navbar" op="=" var2="1" />
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">back</action>
+ </actions>
+ </object>
<action>
<touch key="home"/>
- <action function="page">main</action>
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">main</action>
+ </actions>
</action>
<action>
<touch key="back"/>
- <action function="page">terminalfolder</action>
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
</action>
+
+ <object type="action">
+ <touch key="power+voldown" />
+ <action function="screenshot" />
+ </object>
</page>
<page name="sideload">
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 3d68f44ff..7d343ddb9 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -77,6 +77,12 @@
<font resource="fixed"/>
</style>
+ <style name="terminal">
+ <fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+ <background color="%background_color%"/>
+ <font resource="fixed" spacing="2" color="%text_color%"/>
+ </style>
+
<style name="fileselector">
<highlight color="%fileselector_highlight_color%"/>
<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3871,7 +3877,7 @@
<button style="main_button">
<placement x="%col1_x_left%" y="%row1_y%"/>
<text>{@terminal_btn=Terminal}</text>
- <action function="page">terminalfolder</action>
+ <action function="page">terminalcommand</action>
</button>
<button style="main_button">
@@ -4934,87 +4940,87 @@
</action>
</page>
- <page name="terminalfolder">
- <template name="page"/>
-
- <template name="statusbar"/>
-
- <text style="text_m">
- <placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@term_s_hdr=Terminal} &gt; {@term_sel_folder_hdr=Browse to Starting Folder}</text>
- </text>
-
- <fileselector>
- <placement x="%col1_x_left%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
- <text>%tw_terminal_location%</text>
- <filter folders="1" files="0"/>
- <path name="tw_terminal_location" default="/"/>
- <data name="tw_terminal"/>
- <selection name="tw_terminal_selection"/>
- </fileselector>
-
- <button>
- <placement x="%btn4_col4_x%" y="%row11_y%"/>
- <highlight color="%highlight_color%"/>
- <image resource="q_btn_accept_transp"/>
- <action function="page">terminalcommand</action>
- </button>
-
- <action>
- <touch key="home"/>
- <action function="page">main</action>
- </action>
-
- <action>
- <touch key="back"/>
- <action function="page">advanced</action>
- </action>
- </page>
-
<page name="terminalcommand">
- <template name="page"/>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="0"/>
+ <placement x="0" y="0" w="%screen_width%" h="%console_terminal_s_height%"/>
+ </terminal>
- <template name="statusbar"/>
+ <terminal>
+ <condition var1="tw_hide_kb" var2="1"/>
+ <placement x="0" y="0" w="%screen_width%" h="%console_terminal_l_height%"/>
+ </terminal>
- <text style="text_m">
- <placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@term_s_hdr=Terminal} &gt; %tw_terminal_location%</text>
- </text>
+ <template name="keyboardterminaltemplate"/>
- <template name="console_terminal"/>
+ <template name="keyboardtemplate"/>
- <input>
- <placement x="%col1_x_left%" y="%row5a_y%" w="%input_line_console%" h="%input_height%"/>
- <text>%tw_terminal_command%</text>
- <data name="tw_terminal_command"/>
- <restrict minlen="1"/>
- <action function="terminalcommand">%tw_terminal_command%</action>
- </input>
+ <object type="fill" color="#000000">
+ <placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+ </object>
- <fill color="%accent_color%">
- <placement x="%col1_x_left%" y="row6a_input_y" w="%input_line_console%" h="input_line_width" placement="1"/>
- </fill>
+ <object type="button">
+ <placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="back" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">back</action>
+ </actions>
+ </object>
- <button>
- <condition var1="tw_terminal_state" var2="1"/>
- <highlight color="%highlight_color%"/>
- <placement x="%close_btn_x%" y="%row5_y%"/>
- <font resource="font_m" color="%text_button_color%"/>
- <image resource="close"/>
- <action function="killterminal"/>
- </button>
+ <object type="button">
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="home" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="key">home</action>
+ </actions>
+ </object>
- <template name="keyboardtemplate"/>
+ <object type="button">
+ <condition var1="tw_hide_kb" var2="0"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_hide" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=1</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
+
+ <object type="button">
+ <condition var1="tw_hide_kb" var2="1"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+ <image resource="kb_show" />
+ <condition var1="tw_busy" var2="0" />
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">terminalcommand</action>
+ </actions>
+ </object>
<action>
<touch key="home"/>
- <action function="page">main</action>
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">main</action>
+ </actions>
</action>
<action>
<touch key="back"/>
- <action function="page">terminalfolder</action>
+ <actions>
+ <action function="set">tw_hide_kb=0</action>
+ <action function="page">advanced</action>
+ </actions>
</action>
+
+ <object type="action">
+ <touch key="power+voldown" />
+ <action function="screenshot" />
+ </object>
</page>
<page name="sideload">