Changeset 385 for trunk/LocalPlayer

Timestamp:

Apr 27, 2021, 6:42:29 PM (4 years ago)

Author:

chronos

Message:

• Added: Allow to change key bindings from Settings dialog.
• Added: Allow to reset settings in Settings dialog.

Location:

trunk/LocalPlayer

Files:

• Term.pas (modified) (2 diffs)
• UKeyBindings.pas (modified) (6 diffs)

trunk/LocalPlayer/Term.pas

@@ -3440 +3440 @@
   NoMapPanel := TIsoMap.Create;
 
-  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   UpdateKeyShortcuts;
 
@@ -3539 +3538 @@
   I: Integer;
 begin
-  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   MainFormKeyDown := nil;
   FreeAndNil(sb);

trunk/LocalPlayer/UKeyBindings.pas

@@ -17 +17 @@
     ShortCut: TShortCut;
     ShortCut2: TShortCut;
+    DefaultShortCut: TShortCut;
+    DefaultShortCut2: TShortCut;
     function Test(AShortCut: TShortCut): Boolean;
+    procedure Assign(Source: TKeyBinding);
+    procedure SetDefault;
   end;
 
@@ -23 +27 @@
 
   TKeyBindings = class(TFPGObjectList<TKeyBinding>)
+  private
   public
     function AddItem(const ShortName, FullName: string; ShortCut: TShortCut; ShortCut2: TShortCut = 0): TKeyBinding; overload;
@@ -29 +34 @@
     procedure LoadFromRegistry(RootKey: HKEY; Key: string);
     procedure SaveToRegistry(RootKey: HKEY; Key: string);
+    procedure LoadToStrings(Strings: TStrings);
+    procedure Assign(Source: TKeyBindings);
+    procedure ResetToDefault;
   end;
 
@@ -123 +131 @@
 end;
 
+procedure TKeyBinding.Assign(Source: TKeyBinding);
+begin
+  ShortName := Source.ShortName;
+  FullName := Source.FullName;
+  ShortCut := Source.ShortCut;
+  ShortCut2 := Source.ShortCut2;
+  DefaultShortCut := Source.DefaultShortCut;
+  DefaultShortCut2 := Source.DefaultShortCut2;
+end;
+
+procedure TKeyBinding.SetDefault;
+begin
+  ShortCut := DefaultShortCut;
+  ShortCut2 := DefaultShortCut2;
+end;
+
 { TKeyBindings }
 
@@ -133 +157 @@
   Result.ShortCut := ShortCut;
   Result.ShortCut2 := ShortCut2;
+  Result.DefaultShortCut := ShortCut;
+  Result.DefaultShortCut2 := ShortCut2;
   Add(Result);
 end;
@@ -205 +231 @@
     Free;
   end;
+end;
+
+procedure TKeyBindings.LoadToStrings(Strings: TStrings);
+var
+  I: Integer;
+  Text: string;
+begin
+  Strings.Clear;
+  for I := 0 to Count - 1 do begin
+    Text:= '';
+    if Items[I].ShortCut <> 0 then
+      Text:= Text + ShortCutToText(Items[I].ShortCut);
+    if Items[I].ShortCut2 <> 0 then begin
+      if Text <> '' then Text := Text + ', ';
+      Text:= Text + ShortCutToText(Items[I].ShortCut2);
+    end;
+    if Text <> '' then Text := Items[I].FullName + ' (' + Text + ')'
+      else Text := Items[I].FullName;
+    Strings.Add(Text);
+  end;
+end;
+
+procedure TKeyBindings.Assign(Source: TKeyBindings);
+var
+  I: Integer;
+begin
+  while Count < Source.Count do
+    Add(TKeyBinding.Create);
+  while Count > Source.Count do
+    Delete(Count - 1);
+  for I := 0 to Count - 1 do
+    Items[I].Assign(Source.Items[I]);
+end;
+
+procedure TKeyBindings.ResetToDefault;
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    Items[I].SetDefault;
 end;