Changed: ショートカットキー#100追加

jr8ppg · Jun 8, 2020 · f62ca8e · f62ca8e
1 parent fac0db9
commit f62ca8e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/zlog/UzlogConst.pas b/zlog/UzlogConst.pas
@@ -87,7 +87,7 @@ interface
   pwrH = TPower(3);
 
 const
-  default_primary_shortcut: array[0..99] of string = (
+  default_primary_shortcut: array[0..100] of string = (
     'Ctrl+F1',          // #00
     'Ctrl+F2',
     'Ctrl+F3',
@@ -187,10 +187,11 @@ interface
     'Shift+U',
     'Shift+Y',
     'Shift+Z',
-    ''                  // #99
+    '',                 // #99
+    'Alt+L'             // #100
   );
 
-  default_secondary_shortcut: array[0..99] of string = (
+  default_secondary_shortcut: array[0..100] of string = (
     '',                 // #00
     '',
     '',
@@ -290,7 +291,8 @@ interface
     '',
     '',
     '',
-    ''                  // #99
+    '',                 // #99
+    ''                  // #100
   );
 
 implementation

diff --git a/zlog/main.dfm b/zlog/main.dfm
@@ -5281,6 +5281,11 @@ object MainForm: TMainForm
       ShortCut = 8278
       OnExecute = actionToggleVFOExecute
     end
+    object actionEditLastQSO: TAction
+      Caption = 'actionEditLastQSO'
+      ShortCut = 32844
+      OnExecute = actionEditLastQSOExecute
+    end
   end
   object SPCMenu: TPopupMenu
     AutoHotkeys = maManual

diff --git a/zlog/main.pas b/zlog/main.pas
@@ -636,6 +636,7 @@   TMainForm = class(TForm)
     actionIncreaseCwSpeed: TAction;
     actionCQRepeat2: TAction;
     actionToggleVFO: TAction;
+    actionEditLastQSO: TAction;
     procedure FormCreate(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure ShowHint(Sender: TObject);
@@ -836,6 +837,7 @@   TMainForm = class(TForm)
     procedure actionIncreaseCwSpeedExecute(Sender: TObject);
     procedure actionCQRepeat2Execute(Sender: TObject);
     procedure actionToggleVFOExecute(Sender: TObject);
+    procedure actionEditLastQSOExecute(Sender: TObject);
   private
     FRigControl: TRigControl;
     FPartialCheck: TPartialCheck;
@@ -8224,6 +8226,22 @@ procedure TMainForm.actionToggleVFOExecute(Sender: TObject);
    end;
 end;
 
+// #100 最後の交信のエディット
+procedure TMainForm.actionEditLastQSOExecute(Sender: TObject);
+begin
+   Grid.Row := Log.QsoList.Count - 1;
+   if EditScreen.DirectEdit then begin
+      Grid.col := TEdit(ActiveControl).Tag;
+   end;
+
+   LastFocus := TEdit(ActiveControl);
+   Grid.SetFocus;
+
+   if EditScreen.DirectEdit = False then begin
+      MyContest.EditCurrentRow;
+   end;
+end;
+
 procedure TMainForm.RestoreWindowsPos();
 var
    X, Y, W, H: Integer;

diff --git a/zlog_keyedit/Main.dfm b/zlog_keyedit/Main.dfm
@@ -49,6 +49,7 @@ object formMain: TformMain
           '#91 '#12497#12527#12540#12467#12540#12489#22793#26356'=Shift+P'
           '#93 '#20102#35299#24230'(R)'#22793#26356'=Shift+R'
           '#94 '#20449#21495#24375#24230'(S)'#22793#26356'=Shift+S'
+          '#100 '#26368#24460#12398#20132#20449#12398#32232#38598'=Alt+L'
           '')
         TabOrder = 0
         TitleCaptions.Strings = (
@@ -63,10 +64,6 @@ object formMain: TformMain
     object TabSheet2: TTabSheet
       Caption = #24773#22577#34920#31034
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 391
       object vleInformation: TValueListEditor
         Left = 0
         Top = 0
@@ -105,7 +102,6 @@ object formMain: TformMain
           #27231#33021
           #12471#12519#12540#12488#12459#12483#12488#12461#12540)
         OnDblClick = vleDblClick
-        ExplicitHeight = 391
         ColWidths = (
           448
           96)
@@ -114,10 +110,6 @@ object formMain: TformMain
     object TabSheet3: TTabSheet
       Caption = 'CW'#12461#12540#12452#12531#12464
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object vleCWKeying: TValueListEditor
         Left = 0
         Top = 0
@@ -194,10 +186,6 @@ object formMain: TformMain
     object TabSheet5: TTabSheet
       Caption = #20837#21147#12392#32232#38598
       ImageIndex = 4
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 391
       object vleEdit: TValueListEditor
         Left = 0
         Top = 0
@@ -229,7 +217,6 @@ object formMain: TformMain
           #27231#33021
           #12471#12519#12540#12488#12459#12483#12488#12461#12540)
         OnDblClick = vleDblClick
-        ExplicitHeight = 391
         ColWidths = (
           448
           113)
@@ -238,10 +225,6 @@ object formMain: TformMain
     object TabSheet6: TTabSheet
       Caption = #20107#24460#20837#21147
       ImageIndex = 5
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object vlePostContest: TValueListEditor
         Left = 0
         Top = 0
@@ -266,10 +249,6 @@ object formMain: TformMain
     object TabSheet7: TTabSheet
       Caption = #12381#12398#20182
       ImageIndex = 6
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 391
       object vleOther: TValueListEditor
         Left = 0
         Top = 0
@@ -287,7 +266,6 @@ object formMain: TformMain
           #27231#33021
           #12471#12519#12540#12488#12459#12483#12488#12461#12540)
         OnDblClick = vleDblClick
-        ExplicitHeight = 391
         ColWidths = (
           448
           113)

diff --git a/zlog_keyedit/Main.pas b/zlog_keyedit/Main.pas
@@ -283,7 +283,7 @@ procedure TformMain.ReadKeymap(ini: TIniFile; vle: TValueListEditor);
    N: Integer;
 begin
    for i := 1 to vle.RowCount - 1 do begin
-      N := StrToIntDef(Copy(vle.Cells[0, i], 2, 2), -1);
+      N := StrToIntDef(Copy(vle.Cells[0, i], 2, 3), -1);
       if N = -1 then begin
          Continue;
       end;
@@ -301,7 +301,7 @@ procedure TformMain.WriteKeymap(ini: TIniFile; vle: TValueListEditor);
    slText := TStringList.Create();
    try
       for i := 1 to vle.RowCount - 1 do begin
-         N := StrToIntDef(Copy(vle.Cells[0, i], 2, 2), -1);
+         N := StrToIntDef(Copy(vle.Cells[0, i], 2, 3), -1);
          if N = -1 then begin
             Continue;
          end;