diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-11-24 12:58:31 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-11-25 14:34:14 +0100 |
| commit | 43a5dae94e82cc3792258cc9223885f380cc5063 (patch) | |
| tree | d1f742f63643248ee9c5ff82ca20da079c092865 /addons | |
| parent | 6c39aebde2402916ed4b7b9515bf8788c5168207 (diff) | |
[Estuary][guiinfo][cpuinfo] Hide CPU usage if system does not provide this information (for example: recent Android versions).
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/DialogPlayerProcessInfo.xml | 10 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/SettingsSystemInfo.xml | 18 |
2 files changed, 20 insertions, 8 deletions
diff --git a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml index 5dbbaf8361..498d0d8a71 100644 --- a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml +++ b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml @@ -183,6 +183,16 @@ <label>$INFO[System.Memory(used.percent),[COLOR button_focus]$LOCALIZE[31030]:[/COLOR] , ]$INFO[System.CpuUsage,[COLOR button_focus]$LOCALIZE[13271][/COLOR] ]</label> <font>font14</font> <shadowcolor>black</shadowcolor> + <visible>System.SupportsCPUUsage</visible> + </control> + <control type="label"> + <width>1600</width> + <height>50</height> + <aligny>bottom</aligny> + <label>$INFO[System.Memory(used.percent),[COLOR button_focus]$LOCALIZE[31030]:[/COLOR] ]</label> + <font>font14</font> + <shadowcolor>black</shadowcolor> + <visible>!System.SupportsCPUUsage</visible> </control> </control> <control type="grouplist" id="5550"> diff --git a/addons/skin.estuary/xml/SettingsSystemInfo.xml b/addons/skin.estuary/xml/SettingsSystemInfo.xml index 66282d356c..64cfafdb8c 100644 --- a/addons/skin.estuary/xml/SettingsSystemInfo.xml +++ b/addons/skin.estuary/xml/SettingsSystemInfo.xml @@ -125,35 +125,37 @@ <left>420</left> <orientation>vertical</orientation> <control type="label"> - <description>CPU Text</description> + <description>Memory Text</description> <width>730</width> <height>80</height> - <label>$LOCALIZE[13271] $INFO[System.CPUUsage]</label> + <label>$LOCALIZE[31030]: $INFO[system.memory(used)] [B]/[/B] $INFO[system.memory(total)] [B]-[/B] $INFO[system.memory(used.percent)]</label> <aligny>top</aligny> <textoffsety>40</textoffsety> <shadowcolor>black</shadowcolor> <font>font27</font> </control> <control type="progress"> - <description>CPU BAR</description> + <description>Memory BAR</description> <width>730</width> <height>16</height> - <info>System.CPUUsage</info> + <info>system.memory(used)</info> </control> <control type="label"> - <description>Memory Text</description> + <description>CPU Text</description> <width>730</width> <height>40</height> - <label>$LOCALIZE[31030]: $INFO[system.memory(used)] [B]/[/B] $INFO[system.memory(total)] [B]-[/B] $INFO[system.memory(used.percent)]</label> + <label>$LOCALIZE[13271] $INFO[System.CPUUsage]</label> <aligny>center</aligny> <shadowcolor>black</shadowcolor> <font>font27</font> + <visible>System.SupportsCPUUsage</visible> </control> <control type="progress"> - <description>Memory BAR</description> + <description>CPU BAR</description> <width>730</width> <height>16</height> - <info>system.memory(used)</info> + <info>System.CPUUsage</info> + <visible>System.SupportsCPUUsage</visible> </control> </control> <control type="label"> |