From 68917983942d5c29f2da4004b3134a5470cb3ee1 Mon Sep 17 00:00:00 2001 From: "C.Ponapalt" Date: Wed, 7 Sep 2005 10:01:59 +0000 Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=82=B0=E3=82=92=E3=83=89=E3=83=A9?= =?utf8?q?=E3=83=83=E3=82=B0=EF=BC=86=E3=83=89=E3=83=AD=E3=83=83=E3=83=97?= =?utf8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?utf8?q?=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bottleclient/BottleDef.pas | 6 ++++++ bottleclient/LogForm.pas | 5 +++++ bottleclient/SettingForm.dfm | 19 +++++++++++++++---- bottleclient/SettingForm.pas | 3 +++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas index 1c9a14f..f3c1451 100755 --- a/bottleclient/BottleDef.pas +++ b/bottleclient/BottleDef.pas @@ -103,6 +103,7 @@ type FReplacePresets: TReplacePresets; FNoWarnOfEmptyFMO: Boolean; FShowEditorPreviewWindow: Boolean; + FLogItemDragDrop: Boolean; procedure SetDblClkInsert(const Value: boolean); procedure SetDefaultScript(const Value: String); @@ -285,6 +286,9 @@ type //ƒGƒfƒBƒ^ƒvƒŒƒrƒ…[ƒEƒCƒ“ƒhƒE‚̏ó‘Ô•Û‘¶—p property ShowEditorPreviewWindow: Boolean read FShowEditorPreviewWindow write FShowEditorPreviewWindow; + //ƒƒOƒhƒ‰ƒbƒO•ƒhƒƒbƒv—LŒø + property LogItemDragDrop: Boolean + read FLogItemDragDrop write FLogItemDragDrop; //ƒRƒ“ƒXƒgƒ‰ƒNƒ^EƒfƒXƒgƒ‰ƒNƒ^E•Û‘¶ constructor Create; @@ -551,6 +555,7 @@ begin ConfirmOnTabClose := FIni.ReadBool('System', 'ConfirmOnTabClose', false); NoWarnOfEmptyFMO := FIni.ReadBool('System', 'NoWarnOfEmptyFMO', False); ShowEditorPreviewWindow := FIni.ReadBool('System', 'ShowEditorPreviewWindow', False); + LogItemDragDrop := FIni.ReadBool('System', 'LogItemDragDrop', True); AutoClip := FIni.ReadBool('System', 'AutoClip', false); AutoStart := FIni.ReadBool('System', 'AutoStart', false); @@ -1092,6 +1097,7 @@ begin FIni.WriteString('System', 'BrowserExeName', BrowserExeName); FIni.WriteBool('System', 'NoWarnOfEmptyFMO', NoWarnOfEmptyFMO); FIni.WriteBool('System', 'ShowEditorPreviewWindow', ShowEditorPreviewWindow); + FIni.WriteBool('System', 'LogItemDragDrop', LogItemDragDrop); Strs := TStringList.Create; try diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas index 100166e..a4b021b 100755 --- a/bottleclient/LogForm.pas +++ b/bottleclient/LogForm.pas @@ -1265,6 +1265,9 @@ var Rec: TRect; // ƒ_ƒ~[B begin Accept := False; + + if not Pref.LogItemDragDrop then + Exit; // ‚Æ‚è‚ ‚¦‚¸Žó‚¯•t‚¯‚é‰Â”\«‚ª‚ ‚é‚Ì‚ÍTBottleLogDragObject‚¾‚¯ if not (Source is TBottleLogDragObject) then Exit; @@ -1329,6 +1332,8 @@ var begin timScrollTimer.Enabled := false; + if not Pref.LogItemDragDrop then + Exit; if not (Source is TBottleLogDragObject) then Exit; Src := Source as TBottleLogDragObject; diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm index 36e4db9..9e71e08 100755 --- a/bottleclient/SettingForm.dfm +++ b/bottleclient/SettingForm.dfm @@ -36,7 +36,7 @@ object frmSetting: TfrmSetting Top = 32 Width = 440 Height = 291 - ActivePage = tstReceive + ActivePage = tstGeneral Anchors = [akLeft, akTop, akRight, akBottom] MultiLine = True TabOrder = 0 @@ -76,7 +76,7 @@ object frmSetting: TfrmSetting end object cbxConfirmOnExit: TCheckBox Left = 8 - Top = 224 + Top = 208 Width = 281 Height = 17 Hint = 'Client'#12398#32066#20102#26178#12395#30906#35469#12513#12483#12475#12540#12472#12434#20986#12375#12414#12377 @@ -85,7 +85,7 @@ object frmSetting: TfrmSetting end object cbxIgnoreTimeCritical: TCheckBox Left = 8 - Top = 193 + Top = 177 Width = 297 Height = 17 Hint = #12525#12540#12459#12523#30906#35469#26178#12395'\t'#12434#36865#20449#12375#12394#12356#12371#12392#12391#20182#12398'SSTP'#12364#34920#31034#12373#12428#12420#12377#12367#12377#12427 @@ -105,7 +105,7 @@ object frmSetting: TfrmSetting end object cbxConfirmOnTabClose: TCheckBox Left = 8 - Top = 240 + Top = 224 Width = 257 Height = 17 Hint = #12525#12464#12454#12451#12531#12489#12454#12391#12479#12502#12434#38281#12376#12427#26178#12395#30906#35469#12480#12452#12450#12525#12464#12434#34920#31034#12375#12414#12377 @@ -144,6 +144,17 @@ object frmSetting: TfrmSetting Caption = #12468#12540#12473#12488#12364#35211#12388#12363#12425#12394#12367#12390#12418#35686#21578#12375#12394#12356'(&G)' TabOrder = 7 end + object cbxLogItemDragDrop: TCheckBox + Left = 8 + Top = 240 + Width = 305 + Height = 17 + Hint = #12525#12464#12454#12451#12531#12489#12454#12391#12489#12521#12483#12464#65286#12489#12525#12483#12503#12395#12424#12427#12525#12464#12487#12540#12479#12398#31227#21205#12539#12467#12500#12540#25805#20316#12434#26377#21177#12395#12375#12414#12377 + Caption = #12525#12464#12454#12451#12531#12489#12454#12395#34920#31034#20013#12398#12525#12464#12434#12489#12521#12483#12464#65286#12489#12525#12483#12503#12377#12427'(&D)' + Checked = True + State = cbChecked + TabOrder = 8 + end end object tstDisplay: TTabSheet Caption = #34920#31034': '#30011#38754#34920#31034#38306#20418#12398#35373#23450 diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas index 277c028..c8b3764 100755 --- a/bottleclient/SettingForm.pas +++ b/bottleclient/SettingForm.pas @@ -116,6 +116,7 @@ type lblProxyPass: TLabel; lblMinScriptLength: TLabel; spnMinScriptLength: TSpinEdit; + cbxLogItemDragDrop: TCheckBox; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char); procedure ctvBottleNodeChecked(Sender: TObject; @@ -277,6 +278,7 @@ begin end; edtBrowserName.Text := Pref.BrowserExeName; cbxNoWarnOfEmptyFMO.Checked := Pref.NoWarnOfEmptyFMO; + cbxLogItemDragDrop.Checked := Pref.LogItemDragDrop; // ShowModal; @@ -372,6 +374,7 @@ begin // Pref.BrowserExeName := edtBrowserName.Text; Pref.NoWarnOfEmptyFMO := cbxNoWarnOfEmptyFMO.Checked; + Pref.LogItemDragDrop := cbxLogItemDragDrop.Checked; end; procedure TfrmSetting.edtProxyPortKeyPress(Sender: TObject; var Key: Char); -- 2.11.0