Improving keyboard-based working

#738
FrankBijnen · Jan 28, 2025 · 5831817 · 5831817
1 parent 06bd5d9
commit 5831817
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 32 deletions.
diff --git a/Source/ExifToolsGui_ValEdit.pas b/Source/ExifToolsGui_ValEdit.pas
@@ -13,7 +13,7 @@   TValueListEditor = class;
 
   TETGuiInplaceEdit = class(Vcl.Grids.TInplaceEdit)
   private
-    procedure OwnerPoint(var X, Y: integer);
+    procedure ConvertToGridPoint(var X, Y: integer);
     function ValueListEditor: TValueListEditor;
   protected
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: integer); override;
@@ -43,14 +43,15 @@   TValueListEditor = class(Vcl.ValEdit.TValueListEditor)
     property OnCtrlKeyDown: TkeyEvent read FOnCtrlKeyDown write FOnCtrlKeyDown;
     property ProportionalVScroll: boolean read FProportionalVScroll write SetProportionalVScroll default false;
     property FixedRows;
+    property InplaceEdit: TETGuiInplaceEdit read FInplaceEdit;
   end;
 
 implementation
 
 uses
   System.Types, System.UITypes, Winapi.Windows;
 
-procedure TETGuiInplaceEdit.OwnerPoint(var X, Y: integer);
+procedure TETGuiInplaceEdit.ConvertToGridPoint(var X, Y: integer);
 var
   Pt: TPoint;
 begin
@@ -67,14 +68,6 @@ function TETGuiInplaceEdit.ValueListEditor: TValueListEditor;
 
 procedure TETGuiInplaceEdit.KeyDown(var Key: Word; Shift: TShiftState);
 begin
-  if (Key = VK_RIGHT) and
-     (SelStart = 0) and
-     (SelLength >= Length(Text)) then
-  begin
-    Deselect;
-    SelStart := Length(Text);
-    Key := 0;
-  end;
   if (Shift = [ssCtrl]) then
     ValueListEditor.KeyDown(Key, Shift);
 
@@ -85,7 +78,7 @@ procedure TETGuiInplaceEdit.MouseDown(Button: TMouseButton; Shift: TShiftState;
 begin
   if (Button = TMouseButton.mbRight) then
   begin
-    OwnerPoint(X, Y);
+    ConvertToGridPoint(X, Y);
     ValueListEditor.MouseDown(Button, Shift, X, Y);
   end;
 

diff --git a/Source/Main.dfm b/Source/Main.dfm
@@ -986,7 +986,6 @@ object FMain: TFMain
     Top = 0
     Width = 940
     Height = 25
-    UseSystemFont = False
     ActionManager = MainActionManager
     Caption = 'ActionMainMenuBar'
     Color = clMenuBar
@@ -995,7 +994,7 @@ object FMain: TFMain
     ColorMap.BtnSelectedFont = clBlack
     ColorMap.UnusedColor = clWhite
     Font.Charset = DEFAULT_CHARSET
-    Font.Color = clBlack
+    Font.Color = clWindowText
     Font.Height = -12
     Font.Name = 'Segoe UI'
     Font.Style = []

diff --git a/Source/Main.pas b/Source/Main.pas
@@ -1187,29 +1187,44 @@ procedure TFMain.MetadataListExit(Sender: TObject);
 
 procedure TFMain.MetadataListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 var
-  I: integer;
+  CurrentLine: integer;
+  InplaceEdit: TETGuiInplaceEdit;
 begin
-  I := MetadataList.Row +1;
-  if (Key = VK_Return) and
-     (SpeedBtnQuick.Down) then
-  begin
-    if (EditLineActive) then
-    begin
-      AutoIncLine(I);
-      MetadataList.EditorMode := true;
-    end
-    else
-    begin
-      if (QuickTags[I -1].NoEdit) then
-        AutoIncLine(I)
-      else
+  if (SpeedBtnQuick.Down = false) then
+    exit;
+
+  case Key of
+    VK_RIGHT:
+      begin
+        InplaceEdit := MetadataList.InplaceEdit;
+        if (InplaceEdit.SelStart = 0) and
+           (InplaceEdit.SelLength >= Length(InplaceEdit.Text)) then
+        begin
+          InplaceEdit.SelStart := Length(InplaceEdit.Text);
+          Key := 0;
+        end;
+      end;
+    VK_RETURN:
       begin
-        if SpeedBtnLarge.Down then
-          MemoQuick.SetFocus
+        CurrentLine := MetadataList.Row +1;
+        if (EditLineActive) then
+        begin
+          AutoIncLine(CurrentLine);
+          MetadataList.EditorMode := true;
+        end
         else
-          EditQuick.SetFocus;
+        begin
+          if (QuickTags[CurrentLine -1].NoEdit) then
+            AutoIncLine(CurrentLine)
+          else
+          begin
+            if SpeedBtnLarge.Down then
+              MemoQuick.SetFocus
+            else
+              EditQuick.SetFocus;
+          end;
+        end;
       end;
-    end;
   end;
 end;
 

diff --git a/Translation/ExifToolGUI.CHS b/Translation/ExifToolGUI.CHS
diff --git a/Translation/ExifToolGUI.DEU b/Translation/ExifToolGUI.DEU
diff --git a/Translation/ExifToolGUI.ENU b/Translation/ExifToolGUI.ENU
diff --git a/Translation/ExifToolGUI.ESP b/Translation/ExifToolGUI.ESP
diff --git a/Translation/ExifToolGUI.FRA b/Translation/ExifToolGUI.FRA
diff --git a/Translation/ExifToolGUI.ITA b/Translation/ExifToolGUI.ITA
diff --git a/Translation/ExifToolGUI.NLD b/Translation/ExifToolGUI.NLD
diff --git a/Translation/ExifToolGUI.PTB b/Translation/ExifToolGUI.PTB
diff --git a/Translation/ExifToolGUI_X64.CHS b/Translation/ExifToolGUI_X64.CHS
diff --git a/Translation/ExifToolGUI_X64.DEU b/Translation/ExifToolGUI_X64.DEU
diff --git a/Translation/ExifToolGUI_X64.ENU b/Translation/ExifToolGUI_X64.ENU
diff --git a/Translation/ExifToolGUI_X64.ESP b/Translation/ExifToolGUI_X64.ESP
diff --git a/Translation/ExifToolGUI_X64.FRA b/Translation/ExifToolGUI_X64.FRA
diff --git a/Translation/ExifToolGUI_X64.ITA b/Translation/ExifToolGUI_X64.ITA
diff --git a/Translation/ExifToolGUI_X64.NLD b/Translation/ExifToolGUI_X64.NLD
diff --git a/Translation/ExifToolGUI_X64.PTB b/Translation/ExifToolGUI_X64.PTB