Commit: 2c1e5d1ecce655ba43cbc8a79cc0dbb78405bc88 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 2c1e5d1ecce655ba43cbc8a79cc0dbb78405bc88 (tree)
• Time: 2007-01-22 02:43:52
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_54_0_687'.

Change Summary

• modified: Editor.pas
• modified: Gesture.pas
• modified: Giko.pas
• modified: KeySetting.pas
• modified: gikoNavi.res
• modified: readme/readme.txt

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -1757,7 +1757,6 @@ var
 	Action: TAction;
 begin
 	s := MouseGesture.GetGestureStr;
-    MouseGesture.Clear;
 	Action := GikoSys.Setting.Gestures.GetGestureAction(s);
 	if Action <> nil then
 		Action.Execute;

--- a/Gesture.pas
+++ b/Gesture.pas
@@ -25,6 +25,7 @@ type
 		function CheckAction(Message: Integer; x, y: Integer): Boolean;
 		procedure AddAction(sx, sy: Integer);
 		function AddGesture(Item: string): Integer;
+		procedure ClearGesture;
 		function Get(Index: integer): string;
 		procedure Put(Index: integer; Item: string);
 	public
@@ -36,7 +37,6 @@ type
 		property GestureCount: Integer read GetGestureCount;
 		property Margin: Integer read FMargin write FMargin;
 		function GetGestureStr: string;
-		procedure Clear;
 		property OnGestureStart: TNotifyEvent read FOnGestureStart write FOnGestureStart;
 		property OnGestureMove: TNotifyEvent read FOnGestureMove write FOnGestureMove;
 		property OnGestureEnd: TNotifyEvent read FOnGestureEnd write FOnGestureEnd;
@@ -65,7 +65,7 @@ end;
 destructor TMouseGesture.Destroy;
 begin
 	UnHook;
-	Clear;
+	ClearGesture;
 	FGestureItemList.Free;
 	inherited;
 end;
@@ -161,11 +161,9 @@ begin
 				FBeginGesture := False;
 				ReleaseCapture;
 				if FGestureItemList.Count <> 0 then begin
-					if Assigned(FOnGestureEnd) then begin
+					if Assigned(FOnGestureEnd) then
 						FOnGestureEnd(Self);
-                    end else begin
-                        Clear;
-                    end;
+					ClearGesture;
 				end else begin
 					FCancelMode := True;
 					//ƒWƒFƒXƒ`ƒƒ[‚¶‚á‚È‚©‚Á‚½ê‡Aƒ}ƒEƒXDOWN,UP‚ðƒGƒ~ƒ…ƒŒ[ƒg
@@ -241,7 +239,7 @@ begin
 end;
 
 //ƒWƒFƒXƒ`ƒƒ[‚ðƒNƒŠƒA‚·‚é
-procedure TMouseGesture.Clear;
+procedure TMouseGesture.ClearGesture;
 begin
 	FGestureItemList.Clear;
 end;

--- a/Giko.pas
+++ b/Giko.pas
@@ -1886,13 +1886,7 @@ begin
 		FActiveContent := nil;
 		Exit;
 	end;
-    // ‘O‰ñ‚Æ“¯‚¶ê‡I—¹
-    if (StatusBar.Panels[1].Text = Text2) then begin
-        {$IFDEF DEBUG}
-        Writeln('Status Text is not changed!');
-        {$ENDIF}
-        Exit;
-    end;
+
 	StatusBar.Panels[1].Text := Text2;
 
 	if FHint <> nil then begin
@@ -1906,8 +1900,6 @@ begin
 		if not GikoForm.Active then
 			Exit;
 
-
-
 //file:///C:/Borland/Projects/gikoNavi/test/read.cgi/qa/990576336/10
 //file:///C:/Borland/Projects/gikoNavi/test/read.cgi/qa/990576336/10-15
 
@@ -6790,7 +6782,6 @@ var
 	Action: TAction;
 begin
 	s := MouseGesture.GetGestureStr;
-    MouseGesture.Clear;
 	Action := GikoSys.Setting.Gestures.GetGestureAction(s);
 	if Action <> nil then
 		Action.Execute;

--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -358,7 +358,6 @@ end;
 procedure TKeySettingForm.OnGestureEnd(Sender: TObject);
 begin
 	GestureEdit.Text := MouseGesture.GetGestureStr;
-    MouseGesture.Clear;
 end;
 
 procedure TKeySettingForm.GestureCheckBoxClick(Sender: TObject);

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -107,7 +107,7 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2007/01/28
+2006/12/XX
   Version ÊÞÀ54
 @ƒXƒŒƒbƒh“à‚ł̃Šƒ“ƒN‚ňړ®‚µ‚½‚Æ‚«‚Ì—š—ð‚ð’H‚ê‚é‹@”\‚ð’ljÁ
 @ƒ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é‹@”\‚ð’ljÁiƒIƒvƒVƒ‡ƒ“‚ōŏ¬‰»Žž‚àj