30 Nov
2007
30 Nov
'07
6:52 p.m.
Author: fireball
Date: Fri Nov 30 21:52:33 2007
New Revision: 30919
URL: http://svn.reactos.org/svn/reactos?rev=30919&view=rev
Log:
Dmitry Chapyshev <lentind(a)yandex.ru>
- Add power scheme delete removing function.
- Improve design of english resources.
- Add new strings to all resources.
- Add hibernate.ico icon and update screen.ico.
Added:
trunk/reactos/dll/cpl/powercfg/resources/hibernate.ico (with props)
Modified:
trunk/reactos/dll/cpl/powercfg/advanced.c
trunk/reactos/dll/cpl/powercfg/alarms.c
trunk/reactos/dll/cpl/powercfg/hibernate.c
trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc
trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc
trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc
trunk/reactos/dll/cpl/powercfg/lang/en-US.rc
trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc
trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc
trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc
trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc
trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc
trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc
trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc
trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc
trunk/reactos/dll/cpl/powercfg/powercfg.c
trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
trunk/reactos/dll/cpl/powercfg/powercfg.rc
trunk/reactos/dll/cpl/powercfg/powershemes.c
trunk/reactos/dll/cpl/powercfg/resource.h
trunk/reactos/dll/cpl/powercfg/resources/screen.ico
Modified: trunk/reactos/dll/cpl/powercfg/advanced.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/advanced.c (original)
+++ trunk/reactos/dll/cpl/powercfg/advanced.c Fri Nov 30 21:52:33 2007
@@ -7,6 +7,7 @@
* PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net)
* Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
* Martin Rottensteiner
+ * Dmitry Chapyshev (lentind(a)yandex.ru)
*/
//#ifndef NSTATUS
Modified: trunk/reactos/dll/cpl/powercfg/alarms.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/alarms.c (original)
+++ trunk/reactos/dll/cpl/powercfg/alarms.c Fri Nov 30 21:52:33 2007
@@ -7,6 +7,7 @@
* PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net)
* Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
* Martin Rottensteiner
+ * Dmitry Chapyshev (lentind(a)yandex.ru)
*/
Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/hibernate.c (original)
+++ trunk/reactos/dll/cpl/powercfg/hibernate.c Fri Nov 30 21:52:33 2007
@@ -7,6 +7,7 @@
* PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net)
* Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
* Martin Rottensteiner
+ * Dmitry Chapyshev (lentind(a)yandex.ru)
*/
//#ifndef NSTATUS
Modified: trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/bg-B…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc Fri Nov 30 21:52:33 2007
@@ -158,7 +158,11 @@
IDS_TIMEOUT14 "Ñëåä 4 ÷àñà"
IDS_TIMEOUT15 "Ñëåä 5 ÷àñà"
IDS_TIMEOUT16 "Íèêîãà"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/cs-C…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc Fri Nov 30 21:52:33 2007
@@ -158,5 +158,9 @@
IDS_TIMEOUT14 "Po 4 hodinách"
IDS_TIMEOUT15 "Po 5 hodinách"
IDS_TIMEOUT16 "Nikdy"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc Fri Nov 30 21:52:33 2007
@@ -159,4 +159,6 @@
IDS_TIMEOUT15 "Nach 5 Stunden"
IDS_TIMEOUT16 "Nie"
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/en-US.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/en-US.rc Fri Nov 30 21:52:33 2007
@@ -2,119 +2,119 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Power Schemes"
FONT 8, "MS Shell Dlg"
BEGIN
- ICON IDI_ACDC, IDI_ACDC, 7,7,28,22
+ ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
LTEXT "Select the power scheme with the most appropriate settings for this
computer. Note that changing the settings below will modify the selected scheme.",
- -1,45,13,194,36
- GROUPBOX "P&ower schemes", -1, 7,57,240,46
- COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Save As...", -1, 100,85,75,15,WS_DISABLED
- PUSHBUTTON "&Delete", -1, 180,85,55,15,WS_DISABLED
- GROUPBOX "Unknown", IDC_GRPDETAIL, 7,108,240,105
- LTEXT "When computer is:",IDC_SAT,15,120,60,10
- LTEXT "Plugged in",IDC_SAC,100,120,45,15
- ICON IDI_AC, IDC_IAC, 75,115,25,15
- LTEXT "Running on batteries",IDC_SDC,197,120,45,15
- ICON IDI_DC, IDC_IDC, 165,115,25,15
- LTEXT "Turn off &monitor:",IDC_MONITOR,15,145,80,10
- COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Turn off hard d&isks:",IDC_DISK,15,160,80,10
- COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "System s&tandby:",IDC_STANDBY,15,180,80,10
- COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "System &hibernates:",IDC_HYBERNATE,15,195,80,10
- COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
- COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ -1,37, 6, 209, 36
+ GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50
+ COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL
+ PUSHBUTTON "&Save As...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+ PUSHBUTTON "&Delete", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+ GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136
+ LTEXT "When computer is:",IDC_SAT, 12, 109, 60, 12
+ LTEXT "Plugged in",IDC_SAC, 123, 110, 45, 15
+ ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
+ LTEXT "Running on batteries",IDC_SDC, 195, 110, 45, 15
+ ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
+ LTEXT "Turn off &monitor:",IDC_MONITOR, 13, 148, 84, 10
+ COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ LTEXT "Turn off hard d&isks:",IDC_DISK, 13, 171, 84, 10
+ COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "System s&tandby:",IDC_STANDBY, 13, 191, 84, 10
+ COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ LTEXT "System &hibernates:",IDC_HYBERNATE, 13, 212, 84, 10
+ COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+ COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
END
-IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 252, 237
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Alarms"
FONT 8, "MS Shell Dlg"
BEGIN
- GROUPBOX "Low battery alarm",-1,10,15,235,95
+ GROUPBOX "Low battery alarm",-1, 6, 7, 239, 104
CONTROL "Activate &low battery alarm when power level
reaches:",IDC_ALARM1,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15
- LTEXT "unknown",IDC_ALARMVALUE1,200,25,40,10
- LTEXT "0%",-1,20,40,15,15
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15
+ LTEXT "unknown",IDC_ALARMVALUE1, 209, 20, 33, 10
+ LTEXT "0%",-1, 28, 43, 15, 10
CONTROL
"Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ |
- TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15
- LTEXT "100%",-1,215,40,25,10
- PUSHBUTTON "Alar&m Action...",-1,20,70,70,15,WS_DISABLED
- LTEXT "Notification:",-1,95,70,50,10
- LTEXT "Unknown",IDC_ALARMMSG1,145,70,95,10
- LTEXT "Action:",-1,95,80,45,10
- LTEXT "Unknown",IDC_ALARMAKTION1,145,80,95,10
- LTEXT "Run Program:",-1,95,90,50,10
- LTEXT "Unknown",IDC_ALARMPROG1,150,90,40,10
+ TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
+ LTEXT "100%", -1, 214, 43, 25, 10
+ PUSHBUTTON "Alar&m Action...",-1, 17, 69, 70, 14,WS_DISABLED
+ LTEXT "Notification:",-1, 95, 71, 57, 10
+ LTEXT "Unknown",IDC_ALARMMSG1, 154, 71, 84, 10
+ LTEXT "Action:",-1, 95, 83, 55, 10
+ LTEXT "Unknown",IDC_ALARMAKTION1, 154, 83, 84, 10
+ LTEXT "Run Program:",-1, 95, 95, 55, 10
+ LTEXT "Unknown",IDC_ALARMPROG1, 154, 95, 84, 10
- GROUPBOX "Critical battery alarm",-1,10,115,235,95
+ GROUPBOX "Critical battery alarm",-1, 6, 120, 239, 106
CONTROL "Activate &low battery alarm when power level
reaches:",IDC_ALARM2,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15
- LTEXT "unknown",IDC_ALARMVALUE2,200,125,40,10
- LTEXT "0%",-1,20,140,15,15
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15
+ LTEXT "unknown",IDC_ALARMVALUE2, 209, 133, 33, 10
+ LTEXT "0%",-1, 28, 154, 15, 10
CONTROL
"Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ |
- TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15
- LTEXT "100%",-1,215,140,25,10
- PUSHBUTTON "Alar&m Action...",-1,20,170,70,15,WS_DISABLED
- LTEXT "Notification:",-1,95,170,50,10
- LTEXT "Unknown",IDC_ALARMMSG2,145,170,95,10
- LTEXT "Action:",-1,95,180,45,10
- LTEXT "Unknown",IDC_ALARMAKTION2,145,180,95,10
- LTEXT "Run Program:",-1,95,190,50,10
- LTEXT "Unknown",IDC_ALARMPROG2,150,190,40,10
+ TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
+ LTEXT "100%",-1, 214, 154, 25, 10
+ PUSHBUTTON "Alar&m Action...",-1, 17, 183, 70, 14, WS_DISABLED
+ LTEXT "Notification:",-1, 95, 185, 50, 10
+ LTEXT "Unknown",IDC_ALARMMSG2, 154, 185, 84, 10
+ LTEXT "Action:",-1, 95, 198, 45, 10
+ LTEXT "Unknown",IDC_ALARMAKTION2, 154, 198, 84, 10
+ LTEXT "Run Program:",-1, 95, 211, 50, 10
+ LTEXT "Unknown",IDC_ALARMPROG2, 154, 211, 84, 10
END
-IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 252, 237
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Advanced"
FONT 8, "MS Shell Dlg"
BEGIN
- ICON IDI_ACDC,IDI_ACDC,5,5,20,20
- LTEXT "Select the power-saving settings you want to
use.",-1,30,5,205,20
- GROUPBOX "Options",-1,5,35,225,55
+ ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20
+ LTEXT "Select the power-saving settings you want to use.",-1, 37,
6, 207, 20
+ GROUPBOX "Options",-1, 6, 30, 240, 65
CONTROL "Alway&s show icon on the
taskbar",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,15,45,200,10
+ WS_TABSTOP, 17, 43, 220, 10
CONTROL "&Prompt for password when computer resumes from
standby",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,15,55,200,10
- CONTROL "&Dim display when running on
batteries.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,15,65,200,10
- GROUPBOX "Power buttons",-1,5,100,230,105
- LTEXT "&When I close the lid of my portable computer:",
IDC_SLIDCLOSE,10,110,210,10
- COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT |
+ WS_TABSTOP, 17, 60, 220, 10
+ CONTROL "&Dim display when running on
batteries",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP, 17, 78, 220, 10
+ GROUPBOX "Power buttons",-1, 6, 101, 240, 127
+ LTEXT "&When I close the lid of my portable computer:",
IDC_SLIDCLOSE, 15, 115, 222, 10
+ COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Wh&en I press the power button on my computer:",
IDC_SPOWERBUTTON,10,135,210,10
- COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT |
+ LTEXT "Wh&en I press the power button on my computer:",
IDC_SPOWERBUTTON, 15, 153, 222, 10
+ COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Whe&n I press the sleep button on my computer:",
IDC_SSLEEPBUTTON,10,165,210,10
- COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT |
+ LTEXT "Whe&n I press the sleep button on my computer:",
IDC_SSLEEPBUTTON, 15, 191, 222, 10
+ COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
END
-IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 252, 237
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Hibernate"
FONT 8, "MS Shell Dlg"
BEGIN
- ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20
+ ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20
LTEXT "When your computer hibernates, it stores whatever it has in
memory on your hard disk and then shuts down. When your computer comes out of hibernation,
it returns to its previous state. ",
- -1,35,5,195,35
- GROUPBOX "Hibernate",-1,5,45,235,25
+ -1, 37, 6, 210, 35
+ GROUPBOX "Hibernate",-1, 6, 41, 240, 32
CONTROL "Enable
&hibernation",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,55,210,10
- GROUPBOX "Disk space for hibernation",-1,5,80,240,60
- LTEXT "Free disk space:",-1,10,90,100,10
- LTEXT "Unknown",IDC_FREESPACE,120,90,70,10
- LTEXT "Disk space required to hibernate:",-1,10,100,115,10
- LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE,120,100,55,10
- LTEXT "You must free some disk space before your computer can
hibernate. ",IDC_TOLESSFREESPACE,10,115,220,20
+ WS_TABSTOP, 17, 55, 210, 10
+ GROUPBOX "Disk space for hibernation",-1, 6, 80, 240, 76
+ LTEXT "Free disk space:",-1, 15, 95, 140, 10
+ LTEXT "Unknown",IDC_FREESPACE, 160, 95, 80, 10
+ LTEXT "Disk space required to hibernate:",-1, 15, 115, 140, 10
+ LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+ LTEXT "You must free some disk space before your computer can
hibernate. ",IDC_TOLESSFREESPACE, 15, 135, 224, 20
END
STRINGTABLE
@@ -158,5 +158,9 @@
IDS_TIMEOUT14 "After 4 hours"
IDS_TIMEOUT15 "After 5 hours"
IDS_TIMEOUT16 "Never"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/fr-F…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc Fri Nov 30 21:52:33 2007
@@ -158,5 +158,9 @@
IDS_TIMEOUT14 "Après 4 heures"
IDS_TIMEOUT15 "Après 5 heures"
IDS_TIMEOUT16 "Jamais"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/id-I…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc Fri Nov 30 21:52:33 2007
@@ -158,5 +158,9 @@
IDS_TIMEOUT14 "Setelah 4 jam"
IDS_TIMEOUT15 "Setelah 5 jam"
IDS_TIMEOUT16 "Tidak pernah"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc Fri Nov 30 21:52:33 2007
@@ -173,4 +173,7 @@
IDS_TIMEOUT14 "Dopo 4 ore"
IDS_TIMEOUT15 "Dopo 5 ore"
IDS_TIMEOUT16 "Mai"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
Modified: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc Fri Nov 30 21:52:33 2007
@@ -158,6 +158,10 @@
IDS_TIMEOUT14 "Na 4 uur"
IDS_TIMEOUT15 "Na 5 uur"
IDS_TIMEOUT16 "Nooit"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc Fri Nov 30 21:52:33 2007
@@ -161,5 +161,9 @@
IDS_TIMEOUT14 "Po 4 godzinach"
IDS_TIMEOUT15 "Po 5 godzinach"
IDS_TIMEOUT16 "Nigdy"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc Fri Nov 30 21:52:33 2007
@@ -158,7 +158,11 @@
IDS_TIMEOUT14 "÷åðåç 4 ÷àñà"
IDS_TIMEOUT15 "÷åðåç 5 ÷àñîâ"
IDS_TIMEOUT16 "íèêîãäà"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc Fri Nov 30 21:52:33 2007
@@ -156,5 +156,9 @@
IDS_TIMEOUT14 "ËÅѧ¨Ò¡ 4 ªÑèÇâÁ§"
IDS_TIMEOUT15 "ËÅѧ¨Ò¡ 5 ªÑèÇâÁ§"
IDS_TIMEOUT16 "äÁèµÑ駤èÒ"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Fri Nov 30 21:52:33 2007
@@ -164,6 +164,10 @@
IDS_TIMEOUT14 "÷åðåç 4 ãîäèíè"
IDS_TIMEOUT15 "÷åðåç 5 ãîäèí"
IDS_TIMEOUT16 "í³êîëè"
+
+ IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?"
+ IDS_DEL_SCHEME_TITLE "Delete Scheme"
END
+
Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.c (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.c Fri Nov 30 21:52:33 2007
@@ -7,6 +7,7 @@
* PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net)
* Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
* Martin Rottensteiner
+ * Dmitry Chapyshev (lentind(a)yandex.ru)
*/
#include <windows.h>
@@ -220,3 +221,4 @@
return TRUE;
}
+
Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Fri Nov 30 21:52:33 2007
@@ -12,6 +12,7 @@
<library>comctl32</library>
<library>shell32</library>
<library>msvcrt</library>
+ <library>advapi32</library>
<file>powercfg.c</file>
<file>powershemes.c</file>
<file>alarms.c</file>
Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Fri Nov 30 21:52:33 2007
@@ -13,9 +13,10 @@
123 24 DISCARDABLE "manifest.xml"
-IDI_AC ICON "resources/ac.ico"
-IDI_ACDC ICON "resources/acdc.ico"
-IDI_DC ICON "resources/dc.ico"
-IDI_SCREEN ICON "resources/screen.ico"
+IDI_AC ICON "resources/ac.ico"
+IDI_ACDC ICON "resources/acdc.ico"
+IDI_DC ICON "resources/dc.ico"
+IDI_SCREEN ICON "resources/screen.ico"
+IDI_HIBERNATE ICON "resources/hibernate.ico"
#include "rsrc.rc"
Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powershemes.c (original)
+++ trunk/reactos/dll/cpl/powercfg/powershemes.c Fri Nov 30 21:52:33 2007
@@ -7,6 +7,7 @@
* PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net)
* Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
* Martin Rottensteiner
+ * Dmitry Chapyshev (lentind(a)yandex.ru)
*/
#include <windows.h>
@@ -46,6 +47,7 @@
POWER_POLICY gPP[MAX_POWER_POLICY];
UINT guiIndex = 0;
+HWND hwndDialog;
void LoadConfig(HWND hwndDlg);
void Pos_InitPage(HWND hwndDlg);
@@ -54,6 +56,44 @@
BOOLEAN CreateEnergyList(HWND hwnd);
+
+static
+BOOLEAN DelScheme(HWND hwnd)
+{
+ INT iCurSel;
+ HWND hList;
+ TCHAR szBuf[1024], szBufT[1024];
+ UINT DelScheme;
+
+ hList = GetDlgItem(hwnd, IDC_ENERGYLIST);
+
+ iCurSel = SendMessage(hList, CB_GETCURSEL, 0, 0);
+ if (iCurSel == CB_ERR) return FALSE;
+
+ SendMessage(hList, CB_SETCURSEL, iCurSel, 0);
+
+ DelScheme = SendMessage(hList, CB_GETITEMDATA, (WPARAM)iCurSel, 0);
+ if (DelScheme == (UINT)CB_ERR) return FALSE;
+
+ LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR));
+ LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR));
+
+ if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) ==
IDOK)
+ {
+ UINT Current;
+
+ if (GetActivePwrScheme(&Current))
+ {
+ SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0);
+ SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0);
+ if (Current == DelScheme) Pos_SaveData(hwnd);
+ }
+
+ if (DeletePwrScheme(DelScheme) != 0) return TRUE;
+ }
+
+ return FALSE;
+}
/* Property page dialog callback */
INT_PTR CALLBACK
@@ -68,6 +108,7 @@
{
case WM_INITDIALOG:
hPos = hwndDlg;
+ hwndDialog = hwndDlg;
if (!Pos_InitData())
{
//TODO
@@ -94,6 +135,16 @@
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
}
break;
+ case IDC_DELETE_BTN:
+ {
+ DelScheme(hwndDlg);
+ }
+ break;
+ case IDC_SAVEAS_BTN:
+ {
+
+ }
+ break;
case IDC_MONITORACLIST:
case IDC_MONITORDCLIST:
case IDC_DISKACLIST:
@@ -307,6 +358,12 @@
return FALSE;
retval = EnumPwrSchemes(callback_EnumPwrScheme, aps);
+
+ if(SendMessage(hwnd, CB_GETCOUNT, 0, 0) > 0)
+ {
+ EnableWindow(GetDlgItem(hwndDialog, IDC_DELETE_BTN),TRUE);
+ EnableWindow(GetDlgItem(hwndDialog, IDC_SAVEAS_BTN),TRUE);
+ }
return retval;
}
Modified: trunk/reactos/dll/cpl/powercfg/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resource.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/resource.h (original)
+++ trunk/reactos/dll/cpl/powercfg/resource.h Fri Nov 30 21:52:33 2007
@@ -52,11 +52,14 @@
#define IDS_TIMEOUT13 163
#define IDS_TIMEOUT14 164
#define IDS_TIMEOUT15 165
+#define IDS_DEL_SCHEME 166
+#define IDS_DEL_SCHEME_TITLE 167
#define IDI_AC 175
#define IDI_DC 176
#define IDI_ACDC 177
#define IDI_SCREEN 178
+#define IDI_HIBERNATE 179
#define IDS_CPLNAME_1 190
#define IDC_ENERGYLIST 200
@@ -110,6 +113,9 @@
#define IDC_SPACEFORHIBERNATEFILE 502
#define IDC_TOLESSFREESPACE 503
+#define IDC_DELETE_BTN 504
+#define IDC_SAVEAS_BTN 505
+
#define IDS_ALPERTLOWENERGY 715
#define IDS_ALPERTCRITICLEENERGY 716
#define IDS_CRITCLENERGY 717
Added: trunk/reactos/dll/cpl/powercfg/resources/hibernate.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources…
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/dll/cpl/powercfg/resources/hibernate.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/reactos/dll/cpl/powercfg/resources/screen.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources…
==============================================================================
Binary files - no diff available.