Commit: dc1ba8ccb38283df9d56c040ab09773e10a53010 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: dc1ba8ccb38283df9d56c040ab09773e10a53010 (tree)
• Time: 2006-07-30 10:09:54
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• modified: NewBoard.pas
• modified: gikoNavi.res
• modified: readme/readme.txt

Incremental Difference

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,5 +1,5 @@
 object GikoForm: TGikoForm
-  Left = 241
+  Left = 422
   Top = 68
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
@@ -159,7 +159,7 @@ object GikoForm: TGikoForm
           object ToolBar1: TToolBar
             Left = 2
             Top = 4
-            Width = 15
+            Width = 16
             Height = 18
             Align = alNone
             AutoSize = True
@@ -346,7 +346,7 @@ object GikoForm: TGikoForm
               end>
             EdgeBorders = [ebLeft, ebTop, ebRight]
             EdgeInner = esLowered
-            OnContextPopup = MainCoolBarContextPopup
+            OnContextPopup = ListCoolBarContextPopup
             OnBandInfo = ListCoolBarBandInfo
             OnChevronClick = ListCoolBarChevronClick
             object ListToolBar: TToolBar
@@ -573,7 +573,7 @@ object GikoForm: TGikoForm
               end>
             EdgeBorders = [ebLeft, ebTop, ebRight]
             EdgeInner = esLowered
-            OnContextPopup = MainCoolBarContextPopup
+            OnContextPopup = BrowserCoolBarContextPopup
             OnBandInfo = BrowserCoolBarBandInfo
             OnChevronClick = BrowserCoolBarChevronClick
             object BrowserToolBar: TToolBar
@@ -971,7 +971,7 @@ object GikoForm: TGikoForm
           OnResize = AddressToolBarResize
           object AddressComboBox: TComboBox
             Left = 0
-            Top = 0
+            Top = 1
             Width = 177
             Height = 20
             DropDownCount = 20

--- a/Giko.pas
+++ b/Giko.pas
@@ -508,6 +508,12 @@ type
 			State: TDragState; var Accept: Boolean);
 		procedure FavoriteTreeViewEndDrag(Sender, Target: TObject; X,
 			Y: Integer);
+		procedure ListCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
+			var Handled: Boolean);
+		procedure MainCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
+			var Handled: Boolean);
+		procedure BrowserCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
+			var Handled: Boolean);
 		procedure FavoriteTreeBrowseBoardPopupMenuClick(Sender: TObject);
     procedure BrowserTabContextPopup(Sender: TObject; MousePos: TPoint;
       var Handled: Boolean);
@@ -543,8 +549,6 @@ type
     procedure TreeViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure GetResURLMenuClick(Sender: TObject);
-    procedure MainCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
-      var Handled: Boolean);
 	private
 		{ Private éŒ¾ }
 		FEnabledCloseButton: Boolean;
@@ -643,6 +647,8 @@ type
 		procedure TreeDoubleClick( Node : TTreeNode );
 		/// ŠeŠ‚É‚ ‚éƒLƒƒƒrƒlƒbƒgE BBS ƒƒjƒ…[‚ðƒZƒbƒg^XV
 		procedure SetBBSMenu;
+		/// ƒ^ƒuŽæ“¾
+		procedure GetTabURLs(AStringList: TStringList);
 		/// ListColumnPopupMenu ƒAƒCƒeƒ€‚̃NƒŠƒbƒNƒCƒxƒ“ƒg
 		procedure	ListColumnPopupMenuOnClick( Sender : TObject );
 		//! i‚荞‚Ý•¶Žš—ñÝ’è
@@ -771,6 +777,10 @@ type
 		procedure ResetBandInfo( bar : TGikoCoolBar; band : TToolBar );
 		//ListView‚Å‘I‘ð‚³‚ê‚Ä‚¢‚éƒAƒCƒeƒ€‚ðŽæ“¾‚·‚é
 		procedure SelectListItem(List: TList);
+		/// ƒ^ƒu•Û‘¶
+		procedure SaveTabURLs;
+		/// ƒ^ƒu“ǂݏo‚µ
+		procedure LoadTabURLs;
 		//Žw’肵‚½ƒŒƒX‚ðƒRƒs[‚·‚é
 		procedure KonoresCopy(Number: Integer; ReplaceTag : Boolean);
 		//
@@ -1436,9 +1446,7 @@ begin
 
 		//FormCrete‚©‚çˆÚ“®B
 		if GikoSys.Setting.TabAutoLoadSave then begin
-            GikoDM.TabsOpenAction.Tag := 1;
-			GikoDM.TabsOpenAction.Execute;
-            GikoDM.TabsOpenAction.Tag := 0;
+			GikoDM.TabAutoLoadAction.Execute;
 		end;
 
         //ActionList‚ÌGroupIndex‚ðŒ³‚É–ß‚·
@@ -1460,7 +1468,7 @@ begin
 	end;
 
 	if GikoSys.Setting.TabAutoLoadSave then begin
-		GikoDM.TabsSaveAction.Execute;
+		GikoDM.TabAutoSaveAction.Execute;
 	end;
 
 	if (SearchDialog <> nil) then begin
@@ -1811,6 +1819,8 @@ begin
 	RoundList.LoadRoundThreadFile;
 
 	LockWindowUpdate(0);
+	//
+	GikoDM.TabsOpenAction.Execute;
 end;
 
 {!
@@ -6391,6 +6401,35 @@ begin
 
 end;
 
+procedure TGikoForm.ListCoolBarContextPopup(Sender: TObject;
+	MousePos: TPoint; var Handled: Boolean);
+begin
+
+	FToolBarSettingSender := tssList;
+	MousePos := ListCoolBar.ClientToScreen( MousePos );
+	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
+
+end;
+
+procedure TGikoForm.MainCoolBarContextPopup(Sender: TObject;
+	MousePos: TPoint; var Handled: Boolean);
+begin
+
+	FToolBarSettingSender := tssMain;
+	MousePos := MainCoolBar.ClientToScreen( MousePos );
+	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
+
+end;
+
+procedure TGikoForm.BrowserCoolBarContextPopup(Sender: TObject;
+	MousePos: TPoint; var Handled: Boolean);
+begin
+
+	FToolBarSettingSender := tssBrowser;
+	MousePos := BrowserCoolBar.ClientToScreen( MousePos );
+	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
+
+end;
 procedure TGikoForm.SetListViewBackGroundColor(value: TColor);
 begin
 	if FListViewBackGroundColor <> value then begin
@@ -6877,6 +6916,89 @@ begin
 		end;
 end;
 
+procedure TGikoForm.GetTabURLs(AStringList: TStringList);
+var
+  rec : TBrowserRecord;
+  i : Integer;
+begin
+    for i := 0 to BrowserTab.Tabs.Count -1 do begin
+        try
+            rec := TBrowserRecord( BrowserTab.Tabs.Objects[ i ] );
+            if( rec <> nil) and (rec.Thread <> nil) then
+                AStringList.Add( rec.Thread.URL );
+        except
+        end;
+    end;
+end;
+
+procedure TGikoForm.SaveTabURLs;
+const
+	Filename = 'tab.sav';
+	bFilename = '~tab.sav';
+var
+	SaveStringList: TStringList;
+begin
+	SaveStringList := TStringList.Create;
+	try
+		GetTabURLs(SaveStringList);
+        try
+            if FileExists( GikoSys.GetAppDir + Filename) then begin
+                CopyFile(PChar(GikoSys.GetAppDir + Filename),
+                    PChar(GikoSys.GetAppDir + bFilename), False);
+            end;
+        except
+        end;
+        SaveStringList.SaveToFile(GikoSys.GetAppDir + Filename);
+	finally
+		SaveStringList.Free;
+	end;
+end;
+
+procedure TGikoForm.LoadTabURLs;
+const
+	TABFILE = 'tab.sav';
+var
+	i, bound    : Integer;
+	item        : TThreadItem;
+	URLs				: TStringList;
+	GikoTab			: TGikoTabAppend;
+	fileName		: string;
+begin
+	GikoTab := GikoSys.Setting.BrowserTabAppend;
+    URLs := TStringList.Create();
+	try
+       	fileName := ExtractFilePath(Application.ExeName) + TABFILE;
+		if FileExists(fileName) then begin
+		    try
+				URLs.LoadFromFile(fileName);
+				bound    := URLs.Count - 1;
+				if bound > -1 then begin
+					GikoSys.Setting.BrowserTabAppend := gtpLast;
+					for i := 0 to bound do begin
+						item := BBSsFindThreadFromURL( URLs[ i ] );
+						if item <> nil then
+							InsertBrowserTab( item, false );
+					end;
+					//Å‰‚Ì‚P–‡‚ÉÝ’è ƒAƒhƒŒƒX‚̐ݒè‚Ì‚½‚߂̃Jƒ‰ŒÄ‚Ñ
+					if BrowserTab.Tabs.Count > 0 then begin
+                    	BrowserTab.OnChange(nil);
+					end;
+				end else begin
+                    // ‹ó‚̃tƒ@ƒCƒ‹‚̏ꍇCƒoƒbƒNƒAƒbƒv‚ðíœ‚µ‚È‚¢‚½‚߂ɍ폜
+                    DeleteFile(fileName);
+                end;
+    		except
+	    		on EFOpenError do ShowMessage('ƒ^ƒuƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ');
+            end;
+        end;
+	finally
+        URLs.Free;
+		GikoSys.Setting.BrowserTabAppend := GikoTab;
+	end;
+
+end;
+
+
 /// ListView ‚̃Jƒ‰ƒ€•‚¨‚æ‚шʒu‚Ì•Û‘¶
 procedure TGikoForm.ActiveListColumnSave;
 var
@@ -7672,30 +7794,6 @@ begin
 	end;
 end;
 
-procedure TGikoForm.MainCoolBarContextPopup(Sender: TObject;
-  MousePos: TPoint; var Handled: Boolean);
-var
-    pos : TPoint;
-    coolBar: TGikoCoolBar;
-begin
-    Handled := False;
-    if (Sender <> nil) and (Sender is TGikoCoolBar) then begin
-        coolBar := TGikoCoolBar(Sender);
-        if (coolBar = MainCoolBar) then begin
-            FToolBarSettingSender := tssMain;
-        end else if (coolBar = ListCoolBar) then begin
-            FToolBarSettingSender := tssList;
-        end else if (coolBar = BrowserCoolBar) then begin
-            FToolBarSettingSender := tssBrowser;
-        end else begin
-            FToolBarSettingSender := tssNone;
-        end;
-        pos := coolBar.ClientToScreen( MousePos );
-        MainCoolBarPopupMenu.Popup( pos.X, pos.Y );
-        Handled := True;
-    end;
-end;
-
 initialization
 				OleInitialize(nil);
 finalization

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1079,6 +1079,18 @@ object GikoDM: TGikoDM
       OnExecute = BrowsBoradHeadActionExecute
       OnUpdate = LogFolderOpenActionUpdate
     end
+    object TabAutoSaveAction: TAction
+      Category = #12501#12449#12452#12523
+      Caption = #12479#12502#12398#38918#30058#12434#33258#21205#20445#23384
+      Hint = #12479#12502#12398#38918#30058#12434#33258#21205#20445#23384
+      OnExecute = TabAutoSaveActionExecute
+    end
+    object TabAutoLoadAction: TAction
+      Category = #12501#12449#12452#12523
+      Caption = #12479#12502#12398#38918#30058#12434#33258#21205#24489#20803
+      Hint = #12479#12502#12398#38918#30058#12434#33258#21205#24489#20803
+      OnExecute = TabAutoLoadActionExecute
+    end
     object JumpToNumOfResAction: TAction
       Category = #12473#12524#12483#12489
       Caption = #25351#23450#12375#12383#30058#21495#12398#12524#12473#12395#39131#12406

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -192,6 +192,8 @@ type
 	TabsSaveAction: TAction;
 	TabsOpenAction: TAction;
 	BrowsBoradHeadAction: TAction;
+	TabAutoSaveAction: TAction;
+	TabAutoLoadAction: TAction;
 	JumpToNumOfResAction: TAction;
 	FavoriteTreeViewCollapseAction: TAction;
 	RightTabCloseAction: TAction;
@@ -306,6 +308,8 @@ type
 	procedure SelectItemSaveForDatExecute(Sender: TObject);
 	procedure TabsSaveActionExecute(Sender: TObject);
 	procedure TabsOpenActionExecute(Sender: TObject);
+	procedure TabAutoSaveActionExecute(Sender: TObject);
+	procedure TabAutoLoadActionExecute(Sender: TObject);
 	procedure BeLogInOutActionExecute(Sender: TObject);
 	procedure BeLogInOutActionUpdate(Sender: TObject);
 	procedure KokomadeActionExecute(Sender: TObject);
@@ -425,8 +429,6 @@ type
 	{ Public éŒ¾ }
 	procedure RepaintStatusBar;
     function EditorFormExists(): boolean;
-    procedure GetTabURLs(AStringList: TStringList);
-    procedure OpenURLs(AStringList: TStringList);
   published
 	{ Published éŒ¾ }
 	//! TAction‚ÅGetActiveContent‚ªnilˆÈŠO‚Å—LŒø‚É‚È‚é
@@ -2137,107 +2139,34 @@ end;
 //! ƒ^ƒu‚̏‡”Ô‚ð•Û‘¶
 // *************************************************************************
 procedure TGikoDM.TabsSaveActionExecute(Sender: TObject);
-const
-	Filename = 'tab.sav';
-	bFilename = '~tab.sav';
-var
-	SaveStringList: TStringList;
 begin
-	SaveStringList := TStringList.Create;
-	try
-		GetTabURLs(SaveStringList);
-        try
-            if FileExists( GikoSys.GetAppDir + Filename) then begin
-                CopyFile(PChar(GikoSys.GetAppDir + Filename),
-                    PChar(GikoSys.GetAppDir + bFilename), False);
-            end;
-        except
-        end;
-        SaveStringList.SaveToFile(GikoSys.GetAppDir + Filename);
-	finally
-		SaveStringList.Free;
-	end;
+    GikoForm.SaveTabURLs;
 end;
 // *************************************************************************
-//! ƒuƒ‰ƒEƒUƒ^ƒu‚ɐݒ肳‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚ÌURLŽæ“¾
+//! ƒ^ƒu‚̏‡”Ԃ𕜌³
 // *************************************************************************
-procedure TGikoDM.GetTabURLs(AStringList: TStringList);
-var
-  rec : TBrowserRecord;
-  i : Integer;
+procedure TGikoDM.TabsOpenActionExecute(Sender: TObject);
 begin
-    for i := 0 to GikoForm.BrowserTab.Tabs.Count -1 do begin
-        try
-            rec := TBrowserRecord( GikoForm.BrowserTab.Tabs.Objects[ i ] );
-            if( rec <> nil) and (rec.Thread <> nil) then
-                AStringList.Add( rec.Thread.URL );
-        except
-        end;
+    GikoForm.LoadTabURLs;
+    // TabsOpenAction.Tag‚́C”ˆꗗXV‚©‚çŒÄ‚΂ꂽ‚Æ‚«‚Í1‚É‚È‚Á‚Ä‚¢‚é
+    if (GikoForm.BrowserTab.Tabs.Count = 0)
+        and (TabsOpenAction.Tag = 0) then  begin
+            ShowMessage('•\Ž¦‚·‚éƒ^ƒu‚ª‚ ‚è‚Ü‚¹‚ñB');
     end;
 end;
 // *************************************************************************
-//! Žw’肳‚ꂽURL‚ðŠJ‚«Cæ“ª‚̃^ƒu‚ɃtƒH[ƒJƒX‚·‚é
-// *************************************************************************
-procedure TGikoDM.OpenURLs(AStringList: TStringList);
-var
-    GikoTab			: TGikoTabAppend;
-    i, bound : Integer;
-   	item        : TThreadItem;
-begin
-    if (AStringList <> nil) then begin
-        GikoTab := GikoSys.Setting.BrowserTabAppend;
-        try
-            bound    := AStringList.Count - 1;
-            if bound > -1 then begin
-                GikoSys.Setting.BrowserTabAppend := gtpLast;
-                for i := 0 to bound do begin
-                    item := BBSsFindThreadFromURL( AStringList[ i ] );
-                    if item <> nil then
-                        GikoForm.InsertBrowserTab( item, false );
-                end;
-                //Å‰‚Ì‚P–‡‚ÉÝ’è ƒAƒhƒŒƒX‚̐ݒè‚Ì‚½‚߂̃Jƒ‰ŒÄ‚Ñ
-                if GikoForm.BrowserTab.Tabs.Count > 0 then begin
-                    GikoForm.BrowserTab.OnChange(nil);
-                end;
-            end;
-        finally
-            GikoSys.Setting.BrowserTabAppend := GikoTab;
-        end;
-    end;
+//! ƒ^ƒu‚̏‡”Ô‚ðŽ©“®•Û‘¶
+// *************************************************************************
+procedure TGikoDM.TabAutoSaveActionExecute(Sender: TObject);
+begin
+	GikoForm.SaveTabURLs;
 end;
 // *************************************************************************
-//! ƒ^ƒu‚̏‡”Ԃ𕜌³
+//! ƒ^ƒu‚̏‡”Ô‚ðŽ©“®•œŒ³
 // *************************************************************************
-procedure TGikoDM.TabsOpenActionExecute(Sender: TObject);
-const
-	TABFILE = 'tab.sav';
-var
-	URLs				: TStringList;
-	fileName		: string;
+procedure TGikoDM.TabAutoLoadActionExecute(Sender: TObject);
 begin
-    URLs := TStringList.Create();
-	try
-       	fileName := ExtractFilePath(Application.ExeName) + TABFILE;
-		if FileExists(fileName) then begin
-		    try
-				URLs.LoadFromFile(fileName);
-                if (URLs.Count = 0) then begin
-                    // ‹ó‚̃tƒ@ƒCƒ‹‚̏ꍇCƒoƒbƒNƒAƒbƒv‚ðíœ‚µ‚È‚¢‚½‚߂ɍ폜
-                    SysUtils.DeleteFile(fileName);
-                end else begin
-                    OpenURLs(URLs);
-                end;
-    		except
-	    		on EFOpenError do ShowMessage('ƒ^ƒuƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ');
-            end;
-        end;
-	finally
-        URLs.Free;
-	end;
-
-    if (GikoForm.BrowserTab.Tabs.Count = 0) then  begin
-        ShowMessage('•\Ž¦‚·‚éƒ^ƒu‚ª‚ ‚è‚Ü‚¹‚ñB');
-    end;
+	GikoForm.LoadTabURLs;
 end;
 // *************************************************************************
 //! Be2ch‚ɃƒOƒCƒ“/ƒƒOƒAƒEƒg‚·‚é

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -2753,13 +2753,7 @@ function TGikoSys.GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem
 var
 	i: integer;
 	body: TStringList;
-    Res: TResRec;
-    ResLink : TResLinkRec;
 begin
-    // bodyˆÈŠO‚ÍŽg—p‚µ‚È‚¢‚̂ŏ‰Šú‰»‚µ‚È‚¢
-    Res.FBody := '';
-    Res.FType := glt2chNew;
-
 		Result := '';
 		if (not IsNoValidID(AID)) and
 			(ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
@@ -2768,20 +2762,21 @@ begin
 						GetSameIDRes(AID, 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 + '&gt;' + body[i] + ' ';
+										Result := Result + '&gt;' + body[i] + ' ';
 								end;
 						end else begin
 								for i := 0 to body.Count - 1 do begin
-										Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+										Result := Result + '&gt;' + body[i] + ' ';
 								end;
 						end;
 				finally
 						body.Free;
 				end;
-        ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-        ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
-        HTMLCreater.ConvRes(@Res, @ResLink, false);
-        Result := Res.FBody;
+
+		Result := HTMLCreater.ConvRes(
+			Result,
+			ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''),
+			'bbs', 'key', 'st', 'to', 'nofirst', 'true', false);
 		end;
 end;
 
@@ -2842,13 +2837,7 @@ function TGikoSys.GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem;
 var
 	i: integer;
 	body: TStringList;
-    Res: TResRec;
-    ResLink : TResLinkRec;
 begin
-    // bodyˆÈŠO‚ÍŽg—p‚µ‚È‚¢‚̂ŏ‰Šú‰»‚µ‚È‚¢
-    Res.FBody := '';
-    Res.FType := glt2chNew;
-
 	Result := '';
 	if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
 		body := TStringList.Create;
@@ -2856,20 +2845,21 @@ begin
 			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 + '&gt;' + body[i] + ' ';
+	    			Result := Result + '&gt;' + body[i] + ' ';
 		    	end;
             end else begin
     			for i := 0 to body.Count - 1 do begin
-	    			Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+	    			Result := Result + '&gt;' + body[i] + ' ';
 		    	end;
             end;
 		finally
 			body.Free;
 		end;
-        ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-        ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
-        HTMLCreater.ConvRes(@Res, @ResLink, false);
-        Result := Res.FBody;
+		Result := HTMLCreater.ConvRes(
+					Result, ThreadItem.ParentBoard.BBSID,
+					ChangeFileExt(ThreadItem.FileName, ''),
+					'bbs', 'key', 'st', 'to', 'nofirst', 'true',
+					false);
 	end;
 end;
 

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -60,20 +60,16 @@ type
 		procedure CreateDefaultHTML (html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 		procedure ConvertResAnchor(PRes: PResRec);
 		procedure separateNumber(var st: String; var et: String; const Text, Separator: String);
-		function checkComma(const s : String; var j : Integer) : boolean;
+		function checkComma(const s : String; var j : Integer; var No  : String) : boolean;
 		function addResAnchor(PAddRes: PResRec; PResLink : PResLinkRec; dat : boolean;
 		 var s : String; j : Integer; const No: String) : string;
-        function appendResAnchor(PAddRes: PResRec; PResLink : PResLinkRec;
-             dat : boolean;	var s : String) : string;
-        function getNumberString(const str: String;var index :Integer; var dbCharlen: Boolean;
-             sLen :Integer): String;
-
 	public
 		{ Public éŒ¾ }
 		procedure AddAnchorTag(PRes: PResRec);
 		function LoadFromSkin(fileName: string; ThreadItem: TThreadItem; SizeByte: Integer): string;
 		function SkinedRes(const skin: string; PRes: PResRec; const No: string): string;
 		procedure ConvRes( PRes : PResRec; PResLink : PResLinkRec; DatToHTML: boolean = false); overload;
+		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string; DatToHTML: boolean = false): string; overload;
 		procedure CreateHTML2(Browser: TWebBrowser; ThreadItem: TThreadItem; var sTitle: string);
 		procedure CreateHTML3(var html: TStringList; ThreadItem: TThreadItem; var sTitle: string);
 		//ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̍쐬
@@ -356,9 +352,6 @@ begin
 	end else
 		Result := AID;
 end;
-//! ƒŒƒXƒAƒ“ƒJ[‚̃ŒƒX”ԍ†‚𕪊„‚·‚é
-// Text = '1-9' -> st =  '1'; et = '9'
-// Text = '10'  -> st = '10'; et = '10'
 procedure THTMLCreate.separateNumber(var st: String; var et: String; const Text:String; const Separator: String);
 var
 	p : Integer;
@@ -372,58 +365,54 @@ begin
 		et := Text;
 	end;
 end;
-//! ƒŒƒXƒAƒ“ƒJ[‚ªŽw‚µ‚Ä‚¢‚郌ƒX”ԍ†‚Ì•¶Žš—ñ‚ðŽæ“¾‚·‚é
-function THTMLCreate.getNumberString(
-    const str: String;
-    var index :Integer; var dbCharlen: Boolean; sLen :Integer)
-: String;
-const
-	SN	= '0123456789';
-var
-    ch : String;
-    sw : Boolean;
-begin
-    Result := '';
-    sw := False;
-    while (index <= sLen) do begin
-        if (ByteType(str, index) = mbSingleByte) then begin
-            //1byte•¶Žš
-            ch := str[index];
-            Inc(index);
-            dbCharlen := false;
-        end else begin
-            //2byte•¶Žš
-            ch := ZenToHan(Copy(str, index, 2));
-            Inc(index, 2);
-            dbCharlen := true;
-        end;
-
-        if System.Pos(ch, SN) > 0 then begin
-            Result := Result + ch;
-        end else if (ch = '-') then begin
-            if sw then break;
-            if Result = '' then break;
-            Result := Result + ch;
-            sw := true;
-        end else begin
-            break;
-        end;
-    end;
-end;
-
 procedure THTMLCreate.ConvRes( PRes : PResRec; PResLink : PResLinkRec; DatToHTML: boolean = false);
 const
 	GT	= '&gt;';
+	SN	= '0123456789';
 	//ŒŸõ‘Ώۂ̕¶Žš—ñŒS
 	TOKEN : array[0..5] of string = (GT+GT, GT, '„„', '„', '<a ', '<A ');
 var
 	i : integer;
 	s : string;
+	sw: boolean;
+	cm: boolean;
 	No: string;
+	oc	: string;
 	pos, pmin : integer;
 	j : integer;
+	ch : string;
 	db : boolean;
+	len : integer;
 	rink : string;
+
+	procedure getNumberString;
+	begin
+		while (j <= len) do begin
+			if (ByteType(s, j) = mbSingleByte) then begin
+				//1byte•¶Žš
+				ch := s[j];
+				Inc(j);
+				db := false;
+			end else begin
+				//2byte•¶Žš
+				ch := ZenToHan(Copy(s, j, 2));
+				Inc(j, 2);
+				db := true;
+			end;
+
+			if System.Pos(ch, SN) > 0 then begin
+				No := No + ch;
+			end else if (ch = '-') then begin
+				if sw then break;
+				if No = '' then break;
+				No := No + ch;
+				sw := true;
+			end else begin
+				break;
+			end;
+		end;
+	end;
+
 begin
 	//s ‚É–{•¶‚ð‘S•”“ü‚ê‚é
 	s	 :=	PRes.FBody;
@@ -482,22 +471,43 @@ begin
 			end;
 			// ƒŒƒXƒAƒ“ƒJ[‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç,‚ª‘±‚­ŒÀ‚èƒAƒ“ƒJ[‚Æ‚µ‚Ĉµ‚¤
 			if i <= 3 then begin
-                appendResAnchor(PRes, PResLink, DatToHTML, s );
+				No := '';
+				j := 1;
+				len := Length(s);
+				cm := checkComma(s, j, No);
+				len := Length(s);
+				while cm do begin
+					oc := '';
+					No := '';
+					sw := false;
+					db := false;
+					getNumberString;
+					//I’[‚܂ōs‚Á‚Ă̏I—¹‚©ƒ`ƒFƒbƒN
+					if j <= len then begin
+						if db then j := j - 2
+						else j := j - 1;
+					end;
+					addResAnchor(PRes, PResLink, DatToHTML, s, j, No);
+					j := 1;
+					len := Length(s);
+					cm := checkComma(s, j, No);
+				end;
 			end;
 		end else begin
 			//‰½‚©‚µ‚猩‚‚©‚Á‚½ƒpƒ^[ƒ“
 			j := Length(TOKEN[i]) + 1;
+			oc := '';
+			No := '';
+			sw := false;
 			db := false;
-        	No := getNumberString(s, j, db, Length(s) );
+			len := Length(s);
+			getNumberString;
 			//I’[‚܂ōs‚Á‚Ă̏I—¹‚©ƒ`ƒFƒbƒN
-			if j <= Length(s) then begin
+			if j <= len then begin
 				if db then j := j - 2
 				else j := j - 1;
 			end;
 			addResAnchor(PRes, PResLink, DatToHTML, s, j, No);
-
-            // , ‚ª‘±‚­ŒÀ‚背ƒXƒAƒ“ƒJ[‚Æ‚µ‚ďˆ—‚·‚é
-            appendResAnchor(PRes, PResLink, DatToHTML, s );
 		end;
 	end;
 	if Length(s) > 0 then begin
@@ -506,7 +516,8 @@ begin
 end;
 function THTMLCreate.checkComma(
 	const s : String;
-	var j : Integer
+	var j : Integer;
+	var No  : String
 ) : boolean;
 var
 	bType : TMbcsByteType;
@@ -521,38 +532,10 @@ begin
 				Inc(j)
 			else
 				Inc(j, 2);
+			No := '';
 		end;
 	end;
 end;
-function THTMLCreate.appendResAnchor(
-	PAddRes: PResRec; PResLink : PResLinkRec; dat : boolean;
-	var s : String) : string;
-var
-    No{, ch, oc}: String;
-    len, j : Integer;
-    cm, {sw,} db : Boolean;
-
-begin
-    No := '';
-    j := 1;
-    cm := checkComma(s, j);
-    len := Length(s);
-    while cm do begin
-        db := false;
-        No := getNumberString(s, j, db, len );
-
-        //I’[‚܂ōs‚Á‚Ă̏I—¹‚©ƒ`ƒFƒbƒN
-        if j <= len then begin
-            if db then j := j - 2
-            else j := j - 1;
-        end;
-        addResAnchor(PAddRes, PResLink, dat, s, j, No);
-        j := 1;
-        len := Length(s);
-        cm := checkComma(s, j);
-    end;
-end;
-
 function THTMLCreate.addResAnchor(
 	PAddRes: PResRec; PResLink : PResLinkRec; dat : boolean;
 	var s : String; j : Integer; const No: String) : string;
@@ -579,6 +562,186 @@ begin
 	Delete(s, 1, j - 1);
 end;
 
+(*************************************************************************
+ *
+ * from HotZonu
+ *************************************************************************)
+function THTMLCreate.ConvRes(const Body, Bbs, Key,
+	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string;
+	DatToHTML: boolean = false): string;
+const
+	GT	= '&gt;';
+	SN	= '0123456789';
+	FORMAT_LINK = '<a href="../test/read.cgi?%s=%s&%s=%s&%s=%s&%s=%s&%s=%s" target="_blank">';
+	//ŒŸõ‘Ώۂ̕¶Žš—ñŒS
+	TOKEN : array[0..5] of string = (GT+GT, GT, '„„', '„', '<a ', '<A ');
+var
+	i : integer;
+	s : string;
+	sw: boolean;
+	cm: boolean;
+	No: string;
+	oc	: string;
+	pos, pmin : integer;
+	j : integer;
+	ch : string;
+	db : boolean;
+	len : integer;
+	rink : string;
+	function addResAnchor(const Left :string) : string;
+	var
+		st,et : string;
+	begin
+		//I’[‚܂ōs‚Á‚Ă̏I—¹‚©ƒ`ƒFƒbƒN
+		if j <= len then begin
+			if db then j := j - 2
+			else j := j - 1;
+		end;
+		//‰½‚à”Žš‚ªŒ©‚‚©‚ç‚È‚¢‚Æ‚«
+		if No = '' then begin
+			Result := Left + Copy(s, 1, j - 1);
+		end else begin
+			separateNumber(st, et, No, '-');
+
+			if not DatToHTML then begin
+				Result := Left + Format(FORMAT_LINK,
+							[ParamBBS, Bbs, ParamKey, Key, ParamStart, st, ParamTo, et, ParamNoFirst, ParamTrue]);
+			end else begin
+				Result := Left + Format('<a href="#%s">', [st]);
+			end;
+			Result := Result + Copy(s, 1, j - 1) + '</a>';
+		end;
+		Delete(s, 1, j - 1);
+	end;
+
+	procedure getNumberString;
+	begin
+		while (j <= len) do begin
+			if (ByteType(s, j) = mbSingleByte) then begin
+				//1byte•¶Žš
+				ch := s[j];
+				Inc(j);
+				db := false;
+			end else begin
+				//2byte•¶Žš
+				ch := ZenToHan(Copy(s, j, 2));
+				Inc(j, 2);
+				db := true;
+			end;
+
+			if System.Pos(ch, SN) > 0 then begin
+				No := No + ch;
+			end else if (ch = '-') then begin
+				if sw then break;
+				if No = '' then break;
+				No := No + ch;
+				sw := true;
+			end else begin
+				break;
+			end;
+		end;
+	end;
+
+	function checkComma : boolean;
+	begin
+		j := 1;
+		len := Length(s);
+		if ((len > 0) and (s[j] = ',')) or ((len > 1) and (ZenToHan(Copy(s, j ,2)) = ','))  then begin
+			Result := true;
+			if (ByteType(s, j) = mbSingleByte) then
+				Inc(j)
+			else
+				Inc(j, 2);
+			No := '';
+		end else begin
+			Result := false;
+		end;
+	end;
+begin
+	//s ‚É–{•¶‚ð‘S•”“ü‚ê‚é
+	s	 :=	Body;
+	//Œ‹‰Ê‚ðƒNƒŠƒA
+	Result	 :=	'';
+
+	//
+	while Length(s) > 2 do begin
+		pmin := Length(s) + 1;
+		i	:= Length(token);
+		for j := 0 to 5 do begin
+			pos := AnsiPos(TOKEN[j], s);
+			if pos <> 0 then begin
+				if pos < pmin then begin
+					//‚Ç‚ê‚Ńqƒbƒg‚µ‚½‚©•Û‘¶
+					i := j;
+					//Å¬’l‚ðXV
+					pmin := pos;
+				end;
+			end;
+		end;
+
+		//ƒqƒbƒg‚µ‚½•¶Žš—ñ‚̈ê‚ÂŽè‘O‚Ü‚ÅŒ‹‰Ê‚ɃRƒs[
+		Result := Result + Copy(s, 1, pmin - 1);
+		Delete(s, 1, pmin - 1);
+
+		if i = 6 then begin
+			//ƒqƒbƒg‚È‚µ
+		end else if (i = 4) or (i = 5) then begin
+			//'<a ' or '<A' ‚Ńqƒbƒg '</a>' or '</A>' ‚܂ŃRƒs[
+			pmin := AnsiPos('</a>' , s);
+			pos := AnsiPos('</A>' , s);
+			if (pmin <> 0) and (pos <> 0) then begin
+				if (pmin > pos) then begin
+					pmin := pos;
+				end;
+			end else if (pos <> 0) then begin
+				pmin := pos;
+			end;
+			rink := Copy(s, 1, pmin + 3);
+			Result := Result + rink;
+			Delete(s, 1, pmin + 3);
+
+			pmin := Length(rink);
+			i	:= Length(TOKEN);
+			for j := 0 to 3 do begin
+				pos := AnsiPos(TOKEN[j], rink);
+				if pos <> 0 then begin
+					if pos < pmin then begin
+						//‚Ç‚ê‚Ńqƒbƒg‚µ‚½‚©•Û‘¶
+						i := j;
+						//Å¬’l‚ðXV
+						pmin := pos;
+					end;
+				end;
+			end;
+			// ƒŒƒXƒAƒ“ƒJ[‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç,‚ª‘±‚­ŒÀ‚èƒAƒ“ƒJ[‚Æ‚µ‚Ĉµ‚¤
+			if i <= 3 then begin
+				No := '';
+				cm := checkComma;
+				len := Length(s);
+				while cm do begin
+					oc := '';
+					No := '';
+					sw := false;
+					db := false;
+					getNumberString;
+					Result := addResAnchor(Result);
+					cm := checkComma;
+				end;
+			end;
+		end else begin
+			//‰½‚©‚µ‚猩‚‚©‚Á‚½ƒpƒ^[ƒ“
+			j := Length(TOKEN[i]) + 1;
+			oc := '';
+			No := '';
+			sw := false;
+			db := false;
+			len := Length(s);
+			getNumberString;
+			Result := addResAnchor(Result);
+		end;
+	end;
+	Result := Result + s;
+end;
 
 procedure THTMLCreate.ConvertResAnchor(PRes: PResRec);
 const
@@ -1468,8 +1631,7 @@ begin
 	finally
 		dirs.Free;
 	end;
-end;
-{!
+end;{!
 \brief datƒtƒ@ƒCƒ‹‚̈ꃉƒCƒ“‚𕪉ð
 \param Line datƒtƒ@ƒCƒ‹‚ð\¬‚·‚é 1 s
 \return     ƒŒƒXî•ñ

--- a/NewBoard.pas
+++ b/NewBoard.pas
@@ -61,7 +61,6 @@ var
 	Item: TNewBoardItem;
 	URL : String;
 	protocol, host, path, document, port, bookmark: String;
-    TabURLs: TStringList;
 begin
 	try
 		MessageMemo.Clear;
@@ -82,16 +81,12 @@ begin
 		if FAbort then
 			Exit;
 		if Item.FContent <> '' then begin
-            TabURLs := TStringList.Create;
-            try
-                GikoDM.GetTabURLs(TabURLs);
-	    		if (UpdateURL(Item.FContent)) then begin
-		    		GikoForm.ReloadBBS;
-			    end;
-                GikoDM.OpenURLs(TabURLs);
-            finally
-    			TabURLs.Free;
-            end;
+			GikoDM.TabsOpenAction.Tag := 1;
+			GikoDM.TabsSaveAction.Execute;
+			if (UpdateURL(Item.FContent)) then begin
+				GikoForm.ReloadBBS;
+			end;
+			GikoDM.TabsOpenAction.Tag := 0;
 		end else
 			MessageMemo.Lines.Add('ƒ_ƒEƒ“ƒ[ƒh‚ªŽ¸”s‚µ‚Ü‚µ‚½[' + IntToStr(Item.FResponseCode) + ']');
 	finally

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

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -112,12 +112,8 @@ LICENSE
 @IE7(beta)‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ƃŒƒXƒAƒ“ƒJ[‚̃|ƒbƒvƒAƒbƒv‚Å•\Ž¦‚³‚ê‚È‚¢•s‹ï‡‚̏C³
 @‚µ‚½‚ç‚ÎJBBS”XV‚ªA“®ì‚µ‚È‚¢•s‹ï‡‚̏C³
 @ƒ^ƒu‚ÌŽ©“®•Û‘¶‚ŁAƒ^ƒu‚ª‚È‚¢ó‘Ô‚à•Û‘¶‚·‚é‚悤‚ÉŽd—l‚ð•ÏX
-@”ˆꗗXV‚ð‚·‚é‚ƁAƒ^ƒu‚Ì•Û‘¶ƒtƒ@ƒCƒ‹‚ªXV‚³‚ê‚é•s‹ï‡‚̏C³
 @„‰ñ—\–ñ–¼‚̕ύX‚ª”½‰f‚³‚ê‚È‚¢•s‹ï‡‚̏C³
 @—š—ðíœ‚É”º‚¤•s‹ï‡‚̏C³
-@ƒJƒ“ƒ}‚ŘA‘±‚·‚郌ƒXƒAƒ“ƒJ[‚ɃŠƒ“ƒN‚ªÝ’肳‚ê‚È‚¢•s‹ï‡‚̏C³
-@
-
 
 2006/06/18
   Version ÊÞÀ52