SpinEdit内でのEnter押下でログダウンロードが開始されるように修正。

タブオーダーを修正。

diff --git a/bottleclient/LogDownload.dfm b/bottleclient/LogDownload.dfm
index d2c3746..602046e 100755 (executable)
--- a/bottleclient/LogDownload.dfm
+++ b/bottleclient/LogDownload.dfm
@@ -1,6 +1,6 @@
 object frmLogDownload: TfrmLogDownload
-  Left = 482
-  Top = 442
+  Left = 619
+  Top = 261
   BorderStyle = bsDialog
   Caption = #12525#12464#12480#12454#12531#12525#12540#12489
   ClientHeight = 270
@@ -37,7 +37,7 @@ object frmLogDownload: TfrmLogDownload
     Anchors = [akRight, akBottom]
     Cancel = True
     Caption = #12461#12515#12531#12475#12523'(&C)'
-    TabOrder = 1
+    TabOrder = 3
     OnClick = btnCancelClick
   end
   object grpDate: TGroupBox
@@ -46,7 +46,7 @@ object frmLogDownload: TfrmLogDownload
     Width = 329
     Height = 97
     Caption = #26085#20184'(&D)'
-    TabOrder = 2
+    TabOrder = 1
     object Label1: TLabel
       Left = 144
       Top = 72
@@ -73,10 +73,15 @@ object frmLogDownload: TfrmLogDownload
       Top = 64
       Width = 97
       Height = 20
-      Date = 37591.000000000000000000
-      Time = 37591.000000000000000000
-      MinDate = 36892.000000000000000000
-      TabOrder = 0
+      CalAlignment = dtaLeft
+      Date = 37591
+      Time = 37591
+      DateFormat = dfShort
+      DateMode = dmComboBox
+      Kind = dtkDate
+      MinDate = 36892
+      ParseInput = False
+      TabOrder = 2
       OnChange = dtFromChange
     end
     object dtTo: TDateTimePicker
@@ -84,10 +89,15 @@ object frmLogDownload: TfrmLogDownload
       Top = 64
       Width = 105
       Height = 20
-      Date = 37591.000000000000000000
-      Time = 37591.000000000000000000
-      MinDate = 36892.000000000000000000
-      TabOrder = 1
+      CalAlignment = dtaLeft
+      Date = 37591
+      Time = 37591
+      DateFormat = dfShort
+      DateMode = dmComboBox
+      Kind = dtkDate
+      MinDate = 36892
+      ParseInput = False
+      TabOrder = 3
       OnChange = dtToChange
     end
     object spnRecentCount: TSpinEdit
@@ -97,23 +107,24 @@ object frmLogDownload: TfrmLogDownload
       Height = 21
       MaxValue = 100
       MinValue = 0
-      TabOrder = 2
+      TabOrder = 0
       Value = 0
       OnChange = spnRecentCountChange
+      OnKeyDown = spnEdtEnterKeyDown
     end
     object rbRecent: TRadioButton
       Left = 16
       Top = 30
       Width = 17
       Height = 17
-      TabOrder = 3
+      TabOrder = 4
     end
     object rbRange: TRadioButton
       Left = 16
       Top = 66
       Width = 17
       Height = 17
-      TabOrder = 4
+      TabOrder = 5
     end
     object cbxUnit: TComboBox
       Left = 160
@@ -123,7 +134,7 @@ object frmLogDownload: TfrmLogDownload
       Style = csDropDownList
       ItemHeight = 12
       ItemIndex = 0
-      TabOrder = 5
+      TabOrder = 1
       Text = #20998
       OnChange = cbxUnitChange
       Items.Strings = (
@@ -138,7 +149,7 @@ object frmLogDownload: TfrmLogDownload
     Width = 329
     Height = 113
     Caption = #26465#20214'(&N)'
-    TabOrder = 3
+    TabOrder = 2
     object Label3: TLabel
       Left = 24
       Top = 24
@@ -184,8 +195,9 @@ object frmLogDownload: TfrmLogDownload
       Height = 21
       MaxValue = 100
       MinValue = 0
-      TabOrder = 0
+      TabOrder = 1
       Value = 0
+      OnKeyDown = spnEdtEnterKeyDown
     end
     object spnMinAgree: TSpinEdit
       Left = 104
@@ -194,8 +206,9 @@ object frmLogDownload: TfrmLogDownload
       Height = 21
       MaxValue = 100
       MinValue = 0
-      TabOrder = 1
+      TabOrder = 2
       Value = 0
+      OnKeyDown = spnEdtEnterKeyDown
     end
     object cbxChannel: TComboBox
       Left = 104
@@ -203,7 +216,7 @@ object frmLogDownload: TfrmLogDownload
       Width = 145
       Height = 20
       ItemHeight = 12
-      TabOrder = 2
+      TabOrder = 0
     end
   end
 end

diff --git a/bottleclient/LogDownload.pas b/bottleclient/LogDownload.pas
index 8d79ee9..fba7bd6 100755 (executable)
--- a/bottleclient/LogDownload.pas
+++ b/bottleclient/LogDownload.pas
@@ -35,6 +35,8 @@ type
     procedure cbxUnitChange(Sender: TObject);
     procedure dtFromChange(Sender: TObject);
     procedure dtToChange(Sender: TObject);
+    procedure spnEdtEnterKeyDown(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
   private
     procedure SetChannel(const Value: String);
     procedure SetDateHi(const Value: TDateTime);
@@ -194,5 +196,17 @@ begin
   end;
   Result := spnRecentCount.Value * u;
 end;
+   
+{SpinEdit\82Å\83G\83\93\83^\81[\83L\81[\82ª\89\9f\82³\82ê\82½\82Æ\82«\82É
+ OK\83{\83^\83\93\82ð\89\9f\89º\82·\82é}
+ 
+procedure TfrmLogDownload.spnEdtEnterKeyDown(Sender: TObject;
+var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_RETURN then
+  begin
+      ModalResult := mrOk;
+  end
+end;
 
 end.