コミット: c5e1d89a86979f794d0e2f4d1dc52f8f27c98de5 - gikonavi (git)

ギコナビ

コミットメタ情報

• リビジョン: c5e1d89a86979f794d0e2f4d1dc52f8f27c98de5 (tree)
• 日時: 2009-02-23 00:30:28
• 作者: cvs2git <cvs2git>
• コミッター: cvs2git

ログメッセージ

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

変更サマリ

• modified: BoardGroup.pas
• modified: Giko.pas
• modified: GikoBayesian.pas
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Preview.pas
• modified: Setting.pas
• modified: UpdateCheck.pas
• modified: gikoNavi.res
• modified: readme/gikoSetup.iss
• modified: readme/gikoUSetup.iss
• modified: readme/readme.txt

差分

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -279,7 +279,7 @@ type
 	public
 		constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard; inURL : string ); overload;
 		constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard;
-					 inURL : string; inExist: Boolean; const inFilename: string ); overload;
+					 const inURL : string; inExist: Boolean; const inFilename: string ); overload;
 
 		destructor Destroy; override;
 
@@ -1574,7 +1574,7 @@ end;
 constructor TThreadItem.Create(
 	const inPlugIn : TBoardPlugIn;
 	const inBoard : TBoard;
-	inURL : string;
+	const inURL : string;
 	inExist: Boolean;
 	const inFilename: string
 );
@@ -1589,7 +1589,7 @@ begin
 		// dat ‚Ì•Û‘¶ƒpƒX‚ðÝ’è
 		FileName	:= inFilename;
 		IsLogFile	:= inExist;
-		URL				:= GikoSys.Get2chBrowsableThreadURL( inURL );
+        URL				:= inURL;
 	end else begin
 		// ƒvƒ‰ƒOƒCƒ“‚É TThreadItem ‚ªì¬‚³‚ꂽ‚±‚Æ‚ð“`‚¦‚é
 		inPlugIn.CreateThreadItem( DWORD( Self ) );

--- a/Giko.pas
+++ b/Giko.pas
@@ -1025,7 +1025,11 @@ begin
 		case FResRangeMenuSelect of
 		Ord( grrKoko ):	GikoDM.OnlyKokoResAction.Checked	:= True;
 		Ord( grrNew ):	GikoDM.OnlyNewResAction.Checked	:= True;
-		100:			GikoDM.OnlyAHundredResAction.Checked		:= True;
+		10..65535:
+            begin
+                GikoDM.OnlyAHundredResAction.Checked		:= True;
+                GikoSys.ResRange := GikoSys.Setting.ResRangeExCount;
+            end;
 		end;
 	end;
 
@@ -2079,7 +2083,8 @@ begin
 	s := '';
 	Ext := AnsiLowerCase(ExtractFileExt(Text2));
 	if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and
-			((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) then begin
+			((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) or
+        (Pos('http://www.nicovideo.jp/watch/', Text2) = 1)  then begin
 		if FPreviewBrowser = nil then begin
 			FPreviewBrowser := TPreviewBrowser.Create(Self);
 			ShowWindow(FPreviewBrowser.Handle, SW_HIDE);

--- a/GikoBayesian.pas
+++ b/GikoBayesian.pas
@@ -5,7 +5,7 @@ unit GikoBayesian;
 \brief	ƒxƒCƒWƒAƒ“ƒtƒBƒ‹ƒ^
 
 
-$Id: GikoBayesian.pas,v 1.21 2006/06/26 14:57:15 h677 Exp $
+$Id: GikoBayesian.pas,v 1.22 2009/01/31 15:47:15 h677 Exp $
 }
 
 //! •½‰¼–¼‚ðŽ«‘‚ÉŠÜ‚ß‚È‚¢
@@ -310,12 +310,12 @@ begin
 
 		for i := 1 to sl.Count - 1 do begin
 			s := sl[ i ];
-			name := RemoveToken( s, #1 );
+			name := GikoBayesian.RemoveToken( s, #1 );
 			info := TWordInfo.Create;
-			info.NormalWord			:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.ImportantWord	:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.NormalText 		:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.ImportantText	:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
+			info.NormalWord			:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.ImportantWord	:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.NormalText 		:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.ImportantText	:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
 
 			AddObject( name, info );
 		end;

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -926,8 +926,8 @@ begin
 
 	GikoForm.ResRangeMenuSelect 	:= 100;
 	OnlyAHundredResAction.Checked	:= True;
-	//@•\Ž¦”͈͂ðÝ’è‚·‚é
-	SetResRange(100);
+	//@•\Ž¦”͈͂ðÝ’è‚·‚éBÝ’è’l‚©‚ç‚Æ‚Á‚Ä‚­‚éB
+    SetResRange(GikoSys.Setting.ResRangeExCount);
 end;
 // *************************************************************************
 //! –¢“ǃŒƒX‚Ì‚Ý•\Ž¦

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -181,7 +181,7 @@ type
 
 		procedure MenuFont(Font: TFont);
 
-		function RemoveToken(var s:string; const delimiter:string):string;
+//		function RemoveToken(var s:string; const delimiter:string):string;
 		function GetTokenIndex(s: string; delimiter: string; index: Integer): string;
 
 		function GetShortName(const LongName: string; ALength: integer): string;
@@ -264,7 +264,7 @@ const
 	ZERO_DATE: Integer	= 25569;
 	BETA_VERSION_NAME_E = 'beta';
 	BETA_VERSION_NAME_J = 'ÊÞÀ';
-	BETA_VERSION				= 59;
+	BETA_VERSION				= 60;
 	BETA_VERSION_BUILD	= '';				//!< debug”Å‚È‚Ç
 	APP_NAME						= 'gikoNavi';
 	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -645,7 +645,7 @@ begin
 					end;
 				end;
 
-				ThreadItem.BeginUpdate;
+				//ThreadItem.BeginUpdate;
 				if (datFileCheck) and (islog) then
 					FileList.Delete( Index );
 
@@ -670,7 +670,7 @@ begin
 				Node := FavoriteDM.TreeView.Items.AddChildObject( FavoriteDM.TreeView.Items.Item[0], ThreadItem.Title, FavoThreadItem);
 				*}
 
-				ThreadItem.EndUpdate;
+				//ThreadItem.EndUpdate;
 				Board.Add(ThreadItem);
 
 				if (ThreadItem.UnRead) and (ThreadItem.IsLogFile) then
@@ -699,7 +699,7 @@ begin
 	Board.IsThreadDatRead := True;
 {$IFDEF DEBUG}
 	rt := GetTickCount - st;
-	Writeln('Read Done.' + IntToStr(rt) + ' ms');
+	Writeln('Read Done.' + Board.Title + ':' + IntToStr(rt) + ' ms');
 {$ENDIF}
 end;
 {!
@@ -943,7 +943,7 @@ begin
 	Result.FLastModified := IntToDateTime(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), ZERO_DATE));
 	Result.FKokomade := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), -1);
 	Result.FNewReceive := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
-	RemoveToken(Line, #1);//9: ;	//–¢Žg—p
+	MojuUtils.RemoveToken(Line, #1);//9: ;	//–¢Žg—p
 	Result.FUnRead := IntToBool(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0));
 	Result.FScrollTop := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
 	Result.FAllResCount := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
@@ -1098,8 +1098,8 @@ begin
 		Delim := ','
 	else
 		Delim := '<>';
-	Result.FFileName := RemoveToken(Line, Delim);
-	Result.FTitle := Trim(RemoveToken(Line, Delim));
+	Result.FFileName := MojuUtils.RemoveToken(Line, Delim);
+	Result.FTitle := Trim(MojuUtils.RemoveToken(Line, Delim));
 
 	ws := Result.FTitle;
 	if Copy(ws, Length(ws), 1) = ')' then begin
@@ -1363,7 +1363,7 @@ end;
 
 ‚Ç‚±‚©‚̃TƒCƒg‚©‚ç‚̃pƒNƒŠ
 }
-function TGikoSys.RemoveToken(var s: string;const delimiter: string): string;
+{function TGikoSys.RemoveToken(var s: string;const delimiter: string): string;
 var
 	p: Integer;
 begin
@@ -1374,7 +1374,7 @@ begin
 		Result := Copy(s, 1, p - 1);
 	Delete(s, 1, Length(Result) + Length(delimiter));
 end;
-
+}
 
 {!
 \brief n ŒÂ–ڂ̃g[ƒNƒ“‚ðØ‚èo‚µ
@@ -1390,7 +1390,7 @@ var
 begin
 	Result := '';
 	for i := 0 to index do
-		Result := RemoveToken(s, delimiter);
+		Result := MojuUtils.RemoveToken(s, delimiter);
 end;
 
 
@@ -1632,7 +1632,7 @@ begin
 	SI.cbReserved2 := 0;
 	SI.lpReserved2 := nil;
 	SI.dwysize		 := 0;
-	Windows.CreateProcess(nil,
+    if Windows.CreateProcess(nil,
 								PChar(Path),
 								nil,
 								nil,
@@ -1641,7 +1641,11 @@ begin
 								nil,
 								nil,
 								SI,
-								PI);
+								PI) then
+    begin
+        CloseHandle(PI.hProcess);
+    end;
+
 end;
 
 {!

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -1459,10 +1459,10 @@ begin
 		Line := CustomStringReplace(Line, '—M', ',');
 	end;
 	//Trim‚µ‚Ä‚Í‚¢‚¯‚È‚¢‹C‚ª‚·‚é@by‚à‚¶‚ã
-	PRes.FName := RemoveToken(Line, delimiter);
-	PRes.FMailTo := RemoveToken(Line, delimiter);
-	PRes.FDateTime := RemoveToken(Line, delimiter);
-	PRes.FBody := RemoveToken(Line, delimiter);
+	PRes.FName := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FMailTo := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FDateTime := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FBody := MojuUtils.RemoveToken(Line, delimiter);
 	//‚Q‚¿‚á‚ñ‚Ë‚é‚Æ‚©‚¾‚ƁA–{•¶‚̐擪‚É‚P‚”¼Šp‹ó”’‚ª“ü‚Á‚Ä‚¢‚é‚̂ō폜‚·‚é
 	//‘¼‚ÌŒfŽ¦”‚ŁAƒŒƒXŽ©‘Ì‚Ì‹ó”’‚©‚à‚µ‚ê‚È‚¢‚¯‚Ç‚»‚ê‚Í’ú‚ß‚é
 	PRes.FBody := TrimLeft(PRes.FBody);
@@ -1470,7 +1470,7 @@ begin
 	if PRes.FBody = '' then
 		PRes.FBody := ' ';
 
-	PRes.FTitle := RemoveToken(Line, delimiter);
+	PRes.FTitle := MojuUtils.RemoveToken(Line, delimiter);
 end;
 
 {!

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -475,6 +475,34 @@ object KuroutOption: TKuroutOption
           TabOrder = 1
           Wrap = False
         end
+        object ResRangeLabeledEdit: TLabeledEdit
+          Left = 317
+          Top = 18
+          Width = 121
+          Height = 20
+          EditLabel.Width = 113
+          EditLabel.Height = 12
+          EditLabel.Caption = #34920#31034#12524#12473#25968'(100-9999)'
+          ImeMode = imDisable
+          LabelPosition = lpLeft
+          LabelSpacing = 3
+          TabOrder = 2
+          Text = '100'
+          OnExit = ResRangeLabeledEditExit
+        end
+        object ResRangeCountUpDown: TUpDown
+          Left = 438
+          Top = 18
+          Width = 17
+          Height = 20
+          Associate = ResRangeLabeledEdit
+          Min = 100
+          Max = 9999
+          Position = 100
+          TabOrder = 3
+          Thousands = False
+          Wrap = False
+        end
       end
       object ThreadGroupBox: TGroupBox
         Left = 16

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -94,6 +94,8 @@ type
     RespopupWaitUpDown: TUpDown;
     Label19: TLabel;
     RespopupMailToCheckBox: TCheckBox;
+    ResRangeLabeledEdit: TLabeledEdit;
+    ResRangeCountUpDown: TUpDown;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -110,6 +112,7 @@ type
     procedure DeltaXLabeledEditExit(Sender: TObject);
     procedure DeltaYLabeledEditExit(Sender: TObject);
     procedure RespopupWaitLabeledEditExit(Sender: TObject);
+    procedure ResRangeLabeledEditExit(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure SetValue;
@@ -166,6 +169,8 @@ begin
     MoveHistoryMaxEdit.Text := IntToStr( GikoSys.Setting.MoveHistorySize );
     //@æ“ª•\Ž¦ƒŒƒX”
     AHandredUpDown.Position := GikoSys.Setting.HeadResCount;
+    // •\Ž¦ƒŒƒX”
+    ResRangeCountUpDown.Position := GikoSys.Setting.ResRangeExCount;
     // ŠÖ˜AƒL[ƒ[ƒh’ljÁƒtƒ‰ƒO
     AddKeywordCheckBox.Checked := GikoSys.Setting.AddKeywordLink;
     // Œë”½‰ž‘΍ô
@@ -212,7 +217,8 @@ begin
     //@æ“ª•\Ž¦ƒŒƒX”
     GikoSys.Setting.HeadResCount :=
         StrToIntDef( AHandredLabeledEdit.Text , 1);
-
+    GikoSys.Setting.ResRangeExCount :=
+        StrToIntDef( ResRangeLabeledEdit.Text , 100 );
 	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
     // ŠÖ˜AƒL[ƒ[ƒh’ljÁƒtƒ‰ƒO
     GikoSys.Setting.AddKeywordLink := AddKeywordCheckBox.Checked;
@@ -515,4 +521,14 @@ begin
 		RespopupWaitLabeledEdit.Text := IntToStr(RespopupWaitUpDown.Max);
 end;
 
+procedure TKuroutOption.ResRangeLabeledEditExit(Sender: TObject);
+begin
+	if not GikoSys.IsNumeric(ResRangeLabeledEdit.Text) then
+		ResRangeLabeledEdit.Text := '100';
+    if StrToInt(ResRangeLabeledEdit.Text) < 100 then
+        ResRangeLabeledEdit.Text := '100';
+    if StrToInt(ResRangeLabeledEdit.Text) > 9999 then
+        ResRangeLabeledEdit.Text := '9999';
+end;
+
 end.

--- a/Option.dfm
+++ b/Option.dfm
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
           Top = 43
           Width = 417
           Height = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 0
           Text = 'BoardURLComboBox'
         end

--- a/Option.pas
+++ b/Option.pas
@@ -723,7 +723,7 @@ begin
 	Ord( grrAll ): 	ResRangeHoldComboBox.ItemIndex := 0;
 	Ord( grrKoko ):	ResRangeHoldComboBox.ItemIndex := 2;
 	Ord( grrNew ): 	ResRangeHoldComboBox.ItemIndex := 3;
-	100:						ResRangeHoldComboBox.ItemIndex := 1;
+	10..65535:						ResRangeHoldComboBox.ItemIndex := 1;
 	end;
 	ResRangeHoldComboBox.Enabled := GikoSys.Setting.ResRangeHold;
 	//ƒ^ƒu’ljÁˆÊ’u
@@ -1013,7 +1013,7 @@ begin
 	GikoSys.Setting.ResRangeHold := ResRangeHoldCheckBox.Checked;
 	case ResRangeHoldComboBox.ItemIndex of
 	        0: GikoSys.Setting.ResRange := Ord( grrAll );
-	        1: GikoSys.Setting.ResRange := 100;
+	        1: GikoSys.Setting.ResRange := GikoSys.Setting.ResRangeExCount;
 	        2: GikoSys.Setting.ResRange := Ord( grrKoko );
 	        3: GikoSys.Setting.ResRange := Ord( grrNew );
 	end;

--- a/Preview.pas
+++ b/Preview.pas
@@ -13,6 +13,7 @@ uses
 type
 	TPreviewBrowser = class(TWebBrowser)
 	private
+        function makeHTML(const URL, Host, Document : String): String;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
@@ -31,6 +32,7 @@ const
     // ƒ}ƒEƒXƒJ[ƒ\ƒ‹‚©‚ç‚Ì‚¸‚炵ˆÊ’u
     DIV_X = 15;
     DIV_Y = 15;
+    NICO = 'www.nicovideo.jp';
 
 constructor TPreviewBrowser.Create(AOwner: TComponent);
 begin
@@ -52,7 +54,6 @@ end;
 }
 procedure TPreviewBrowser.PreviewImage(URL : String);
 var
-    html : string;
     HtmlFileName : string;
     sl : TStringList;
     Protocol, Host, Path, Document, Port, Bookmark : string;
@@ -62,41 +63,21 @@ var
 	PostData: OleVariant;
   	Headers: OleVariant;
 begin
-	html := '<html><head>'#13#10
-				+ '<SCRIPT>'#13#10
-				+ 'function init() {'#13#10
-				+ '	if ((document.body.clientHeight >= Image1.height) && (document.body.clientWidth >= Image1.width)) {'#13#10
-				+ '	} else {'#13#10
-				+ '		var dh, ih;'#13#10
-				+ '		dh = document.body.clientWidth / document.body.clientHeight;'#13#10
-				+ '		ih = Image1.width / Image1.height;'#13#10
-				+ '		if (document.body.clientWidth < document.body.clientHeight) {'#13#10
-				+ '			if (ih > dh)'#13#10
-				+ '				Image1.width = document.body.clientWidth;'#13#10
-				+ '			else'#13#10
-				+ '				Image1.height = document.body.clientHeight;'#13#10
-				+ '		} else {'#13#10
-				+ '			if (ih < dh)'#13#10
-				+ '				Image1.height = document.body.clientHeight;'#13#10
-				+ '			else'#13#10
-				+ '				Image1.width = document.body.clientWidth;'#13#10
-				+ '		}'#13#10
-				+ '	}'#13#10
-				+ '	Message.style.display = "none";'#13#10
-				+ '}'#13#10
-				+ '</SCRIPT>'#13#10
-				+ '</head>'#13#10
-				+ '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10
-				+ '<div align="center" id="Message">ƒvƒŒƒrƒ…[ì¬’†</div>'#13#10
-				+ '<div align="center"><img name="Image1" border="0" src="%ImageURL%"></div>'#13#10
-				+ '</body></html>';
-    
+	GikoSys.ParseURI(URL, Protocol, Host, Path, Document, Port, Bookmark);
+	Referer := Protocol + '://' + Host;
+	if Port <> '' then
+		Referer := Referer + ':' + Port;
+	Referer := Referer + Path;
+	Headers := 'Referer: ' + Referer;
+    Flags := 0;
+    TargetFrameName := '';
+    PostData := '';
+
     HtmlFileName := GikoSys.GetAppDir + HTML_FILE_NAME;
 	sl := TStringList.Create;
 	try
 		try
-            sl.Text := MojuUtils.
-                CustomStringReplace(html, '%ImageURL%', URL, False);
+            sl.Text := makeHTML(URL, Host, Document);
 			sl.SaveToFile(HtmlFileName);
 		finally
 			sl.Free;
@@ -104,15 +85,6 @@ begin
 	except
 	end;
 
-	GikoSys.ParseURI(URL, Protocol, Host, Path, Document, Port, Bookmark);
-	Referer := Protocol + '://' + Host;
-	if Port <> '' then
-		Referer := Referer + ':' + Port;
-	Referer := Referer + Path;
-	Headers := 'Referer: ' + Referer;
-    Flags := 0;
-    TargetFrameName := '';
-    PostData := '';
 
 	Navigate(HtmlFileName,Flags, TargetFrameName, PostData, Headers);
 
@@ -173,4 +145,60 @@ begin
 	end;
 
 end;
+
+{
+\breif ƒvƒŒƒrƒ…[—p‚ÌHTML‚ðì¬‚·‚é
+\param URL ƒvƒŒƒrƒ…[‚·‚éƒCƒ[ƒWƒtƒ@ƒCƒ‹
+}
+function TPreviewBrowser.makeHTML(const URL, Host, Document : String): String;
+var
+    point :TPoint;
+    rect  :TRect;
+begin
+    if (Pos('http://www.nicovideo.jp/watch/', URL) <> 1) then begin
+    	Result := '<html><head>'#13#10
+				+ '<SCRIPT>'#13#10
+				+ 'function init() {'#13#10
+				+ '	if ((document.body.clientHeight >= Image1.height) && (document.body.clientWidth >= Image1.width)) {'#13#10
+				+ '	} else {'#13#10
+				+ '		var dh, ih;'#13#10
+				+ '		dh = document.body.clientWidth / document.body.clientHeight;'#13#10
+				+ '		ih = Image1.width / Image1.height;'#13#10
+				+ '		if (document.body.clientWidth < document.body.clientHeight) {'#13#10
+				+ '			if (ih > dh)'#13#10
+				+ '				Image1.width = document.body.clientWidth;'#13#10
+				+ '			else'#13#10
+				+ '				Image1.height = document.body.clientHeight;'#13#10
+				+ '		} else {'#13#10
+				+ '			if (ih < dh)'#13#10
+				+ '				Image1.height = document.body.clientHeight;'#13#10
+				+ '			else'#13#10
+				+ '				Image1.width = document.body.clientWidth;'#13#10
+				+ '		}'#13#10
+				+ '	}'#13#10
+				+ '	Message.style.display = "none";'#13#10
+				+ '}'#13#10
+				+ '</SCRIPT>'#13#10
+				+ '</head>'#13#10
+				+ '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10
+				+ '<div align="center" id="Message">ƒvƒŒƒrƒ…[ì¬’†</div>'#13#10
+				+ '<div align="center"><img name="Image1" border="0" src="' + URL + '"></div>'#13#10
+				+ '</body></html>';
+    end else begin
+        // <div><iframe width="340" height="185" src="http://www.nicovideo.jp/thumb/sm2494604" scrolling="no" style="border:solid 1px #CCC;" frameborder="0"></iframe></div><div class=link_nicovideo_title><a href="" title="" target="_blank"></a></div>
+        rect := GetWindowRect(point);
+
+        Result := '<html><head>'#13#10
+                + '<SCRIPT>'#13#10
+                + 'function init() {'#13#10
+                + '	Message.style.display = "none";'#13#10
+                + '}'#13#10
+                + '</SCRIPT>'#13#10
+                + '</head>'#13#10
+                + '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10
+                + '<div align="center" id="Message">ƒvƒŒƒrƒ…[ì¬’†</div>'#13#10
+                + '<div><iframe width="' + IntToStr(rect.Right - rect.Left) +'" height="' + IntToStr(rect.Bottom - rect.Top) + '" src="http://' + Host + '/thumb/' + Document + '" scrolling="no" style="border:solid 1px #CCC;" frameborder="0"></iframe></div>'
+				+ '</body></html>';
+    end;
+end;
 end.

--- a/Setting.pas
+++ b/Setting.pas
@@ -440,6 +440,8 @@ type
         FLoopBrowserTabs : Boolean;
         //! 100ƒŒƒX•\Ž¦‚̐擪•\Ž¦ƒŒƒX”
         FHeadResCount : Integer;
+        //! 100ƒŒƒX•\Ž¦”iŠg’£—pj
+        FResRangeExCount: Integer;
         //! ŠÖ˜AƒL[ƒ[ƒh’ljÁƒtƒ‰ƒO
         FAddKeywordLink: Boolean;
         //! dat’uŠ·‚ð—LŒø‚É‚·‚é
@@ -810,6 +812,8 @@ type
         property LoopBrowserTabs : Boolean read FLoopBrowserTabs write FLoopBrowserTabs;
         //! 100ƒŒƒX•\Ž¦‚̐擪•\Ž¦ƒŒƒX”
         property HeadResCount : Integer read FHeadResCount write FHeadResCount;
+        //! 100ƒŒƒX•\Ž¦”iŠg’£—pj
+        property ResRangeExCount: Integer read FResRangeExCount write FResRangeExCount;
         //! ŠÖ˜AƒL[ƒ[ƒh’ljÁƒtƒ‰ƒO
         property AddKeywordLink: Boolean read FAddKeywordLink write FAddKeywordLink;
         //! dat‚Ì’uŠ·‚ð—LŒø‚É‚·‚é‚©
@@ -1127,6 +1131,7 @@ begin
 			FResRange := ini.ReadInteger( 'Thread', 'ResRange', Ord( grrAll ) );
 		FResRangeHold := ini.ReadBool( 'Thread', 'ResRangeHold', False );
         FHeadResCount := ini.ReadInteger('Thread', 'HeadResCount', 1);
+        FResRangeExCount:= ini.ReadInteger('Thread','ResRangeExCount', 100);
 		// ƒXƒŒƒbƒhˆê——•\Ž¦”͈Í
 		FThreadRange := TGikoThreadRange( ini.ReadInteger('ThreadList', 'ThreadRange', Ord( gtrAll )) );
 		//”ñƒAƒNƒeƒBƒuŽžƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦
@@ -1531,6 +1536,7 @@ begin
 		ini.WriteInteger('Thread', 'ResRange', FResRange);
 		ini.WriteBool('Thread', 'ResRangeHold', FResRangeHold);
         ini.WriteInteger('Thread', 'HeadResCount', FHeadResCount);
+        ini.WriteInteger('Thread','ResRangeExCount', FResRangeExCount);
 		// ƒXƒŒƒbƒhˆê——•\Ž¦”͈Í
 		ini.WriteInteger('ThreadList', 'ThreadRange', Ord( FThreadRange ));
 		//ƒƒOíœŠm”F

--- a/UpdateCheck.pas
+++ b/UpdateCheck.pas
@@ -80,7 +80,7 @@ const
 	CHECK_URL = 'http://gikonavi.sourceforge.jp/updater/latest.txt';
 {$ENDIF}
 var
-    value : string;
+    value, url : string;
    	ResStream: TMemoryStream;
     downResult, current, newest: TStringList;
     newgiko: Boolean;
@@ -129,8 +129,10 @@ begin
                         newgiko := false;
                         // night build‚́Aƒrƒ‹ƒh”ԍ†‚¾‚¯‚Å”»’è‚·‚é
                         if (nightbuild) then begin
+                            url := downResult.Values[ 'n_url' ];
                             newgiko := StrToInt(current[3]) < StrToInt(newest[3]);
                         end else begin
+                            url := downResult.Values[ 'url' ];
                             newgiko := ( StrToInt(current[1]) < StrToInt(newest[1]) ) or
                                         ( (StrToInt(current[1]) = StrToInt(newest[1]))) and
                                             ((StrToInt(current[2]) < StrToInt(newest[2])) );
@@ -138,9 +140,8 @@ begin
                         if (newgiko) then begin
                             if GikoUtil.MsgBox(Handle, 'V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚·‚©H', 'XVŠm”F',
                                 MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
-
-                                ResultMemo.Lines.Add('V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚ðŠJŽn‚µ‚Ü‚·B' + downResult.Values[ 'url' ]);
-                                DonwloadUpdate(Trim(downResult.Values[ 'url' ]));
+                                ResultMemo.Lines.Add('V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚ðŠJŽn‚µ‚Ü‚·B' + url);
+                                DonwloadUpdate(Trim(url));
                                 Result := True;
                             end;
                         end else begin

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

--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -13,8 +13,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.58.1.764
-OutputBaseFilename=gikoNavi_b58_setup
+VersionInfoVersion=1.59.1.778
+OutputBaseFilename=gikoNavi_b59_setup
 
 
 [Tasks]

--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -18,8 +18,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.59.0.778
-OutputBaseFilename=gikoNavi_b59_778_usetup
+VersionInfoVersion=1.60.0.779
+OutputBaseFilename=gikoNavi_b60_779_usetup
 CreateUninstallRegKey=no
 
 [Tasks]

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ59 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ60 Readme.txt
 
 
 ------------------------------
@@ -108,8 +108,19 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2008/XX/XX
+2009/XX/YY
+  Version ÊÞÀ60
+
+
+2009/02/01
   Version ÊÞÀ59
+  ƒŒƒX–{•¶’†‚ÉAƒ^ƒOˆÈŠO‚̃^ƒO‚ªŠÜ‚Ü‚ê‚é‚ƁAƒŒƒXƒ|ƒbƒvƒAƒbƒv‚ŁA–{•¶‚ªŒ‡‚¯‚é•s‹ï‡‚̏C³ 
+  ƒMƒRƒiƒrXV‹@”\’ljÁ
+  ƒƒCƒ“ƒtƒH[ƒ€‚Å—˜—p‚µ‚Ä‚¢‚éƒAƒCƒRƒ“‚̉摜‚ð·‚µ‘Ö‚¦‚ê‚é‚悤‚ɏC³
+  •Û‘¶‚µ‚½ƒ^ƒu‚̃ƒO‚ª‘¶Ý‚µ‚È‚¢ê‡‚É‚±‚¯‚é–â‘è‚̏C³
+  RoundBoard.2chARoundItem.2ch‚Ì“à—e‚ª‚Ps‚à‚È‚¢ê‡ƒNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚̏C³
+  ‘O‰ñ“ŠeŽž‚ÆIPƒAƒhƒŒƒXiƒzƒXƒg–¼j‚ª•Ï‚í‚Á‚Ä‚¢‚é‚Æ‚«‚ɁACookieî•ñ‚ª‹ó‚É‚È‚é•s‹ï‡‚̏C³
+  ‚µ‚½‚ç‚ÎJBBS‚̉ߋŽƒƒO‚ŁA“Še“ú+ID‚Ì‘O‚É"“Še“úF"‚Ì•¶Žš—ñ‚ª‚È‚¢ê‡‚ɑΉž
   
 2008/09/16
   Version ÊÞÀ58