Commit: 14699e265671af2e1f58de2c78d4242592538793 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Révision: 14699e265671af2e1f58de2c78d4242592538793 (tree)
• l'heure: 2007-03-04 21:33:58
• Auteur: h677 <h677>
• Commiter: h677

Message de Log

同IDポップアップの関数の修正

Change Summary

• modified: Giko.pas
• modified: GikoDataModule.pas
• modified: GikoSystem.pas

Modification

--- a/Giko.pas
+++ b/Giko.pas
@@ -6509,14 +6509,16 @@ end;
 //! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃}ƒEƒXƒAƒbƒvƒCƒxƒ“ƒg
 // *************************************************************************
 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
+const
+    LIMIT = 20;
 var
 	p : TPoint;
 	e: IHTMLElement;
 	AID: string;
 	stlist : TStringList;
-	i, count, rc : Integer;
+	i, count: Integer;
 	body : String;
-    limited : boolean;
+    limited : Integer;
 begin
   result := true;
   try
@@ -6552,13 +6554,14 @@ begin
 						end;
 					end;
                     count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
-                    limited := false;
-                    if count > 20 then begin
-                        rc := GikoUtil.MsgBox(Handle,
-                                '20ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
+                    limited := LIMIT;
+                    if count > LIMIT then begin
+                        if (GikoUtil.MsgBox(Handle,
+                                IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
                                 'IDƒ|ƒbƒvƒAƒbƒvŒx',
-								MB_YESNO or MB_ICONQUESTION);
-                        limited := rc <> ID_YES;
+								MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin
+                            limited := -1;
+                        end
                     end;
 					body := GikoSys.GetSameIDResAnchor(AID, FActiveContent.Thread, limited);
 					FActiveContent.IDAnchorPopup(body);

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2385,24 +2385,27 @@ end;
 //! ‘I‘ð‚µ‚½ƒŒƒX‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.SameIDResAnchorActionExecute(Sender: TObject);
+const
+    LIMIT = 20;
 var
 	ThreadItem : TThreadItem;
-	No, count, rc : Integer;
+	No, count: Integer;
 	body : string;
-	limited: boolean;
+	limited: Integer;
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
 	ThreadItem := GikoForm.GetActiveContent;
 	if ThreadItem = nil then Exit;
 	count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
-	limited := false;
-	if count > 20 then begin
-		rc := GikoUtil.MsgBox(GikoForm.Handle,
-				'20ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
+	limited := LIMIT;
+	if count > LIMIT then begin
+		if ( GikoUtil.MsgBox(GikoForm.Handle,
+				IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
 				'IDƒ|ƒbƒvƒAƒbƒvŒx',
-				MB_YESNO or MB_ICONQUESTION);
-		limited := rc <> ID_YES;
+				MB_YESNO or MB_ICONQUESTION) = ID_YES ) then begin
+            limited := -1;
+        end;
 	end;
 	body := GikoSys.GetSameIDResAnchor(No, ThreadItem, limited);
 	GikoForm.ActiveContent.IDAnchorPopup(body);

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -216,8 +216,8 @@ type
 		procedure GetPopupResNumber(URL : string; var stRes, endRes : Int64);
 
 		property Bayesian : TGikoBayesian read FBayesian write FBayesian;
-		function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: boolean):string; overload;
-		function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: boolean):string; overload;
+		function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: Integer):string; overload;
+		function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: Integer):string; overload;
 		procedure GetSameIDRes(const AID : string; ThreadItem: TThreadItem;var body: TStringList); overload;
 		procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload;
 		function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload;
@@ -2699,11 +2699,12 @@ end;
 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒAƒ“ƒJ[‚É‚µ‚Ä—ñ‹“
 \param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
-\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç True
+\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
 \return           —ñ‹“‚³‚ꂽƒŒƒXƒAƒ“ƒJ[
-\todo limited ‚ð Integer ‚É‚·‚é‚©A20 ‚ðŠO‚ɏo‚·
 }
-function TGikoSys.GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: boolean):string;
+function TGikoSys.GetSameIDResAnchor(
+    const AID : string; ThreadItem: TThreadItem;
+    limited: Integer):string;
 var
 	i: integer;
 	body: TStringList;
@@ -2720,8 +2721,8 @@ begin
 				body := TStringList.Create;
 				try
 						GetSameIDRes(AID, ThreadItem, body);
-						if (limited) and (body.Count > 20) then begin
-								for i := body.Count - 20 to body.Count - 1 do begin
+						if (limited > 0) and (body.Count > limited) then begin
+								for i := body.Count - limited to body.Count - 1 do begin
 										Res.FBody := Res.FBody + '>' + body[i] + ' ';
 								end;
 						end else begin
@@ -2788,11 +2789,12 @@ end;
 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ð—ñ‹“
 \param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
-\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç True
+\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
 \return
-\todo limited ‚ð Integer ‚É‚·‚é‚©A20 ‚ðŠO‚ɏo‚·
 }
-function TGikoSys.GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: boolean):string;
+function TGikoSys.GetSameIDResAnchor(AIDNum : Integer;
+     ThreadItem: TThreadItem;
+     limited: Integer):string;
 var
 	i: integer;
 	body: TStringList;
@@ -2808,10 +2810,10 @@ begin
 		body := TStringList.Create;
 		try
 			GetSameIDRes(AIDNum, ThreadItem, body);
-            if (limited) and (body.Count > 20) then begin
-    			for i := body.Count - 20 to body.Count - 1 do begin
-	    			Res.FBody := Res.FBody + '>' + body[i] + ' ';
-		    	end;
+            if (limited > 0) and ( body.Count > limited) then begin
+                for i := body.Count - 20 to body.Count - 1 do begin
+                    Res.FBody := Res.FBody + '>' + body[i] + ' ';
+                end;
             end else begin
     			for i := 0 to body.Count - 1 do begin
 	    			Res.FBody := Res.FBody + '>' + body[i] + ' ';