- 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

reactos/base/setup/usetup/interface/consup.c

@@ -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,8 +603,8 @@ CONSOLE_SetStyledText(
 
     if (Flags & TEXT_TYPE_STATUS)
 	{
+		coPos.X = x;
 		coPos.Y = yScreen - 1;
-		coPos.X = 0;
 	}
     else /* TEXT_TYPE_REGULAR (Default) */
     {
@@ -546,18 +612,9 @@ CONSOLE_SetStyledText(
 		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)
 	{
@@ -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_ALIGN_CENTER)
+		else if (Flags & TEXT_PADDING_BIG)
 		{
-		coPos.X = (xScreen - Length) /2; 
+			coPos.X -= 3;
+		}
+	}
+   	else /* TEXT_ALIGN_LEFT (Default) */
+	{
+		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) */
     {

reactos/base/setup/usetup/interface/consup.h

@@ -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,

reactos/base/setup/usetup/interface/usetup.c

@@ -3008,7 +3008,7 @@ FileCopyCallback(PVOID Context,
 
         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;
 

reactos/base/setup/usetup/lang/en-US.h

@@ -37,7 +37,7 @@ static MUI_ENTRY enUSLanguagePageEntries[] =
         0,
         0,
         "ENTER = Continue  F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -113,7 +113,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] =
         0,
         0,
         "ENTER = Continue  R = Repair F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -207,7 +207,7 @@ static MUI_ENTRY enUSIntroPageEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS| TEXT_PADDING_BIG
     },
     {
         0,
@@ -331,7 +331,7 @@ static MUI_ENTRY enUSLicensePageEntries[] =
         0,
         0,
         "ENTER = Return",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -424,7 +424,7 @@ static MUI_ENTRY enUSDevicePageEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -488,7 +488,7 @@ static MUI_ENTRY enUSRepairPageEntries[] =
         0,
         0,
         "ESC = Main page  ENTER = Reboot",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -539,7 +539,7 @@ static MUI_ENTRY enUSComputerPageEntries[] =
         0,
         0,
         "ENTER = Continue   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -579,7 +579,7 @@ static MUI_ENTRY enUSFlushPageEntries[] =
         0,
         0,
         "Flushing cache",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -625,7 +625,7 @@ static MUI_ENTRY enUSQuitPageEntries[] =
         0,
         0,
         "Please wait ...",
-        TEXT_TYPE_STATUS,
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
     },
     {
         0,
@@ -676,7 +676,7 @@ static MUI_ENTRY enUSDisplayPageEntries[] =
         0,
         0,
         "ENTER = Continue   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -722,7 +722,7 @@ static MUI_ENTRY enUSSuccessPageEntries[] =
         0,
         0,
         "ENTER = Reboot computer",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -768,7 +768,7 @@ static MUI_ENTRY enUSBootPageEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -827,7 +827,7 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
         0,
         0,
         "Please wait...",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -861,7 +861,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -913,7 +913,7 @@ static MUI_ENTRY enUSInstallDirectoryEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -950,7 +950,7 @@ static MUI_ENTRY enUSFileCopyEntries[] =
         TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
     },
     {
-        0,
+        50,
         0,
         "\xB3 Please wait...    ",
         TEXT_TYPE_STATUS
@@ -999,7 +999,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -1051,7 +1051,7 @@ static MUI_ENTRY enUSKeyboardSettingsEntries[] =
         0,
         0,
         "ENTER = Continue   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -1103,7 +1103,7 @@ static MUI_ENTRY enUSLayoutSettingsEntries[] =
         0,
         0,
         "ENTER = Continue   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -1132,7 +1132,7 @@ static MUI_ENTRY enUSPrepareCopyEntries[] =
         0,
         0,
         "Building the file copy list...",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -1179,7 +1179,7 @@ static MUI_ENTRY enUSSelectFSEntries[] =
         0,
         0,
         "ENTER = Continue   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
 
     {
@@ -1226,7 +1226,7 @@ static MUI_ENTRY enUSDeletePartitionEntries[] =
         0,
         0,
         "D = Delete Partition   ESC = Cancel   F3 = Quit",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -1254,7 +1254,7 @@ static MUI_ENTRY enUSRegistryEntries[] =
         0,
         0,
         "Creating registry hives...",
-        TEXT_TYPE_STATUS
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,

reactos/base/setup/usetup/lang/es-ES.h

@@ -356,34 +356,34 @@ static MUI_ENTRY esESDevicePageEntries[] =
         TEXT_STYLE_NORMAL
     },
     {
-        8,
+        24,
         11,
         "Equipo:",
-        TEXT_STYLE_NORMAL
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
     },
     {
-        8,
+        24,
         12,
         "Pantalla:",
-        TEXT_STYLE_NORMAL,
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
     },
     {
-        8,
+        24,
         13,
         "Teclado:",
-        TEXT_STYLE_NORMAL
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
     },
     {
-        8,
+        24,
         14,
         "Disp. Teclado:",
-        TEXT_STYLE_NORMAL
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT
     },
     {
-        8,
+        24,
         16,
         "Aceptar:",
-        TEXT_STYLE_NORMAL
+        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,