Fix wrong percentage in swap and memory usage, add about section on loads
Fixes #7
This commit is contained in:
parent
1bfce5e599
commit
af093bbbfd
4 changed files with 38 additions and 8 deletions
|
@ -29,7 +29,7 @@ Page {
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
text: "SailTime 1.1.2"
|
text: "SailTime 1.2.0"
|
||||||
color: Theme.highlightColor
|
color: Theme.highlightColor
|
||||||
font.pixelSize: Theme.fontSizeLarge
|
font.pixelSize: Theme.fontSizeLarge
|
||||||
}
|
}
|
||||||
|
@ -62,6 +62,36 @@ Page {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
onClicked: Qt.openUrlExternally("https://bitbucket.org/Nicd/sailtime");
|
onClicked: Qt.openUrlExternally("https://bitbucket.org/Nicd/sailtime");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Separator {
|
||||||
|
x: Theme.paddingLarge
|
||||||
|
width: parent.width - Theme.paddingLarge * 2
|
||||||
|
horizontalAlignment: Qt.AlignCenter
|
||||||
|
color: Theme.highlightColor
|
||||||
|
}
|
||||||
|
|
||||||
|
PageHeader {
|
||||||
|
title: "What are load averages?"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Label {
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
text: "In UNIX computing, the system load is a measure of the amount of \
|
||||||
|
computational work that a computer system performs. The load average represents the average \
|
||||||
|
system load over a period of time. It conventionally appears in the form of three numbers \
|
||||||
|
which represent the system load during the last one-, five-, and fifteen-minute periods."
|
||||||
|
color: Theme.primaryColor
|
||||||
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
width: parent.width - Theme.paddingLarge * 2
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: "Open Wikipedia description"
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
onClicked: Qt.openUrlExternally("http://en.wikipedia.org/wiki/Load_average");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ Page {
|
||||||
|
|
||||||
memlegend.text = usedram[0].toFixed(2) + " " + usedram[1] + "B/"
|
memlegend.text = usedram[0].toFixed(2) + " " + usedram[1] + "B/"
|
||||||
+ totalram[0].toFixed(2) + " " + totalram[1] + "B ("
|
+ totalram[0].toFixed(2) + " " + totalram[1] + "B ("
|
||||||
+ (usedram[0] / totalram[0] * 100).toFixed(2) + " %)";
|
+ (meminuse / sysinfo.totalram * 100).toFixed(2) + " %)";
|
||||||
|
|
||||||
|
|
||||||
// Swap bar
|
// Swap bar
|
||||||
|
@ -67,7 +67,7 @@ Page {
|
||||||
|
|
||||||
swaplegend.text = usedswap_scale[0].toFixed(2) + " " + usedswap_scale[1] + "B/"
|
swaplegend.text = usedswap_scale[0].toFixed(2) + " " + usedswap_scale[1] + "B/"
|
||||||
+ totalswap_scale[0].toFixed(2) + " " + totalswap_scale[1] + "B ("
|
+ totalswap_scale[0].toFixed(2) + " " + totalswap_scale[1] + "B ("
|
||||||
+ (usedswap_scale[0] / totalswap_scale[0] * 100).toFixed(2) + " %)";
|
+ (swapinuse / sysinfo.totalswap * 100).toFixed(2) + " %)";
|
||||||
|
|
||||||
|
|
||||||
// Processes amount
|
// Processes amount
|
||||||
|
@ -112,7 +112,7 @@ Page {
|
||||||
// PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
|
// PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
|
||||||
PullDownMenu {
|
PullDownMenu {
|
||||||
MenuItem {
|
MenuItem {
|
||||||
text: "About..."
|
text: "About SailTime"
|
||||||
onClicked: pageStack.push(aboutpage);
|
onClicked: pageStack.push(aboutpage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,11 +13,11 @@ Name: harbour-sailtime
|
||||||
%{!?qtc_make:%define qtc_make make}
|
%{!?qtc_make:%define qtc_make make}
|
||||||
%{?qtc_builddir:%define _builddir %qtc_builddir}
|
%{?qtc_builddir:%define _builddir %qtc_builddir}
|
||||||
Summary: SailTime
|
Summary: SailTime
|
||||||
Version: 1.1.2
|
Version: 1.2.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Group: Qt/Qt
|
Group: Qt/Qt
|
||||||
License: MIT Expat licence
|
License: MIT Expat licence
|
||||||
URL: http://example.org/
|
URL: https://bitbucket.org/Nicd/sailtime/
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source100: harbour-sailtime.yaml
|
Source100: harbour-sailtime.yaml
|
||||||
Requires: sailfishsilica-qt5 >= 0.10.9
|
Requires: sailfishsilica-qt5 >= 0.10.9
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
Name: harbour-sailtime
|
Name: harbour-sailtime
|
||||||
Summary: SailTime
|
Summary: SailTime
|
||||||
Version: 1.1.2
|
Version: 1.2.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Group: Qt/Qt
|
Group: Qt/Qt
|
||||||
URL: http://example.org/
|
URL: https://bitbucket.org/Nicd/sailtime/
|
||||||
License: "MIT Expat licence"
|
License: "MIT Expat licence"
|
||||||
Sources:
|
Sources:
|
||||||
- '%{name}-%{version}.tar.bz2'
|
- '%{name}-%{version}.tar.bz2'
|
||||||
|
|
Loading…
Reference in a new issue