Skip to content

Commit

Permalink
Merge branch 'main' into far3-dev-tests
Browse files Browse the repository at this point in the history
* main:
  Fix updating session on import
  Return back the ability to change file names on upload
  Do not spoil default CopyParam
  Fix IP protocol selection
  Fix behaviour when connecting session with empty hostname
  Show S3 key labels in Session Edit dialog
  Fix TFarLister scrolling with mouse wheel
  Fix text style
  Show SSH and SSL fingerprints
  Fix style of text messages
  Keep text inside dialog borders
  Fix key value alignment
  Close panel on EAbort in HandleException
  Fix crash when reconnecting to inacessible FTP
  Fix: clicking abort in retry dialog shouldn't show any other messages
  Do not duplicate FTP error messages
  ExtException: don't append the same message twice
  Fix copying of exception messages
  Fix error when uploading an existing directory
  bump version to 24.5.0.602
  • Loading branch information
michaellukashov committed May 28, 2024
2 parents 4c4e53c + ee0dcd3 commit a1c9d83
Show file tree
Hide file tree
Showing 17 changed files with 237 additions and 88 deletions.
19 changes: 19 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
# for this file format description,
# see https://github.com/olivierlacan/keep-a-changelog

## [24.5.0.602] - 2024-05-05

### Changes
* gh-467 Update PuTTY to 0.81
* gh-461 Tell AppVeyour to keep build artifacts

### Fixes

Thanks to ssvine https://github.com/ssvine
* gh-469 Fix log time format
* gh-468 Fix MFC termination
* gh-466 Fix Charset encoding for filenames
* gh-465 Fix dialog message
* gh-463 Fix freeze on exit
* gh-462 Fix possible crashes on lost connections while modal dialog is shown
* gh-459 Fix ssh crash on reconnect
* gh-458 Fix broken terminal output
* gh-457 Fix properties implementation

## [24.4.1.601] - 2024-04-10

### Fixes
Expand Down
12 changes: 11 additions & 1 deletion src/NetBox/FarDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2783,7 +2783,17 @@ intptr_t TFarLister::ItemProc(intptr_t Msg, void * Param)
{
Result = TFarDialogItem::ItemProc(Msg, Param);
}
else
else if (FLAGSET(Event->dwEventFlags, MOUSE_WHEELED))
{
auto WheelDelta = (nb::ToInt(Event->dwButtonState) >> 16) / 120;
int32_t NewTopIndex = GetTopIndex() - WheelDelta;
if (NewTopIndex >= 0 && NewTopIndex <= GetItems()->GetCount() - GetHeight())
{
SetTopIndex(NewTopIndex);
}
Result = 1;
}
else if (Event->dwEventFlags == 0)
{
int32_t NewTopIndex = GetTopIndex();

Expand Down
4 changes: 2 additions & 2 deletions src/NetBox/NetBox.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1.601\0"
VALUE "FileVersion", "24.5.0.602\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.4.1.601\0"
VALUE "ProductVersion", "24.5.0.602\0"
VALUE "ReleaseType", "beta\0"
VALUE "WWW", "https://github.com/michaellukashov/Far-NetBox\0"
}
Expand Down
11 changes: 7 additions & 4 deletions src/NetBox/NetBoxEng.lng
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,10 @@
"Encryption algorithm:"
"Compression:"
"File transfer protocol:"
"Server host key fingerprint:"
"Server host key fingerprint (MD5):"
"Server host key fingerprint (SHA256):"
"Server certificate fingerprint (SHA1):"
"Server certificate fingerprint (SHA256):"
" Protocol capabilities/information "
"Can change permissions:"
"Can change owner/group:"
Expand All @@ -595,10 +598,10 @@
"Capa&bilities"
"Space &available"
"&Copy to Clipboard"
"Remote system"
"Session protocol"
"Remote system:"
"Session protocol:"
"Protocol commands only"
"Can calculate file checksum"
"Can calculate file checksum:"

"&Putty path"
"&Remember session password and pass it to PuTTY"
Expand Down
11 changes: 7 additions & 4 deletions src/NetBox/NetBoxPol.lng
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,10 @@
"Algorytm szyfrowania:"
"Kompresja:"
"Protokół przesyłania plików:"
"Odcisk palca klucza serwera:"
"Odcisk palca klucza serwera (MD5):"
"Odcisk palca klucza serwera (SHA256):"
"Server certificate fingerprint (SHA1):"
"Server certificate fingerprint (SHA256):"
" Możliwości protokołu/informacje "
"Można zmieniać uprawnienia:"
"Można zmieniać właściciela/grupę:"
Expand All @@ -595,10 +598,10 @@
"&Możliwości"
"&Dostępne miejsce"
"&Kopiuj do Schowka"
"Zdalny system"
"Protokół sesji"
"Zdalny system:"
"Protokół sesji:"
"Tylko polecenia protokołu"
"Można obliczać sumy kontrolne"
"Można obliczać sumy kontrolne:"

"Ścieżka do &Putty "
"&Zapamiętaj hasło i przekaż do PuTTY"
Expand Down
11 changes: 7 additions & 4 deletions src/NetBox/NetBoxRus.lng
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,10 @@
"Encryption algorithm:"
"Compression:"
"File transfer protocol:"
"Server host key fingerprint:"
"Server host key fingerprint (MD5):"
"Server host key fingerprint (SHA256):"
"Server certificate fingerprint (SHA1):"
"Server certificate fingerprint (SHA256):"
" Protocol capabilities/information "
"Can change permissions:"
"Can change owner/group:"
Expand All @@ -595,10 +598,10 @@
"Capa&bilities"
"Space &available"
"&Copy to Clipboard"
"Remote system"
"Session protocol"
"Remote system:"
"Session protocol:"
"Protocol commands only"
"Can calculate file checksum"
"Can calculate file checksum:"

"Путь к &Putty"
"&Помнить пароль сессии и передавать его PuTTY"
Expand Down
11 changes: 7 additions & 4 deletions src/NetBox/NetBoxSpa.lng
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,10 @@
"Algoritmo de codificación:"
"Compresión:"
"Protocolo de transferencia de archivo:"
"Server host key fingerprint:"
"Server host key fingerprint (MD5):"
"Server host key fingerprint (SHA256):"
"Server certificate fingerprint (SHA1):"
"Server certificate fingerprint (SHA256):"
" Capacidades/información de protocolo"
"Cambiar permisos:"
"Cambiar dueño/grupo:"
Expand All @@ -595,10 +598,10 @@
"Capa&cidades"
"Esp&acio disponible"
"&Copiar al Portapapeles"
"Sistema remoto"
"Protocolo de sesión"
"Sistema remoto:"
"Protocolo de sesión:"
"Sólo comandos de protocolo"
"Poder calcular checksum de archivo"
"Poder calcular checksum de archivo:"

"Ruta &Putty"
"&Recordar contraseña de sesión y pasarlo a PuTTY"
Expand Down
Loading

0 comments on commit a1c9d83

Please sign in to comment.