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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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 "¥i 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…
==============================================================================
--- 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…
==============================================================================
--- 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…
==============================================================================
--- 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?re…
==============================================================================
--- 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?re…
==============================================================================
--- 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;