[ros-diffs] [ekohl] 75085: [DESK] Replace the screen resolution change confirmation message box by a proper dialog box with timeout. CORE-8352

ekohl Sun, 18 Jun 2017 01:33:08 -0700

Author: ekohl
Date: Sun Jun 18 08:31:20 2017
New Revision: 75085

URL: http://svn.reactos.org/svn/reactos?rev=75085&view=rev
Log:
[DESK]
Replace the screen resolution change confirmation message box by a proper 
dialog box with timeout.
CORE-8352


Modified:
    trunk/reactos/dll/cpl/desk/lang/bg-BG.rc
    trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc
    trunk/reactos/dll/cpl/desk/lang/de-DE.rc
    trunk/reactos/dll/cpl/desk/lang/el-GR.rc
    trunk/reactos/dll/cpl/desk/lang/en-GB.rc
    trunk/reactos/dll/cpl/desk/lang/en-US.rc
    trunk/reactos/dll/cpl/desk/lang/es-ES.rc
    trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
    trunk/reactos/dll/cpl/desk/lang/he-IL.rc
    trunk/reactos/dll/cpl/desk/lang/hu-HU.rc
    trunk/reactos/dll/cpl/desk/lang/id-ID.rc
    trunk/reactos/dll/cpl/desk/lang/it-IT.rc
    trunk/reactos/dll/cpl/desk/lang/ja-JP.rc
    trunk/reactos/dll/cpl/desk/lang/nl-NL.rc
    trunk/reactos/dll/cpl/desk/lang/no-NO.rc
    trunk/reactos/dll/cpl/desk/lang/pl-PL.rc
    trunk/reactos/dll/cpl/desk/lang/pt-BR.rc
    trunk/reactos/dll/cpl/desk/lang/ro-RO.rc
    trunk/reactos/dll/cpl/desk/lang/ru-RU.rc
    trunk/reactos/dll/cpl/desk/lang/sk-SK.rc
    trunk/reactos/dll/cpl/desk/lang/sq-AL.rc
    trunk/reactos/dll/cpl/desk/lang/sv-SE.rc
    trunk/reactos/dll/cpl/desk/lang/tr-TR.rc
    trunk/reactos/dll/cpl/desk/lang/uk-UA.rc
    trunk/reactos/dll/cpl/desk/lang/zh-CN.rc
    trunk/reactos/dll/cpl/desk/lang/zh-TW.rc
    trunk/reactos/dll/cpl/desk/resource.h
    trunk/reactos/dll/cpl/desk/settings.c

Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&ÐÑÐµÐ·Ð°Ð¿ÑÑÐº Ð¿ÑÐµÐ´Ð¸ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° 
Ð½Ð¾Ð²Ð¸ÑÐµ ÑÐ²ÐµÑÐ¾Ð²Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸.", IDC_RESTART_RB, 14, 116, 228, 
10
     AUTORADIOBUTTON "ÐÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ 
Ð±ÐµÐ· Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐº.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     IDS_DISPLAY_SETTINGS "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°"
     IDS_APPLY_FAILED "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ 
Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸..."
     IDS_APPLY_NEEDS_RESTART "ÐÐ° Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° 
Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ, ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½ÐµÑÐµ 
ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°"
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -154,6 +154,17 @@
     AUTORADIOBUTTON "&Restartovat poÄÃtaÄ pÅed aplikovÃ¡nÃm novÃ©ho 
nastavenÃ barev.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Aplikovat novÃ© nastavenÃ barev bez restartovÃ¡nÃ.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -258,4 +269,5 @@
     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Ä."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/de-DE.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Computer vor dem Anwenden der Farbeinstellungen neu 
starten.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Farbeinstellungen ohne Neustart Ã¼bernehmen.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Einstellungen in %d Sekunden zurÃ¼cksetzen."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/el-GR.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/en-GB.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-GB.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/en-GB.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/en-GB.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new colour 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new colour settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/en-US.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/en-US.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/es-ES.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&Reiniciar el equipo antes de aplicar la nueva 
configuraciÃ³n.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "&Aplicar la nueva configuraciÃ³n de pantalla sin 
reiniciar.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&RedÃ©marrer l'ordinateur avant d'appliquer les nouveaux 
paramÃ¨tres des couleurs.", IDC_RESTART_RB, 14, 116, 273, 10
     AUTORADIOBUTTON "Appliquer les nouveaux paramÃ¨tres des couleurs sans 
redÃ©marrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/he-IL.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     IDS_DISPLAY_SETTINGS "××××¨××ª ×ª×¦×××"
     IDS_APPLY_FAILED "Failed to apply new settings..."
     IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply 
changes."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/id-ID.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/it-IT.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove 
impostazioni.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza 
riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON 
"æ°ããè²ã®è¨å®ãé©ç¨ããåã«ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã(&R)",
 IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON 
"åèµ·åããã«ãæ°ããè²ã®è¨å®ãé©ç¨ãã", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     IDS_DISPLAY_SETTINGS "è¡¨ç¤ºè¨å®"
     IDS_APPLY_FAILED "æ°ããè¨å®ã®é©ç¨ã«å¤±æãã¾ãã..."
     IDS_APPLY_NEEDS_RESTART "å¤æ´ãåæ 
ããã«ã¯ã³ã³ãã¥ã¼ã¿ãåèµ·åããå¿è¦ãããã¾ãã"
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/no-NO.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Start maskinen pÃ¥ nytt fÃ¸r de nye skjerminnstillingene 
tas i bruk.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Bruk de nye skjerminnstillingene uten Ã¥ starte pÃ¥ 
nytt.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -157,6 +157,17 @@
     AUTORADIOBUTTON "&Zrestartuj system przed wprowadzeniem zmian.", 
IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Zastosuj nowe ustawienia ekranu bez restartu systemu.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -261,4 +272,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "&Reiniciar computador antes de aplicar novas 
configuraÃ§Ãµes de vÃdeo", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "&Aplicar as novas configuraÃ§Ãµes de vÃdeo sem reiniciar 
o computador", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -252,4 +263,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -153,6 +153,17 @@
     AUTORADIOBUTTON "&ReporneÈte calculatorul pentru a aplica noua 
configuraÈie", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "AplicÄ noua &configuraÈie fÄrÄ a reporni 
calculatorul", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -257,4 +268,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -148,6 +148,17 @@
     AUTORADIOBUTTON "ÐÐµÑÐµ&Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ñ 
Ð½Ð¾Ð²ÑÐ¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÑÐºÑÐ°Ð½Ð°", IDC_RESTART_RB, 14, 116, 
228, 10
     AUTORADIOBUTTON "&ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ 
ÑÐºÑÐ°Ð½Ð° Ð±ÐµÐ· Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_WITHOUTREBOOT_RB, 14, 131, 
228, 10
     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
@@ -252,4 +263,5 @@
     IDS_DISPLAY_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°"
     IDS_APPLY_FAILED "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿ÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ 
Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸..."
     IDS_APPLY_NEEDS_RESTART "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ 
ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&ReÅ¡tartovaÅ¥ poÄÃtaÄ pred pouÅ¾itÃm novÃ½ch 
nastavenÃ farieb.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "PouÅ¾iÅ¥ &novÃ© nastavenia farieb bez reÅ¡tartovania.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -152,6 +152,17 @@
     AUTORADIOBUTTON "&Rifillo kompjuterin para se tÃ« aplikoni vetit e reja 
ngjyra.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apliko parametrat e ngjyrave te reja par rifilluar 
sistemit.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -256,4 +267,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&Restart the computer before applying the new color 
settings.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "Apply the new color settings without restarting.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON "&yeni renk ayarlarÄ± uygulanmadan Ã¶nce bilgisayarÄ± 
yeniden baÅlat.", IDC_RESTART_RB, 14, 116, 228, 10
     AUTORADIOBUTTON "y&eniden baÅlatmadan yeni renk ayarlarÄ±nÄ± uygula.", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     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."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -156,6 +156,17 @@
     AUTORADIOBUTTON "&ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ ÑÐ· 
Ð½Ð¾Ð²Ð¸Ð¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÐºÐ¾Ð»ÑÐ¾ÑÑ.", IDC_RESTART_RB, 14, 116, 
228, 10
     AUTORADIOBUTTON "&ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ 
ÐºÐ¾Ð»ÑÐ¾ÑÑ Ð±ÐµÐ· Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ.", IDC_WITHOUTREBOOT_RB, 
14, 131, 228, 10
     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
@@ -260,4 +271,5 @@
     IDS_DISPLAY_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¸ÑÐ¿Ð»ÐµÑ"
     IDS_APPLY_FAILED "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ 
Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸..."
     IDS_APPLY_NEEDS_RESTART "ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ 
Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð´Ð»Ñ 
Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð·Ð¼ÑÐ½."
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -155,6 +155,17 @@
     AUTORADIOBUTTON 
"å¨åºç¨æ°çæ¾ç¤ºè®¾ç½®ä¹åéæ°å¯å¨è®¡ç®æº(&R)", IDC_RESTART_RB, 
14, 116, 228, 10
     AUTORADIOBUTTON "åºç¨æ°çæ¾ç¤ºè®¾ç½®èä¸éæ°å¯å¨è®¡ç®æº(&P)", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -259,4 +270,5 @@
     IDS_DISPLAY_SETTINGS "æ¾ç¤ºè®¾ç½®"
     IDS_APPLY_FAILED "åºç¨æ°è®¾ç½®å¤±è´¥..."
     IDS_APPLY_NEEDS_RESTART "éè¦éæ°å¯å¨è®¡ç®æºä½¿æ´æ¹çæã"
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/zh-TW.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/zh-TW.rc    [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -150,6 +150,17 @@
     AUTORADIOBUTTON 
"å¨æç¨æ°çé¡¯ç¤ºè¨å®ä¹åéæ°ååè¨ç®æ©(&R)", IDC_RESTART_RB, 
14, 116, 228, 10
     AUTORADIOBUTTON "æç¨æ°çé¡¯ç¤ºè¨å®èä¸éæ°ååè¨ç®æ©(&P)", 
IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
     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
@@ -254,4 +265,5 @@
     IDS_DISPLAY_SETTINGS "é¡¯ç¤ºè¨å®"
     IDS_APPLY_FAILED "æç¨æ°è¨å®å¤±æ..."
     IDS_APPLY_NEEDS_RESTART "éè¦éæ°ååè¨ç®æ©ä½¿æ´æ¹çæã"
-END
+    IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds."
+END

Modified: trunk/reactos/dll/cpl/desk/resource.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/resource.h       [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/resource.h       [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -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

Modified: trunk/reactos/dll/cpl/desk/settings.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?rev=75085&r1=75084&r2=75085&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/settings.c       [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/settings.c       [iso-8859-1] Sun Jun 18 
08:31:20 2017
@@ -19,6 +19,12 @@
     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 @@
     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 @@
             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;

[ros-diffs] [ekohl] 75085: [DESK] Replace the screen resolution change confirmation message box by a proper dialog box with timeout. CORE-8352

Reply via email to