Browse Source

Removing STATUS_COMPRESSION2_HINT (using simple slash in STATUS_COMPRESSION_HINT instead) as its use is rather obscure and the symbol in the string was corrupted ever since 5.0 (and copied over to all translations) and no one ever noticed

Source commit: 19fe5b99e7643a331b85f1752f219c3a749b9cd2
Martin Prikryl 7 years ago
parent
commit
43db702226
3 changed files with 6 additions and 11 deletions
  1. 6 9
      source/forms/CustomScpExplorer.cpp
  2. 0 1
      source/resource/TextsWin.h
  3. 0 1
      source/resource/TextsWin1.rc

+ 6 - 9
source/forms/CustomScpExplorer.cpp

@@ -4351,17 +4351,14 @@ void __fastcall TCustomScpExplorerForm::InitStatusBar()
 
   SessionStatusBar->Panels->Items[Offset + 2]->Enabled =
     (!SessionInfo.CSCompression.IsEmpty() || !SessionInfo.SCCompression.IsEmpty());
-  if (SessionInfo.CSCompression == SessionInfo.SCCompression)
+  UnicodeString CSCompressionStr = DefaultStr(SessionInfo.CSCompression, LoadStr(NO_STR));
+  UnicodeString SCCompressionStr = DefaultStr(SessionInfo.SCCompression, LoadStr(NO_STR));
+  UnicodeString CompressionStr = CSCompressionStr;
+  if (CSCompressionStr != SCCompressionStr)
   {
-    SessionStatusBar->Panels->Items[Offset + 2]->Hint =
-      FMTLOAD(STATUS_COMPRESSION_HINT, (DefaultStr(SessionInfo.CSCompression, LoadStr(NO_STR))));
-  }
-  else
-  {
-    SessionStatusBar->Panels->Items[Offset + 2]->Hint = FMTLOAD(STATUS_COMPRESSION2_HINT,
-      (DefaultStr(SessionInfo.CSCompression, LoadStr(NO_STR)),
-       DefaultStr(SessionInfo.SCCompression, LoadStr(NO_STR))));
+    CompressionStr += UnicodeString(L"/") + SCCompressionStr;
   }
+  SessionStatusBar->Panels->Items[Offset + 2]->Hint = FMTLOAD(STATUS_COMPRESSION_HINT, (CompressionStr));
 
   SessionStatusBar->Panels->Items[Offset + 3]->Hint = LoadStr(STATUS_DURATION_HINT);
 

+ 0 - 1
source/resource/TextsWin.h

@@ -318,7 +318,6 @@
 #define STATUS_DURATION_HINT    1640
 #define STATUS_COMPRESSION_HINT 1641
 #define STATUS_FILEINFO_HINT    1644
-#define STATUS_COMPRESSION2_HINT 1645
 #define STATUS_ENCRYPTION2_HINT 1646
 #define SAVEDSESSION_HINT       1647
 #define LICENSE_CAPTION         1649

+ 0 - 1
source/resource/TextsWin1.rc

@@ -318,7 +318,6 @@ BEGIN
         EXPLORER_FORWARD_HINT, "Forward to %s"
         STATUS_DURATION_HINT, "Connection time"
         STATUS_COMPRESSION_HINT, "Compression (%s)"
-        STATUS_COMPRESSION2_HINT, "Compression (client \273 server: %s, server \273 client: %s)"
         STATUS_FILEINFO_HINT, "File selection info"
         SAVEDSESSION_HINT, "Open site '%s' (hold down Shift to open site in new window)"
         LICENSE_CAPTION, "%s license"