Merge branch 'main' into far3-dev-tests

ChangeLog

@@ -1,26 +1,43 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
-## [24.9.0.605] - 2024-09-07
+## [24.11.1.605] - 2024-11-25
 
-### Changes
+### Fixes
 
-* Upgrade dependencies: OpenSSL 3.3.2
-* Upgrade dependencies: neon 0.34.0
-* Upgrade dependencies: expat 2.6.3
-* Upgrade dependencies: tinyxml 10.0.0
+Thanks to ssvine https://github.com/ssvine
+ * gh-498 Fix RTTI class IDs
+https://github.com/michaellukashov/Far-NetBox/pull/498
+ * gh-496 Fix SCP terminal command execution
+https://github.com/michaellukashov/Far-NetBox/pull/496
+ * gh-495 Remove SSH-1 remainings from the Session dialog
+https://github.com/michaellukashov/Far-NetBox/pull/495
+ * gh-494 Don't treat netbox file as archive when searching in archives
+https://github.com/michaellukashov/Far-NetBox/pull/494
 
 
-## [24.6.1.604] - 2024-06-29
+## [24.9.0.604] - 2024-09-07
 
 ### Changes
 
- * Upgrade dependencies: OpenSSL 3.3.1
+ * Upgrade dependencies: OpenSSL 3.3.2
+ * Upgrade dependencies: expat 2.6.3
+ * Upgrade dependencies: tinyxml 10.0.0
  * Clarify .ppk file prompt: add (.ppk)
 https://forum.farmanager.com/viewtopic.php?p=177884#p177884
 
 ### Fixes
 
+ * gh-492 Fix focusing of new and duplicated sessions
+https://github.com/michaellukashov/Far-NetBox/issues/492
+ * gh-491 Add Alt-Shift-F11 hotkey to open Edit history
+https://github.com/michaellukashov/Far-NetBox/issues/491
+ * gh-490 Truncate long file names correctly in several dialogs
+https://github.com/michaellukashov/Far-NetBox/issues/490
+ * gh-488 Add more guids for dialogs
+https://github.com/michaellukashov/Far-NetBox/issues/488
+ * gh-487 Fix user/password labels appearing on wrong tab
+https://github.com/michaellukashov/Far-NetBox/issues/487
  * gh-485 Can not create a remote folder
 https://github.com/michaellukashov/Far-NetBox/issues/485
 

src/NetBox/FarDialog.cpp

@@ -15,7 +15,6 @@ inline TRect Rect(int32_t Left, int32_t Top, int32_t Right, int32_t Bottom)
   return TRect(Left, Top, Right, Bottom);
 }
 
-constexpr const TObjectClassId OBJECT_CLASS_TDialogIdleThread = static_cast<TObjectClassId>(nb::counter_id());
 class TFarDialogIdleThread final : public TSimpleThread
 {
 public:
@@ -772,7 +771,7 @@ int32_t TFarDialog::ShowModal()
         GetItemCount(), 0, GetFlags(),
         TFarDialog::DialogProcGeneral,
         nb::ToPtr(this));
-      BResult = Info.DialogRun(Handle);
+      BResult = CheckHandle(Handle) ? Info.DialogRun(Handle) : -1;
     }
 
     if (BResult >= 0)

src/NetBox/FarPlugin.cpp

@@ -1575,7 +1575,6 @@ void TCustomFarPlugin::SaveTerminalScreen()
   FarControl(FCTL_SETUSERSCREEN, 0, nullptr);
 }
 
-const TObjectClassId OBJECT_CLASS_TConsoleTitleParam = static_cast<TObjectClassId>(nb::counter_id());
 class TConsoleTitleParam : public TObject
 {
 public:

src/NetBox/NetBox.cpp

@@ -234,6 +234,10 @@ HANDLE WINAPI AnalyseW(const struct AnalyseInfo * Info)
   if (!Info || (Info->StructSize < sizeof(AnalyseInfo)))
     return nullptr;
   const TFarPluginGuard Guard;
+  if (Info->OpMode & (OPM_FIND | OPM_COMMANDS))
+  {
+    return nullptr;
+  }
   if (!Info->FileName)
   {
     return nullptr;

src/NetBox/NetBox.rc

@@ -12,13 +12,13 @@ FILETYPE 0x2
         {
             VALUE "CompanyName", "Mikhail Lukashov\0"
             VALUE "FileDescription", "NetBox: SFTP/FTP/FTPS/SCP/WebDAV/S3 client for Far Manager 3.0\0"
-            VALUE "FileVersion", "24.9.0.605\0"
+            VALUE "FileVersion", "24.11.1.605\0"
             VALUE "InternalName", "FarNetBox\0"
             VALUE "LegalCopyright", "(c) 2011, 2024 Mikhail Lukashov\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "NetBox.dll\0"
             VALUE "ProductName", "NetBox\0"
-            VALUE "ProductVersion", "24.9.0.605\0"
+            VALUE "ProductVersion", "24.11.1.605\0"
             VALUE "ReleaseType", "beta\0"
             VALUE "WWW", "https://github.com/michaellukashov/Far-NetBox\0"
         }

src/NetBox/NetBoxEng.lng

@@ -239,11 +239,6 @@
 "Preser&ve remote timestamp (Unix)"
 " SSH protocol options "
 "Enable &compression"
-" Preferred SSH protocol version "
-"1 on&ly"
-"&1"
-"&2"
-"2 o&nly"
 " Encryption options "
 "&Encryption cipher selection policy:"
 "&Up  "
@@ -333,7 +328,6 @@
 "&Bypass authentication entirely (SSH-2)"
 " Authentication options "
 "Attempt authentication using &Pageant"
-"Attempt &TIS or CryptoCard authentication (SSH-1)"
 "Attempt 'keyboard-&interactive' authentication (SSH-2)"
 "Respond with pass&word to the first prompt"
 "Allow agent &forwarding"

src/NetBox/NetBoxPol.lng

@@ -239,11 +239,6 @@
 "Za&chowaj znacznik czasu serwera (Unix)"
 " Opcje protokołu SSH "
 "Włącz &kompresję"
-" Preferowania wersja protokołu SSH "
-"&Tylko 1"
-"&1"
-"&2"
-"T&ylko 2"
 " Opcje szyfrowania "
 "Kolejność wyboru &szyfrów: "
 "&Góra"
@@ -333,7 +328,6 @@
 "&Całkowicie omiń autoryzację (SSH-2)"
 " Opcje autoryzacji "
 "Próbuj autoryzacji za pomocą &Pageant"
-"Próbuj autoryzacji &TIS lub CryptoCard (SSH-1)"
 "Próbuj autoryzacji '&klawiaturą' (SSH-2)"
 "Odpowiedz &hasłem na pierwszy monit"
 "&Zezwól na przekierowanie agenta"

src/NetBox/NetBoxRus.lng

@@ -239,11 +239,6 @@
 "Не &менять время для файлов сервера"
 " Настройки протокола SSH "
 "Разрешить &сжатие"
-" Предпочитаемая версия SSH "
-"&только 1"
-"&1"
-"&2"
-"то&лько 2"
 " Настройки шифрования "
 "&Метод выбора шифра:"
 "&Выше"
@@ -333,7 +328,6 @@
 "&Полностью игнорировать аутентификацию (SSH-2)"
 " Настройки аутентификации "
 "Пытаться аутентифицироваться с помощью &Pageant"
-"Пробовать аутентификацию &TIS или CryptoCard (SSH-1)"
 "Пытаться &аутентифицир. с помощью клавиатуры (SSH-2)"
 "Отвечать с паролем на первый &запрос"
 "Разрешить обращение к агенту через себя"

src/NetBox/NetBoxSpa.lng

@@ -239,11 +239,6 @@
 "Preser&var sello de tiempo remoto (Unix)"
 " Opciones protocolo SSH "
 "Habilitar &compresión"
-" Versión de protocolo SSH preferido "
-"1 so&lamente"
-"&1"
-"&2"
-"2 solame&nte"
 " Opciones de cifrado "
 "S&elección de norma de código cifrado:"
 "&Arriba"
@@ -333,7 +328,6 @@
 "&Bypass authentication entirely (SSH-2)"
 " Authentication options "
 "Attempt authentication using &Pageant"
-"Attempt &TIS or CryptoCard authentication (SSH-1)"
 "Attempt 'keyboard-&interactive' authentication (SSH-2)"
 "Respond with pass&word to the first prompt"
 "Allow agent &forwarding"