浏览代码

Show 'Storing' instead of 'Compressing' when a file is not compressed. Closes #129.

Martijn Laan 11 年之前
父节点
当前提交
40d6b5665d
共有 2 个文件被更改,包括 11 次插入2 次删除
  1. 2 0
      Projects/CompMsgs.pas
  2. 9 2
      Projects/Compile.pas

+ 2 - 0
Projects/CompMsgs.pas

@@ -120,6 +120,8 @@ const
   SCompilerStatusFilesInitEncryption = '   Initializing encryption';
   SCompilerStatusFilesCompressing = '   Compressing: %s';
   SCompilerStatusFilesCompressingVersion = '   Compressing: %s   (%u.%u.%u.%u)';
+  SCompilerStatusFilesStoring = '   Storing: %s';
+  SCompilerStatusFilesStoringVersion = '   Storing: %s   (%u.%u.%u.%u)';
   SCompilerStatusCompressingSetupExe = '   Compressing Setup program executable';
   SCompilerStatusUpdatingVersionInfo = '   Updating version info';
   SCompilerStatusUpdatingIcons = '   Updating icons (%s)';

+ 9 - 2
Projects/Compile.pas

@@ -7813,6 +7813,13 @@ var
       end;
     end;
 
+  const
+    StatusFilesStoringOrCompressingVersionStrings: array [Boolean] of String = (
+     SCompilerStatusFilesStoringVersion,
+     SCompilerStatusFilesCompressingVersion);
+    StatusFilesStoringOrCompressingStrings: array [Boolean] of String = (
+     SCompilerStatusFilesStoring,
+     SCompilerStatusFilesCompressing);
   var
     CH: TCompressionHandler;
     ChunkCompressed: Boolean;
@@ -7851,12 +7858,12 @@ var
       for I := 0 to FileLocationEntries.Count-1 do begin
         FL := FileLocationEntries[I];
         if foVersionInfoValid in FL.Flags then
-          AddStatus(Format(SCompilerStatusFilesCompressingVersion,
+          AddStatus(Format(StatusFilesStoringOrCompressingVersionStrings[foChunkCompressed in FL.Flags],
             [FileLocationEntryFilenames[I],
              LongRec(FL.FileVersionMS).Hi, LongRec(FL.FileVersionMS).Lo,
              LongRec(FL.FileVersionLS).Hi, LongRec(FL.FileVersionLS).Lo]))
         else
-          AddStatus(Format(SCompilerStatusFilesCompressing,
+          AddStatus(Format(StatusFilesStoringOrCompressingStrings[foChunkCompressed in FL.Flags],
             [FileLocationEntryFilenames[I]]));
         CallIdleProc;