Skip to content

Commit

Permalink
Dialog focus & hotkeys; gh-436
Browse files Browse the repository at this point in the history
1. Minor correction of moving dialog focus with hotkeys.
2. gh-436: Difference between help file and dialog window.
  • Loading branch information
alabuzhev committed Aug 19, 2021
1 parent afa595f commit 27a57c7
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 29 deletions.
3 changes: 1 addition & 2 deletions far/FarCze.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3963,8 +3963,7 @@ non-typical text files.
@FileAttrDlg
$ #Dialog Atributy souboru#
Tento příkaz umí změnit atributy a časy souboru. Aplikován může být na kterýkoliv soubor,
nebo skupinu souborů. Pokud si nepřejete změnit atributy v podadresářích odznačte nastavení
"Změnit soubory v podadresářích".
nebo skupinu souborů.

#Atributy souboru#

Expand Down
3 changes: 1 addition & 2 deletions far/FarEng.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3930,8 +3930,7 @@ non-typical text files.
@FileAttrDlg
$ #File attributes dialog#
With this command it is possible to change file attributes and file time.
Either single file or group of files can be processed. If you do not want to
process files in subfolders, clear the "Process subfolders" option.
Either single file or group of files can be processed.

#File attributes#

Expand Down
4 changes: 1 addition & 3 deletions far/FarGer.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4008,9 +4008,7 @@ non-typical text files.
$ #Dateiattribute#
Mit diesem Befehl ist es möglich, Dateiattribute und -zeiten
zu ändern. Es können entweder einzelne Dateien auch Dateigruppen
bearbeitet werden. Wenn Sie keine Dateien in Unterverzeichnissen
ändern wollen, schalten Sie die Option "Unterverzeichnisse
einschließen" aus.
bearbeitet werden.

#File attributes#

Expand Down
3 changes: 1 addition & 2 deletions far/FarHun.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4024,8 +4024,7 @@ garantálható, különösen, ha rövid vagy nem tipikus szövegfájlt nyitunk m
$ #Fájl attribútumok párbeszédablak#
A párbeszédablakban a fájlobjektumok attribútumait, valamint dátumát és
idejét változtathatjuk meg. Használhatjuk egyetlen fájlra vagy fájlok
csoportjára is. Ha nem szeretnénk, hogy a változtatások almappákban is
végbemenjenek, "Az almappákon is" opciót ne kapcsoljuk be.
csoportjára is.

#Fájl attribútumok#

Expand Down
3 changes: 1 addition & 2 deletions far/FarPol.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3929,8 +3929,7 @@ non-typical text files.
@FileAttrDlg
$ #File attributes dialog#
With this command it is possible to change file attributes and file time.
Either single file or group of files can be processed. If you do not want to
process files in subfolders, clear the "Process subfolders" option.
Either single file or group of files can be processed.

#File attributes#

Expand Down
3 changes: 1 addition & 2 deletions far/FarRus.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3982,8 +3982,7 @@ $ #Автоопределение кодовой страницы#
@FileAttrDlg
$ #Файловые атрибуты#
Эта команда позволяет изменить атрибуты и время как у отдельных файлов, так
и у групп файлов и папок. Если вам не нужно обрабатывать файлы во вложенных
папках, отмените параметр "Обрабатывать вложенные папки".
и у групп файлов и папок.

#Файловые атрибуты#

Expand Down
3 changes: 1 addition & 2 deletions far/FarSky.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3925,8 +3925,7 @@ non-typical text files.
@FileAttrDlg
$ #Atribúty súborov#
S týmto príkazom je možné zmeniť atribúty súborov a ich čas.
Možno pracovať s jedným ako i skupinou súborov. Ak nechcete zvolené nastavenia
použiť pre súbory v podadresároch, zrušte voľbu "Prejdi podadresáre".
Možno pracovať s jedným ako i skupinou súborov.

#File attributes#

Expand Down
4 changes: 1 addition & 3 deletions far/FarUkr.hlf.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3993,9 +3993,7 @@ non-typical text files.
@FileAttrDlg
$ #Зміна файлових атрибутів#
Ця команда дозволяє змінити атрибути та час як у окремих
файлів, так і у груп файлів та папок. Якщо вам не треба обробляти
файли у вкладених папках, відмініть параметр "Обробляти вкладені
папки".
файлів, так і у груп файлів та папок.

#Файлові атрибути#

Expand Down
7 changes: 7 additions & 0 deletions far/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
--------------------------------------------------------------------------------
drkns 19.08.2021 18:33:48 +0100 - build 5880

1. Minor correction of moving dialog focus with hotkeys.

2. gh-436: Difference between help file and dialog window.

--------------------------------------------------------------------------------
drkns 17.08.2021 20:16:51 +0100 - build 5879

Expand Down
6 changes: 1 addition & 5 deletions far/dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4089,11 +4089,7 @@ bool Dialog::ProcessHighlighting(int Key, size_t FocusPos, bool Translate)
if (!DlgProc(DN_HOTKEY, I, &rec))
break; // сказали не продолжать обработку...

// ... если следующий контрол задизаблен или невидим, тогда выходим.
if ((Items[I + 1].Flags & (DIF_DISABLE | DIF_HIDDEN))) // и не задисаблен
break;

I = ChangeFocus(I, 1, false);
I = ChangeFocus(I, 1, true);
DisableSelect = true;
}
}
Expand Down
1 change: 0 additions & 1 deletion far/print.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "filelist.hpp"
#include "savescr.hpp"
#include "ctrlobj.hpp"
#include "keyboard.hpp"
#include "interf.hpp"
#include "message.hpp"
#include "delete.hpp"
Expand Down
8 changes: 4 additions & 4 deletions far/setcolor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -906,8 +906,8 @@ bool GetColorDialog(FarColor& Color, bool const bCentered, const FarColor* const

if (BaseColor)
{
ColorDlg[cd_fg_text].Flags |= DIF_HIDDEN;
ColorDlg[cd_bg_text].Flags |= DIF_HIDDEN;
ColorDlg[cd_fg_text].Flags |= DIF_HIDDEN | DIF_DISABLE;
ColorDlg[cd_bg_text].Flags |= DIF_HIDDEN | DIF_DISABLE;

if (colors::is_transparent(Color.ForegroundColor))
{
Expand Down Expand Up @@ -942,8 +942,8 @@ bool GetColorDialog(FarColor& Color, bool const bCentered, const FarColor* const
}
else
{
ColorDlg[cd_fg_active].Flags|=DIF_HIDDEN;
ColorDlg[cd_bg_active].Flags|=DIF_HIDDEN;
ColorDlg[cd_fg_active].Flags |= DIF_HIDDEN | DIF_DISABLE;
ColorDlg[cd_bg_active].Flags |= DIF_HIDDEN | DIF_DISABLE;
}

const auto Dlg = Dialog::create(ColorDlg, GetColorDlgProc, &ColorState);
Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5879
5880

0 comments on commit 27a57c7

Please sign in to comment.