From 4e9d148146a988651254579e9ccd108289064e53 Mon Sep 17 00:00:00 2001 From: h677 Date: Sun, 24 Dec 2006 15:21:09 +0000 Subject: [PATCH] =?utf8?q?=E5=8F=B3=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?= =?utf8?q?=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?utf8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E4=B8=8A=E3=81=AE=E3=83=9E?= =?utf8?q?=E3=82=A6=E3=82=B9=E3=82=B8=E3=82=A7=E3=82=B9=E3=83=81=E3=83=A3?= =?utf8?q?=E3=83=BC=E3=82=92=E7=84=A1=E5=8A=B9=E3=81=AB=E3=81=A7=E3=81=8D?= =?utf8?q?=E3=82=8B=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=E3=80=82=20=E3=82=A2=E3=83=89=E3=83=AC?= =?utf8?q?=E3=82=B9=E3=83=90=E3=83=BC=E3=81=AB=E3=83=95=E3=82=A9=E3=83=BC?= =?utf8?q?=E3=82=AB=E3=82=B9=E3=82=92=E5=BD=93=E3=81=A6=E3=82=8B=E3=82=B7?= =?utf8?q?=E3=83=A7=E3=83=BC=E3=83=88=E3=82=AB=E3=83=83=E3=83=88=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Gesture.pas | 19 +++++++++++++++---- GikoDataModule.dfm | 8 +++++++- GikoDataModule.pas | 12 ++++++++++++ Option.dfm | 28 ++++++++++++++++++++++------ Option.pas | 5 +++++ Setting.pas | 8 +++++--- gikoNavi.res | Bin 4292 -> 4292 bytes 7 files changed, 66 insertions(+), 14 deletions(-) diff --git a/Gesture.pas b/Gesture.pas index de4caa8..5d649ff 100644 --- a/Gesture.pas +++ b/Gesture.pas @@ -49,6 +49,9 @@ var implementation +uses + GikoSystem; + constructor TMouseGesture.Create; begin inherited; @@ -116,8 +119,8 @@ begin //ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚̑ΏۂƈႤ‚Æ‚«‚́AŠJ•ú‚·‚é if (hwnd <> 0) and (hwnd <> FHandle) then begin ReleaseCapture; + SetCapture(FHandle); end; - SetCapture(FHandle); dp := Point(x - FLastPoint.X, y - FLastPoint.Y); sp := Point(Sign(dp.X), Sign(dp.Y)); if (dp.X * dp.X + dp.Y * dp.Y) > (FMargin * FMargin) then begin @@ -130,11 +133,19 @@ begin FLastTime := GetTickCount; FLastPoint := Point(x, y); end; - Result := True; - end; + Result := True; + end; end; WM_RBUTTONDOWN: begin - if not FCancelMode then begin + if (not FCancelMode) then begin + if ( GikoSys.Setting.GestureIgnoreContext ) then begin + //¡ƒ}ƒEƒX‚ðƒLƒƒƒvƒ`ƒƒ[‚µ‚Ä‚¢‚é‚̂𓾂é + hwnd := GetCapture; + //ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚̑ΏۂƈႤ‚Æ‚«‚́AŠJ•ú‚·‚é + if (hwnd <> 0) and (hwnd <> FHandle) then begin + Exit; + end; + end; FBeginGesture := True; FLastTime := 0; FLastPoint := Point(x, y); diff --git a/GikoDataModule.dfm b/GikoDataModule.dfm index 17054f0..9023210 100644 --- a/GikoDataModule.dfm +++ b/GikoDataModule.dfm @@ -1,7 +1,7 @@ object GikoDM: TGikoDM OldCreateOrder = False OnCreate = DataModuleCreate - Left = 660 + Left = 514 Top = 170 Height = 336 Width = 286 @@ -1299,6 +1299,12 @@ object GikoDM: TGikoDM OnExecute = NewImageLinkToClipBoardActionExecute OnUpdate = DependActiveCntentLogActionUpdate end + object SetForcusForAddresBarAction: TAction + Category = #12450#12489#12524#12473#12496#12540 + Caption = #12450#12489#12524#12473#12496#12540#12395#12501#12457#12540#12459#12473#12434#24403#12390#12427 + Hint = #12450#12489#12524#12473#12496#12540#12395#12501#12457#12540#12459#12473#12434#24403#12390#12427 + OnExecute = SetForcusForAddresBarActionExecute + end end object ToobarImageList: TImageList Left = 44 diff --git a/GikoDataModule.pas b/GikoDataModule.pas index 4a90b7f..4597cb7 100644 --- a/GikoDataModule.pas +++ b/GikoDataModule.pas @@ -229,6 +229,7 @@ type StoredTaskTrayAction: TAction; AllImageLinkToClipbordAction: TAction; NewImageLinkToClipBoardAction: TAction; + SetForcusForAddresBarAction: TAction; procedure EditNGActionExecute(Sender: TObject); procedure ReloadActionExecute(Sender: TObject); procedure GoFowardActionExecute(Sender: TObject); @@ -430,6 +431,7 @@ type procedure RightmostTabSelectActionUpdate(Sender: TObject); procedure NewImageLinkToClipBoardActionExecute(Sender: TObject); procedure AllImageLinkToClipbordActionExecute(Sender: TObject); + procedure SetForcusForAddresBarActionExecute(Sender: TObject); private { Private éŒ¾ } procedure ClearResFilter; @@ -4301,6 +4303,16 @@ begin end; end; end; +{ +\brief ƒAƒhƒŒƒXƒo[‚ɃtƒH[ƒJƒX‚ð“–‚Ä‚é +\param Sender ƒCƒxƒ“ƒg‚Ì”­¶Œ³ +} +procedure TGikoDM.SetForcusForAddresBarActionExecute(Sender: TObject); +begin + if ( GikoForm.AddressToolBar.Visible ) then begin + GikoForm.AddressComboBox.SetFocus; + end +end; end. diff --git a/Option.dfm b/Option.dfm index 808d2fd..40c6af0 100644 --- a/Option.dfm +++ b/Option.dfm @@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog Top = 4 Width = 509 Height = 389 - ActivePage = CSSTabSheet + ActivePage = TabSheet4 MultiLine = True - TabIndex = 2 + TabIndex = 7 TabOrder = 3 OnChange = OptionTabChange object ConnectSheet: TTabSheet @@ -1208,7 +1208,7 @@ object OptionDialog: TOptionDialog end object GroupBox19: TGroupBox Left = 12 - Top = 74 + Top = 66 Width = 473 Height = 49 Caption = #23653#27508 @@ -1239,8 +1239,8 @@ object OptionDialog: TOptionDialog end end object GroupBox21: TGroupBox - Left = 11 - Top = 133 + Left = 12 + Top = 125 Width = 473 Height = 52 Caption = #26368#23567#21270#26178#12479#12473#12463#12488#12524#12452 @@ -1256,7 +1256,7 @@ object OptionDialog: TOptionDialog end object GroupBox22: TGroupBox Left = 12 - Top = 200 + Top = 184 Width = 473 Height = 52 Caption = #12502#12521#12454#12470#12479#12502 @@ -1270,6 +1270,22 @@ object OptionDialog: TOptionDialog TabOrder = 0 end end + object GroupBox23: TGroupBox + Left = 12 + Top = 246 + Width = 473 + Height = 52 + Caption = #12510#12454#12473#12472#12455#12473#12481#12515#12540 + TabOrder = 4 + object IgnoreContextCheckBox: TCheckBox + Left = 11 + Top = 24 + Width = 294 + Height = 17 + Caption = #12467#12531#12486#12461#12473#12488#19978#12391#12510#12454#12473#12472#12455#12473#12481#12515#12540#12434#28961#21177#12395#12377#12427 + TabOrder = 0 + end + end end object SoundSheet: TTabSheet Caption = #12469#12454#12531#12489 diff --git a/Option.pas b/Option.pas index 97c3f6e..54f5fad 100644 --- a/Option.pas +++ b/Option.pas @@ -209,6 +209,8 @@ type StoredTaskTrayCB: TCheckBox; GroupBox22: TGroupBox; LoopBrowserTabsCB: TCheckBox; + GroupBox23: TGroupBox; + IgnoreContextCheckBox: TCheckBox; procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); procedure ApplyButtonClick(Sender: TObject); @@ -872,6 +874,8 @@ begin StoredTaskTrayCB.Checked := GikoSys.Setting.StoredTaskTray; // ƒuƒ‰ƒEƒUƒ^ƒu‚̈ړ®‚Ń‹[ƒv‚ð‹–‰Â‚·‚é‚© LoopBrowserTabsCB.Checked := GikoSys.Setting.LoopBrowserTabs; + // + IgnoreContextCheckBox.Checked := GikoSys.Setting.GestureIgnoreContext; end; procedure TOptionDialog.SaveSetting; @@ -1162,6 +1166,7 @@ begin GikoSys.Setting.StoredTaskTray := StoredTaskTrayCB.Checked; GikoSys.Setting.LoopBrowserTabs := LoopBrowserTabsCB.Checked; + GikoSys.Setting.GestureIgnoreContext := IgnoreContextCheckBox.Checked; end; procedure TOptionDialog.SettingApply; diff --git a/Setting.pas b/Setting.pas index 4465ab3..e592fdf 100644 --- a/Setting.pas +++ b/Setting.pas @@ -398,7 +398,8 @@ type FGestures : TGestureModel; //! ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚ðŽg—p‚·‚é‚©‚Ç‚¤‚© FGestureEnabled : Boolean; - + //! ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚ðƒRƒ“ƒeƒLƒXƒg“™‚̏ã‚Å–³Œø + FGestureIgnoreContext : Boolean; //ƒtƒVƒAƒiƒgƒ‰ƒbƒvÝ’è FLocalTrapAtt : Boolean; FRemoteTrapAtt : Boolean; @@ -755,6 +756,7 @@ type property Gestures : TGestureModel read FGestures write FGestures; //! ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚ðŽg—p‚·‚é‚©‚Ç‚¤‚© property GestureEnabled : Boolean read FGestureEnabled write FGestureEnabled; + property GestureIgnoreContext : Boolean read FGestureIgnoreContext write FGestureIgnoreContext; //ƒtƒVƒAƒiƒgƒ‰ƒbƒvÝ’è property LocalTrapAtt : Boolean read FLocalTrapAtt write FLocalTrapAtt; property RemoteTrapAtt : Boolean read FRemoteTrapAtt write FRemoteTrapAtt; @@ -1223,7 +1225,7 @@ begin // ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ FGestureEnabled := ini.ReadBool( 'Guesture', 'Enabled', False ); - + FGestureIgnoreContext := ini.ReadBool( 'Guesture', 'IgnoreContext', False ); //2chŒ¾ŒêƒTƒ| F2chSupport := ini.ReadBool('2chSupport', 'Support', False); @@ -1612,7 +1614,7 @@ begin // ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚ðŽg—p‚·‚é‚©‚Ç‚¤‚© ini.WriteBool( 'Guesture', 'Enabled', FGestureEnabled ); - + ini.WriteBool( 'Guesture', 'IgnoreContext', FGestureIgnoreContext ); //FusianaTrap ini.WriteBool('Trap', 'LocalTrap', FLocalTrapAtt); ini.WriteBool('Trap', 'RemoteTrap', FRemoteTrapAtt); diff --git a/gikoNavi.res b/gikoNavi.res index 1043a57a441c170bb0124b4301a0b55114aa2495..89c467c1fc74527b3b3b67c1e479e184ca3851dd 100644 GIT binary patch delta 28 kcmX@2ctml-8(z+}ObiTW42%qGCx7Mr%V@g!Gv7r<0F#IcUH||9 delta 28 kcmX@2ctml-8(z*eObiTW42%qGCV%Dq%V@IsGv7r<0Fz=0TL1t6 -- 2.11.0