[POWERCFG] Add a separate power schemes dialog for ac-only systems

The layout issues will be fixed by a future patch.

diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc
index 232a3fd..7787455 100644 (file)
--- a/dll/cpl/powercfg/lang/bg-BG.rc
+++ b/dll/cpl/powercfg/lang/bg-BG.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Наредби на захранването"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Наредби на захранването"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Изберете най- подходящата настройка за този компютър. Обърнете внимание, че промяната на долните настройки ще променят избраната наредба.", -1, 45, 13, 194, 36
+    GROUPBOX "За&хранване", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Запис като...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Изтриване", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Неизвестно", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Изключване на &монитора:", IDC_MONITOR, 15, 140, 80, 20
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 15, 160, 80, 20
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Системата из&чаква:", IDC_STANDBY, 15, 180, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Системата за&спива:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Тревоги"

diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc
index 47dfff8..779e1b5 100644 (file)
--- a/dll/cpl/powercfg/lang/cs-CZ.rc
+++ b/dll/cpl/powercfg/lang/cs-CZ.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémata napájení"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Schémata napájení"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Vyberte napájecí schéma, které se nejvíce hodí pro tento počítač. Všechny změny nastavení se uloží do vybraného schématu.", -1, 37, 6, 209, 36
+    GROUPBOX "&Schéma napájení", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Uložit jako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Neznámý", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Varování"

diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc
index 85c789a..07a1948 100644 (file)
--- a/dll/cpl/powercfg/lang/de-DE.rc
+++ b/dll/cpl/powercfg/lang/de-DE.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 218
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energieschemata"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Energieschemata"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Wählen Sie das Energieschema mit den am besten zu diesem Computer passenden Einstellungen. Bedenken Sie, dass die Einstellungen das unten ausgewählte Schema modifizieren.", -1, 45, 13, 194, 36
+    GROUPBOX "&Energieschemata", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Unbekannt", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "&Monitor ausschalten:", IDC_MONITOR, 15, 145, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Festplatten ausschalten:", IDC_DISK, 15, 160, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Standby:", IDC_STANDBY, 15, 180, 55, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Ruhezustand:", IDC_HIBERNATE, 15, 195, 55, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"

diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc
index a27f5fc..5bb10ca 100644 (file)
--- a/dll/cpl/powercfg/lang/el-GR.rc
+++ b/dll/cpl/powercfg/lang/el-GR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Συνδυασμοί τροφοδοσίας"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Συνδυασμοί τροφοδοσίας"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 209, 36
+    GROUPBOX "Σ&υνδυασμοί τροφοδοσίας", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Αποθήκευση ως...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Διαγραφή", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Άγνωστο", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Απενεργοποίηση &σκληρών δίσκων:", IDC_DISK, 13, 166, 84, 18
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ειδοποιήσεις"

diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc
index b37b408..c9d1f2d 100644 (file)
--- a/dll/cpl/powercfg/lang/en-US.rc
+++ b/dll/cpl/powercfg/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Power Schemes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    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, 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 "Turn off &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarms"

diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc
index 042b4d8..b9ea2d1 100644 (file)
--- a/dll/cpl/powercfg/lang/es-ES.rc
+++ b/dll/cpl/powercfg/lang/es-ES.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 262, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 262, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Combinaciones de energía"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 262, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Combinaciones de energía"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Seleccione la combinación de energía cuya configuración sea la más adecuada para su equipo. Tenga en cuenta que, si cambia la configuración siguiente, se modificará la combinación seleccionada.", -1, 37, 6, 209, 36
+    GROUPBOX "C&ombinaciones de energía", -1, 6, 43, 250, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Desconocido ", IDC_GRPDETAIL, 6, 95, 250, 136
+    LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 262, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmas"

diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc
index 5d86976..a57abdd 100644 (file)
--- a/dll/cpl/powercfg/lang/fr-FR.rc
+++ b/dll/cpl/powercfg/lang/fr-FR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Profils d'alimentation"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Profils d'alimentation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Choisissez le profil d'alimentation le plus approprié pour cet ordinateur. Notez que modifier les réglages suivants modifiera le profil sélectionné.", -1, 45, 13, 194, 36
+    GROUPBOX "P&rofils d'alimentation", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Inconnu", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 15, 145, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Éteindre les d&isques durs :", IDC_DISK, 15, 160, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Mode s&tandby :", IDC_STANDBY, 15, 180, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Mise en veille du système :", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmes"

diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc
index 595e036..b8cdec6 100644 (file)
--- a/dll/cpl/powercfg/lang/he-IL.rc
+++ b/dll/cpl/powercfg/lang/he-IL.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "תכניות צריכת חשמל"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "תכניות צריכת חשמל"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    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, 37, 6, 209, 36
+    GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "מחק", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב המתנה:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "התראות"

diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc
index 9478d1c..cd4fc29 100644 (file)
--- a/dll/cpl/powercfg/lang/id-ID.rc
+++ b/dll/cpl/powercfg/lang/id-ID.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema Tenaga"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Skema Tenaga"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Pilih skema tenaga dengan setelan paling benar untuk komputer ini. Catatan bahwa mengubah setelan di bawah akan mengubah skema yang dipilih.", -1, 45, 13, 194, 36
+    GROUPBOX "Skema Tena&ga", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Tidak Dikenal", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Matikan &monitor:", IDC_MONITOR, 15, 145, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Matikan hard d&isks:", IDC_DISK, 15, 160, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistem s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarm"

diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc
index 119f2c8..0752a89 100644 (file)
--- a/dll/cpl/powercfg/lang/it-IT.rc
+++ b/dll/cpl/powercfg/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Gestione risparmio energia"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 176, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Gestione risparmio energia"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
+    LTEXT "Scegliere lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.", -1, 40, 8, 194, 36
+    GROUPBOX "Schema di gestione dell'energia", -1, 8, 48, 240, 48
+    COMBOBOX IDC_ENERGYLIST, 15, 61, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 101, 76, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 181, 76, 55, 15, WS_DISABLED
+    GROUPBOX "sconosciuto", IDC_GRPDETAIL, 8, 100, 240, 112
+    LTEXT "Spegni il &monitor:", IDC_MONITOR, 16, 143, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 101, 141, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 16, 158, 80, 10
+    COMBOBOX IDC_DISKACLIST, 101, 156, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Standby:", IDC_STANDBY, 16, 178, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 101, 176, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sospensione:", IDC_HIBERNATE, 16, 193, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 101, 191, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Allarmi"

diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc
index 2b2d0cd..f2d4599 100644 (file)
--- a/dll/cpl/powercfg/lang/ja-JP.rc
+++ b/dll/cpl/powercfg/lang/ja-JP.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源設定"
 FONT 9, "MS UI Gothic"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "電源設定"
+FONT 9, "MS UI Gothic"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 209, 36
+    GROUPBOX "電源設定(&O)", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "名前を付けて保存(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "不明", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システム スタンバイ(&T):", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "アラーム"

diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc
index bae8278..a129b74 100644 (file)
--- a/dll/cpl/powercfg/lang/nl-NL.rc
+++ b/dll/cpl/powercfg/lang/nl-NL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energie schema's"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Energie schema's"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", -1, 45, 13, 194, 36
+    GROUPBOX "&Energie schema's", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Onbekend", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 15, 145, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "V&aste schijven uitschakelen:", IDC_DISK, 15, 160, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Op stand-&by:", IDC_STANDBY, 15, 180, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "In slaapstand:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Waarschuwingen"

diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc
index 891f4e9..a8f122b 100644 (file)
--- a/dll/cpl/powercfg/lang/no-NO.rc
+++ b/dll/cpl/powercfg/lang/no-NO.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Strømstyringsplan"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Strømstyringsplan"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Velg Strømstyringsplan med den mest passende innstilling for denne datamaskinen. Vær oppmerksom på å endre innstillingene under vil forandre valgte plan.", -1, 37, 6, 209, 36
+    GROUPBOX "S&trømstyringsplan", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Lagre som...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Slett", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Ukjent", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmer"

diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc
index de7cb29..0ebaefc 100644 (file)
--- a/dll/cpl/powercfg/lang/pl-PL.rc
+++ b/dll/cpl/powercfg/lang/pl-PL.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schematy zasilania"
 FONT 8, "MS Shell Dlg"
@@ -39,6 +39,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Schematy zasilania"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Wybierz schemat zasilana najbardziej pasujący do Twojego komputera. Miej na uwadze, że zmiany poniżej spowodują modyfikację wybranego schematu.", -1, 45, 13, 194, 36
+    GROUPBOX "&Schematy zasilania", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Usuń", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Nieznany", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 142, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 157, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernuje:", IDC_HIBERNATE, 15, 192, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ostrzeżenia"

diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc
index a24f6f0..8e85332 100644 (file)
--- a/dll/cpl/powercfg/lang/ro-RO.rc
+++ b/dll/cpl/powercfg/lang/ro-RO.rc
@@ -5,7 +5,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Regim de consum"
 FONT 8, "MS Shell Dlg"
@@ -36,6 +36,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Regim de consum"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Alegeți un regim de consum al energiei cât mai potrivit pentru dumneavoastră. Aveți în vedere că modificările aduse vor fi memorate în regimul curent.", -1, 37, 6, 209, 36
+    GROUPBOX "&Regimuri de consum", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Păstrare…", IDC_SAVEAS_BTN, 124, 72, 55, 14, WS_DISABLED
+    PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Nespecificat", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"

diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc
index 4877cf2..7c96be7 100644 (file)
--- a/dll/cpl/powercfg/lang/ru-RU.rc
+++ b/dll/cpl/powercfg/lang/ru-RU.rc
@@ -2,12 +2,12 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схемы управления питанием"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 32, 32
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32
     LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 5, 194, 36
     GROUPBOX "&Схемы управления питанием", -1, 7, 57, 240, 46
     COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Схемы управления питанием"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32
+    LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 5, 194, 36
+    GROUPBOX "&Схемы управления питанием", -1, 7, 57, 240, 46
+    COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "Сохранить &как...", IDC_SAVEAS_BTN, 103, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 183, 85, 55, 15, WS_DISABLED
+    GROUPBOX "Нет данных", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "Отключить &монитор:", IDC_MONITOR, 15, 142, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Отключить &диски:", IDC_DISK, 15, 157, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Ждущий режим через:", IDC_STANDBY, 15, 177, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "С&пящий режим через:", IDC_HIBERNATE, 15, 192, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Уведомления"
@@ -71,7 +93,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Дополнительно"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 32, 32
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32
     LTEXT "Выберите желаемые параметры энергосбережения.", -1, 37, 5, 205, 20
     GROUPBOX "Параметры", -1, 5, 35, 225, 55
     AUTOCHECKBOX "&Всегда отображать значок на панели задач", IDC_SYSTRAYBATTERYMETER, 15, 48, 200, 10, WS_TABSTOP
@@ -91,7 +113,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Спящий режим"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 32, 32
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 32, 32
     LTEXT "При переходе в спящий режим компьютер переносит содержимое оперативной памяти на диск и выключается. При выходе из спящего режима компьютер возвращается в прежнее состояние.", -1, 37, 5, 195, 35
     GROUPBOX "Спящий режим", -1, 5, 57, 235, 25
     AUTOCHECKBOX "&Разрешить переход в спящий режим", IDC_HIBERNATEFILE, 10, 67, 210, 10, WS_TABSTOP

diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc
index f52c6c3..f203b8e 100644 (file)
--- a/dll/cpl/powercfg/lang/sk-SK.rc
+++ b/dll/cpl/powercfg/lang/sk-SK.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémy napájania"
 FONT 8, "MS Shell Dlg"
@@ -39,6 +39,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Schémy napájania"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Vyberte schému napájania, ktorej nastavenie je najvhodnejšie pre tento počítač. Všimnite si, že zmenou nastavení v tomto okne sa zmení aj zvolená schéma.", -1, 37, 6, 209, 36
+    GROUPBOX "&Schémy napájania", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Uložiť ako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Neznáme", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 210, 84, 18
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Signalizácie"

diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc
index 2859e71..afbe1ef 100644 (file)
--- a/dll/cpl/powercfg/lang/sq-AL.rc
+++ b/dll/cpl/powercfg/lang/sq-AL.rc
@@ -5,7 +5,7 @@
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema e Energjisë"
 FONT 8, "MS Shell Dlg"
@@ -36,6 +36,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Skema e Energjisë"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Zgjidhni skemën energjisë me parametrat më të përshtatshme për këtë kompjuter. Vini re se ndryshimet e parametrave te më poshtëm do të ndryshojë skemën e zgjedhur.", -1, 37, 6, 209, 36
+    GROUPBOX "Skema e Energjisë", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "i panjohur", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"

diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc
index c5a8979..7404de1 100644 (file)
--- a/dll/cpl/powercfg/lang/th-TH.rc
+++ b/dll/cpl/powercfg/lang/th-TH.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
@@ -31,6 +31,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Power Schemes"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    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 | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&บันทึกเป็น...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED
+    PUSHBUTTON "&ลบ", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED
+    GROUPBOX "ไม่ทราบค่า", IDC_GRPDETAIL, 7, 108, 240, 105
+    LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 15, 145, 80, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 15, 160, 80, 10
+    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarms"

diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc
index c1209bd..96d61ce 100644 (file)
--- a/dll/cpl/powercfg/lang/tr-TR.rc
+++ b/dll/cpl/powercfg/lang/tr-TR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Güç Düzenleri"
 FONT 8, "MS Shell Dlg"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Güç Düzenleri"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. Aşağıdaki ayarların değiştirilmesi seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 209, 36
+    GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Ayrı Sakla...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "&Sil", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Bilinmiyor", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "G&östergeci Kapat:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sâ&bit Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Dizgeyi Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "D&izgeyi Anıkta Beklet:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Uyarılar"

diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc
index 91d7eb2..4423011 100644 (file)
--- a/dll/cpl/powercfg/lang/uk-UA.rc
+++ b/dll/cpl/powercfg/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схеми керування живленням"
 FONT 8, "MS Shell Dlg"
@@ -39,6 +39,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Схеми керування живленням"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 209, 36
+    GROUPBOX "&Схеми керування живленням", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "Зберегти &як...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "Немає даних", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Сигналізація"

diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc
index 1257571..9480303 100644 (file)
--- a/dll/cpl/powercfg/lang/zh-CN.rc
+++ b/dll/cpl/powercfg/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "电源使用方案"
 FONT 9, "宋体"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "电源使用方案"
+FONT 9, "宋体"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36
+    GROUPBOX "电源使用方案(&O)", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "另存为(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "关闭监视器(&M):", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "关闭硬盘(&I):", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统待机(&T):", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "警报"

diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc
index 34e83fd..4f68746 100644 (file)
--- a/dll/cpl/powercfg/lang/zh-TW.rc
+++ b/dll/cpl/powercfg/lang/zh-TW.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源使用方案"
 FONT 9, "新細明體"
@@ -33,6 +33,28 @@ BEGIN
     COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "電源使用方案"
+FONT 9, "新細明體"
+BEGIN
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
+    LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36
+    GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "另存爲(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
+    PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
+    GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136
+    LTEXT "關閉監視器(&M):", IDC_MONITOR, 13, 148, 84, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "關閉硬碟(&I):", IDC_DISK, 13, 171, 84, 10
+    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統待機(&T):", IDC_STANDBY, 13, 191, 84, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
 IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "警報"

diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c
index be89004..14f2e9a 100644 (file)
--- a/dll/cpl/powercfg/powercfg.c
+++ b/dll/cpl/powercfg/powercfg.c
@@ -115,13 +115,19 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     psh.phpage = hpsp;
     psh.pfnCallback = PropSheetProc;
 
-    InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc);
-    if (GetPwrCapabilities(&spc))
+    if (!GetPwrCapabilities(&spc))
     {
-        if (spc.SystemBatteriesPresent)
-        {
-            InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc);
-        }
+        return GetLastError();
+    }
+
+    if (spc.SystemBatteriesPresent)
+    {
+        InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_ACDC, PowerSchemesDlgProc);
+        InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc);
+    }
+    else
+    {
+        InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_AC, PowerSchemesDlgProc);
     }
     InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc);
     InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc);
@@ -188,10 +194,10 @@ DllMain(HINSTANCE hinstDLL,
 {
     UNREFERENCED_PARAMETER(lpvReserved);
 
-    switch(dwReason)
+    switch (dwReason)
     {
         case DLL_PROCESS_ATTACH:
-        case DLL_THREAD_ATTACH:
+            DisableThreadLibraryCalls(hinstDLL);
             hApplet = hinstDLL;
             break;
     }

diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c
index 1e164d9..3ef3abf 100644 (file)
--- a/dll/cpl/powercfg/powershemes.c
+++ b/dll/cpl/powercfg/powershemes.c
@@ -206,91 +206,27 @@ Pos_InitData(
     HWND hwndDlg)
 {
     SYSTEM_POWER_CAPABILITIES spc;
-/*
-    RECT rectCtl, rectDlg, rectCtl2;
-    LONG movetop = 0;
-    LONG moveright = 0;
-
-    if (GetWindowRect(hwndDlg,&rectDlg))
-        {
-            if (GetWindowRect(GetDlgItem(hwndDlg, IDC_SAT),&rectCtl2))
-            {
-                if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITOR),&rectCtl))
-                {
-                    movetop=rectCtl.top - rectCtl2.top;
-                    MoveWindow(GetDlgItem(hwndDlg, IDC_MONITOR),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE);
-                    if (GetWindowRect(GetDlgItem(hwndDlg, IDC_DISK),&rectCtl))
-                    {
-                        MoveWindow(GetDlgItem(hwndDlg, IDC_DISK),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE);
-                    }
-                    if (GetWindowRect(GetDlgItem(hwndDlg, IDC_STANDBY),&rectCtl))
-                    {
-                        MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBY),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE);
-                    }
-                    if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATE),&rectCtl))
-                    {
-                        MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE);
-                    }
-                    if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITORDCLIST),&rectCtl2))
-                    {
-                        movetop=movetop-8;
-                        if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITORACLIST),&rectCtl))
-                        {
-                            moveright=rectCtl.right - rectCtl2.right;
-                            MoveWindow(GetDlgItem(hwndDlg, IDC_MONITORACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE);
-                            if (GetWindowRect(GetDlgItem(hwndDlg, IDC_DISKACLIST),&rectCtl))
-                            {
-                                MoveWindow(GetDlgItem(hwndDlg, IDC_DISKACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE);
-                            }
-                            if (GetWindowRect(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),&rectCtl))
-                            {
-                                MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE);
-                            }
-                            if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),&rectCtl))
-                            {
-                                MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE);
-                            }
-                        }
-                        if (GetWindowRect(GetDlgItem(hwndDlg, IDC_GRPDETAIL),&rectCtl))
-                        {
-                            MoveWindow(GetDlgItem(hwndDlg, IDC_GRPDETAIL),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE);
-                        }
-                    }
-                }
-            }
-        }
-    }
-*/
 
     if (!GetPwrCapabilities(&spc))
     {
         return FALSE;
     }
 
-    if (!spc.SystemBatteriesPresent)
-    {
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SAT), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_IAC), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SAC), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_IDC), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_SDC), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), SW_HIDE);
-        ShowWindow(GetDlgItem(hwndDlg, IDC_DISKDCLIST), SW_HIDE);
-    }
-
     ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBY),
                (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE);
     ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),
                (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST),
-               ((spc.SystemS1 || spc.SystemS2 || spc.SystemS3) && spc.SystemBatteriesPresent) ? SW_SHOW : SW_HIDE);
+    if (spc.SystemBatteriesPresent)
+        ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST),
+                   (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE);
 
     ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE),
                (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE);
     ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),
                (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST),
-               (spc.HiberFilePresent && spc.SystemBatteriesPresent) ? SW_SHOW : SW_HIDE);
+    if (spc.SystemBatteriesPresent)
+        ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST),
+                   (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE);
 
     return TRUE;
 }
@@ -307,6 +243,7 @@ LoadConfig(
     TCHAR szTemp[MAX_PATH];
     TCHAR szConfig[MAX_PATH];
     PPOWER_POLICY pp;
+    HWND hwndCtrl;
 
     if (pScheme == NULL)
     {
@@ -339,68 +276,52 @@ LoadConfig(
 
     for (i = 0; i < 16; i++)
     {
-        if (Sec[i] == pp->user.VideoTimeoutAc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORACLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.VideoTimeoutAc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST,
-                        CB_SETCURSEL,
-                        i,
-                        (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
 
-        if (Sec[i] == pp->user.VideoTimeoutDc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORDCLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.VideoTimeoutDc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST,
-                        CB_SETCURSEL,
-                         i,
-                         (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
 
-        if (Sec[i] == pp->user.SpindownTimeoutAc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKACLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.SpindownTimeoutAc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_DISKACLIST,
-                       CB_SETCURSEL,
-                       i - 2,
-                       (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i - 2, 0);
         }
 
-        if (Sec[i] == pp->user.SpindownTimeoutDc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKDCLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.SpindownTimeoutDc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST,
-                       CB_SETCURSEL,
-                       i - 2,
-                       (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i - 2, 0);
         }
 
-        if (Sec[i] == pp->user.IdleTimeoutAc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYACLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.IdleTimeoutAc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST,
-                       CB_SETCURSEL,
-                       i,
-                       (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
 
-        if (Sec[i] == pp->user.IdleTimeoutDc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYDCLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->user.IdleTimeoutDc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST,
-                       CB_SETCURSEL,
-                       i,
-                       (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
 
-        if (Sec[i] == pp->mach.DozeS4TimeoutAc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->mach.DozeS4TimeoutAc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST,
-                       CB_SETCURSEL,
-                       i,
-                    (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
 
-        if (Sec[i] == pp->mach.DozeS4TimeoutDc)
+        hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST);
+        if (hwndCtrl != NULL && Sec[i] == pp->mach.DozeS4TimeoutDc)
         {
-            SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST,
-                       CB_SETCURSEL,
-                       i,
-                       (LPARAM)0);
+            SendMessage(hwndCtrl, CB_SETCURSEL, i, 0);
         }
     }
 
@@ -462,9 +383,13 @@ Pos_InitPage(HWND hwndDlg)
                 break;
 
             default:
+                hwnd = NULL;
                 return;
         }
 
+        if (hwnd == NULL)
+            continue;
+
         for (ifrom = imin; ifrom < (IDS_TIMEOUT15 + 1); ifrom++)
         {
             if (LoadString(hApplet, ifrom, szName, MAX_PATH))
@@ -507,80 +432,89 @@ Pos_SaveData(
     PPOWER_SCHEMES_PAGE_DATA pPageData)
 {
     PPOWER_SCHEME pScheme;
+    HWND hwndCtrl;
     INT tmp;
 
     pScheme = pPageData->pSelectedPowerScheme;
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORACLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.VideoTimeoutAc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.VideoTimeoutAc = Sec[tmp];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORDCLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.VideoTimeoutDc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.VideoTimeoutDc = Sec[tmp];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_DISKACLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKACLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.SpindownTimeoutAc = Sec[tmp + 2];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.SpindownTimeoutAc = Sec[tmp + 2];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKDCLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.SpindownTimeoutDc = Sec[tmp + 2];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.SpindownTimeoutDc = Sec[tmp + 2];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYACLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.IdleTimeoutAc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.IdleTimeoutAc = Sec[tmp];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYDCLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.user.IdleTimeoutDc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.user.IdleTimeoutDc = Sec[tmp];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.mach.DozeS4TimeoutAc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.mach.DozeS4TimeoutAc = Sec[tmp];
+        }
     }
 
-    tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST,
-                   CB_GETCURSEL,
-                   0,
-                   (LPARAM)0);
-    if (tmp > 0 && tmp < 16)
+    hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST);
+    if (hwndCtrl != NULL)
     {
-        pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp];
+        tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0);
+        if (tmp > 0 && tmp < 16)
+        {
+            pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp];
+        }
     }
 
     if (SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy))

diff --git a/dll/cpl/powercfg/resource.h b/dll/cpl/powercfg/resource.h
index 7227bd8..b3a5095 100644 (file)
--- a/dll/cpl/powercfg/resource.h
+++ b/dll/cpl/powercfg/resource.h
@@ -11,11 +11,13 @@
 #define IDS_CONFIG1  53
 #define IDS_CONFIG2  54
 
-#define IDD_PROPPAGEPOWERSCHEMES 70
-#define IDD_PROPPAGEALARMS       71
-#define IDD_PROPPAGEPOWERMETER   72
-#define IDD_PROPPAGEADVANCED     73
-#define IDD_PROPPAGEHIBERNATE    74
+#define IDD_POWERSCHEMESPAGE_ACDC 70
+#define IDD_POWERSCHEMESPAGE_AC   71
+#define IDD_PROPPAGEALARMS        72
+#define IDD_PROPPAGEPOWERMETER    73
+#define IDD_PROPPAGEADVANCED      74
+#define IDD_PROPPAGEHIBERNATE     75
+#define IDD_SAVEPOWERSCHEME       76
 
 #define IDS_NOACTION               100
 #define IDS_PowerActionNone1       114
@@ -107,7 +109,6 @@
 #define IDC_DELETE_BTN 504
 #define IDC_SAVEAS_BTN 505
 
-#define IDD_SAVEPOWERSCHEME      75
 #define IDC_SCHEMENAME           620
 
 #define IDS_ALPERTLOWENERGY      715