Skip to content

Commit c76049e

Browse files
HBeluscaHBelusca
committed
[POWERCFG] Further improve the Power Meter & Battery tab (reactos#8390)
- Use battery charge level icons instead of a dummy placeholder. - Implement showing only the global power-meter (from the composite battery), in addition to the per-battery meters. - Fix the battery details dialog handling of ESC key and re-showing the already-opening dialog.
1 parent 8fabb29 commit c76049e

28 files changed

+1358
-1107
lines changed

‎dll/cpl/powercfg/lang/bg-BG.rc‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -135,55 +135,58 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
135135
CAPTION "Power Meter"
136136
FONT 8, "MS Shell Dlg"
137137
BEGIN
138-
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10, WS_TABSTOP | WS_DISABLED
138+
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10
139139
GROUPBOX "Power status", IDC_STATIC, 7, 41, 240, 170
140-
ICON IDI_HIBERNATE, IDI_HIBERNATE, 23, 54, 21, 20
140+
141+
ICON "", IDC_IPOWERSOURCE, 23, 54, 21, 20
141142
LTEXT "Current power source:", IDC_STATIC, 54, 54, 73, 10
142143
LTEXT "AC power", IDC_POWERSOURCE, 140, 54, 60, 10
143144
LTEXT "Total battery power remaining:", IDC_STATIC, 54, 64, 101, 10
144145
LTEXT "100%", IDC_POWERSTATUS, 160, 64, 50, 10
145146

146-
LTEXT "#1", IDC_BATTERY0, 24, 113, 13, 10
147-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL0, 20, 124, 21, 20, SS_NOTIFY
148-
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 127, 21, 10
149-
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 142, 38, 10
150-
151-
LTEXT "#2", IDC_BATTERY1, 80, 113, 13, 10
152-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL1, 76, 124, 21, 20, SS_NOTIFY
153-
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 127, 21, 10
154-
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 142, 38, 10
155-
156-
LTEXT "#3", IDC_BATTERY2, 136, 113, 13, 10
157-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL2, 132, 124, 21, 20, SS_NOTIFY
158-
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 127, 21, 10
159-
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 142, 38, 10
160-
161-
LTEXT "#4", IDC_BATTERY3, 192, 113, 13, 10
162-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL3, 188, 124, 21, 20, SS_NOTIFY
163-
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 127, 21, 10
164-
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 142, 38, 10
165-
166-
LTEXT "#5", IDC_BATTERY4, 24, 169, 13, 10
167-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL4, 20, 180, 21, 20, SS_NOTIFY
168-
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 183, 21, 10
169-
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 198, 38, 10
170-
171-
LTEXT "#6", IDC_BATTERY5, 80, 169, 13, 10
172-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL5, 76, 180, 21, 20, SS_NOTIFY
173-
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 183, 21, 10
174-
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 198, 38, 10
175-
176-
LTEXT "#7", IDC_BATTERY6, 136, 169, 13, 10
177-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL6, 132, 180, 21, 20, SS_NOTIFY
178-
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 183, 21, 10
179-
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 198, 38, 10
180-
181-
LTEXT "#8", IDC_BATTERY7, 192, 169, 13, 10
182-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL7, 188, 180, 21, 20, SS_NOTIFY
183-
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 183, 21, 10
184-
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 198, 38, 10
185-
186-
LTEXT "Click an individual battery icon for more information.", IDC_STATIC, 108, 230, 150, 10
147+
CONTROL "", IDC_BATTPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 14, 100, 226, 14
148+
149+
LTEXT "#1", IDC_BATTERY0, 24, 90, 13, 10
150+
ICON "", IDI_BATTERYDETAIL0, 20, 101, 21, 20, SS_NOTIFY
151+
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 104, 21, 10
152+
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 123, 38, 10
153+
154+
LTEXT "#2", IDC_BATTERY1, 80, 90, 13, 10
155+
ICON "", IDI_BATTERYDETAIL1, 76, 101, 21, 20, SS_NOTIFY
156+
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 104, 21, 10
157+
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 123, 38, 10
158+
159+
LTEXT "#3", IDC_BATTERY2, 136, 90, 13, 10
160+
ICON "", IDI_BATTERYDETAIL2, 132, 101, 21, 20, SS_NOTIFY
161+
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 104, 21, 10
162+
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 123, 38, 10
163+
164+
LTEXT "#4", IDC_BATTERY3, 192, 90, 13, 10
165+
ICON "", IDI_BATTERYDETAIL3, 188, 101, 21, 20, SS_NOTIFY
166+
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 104, 21, 10
167+
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 123, 38, 10
168+
169+
LTEXT "#5", IDC_BATTERY4, 24, 145, 13, 10
170+
ICON "", IDI_BATTERYDETAIL4, 20, 156, 21, 20, SS_NOTIFY
171+
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 159, 21, 10
172+
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 178, 38, 10
173+
174+
LTEXT "#6", IDC_BATTERY5, 80, 145, 13, 10
175+
ICON "", IDI_BATTERYDETAIL5, 76, 156, 21, 20, SS_NOTIFY
176+
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 159, 21, 10
177+
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 178, 38, 10
178+
179+
LTEXT "#7", IDC_BATTERY6, 136, 145, 13, 10
180+
ICON "", IDI_BATTERYDETAIL6, 132, 156, 21, 20, SS_NOTIFY
181+
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 159, 21, 10
182+
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 178, 38, 10
183+
184+
LTEXT "#8", IDC_BATTERY7, 192, 145, 13, 10
185+
ICON "", IDI_BATTERYDETAIL7, 188, 156, 21, 20, SS_NOTIFY
186+
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 159, 21, 10
187+
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 178, 38, 10
188+
189+
CTEXT "Click an individual battery icon for more information.", IDC_CLICKBATTINFO, 20, 197, 215, 10
187190
END
188191

189192
IDD_POWERMETERDETAILS DIALOGEX 0, 0, 263, 156

‎dll/cpl/powercfg/lang/cs-CZ.rc‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -144,55 +144,58 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
144144
CAPTION "Power Meter"
145145
FONT 8, "MS Shell Dlg"
146146
BEGIN
147-
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10, WS_TABSTOP | WS_DISABLED
147+
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10
148148
GROUPBOX "Power status", IDC_STATIC, 7, 41, 240, 170
149-
ICON IDI_HIBERNATE, IDI_HIBERNATE, 23, 54, 21, 20
149+
150+
ICON "", IDC_IPOWERSOURCE, 23, 54, 21, 20
150151
LTEXT "Current power source:", IDC_STATIC, 54, 54, 73, 10
151152
LTEXT "AC power", IDC_POWERSOURCE, 140, 54, 60, 10
152153
LTEXT "Total battery power remaining:", IDC_STATIC, 54, 64, 101, 10
153154
LTEXT "100%", IDC_POWERSTATUS, 160, 64, 50, 10
154155

155-
LTEXT "#1", IDC_BATTERY0, 24, 113, 13, 10
156-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL0, 20, 124, 21, 20, SS_NOTIFY
157-
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 127, 21, 10
158-
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 142, 38, 10
156+
CONTROL "", IDC_BATTPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 14, 100, 226, 14
157+
158+
LTEXT "#1", IDC_BATTERY0, 24, 90, 13, 10
159+
ICON "", IDI_BATTERYDETAIL0, 20, 101, 21, 20, SS_NOTIFY
160+
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 104, 21, 10
161+
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 123, 38, 10
159162

160-
LTEXT "#2", IDC_BATTERY1, 80, 113, 13, 10
161-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL1, 76, 124, 21, 20, SS_NOTIFY
162-
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 127, 21, 10
163-
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 142, 38, 10
163+
LTEXT "#2", IDC_BATTERY1, 80, 90, 13, 10
164+
ICON "", IDI_BATTERYDETAIL1, 76, 101, 21, 20, SS_NOTIFY
165+
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 104, 21, 10
166+
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 123, 38, 10
164167

165-
LTEXT "#3", IDC_BATTERY2, 136, 113, 13, 10
166-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL2, 132, 124, 21, 20, SS_NOTIFY
167-
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 127, 21, 10
168-
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 142, 38, 10
168+
LTEXT "#3", IDC_BATTERY2, 136, 90, 13, 10
169+
ICON "", IDI_BATTERYDETAIL2, 132, 101, 21, 20, SS_NOTIFY
170+
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 104, 21, 10
171+
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 123, 38, 10
169172

170-
LTEXT "#4", IDC_BATTERY3, 192, 113, 13, 10
171-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL3, 188, 124, 21, 20, SS_NOTIFY
172-
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 127, 21, 10
173-
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 142, 38, 10
173+
LTEXT "#4", IDC_BATTERY3, 192, 90, 13, 10
174+
ICON "", IDI_BATTERYDETAIL3, 188, 101, 21, 20, SS_NOTIFY
175+
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 104, 21, 10
176+
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 123, 38, 10
174177

175-
LTEXT "#5", IDC_BATTERY4, 24, 169, 13, 10
176-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL4, 20, 180, 21, 20, SS_NOTIFY
177-
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 183, 21, 10
178-
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 198, 38, 10
178+
LTEXT "#5", IDC_BATTERY4, 24, 145, 13, 10
179+
ICON "", IDI_BATTERYDETAIL4, 20, 156, 21, 20, SS_NOTIFY
180+
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 159, 21, 10
181+
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 178, 38, 10
179182

180-
LTEXT "#6", IDC_BATTERY5, 80, 169, 13, 10
181-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL5, 76, 180, 21, 20, SS_NOTIFY
182-
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 183, 21, 10
183-
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 198, 38, 10
183+
LTEXT "#6", IDC_BATTERY5, 80, 145, 13, 10
184+
ICON "", IDI_BATTERYDETAIL5, 76, 156, 21, 20, SS_NOTIFY
185+
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 159, 21, 10
186+
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 178, 38, 10
184187

185-
LTEXT "#7", IDC_BATTERY6, 136, 169, 13, 10
186-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL6, 132, 180, 21, 20, SS_NOTIFY
187-
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 183, 21, 10
188-
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 198, 38, 10
188+
LTEXT "#7", IDC_BATTERY6, 136, 145, 13, 10
189+
ICON "", IDI_BATTERYDETAIL6, 132, 156, 21, 20, SS_NOTIFY
190+
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 159, 21, 10
191+
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 178, 38, 10
189192

190-
LTEXT "#8", IDC_BATTERY7, 192, 169, 13, 10
191-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL7, 188, 180, 21, 20, SS_NOTIFY
192-
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 183, 21, 10
193-
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 198, 38, 10
193+
LTEXT "#8", IDC_BATTERY7, 192, 145, 13, 10
194+
ICON "", IDI_BATTERYDETAIL7, 188, 156, 21, 20, SS_NOTIFY
195+
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 159, 21, 10
196+
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 178, 38, 10
194197

195-
LTEXT "Click an individual battery icon for more information.", IDC_STATIC, 108, 230, 150, 10
198+
CTEXT "Click an individual battery icon for more information.", IDC_CLICKBATTINFO, 20, 197, 215, 10
196199
END
197200

198201
IDD_POWERMETERDETAILS DIALOGEX 0, 0, 263, 156

‎dll/cpl/powercfg/lang/de-DE.rc‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -137,55 +137,58 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
137137
CAPTION "Power Meter"
138138
FONT 8, "MS Shell Dlg"
139139
BEGIN
140-
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10, WS_TABSTOP | WS_DISABLED
140+
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10
141141
GROUPBOX "Power status", IDC_STATIC, 7, 41, 240, 170
142-
ICON IDI_HIBERNATE, IDI_HIBERNATE, 23, 54, 21, 20
142+
143+
ICON "", IDC_IPOWERSOURCE, 23, 54, 21, 20
143144
LTEXT "Current power source:", IDC_STATIC, 54, 54, 73, 10
144145
LTEXT "AC power", IDC_POWERSOURCE, 140, 54, 60, 10
145146
LTEXT "Total battery power remaining:", IDC_STATIC, 54, 64, 101, 10
146147
LTEXT "100%", IDC_POWERSTATUS, 160, 64, 50, 10
147148

148-
LTEXT "#1", IDC_BATTERY0, 24, 113, 13, 10
149-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL0, 20, 124, 21, 20, SS_NOTIFY
150-
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 127, 21, 10
151-
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 142, 38, 10
152-
153-
LTEXT "#2", IDC_BATTERY1, 80, 113, 13, 10
154-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL1, 76, 124, 21, 20, SS_NOTIFY
155-
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 127, 21, 10
156-
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 142, 38, 10
157-
158-
LTEXT "#3", IDC_BATTERY2, 136, 113, 13, 10
159-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL2, 132, 124, 21, 20, SS_NOTIFY
160-
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 127, 21, 10
161-
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 142, 38, 10
162-
163-
LTEXT "#4", IDC_BATTERY3, 192, 113, 13, 10
164-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL3, 188, 124, 21, 20, SS_NOTIFY
165-
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 127, 21, 10
166-
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 142, 38, 10
167-
168-
LTEXT "#5", IDC_BATTERY4, 24, 169, 13, 10
169-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL4, 20, 180, 21, 20, SS_NOTIFY
170-
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 183, 21, 10
171-
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 198, 38, 10
172-
173-
LTEXT "#6", IDC_BATTERY5, 80, 169, 13, 10
174-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL5, 76, 180, 21, 20, SS_NOTIFY
175-
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 183, 21, 10
176-
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 198, 38, 10
177-
178-
LTEXT "#7", IDC_BATTERY6, 136, 169, 13, 10
179-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL6, 132, 180, 21, 20, SS_NOTIFY
180-
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 183, 21, 10
181-
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 198, 38, 10
182-
183-
LTEXT "#8", IDC_BATTERY7, 192, 169, 13, 10
184-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL7, 188, 180, 21, 20, SS_NOTIFY
185-
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 183, 21, 10
186-
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 198, 38, 10
187-
188-
LTEXT "Click an individual battery icon for more information.", IDC_STATIC, 108, 230, 150, 10
149+
CONTROL "", IDC_BATTPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 14, 100, 226, 14
150+
151+
LTEXT "#1", IDC_BATTERY0, 24, 90, 13, 10
152+
ICON "", IDI_BATTERYDETAIL0, 20, 101, 21, 20, SS_NOTIFY
153+
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 104, 21, 10
154+
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 123, 38, 10
155+
156+
LTEXT "#2", IDC_BATTERY1, 80, 90, 13, 10
157+
ICON "", IDI_BATTERYDETAIL1, 76, 101, 21, 20, SS_NOTIFY
158+
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 104, 21, 10
159+
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 123, 38, 10
160+
161+
LTEXT "#3", IDC_BATTERY2, 136, 90, 13, 10
162+
ICON "", IDI_BATTERYDETAIL2, 132, 101, 21, 20, SS_NOTIFY
163+
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 104, 21, 10
164+
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 123, 38, 10
165+
166+
LTEXT "#4", IDC_BATTERY3, 192, 90, 13, 10
167+
ICON "", IDI_BATTERYDETAIL3, 188, 101, 21, 20, SS_NOTIFY
168+
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 104, 21, 10
169+
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 123, 38, 10
170+
171+
LTEXT "#5", IDC_BATTERY4, 24, 145, 13, 10
172+
ICON "", IDI_BATTERYDETAIL4, 20, 156, 21, 20, SS_NOTIFY
173+
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 159, 21, 10
174+
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 178, 38, 10
175+
176+
LTEXT "#6", IDC_BATTERY5, 80, 145, 13, 10
177+
ICON "", IDI_BATTERYDETAIL5, 76, 156, 21, 20, SS_NOTIFY
178+
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 159, 21, 10
179+
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 178, 38, 10
180+
181+
LTEXT "#7", IDC_BATTERY6, 136, 145, 13, 10
182+
ICON "", IDI_BATTERYDETAIL6, 132, 156, 21, 20, SS_NOTIFY
183+
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 159, 21, 10
184+
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 178, 38, 10
185+
186+
LTEXT "#8", IDC_BATTERY7, 192, 145, 13, 10
187+
ICON "", IDI_BATTERYDETAIL7, 188, 156, 21, 20, SS_NOTIFY
188+
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 159, 21, 10
189+
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 178, 38, 10
190+
191+
CTEXT "Click an individual battery icon for more information.", IDC_CLICKBATTINFO, 20, 197, 215, 10
189192
END
190193

191194
IDD_POWERMETERDETAILS DIALOGEX 0, 0, 263, 156

‎dll/cpl/powercfg/lang/el-GR.rc‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -137,55 +137,58 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
137137
CAPTION "Power Meter"
138138
FONT 8, "MS Shell Dlg"
139139
BEGIN
140-
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10, WS_TABSTOP | WS_DISABLED
140+
AUTOCHECKBOX "Show details for each &battery", IDC_SHOWDETAILS, 7, 10, 190, 10
141141
GROUPBOX "Power status", IDC_STATIC, 7, 41, 240, 170
142-
ICON IDI_HIBERNATE, IDI_HIBERNATE, 23, 54, 21, 20
142+
143+
ICON "", IDC_IPOWERSOURCE, 23, 54, 21, 20
143144
LTEXT "Current power source:", IDC_STATIC, 54, 54, 73, 10
144145
LTEXT "AC power", IDC_POWERSOURCE, 140, 54, 60, 10
145146
LTEXT "Total battery power remaining:", IDC_STATIC, 54, 64, 101, 10
146147
LTEXT "100%", IDC_POWERSTATUS, 160, 64, 50, 10
147148

148-
LTEXT "#1", IDC_BATTERY0, 24, 113, 13, 10
149-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL0, 20, 124, 21, 20, SS_NOTIFY
150-
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 127, 21, 10
151-
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 142, 38, 10
152-
153-
LTEXT "#2", IDC_BATTERY1, 80, 113, 13, 10
154-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL1, 76, 124, 21, 20, SS_NOTIFY
155-
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 127, 21, 10
156-
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 142, 38, 10
157-
158-
LTEXT "#3", IDC_BATTERY2, 136, 113, 13, 10
159-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL2, 132, 124, 21, 20, SS_NOTIFY
160-
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 127, 21, 10
161-
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 142, 38, 10
162-
163-
LTEXT "#4", IDC_BATTERY3, 192, 113, 13, 10
164-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL3, 188, 124, 21, 20, SS_NOTIFY
165-
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 127, 21, 10
166-
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 142, 38, 10
167-
168-
LTEXT "#5", IDC_BATTERY4, 24, 169, 13, 10
169-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL4, 20, 180, 21, 20, SS_NOTIFY
170-
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 183, 21, 10
171-
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 198, 38, 10
172-
173-
LTEXT "#6", IDC_BATTERY5, 80, 169, 13, 10
174-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL5, 76, 180, 21, 20, SS_NOTIFY
175-
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 183, 21, 10
176-
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 198, 38, 10
177-
178-
LTEXT "#7", IDC_BATTERY6, 136, 169, 13, 10
179-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL6, 132, 180, 21, 20, SS_NOTIFY
180-
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 183, 21, 10
181-
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 198, 38, 10
182-
183-
LTEXT "#8", IDC_BATTERY7, 192, 169, 13, 10
184-
ICON IDI_HIBERNATE, IDI_BATTERYDETAIL7, 188, 180, 21, 20, SS_NOTIFY
185-
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 183, 21, 10
186-
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 198, 38, 10
187-
188-
LTEXT "Click an individual battery icon for more information.", IDC_STATIC, 108, 230, 150, 10
149+
CONTROL "", IDC_BATTPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 14, 100, 226, 14
150+
151+
LTEXT "#1", IDC_BATTERY0, 24, 90, 13, 10
152+
ICON "", IDI_BATTERYDETAIL0, 20, 101, 21, 20, SS_NOTIFY
153+
LTEXT "100%", IDC_BATTERYPERCENT0, 46, 104, 21, 10
154+
LTEXT "Charging", IDC_BATTERYCHARGING0, 24, 123, 38, 10
155+
156+
LTEXT "#2", IDC_BATTERY1, 80, 90, 13, 10
157+
ICON "", IDI_BATTERYDETAIL1, 76, 101, 21, 20, SS_NOTIFY
158+
LTEXT "100%", IDC_BATTERYPERCENT1, 102, 104, 21, 10
159+
LTEXT "Charging", IDC_BATTERYCHARGING1, 80, 123, 38, 10
160+
161+
LTEXT "#3", IDC_BATTERY2, 136, 90, 13, 10
162+
ICON "", IDI_BATTERYDETAIL2, 132, 101, 21, 20, SS_NOTIFY
163+
LTEXT "100%", IDC_BATTERYPERCENT2, 158, 104, 21, 10
164+
LTEXT "Charging", IDC_BATTERYCHARGING2, 136, 123, 38, 10
165+
166+
LTEXT "#4", IDC_BATTERY3, 192, 90, 13, 10
167+
ICON "", IDI_BATTERYDETAIL3, 188, 101, 21, 20, SS_NOTIFY
168+
LTEXT "100%", IDC_BATTERYPERCENT3, 214, 104, 21, 10
169+
LTEXT "Charging", IDC_BATTERYCHARGING3, 192, 123, 38, 10
170+
171+
LTEXT "#5", IDC_BATTERY4, 24, 145, 13, 10
172+
ICON "", IDI_BATTERYDETAIL4, 20, 156, 21, 20, SS_NOTIFY
173+
LTEXT "100%", IDC_BATTERYPERCENT4, 46, 159, 21, 10
174+
LTEXT "Charging", IDC_BATTERYCHARGING4, 24, 178, 38, 10
175+
176+
LTEXT "#6", IDC_BATTERY5, 80, 145, 13, 10
177+
ICON "", IDI_BATTERYDETAIL5, 76, 156, 21, 20, SS_NOTIFY
178+
LTEXT "100%", IDC_BATTERYPERCENT5, 102, 159, 21, 10
179+
LTEXT "Charging", IDC_BATTERYCHARGING5, 80, 178, 38, 10
180+
181+
LTEXT "#7", IDC_BATTERY6, 136, 145, 13, 10
182+
ICON "", IDI_BATTERYDETAIL6, 132, 156, 21, 20, SS_NOTIFY
183+
LTEXT "100%", IDC_BATTERYPERCENT6, 158, 159, 21, 10
184+
LTEXT "Charging", IDC_BATTERYCHARGING6, 136, 178, 38, 10
185+
186+
LTEXT "#8", IDC_BATTERY7, 192, 145, 13, 10
187+
ICON "", IDI_BATTERYDETAIL7, 188, 156, 21, 20, SS_NOTIFY
188+
LTEXT "100%", IDC_BATTERYPERCENT7, 214, 159, 21, 10
189+
LTEXT "Charging", IDC_BATTERYCHARGING7, 192, 178, 38, 10
190+
191+
CTEXT "Click an individual battery icon for more information.", IDC_CLICKBATTINFO, 20, 197, 215, 10
189192
END
190193

191194
IDD_POWERMETERDETAILS DIALOGEX 0, 0, 263, 156

0 commit comments

Comments
 (0)