Changeset 292 for trunk

Timestamp:

Mar 2, 2021, 10:45:43 PM (4 years ago)

Author:

chronos

Message:

• Modified: Store key bindings in registry.

Location:

trunk

Files:

• Integrated.lpi (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (2 diffs)
• LocalPlayer/UKeyBindings.pas (moved) (moved from trunk/UKeyBindings.pas ) (3 diffs)
• Start.pas (modified) (5 diffs)

trunk/Integrated.lpi

@@ -333 +333 @@
       </Unit40>
       <Unit41>
-        <Filename Value="UKeyBindings.pas"/>
+        <Filename Value="LocalPlayer\UKeyBindings.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit41>

trunk/LocalPlayer/Term.pas

@@ -3403 +3403 @@
   i, j: integer;
 begin
+  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   UpdateKeyShortcuts;
 
@@ -3507 +3508 @@
   I: Integer;
 begin
+  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   MainFormKeyDown := nil;
   FreeAndNil(sb);

trunk/LocalPlayer/UKeyBindings.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, LCLProc, LCLType, Menus;
+  Classes, SysUtils, fgl, LCLProc, LCLType, Menus, Registry;
 
 type
@@ -23 +23 @@
 
   TKeyBindings = class(TFPGObjectList<TKeyBinding>)
+  public
     function AddItem(const ShortName, FullName: string; ShortCut: TShortCut; ShortCut2: TShortCut = 0): TKeyBinding; overload;
     function AddItem(const ShortName, FullName: string; ShortCutText: string; ShortCutText2: string = ''): TKeyBinding; overload;
     function Search(ShortName: string): TKeyBinding;
-    procedure LoadFromFile(FileName: string);
-    procedure SaveToFile(FileName: string);
+    procedure LoadFromRegistry(RootKey: HKEY; Key: string);
+    procedure SaveToRegistry(RootKey: HKEY; Key: string);
   end;
 
@@ -151 +152 @@
 end;
 
-procedure TKeyBindings.LoadFromFile(FileName: string);
-var
-  Lines: TStringList;
+procedure TKeyBindings.LoadFromRegistry(RootKey: HKEY; Key: string);
+var
   I: Integer;
-  KeyBinding: TKeyBinding;
-begin
-  Lines := TStringList.Create;
-  Lines.NameValueSeparator := '=';
+  Registry: TRegistry;
+  Text: string;
+begin
+  Registry := TRegistry.Create;
+  Registry.RootKey := RootKey;
+  with Registry do
   try
-    Lines.LoadFromFile(FileName);
-    for I := 0 to Lines.Count - 1 do begin
-      KeyBinding := Search(Lines.Names[I]);
-      if Assigned(KeyBinding) then begin
-        KeyBinding.ShortCut := TextToShortCut(Lines.ValueFromIndex[I]);
+    OpenKey(Key, True);
+    for I := 0 to Count - 1 do begin
+      Text := '';
+      if ValueExists(Items[I].ShortName) then begin
+        Text := ReadString(Items[I].ShortName);
+        if Pos(',', Text) > 0 then begin
+          Items[I].ShortCut2 := TextToShortCut(Copy(Text, Pos(',', Text) + 1, MaxInt));
+          Items[I].ShortCut := TextToShortCut(Copy(Text, 1, Pos(',', Text) - 1));
+        end else begin
+          Items[I].ShortCut := TextToShortCut(Text);
+          Items[I].ShortCut2 := 0;
+        end;
+      end else begin
+        Text := ShortCutToText(Items[I].ShortCut);
+        if Items[I].ShortCut2 <> 0 then Text := Text + ',' + ShortCutToText(Items[I].ShortCut2);
+        WriteString(Items[I].ShortName, Text);
       end;
     end;
   finally
-    FreeAndNil(Lines);
-  end;
-end;
-
-procedure TKeyBindings.SaveToFile(FileName: string);
-var
-  Lines: TStringList;
+    Free;
+  end;
+end;
+
+procedure TKeyBindings.SaveToRegistry(RootKey: HKEY; Key: string);
+var
   I: Integer;
-begin
-  Lines := TStringList.Create;
-  Lines.NameValueSeparator := '=';
+  Registry: TRegistry;
+  Text: string;
+begin
+  Registry := TRegistry.Create;
+  Registry.RootKey := RootKey;
+  with Registry do
   try
+    OpenKey(Key, True);
     for I := 0 to Count - 1 do begin
-      Lines.Add(TKeyBinding(Items[I]).ShortName + '=' + ShortCutToText(TKeyBinding(Items[I]).ShortCut));
+      Text := ShortCutToText(Items[I].ShortCut);
+      if Items[I].ShortCut2 <> 0 then Text := Text + ',' + ShortCutToText(Items[I].ShortCut2);
+      WriteString(Items[I].ShortName, Text);
     end;
-    Lines.SaveToFile(FileName);
   finally
-    FreeAndNil(Lines);
+    Free;
   end;
 end;

trunk/Start.pas

@@ -166 +166 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer,
-  UKeyBindings;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer;
 
 {$R *.lfm}
@@ -226 +225 @@
   PlayerAutoDiff: array [1 .. 5] of integer = (1, 1, 2, 2, 3);
   EnemyAutoDiff: array [1 .. 5] of integer = (4, 3, 2, 1, 1);
-  KeyBindingsFileName = 'KeyBindings.txt';
 
 { TMiniMap }
@@ -438 +436 @@
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
-  KeyBindingsAbsoluteFileName: string;
 begin
   PlayerSlots := TPlayerSlots.Create;
@@ -449 +446 @@
   LoadConfig;
   LoadAssets;
-  KeyBindingsAbsoluteFileName := DataDir + DirectorySeparator + KeyBindingsFileName;
-  if FileExists(KeyBindingsAbsoluteFileName) then KeyBindings.LoadFromFile(KeyBindingsAbsoluteFileName)
-    else begin
-      ForceDirectories(ExtractFileDir(KeyBindingsAbsoluteFileName));
-      KeyBindings.SaveToFile(KeyBindingsAbsoluteFileName);
-    end;
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
@@ -1979 +1970 @@
   Shift: TShiftState);
 begin
-  if KeyToShortCut(Key, Shift) = BHelp.ShortCut then
+  if KeyToShortCut(Key, Shift) = VK_F1 then
     DirectHelp(cStartHelp);
 end;