[mpiulachs] 32727: - Show full filename while copying files. automatically move "copying file" when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes
Author: mpiulachs Date: Thu Mar 20 13:28:37 2008 New Revision: 32727
URL: http://svn.reactos.org/svn/reactos?rev=3D32727&view=3Drev Log: - Show full filename while copying files. automatically move "copying file"= when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes
Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h
Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.c?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/consup.c (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c Thu Mar 20 13:28:37 = 2008 @@ -204,44 +204,6 @@ } =
VOID -CONSOLE_SetStatusText( - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X =3D 0; - coPos.Y =3D yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); -} - -VOID CONSOLE_InvertTextXY( IN SHORT x, IN SHORT y, @@ -391,6 +353,110 @@ } =
VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + coPos.X =3D x; + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + DWORD Length; + va_list ap; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + Length =3D (ULONG)strlen(Buffer); + + if (Length + x <=3D 79) + { + CONSOLE_SetStatusTextX (x , Buffer); + } + else + { + CONSOLE_SetStatusTextX (79 - Length , Buffer); + } +} + +VOID CONSOLE_SetInvertedTextXY( IN SHORT x, IN SHORT y, @@ -537,49 +603,55 @@ =
if (Flags & TEXT_TYPE_STATUS) { + coPos.X =3D x; coPos.Y =3D yScreen - 1; - coPos.X =3D 0; } else /* TEXT_TYPE_REGULAR (Default) */ { - coPos.X =3D x; + coPos.X =3D x; coPos.Y =3D y; } =
- if (Flags & TEXT_ALIGN_LEFT) - { - coPos.X =3D 0; - =
+ if (Flags & TEXT_ALIGN_CENTER) + { + coPos.X =3D (xScreen - Length) /2; =
+ } + else if(Flags & TEXT_ALIGN_RIGHT) + { + coPos.X =3D coPos.X - Length; =
+ + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X -=3D 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X -=3D 2; =
+ } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X -=3D 3; + } + } + else /* TEXT_ALIGN_LEFT (Default) */ + { if (Flags & TEXT_PADDING_SMALL) { coPos.X +=3D 1; } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X +=3D 2; =
+ } =
else if (Flags & TEXT_PADDING_BIG) { - coPos.X +=3D 2; =
+ coPos.X +=3D 3; } } - else if (Flags & TEXT_ALIGN_RIGHT) - { - coPos.X =3D coPos.X - Length; =
- - if (Flags & TEXT_PADDING_SMALL) - { - coPos.X -=3D 1; - } - else if (Flags & TEXT_PADDING_BIG) - { - coPos.X -=3D 2; =
- } - } - else if (Flags & TEXT_ALIGN_CENTER) - { - coPos.X =3D (xScreen - Length) /2; =
- } =
if (Flags & TEXT_TYPE_STATUS) { - CONSOLE_SetStatusText(Text); + CONSOLE_SetStatusTextX(coPos.X, Text); } else /* TEXT_TYPE_REGULAR (Default) */ {
Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/consup.h (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h Thu Mar 20 13:28:37 = 2008 @@ -47,8 +47,9 @@ #define TEXT_ALIGN_CENTER 0x00000100 =
/* Text padding */ -#define TEXT_PADDING_SMALL 0x00000200 -#define TEXT_PADDING_BIG 0x00000400 +#define TEXT_PADDING_SMALL 0x00000200 /* One space */ +#define TEXT_PADDING_MEDIUM 0x00000400 /* Two spaces */ +#define TEXT_PADDING_BIG 0x00000800 /* Three spaces */ =
extern HANDLE StdInput, StdOutput; extern SHORT xScreen, yScreen; @@ -158,6 +159,16 @@ IN LPCSTR fmt, ...); =
VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID CONSOLE_SetTextXY( IN SHORT x, IN SHORT y,
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/usetup.c?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Thu Mar 20 13:28:37 = 2008 @@ -3002,13 +3002,13 @@ case SPFILENOTIFY_STARTSUBQUEUE: CopyContext->TotalOperations =3D (ULONG)Param2; ProgressSetStepCount(CopyContext->ProgressBar, - CopyContext->TotalOperations); + CopyContext->TotalOperations); SetupUpdateMemoryInfo(CopyContext, TRUE); break; =
case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Par= am1); + CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYIN= G), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; =
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/bg-BG.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "=C2=8D=C2=A5 =C2=A1=C2=A5 =C2=AD=C2=A0=C2=AC=C2=A5=C3=A0=C2=A5=C2=AD = =C3=A0=C2=A0=C2=A7=C2=A4=C2=A5=C2=AB '%S'\n=C2=A2 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=87=C2=A0=C2=AF=C2= =A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB: %S"}, + "\xB3 =C2=87=C2=A0=C2=AF=C2=A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9= =C2=AB: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=92=C2=A5=C3=A7=C2=A5 =C2=A7=C2=A0=C2=AF=C2=A8=C3=A1=C2=A2=C2=A0= =C2=AD=C2=A5 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB=C2=AE=C2=A2=C2=A5=C3=A2= =C2=A5..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Nepoda=C3=BDilo se naj=C2=A1t sekci '%S' v souboru\n TXTSETUP.SIF.\n"= }, {STRING_COPYING, - " \xB3 Kop=C2=A1ruj= i soubor: %S"}, + "\xB3 Kop=C2=A1ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, "Instalace kop=C2=A1ruje soubory..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - " \xB3 Kopiere Datei: %S"}, + "\xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/el-GR.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/en-US.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Thu Mar 20 13:28:37 2008 @@ -36,8 +36,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -112,8 +112,8 @@ { 0, 0, - " ENTER =3D Continue R =3D Repair F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue R =3D Repair F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -206,8 +206,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -330,8 +330,8 @@ { 0, 0, - " ENTER =3D Return", - TEXT_TYPE_STATUS + "ENTER =3D Return", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -423,8 +423,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -487,8 +487,8 @@ { 0, 0, - " ESC =3D Main page ENTER =3D Reboot", - TEXT_TYPE_STATUS + "ESC =3D Main page ENTER =3D Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -538,8 +538,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -578,8 +578,8 @@ { 0, 0, - " Flushing cache", - TEXT_TYPE_STATUS + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -624,8 +624,8 @@ { 0, 0, - " Please wait ...", - TEXT_TYPE_STATUS, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -675,8 +675,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -721,8 +721,8 @@ { 0, 0, - " ENTER =3D Reboot computer", - TEXT_TYPE_STATUS + "ENTER =3D Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -767,8 +767,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -826,8 +826,8 @@ { 0, 0, - " Please wait...", - TEXT_TYPE_STATUS + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -860,8 +860,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -912,8 +912,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -950,9 +950,9 @@ TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { - 0, - 0, - " \xB3 P= lease wait... ", + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -998,8 +998,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1050,8 +1050,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1102,8 +1102,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1131,8 +1131,8 @@ { 0, 0, - " Building the file copy list...", - TEXT_TYPE_STATUS + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1178,8 +1178,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, =
{ @@ -1225,8 +1225,8 @@ { 0, 0, - " D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1253,8 +1253,8 @@ { 0, 0, - " Creating registry hives...", - TEXT_TYPE_STATUS + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/es-ES.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Thu Mar 20 13:28:37 2008 @@ -356,34 +356,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " Equipo:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Equipo:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Pantalla:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Pantalla:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, - " Disp. Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Disp. Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Aceptar:", - TEXT_STYLE_NORMAL + "Aceptar:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -932,22 +932,22 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Por favor espere mientras el Instalador de ReactOS copia", - TEXT_STYLE_NORMAL - }, - { - 30, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "archivos en su carpeta de instalaci=C2=A2n de ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 20, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "Esta operaci=C2=A2n puede durar varios minutos.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "El instalador fall=C2=A2 al buscar la secci=C2=A2n\nin TXTSETUP.SIF.= n"}, {STRING_COPYING, - " \xB3 Copiando archivo: %S"= }, + "\xB3 Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, "El instalador est=C2=A0 copiando archivos..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/fr-FR.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Thu Mar 20 13:28:37 2008 @@ -1611,7 +1611,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + "\xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/it-IT.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copia di: %S"}, + "\xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/lt-LT.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Thu Mar 20 13:28:37 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by=C2=88 w stanie odnale=C2=AB=C2=86 sekji '%S'\nw pli= ku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik=C2=A2w: %S"}, + "\xB3 Kopiowanie plik=C2=A2w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/ru-RU.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AD=C2=A5 =C3=A1=C2=AC=C2=AE= =C2=A3=C2=AB=C2=A0 =C2=AD=C2=A0=C2=A9=C3=A2=C2=A8 =C3=A1=C2=A5=C2=AA=C3=A6= =C2=A8=C3=AE '%S'\n=C2=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C2=A5 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=8A=C2=AE=C2=AF=C2= =A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2=A5: %S"}, + "\xB3 =C2=8A=C2=AE=C2=AF=C2=A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2= =A5: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AA=C2=AE=C2=AF=C2=A8=C3=A0= =C3=A3=C2=A5=C3=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C3=AB..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Thu Mar 20 13:28:37 2008 @@ -1604,7 +1604,7 @@ {STRING_TXTSETUPFAILED, "In=C3=A7tal=C2=A0tor zlyhal pri h=C2=96adan=C2=A1 sekcie '%S'\nv s=C2= =A3bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kop=C2=A1ruje sa s=C2= =A3bor: %S"}, + "\xB3 Kop=C2=A1ruje sa s=C2=A3bor: %S"}, {STRING_SETUPCOPYINGFILES, "In=C3=A7tal=C2=A0tor kop=C2=A1ruje s=C2=A3bory..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sv-SE.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Thu Mar 20 13:28:37 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/uk-UA.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,
-
mpiulachs＠svn.reactos.org