- 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

svn path=/trunk/; revision=32727
This commit is contained in:
Marc Piulachs 2008-03-20 18:28:37 +00:00
parent 070880c0a2
commit b3c070fba3
17 changed files with 224 additions and 141 deletions

View file

@ -203,44 +203,6 @@ CONSOLE_ClearScreen(VOID)
&Written);
}
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 = 0;
coPos.Y = 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,
@ -390,6 +352,110 @@ CONSOLE_SetUnderlinedTextXY(
&Written);
}
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 = 0;
coPos.Y = 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 = 0;
coPos.Y = yScreen - 1;
FillConsoleOutputAttribute(
StdOutput,
BACKGROUND_WHITE,
xScreen,
coPos,
&Written);
FillConsoleOutputCharacterA(
StdOutput,
' ',
xScreen,
coPos,
&Written);
coPos.X = 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 = (ULONG)strlen(Buffer);
if (Length + x <= 79)
{
CONSOLE_SetStatusTextX (x , Buffer);
}
else
{
CONSOLE_SetStatusTextX (79 - Length , Buffer);
}
}
VOID
CONSOLE_SetInvertedTextXY(
IN SHORT x,
@ -537,29 +603,20 @@ CONSOLE_SetStyledText(
if (Flags & TEXT_TYPE_STATUS)
{
coPos.X = x;
coPos.Y = yScreen - 1;
coPos.X = 0;
}
else /* TEXT_TYPE_REGULAR (Default) */
{
coPos.X = x;
coPos.X = x;
coPos.Y = y;
}
if (Flags & TEXT_ALIGN_LEFT)
if (Flags & TEXT_ALIGN_CENTER)
{
coPos.X = 0;
if (Flags & TEXT_PADDING_SMALL)
{
coPos.X += 1;
}
else if (Flags & TEXT_PADDING_BIG)
{
coPos.X += 2;
}
coPos.X = (xScreen - Length) /2;
}
else if (Flags & TEXT_ALIGN_RIGHT)
else if(Flags & TEXT_ALIGN_RIGHT)
{
coPos.X = coPos.X - Length;
@ -567,19 +624,34 @@ CONSOLE_SetStyledText(
{
coPos.X -= 1;
}
else if (Flags & TEXT_PADDING_BIG)
else if (Flags & TEXT_PADDING_MEDIUM)
{
coPos.X -= 2;
}
else if (Flags & TEXT_PADDING_BIG)
{
coPos.X -= 3;
}
}
else if (Flags & TEXT_ALIGN_CENTER)
else /* TEXT_ALIGN_LEFT (Default) */
{
coPos.X = (xScreen - Length) /2;
if (Flags & TEXT_PADDING_SMALL)
{
coPos.X += 1;
}
else if (Flags & TEXT_PADDING_MEDIUM)
{
coPos.X += 2;
}
else if (Flags & TEXT_PADDING_BIG)
{
coPos.X += 3;
}
}
if (Flags & TEXT_TYPE_STATUS)
{
CONSOLE_SetStatusText(Text);
CONSOLE_SetStatusTextX(coPos.X, Text);
}
else /* TEXT_TYPE_REGULAR (Default) */
{

View file

@ -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;
@ -157,6 +158,16 @@ VOID
CONSOLE_SetStatusText(
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,

View file

@ -3002,13 +3002,13 @@ FileCopyCallback(PVOID Context,
case SPFILENOTIFY_STARTSUBQUEUE:
CopyContext->TotalOperations = (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)Param1);
CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYING), (PWSTR)Param1);
SetupUpdateMemoryInfo(CopyContext, FALSE);
break;

View file

@ -1608,7 +1608,7 @@ MUI_STRING bgBGStrings[] =
{STRING_TXTSETUPFAILED,
"<EFBFBD>¥ ¡¥ ­ ¬¥à¥­ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 ‡ ¯¨ב ­  ה ©«: %S"},
"\xB3 ‡ ¯¨ב ­  ה ©«: %S"},
{STRING_SETUPCOPYINGFILES,
"’¥ç¥ § ¯¨á¢ ­¥ ­  ä ©«®¢¥â¥..."},
{STRING_PAGEDMEM,

View file

@ -1605,7 +1605,7 @@ MUI_STRING csCZStrings[] =
{STRING_TXTSETUPFAILED,
"Nepodaýilo se naj¡t sekci '%S' v souboru\n TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 Kop¡ruji soubor: %S"},
"\xB3 Kop¡ruji soubor: %S"},
{STRING_SETUPCOPYINGFILES,
"Instalace kop¡ruje soubory..."},
{STRING_PAGEDMEM,

View file

@ -1605,7 +1605,7 @@ MUI_STRING deDEStrings[] =
{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,

View file

@ -1599,7 +1599,7 @@ MUI_STRING elGRStrings[] =
{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,

View file

@ -36,8 +36,8 @@ static MUI_ENTRY enUSLanguagePageEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -112,8 +112,8 @@ static MUI_ENTRY enUSWelcomePageEntries[] =
{
0,
0,
" ENTER = Continue R = Repair F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue R = Repair F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -206,8 +206,8 @@ static MUI_ENTRY enUSIntroPageEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS| TEXT_PADDING_BIG
},
{
0,
@ -330,8 +330,8 @@ static MUI_ENTRY enUSLicensePageEntries[] =
{
0,
0,
" ENTER = Return",
TEXT_TYPE_STATUS
"ENTER = Return",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -423,8 +423,8 @@ static MUI_ENTRY enUSDevicePageEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -487,8 +487,8 @@ static MUI_ENTRY enUSRepairPageEntries[] =
{
0,
0,
" ESC = Main page ENTER = Reboot",
TEXT_TYPE_STATUS
"ESC = Main page ENTER = Reboot",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -538,8 +538,8 @@ static MUI_ENTRY enUSComputerPageEntries[] =
{
0,
0,
" ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -578,8 +578,8 @@ static MUI_ENTRY enUSFlushPageEntries[] =
{
0,
0,
" Flushing cache",
TEXT_TYPE_STATUS
"Flushing cache",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -624,8 +624,8 @@ static MUI_ENTRY enUSQuitPageEntries[] =
{
0,
0,
" Please wait ...",
TEXT_TYPE_STATUS,
"Please wait ...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
},
{
0,
@ -675,8 +675,8 @@ static MUI_ENTRY enUSDisplayPageEntries[] =
{
0,
0,
" ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -721,8 +721,8 @@ static MUI_ENTRY enUSSuccessPageEntries[] =
{
0,
0,
" ENTER = Reboot computer",
TEXT_TYPE_STATUS
"ENTER = Reboot computer",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -767,8 +767,8 @@ static MUI_ENTRY enUSBootPageEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -826,8 +826,8 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
{
0,
0,
" Please wait...",
TEXT_TYPE_STATUS
"Please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -860,8 +860,8 @@ static MUI_ENTRY enUSFormatPartitionEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -912,8 +912,8 @@ static MUI_ENTRY enUSInstallDirectoryEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -950,9 +950,9 @@ static MUI_ENTRY enUSFileCopyEntries[] =
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
50,
0,
0,
" \xB3 Please wait... ",
"\xB3 Please wait... ",
TEXT_TYPE_STATUS
},
{
@ -998,8 +998,8 @@ static MUI_ENTRY enUSBootLoaderEntries[] =
{
0,
0,
" ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -1050,8 +1050,8 @@ static MUI_ENTRY enUSKeyboardSettingsEntries[] =
{
0,
0,
" ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -1102,8 +1102,8 @@ static MUI_ENTRY enUSLayoutSettingsEntries[] =
{
0,
0,
" ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -1131,8 +1131,8 @@ static MUI_ENTRY enUSPrepareCopyEntries[] =
{
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 @@ static MUI_ENTRY enUSSelectFSEntries[] =
{
0,
0,
" ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"ENTER = Continue ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
@ -1225,8 +1225,8 @@ static MUI_ENTRY enUSDeletePartitionEntries[] =
{
0,
0,
" D = Delete Partition ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS
"D = Delete Partition ESC = Cancel F3 = Quit",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -1253,8 +1253,8 @@ static MUI_ENTRY enUSRegistryEntries[] =
{
0,
0,
" Creating registry hives...",
TEXT_TYPE_STATUS
"Creating registry hives...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
0,
@ -1599,7 +1599,7 @@ MUI_STRING enUSStrings[] =
{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,

View file

@ -356,34 +356,34 @@ static MUI_ENTRY esESDevicePageEntries[] =
TEXT_STYLE_NORMAL
},
{
8,
24,
11,
" Equipo:",
TEXT_STYLE_NORMAL
"Equipo:",
TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
},
{
8,
24,
12,
" Pantalla:",
TEXT_STYLE_NORMAL,
"Pantalla:",
TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
},
{
8,
24,
13,
" Teclado:",
TEXT_STYLE_NORMAL
"Teclado:",
TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
},
{
8,
24,
14,
" Disp. Teclado:",
TEXT_STYLE_NORMAL
"Disp. Teclado:",
TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
},
{
8,
24,
16,
" Aceptar:",
TEXT_STYLE_NORMAL
"Aceptar:",
TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
},
{
25,
@ -932,22 +932,22 @@ static MUI_ENTRY esESFileCopyEntries[] =
TEXT_STYLE_UNDERLINE
},
{
11,
0,
12,
"Por favor espere mientras el Instalador de ReactOS copia",
TEXT_STYLE_NORMAL
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
30,
0,
13,
"archivos en su carpeta de instalaci¢n de ReactOS.",
TEXT_STYLE_NORMAL
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
20,
0,
14,
"Esta operaci¢n puede durar varios minutos.",
TEXT_STYLE_NORMAL
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
0,
@ -1598,7 +1598,7 @@ MUI_STRING esESStrings[] =
{STRING_TXTSETUPFAILED,
"El instalador fall¢ al buscar la secci¢n\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 Copiando archivo: %S"},
"\xB3 Copiando archivo: %S"},
{STRING_SETUPCOPYINGFILES,
"El instalador est  copiando archivos..."},
{STRING_PAGEDMEM,

View file

@ -1611,7 +1611,7 @@ MUI_STRING frFRStrings[] =
{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,

View file

@ -1599,7 +1599,7 @@ MUI_STRING itITStrings[] =
{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,

View file

@ -1608,7 +1608,7 @@ MUI_STRING ltLTStrings[] =
{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,

View file

@ -1607,7 +1607,7 @@ MUI_STRING plPLStrings[] =
{STRING_TXTSETUPFAILED,
"Instalator nie byˆ w stanie odnale«† sekji '%S'\nw pliku TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 Kopiowanie plik˘w: %S"},
"\xB3 Kopiowanie plik˘w: %S"},
{STRING_SETUPCOPYINGFILES,
"Instalator kopiuje pliki..."},
{STRING_PAGEDMEM,

View file

@ -1599,7 +1599,7 @@ MUI_STRING ruRUStrings[] =
{STRING_TXTSETUPFAILED,
"<EFBFBD>ணࠬ¬  ãáâ ­®¢ª¨ ­¥ ᬮ£«  ­ ©â¨ ᥪæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 Š®¯¨à®¢ ­¨¥: %S"},
"\xB3 Š®¯¨à®¢ ­¨¥: %S"},
{STRING_SETUPCOPYINGFILES,
"<EFBFBD>ணࠬ¬  ãáâ ­®¢ª¨ ª®¯¨àã¥â ä ©«ë..."},
{STRING_PAGEDMEM,

View file

@ -1604,7 +1604,7 @@ MUI_STRING skSKStrings[] =
{STRING_TXTSETUPFAILED,
"Inçtal tor zlyhal pri hadan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"},
{STRING_COPYING,
" \xB3 Kop¡ruje sa s£bor: %S"},
"\xB3 Kop¡ruje sa s£bor: %S"},
{STRING_SETUPCOPYINGFILES,
"Inçtal tor kop¡ruje s£bory..."},
{STRING_PAGEDMEM,

View file

@ -1598,7 +1598,7 @@ MUI_STRING svSEStrings[] =
{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,

View file

@ -1599,7 +1599,7 @@ MUI_STRING ukUAStrings[] =
{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,