Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-03 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK]

Browse source 
Replace the screen resolution change confirmation message box by a proper dialog box with timeout.
CORE-8352

svn path=/trunk/; revision=75085
This commit is contained in:
Eric Kohl 2017-06-18 08:31:20 +00:00
parent 6bea3b076d
commit 838d4a450d
28 changed files with 387 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/cpl/desk/lang/bg-BG.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Питане преди прилагане на новите настройки", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Обикновено", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Настройки на екрана"
IDS_APPLY_FAILED "Неуспешно прилагане на новите настройки..."
IDS_APPLY_NEEDS_RESTART "За прилагане на настройките, трябва да презапуснете компютъра"
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/cs-CZ.rc
View file

@ -156,6 +156,17 @@ BEGIN
AUTORADIOBUTTON "Zeptat se před aplikováním nového nastavení barev.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normální", ID_MENU_NORMAL
@ -258,4 +269,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Nastavení zobrazení"
IDS_APPLY_FAILED "Nepodařilo se aplikovat nová nastavení..."
IDS_APPLY_NEEDS_RESTART "Aby se změny projevily, je třeba restartovat počítač."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/de-DE.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Vor dem Anwenden der neuen Farbeinstellungen nachfragen.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Anzeigeeinstellungen"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Möchten Sie diese Anzeigeeinstellungen beibehalten?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Ja", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&Nein", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Anzeigeeinstellungen"
IDS_APPLY_FAILED "Beim Anwenden Ihrer Änderungen ist ein Fehler aufgetreten..."
IDS_APPLY_NEEDS_RESTART "Sie müssen Ihren Computer neu starten, damit die Änderungen wirksam werden."
IDS_TIMEOUTTEXT "Einstellungen in %d Sekunden zurücksetzen."
END

12
reactos/dll/cpl/desk/lang/el-GR.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Κανονικό", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/en-GB.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new colour settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/en-US.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/es-ES.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "Pregu&ntar antes de aplicar la nueva configuración de pantalla.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Configuración del monitor"
IDS_APPLY_FAILED "Error al aplicar la nueva configuración..."
IDS_APPLY_NEEDS_RESTART "Necesita reiniciar el equipo para aplicar los cambios."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/fr-FR.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramètres des couleurs.", IDC_ASKME_RB, 14, 146, 243, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Paramètres d'affichage"
IDS_APPLY_FAILED "Echec lors de l'application des nouveaux paramètres..."
IDS_APPLY_NEEDS_RESTART "Vous devez redémarrer votre ordinateur pour appliquer les modifications."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/he-IL.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "רגיל", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "הגדרות תצוגה"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/hu-HU.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/id-ID.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/it-IT.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normale", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Impostazioni del monitor"
IDS_APPLY_FAILED "Impossibile applicare le nuove impostazioni..."
IDS_APPLY_NEEDS_RESTART "E' necessario riavviare il computer per applicare le modifiche."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/ja-JP.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "新しい色の設定を適用する前に確認する", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "通常", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "表示設定"
IDS_APPLY_FAILED "新しい設定の適用に失敗しました..."
IDS_APPLY_NEEDS_RESTART "変更を反映するにはコンピュータを再起動する必要があります。"
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/nl-NL.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/no-NO.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Spør før de nye skjerminnstillingene tas i bruk.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Vanlig", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Skjerm innstillinger"
IDS_APPLY_FAILED "Mislykket å endre innstillingene..."
IDS_APPLY_NEEDS_RESTART "Du trenger å starte datamaskinen på nytt for at innstillingene skal endres."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/pl-PL.rc
View file

@ -159,6 +159,17 @@ BEGIN
AUTORADIOBUTTON "Pytaj przed zastosowaniem nowych ustawień ekranu.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normalny", ID_MENU_NORMAL
@ -261,4 +272,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Ustawienia ekranu"
IDS_APPLY_FAILED "Nie udało się zastosować nowych ustawień..."
IDS_APPLY_NEEDS_RESTART "Musisz ponownie uruchomić komputer aby zastosować zmiany."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/pt-BR.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "Perg&untar antes de aplicar novas configurações de vídeo", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Configurações de vídeo"
IDS_APPLY_FAILED "Falha ao aplicar as novas configurações..."
IDS_APPLY_NEEDS_RESTART "É necessário reiniciar o computador para aplicar as mudanças."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/ro-RO.rc
View file

@ -155,6 +155,17 @@ BEGIN
AUTORADIOBUTTON "Solicită-mi &decizia la momentul aplicării noii configurații", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -257,4 +268,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Configurare afișare"
IDS_APPLY_FAILED "Modificările aduse nu au putut fi aplicate."
IDS_APPLY_NEEDS_RESTART "Pentru a aplica noua configurație este necesară repornirea calculatorului."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/ru-RU.rc
View file

@ -150,6 +150,17 @@ BEGIN
AUTORADIOBUTTON "З&апросить перед применением новых параметров экрана", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Обычная", ID_MENU_NORMAL
@ -252,4 +263,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Параметры экрана"
IDS_APPLY_FAILED "Не удалось применить новые настройки..."
IDS_APPLY_NEEDS_RESTART "Вы должны перезагрузить компьютер для применения изменений."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/sk-SK.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "&Opýtať sa pred použitím nových nastavení farieb.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normálne", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Nastavenia zobrazenia" // obrazovky ?
IDS_APPLY_FAILED "Nepodarilo sa aplikovať nové nastavenia..."
IDS_APPLY_NEEDS_RESTART "Je potrebné reštartovať počítač, aby sa prejavili zmeny."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/sq-AL.rc
View file

@ -154,6 +154,17 @@ BEGIN
AUTORADIOBUTTON "Pyet para se te aplikosh parametrat e ngjyrave te reja.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normale", ID_MENU_NORMAL
@ -256,4 +267,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Konfigurimi i Ekranit"
IDS_APPLY_FAILED "Deshtoj ne apilimin e konfigurimit..."
IDS_APPLY_NEEDS_RESTART "Ju duhet te rifilloni sistemin tuaj qe te aplikoni ndryshimet."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/sv-SE.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Normal", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Display settings"
IDS_APPLY_FAILED "Failed to apply new settings..."
IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/tr-TR.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "ye&ni renk ayarlarıuygulanmadan önce bana sor.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Düzgülü", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Görüntü Ayarları"
IDS_APPLY_FAILED "Yeni ayarların uygulanması başarısız oldu."
IDS_APPLY_NEEDS_RESTART "Değişiklikleri uygulamak için bilgisayarınızı yeniden başlatmanız gerekir."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/uk-UA.rc
View file

@ -158,6 +158,17 @@ BEGIN
AUTORADIOBUTTON "Запитати перед застосуванням нових параметрів кольору.", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "Звичайне", ID_MENU_NORMAL
@ -260,4 +271,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "Параметри дисплея"
IDS_APPLY_FAILED "Не вдалося застосувати нові параметри..."
IDS_APPLY_NEEDS_RESTART "Ви повинні перезавантажити комп'ютер для застосування змін."
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/zh-CN.rc
View file

@ -157,6 +157,17 @@ BEGIN
AUTORADIOBUTTON "在应用新的显示设置之前询问(&K)", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "一般", ID_MENU_NORMAL
@ -259,4 +270,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "显示设置"
IDS_APPLY_FAILED "应用新设置失败..."
IDS_APPLY_NEEDS_RESTART "需要重新启动计算机使更改生效。"
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

12
reactos/dll/cpl/desk/lang/zh-TW.rc
View file

@ -152,6 +152,17 @@ BEGIN
AUTORADIOBUTTON "在應用新的顯示設定之前詢問(&K)", IDC_ASKME_RB, 14, 146, 228, 10
END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Display Settings"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8
LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8
PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14
DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14
END
IDR_PREVIEW_MENU MENU
BEGIN
MENUITEM "一般", ID_MENU_NORMAL
@ -254,4 +265,5 @@ BEGIN
IDS_DISPLAY_SETTINGS "顯示設定"
IDS_APPLY_FAILED "應用新設定失敗..."
IDS_APPLY_NEEDS_RESTART "需要重新啟動計算機使更改生效。"
IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
END

5
reactos/dll/cpl/desk/resource.h
View file

@ -14,6 +14,7 @@
#define IDD_ADVAPPEARANCE 104
#define IDD_EFFAPPEARANCE 105
#define IDD_ADVANCED_GENERAL 200
#define IDD_CONFIRMSETTINGS 201
/* Background Page */
#define IDC_BACKGROUND_LIST 1000
@ -170,3 +171,7 @@
#define IDC_RESTART_RB 5002
#define IDC_WITHOUTREBOOT_RB 5003
#define IDC_ASKME_RB 5004
/* Confirm Settings Dialog */
#define IDC_TIMEOUTTEXT 5100
#define IDS_TIMEOUTTEXT 3800

73
reactos/dll/cpl/desk/settings.c
View file

@ -19,6 +19,12 @@ typedef struct _DATA
int cySource[NUM_SPECTRUM_BITMAPS];
} DATA, *PDATA;
typedef struct _TIMEOUTDATA
{
TCHAR szRawBuffer[256];
TCHAR szCookedBuffer[256];
INT nTimeout;
} TIMEOUTDATA, *PTIMEOUTDATA;
static VOID
UpdateDisplay(IN HWND hwndDlg, PDATA pData, IN BOOL bUpdateThumb)
@ -652,6 +658,69 @@ SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp)
return Ret;
}
static INT_PTR CALLBACK
ConfirmDlgProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam)
{
PTIMEOUTDATA pData;
pData = (PTIMEOUTDATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
switch(uMsg)
{
case WM_INITDIALOG:
/* Allocate the local dialog data */
pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEOUTDATA));
if (pData == NULL)
return FALSE;
/* Link the dialog data to the dialog */
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData);
/* Timeout in seconds */
pData->nTimeout = 15;
/* Load the raw timeout string */
LoadString(hApplet, IDS_TIMEOUTTEXT, pData->szRawBuffer, ARRAYSIZE(pData->szRawBuffer));
/* Cook the timeout string and show it */
_stprintf(pData->szCookedBuffer, pData->szRawBuffer, pData->nTimeout);
SetDlgItemText(hwndDlg, IDC_TIMEOUTTEXT, pData->szCookedBuffer);
/* Start the timer (ticks every second)*/
SetTimer(hwndDlg, 1, 1000, NULL);
break;
case WM_TIMER:
/* Update the timepout value */
pData->nTimeout--;
/* Update the timeout text */
_stprintf(pData->szCookedBuffer, pData->szRawBuffer, pData->nTimeout);
SetDlgItemText(hwndDlg, IDC_TIMEOUTTEXT, pData->szCookedBuffer);
/* Kill the timer and return a 'No', if we ran out of time */
if (pData->nTimeout == 0)
{
KillTimer(hwndDlg, 1);
EndDialog(hwndDlg, IDNO);
}
break;
case WM_COMMAND:
/* Kill the timer and return the clicked button id */
KillTimer(hwndDlg, 1);
EndDialog(hwndDlg, LOWORD(wParam));
break;
case WM_DESTROY:
/* Free the local dialog data */
HeapFree(GetProcessHeap(), 0, pData);
break;
}
return FALSE;
}
static VOID
ApplyDisplaySettings(HWND hwndDlg, PDATA pData)
{
@ -691,9 +760,7 @@ ApplyDisplaySettings(HWND hwndDlg, PDATA pData)
return;
}
LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR));
if (MessageBox(hwndDlg, _T("Do you want to keep these display settings?"), Title, MB_YESNO | MB_ICONQUESTION) == IDYES)
if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CONFIRMSETTINGS), hwndDlg, ConfirmDlgProc) == IDYES)
{
pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth;
pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight;