Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
libksysguard
Commits
d7ffece9
Commit
d7ffece9
authored
Sep 21, 2020
by
David Redondo
🏎
Browse files
Add watt-hour to units
Needed for future power plugin
parent
3b5914ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
formatter/Formatter.cpp
View file @
d7ffece9
...
...
@@ -75,6 +75,7 @@ static KLocalizedString unitFormat(Unit unit)
const
static
KLocalizedString
s
=
ki18nc
(
"Seconds unit symbol"
,
"%1s"
);
const
static
KLocalizedString
V
=
ki18nc
(
"Volts unit symbol"
,
"%1 V"
);
const
static
KLocalizedString
W
=
ki18nc
(
"Watts unit symbol"
,
"%1 W"
);
const
static
KLocalizedString
Wh
=
ki18nc
(
"Watt-hours unit symbol"
,
"%1 Wh"
);
const
static
KLocalizedString
rate
=
ki18nc
(
"Rate unit symbol"
,
"%1 s⁻¹"
);
const
static
KLocalizedString
unitless
=
ki18nc
(
"Unitless"
,
"%1"
);
...
...
@@ -134,6 +135,8 @@ static KLocalizedString unitFormat(Unit unit)
return
V
;
case
UnitWatt
:
return
W
;
case
UnitWattHour
:
return
Wh
;
default:
return
unitless
;
...
...
@@ -163,6 +166,8 @@ static int unitOrder(Unit unit)
case
UnitGigaHertz
:
case
UnitTeraHertz
:
case
UnitPetaHertz
:
case
UnitWatt
:
case
UnitWattHour
:
return
1000
;
default:
...
...
@@ -372,6 +377,8 @@ QString Formatter::symbol(Unit unit)
return
i18nc
(
"Volts unit symbol"
,
"V"
);
case
UnitWatt
:
return
i18nc
(
"Watts unit symbol"
,
"W"
);
case
UnitWattHour
:
return
i18nc
(
"Watt-hours unit symbol"
,
"Wh"
);
case
UnitRate
:
return
i18nc
(
"Rate unit symbol"
,
"s⁻¹"
);
...
...
formatter/Unit.h
View file @
d7ffece9
...
...
@@ -87,6 +87,7 @@ enum Unit {
UnitRpm
,
UnitVolt
,
UnitWatt
,
UnitWattHour
};
Q_ENUM_NS
(
Unit
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment