[cfinck] 66121: [FOSDEM 2015] - Import the <msg> code again. reactos.exe doesn't show a "Finish" button as promised, but instead presents you with an unfinished GUI installer. - Also import the mes...
Author: cfinck Date: Fri Jan 30 03:19:25 2015 New Revision: 66121
URL: http://svn.reactos.org/svn/reactos?rev=66121&view=rev Log: [FOSDEM 2015] - Import the <msg> code again. reactos.exe doesn't show a "Finish" button as promised, but instead presents you with an unfinished GUI installer. - Also import the messages. The French translation is copied from reactos.exe, so it isn't as exact as the English or German ones, but it carries the meaning.
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.c branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Fri Jan 30 03:19:25 2015 @@ -46,5 +46,17 @@ IDS_TOPICDESC6 "Beendet das AutoRun-Programm." END
+/* Topic actions */ +STRINGTABLE +BEGIN + IDS_TOPICACTION0 "<msg>Sie müssen Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthält!" + IDS_TOPICACTION1 "\extras\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" + IDS_TOPICACTION2 "\extras\ReactOS Build Environment\RosBE-2.1.1.exe" + IDS_TOPICACTION3 "\extras\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" + IDS_TOPICACTION4 "https://www.reactos.org/" + IDS_TOPICACTION5 "explorer.exe" + IDS_TOPICACTION6 "<exit>" +END + /* EOF */
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] Fri Jan 30 03:19:25 2015 @@ -46,4 +46,16 @@ IDS_TOPICDESC6 "Exits the AutoRun program." END
+/* Topic actions */ +STRINGTABLE +BEGIN + IDS_TOPICACTION0 "<msg>You have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not install ReactOS on a computer that contains important data!" + IDS_TOPICACTION1 "\extras\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" + IDS_TOPICACTION2 "\extras\ReactOS Build Environment\RosBE-2.1.1.exe" + IDS_TOPICACTION3 "\extras\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" + IDS_TOPICACTION4 "https://www.reactos.org/" + IDS_TOPICACTION5 "explorer.exe" + IDS_TOPICACTION6 "<exit>" +END + /* EOF */
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] Fri Jan 30 03:19:25 2015 @@ -46,4 +46,16 @@ IDS_TOPICDESC6 "Quitte le programme AutoRun." END
+/* Topic actions */ +STRINGTABLE +BEGIN + IDS_TOPICACTION0 "<msg>Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redémarrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS." + IDS_TOPICACTION1 "\extras\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" + IDS_TOPICACTION2 "\extras\ReactOS Build Environment\RosBE-2.1.1.exe" + IDS_TOPICACTION3 "\extras\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" + IDS_TOPICACTION4 "https://www.reactos.org/" + IDS_TOPICACTION5 "explorer.exe" + IDS_TOPICACTION6 "<exit>" +END + /* EOF */
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.c [iso-8859-1] Fri Jan 30 03:19:25 2015 @@ -260,6 +260,12 @@ if (nLength == 0) return TRUE;
+ if (!_tcsnicmp(AppName, TEXT("<msg>"), 5)) + { + MessageBox(hwndMain, AppName + 5, TEXT("ReactOS"), MB_OK | MB_TASKMODAL); + return TRUE; + } + if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE;
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc [iso-8859-1] Fri Jan 30 03:19:25 2015 @@ -30,18 +30,6 @@ IDB_TOPICBITMAP9 BITMAP "res/topic9.bmp" */
-/* Topic actions */ -STRINGTABLE -BEGIN - IDS_TOPICACTION0 "reactos.exe" - IDS_TOPICACTION1 "..\extras\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" - IDS_TOPICACTION2 "..\extras\ReactOS Build Environment\RosBE-2.1.1.exe" - IDS_TOPICACTION3 "..\extras\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" - IDS_TOPICACTION4 "https://www.reactos.org/" - IDS_TOPICACTION5 "explorer.exe" - IDS_TOPICACTION6 "<exit>" -END - /* UTF-8 */ #pragma code_page(65001)
-
cfinck＠svn.reactos.org