コミット: a6195bc646f63a1b3a8a75a8133ce19c2a7f5dbb - gikonavi (git)

ギコナビ

コミットメタ情報

• リビジョン: a6195bc646f63a1b3a8a75a8133ce19c2a7f5dbb (tree)
• 日時: 2005-12-28 02:12:57
• 作者: cvs2git <cvs2git>
• コミッター: cvs2git

ログメッセージ

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

変更サマリ

• modified: AbonUnit.pas
• modified: BoardGroup.pas
• modified: Editor.dfm
• modified: Editor.pas
• modified: ExternalThreadItem.pas
• modified: Favorite.pas
• modified: Gesture.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• delete: GikoMessage.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• modified: ItemDownload.pas
• modified: KeySetting.pas
• modified: KuroutSetting.pas
• modified: ListViewUtils.pas
• modified: MojuUtils.pas
• modified: NewBoard.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Setting.pas
• modified: gikoNavi.dpr
• modified: gikoNavi.res
• delete: readme/language.ini
• modified: readme/readme.txt

差分

--- a/AbonUnit.pas
+++ b/AbonUnit.pas
@@ -374,6 +374,7 @@ var
 	pos : Integer;
 	buftoken : String;
 begin
+	pos := 0;
 	bufstl := TStringList.Create;
 	try
 		if Length(argline) > 0 then begin

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -90,7 +90,6 @@ type
 		property NodeExpand: Boolean read FExpand write FExpand;
 	end;
 
-	
 	// ”Â(ƒXƒŒƒbƒh URL ‚̃ŠƒXƒg)
 //	TBoard = class(THashedStringList)
 	TBoard = class(TStringList)
@@ -459,11 +458,10 @@ function	BBSsFindThreadFromURL(
 ) : TThreadItem;
 var
 	board			: TBoard;
-	tmpThread		: TThreadItem;
 	boardURL	: string;
 	protocol, host, path, document, port, bookmark : string;
 	BBSID, BBSKey : string;
-	i, bi : Integer;
+//	i : Integer;
 begin
 
 	boardURL	:= GikoSys.GetThreadURL2BoardURL( inURL );
@@ -477,26 +475,6 @@ begin
 			GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark );
 			GikoSys.Parse2chURL( inURL, path, document, BBSID, BBSKey );
 			Result := board.FindThreadFromFileName(BBSKey + '.dat');
-		end else if (Result = nil) and not (board.Is2ch) then begin
-		//ƒvƒ‰ƒOƒCƒ“Œn‚Ì’TõiŽå‚ÉURL‚ª“r’†‚ŕύX‚É‚È‚Á‚½—Þ)
-			try
-				bi := Length(BoardGroups) - 1;
-				for i := 1 to bi do begin
-					if (BoardGroups[i].BoardPlugIn <> nil) and (Assigned(Pointer(BoardGroups[i].BoardPlugIn.Module))) then begin
-						if BoardGroups[i].BoardPlugIn.AcceptURL( inURL ) = atThread then begin
-							tmpThread		:= TThreadItem.Create( BoardGroups[i].BoardPlugIn, Board, inURL );
-							if not board.IsThreadDatRead then begin
-								GikoSys.ReadSubjectFile( board );
-							end;
-							Result := Board.FindThreadFromFileName( tmpThread.FileName );
-							tmpThread.Free;
-							Break;
-						end;
-					end;
-				end;
-			except
-            	Result := nil;
-			end;
 		end;
 	end;
 
@@ -1905,14 +1883,8 @@ procedure TThreadItem.SetUnRead(b: Boolean);
 begin
 	if FUnRead = b then Exit;
 	FUnRead := b;
-	if FUpdate and (ParentBoard <> nil) then begin
+	if FUpdate and (ParentBoard <> nil) then
 		ParentBoard.FModified := True;
-		if FUnRead then begin
-			ParentBoard.UnRead := ParentBoard.UnRead + 1;
-		end else begin
-            ParentBoard.UnRead := ParentBoard.UnRead - 1;
-		end;
-	end;
 end;
 
 procedure TThreadItem.SetScrollTop(i: Integer);

--- a/Editor.dfm
+++ b/Editor.dfm
@@ -106,7 +106,7 @@ object EditorForm: TEditorForm
           Width = 149
           Height = 20
           DropDownCount = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 0
         end
         object MailComboBox: TComboBox
@@ -115,7 +115,7 @@ object EditorForm: TEditorForm
           Width = 149
           Height = 20
           DropDownCount = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 1
           OnChange = MailComboBoxChange
         end
@@ -358,12 +358,6 @@ object EditorForm: TEditorForm
       object N01: TMenuItem
         Caption = '-'
       end
-      object Samba241: TMenuItem
-        Action = UpdateSambaAction
-      end
-      object N7: TMenuItem
-        Caption = '-'
-      end
       object CloseMenu: TMenuItem
         Action = CloseAction
       end
@@ -1726,13 +1720,6 @@ object EditorForm: TEditorForm
       OnExecute = BeLogInOutEActionExecute
       OnUpdate = BeLogInOutEActionUpdate
     end
-    object UpdateSambaAction: TAction
-      Category = #12501#12449#12452#12523
-      Caption = 'Samba24'#12398#35373#23450#20516#12434#26356#26032#12377#12427
-      Hint = 'Samba24'#12398#35373#23450#20516#12434#26356#26032#12377#12427
-      OnExecute = UpdateSambaActionExecute
-      OnUpdate = UpdateSambaActionUpdate
-    end
   end
   object IdLogDebug: TIdLogDebug
     OnReceive = IdLogDebugReceive

--- a/Editor.pas
+++ b/Editor.pas
@@ -124,9 +124,6 @@ type
     SaveNameMailAction: TAction;
     ToolButton7: TToolButton;
     BeLogInOutEAction: TAction;
-    UpdateSambaAction: TAction;
-    Samba241: TMenuItem;
-    N7: TMenuItem;
 
 		procedure EditorPageChange(Sender: TObject);
 		procedure FormCreate(Sender: TObject);
@@ -179,8 +176,6 @@ type
     procedure SaveNameMailActionExecute(Sender: TObject);
     procedure BeLogInOutEActionExecute(Sender: TObject);
     procedure BeLogInOutEActionUpdate(Sender: TObject);
-    procedure UpdateSambaActionUpdate(Sender: TObject);
-    procedure UpdateSambaActionExecute(Sender: TObject);
 	private
 		FThreadItem: TThreadItem;
 		FBoard: TBoard;
@@ -210,18 +205,24 @@ type
 		procedure SaveSendFile;
 		procedure SetContent(Content: string; ABrowser: TWebBrowser);
 		function GetResultType(ResponseText: string): TGikoResultType;
+
+		procedure ReadSambaTime(const AHost: string); overload;
+		procedure WriteSambaTime(const AHost: string; ATime: TDateTime); overload;
+		function ReadSettingTime(const AHost: string): Integer; overload;
+		function CheckSambaTime(const AHost: string; ATime: TDateTime): Boolean; overload;
+		procedure SetSamba24(AURL: string); overload;
+
 		//Samba‚ÌŽžŠÔ‚ð“ǂݍž‚Þ
-		procedure ReadSambaTime(const AHost: string);
+		procedure ReadSambaTime(); overload;
 		//Samba‚ÉŽžŠÔ‚ð‘‚«ž‚Þ
-		procedure WriteSambaTime(const AHost: string; ATime: TDateTime);
+		procedure WriteSambaTime(ATime: TDateTime); overload;
 		//Samba‚̐ݒè’l‚ð“ǂݍž‚Þ
-		function ReadSettingTime(const AHost: string): Integer;
+		function ReadSettingTime(): Integer ; overload;
 		//Samba‚Ɉø‚Á‚©‚©‚é‚©ŒŸ¸‚·‚é
-		function CheckSambaTime(const AHost: string; ATime: TDateTime): Boolean;
+		function CheckSambaTime(ATime: TDateTime): Boolean; overload;
 		//Samba‚̐ݒè’l‚ð‘‚«ž‚Þ
-		procedure SetSamba24(AURL: string);
-		//Samba‚̐ݒè’l‚ðXV‚·‚é
-		procedure UpdateSamba(const AHost: String; value: Integer);
+		procedure SetSamba24(); overload;
+
 		/// ˆø—p•„‚̎擾
 		function GetOEIndentChar : string;
 		/// –{•¶‚̎擾
@@ -258,7 +259,7 @@ type
 implementation
 
 uses
-	Giko, ItemDownload, MojuUtils, IdGlobal, GikoMessage;
+	Giko, ItemDownload, MojuUtils, IdGlobal;
 const
 	CAPTION_NAME_NEW: string = 'ƒMƒRƒiƒr ƒXƒŒ—§‚ăGƒfƒBƒ^';
 	CAPTION_NAME_RES: string = 'ƒMƒRƒiƒr ƒŒƒXƒGƒfƒBƒ^';
@@ -967,7 +968,7 @@ begin
 				        if MsgResult = IDNO  then begin
 					        Board.SPID := '';
 					        Board.PON := '';
-							FWork := false;
+					        FWork := false;
 					        EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
 					        DrawMenuBar(Handle);
 					        Exit;
@@ -976,7 +977,7 @@ begin
                         end;
 
 			if ResultType = grtOK then begin
-				if (GikoSys.Setting.UseSamba) and  (Timer1.Enabled) then
+                if GikoSys.Setting.UseSamba then
 					WriteSambaTime(FHost, Now());
 				State := gdsComplete;
 			end else if ResultType = grtCookie then begin
@@ -1045,8 +1046,8 @@ begin
 					Exit;
 				        end;
 			        end else begin
-                        if (GikoSys.Setting.UseSamba)  and  (Timer1.Enabled) then
-							WriteSambaTime(FHost, Now());
+                        if GikoSys.Setting.UseSamba then
+                    		WriteSambaTime(FHost, Now());
 				        State := gdsError;
 				        raise Exception.Create('');
 			        end;
@@ -1097,9 +1098,9 @@ begin
         GikoForm.PlaySound('ResEnd');
         SaveSendFile;
 		if FThreadItem = nil then
-			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmNewSure), nil, gmiOK)
+			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewSure)), nil, gmiOK)
 		else
-			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmNewRes), nil, gmiOK);
+			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewRes)), nil, gmiOK);
         Close;
         Exit;
     end;
@@ -1107,20 +1108,20 @@ begin
 		GikoForm.PlaySound('ResEnd');
 		SaveSendFile;
 		if FThreadItem = nil then
-			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmNewSure), nil, gmiOK)
+			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewSure)), nil, gmiOK)
 		else
-			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmNewRes), nil, gmiOK);
+			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewRes)), nil, gmiOK);
 		Close;
 	end else if State = gdsError then begin
 		if FThreadItem = nil then
-			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmNewSure), nil, gmiOK)
+			GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewSure)), nil, gmiOK)
 		else
-			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmNewRes), nil, gmiOK);
+			GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewRes)), nil, gmiOK);
 
 		EditorPage.ActivePage := PreviewTab;
 		SetContent(ResponseText, Browser);
 	end else if State = gdsAbort then begin
-		GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmAbort), nil, gmiSAD);
+        GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmAbort)), nil, gmiSAD);
 	end;
 end;
 
@@ -1279,13 +1280,13 @@ begin
 				if state = gdsComplete then begin
 					GikoForm.PlaySound('ResEnd');
 					SaveSendFile;
-					GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmNewSure), nil, gmiOK);
+                    GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewSure)), nil, gmiOK);
 					FWork := False;
 					Close;
 				end else if State = gdsError then begin
-					GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmSureError), nil, gmiNG);
+                    GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmSureError)), nil, gmiNG);
 				end else if State = gdsAbort then begin
-					GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.GetGikoMessage(gmAbort), nil, gmiNG);
+                    GikoForm.AddMessageList(FBoard.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmAbort)), nil, gmiNG);
 				end;
 			end else begin
 				// ƒŒƒX
@@ -1295,13 +1296,13 @@ begin
 				if state = gdsComplete then begin
 					GikoForm.PlaySound('ResEnd');
 					SaveSendFile;
-					GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmNewRes), nil, gmiOK);
-					FWork := False;
+                    GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmNewRes)), nil, gmiOK);
+                    FWork := False;
 					Close;
 				end else if State = gdsError then begin
-					GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmResError), nil, gmiOK);
+                    GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmResError)), nil, gmiOK);
 				end else if State = gdsAbort then begin
-                    GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.GetGikoMessage(gmAbort), nil, gmiOK);
+                    GikoForm.AddMessageList(FThreadItem.Title + ' ' + GikoSys.Setting.GetMessage(Ord(gmAbort)), nil, gmiOK);
 				end;
 			end;
 		end else begin
@@ -1596,8 +1597,6 @@ begin
 			ini.WriteInteger('Setting', AHost, 0);
 			ini.UpdateFile;
 		end;
-		//StatusBar‚É‚±‚ÌŽI‚Ì‹K’è’l‚ð•\Ž¦‚·‚é
-		StatusBar.Panels[2].Text := 'Samba24‹K’è’l' + IntToStr(Result);
 	finally
 		ini.Free;
 	end;
@@ -1633,7 +1632,8 @@ begin
 		Host := Copy(Host, 1, AnsiPos('.', Host) - 1);
 		FHost := Host;   //FHost=ŽI–¼
 		ReadSambaTime(FHost); //ˆÈ‘O‚̏‘‚«ž‚ÝŽžŠÔ‚ð“ǂݍž‚Þ
-		ReadSettingTime(FHost); //Samba‚̐ݒè‚ð“ǂݍž‚Þ
+		//StatusBar‚É‚±‚ÌŽI‚Ì‹K’è’l‚ð•\Ž¦‚·‚é
+		StatusBar.Panels[2].Text := 'Samba24‹K’è’l' + IntToStr(ReadSettingTime(FHost));
 	end;
 end;
 procedure TEditorForm.FormCloseQuery(Sender: TObject;
@@ -2098,8 +2098,8 @@ begin
 
 	if ABoard = nil then Exit;
 
-		URL := ABoard.GETHEADTXTFileName;
-		GikoSys.OpenBrowser(URL, gbtAuto);
+        URL := ABoard.GETHEADTXTFileName;
+        GikoSys.OpenBrowser(URL, gbtAuto);
 end;
 
 procedure TEditorForm.SaveNameMailActionExecute(Sender: TObject);
@@ -2112,8 +2112,8 @@ function TEditorForm.LFusianaGet(s: String): Boolean;
 var
 	i: Integer;
 begin
-		i := AnsiPos('fusianasan', s);
-		if (i > 0) then Result := True else Result := False;
+        i := AnsiPos('fusianasan', s);
+        if (i > 0) then Result := True else Result := False;
 end;
 
 procedure TEditorForm.BeLogInOutEActionExecute(Sender: TObject);
@@ -2166,49 +2166,101 @@ begin
 	end;
 end;
 
-//! Samba‚̐ݒè’l‚ðXV‚·‚é
-procedure TEditorForm.UpdateSamba(const AHost: String; value: Integer);
+//Samba‚ÌŽžŠÔ‚ð“ǂݍž‚Þ
+procedure TEditorForm.ReadSambaTime();
 var
 	ini :TMemIniFile;
+	skey: String;
+	board: TBoard;
+	tmp: string;
 begin
+	Timer1.Enabled := false; //Œo‰ß•b”•\Ž¦Timer‚ðOff‚É‚·‚éi‚±‚ꂪON‚Ì‚Æ‚«Samba24‘΍ôOnj
 	ini := TMemIniFile.Create(GikoSys.GetSambaFileName);
 	try
-		ini.WriteInteger('Setting', AHost, value);
-		ini.UpdateFile;
+		 //•¶Žš—ñ‚Å“Ç‚ÝŽæ‚Á‚āA•ÏŠ·ŠÖ”‚ÅTDateTime‚Ö
+		 if( FThreadItem <> nil ) then
+			board := FThreadItem.ParentBoard
+		 else
+			board := FBoard;
+
+		 if (board <> nil) then begin
+			//BBSID‚ƃzƒXƒg–¼‚ªˆê’v‚µ‚Ä‚¢‚½‚ç BBSID@ƒzƒXƒg–¼
+			if( board.BBSID = FHost ) then
+				skey := board.BBSID + '@' + FHost
+			else
+				skey := board.BBSID;
+
+			tmp := ini.ReadString('Send', skey, DateTimeToStr(ZERO_DATE));
+
+			//BBSID‚̃L[‚ª–³‚¢‚È‚çFHost‚ɐ؂è‘Ö‚¦‚Ä‚Ý‚é
+			if (tmp = DateTimeToStr(ZERO_DATE)) then begin
+				tmp := ini.ReadString('Send', FHost, DateTimeToStr(ZERO_DATE));
+			end;
+			FSambaTime := ConvertDateTimeString(tmp);
+		 end;
 	finally
 		ini.Free;
 	end;
+	FNow := Now();   //Œ»ÝŽžŠÔ‚ðŽæ“¾iTimer•\Ž¦—p‚ŁACheck‚·‚é‚Æ‚«‚͍ĂÑNow()‚ðŒÄ‚ԁj
+	Timer1.Enabled := true; //Œo‰ß•b”•\Ž¦Timer‚ðOn‚É‚·‚éi‚±‚ꂪON‚Ì‚Æ‚«Samba24‘΍ôOnj
 end;
 
-//! ƒTƒ“ƒoXV‚̃AƒNƒVƒ‡ƒ“‚ÌUpdateƒCƒxƒ“ƒg@ŠÈ’P‚Ì‚½‚߃^ƒCƒ}[‚Æ“¯‚¶‚É‚µ‚Ä‚¨‚­
-procedure TEditorForm.UpdateSambaActionUpdate(Sender: TObject);
+//Samba‚ÉŽžŠÔ‚ð‘‚«ž‚Þ
+procedure TEditorForm.WriteSambaTime(ATime: TDateTime);
+var
+	ini :TMemIniFile;
 begin
-	UpdateSambaAction.Enabled := Timer1.Enabled;
+	ini := TMemIniFile.Create(GikoSys.GetSambaFileName);
+	try
+//		ini.WriteDateTime('Send', AHost, ATime);
+		ini.UpdateFile;
+	finally
+		ini.Free;
+	end;
 end;
-
-//! ƒTƒ“ƒoXVƒAƒNƒVƒ‡ƒ“
-procedure TEditorForm.UpdateSambaActionExecute(Sender: TObject);
+//Samba‚̐ݒè’l‚ð“ǂݍž‚Þ
+function TEditorForm.ReadSettingTime(): Integer ;
 var
-	input : String;
-	i : Integer;
-begin
-	if InputQuery('Samba24Ý’è’lXV', 'V‚µ‚¢Ý’è’l‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢', input) then begin
-        input := ZenToHan(input);
-		if GikoSys.IsNumeric(input) then begin
-			UpdateSamba(FHost, StrToInt(input));
-			//‘S‚ẴtƒH[ƒ€‚©‚çA“¯‚¶ƒzƒXƒg‚̃GƒfƒBƒ^‚ɓǂݍž‚ÝŽwŽ¦
-			for i := 0 to Screen.FormCount - 1 do begin
-				if Screen.Forms[i] is TEditorForm then begin
-					if FHost = TEditorForm(Screen.Forms[i]).FHost then begin
-						TEditorForm(Screen.Forms[i]).ReadSettingTime(FHost);
-					end;
-				end;
+	ini :TMemIniFile;
+	skey: String;
+	board: TBoard;
+begin
+	ini := TMemIniFile.Create(GikoSys.GetSambaFileName);
+	try
+		 if( FThreadItem <> nil ) then
+			board := FThreadItem.ParentBoard
+		 else
+			board := FBoard;
+
+		 if (board <> nil) then begin
+			//BBSID‚ƃzƒXƒg–¼‚ªˆê’v‚µ‚Ä‚¢‚½‚ç BBSID@ƒzƒXƒg–¼
+			if( board.BBSID = FHost ) then
+				skey := board.BBSID + '@' + FHost
+			else
+				skey := board.BBSID;
+
+			Result := ini.ReadInteger('Setting', skey, -1);
+			//BBSID‚̃L[‚ª–³‚¢‚È‚çFHost‚ðŽg‚¤
+			if( Result = -1 ) then
+				Result := ini.ReadInteger('Setting', FHost, -1);
+
+			//‹K’è’l‚ªÝ’肳‚ê‚Ä‚¢‚È‚¢‚Æ‚«‚́Aƒtƒ@ƒCƒ‹‚ɏ‘‚«‚½‚·B
+			if Result = -1 then begin
+				ini.WriteInteger('Setting', FHost, 0);
+				ini.UpdateFile;
 			end;
-		end else begin
-			ShowMessage('”’l‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢');
-			UpdateSambaActionExecute(Sender);
-		end;
+		 end;
+	finally
+		ini.Free;
 	end;
 end;
+//Samba‚Ɉø‚Á‚©‚©‚é‚©ŒŸ¸‚·‚é
+function TEditorForm.CheckSambaTime(ATime: TDateTime): Boolean;
+begin
+end;
+//Samba‚̐ݒè’l‚ð‘‚«ž‚Þ
+procedure TEditorForm.SetSamba24();
+begin
+end;
 
 end.

--- a/ExternalThreadItem.pas
+++ b/ExternalThreadItem.pas
@@ -290,35 +290,32 @@ var
 	threadItem : TThreadItem;
 	res : TResRec;
 	no : string;
-	resLink : TResLinkRec;
 begin
 
 	threadItem	:= TThreadItem( inInstance );
 	// ˆø”‚𕪉ð
-	THTMLCreate.DivideStrLine( string( inDatRes ) , @res);
-	if AnsiCompareStr( string( inDatRes ) , '' ) <> 0 then begin
-		res.FBody		:= THTMLCreate.DeleteLink(res.FBody);
-		resLink.FBbs	:= threadItem.ParentBoard.BBSID;
-		resLink.FKey	:= ChangeFileExt( threadItem.FileName, '' );
-		HTMLCreater.AddAnchorTag( @res );
-		HTMLCreater.ConvRes( @res, @resLink );
-
-		no					:= IntToStr( inResNo );
-
-		try
-			if GikoSys.Setting.UseSkin then begin
-				// ƒXƒLƒ“
-				if inIsNew then
+	res					:= DivideStrLine( string( inDatRes ) );
+    if AnsiCompareStr( string( inDatRes ) , '' ) <> 0 then begin
+		res.FBody		:= GikoSys.DeleteLink(res.FBody);
+		res.FBody		:= HTMLCreater.AddAnchorTag( res.FBody );
+		res.FBody		:= HTMLCreater.ConvRes( res.FBody, threadItem.ParentBoard.BBSID, ChangeFileExt( threadItem.FileName, '' ), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
+
+        no					:= IntToStr( inResNo );
+
+        try
+            if GikoSys.Setting.UseSkin then begin
+                // ƒXƒLƒ“
+                if inIsNew then
 					Result := CreateResultString( HTMLCreater.SkinedRes(
 						HTMLCreater.LoadFromSkin(
                             GikoSys.Setting.GetSkinNewResFileName, threadItem, threadItem.Size
-						), @res, no
+                        ), res, no
                     ) )
                 else
 					Result := CreateResultString( HTMLCreater.SkinedRes(
 						HTMLCreater.LoadFromSkin(
                             GikoSys.Setting.GetSkinResFileName, threadItem, threadItem.Size
-                        ), @res, no
+                        ), res, no
                     ) );
             end else if GikoSys.Setting.UseCSS then begin
                 // CSS

--- a/Favorite.pas
+++ b/Favorite.pas
@@ -4,44 +4,42 @@ interface
 
 uses
 	Messages, SysUtils, Classes, Contnrs, ComCtrls, {HttpApp,} YofUtils,
-	GikoSystem{, XMLIntf, XMLDoc}, GikoXMLDoc, BoardGroup, windows;
+	GikoSystem{, XMLIntf, XMLDoc}, GikoXMLDoc, BoardGroup, windows,
+    MojuUtils;
 	{SAX, SAXHelpers, SAXComps, SAXKW;}
 
 type
 	TFavoriteFolder = class
 	end;
 
-	TFavoriteItem = class(TObject)
+	TFavoriteBoardItem = class
 	private
+		FItem				: TBoard;
 		FURL				: string;
 		FTitle			: string;
-	public
-		function GetItemTitle : string; virtual;abstract;
-		property URL				: string	read FURL write FURL;	// Item ‚ªŽæ“¾‚Å‚«‚È‚­‚Ä‚à URL ‚͏í‚É•ÛŽ‚³‚ê‚é
-		property Title			: string	read FTitle write FTitle;
-	end;
-	TFavoriteBoardItem = class(TFavoriteItem)
-	private
-		FItem				: TBoard;
 		function	GetItem : TBoard;
 	public
 		constructor Create( inURL : string; inTitle : string = ''; inItem : TBoard = nil );
 		constructor CreateWithItem( inItem : TBoard );
-		destructor Destory;
-		function GetItemTitle : string; override;
+        destructor Destory;
 		property Item				: TBoard	read GetItem write FItem;
+		property URL				: string	read FURL write FURL;	// Item ‚ªŽæ“¾‚Å‚«‚È‚­‚Ä‚à URL ‚͏í‚É•ÛŽ‚³‚ê‚é
+		property Title			: string	read FTitle write FTitle;
 	end;
 
-	TFavoriteThreadItem = class(TFavoriteItem)
+	TFavoriteThreadItem = class
 	private
 		FItem				: TThreadItem;
+		FURL				: string;
+		FTitle			: string;
 		function	GetItem : TThreadItem;
 	public
 		constructor Create( inURL : string; inTitle : string = ''; inItem : TThreadItem = nil );
 		constructor CreateWithItem( inItem : TThreadItem );
-		destructor Destory;
-		function GetItemTitle : string; override;
+        destructor Destory;
 		property Item				: TThreadItem	read GetItem write FItem;
+		property URL				: string			read FURL write FURL;	// Item ‚ªŽæ“¾‚Å‚«‚È‚­‚Ä‚à URL ‚͏í‚É•ÛŽ‚³‚ê‚é
+		property Title			: string			read FTitle write FTitle;
 	end;
 
 	TFavoriteDM = class(TDataModule)
@@ -50,7 +48,7 @@ type
 		{ Private éŒ¾ }
 		FStack: TStack;
 		FTreeView: TTreeView;
-		FModified: boolean;
+
 		procedure ReadNode(Node: IXMLNode);
 		procedure AddSaveString(Node: TTreeNode; SaveList: TStringList);
 //		procedure AddSaveString(Node: TTreeNode; XMLNode: IXMLNode);
@@ -61,15 +59,14 @@ type
 //		procedure SAXCharacters(Sender: TObject; const PCh: SAXString);
 	public
 		{ Public éŒ¾ }
-		procedure Clear;
-		function GetFavoriteFilePath() : String;
-		function SaveFavoriteFile(FileName: String) : Boolean;
+        procedure Clear;
+				function GetFavoriteFilePath() : String;
+				function SaveFavoriteFile(FileName: String) : Boolean;
 		procedure SetFavTreeView(TreeView: TTreeView);
 		procedure ReadFavorite;
 		procedure WriteFavorite;
-		procedure URLReplace(oldURLs: TStringList; newURLs: TStringList);
+        procedure URLReplace(oldURLs: TStringList; newURLs: TStringList);
 		property TreeView: TTreeView read FTreeView;
-		property Modified: boolean read FModified write FModified;
 	end;
 
 var
@@ -79,7 +76,7 @@ const
 
 implementation
 
-uses	ExternalBoardManager, ExternalBoardPlugInMain,  MojuUtils;
+uses	ExternalBoardManager, ExternalBoardPlugInMain;
 
 const
 	FAVORITE_ROOT_NAME = '‚¨‹C‚É“ü‚è';
@@ -116,30 +113,15 @@ begin
 		FItem.Free;
 	inherited;
 end;
-//! •ÛŽ‚µ‚Ä‚¢‚锂̃^ƒCƒgƒ‹‚ð•Ô‚·
-function TFavoriteBoardItem.GetItemTitle : string;
-begin
-	Result := '';
-	//ˆê“x‚à”‚ðŠJ‚¢‚Ä‚¢‚È‚¢‚Æ‚«i‹N“®Žž‚ɃLƒƒƒrƒlƒbƒg‚ð‚¨‹C‚É“ü‚è‚Æ‚©j
-	//‚Ì‚Æ‚«‚ÉFItem‚ªnil‚È‚Ì‚Å‚»‚Ì‚Æ‚«‚ׂ͂Á‚ÆŒŸõ
-	if FItem = nil then begin
-		FItem := BBSsFindBoardFromURL(URL);
-	end;
-	if FItem <> nil then begin
-		try
-			if not FItem.IsThreadDatRead then begin
-				GikoSys.ReadSubjectFile(FItem);
-			end;
-		except
-		end;
-		Result := FItem.Title;
-	end;
-end;
 function	TFavoriteBoardItem.GetItem : TBoard;
 var
 	protocol, host, path, document, port, bookmark : string;
-	BBSID	: string;
-	tmpURL	: string;
+	BBSID{, BBSKey}	: string;
+	tmpURL{, boardURL}		: string;
+//	category : TCategory;
+	{i, bi: Integer;}
+	{tmpThread: TThreadItem;}
+	{tmpBoard: TBoard;}
 begin
 
 	if FItem = nil then begin
@@ -194,17 +176,6 @@ begin
     	FItem.Free;
     inherited;
 end;
-//! •ÛŽ‚µ‚Ä‚¢‚éƒXƒŒ‚̃^ƒCƒgƒ‹‚ð•Ô‚·
-function TFavoriteThreadItem.GetItemTitle : string;
-begin
-	Result := '';
-	if FItem = nil then begin
-		FItem := BBSsFindThreadFromURL(URL);
-	end;
-	if FItem <> nil then begin
-		Result := FItem.Title;
-	end;
-end;
 
 function	TFavoriteThreadItem.GetItem : TThreadItem;
 var
@@ -288,8 +259,7 @@ begin
 	end;
 		TreeView.Items.Clear;
 		TreeView.Items.EndUpdate;
-
-    FavoriteDM.Modified := true;
+    //TreeView.Free;
 end;
 
 procedure TFavoriteDM.SetFavTreeView(TreeView: TTreeView);
@@ -307,7 +277,7 @@ var
 	FavFolder: TFavoriteFolder;
 	LinkExists: Boolean;
 begin
-	FavoriteDM.Modified := true;
+
 	FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
 
 	FavFolder := TFavoriteFolder.Create;
@@ -479,7 +449,6 @@ var
 	SaveList: TStringList;
 
 begin
-    FavoriteDM.Modified := true;
 	FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
 	if FileExists(FileName) then begin
 		tmpFileName := GikoSys.GetConfigDir + '~' + FAVORITE_FILE_NAME;
@@ -491,10 +460,7 @@ begin
 	try
 		SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
 		SaveList.Add('<favorite>');
-		try
-			AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
-		except
-		end;
+		AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
 		SaveList.Add('</favorite>');
 		SaveList.SaveToFile(FileName);
 	finally

--- a/Gesture.pas
+++ b/Gesture.pas
@@ -130,6 +130,10 @@ begin
 					FLastTime := GetTickCount;
 					FLastPoint := Point(x, y);
 				end;
+				//ƒ}ƒEƒX‚ðÄÝ’è
+				if (hwnd <> 0) and (hwnd <> FHandle) then
+					SetCapture(hwnd);
+				
 				Result := True;
 			end;
 		end;
@@ -139,7 +143,7 @@ begin
 				FLastTime := 0;
 				FLastPoint := Point(x, y);
 				FStartPoint := Point(x, y);
-				Result := True;
+				CheckAction := True;
 				SetCapture(FHandle);
 			end;
 		end;

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 363
-  Top = 92
+  Left = 332
+  Top = 101
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -39,9 +39,6 @@ object GikoForm: TGikoForm
         Width = 500
       end
       item
-        Width = 80
-      end
-      item
         Width = 50
       end>
     SimplePanel = False
@@ -98,6 +95,7 @@ object GikoForm: TGikoForm
           Height = 167
           BorderStyle = bsNone
           ChangeDelay = 50
+          DragMode = dmAutomatic
           HideSelection = False
           Images = ItemIcon16
           Indent = 19
@@ -106,12 +104,16 @@ object GikoForm: TGikoForm
           RightClickSelect = True
           ShowRoot = False
           TabOrder = 0
+          OnClick = TreeViewClick
           OnCollapsed = TreeViewCollapsed
+          OnCollapsing = TreeViewCollapsing
           OnCustomDraw = TreeViewCustomDraw
           OnCustomDrawItem = TreeViewCustomDrawItem
+          OnDblClick = TreeViewDblClick
+          OnExpanding = TreeViewExpanding
           OnExpanded = TreeViewExpanded
           OnKeyDown = TreeViewKeyDown
-          OnMouseDown = TreeViewMouseDown
+          OnMouseUp = TreeViewMouseUp
         end
         object Panel3: TPanel
           Left = 0
@@ -226,13 +228,18 @@ object GikoForm: TGikoForm
           RightClickSelect = True
           ShowRoot = False
           TabOrder = 3
+          OnClick = FavoriteTreeViewClick
+          OnCollapsing = FavoriteTreeViewCollapsing
+          OnDblClick = FavoriteTreeViewDblClick
           OnDragDrop = FavoriteTreeViewDragDrop
           OnDragOver = FavoriteTreeViewDragOver
           OnEdited = FavoriteTreeViewEdited
           OnEditing = FavoriteTreeViewEditing
           OnEndDrag = FavoriteTreeViewEndDrag
+          OnExpanding = FavoriteTreeViewExpanding
           OnKeyDown = FavoriteTreeViewKeyDown
           OnMouseDown = FavoriteTreeViewMouseDown
+          OnMouseUp = FavoriteTreeViewMouseUp
         end
         object FavoriteToolBar: TToolBar
           Left = 0

--- a/Giko.pas
+++ b/Giko.pas
@@ -20,10 +20,6 @@ uses
 	ExternalBoardPlugInMain, StdActns, Variants, ExtActns,IdTCPConnection,
 	IdBaseComponent, IdTCPClient, AppEvnts, BrowserRecord;
 
-const
-	NGWORDNAME_PANEL = 3;
-	THREADSIZE_PANEL = 2;
-	
 type
 	TGikoTreeType = (gttNone, gtt2ch, gttHistory, gttFavorite);
 	TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
@@ -358,7 +354,7 @@ type
 	N63: TMenuItem;
     N64: TMenuItem;
     dummy1: TMenuItem;
-	TreeSelectLogDeletePopupMenu: TMenuItem;
+    TreeSelectLogDeletePopupMenu: TMenuItem;
 	N65: TMenuItem;
     BBSSelectPopupMenu: TPopupMenu;
 		PlugInMenu: TMenuItem;
@@ -378,7 +374,7 @@ type
     ResRangeKokoPMenuItem: TMenuItem;
     ResRangeNewPMenuItem: TMenuItem;
     ResRangeAllPMenuItem: TMenuItem;
-	BrowsBoradHeadAction1: TMenuItem;
+    BrowsBoradHeadAction1: TMenuItem;
     ThreadRangePopupMenu: TPopupMenu;
     A15: TMenuItem;
     L8: TMenuItem;
@@ -398,7 +394,7 @@ type
     N73: TMenuItem;
     SelectComboBoxPanel: TPanel;
     SelectComboBoxSplitter: TImage;
-	ToolButton1: TToolButton;
+    ToolButton1: TToolButton;
     N74: TMenuItem;
     WikiFAQ: TMenuItem;
     GikoApplicationEvents: TApplicationEvents;
@@ -423,6 +419,7 @@ type
 		procedure TreeViewCustomDrawItem(Sender: TCustomTreeView;
 			Node: TTreeNode; State: TCustomDrawState; var DefaultDraw: Boolean);
 		procedure TreeViewExpanded(Sender: TObject; Node: TTreeNode);
+		procedure TreeViewDblClick(Sender: TObject);
 		procedure ListViewCustomDraw(Sender: TCustomListView;
 			const ARect: TRect; var DefaultDraw: Boolean);
 		procedure ListViewMouseDown(Sender: TObject; Button: TMouseButton;
@@ -494,6 +491,7 @@ type
 		procedure FavoriteTreeViewKeyDown(Sender: TObject; var Key: Word;
 			Shift: TShiftState);
 		procedure FavoriteTreePopupMenuPopup(Sender: TObject);
+		procedure FavoriteTreeViewDblClick(Sender: TObject);
 		procedure LinkToolBarDragDrop(Sender, Source: TObject; X, Y: Integer);
 		procedure BrowserTabMouseUp(Sender: TObject; Button: TMouseButton;
 			Shift: TShiftState; X, Y: Integer);
@@ -512,12 +510,15 @@ type
       var Handled: Boolean);
     procedure BrowserTabPopupMenuPopup(Sender: TObject);
     procedure BrowserTabResize(Sender: TObject);
+	procedure TreeViewClick(Sender: TObject);
     procedure TreeViewKeyDown(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure FavoriteTreeViewMouseDown(Sender: TObject;
 			Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure MessagePanelResize(Sender: TObject);
 		procedure OnResized;
+    procedure FavoriteTreeViewMouseUp(Sender: TObject;
+	  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 	procedure SelectTimerTimer(Sender: TObject);
 		procedure ListViewColumnRightClick(Sender: TObject;
       Column: TListColumn; Point: TPoint);
@@ -533,16 +534,27 @@ type
 	  Shift: TShiftState);
     procedure FavoriteTreeViewEditing(Sender: TObject; Node: TTreeNode;
       var AllowEdit: Boolean);
-	procedure CabinetCloseSpeedButtonClick(Sender: TObject);
+    procedure CabinetCloseSpeedButtonClick(Sender: TObject);
     procedure FavoriteArrangeToolButtonClick(Sender: TObject);
     procedure GikoApplicationEventsMessage(var Msg: tagMSG;
 	  var Handled: Boolean);
     procedure GikoApplicationEventsDeactivate(Sender: TObject);
     procedure GikoApplicationEventsException(Sender: TObject; E: Exception);
-    procedure TreeViewMouseDown(Sender: TObject; Button: TMouseButton;
+    procedure FavoriteTreeViewClick(Sender: TObject);
+    procedure FavoriteTreeViewCollapsing(Sender: TObject; Node: TTreeNode;
+      var AllowCollapse: Boolean);
+    procedure FavoriteTreeViewExpanding(Sender: TObject; Node: TTreeNode;
+      var AllowExpansion: Boolean);
+    procedure TreeViewCollapsing(Sender: TObject; Node: TTreeNode;
+      var AllowCollapse: Boolean);
+    procedure TreeViewExpanding(Sender: TObject; Node: TTreeNode;
+      var AllowExpansion: Boolean);
+    procedure TreeViewMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
 	private
 		{ Private éŒ¾ }
+		FSortIndex: Integer;
+		FSortOrder: Boolean;
 		FEnabledCloseButton: Boolean;
 		FClickNode: TTreeNode;
 		FHttpState: Boolean;
@@ -588,7 +600,6 @@ type
 		FIsHandledWheel	: Boolean;			///< Šù‚Ɏ󂯎æ‚Á‚½ WM_MOUSEWHEEL ‚©‚Ç‚¤‚©
 				DiffComp: Boolean;                      //Add by Genyakun ƒXƒŒ‚ªXV‚³‚ꂽ‚Æ‚«‚ÉTrue‚É‚È‚é
 		FOrigenCaption: String;				//‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€•ÒWŽž‚̕ҏW‘O‚Ì•¶Žš—ñ
-        FPreviewBrowserRect: TRect;			///< ƒvƒŒƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ð‹L‰¯‚·‚é
 		procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
 		procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
 		procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -689,6 +700,8 @@ type
 		property ToolBarSettingSender : TToolBarSettingSenderType
 						 read FToolBarSettingSender write FToolBarSettingSender;
 		property ScreenCursor : TCursor read GetScreenCursor write SetScreenCursor;
+		property SortIndex: Integer read FSortIndex write FSortIndex;
+		property SortOrder: Boolean read FSortOrder write FSortOrder;
 		property ActiveBBS : TBBS read FActiveBBS write FActiveBBS;
 		property WorkCount: Integer read FWorkCount write FWorkCount;
 		procedure SetContent(inThread: TBrowserRecord);
@@ -820,17 +833,31 @@ uses
 	FavoriteArrange, AddressHistory, Preview, Gesture,
 	About, Option, Round, Splash, Sort, ListSelect, Imm,
 	NewBoard, MojuUtils, Clipbrd, GikoBayesian,Y_TextConverter,
-	HTMLCreate, ListViewUtils, GikoDataModule, GikoMessage;
+	HTMLCreate, ListViewUtils, GikoDataModule;
 
 const
+	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
 	BLANK_HTML: string = 'about:blank';
 	BROWSER_COUNT		= 5;	//ƒuƒ‰ƒEƒU‚̐”
 	//D&D臒l
 	DandD_THRESHOLD	= 5;	//D&D‚Ì臒lipixcel)
 	//ƒvƒŒƒrƒ…[ƒtƒ@ƒCƒ‹–¼
 	HTML_FILE_NAME 	= 'temp_preview.html';
+	//ƒXƒŒƒbƒhiž‚݃{ƒbƒNƒX
+	SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ';
+	SELECTCOMBOBOX_COLOR: TColor = clWindow;
+	//ƒc[ƒ‹ƒo[ƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_MAX 		= 16;		//‚‚³Å‘åƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_MIN 		= 17;		//‚‚³Å¬ƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_NORMAL = 18;		//‚‚³•W€ƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_MAX 		= 19;		//•Å‘åƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_MIN 		= 20;		//•Å¬ƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_NORMAL 	= 21;		//••W€ƒAƒCƒRƒ“
 	ITEM_ICON_THREADLOG1		= 6;		//ƒXƒŒƒAƒCƒRƒ“iƒƒO‚ ‚èj
 	ITEM_ICON_THREADLOG2		= 7;		//ƒXƒŒƒAƒCƒRƒ“iƒƒO‚ ‚èj
+	TOOL_ICON_FAV_FOLDER		= 30;		//‚¨‹C‚É“ü‚èƒtƒHƒ‹ƒ_ƒAƒCƒRƒ“
+	TOOL_ICON_FAV_BOARD			= 31;		//‚¨‹C‚É“ü‚蔃AƒCƒRƒ“
+	TOOL_ICON_FAV_THREAD		= 32;		//‚¨‹C‚É“ü‚èƒXƒŒƒAƒCƒRƒ“
 	//ƒƒbƒZ[ƒWID
 	USER_TREECLICK					= WM_USER + 2000;
 	USER_RESIZED            = WM_USER + 2001;
@@ -859,6 +886,7 @@ var
 	msg: string;
 	i: Integer;
 	wp: TWindowPlacement;
+	s: string;
 begin
 {$IFDEF DEBUG}
 	AllocConsole;
@@ -885,6 +913,7 @@ begin
 	Screen.Cursors[5] := LoadCursor(HInstance, 'GIKOHAND');
 
 	//ƒAƒhƒŒƒX—š—ð“ǂݍž‚Ý
+	//AddressHistoryDM.ReadHistory(AddressComboBox.Items, GikoSys.Setting.AddressHistoryCount);
 	AddressHistoryDM.ReadHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount);
 
 	EnabledCloseButton := True;
@@ -1047,36 +1076,36 @@ begin
 		case GikoSys.Setting.ListWidthState of
 			glsMax: begin
 				ViewPanel.Width := 1;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_NORMAL;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MIN;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
 			end;
 			glsMin: begin
 				ViewPanel.Width := GikoSys.Setting.ListWidth;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MAX;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_NORMAL;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
 			end;
 			else begin
 				ViewPanel.Width := GikoSys.Setting.ListWidth;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MAX;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MIN;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
 			end;
 		end;
 	end else begin
 		case GikoSys.Setting.ListHeightState of
 			glsMax: begin
 				ViewPanel.Height := 1;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_NORMAL;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MIN;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 			end;
 			glsMin: begin
 				ViewPanel.Height := GikoSys.Setting.ListHeight;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MAX;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_NORMAL;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
 			end;
 			else begin
 				ViewPanel.Height := GikoSys.Setting.ListHeight;
-				GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MAX;
-				GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MIN;
+				GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+				GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 			end;
 		end;
 	end;
@@ -1127,7 +1156,7 @@ begin
 	end;
 
 	//ƒL[Ý’è“ǂݍž‚Ý
-	GikoSys.LoadKeySetting(GikoDM.GikoFormActionList, GikoSys.GetMainKeyFileName);
+	GikoSys.LoadKeySetting(GikoDM.GikoFormActionList);
 
 	//ÅI„‰ñŽžŠÔ
 //	FLastRoundTime := 0;
@@ -1162,7 +1191,9 @@ begin
 		MoveToURL(ParamStr(i));
 	end;
 
-	GikoDM.RepaintStatusBar;
+	s := GikoSys.FAbon.NGwordname;
+	StatusBar.Panels[2].Text := s;
+	StatusBar.Panels[2].Width := Max(StatusBar.Canvas.TextWidth(s), 100);
 	StatusBarResize(Sender);
 
 	dummy1.Caption	:= ItemReservPMenu.Caption;
@@ -1188,7 +1219,7 @@ begin
 		MouseGesture.SetHook( Handle );
 
 	//2chŒ¾Œê“ǂݏo‚µ
-	GikoSys.SetGikoMessage;
+	GikoSys.Setting.SetMessages;
 
 	//ƒI[ƒgƒƒOƒCƒ“
 	if GikoSys.Setting.AutoLogin then
@@ -1200,7 +1231,6 @@ begin
 	FavoriteAddToolButton.Caption := '’ljÁ...';
 	AntiIndivAbonMenuItem.Caption := 'ŒÂ•Ê‚ ‚ځ`‚ñ‰ðœ';
 
-
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1521,6 +1551,7 @@ begin
 	//ƒAƒhƒŒƒX—š—ð•Û‘¶
 	try
 		//AddressHistoryDM‚ÍŽ©“®¶¬ƒtƒH[ƒ€‚Ȃ̂ŁA‰ð•ú‚ÍŽ©“®“I‚É‚³‚ê‚éB
+		//AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.AddressHistoryCount);
 		AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount);
 	except
 	end;
@@ -1655,6 +1686,7 @@ begin
 	GikoSys.Setting.ShowDialogForAllTabClose := false;
 	GikoDM.AllTabCloseAction.Execute;
 	GikoSys.Setting.ShowDialogForAllTabClose := tmpBool;
+
 	SetContent(BrowserNullTab);
 	//TreeViewƒNƒŠƒAiBBS2ch.Free‚ÌŒã‚ɃNƒŠƒA‚·‚é‚ÆXPƒXƒ^ƒCƒ‹Žž‚ɃGƒ‰[o‚éj
 	TreeView.Items.Clear;
@@ -1985,35 +2017,27 @@ procedure TGikoForm.ListViewColumnClick(Sender: TObject;
 var
 	id, idx			: Integer;
 	orderList		: TList;
-	vSortIndex		: Integer;
-	vSortOrder		: Boolean;
 begin
 	idx := TListViewUtils.ActiveListTrueColumn( Column ).Tag;
-	if TObject( FActiveList ) is TBBS then begin
-		orderList := GikoSys.Setting.BBSColumnOrder;
-		vSortIndex := GikoSys.Setting.BBSSortIndex;
-		vSortOrder := GikoSys.Setting.BBSSortOrder;
-	end else if TObject( FActiveList ) is TCategory then begin
-		orderList := GikoSys.Setting.CategoryColumnOrder;
-		vSortIndex := GikoSys.Setting.CategorySortIndex;
-		vSortOrder := GikoSys.Setting.CategorySortOrder;
-	end else if TObject( FActiveList ) is TBoard then begin
-		orderList := GikoSys.Setting.BoardColumnOrder;
-		vSortIndex := GikoSys.Setting.BoardSortIndex;
-		vSortOrder := GikoSys.Setting.BoardSortOrder;
-	end else
+
+	if TObject( FActiveList ) is TBBS then
+		orderList := GikoSys.Setting.BBSColumnOrder
+	else if TObject( FActiveList ) is TCategory then
+		orderList := GikoSys.Setting.CategoryColumnOrder
+	else if TObject( FActiveList ) is TBoard then
+		orderList := GikoSys.Setting.BoardColumnOrder
+	else
 		Exit;
 
 	id := Integer( orderList[ idx ] );
 
-
-	if vSortIndex = id then
-		vSortOrder := not vSortOrder
+	if FSortIndex = id then
+		FSortOrder := not FSortOrder
 	else begin
-		vSortOrder := id = 0;
+		FSortOrder := id = 0;
 	end;
 
-	TListViewUtils.ListViewSort(Sender, ListView, Column, GikoDM.ListNumberVisibleAction.Checked, vSortOrder);
+	TListViewUtils.ListViewSort(Sender, ListView, Column, GikoDM.ListNumberVisibleAction.Checked, FSortOrder, FSortIndex );
 end;
 
 procedure TGikoForm.MenuToolBarCustomDrawButton(Sender: TToolBar;
@@ -2212,13 +2236,31 @@ begin
 	ListView.SetFocus;
 	ListView.SelectAll;
 end;
+// *************************************************************************
+//! ƒcƒŠ[ƒrƒ…[‚̃_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.TreeViewDblClick(Sender: TObject);
+var
+	pos : TPoint;
+	rect: TRect;
+begin
+	pos := FMouseDownPos;
+	if (FClickNode <> nil) and (FClickNode = TreeView.GetNodeAt(pos.X, pos.Y)) then begin
+		//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
+		rect := FClickNode.DisplayRect(true);
+		if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and
+			((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin
+			TreeDoubleClick( FClickNode );
+			FClickNode := nil;
+		end;
+	end;
+end;
+
 procedure TGikoForm.DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
 begin
 	AddMessageList(Msg, nil, Icon);
 end;
-// *************************************************************************
-//! ƒ_ƒEƒ“ƒ[ƒh‚ªŠ®—¹‚µ‚½‚Æ‚«‚É”­¶‚·‚éƒCƒxƒ“ƒg
-// *************************************************************************
+
 procedure TGikoForm.DownloadEnd(Sender: TObject; Item: TDownloadItem);
 var
 	ATitle: string;
@@ -2226,7 +2268,6 @@ var
 	boardPlugIn : TBoardPlugIn;
 	i: Integer;
 	browserRec	: TBrowserRecord;
-	Res : TResRec;
 begin
 	try
 		if Item.DownType = gdtBoard then
@@ -2234,21 +2275,16 @@ begin
 		else
 			ATitle := Item.ThreadItem.Title;
 		if ATitle = '' then
-			ATitle := GikoSys.GetGikoMessage(gmUnKnown);
+			ATitle := GikoSys.Setting.GetMessage(Ord(gmUnKnown));
 
 		if Item.State in [gdsComplete, gdsDiffComplete] then begin
 			//³íI—¹
 			if Item.DownType = gdtBoard then begin
 				//”Â
 				Item.SaveListFile;
-				AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmSureItiran), nil, gmiOK);
+				AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmSureItiran)), nil, gmiOK);
 				if GetActiveList = Item.Board then begin
 					FActiveList := nil;
-					//Ž©“®ƒ\[ƒg‚̏ꍇ”ˆꗗ‚̃\[ƒg‡‚ðƒNƒŠƒA‚·‚é
-					if (GikoSys.Setting.AutoSortThreadList) then begin
-						GikoSys.Setting.BoardSortIndex := 0;
-						GikoSys.Setting.BoardSortOrder := True;
-					end;
 					SetActiveList(Item.Board);
 				end;
 				Item.Board.Modified := True;
@@ -2262,12 +2298,10 @@ begin
 				if (Item.ThreadItem.ParentBoard.IsBoardPlugInAvailable) and (Item.ThreadItem.Title = '') then begin
 					//boardPlugIn		:= Item.ThreadItem.BoardPlugIn;
 					boardPlugIn		:= Item.ThreadItem.ParentBoard.BoardPlugIn;
-					THTMLCreate.DivideStrLine(boardPlugIn.GetDat( DWORD( Item.ThreadItem ), 1 ), @Res);
-					Item.ThreadItem.Title := Res.FTitle;
+					Item.ThreadItem.Title := DivideStrLine(boardPlugIn.GetDat( DWORD( Item.ThreadItem ), 1 )).FTitle;
 					ATitle := Item.ThreadItem.Title;
 				end else if ATitle = 'i–¼Ì•s–¾j' then begin
-					THTMLCreate.DivideStrLine(GikoSys.ReadThreadFile(Item.ThreadItem.GetThreadFileName, 1), @Res);
-					ATitle := Res.FTitle;
+					ATitle := DivideStrLine(GikoSys.ReadThreadFile(Item.ThreadItem.GetThreadFileName, 1)).FTitle;
 				end;
 				for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
 					if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = Item.ThreadItem then begin
@@ -2295,12 +2329,12 @@ begin
 
 				if Item.State = gdsComplete then begin
 					PlaySound('New');
-										AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmSureSyutoku), nil, gmiOK);
+										AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmSureSyutoku)), nil, gmiOK);
 										//Add by Genyakun
 										DiffComp := True;
 				end else begin
 					PlaySound('NewDiff');
-										AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmSureDiff), nil, gmiOK);
+										AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmSureDiff)), nil, gmiOK);
 										//Add by Genyakun
 										DiffComp := True;
 				end;
@@ -2333,18 +2367,18 @@ begin
 				//SetContent(Item.ThreadItem);
 				InsertBrowserTab(Item.ThreadItem);
 			end;}
-						AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmNotMod), nil, gmiSAD);
+						AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmNotMod)), nil, gmiSAD);
 			PlaySound('NoChange');
 			Screen.Cursor := crDefault;
 		end else if Item.State = gdsAbort then begin
 			//’†’f
-						AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmAbort), nil, gmiOK);
+						AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmAbort)), nil, gmiOK);
 		end else if Item.State = gdsError then begin
 			//ƒGƒ‰[
 			s := Item.ErrText;
 			if s <> '' then
 				s := ':' + s;
-                        AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(gmError) + ' (' + IntToStr(Item.ResponseCode) + ')' + s, nil, gmiNG);
+                        AddMessageList(ATitle + ' ' + GikoSys.Setting.GetMessage(Ord(gmError)) + ' (' + IntToStr(Item.ResponseCode) + ')' + s, nil, gmiNG);
 //			if Item.ResponseCode = 302 then
 //				AddMessageList('”‚ªˆÚ“]‚µ‚½‚©‚à‚µ‚ê‚È‚¢‚̂ŔXV‚ðs‚Á‚Ä‚­‚¾‚³‚¢B', nil, gmiNG);
 			PlaySound('Error');
@@ -2524,9 +2558,6 @@ begin
 			BrowserNullTab := TBrowserRecord.Create;
 			BrowserNullTab.Browser := Browser;
 		end;
-		if BrowserNullTab.thread <> ThreadItem then begin
-        	BrowserNullTab.Movement := '';
-		end;
 		BrowserNullTab.thread := ThreadItem;
 		Result := BrowserNullTab;
 		BrowserTab.TabIndex := -1;
@@ -2556,7 +2587,6 @@ begin
 	idx := BrowserTab.TabIndex;
 	if (FActiveContent <> nil) and
 		(FActiveContent.Thread <> Thread.Thread) and
-		(FActiveContent.Browser <> nil) and
 		(Assigned(FActiveContent.Browser.Document)) then begin
 		try
 		try
@@ -2575,7 +2605,7 @@ begin
 		ItemBoardImage.Picture := nil;
 		BrowserNameLabel.Caption := '';
 		ItemImage.Picture := nil;
-        BrowserNullTab.Thread := nil;
+		BrowserNullTab.Thread := nil;
 		//TOleControl(BrowserNullTab.Browser).Visible := true;
 		ShowWindow(BrowserNullTab.Browser.Handle, SW_SHOW);
 		FActiveContent := nil;
@@ -2631,9 +2661,7 @@ begin
 		FActiveContent := Thread;
 
 		if not ThreadIsLog then begin
-			Self.Caption := GikoDataModule.CAPTION_NAME ;
-            //ƒXƒe[ƒ^ƒXƒo[‚É•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒ‚Ì—e—Ê‚ðÁ‹Ž
-			StatusBar.Panels[THREADSIZE_PANEL].Text := '';
+			Self.Caption := CAPTION_NAME ;
 			try
 				s := '<HTML><BODY><CENTER>‚±‚̃XƒŒƒbƒh‚͎擾‚µ‚Ä‚¢‚Ü‚¹‚ñ</CENTER></BODY></HTML>';
 				doc := Idispatch( olevariant(Thread.Browser.ControlInterface).Document) as IHTMLDocument2;
@@ -2644,11 +2672,7 @@ begin
 			finally
 			end;
 		end else begin
-			Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + ThreadTitle + ']';
-            //ƒXƒe[ƒ^ƒXƒo[‚É•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒ‚Ì—e—Ê‚ð•\Ž¦
-			StatusBar.Panels[THREADSIZE_PANEL].Text := Format('%6.2f kB', [ThreadItem.Size / 1024]);
-			StatusBar.Panels[THREADSIZE_PANEL].Width :=
-				Max(StatusBar.Canvas.TextWidth(StatusBar.Panels[THREADSIZE_PANEL].Text), 70);
+			Self.Caption := CAPTION_NAME + ' - [' + ThreadTitle + ']';
 			//Thread.Repaint‚́AƒXƒLƒ““™‚̐ݒè‚ð•ÏX‚µ‚½‚Æ‚«AThread‚ðƒ_ƒEƒ“ƒ[ƒh‚µ‚½‚Æ‚«
 			//V‹K‚ÉThread‚ðŠJ‚¢‚½‚Æ‚«‚ɐ^‚É‚È‚Á‚Ä‚¢‚éB
 			if Thread.Repaint then begin
@@ -2660,7 +2684,7 @@ begin
 				//GikoSys.CreateHTML2(doc, ThreadItem, sTitle);
 				HTMLCreater.CreateHTML2(doc, ThreadItem, sTitle);
 				Thread.Browser.OnStatusTextChange := BrowserStatusTextChange;
-
+				
 				if ThreadItem = nil then begin
 					FActiveContent := nil;
 					BrowserTab.Repaint;
@@ -2728,20 +2752,10 @@ begin
 		ListView.Selected := nil;
 //	ListView.Columns.Clear;
 		if (FActiveContent <> nil) and (FActiveContent.Thread <> nil)
-			and (FActiveContent.Thread.IsLogFile) then begin
-			try
-				Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']'
-			except
-				on E: Exception do begin
-					//ƒXƒŒˆê——DLŒã‚È‚Ç‚ÉFActiveContent‚ÌŽ‚ÂThread‚ª
-					//íœ‚³‚ê‚Ä‚¢‚éê‡‚ª‚ ‚é‚Ì‚Å‚±‚±‚ďˆ—‚·‚é
-					ReleaseBrowser(FActiveContent);
-					FActiveContent.Thread := nil;
-					Self.Caption := GikoDataModule.CAPTION_NAME;
-				end;
-			end;
-		end else
-			Self.Caption := GikoDataModule.CAPTION_NAME;
+			and (FActiveContent.Thread.IsLogFile) then
+			Self.Caption := CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']'
+		else
+			Self.Caption := CAPTION_NAME;
 		//Application.Title := CAPTION_NAME;
 
 //		ActiveListColumnSave;
@@ -2749,11 +2763,14 @@ begin
 		Screen.Cursor := crHourGlass;
 		try
 			if Obj is TBBS then begin
-				TListViewUtils.SetCategoryListItem(TBBS(obj), ListView, GikoDM.ListNumberVisibleAction.Checked);
+				TListViewUtils.SetCategoryListItem(TBBS(obj), ListView, GikoDM.ListNumberVisibleAction.Checked,
+								FSortIndex, FSortOrder);
 			end else if Obj is TCategory then begin
-				TListViewUtils.SetBoardListItem(TCategory(Obj), ListView, GikoDM.ListNumberVisibleAction.Checked);
+				TListViewUtils.SetBoardListItem(TCategory(Obj), ListView, GikoDM.ListNumberVisibleAction.Checked,
+								FSortIndex, FSortOrder);
 			end else if Obj is TBoard then begin
-				TListViewUtils.SetThreadListItem(TBoard(Obj), ListView,  GikoDM.ListNumberVisibleAction.Checked);
+				TListViewUtils.SetThreadListItem(TBoard(Obj), ListView,  GikoDM.ListNumberVisibleAction.Checked,
+								FSortIndex, FSortOrder);
 			end;
 		finally
 			Screen.Cursor := crDefault;
@@ -3497,9 +3514,6 @@ begin
 	end else if TObject(Node.Data) is TBoard then begin
 		TBoard(Node.Data).NodeExpand := False;
 	end;
-	if (TreeView.Selected <> nil) and (TreeView.Selected = Node) then begin
-    	TreeClick(TreeView.Selected);
-	end;
 end;
 
 procedure TGikoForm.MessageListViewResize(Sender: TObject);
@@ -3706,6 +3720,8 @@ begin
 	AddRoundNameMenu(ListReservPMenu);
 end;
 
+
+//ActiveList‚ªTBoard‚©TCategory‚ŃXƒŒˆê——‚Å‚P‚ˆȏã‘I‘ð‚µ‚Ä‚¢‚é‚Æ—LŒø‚É‚È‚éActionde‹¤’Ê
 procedure TGikoForm.TreePopupMenuPopup(Sender: TObject);
 begin
 	FClickNode := TreeView.Selected;
@@ -3801,6 +3817,7 @@ var
 	idx: Integer;
 	wkIntSt: Integer;
 	wkIntTo: Integer;
+	document: IHTMLDocument2;
     BNum, BRes: string;
     threadItem: TThreadItem;
 begin
@@ -3888,31 +3905,31 @@ begin
 	if GikoSys.Setting.ListOrientation = gloHorizontal then begin
 		if ViewPanel.Width < 2 then begin
 			ViewPanel.Width := 1;
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_NORMAL;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MIN;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
 			GikoSys.Setting.ListWidthState := glsMax;
 		end else if ViewPanel.Width > (ThreadMainPanel.Width - 80) then begin
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MAX;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_NORMAL;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
 			GikoSys.Setting.ListWidthState := glsMin;
 		end else begin
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MAX;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_WIDTH_MIN;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
 			GikoSys.Setting.ListWidthState := glsNormal;
 		end;
 	end else begin
 		if ViewPanel.Height < 2 then begin
 			ViewPanel.Height := 1;
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_NORMAL;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MIN;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 			GikoSys.Setting.ListHeightState := glsMax;
 		end else if ViewPanel.Height > (ThreadMainPanel.Height - BrowserCoolBar.Height - 7) then begin
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MAX;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_NORMAL;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
 			GikoSys.Setting.ListHeightState := glsMin;
 		end else begin
-			GikoDM.BrowserMaxAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MAX;
-			GikoDM.BrowserMinAction.ImageIndex := GikoDataModule.TOOL_ICON_HEIGHT_MIN;
+			GikoDM.BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+			GikoDM.BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 			GikoSys.Setting.ListHeightState := glsNormal;
 		end;
 	end;
@@ -3928,11 +3945,14 @@ var
 	idx: Integer;
 begin
 
+//	if NewTab = -1 then
+//	ThreadItem := nil;
 	if not BrowserTab.Dragging then begin
 		FTabHintIndex := -1;
 		BrowserTab.Hint := '';
 		idx := BrowserTab.TabIndex;
 		if idx = -1 then begin
+			BrowserNullTab.Thread := nil;
 			SetContent(BrowserNullTab);
 
 		end else if(BrowserTab.Tabs.Objects[idx] <> nil) and (BrowserTab.Tabs.Objects[idx] is TBrowserRecord) then begin
@@ -3958,6 +3978,8 @@ begin
 			end;
 			MoveWindow(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser.Handle, 0, 0, BrowserPanel.Width, BrowserPanel.Height, false);
 			TOleControl(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser).BringToFront;
+//			GikoSys.OnlyAHundredRes := TBrowserRecord(BrowserTab.Tabs.Objects[idx]).OnlyHundred;
+//			OnlyAHundredRes.Checked := TBrowserRecord(BrowserTab.Tabs.Objects[idx]).OnlyHundred;
 			SetContent(TBrowserRecord(BrowserTab.Tabs.Objects[idx]));
 
 			if (GikoSys.Setting.URLDisplay) and (GetActiveContent <> nil) then
@@ -4144,11 +4166,6 @@ begin
 				FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
 				FEvent.OnContextMenu := OnDocumentContextMenu;
 				FEvent.OnClick := WebBrowserClick;  //’ljÁ‚µ‚½OnClickƒCƒxƒ“ƒg
-			end else begin
-				if FEvent <> nil then begin
-					FEvent.Free;
-					FEvent := nil;
-				end;
 			end;
 			
 		end;
@@ -4160,19 +4177,17 @@ begin
 			if (BrowserRecord <> nil) and (Length( BrowserRecord.Movement ) > 0) then begin
 				if threadItem.UnRead then begin
 					threadItem.UnRead := False;
+					threadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead - 1;
+					if threadItem.ParentBoard.UnRead < 0 then threadItem.ParentBoard.UnRead := 0;
 					TreeView.Refresh;
 					ListView.Refresh;
 				end;
-				// ƒXƒNƒ[ƒ‹æ‚ªŽæ“¾ŠO‚̃ŒƒX‚ÌŽž‚͏I’[‚Ɉړ®
-				if (StrToIntDef(BrowserRecord.Movement, 0) <= BrowserRecord.Thread.Count) then begin
-					BrowserRecord.Move(BrowserRecord.Movement);
-					BrowserRecord.Movement := '';
-				end else begin
-					BrowserRecord.Move(IntToStr(BrowserRecord.Thread.Count));
-				end;
-
+				BrowserRecord.Move(BrowserRecord.Movement);
+				BrowserRecord.Movement := '';
 			end else if threadItem.UnRead then begin
 				threadItem.UnRead := False;
+				threadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead - 1;
+				if threadItem.ParentBoard.UnRead < 0 then threadItem.ParentBoard.UnRead := 0;
 				TreeView.Refresh;
 				BrowserRecord.Move('new');
 				ListView.Refresh;
@@ -4322,52 +4337,47 @@ procedure TGikoForm.FavoriteMenuClick(Sender: TObject);
 var
 	NewMenu: TMenuItem;
 begin
-	if FavoriteDM.Modified then begin
-		FavoriteMenu.Clear;
+	FavoriteMenu.Clear;
 
-		//‚¨‹C‚É“ü‚è‚̒ljÁ
-		NewMenu := TMenuItem.Create(MainMenu);
-		NewMenu.Action := GikoDM.FavoriteAddAction;
-		FavoriteMenu.Add(NewMenu);
-		//‚¨‹C‚É“ü‚è‚̐®—
-		NewMenu := TMenuItem.Create(FavoriteMenu);
-		NewMenu.Action := GikoDM.FavoriteArrangeAction;
-		FavoriteMenu.Add(NewMenu);
-		//ƒZƒpƒŒ[ƒ^
-		FavoriteMenu.InsertNewLineAfter(NewMenu);
-		CreateFavMenu(FavoriteDM.TreeView.Items.GetFirstNode, FavoriteMenu);
-		FavoriteDM.Modified := false;
-	end;
+	//‚¨‹C‚É“ü‚è‚̒ljÁ
+	NewMenu := TMenuItem.Create(MainMenu);
+	NewMenu.Action := GikoDM.FavoriteAddAction;
+	FavoriteMenu.Add(NewMenu);
+	//‚¨‹C‚É“ü‚è‚̐®—
+	NewMenu := TMenuItem.Create(FavoriteMenu);
+	NewMenu.Action := GikoDM.FavoriteArrangeAction;
+	FavoriteMenu.Add(NewMenu);
+	//ƒZƒpƒŒ[ƒ^
+	NewMenu := TMenuItem.Create(FavoriteMenu);
+	NewMenu.Caption := '-';
+	FavoriteMenu.Add(NewMenu);
+
+	CreateFavMenu(FavoriteDM.TreeView.Items.GetFirstNode, FavoriteMenu);
 end;
 
 procedure TGikoForm.CreateFavMenu(Node: TTreeNode; MenuItem: TMenuItem);
 var
 	i: Integer;
-	NewMenu: array of TMenuItem;
+	NewMenu: TMenuItem;
 begin
-	SetLength(NewMenu, Node.Count);
-	Node := Node.getFirstChild;
-	i := 0;
-	while ( Node <> nil ) do begin
-		NewMenu[i] := TFavoriteMenuItem.Create(nil);
-		NewMenu[i].AutoHotkeys := maAutomatic;
-		NewMenu[i].Caption := CustomStringReplace(Node.Text, '&', '&&');
-		TFavoriteMenuItem(NewMenu[i]).Data := Node.Data;
+	for i := 0 to Node.Count - 1 do begin
+		NewMenu := TFavoriteMenuItem.Create(Self);
+		NewMenu.AutoHotkeys := maAutomatic;
+		NewMenu.Caption := CustomStringReplace(Node.Item[i].Text, '&', '&&');
+		TFavoriteMenuItem(NewMenu).Data := Node.Item[i].Data;
+		MenuItem.Add(NewMenu);
 
-		if TObject(Node.Data) is TFavoriteFolder then begin
-			NewMenu[i].ImageIndex := GikoDataModule.TOOL_ICON_FAV_FOLDER;
-			CreateFavMenu(Node, NewMenu[i]);
-		end else if TObject(Node.Data) is TFavoriteBoardItem then begin
-			NewMenu[i].ImageIndex := GikoDataModule.TOOL_ICON_FAV_BOARD;
-			NewMenu[i].OnClick := FavoriteClick;
-		end else if TObject(Node.Data) is TFavoriteThreadItem then begin
-			NewMenu[i].ImageIndex := GikoDataModule.TOOL_ICON_FAV_THREAD;
-			NewMenu[i].OnClick := FavoriteClick;
+		if TObject(Node.Item[i].Data) is TFavoriteFolder then begin
+			NewMenu.ImageIndex := TOOL_ICON_FAV_FOLDER;
+			CreateFavMenu(Node.Item[i], NewMenu);
+		end else if TObject(Node.Item[i].Data) is TFavoriteBoardItem then begin
+			NewMenu.ImageIndex := TOOL_ICON_FAV_BOARD;
+			NewMenu.OnClick := FavoriteClick;
+		end else if TObject(Node.Item[i].Data) is TFavoriteThreadItem then begin
+			NewMenu.ImageIndex := TOOL_ICON_FAV_THREAD;
+			NewMenu.OnClick := FavoriteClick;
 		end;
-        Inc(i);
-		Node := Node.getNextSibling;
 	end;
-	MenuItem.Add(NewMenu);
 end;
 
 procedure TGikoForm.ShowFavoriteAddDialog( Item : TObject );
@@ -4431,7 +4441,9 @@ end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject);
 begin
+
 	FavoriteClick( Sender, True );
+
 end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject; ActiveTab: Boolean);
@@ -4533,8 +4545,11 @@ begin
 	//===== ƒvƒ‰ƒOƒCƒ“
 	try
 		//ì‹Æ’†//
+		//bi := High( BoardPlugIns );
 		bi := Length(BoardGroups) - 1;
+		//for i := Low( BoardPlugIns ) to bi do begin
 		for i := 1 to bi do begin
+			//if Assigned( Pointer( BoardPlugIns[ i ].Module ) ) then begin
 			if (BoardGroups[i].BoardPlugIn <> nil) and (Assigned(Pointer(BoardGroups[i].BoardPlugIn.Module))) then begin
 				case BoardGroups[i].BoardPlugIn.AcceptURL( inURL ) of
 				atThread:
@@ -4580,12 +4595,8 @@ begin
 								GikoSys.GetPopupResNumber( inURL, stRes, edRes );
 								browserRec := InsertBrowserTab( ThreadItem );
 								if ThreadItem.IsLogFile then begin
-									if (browserRec <> nil) and (stRes > 0) then begin
-										browserRec.Movement := IntToStr( stRes );
-										if (stRes > ThreadItem.Count) then begin
-											DownloadContent( ThreadItem );
-										end;
-									end;
+									if (browserRec <> nil) and (stRes > 0) then
+										browserRec.Move(IntToStr( stRes ));
 								end else begin
 									if (browserRec <> nil) and (stRes > 0) then
 										browserRec.Movement := IntToStr( stRes );
@@ -4684,12 +4695,8 @@ begin
 			if ThreadItem.IsLogFile then begin
 				GikoSys.GetPopupResNumber( inURL, stRes, edRes );
 				browserRec := InsertBrowserTab(ThreadItem);
-				if (browserRec <> nil) and (stRes > 0) then begin
+				if (browserRec <> nil) and (stRes > 0) then
 					browserRec.Movement := IntToStr( stRes );
-					if (stRes > ThreadItem.Count) then begin
-                    	DownloadContent(ThreadItem);
-					end;
-				end;
 			end else begin
 				if AnsiPos(Host, Board.URL) = 0 then
 					ThreadItem.DownloadHost := Host
@@ -4950,42 +4957,26 @@ begin
 
 	SetWindowPos(FPreviewBrowser.Handle, HWND_TOPMOST, ARect.Left, ARect.Top, WindowWidth, WindowHeight, SWP_NOACTIVATE or SWP_HIDEWINDOW);
 	ShowWindow(FPreviewBrowser.Handle, SW_SHOWNOACTIVATE);
-	FPreviewBrowserRect := ARect;
+
 //	Style := GetWindowLong(FPreviewBrowser.Handle, GWL_EXSTYLE);
 //	SetWindowLong(FPreviewBrowser.Handle, GWL_EXSTYLE, Style xor WS_EX_APPWINDOW);
 
 end;
 
 procedure TGikoForm.WMSetCursor(var Message: TWMSetCursor);
-var
-	Pos : TPoint;
 begin
-
 	if PreviewTimer.Enabled then
 		PreviewTimer.Enabled := False;
 	if (FHint <> nil) and (IsWindowVisible(FHint.Handle)) then begin
 		FHint.ReleaseHandle;
 		FHint.ClearAllRes;
 	end;
-
-	if (FPreviewBrowser <> nil)
-		and (IsWindowVisible(FPreviewBrowser.Handle)) then begin
-        //‚±‚±‚ŏÁ‚³‚ê‚é‚Ì‚ª–â‘è
-        //‚½‚Ô‚ñ‚±‚ê‚Å•\Ž¦”͈͔»’è‚Å‚«‚Ä‚¢‚é‚Í‚¸
-		Pos := Mouse.CursorPos;
-		Pos.X := Pos.X + Left;
-		Pos.Y := Pos.Y + Top;
-		if (FPreviewBrowserRect.Left > Pos.X) or
-			(FPreviewBrowserRect.Right < Pos.X) or
-			(FPreviewBrowserRect.Top > Pos.Y) or
-			(FPreviewBrowserRect.Bottom < Pos.Y) then begin
-			ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
-		end;
-	end;
-
+	if (FPreviewBrowser <> nil) and (IsWindowVisible(FPreviewBrowser.Handle)) then
+		ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
 	Message.Result := 1;
 	inherited;
 end;
+
 procedure TGikoForm.MessageHideButtonClick(Sender: TObject);
 begin
 	GikoDM.MsgBarCloseAction.Execute;
@@ -5105,12 +5096,12 @@ begin
 						CreateFavMenu(FavoriteTreeView.Items[i].Item[j], MenuItem);
 						LinkBarPopupMenu.Items.Add(MenuItem);
 						ToolButton.MenuItem := MenuItem;
-						ToolButton.ImageIndex := GikoDataModule.TOOL_ICON_FAV_FOLDER;
+						ToolButton.ImageIndex := TOOL_ICON_FAV_FOLDER;
 					end else if TObject(FavoriteTreeView.Items[i].Item[j].Data) is TFavoriteBoardItem then begin
-						ToolButton.ImageIndex := GikoDataModule.TOOL_ICON_FAV_BOARD;
+						ToolButton.ImageIndex := TOOL_ICON_FAV_BOARD;
 						ToolButton.OnClick := FavoriteClick;
 					end else if TObject(FavoriteTreeView.Items[i].Item[j].Data) is TFavoriteThreadItem then begin
-						ToolButton.ImageIndex := GikoDataModule.TOOL_ICON_FAV_THREAD;
+						ToolButton.ImageIndex := TOOL_ICON_FAV_THREAD;
 						ToolButton.OnClick := FavoriteClick;
 					end;
 					ToolButton.Caption := FavoriteTreeView.Items[i].Item[j].Text;
@@ -5658,13 +5649,16 @@ function TGikoForm.FindToolBarButton( bar : TToolBar; action : TAction ) : TTool
 var
 	i : Integer;
 begin
-	Result := nil;
+
 	for i := bar.ButtonCount - 1 downto 0 do begin
 		if bar.Buttons[ i ].Action = action then begin
 			Result := bar.Buttons[ i ];
-			Break;
+			Exit;
 		end;
 	end;
+
+	Result := nil;
+
 end;
 
 procedure TGikoForm.SetToolBarPopup;
@@ -5818,8 +5812,8 @@ begin
 
 	if Length( SelectComboBox.Text ) = 0 then
 	begin
-		SelectComboBox.Text := GikoDataModule.SELECTCOMBOBOX_NAME;
-		SelectComboBox.Color := GikoDataModule.SELECTCOMBOBOX_COLOR;
+		SelectComboBox.Text := SELECTCOMBOBOX_NAME;
+		SelectComboBox.Color := SELECTCOMBOBOX_COLOR;
 	end;
 
 end;
@@ -5854,6 +5848,7 @@ begin
 end;
 
 
+// ‘S‚ẴŒƒX‚ð•\Ž¦
 procedure TGikoForm.SelectComboBoxSplitterMouseMove(Sender: TObject;
 	Shift: TShiftState; X, Y: Integer);
 var
@@ -5913,15 +5908,14 @@ end;
 procedure TGikoForm.StatusBarResize(Sender: TObject);
 begin
 	StatusBar.Panels[1].Width := StatusBar.Width -
-					StatusBar.Panels[0].Width -
-					StatusBar.Panels[THREADSIZE_PANEL].Width -
-					StatusBar.Panels[NGWORDNAME_PANEL].Width;
+															 StatusBar.Panels[0].Width -
+															 StatusBar.Panels[2].Width;
 end;
 procedure TGikoForm.SelectComboBoxEnter(Sender: TObject);
 begin
 
 	if (Length( SelectComboBox.Text ) = 0) or
-		(SelectComboBox.Text = GikoDataModule.SELECTCOMBOBOX_NAME) then
+		(SelectComboBox.Text = SELECTCOMBOBOX_NAME) then
 	begin
 		SelectComboBox.Text := '';
 		SelectComboBox.Color := clWindow;
@@ -5929,6 +5923,7 @@ begin
 
 end;
 
+//”–¼ŒŸõ
 procedure TGikoForm.FavoriteMoveTo( SenderNode, SourceNode: TTreeNode );
 begin
 
@@ -6053,8 +6048,6 @@ begin
 			FDropSpaceNode := nil;
 		end;
 	end;
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	SetLinkBar;
 
@@ -6063,8 +6056,6 @@ end;
 procedure TGikoForm.FavoriteTreeViewEdited(Sender: TObject;
 	Node: TTreeNode; var S: String);
 begin
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	FavoriteTreeView.ReadOnly := True;
 	SetLinkBar;
@@ -6092,10 +6083,7 @@ begin
 			FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded;
 			end;
 		VK_SPACE:
-			begin
-			FClickNode := FavoriteTreeView.Selected;
-			GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
-			end;
+			FavoriteTreeViewDblClick( Sender );
 		end;
 	end else begin
 		//•ÒW’†‚ÉESC‚ð‰Ÿ‚µ‚½‚çA•ÒW‚ðI—¹‚µ‚āAŒ³‚Ì•¶Žš—ñ‚É–ß‚·
@@ -6228,6 +6216,27 @@ begin
 	end;
 
 end;
+// *************************************************************************
+//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.FavoriteTreeViewDblClick(Sender: TObject);
+var
+	pos : TPoint;
+	rect: TRect;
+begin
+	//ƒNƒŠƒbƒNŽž‚Ì‘I‘ðƒCƒxƒ“ƒg‚Æ“¯‚¶‚È‚çƒ_ƒuƒ‹ƒNƒŠƒbƒNŽÀs
+	pos := FMouseDownPos;
+	if (FClickNode <> nil) and (FClickNode = FavoriteTreeView.GetNodeAt(pos.X, pos.Y)) then begin
+		//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
+		rect := FClickNode.DisplayRect(true);
+		if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and
+			((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin
+			GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
+			FClickNode := nil;
+		end;
+	end;
+end;
+
 function TGikoForm.TreeNodeDataFind(Node: TTreeNode; FindPointer: Pointer): TTreeNode;
 var
 	Found: TTreeNode;
@@ -6313,8 +6322,6 @@ begin
 		finally
 			FDropSpaceNode := nil;
 		end;
-		//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-		FavoriteDM.Modified := true;
 		SetLinkBar;
 	end;
 
@@ -6423,7 +6430,7 @@ begin
       tmp := GikoSys.ReadThreadFile(FileName, Number);
 		end;
 		if tmp <> '' then begin
-			THTMLCreate.DivideStrLine(tmp, @Res);
+			Res := DivideStrLine(tmp);
 
 			Header := IntToStr(Number) + ' F' + Res.FName + ' F' + Res.FDateTime + #13#10;
 			if ReplaceTag then begin
@@ -6445,7 +6452,7 @@ begin
 			end;
 			Body := CustomStringReplace(Body, '</a>', '',true);
 
-			Body := HTMLCreater.DeleteLink(Body);
+			Body := GikoSys.DeleteLink(Body);
 			if ReplaceTag then begin
 				Body := CustomStringReplace(Body, '&lt;', '<');
 				Body := CustomStringReplace(Body, '&gt;', '>');
@@ -6658,8 +6665,13 @@ begin
 
 end;
 // *************************************************************************
-//! ƒcƒŠ[ƒrƒ…[‚ÌKeyDownƒCƒxƒ“ƒg
+//! ƒcƒŠ[ƒrƒ…[‚̃NƒŠƒbƒNƒCƒxƒ“ƒg
 // *************************************************************************
+procedure TGikoForm.TreeViewClick(Sender: TObject);
+begin
+	FClickNode := TreeView.Selected;
+	FMouseDownPos := TreeView.ScreenToClient(Mouse.CursorPos);
+end;
 procedure TGikoForm.TreeViewKeyDown(Sender: TObject; var Key: Word;
 	Shift: TShiftState);
 begin
@@ -6672,35 +6684,21 @@ begin
 		TreeView.Selected.Expanded := not TreeView.Selected.Expanded;
 	end;
 end;
-//! ‚¨‹C‚É“ü‚è‚ÌMouseDownƒCƒxƒ“ƒg
+
 procedure TGikoForm.FavoriteTreeViewMouseDown(Sender: TObject;
 	Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 var
 	favItem				: TTreeNode;
 	favThreadItem	: TFavoriteThreadItem;
-	rect: TRect;
 begin
+
 	case Button of
-	mbLeft:
+{	mbLeft:
 		begin
-			if not (ssAlt in Shift) and (FavoriteTreeView.Selected <> nil) and 
-				(FavoriteTreeView.Selected = FavoriteTreeView.GetNodeAt(X, Y)) then begin
-				//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
-				rect := FavoriteTreeView.Selected.DisplayRect(true);
-				if ((rect.Left <= X) and (rect.Right >= X)) and
-					((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
-					if ssDouble in Shift then begin
-						FClickNode := FavoriteTreeView.Selected;
-						GikoDM.FavoriteTreeViewReloadActionExecute(Sender);
-						FClickNode := nil;
-					end else begin
-						FavoriteClick(
-							TObject(FavoriteTreeView.Selected));
-					end;
-				end;
-			end;
+			FMouseDownPos.X := X;
+			FMouseDownPos.Y := Y;
 		end;
-	mbMiddle:
+}	mbMiddle:
 		begin
 			favItem := FavoriteTreeView.GetNodeAt( X, Y );
 			if favItem = nil then Exit;
@@ -6760,6 +6758,16 @@ end;
 // *************************************************************************
 //! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃}ƒEƒXƒAƒbƒvƒCƒxƒ“ƒg
 // *************************************************************************
+procedure TGikoForm.FavoriteTreeViewMouseUp(Sender: TObject;
+  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+begin
+	if (Button = mbLeft) and not (ssDouble	in Shift) then begin
+		if (FClickNode <> nil) and (FClickNode = FavoriteTreeView.GetNodeAt(X, Y)) then begin
+			FavoriteClick( TObject( FClickNode ) );
+		end;
+	end;
+end;
+
 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
 var
 	p : TPoint;
@@ -6838,21 +6846,18 @@ var
   rec : TBrowserRecord;
   i, bound : Integer;
 begin
-	bound := BrowserTab.Tabs.Count -1;
+  bound := BrowserTab.Tabs.Count -1;
 	if bound = -1 then begin
 		Result := False;
 		Exit; //for‚É”ò‚΂Ȃ¢‚Å‘€ì‚𔲂¯‚é
-	end;
+  end;
 
-	for i := 0 to bound 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;
-	Result := True;
+  for i := 0 to bound do begin
+	rec := TBrowserRecord( BrowserTab.Tabs.Objects[ i ] );
+	if( rec <> nil) and (rec.Thread <> nil) then
+		AStringList.Add( rec.Thread.URL );
+  end;
+  Result := True;
 end;
 
 function TGikoForm.SaveTabURLs : Boolean;
@@ -6867,15 +6872,12 @@ begin
 	SaveStringList := TStringList.Create;
 	try
 		if GetTabURLs(SaveStringList) then begin
-			try
-				if FileExists( GikoSys.GetAppDir + Filename) then begin
-					if FileExists( GikoSys.GetAppDir + bFilename) then
-						DeleteFile(GikoSys.GetAppDir + bFilename);
+			if FileExists( GikoSys.GetAppDir + Filename) then begin
+				if FileExists( GikoSys.GetAppDir + bFilename) then
+					DeleteFile(GikoSys.GetAppDir + bFilename);
 
-					//ƒoƒbƒNƒAƒbƒv‚ðì‚éB
-					RenameFile(GikoSys.GetAppDir + Filename, GikoSys.GetAppDir + bFilename);
-				end;
-			except
+				//ƒoƒbƒNƒAƒbƒv‚ðì‚éB
+				RenameFile(GikoSys.GetAppDir + Filename, GikoSys.GetAppDir + bFilename);
 			end;
 			SaveStringList.SaveToFile(GikoSys.GetAppDir + Filename);
 			Result := true;
@@ -6886,8 +6888,6 @@ begin
 end;
 
 function TGikoForm.LoadTabURLs : Boolean;
-const
-	TABFILE = 'tab.sav';
 var
 	i, bound    : Integer;
 	item        : TThreadItem;
@@ -6896,7 +6896,7 @@ var
 	fileName		: string;
 begin
 
-	fileName := ExtractFilePath(Application.ExeName) + TABFILE;
+	fileName := ExtractFilePath(Application.ExeName) + 'tab.sav';
 	URLs := TStringList.Create();
 	GikoTab := GikoSys.Setting.BrowserTabAppend;
 	try
@@ -6912,10 +6912,6 @@ begin
 						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
 					Result := False;
 			end else
@@ -7635,6 +7631,61 @@ begin
 	end;
 end;
 // *************************************************************************
+//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃NƒŠƒbƒNƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.FavoriteTreeViewClick(Sender: TObject);
+begin
+	//Œ»Ý‘I‘ð‚³‚ê‚Ä‚¢‚éƒAƒCƒeƒ€‚ð•Û‘¶
+	FClickNode := FavoriteTreeView.Selected;
+	FMouseDownPos := FavoriteTreeView.ScreenToClient(Mouse.CursorPos);
+end;
+// *************************************************************************
+//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€‚̏k¬ŽžƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.FavoriteTreeViewCollapsing(Sender: TObject;
+  Node: TTreeNode; var AllowCollapse: Boolean);
+begin
+	//k¬‚³‚ꂽ‚ç•Û‘¶‚³‚ê‚Ä‚¢‚éƒNƒŠƒbƒNŽž‘I‘ðƒAƒCƒeƒ€‚ðƒNƒŠƒA
+	FClickNode := nil;
+end;
+// *************************************************************************
+//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€‚Ì“WŠJŽžƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.FavoriteTreeViewExpanding(Sender: TObject;
+  Node: TTreeNode; var AllowExpansion: Boolean);
+begin
+	//“WŠJ‚³‚ꂽ‚ç•Û‘¶‚³‚ê‚Ä‚¢‚éƒNƒŠƒbƒNŽž‘I‘ðƒAƒCƒeƒ€‚ðƒNƒŠƒA
+	FClickNode := nil;
+end;
+// *************************************************************************
+//! ƒcƒŠ[ƒrƒ…[‚̃AƒCƒeƒ€‚̏k¬ŽžƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.TreeViewCollapsing(Sender: TObject; Node: TTreeNode;
+  var AllowCollapse: Boolean);
+begin
+	FClickNode := nil;
+end;
+// *************************************************************************
+//! ƒcƒŠ[ƒrƒ…[‚̃AƒCƒeƒ€‚Ì“WŠJŽžƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.TreeViewExpanding(Sender: TObject; Node: TTreeNode;
+  var AllowExpansion: Boolean);
+begin
+	FClickNode := nil;
+end;
+// *************************************************************************
+//! ƒcƒŠ[ƒrƒ…[‚̃}ƒEƒXƒAƒbƒvƒCƒxƒ“ƒg
+// *************************************************************************
+procedure TGikoForm.TreeViewMouseUp(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; X, Y: Integer);
+begin
+	if (Button = mbLeft) and not (ssDouble in Shift) then begin
+		if (FClickNode <> nil) and (FClickNode = TreeView.GetNodeAt(X, Y)) then begin
+			TreeClick(FClickNode);
+		end;
+	end;
+end;
+// *************************************************************************
 //! ƒ_ƒEƒ“ƒ[ƒhƒRƒ“ƒgƒ[ƒ‹ƒXƒŒƒbƒh‚̐¶¬
 // *************************************************************************
 procedure TGikoForm.CreateControlThread();
@@ -7742,32 +7793,6 @@ begin
 	except
 	end;
 end;
-//! ƒLƒƒƒrƒlƒbƒg‚̃}ƒEƒXƒ_ƒEƒ“ƒCƒxƒ“ƒg
-procedure TGikoForm.TreeViewMouseDown(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-var
-	rect : TRect;
-begin
-	case Button of
-	mbLeft:
-		begin
-			if (TreeView.Selected <> nil) and
-				(TreeView.Selected = TreeView.GetNodeAt(X, Y)) then begin
-				//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
-				rect := TreeView.Selected.DisplayRect(true);
-				if ((rect.Left <= X) and (rect.Right >= X)) and
-					((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
-                    // ƒNƒŠƒbƒN‚ƃ_ƒuƒ‹ƒNƒŠƒbƒN‚ðƒRƒR‚Å”»’è
-					if ssDouble in Shift then begin
-						TreeDoubleClick( TreeView.Selected );
-					end else begin
-						TreeClick(TreeView.Selected);
-					end;
-				end;
-			end;
-		end;
-	end;
-end;
 
 initialization
 				OleInitialize(nil);

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1030,6 +1030,13 @@ object GikoDM: TGikoDM
       ImageIndex = 44
       OnExecute = SelectItemSaveForDatExecute
     end
+    object FileSaveAs1: TFileSaveAs
+      Tag = -1
+      Category = #12501#12449#12452#12523
+      Caption = #21517#21069#12434#20184#12369#12390#20445#23384'(&A)...'
+      Hint = #21029#21517#12391#20445#23384'|'#29694#22312#12398#12501#12449#12452#12523#12395#26032#12375#12356#21517#21069#12434#12388#12369#12390#20445#23384
+      ImageIndex = 44
+    end
     object LogFolderOpenAction: TAction
       Category = #26495
       Caption = 'Explorer'#12391'Log'#12501#12457#12523#12480#12434#38283#12367
@@ -1195,12 +1202,6 @@ object GikoDM: TGikoDM
       Hint = #12462#12467#12490#12499'Wiki'#12398'FAQ'#12434#34920#31034#12377#12427
       OnExecute = WikiFAQWebPageActionExecute
     end
-    object ThreadSizeCalcForFileAction: TAction
-      Category = #12484#12540#12523
-      Caption = #12473#12524#12483#12489#12398#23481#37327#12434#12501#12449#12452#12523#12363#12425#20877#35336#31639#12377#12427
-      Hint = #12473#12524#12483#12489#12398#23481#37327#12434#12501#12449#12452#12523#12363#12425#20877#35336#31639#12377#12427
-      OnExecute = ThreadSizeCalcForFileActionExecute
-    end
   end
   object ToobarImageList: TImageList
     Left = 44
@@ -3193,8 +3194,4 @@ object GikoDM: TGikoDM
       F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
       000000000000}
   end
-  object SaveDialog: TSaveDialog
-    Left = 48
-    Top = 128
-  end
 end

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -11,38 +11,7 @@ uses
 	SHDocVw_TLB,
 	MSHTML_TLB,
 {$IFEND}
-  ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs;
-
-const
-	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
-	USER_SETLINKBAR					= WM_USER + 2003;
-
-	ITEM_ICON_SORT1					= 12;		//!< ƒ\[ƒgƒAƒCƒRƒ“
-	ITEM_ICON_SORT2					= 13;		//!< ƒ\[ƒgƒAƒCƒRƒ“
-
-	//ƒc[ƒ‹ƒo[ƒAƒCƒRƒ“
-	TOOL_ICON_HEIGHT_MAX 		= 16;		//!< ‚‚³Å‘åƒAƒCƒRƒ“
-	TOOL_ICON_HEIGHT_MIN 		= 17;		//!< ‚‚³Å¬ƒAƒCƒRƒ“
-	TOOL_ICON_HEIGHT_NORMAL = 18;		//!< ‚‚³•W€ƒAƒCƒRƒ“
-	TOOL_ICON_WIDTH_MAX 		= 19;		//!< •Å‘åƒAƒCƒRƒ“
-	TOOL_ICON_WIDTH_MIN 		= 20;		//!< •Å¬ƒAƒCƒRƒ“
-	TOOL_ICON_WIDTH_NORMAL 	= 21;		//!< ••W€ƒAƒCƒRƒ“
-
-	TOOL_ICON_FAV_FOLDER		= 30;		//!< ‚¨‹C‚É“ü‚èƒtƒHƒ‹ƒ_ƒAƒCƒRƒ“
-	TOOL_ICON_FAV_BOARD			= 31;		//!< ‚¨‹C‚É“ü‚蔃AƒCƒRƒ“
-	TOOL_ICON_FAV_THREAD		= 32;		//!< ‚¨‹C‚É“ü‚èƒXƒŒƒAƒCƒRƒ“
-
-	//! ƒMƒRƒiƒrƒTƒCƒg‚ÌURL
-	URL_GIKONAVI: string = 'http://gikonavi.sourceforge.jp/';
-	//! MonazillaƒTƒCƒg‚ÌURL
-	URL_MONAZILLA: string = 'http://www.monazilla.org/';
-	//! 2‚¿‚á‚ñ‚Ë‚é‚ÌURL
-	URL_2ch: string = 'http://www.2ch.net/';
-	//! ƒMƒRƒiƒrWiki‚ÌURL
-	URL_Wiki: string = 'http://gikowiki.dyndns.info/index.php?FAQ';
-
-	SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ';
-	SELECTCOMBOBOX_COLOR: TColor = clWindow;
+  ComCtrls, BrowserRecord;
 
 
 type
@@ -185,6 +154,7 @@ type
 	BrowserMaxAndFocusAction: TAction;
 	SelectItemSaveForHTML: TAction;
 	SelectItemSaveForDat: TAction;
+	FileSaveAs1: TFileSaveAs;
 	LogFolderOpenAction: TAction;
 	TabsSaveAction: TAction;
 	TabsOpenAction: TAction;
@@ -210,8 +180,6 @@ type
 	UnSelectedListViewAction: TAction;
 	WikiFAQWebPageAction: TAction;
 	ToobarImageList: TImageList;
-    SaveDialog: TSaveDialog;
-    ThreadSizeCalcForFileAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -393,22 +361,10 @@ type
 	procedure MidokuActionExecute(Sender: TObject);
 	procedure AllSelectActionExecute(Sender: TObject);
 	procedure AllSelectActionUpdate(Sender: TObject);
-    procedure ThreadSizeCalcForFileActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
-	procedure ClearResFilter;
-	procedure SetResRange(range: Integer);
-	procedure SetThreadAreaHorNormal;
-	procedure SetThreadAreaHorizontal(gls : TGikoListState);
-	procedure SetThreadAreaVerNormal;
-	procedure SetThreadAreaVertical(gls : TGikoListState);
-	procedure SetThreadReadProperty(read: Boolean);
-	procedure SelectThreadSaveToFile(dat: Boolean);
-	function GetSortProperties(List: TObject;var vSortOrder: Boolean): Boolean;
-	procedure RecalcThreadSize(limit : Integer);
   public
 	{ Public éŒ¾ }
-	procedure RepaintStatusBar;
   published
 	{ Published éŒ¾ }
 	//! TAction‚ÅGetActiveContent‚ªnilˆÈŠO‚Å—LŒø‚É‚È‚é
@@ -426,16 +382,46 @@ var
 implementation
 
 uses
-	Windows, Math, Clipbrd,
+	Windows, Math, Messages, Dialogs, Clipbrd,
 	Giko, GikoSystem, GikoUtil, BoardGroup,
-	FavoriteArrange, Favorite, MojuUtils,
+	FavoriteArrange, Favorite, Setting, MojuUtils,
 	Editor, ListSelect, Search, Option, Round,
 	KeySetting, Gesture, Kotehan, ToolBarSetting,
 	ToolBarUtil, NewBoard, HTMLCreate, IndividualAbon,
-	GikoBayesian, About, ShellAPI,
+	GikoBayesian, About, ShellAPI, Graphics,
 	RoundName, RoundData, Menus, ListViewUtils,
-	ThreadControl, GikoMessage;
+	ThreadControl;
 
+const
+	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
+	USER_SETLINKBAR					= WM_USER + 2003;
+
+	ITEM_ICON_SORT1					= 12;		//!< ƒ\[ƒgƒAƒCƒRƒ“
+	ITEM_ICON_SORT2					= 13;		//!< ƒ\[ƒgƒAƒCƒRƒ“
+
+	//ƒc[ƒ‹ƒo[ƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_MAX 		= 16;		//!< ‚‚³Å‘åƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_MIN 		= 17;		//!< ‚‚³Å¬ƒAƒCƒRƒ“
+	TOOL_ICON_HEIGHT_NORMAL = 18;		//!< ‚‚³•W€ƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_MAX 		= 19;		//!< •Å‘åƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_MIN 		= 20;		//!< •Å¬ƒAƒCƒRƒ“
+	TOOL_ICON_WIDTH_NORMAL 	= 21;		//!< ••W€ƒAƒCƒRƒ“
+
+	TOOL_ICON_FAV_FOLDER		= 30;		//!< ‚¨‹C‚É“ü‚èƒtƒHƒ‹ƒ_ƒAƒCƒRƒ“
+	TOOL_ICON_FAV_BOARD			= 31;		//!< ‚¨‹C‚É“ü‚蔃AƒCƒRƒ“
+	TOOL_ICON_FAV_THREAD		= 32;		//!< ‚¨‹C‚É“ü‚èƒXƒŒƒAƒCƒRƒ“
+
+	//! ƒMƒRƒiƒrƒTƒCƒg‚ÌURL
+	URL_GIKONAVI: string = 'http://gikonavi.sourceforge.jp/';
+	//! MonazillaƒTƒCƒg‚ÌURL
+	URL_MONAZILLA: string = 'http://www.monazilla.org/';
+	//! 2‚¿‚á‚ñ‚Ë‚é‚ÌURL
+	URL_2ch: string = 'http://www.2ch.net/';
+	//! ƒMƒRƒiƒrWiki‚ÌURL
+	URL_Wiki: string = 'http://gikowiki.dyndns.info/index.php?FAQ';
+
+	SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ';
+	SELECTCOMBOBOX_COLOR: TColor = clWindow;
 
 {$R *.dfm}
 // *************************************************************************
@@ -485,13 +471,19 @@ end;
 //! NGƒ[ƒh“ǂݍž‚݁iˆê‚ÂŒã‚ëj
 // *************************************************************************
 procedure TGikoDM.GoFowardActionExecute(Sender: TObject);
+var
+	s: string;
 begin
 	//ˆê‚ÂŒã‚ë‚̓ǂݍž‚݁@Ž¸”s‚µ‚½‚烁ƒbƒZ[ƒWo—Í
 	if GikoSys.FAbon.GoBack =false then begin
 		MsgBox(GikoForm.Handle, 'ˆê‚ÂŒã‚ë‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', 'ƒGƒ‰[', MB_OK or MB_ICONEXCLAMATION);
 	end else begin
 		//ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV
-		RepaintStatusBar;
+		s := GikoSys.FAbon.NGwordname;
+		GikoForm.StatusBar.Panels.Items[2].Text := s;
+		//ƒXƒe[ƒ^ƒX‚Ì•\Ž¦ƒTƒCƒY‚̃ŠƒTƒCƒY
+		GikoForm.StatusBar.Panels[2].Width := Max(GikoForm.StatusBar.Canvas.TextWidth(s), 100);
+		GikoForm.StatusBarResize(Sender);
 		//‘S‚Ẵ^ƒu‚ɍĕ`‰æ‚ðÝ’è
 		GikoForm.RepaintAllTabsBrowser();
 	end;
@@ -500,33 +492,24 @@ end;
 //! NGƒ[ƒh“ǂݍž‚݁iˆê‚‘Oj
 // *************************************************************************
 procedure TGikoDM.GoBackActionExecute(Sender: TObject);
+var
+	s: string;
 begin
 	//ˆê‚ÂŒã‚ë‚̓ǂݍž‚݁@Ž¸”s‚µ‚½‚烁ƒbƒZ[ƒWo—Í
 	if GikoSys.FAbon.GoForward =false then begin
 		MsgBox(GikoForm.Handle, 'ˆê‚‘O‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', 'ƒGƒ‰[', MB_OK or MB_ICONEXCLAMATION);
 	end else begin
-		//ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV
-		RepaintStatusBar;
-		//‘S‚Ẵ^ƒu‚ɍĕ`‰æ‚ðÝ’è
+        //ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV
+		s := GikoSys.FAbon.NGwordname;
+		GikoForm.StatusBar.Panels.Items[2].Text := s;
+        //ƒXƒe[ƒ^ƒX‚Ì•\Ž¦ƒTƒCƒY‚̃ŠƒTƒCƒY
+		GikoForm.StatusBar.Panels[2].Width := Max(GikoForm.StatusBar.Canvas.TextWidth(s), 100);
+		GikoForm.StatusBarResize(Sender);
+        //‘S‚Ẵ^ƒu‚ɍĕ`‰æ‚ðÝ’è
 		GikoForm.RepaintAllTabsBrowser();
 	end;
 end;
 // *************************************************************************
-//! NGƒ[ƒh‚ð•ÏX‚µ‚½Œã‚̃Xƒe[ƒ^ƒXƒo[‚̍XVˆ—
-// *************************************************************************
-procedure TGikoDM.RepaintStatusBar;
-var
-	s : String;
-begin
-	//ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV
-	s := GikoSys.FAbon.NGwordname;
-	GikoForm.StatusBar.Panels.Items[GiKo.NGWORDNAME_PANEL].Text := s;
-	//ƒXƒe[ƒ^ƒX‚Ì•\Ž¦ƒTƒCƒY‚̃ŠƒTƒCƒY
-	GikoForm.StatusBar.Panels[GiKo.NGWORDNAME_PANEL].Width
-		:= Max(GikoForm.StatusBar.Canvas.TextWidth(s), 100);
-	GikoForm.StatusBarResize(nil);
-end;
-// *************************************************************************
 //! ƒAƒhƒŒƒXƒo[‚É•\Ž¦‚µ‚Ä‚¢‚éƒAƒhƒŒƒX‚ÖˆÚ“®‚·‚é
 // *************************************************************************
 procedure TGikoDM.MoveToActionExecute(Sender: TObject);
@@ -615,8 +598,7 @@ begin
 	end else begin
 		GikoForm.ClickNode.Text := InputBox( '–¼‘O‚̕ύX', '‚¨‹C‚É“ü‚è‚̐V‚µ‚¢–¼‘O‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢', GikoForm.ClickNode.Text );
 	end;
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
+
 	GikoForm.SetLinkBar;
 end;
 // *************************************************************************
@@ -644,8 +626,6 @@ begin
 	//			FClickNode.Selected.Expanded := True;
 		GikoForm.FavoriteTreeView.Selected := Node;
 		GikoForm.ClickNode := Node;
-		//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-		FavoriteDM.Modified := true;
 		FavoriteTreeViewRenameAction.Execute;
 	finally
 	end;
@@ -676,8 +656,6 @@ begin
 	end;
 
 	GikoForm.ClickNode.Delete;
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	GikoForm.SetLinkBar;
 
@@ -695,21 +673,26 @@ end;
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewReloadActionExecute(Sender: TObject);
 var
+	ThreadItem: TThreadItem;
 	FavThread: TFavoriteThreadItem;
+	Board: TBoard;
 	FavBoard: TFavoriteBoardItem;
 	shiftDown: Boolean;
 begin
-	if (GikoForm.ClickNode = nil) then Exit;
+
+	if GikoForm.ClickNode = nil then Exit;
 
 	shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
 
 	if TObject( GikoForm.ClickNode.Data ) is TFavoriteThreadItem then begin
 		FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
-		if FavThread.Item <> nil then
-			GikoForm.DownloadContent(FavThread.Item, shiftDown);
+		ThreadItem := FavThread.Item;
+		if ThreadItem <> nil then
+			GikoForm.DownloadContent(ThreadItem, shiftDown);
 	end else if TObject( GikoForm.ClickNode.Data ) is TFavoriteBoardItem then begin
 		FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
-		GikoForm.DownloadList(FavBoard.Item, shiftDown);
+		Board := FavBoard.Item;
+		GikoForm.DownloadList(Board, shiftDown);
 	end;
 
 end;
@@ -717,26 +700,73 @@ end;
 //! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚ÌURL‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewURLCopyActionExecute(Sender: TObject);
+var
+	FavThread	: TFavoriteThreadItem;
+	FavBoard	: TFavoriteBoardItem;
+	s					: string;
 begin
 
 	if GikoForm.ClickNode = nil then Exit;
 
-	if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
-		Clipboard.AsText := TFavoriteItem( GikoForm.ClickNode.Data ).URL + #13#10;
+	if (TObject(GikoForm.ClickNode.Data) is TFavoriteThreadItem) then begin
+
+		FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
+		s := FavThread.URL + #13#10;
+		if s <> '' then
+			Clipboard.AsText := s;
+
+	end else if (TObject(GikoForm.ClickNode.Data) is TFavoriteBoardItem) then begin
+
+		FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
+		s := FavBoard.URL + #13#10;
+		if s <> '' then
+			Clipboard.AsText := s;
+
 	end;
 end;
 // *************************************************************************
 //! ‘I‘ð‚³‚ê‚Ä‚¢‚锂̖¼‘O‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewNameCopyActionExecute(Sender: TObject);
+var
+	ThreadItem: TThreadItem;
+	FavThread: TFavoriteThreadItem;
+	Board: TBoard;
+	FavBoard: TFavoriteBoardItem;
+	s: string;
 begin
 
 	if GikoForm.ClickNode = nil then Exit;
 
-	if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
-		Clipboard.AsText :=
-			TFavoriteItem(GikoForm.ClickNode.Data).GetItemTitle + #13#10;
+	if (TObject(GikoForm.ClickNode.Data) is TFavoriteThreadItem) then begin
+
+		FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
+		ThreadItem := FavThread.Item;
+
+		try
+			s := ThreadItem.Title + #13#10;
+			if s <> '' then
+				Clipboard.AsText := s;
+		finally
+		end;
+
+	end else if (TObject(GikoForm.ClickNode.Data) is TFavoriteBoardItem) then begin
+
+		FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
+		Board := FavBoard.Item;
+		if Board <> nil then
+			if not Board.IsThreadDatRead then
+				GikoSys.ReadSubjectFile(Board);
+
+		try
+			s := Board.Title + #13#10;
+			if s <> '' then
+				Clipboard.AsText := s;
+		finally
+		end;
+
 	end;
+
 end;
 // *************************************************************************
 //! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚Ì–¼‘O‚ÆURL‚ðƒRƒs[‚·‚é
@@ -744,15 +774,42 @@ end;
 procedure TGikoDM.FavoriteTreeViewNameURLCopyActionExecute(
   Sender: TObject);
 var
-	favItem : TFavoriteItem;
+	ThreadItem: TThreadItem;
+	FavThread: TFavoriteThreadItem;
+	Board: TBoard;
+	FavBoard: TFavoriteBoardItem;
+	s: string;
 begin
 
 	if GikoForm.ClickNode = nil then Exit;
 
-	if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
-		favItem := TFavoriteItem(GikoForm.ClickNode.Data);
-		Clipboard.AsText := favItem.GetItemTitle  + #13#10 +
-							favItem.URL + #13#10;
+	if (TObject(GikoForm.ClickNode.Data) is TFavoriteThreadItem) then begin
+
+		FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
+		ThreadItem := FavThread.Item;
+
+		try
+			s := ThreadItem.Title + #13#10 + ThreadItem.URL + #13#10;
+			if s <> '' then
+				Clipboard.AsText := s;
+		finally
+		end;
+
+	end else if (TObject(GikoForm.ClickNode.Data) is TFavoriteBoardItem) then begin
+
+		FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
+		Board := FavBoard.Item;
+		if Board <> nil then
+			if not Board.IsThreadDatRead then
+				GikoSys.ReadSubjectFile(Board);
+
+		try
+			s := Board.Title + #13#10 + Board.URL + #13#10;
+			if s <> '' then
+				Clipboard.AsText := s;
+		finally
+		end;
+
 	end;
 
 end;
@@ -810,50 +867,41 @@ begin
 
 	end;
 end;
-//! ƒŒƒX‚̍iž‚݃tƒBƒ‹ƒ^[‚ð‹ó‚É‚·‚é
-procedure TGikoDM.ClearResFilter;
-var
-	FilterList : TStringList;
-begin
-	// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
-	FilterList := TStringList.Create;
-	try
-		GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
-		GikoSys.FSelectResFilter.Reverse := False;
-	finally
-		FilterList.Free;
-	end;
-	GikoForm.SelectResWord := '';
-end;
-// *************************************************************************
-//! ƒŒƒX‚Ì•\Ž¦”͈͂ðÝ’è‚·‚é
-// *************************************************************************
-procedure TGikoDM.SetResRange(range: Integer);
-begin
-	if GikoSys.ResRange <> range then begin
-		GikoSys.ResRange	:= range;
-		// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
-		ClearResFilter;
-		GikoForm.RepaintAllTabsBrowser();
-	end;
-end;
 // *************************************************************************
 //! ÅV100ƒŒƒX‚Ì‚Ý•\Ž¦
 // *************************************************************************
 procedure TGikoDM.OnlyAHundredResActionExecute(Sender: TObject);
+var
+	FilterList : TStringList;
 begin
 	if (GikoForm.ActiveContent <> nil) and (GikoForm.ActiveContent.Browser <> nil)
 		and (GikoForm.ActiveContent.Browser.Busy) then Exit;
 
 	GikoForm.ResRangeMenuSelect 	:= 100;
 	OnlyAHundredResAction.Checked	:= True;
-	//@•\Ž¦”͈͂ðÝ’è‚·‚é
-	SetResRange(100);
+
+	if GikoSys.ResRange <> 100 then begin
+		GikoSys.ResRange	:= 100;
+
+		// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
+		FilterList := TStringList.Create;
+		try
+			GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+			GikoSys.FSelectResFilter.Reverse := False;
+		finally
+			FilterList.Free;
+		end;
+
+		GikoForm.SelectResWord := '';
+		GikoForm.RepaintAllTabsBrowser();
+	end;
 end;
 // *************************************************************************
 //! –¢“ǃŒƒX‚Ì‚Ý•\Ž¦
 // *************************************************************************
 procedure TGikoDM.OnlyKokoResActionExecute(Sender: TObject);
+var
+	FilterList : TStringList;
 begin
 	if (GikoForm.ActiveContent <> nil) and (GikoForm.ActiveContent.Browser <> nil)
 		and (GikoForm.ActiveContent.Browser.Busy) then Exit;
@@ -861,13 +909,28 @@ begin
 	GikoForm.ResRangeMenuSelect	:= Ord( grrKoko );
 	OnlyKokoResAction.Checked	:= True;
 
-	//@•\Ž¦”͈͂ðÝ’è‚·‚é
-	SetResRange(Ord( grrKoko ));
+	if GikoSys.ResRange <> Ord( grrKoko ) then begin
+		GikoSys.ResRange					:= Ord( grrKoko );
+
+		// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
+		FilterList := TStringList.Create;
+		try
+			GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+			GikoSys.FSelectResFilter.Reverse := False;
+		finally
+			FilterList.Free;
+		end;
+
+		GikoForm.SelectResWord := '';
+		GikoForm.RepaintAllTabsBrowser();
+	end;
 end;
 // *************************************************************************
 //! V’…ƒŒƒX‚Ì‚Ý•\Ž¦
 // *************************************************************************
 procedure TGikoDM.OnlyNewResActionExecute(Sender: TObject);
+var
+	FilterList : TStringList;
 begin
 	if (GikoForm.ActiveContent <> nil) and (GikoForm.ActiveContent.Browser <> nil)
 		and (GikoForm.ActiveContent.Browser.Busy) then Exit;
@@ -875,85 +938,21 @@ begin
 	GikoForm.ResRangeMenuSelect	:= Ord( grrNew );
 	OnlyNewResAction.Checked	:= True;
 
-	//@•\Ž¦”͈͂ðÝ’è‚·‚é
-	SetResRange(Ord( grrNew ));
-end;
-// *************************************************************************
-//! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒA’ʏí•\Ž¦‚É‚·‚é ’)ListOrientation = gloHorizontal@
-// *************************************************************************
-procedure TGikoDM.SetThreadAreaHorNormal;
-begin
-	//’ʏí•\Ž¦‚É‚·‚é
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
-	GikoForm.ViewPanel.Width := GikoForm.BrowserSizeWidth;
-	BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
-	BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
-	GikoSys.Setting.ListWidthState := glsNormal;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
-end;
-// *************************************************************************
-//! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒAÅ‘å/Å¬•\Ž¦‚É‚·‚é ’)ListOrientation = gloHorizontal@
-// *************************************************************************
-procedure TGikoDM.SetThreadAreaHorizontal(gls : TGikoListState);
-begin
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
-	if GikoSys.Setting.ListWidthState = glsNormal then
-		GikoForm.BrowserSizeWidth := GikoForm.ViewPanel.Width;
-	//Å‘å•\Ž¦
-	if (gls = glsMax) then begin
-		GikoForm.ViewPanel.Width := 1;
-		BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
-		BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
-		GikoSys.Setting.ListWidthState := glsMax;
-	end else if (gls = glsMin) then begin
-		GikoForm.ViewPanel.Width := GikoForm.ThreadMainPanel.Width - 80;
-		BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
-		BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
-		GikoSys.Setting.ListWidthState := glsMin;
-	end;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
-end;
-// *************************************************************************
-//! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒA’ʏí•\Ž¦‚É‚·‚é ’)ListOrientation = gloVertical
-// *************************************************************************
-procedure TGikoDM.SetThreadAreaVerNormal;
-begin
-	//’ʏí•\Ž¦‚É‚·‚é
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
-	GikoForm.ViewPanel.Height := GikoForm.BrowserSizeHeight;
-	BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
-	BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
-	GikoSys.Setting.ListHeightState := glsNormal;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
-end;
-// *************************************************************************
-//! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒAÅ‘å/Å¬•\Ž¦‚É‚·‚é ’)ListOrientation = gloVertical
-// *************************************************************************
-procedure TGikoDM.SetThreadAreaVertical(gls : TGikoListState);
-begin
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
-	if GikoSys.Setting.ListHeightState = glsNormal then
-		GikoForm.BrowserSizeHeight := GikoForm.ViewPanel.Height;
-	if (gls = glsMin) then begin
-		GikoForm.ViewPanel.Height := GikoForm.ThreadMainPanel.Height - GikoForm.BrowserCoolBar.Height - 7;
-		BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
-		BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
-		GikoSys.Setting.ListHeightState := glsMin;
-	end else if (gls = glsMax) then begin
-		GikoForm.ViewPanel.Height := 1;
-		BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
-		BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
-		GikoSys.Setting.ListHeightState := glsMax;
+	if GikoSys.ResRange <> Ord( grrNew ) then begin
+		GikoSys.ResRange					:= Ord( grrNew );
+
+		// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
+		FilterList := TStringList.Create;
+		try
+			GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+			GikoSys.FSelectResFilter.Reverse := False;
+		finally
+			FilterList.Free;
+		end;
+
+		GikoForm.SelectResWord := '';
+		GikoForm.RepaintAllTabsBrowser();
 	end;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 end;
 // *************************************************************************
 //! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒA‚ð‘å‚«‚­•\Ž¦‚·‚é
@@ -964,22 +963,54 @@ begin
 		case GikoSys.Setting.ListWidthState of
 			glsMax: begin
 				//’ʏí•\Ž¦‚É‚·‚é
-				SetThreadAreaHorNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				GikoForm.ViewPanel.Width := GikoForm.BrowserSizeWidth;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
+				GikoSys.Setting.ListWidthState := glsNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 			end;
 			glsMin, glsNormal: begin
 				//Å‘å•\Ž¦‚É‚·‚é
-				SetThreadAreaHorizontal(glsMax);
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				if GikoSys.Setting.ListWidthState = glsNormal then
+					GikoForm.BrowserSizeWidth := GikoForm.ViewPanel.Width;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
+				GikoForm.ViewPanel.Width := 1;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
+				BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
+				GikoSys.Setting.ListWidthState := glsMax;
 			end;
 		end;
 	end else begin
 		case GikoSys.Setting.ListHeightState of
 			glsMax: begin
 				//’ʏí•\Ž¦‚É‚·‚é
-				SetThreadAreaVerNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				GikoForm.ViewPanel.Height := GikoForm.BrowserSizeHeight;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
+				GikoSys.Setting.ListHeightState := glsNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 			end;
 			glsMin, glsNormal: begin
 				//Å‘å•\Ž¦‚É‚·‚é
-				SetThreadAreaVertical(glsMax);
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				if GikoSys.Setting.ListHeightState = glsNormal then
+					GikoForm.BrowserSizeHeight := GikoForm.ViewPanel.Height;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
+				GikoForm.ViewPanel.Height := 1;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
+				BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
+				GikoSys.Setting.ListHeightState := glsMax;
 			end;
 		end;
 	end;
@@ -993,22 +1024,54 @@ begin
 		case GikoSys.Setting.ListWidthState of
 			glsMax, glsNormal: begin
 				//Å¬•\Ž¦‚É‚·‚é
-				SetThreadAreaHorizontal(glsMin);
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				if GikoSys.Setting.ListWidthState = glsNormal then
+					GikoForm.BrowserSizeWidth := GikoForm.ViewPanel.Width;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
+				GikoForm.ViewPanel.Width := GikoForm.ThreadMainPanel.Width - 80;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
+				GikoSys.Setting.ListWidthState := glsMin;
 			end;
 			glsMin: begin
 				//’ʏí•\Ž¦‚É‚·‚é
-				SetThreadAreaHorNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				GikoForm.ViewPanel.Width := GikoForm.BrowserSizeWidth;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
+				GikoSys.Setting.ListWidthState := glsNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 			end;
 		end;
 	end else begin
 		case GikoSys.Setting.ListHeightState of
 			glsMax, glsNormal: begin
 				//Å¬•\Ž¦‚É‚·‚é
-				SetThreadAreaVertical(glsMin);
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				if GikoSys.Setting.ListHeightState = glsNormal then
+					GikoForm.BrowserSizeHeight := GikoForm.ViewPanel.Height;
+				GikoForm.ViewPanel.Height := GikoForm.ThreadMainPanel.Height - GikoForm.BrowserCoolBar.Height - 7;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_NORMAL;
+				GikoSys.Setting.ListHeightState := glsMin;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 			end;
 			glsMin: begin
 				//’ʏí•\Ž¦‚É‚·‚é
-				SetThreadAreaVerNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
+				GikoForm.ViewPanel.Height := GikoForm.BrowserSizeHeight;
+				BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
+				BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
+				GikoSys.Setting.ListHeightState := glsNormal;
+				if GikoForm.ActiveContent <> nil then
+					SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 			end;
 		end;
 	end;
@@ -1062,7 +1125,7 @@ begin
 	if Item = nil then Exit;
 	Editor := TEditorForm.Create(GikoForm.GetMainForm);
 	Editor.SetThreadItem(Item);
-	GikoSys.LoadKeySetting(Editor.ActionList, GikoSys.GetEditorKeyFileName);
+	GikoSys.LoadEditorKeySetting(Editor.ActionList);
 	Editor.Show;
 	Editor.BodyEdit.SetFocus;
 end;
@@ -1403,6 +1466,8 @@ end;
 //! ‘S‚ẴŒƒX‚ð•\Ž¦‚·‚é
 // *************************************************************************
 procedure TGikoDM.AllResActionExecute(Sender: TObject);
+var
+	FilterList : TStringList;
 begin
 	if(GikoForm.ActiveContent <> nil) and (GikoForm.ActiveContent.Browser <> nil )
 		and (GikoForm.ActiveContent.Browser.Busy) then Exit;
@@ -1410,8 +1475,22 @@ begin
 	GikoForm.ResRangeMenuSelect	:= Ord( grrAll );
 	AllResAction.Checked		:= True;
 
-	//@•\Ž¦”͈͂ðÝ’è‚·‚é
-	SetResRange(Ord( grrAll ));
+	if GikoSys.ResRange <> Ord( grrAll ) then begin
+		GikoSys.ResRange := Ord( grrAll );
+
+		// ƒtƒBƒ‹ƒ^•¶Žš—ñ‚ð‹ó‚É‚·‚é
+		FilterList := TStringList.Create;
+		try
+			GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+			GikoSys.FSelectResFilter.Reverse := False;
+		finally
+			FilterList.Free;
+		end;
+
+		GikoForm.SelectResWord := '';
+
+		GikoForm.RepaintAllTabsBrowser();
+	end;
 end;
 // *************************************************************************
 //! ƒŒƒX‚Ì•\Ž¦”͈͂ðÝ’è
@@ -1562,8 +1641,8 @@ begin
 	Dlg := TKeySettingForm.Create(GikoForm);
 	try
 		if Dlg.ShowModal = mrOk then begin
-			GikoSys.SaveKeySetting(GikoFormActionList, Setting.KEY_SETTING_FILE_NAME);
-			GikoSys.SaveKeySetting(Dlg.EditorForm.ActionList, Setting.KEY_SETTING_FILE_NAME);
+			GikoSys.SaveKeySetting(GikoFormActionList);
+			GikoSys.SaveEditorKeySetting(Dlg.EditorForm.ActionList);
 			GikoSys.Setting.Gestures.SaveGesture( GikoSys.Setting.GetGestureFileName );
 		end;
 
@@ -1822,7 +1901,7 @@ begin
 		//ƒƒOƒAƒEƒg
 		GikoSys.Dolib.Disconnect;
 		LoginAction.Checked := False;
-		GikoForm.AddMessageList(GikoSys.GetGikoMessage(gmLogout), nil, gmiOK);
+		GikoForm.AddMessageList(GikoSys.Setting.GetMessage(Ord(gmLogout)), nil, gmiOK);
 		LoginAction.Caption := 'ƒƒOƒCƒ“(&L)';
 	end else begin
 		TmpCursor := GikoForm.ScreenCursor;
@@ -1842,7 +1921,7 @@ begin
 				end;
 				if GikoSys.Dolib.Connect then begin
 					LoginAction.Checked := True;
-					GikoForm.AddMessageList(GikoSys.GetGikoMessage(gmLogin) + GikoSys.Setting.UserID, nil, gmiOK);
+					GikoForm.AddMessageList(GikoSys.Setting.GetMessage(Ord(gmLogin)) + GikoSys.Setting.UserID, nil, gmiOK);
 					LoginAction.Caption := 'ƒƒOƒAƒEƒg(&L)';
 					//LoginToolButton.Style := tbsCheck;
 				end else begin
@@ -1872,7 +1951,7 @@ begin
 					GikoSys.Dolib.ForcedConnect;
 					if GikoSys.Dolib.Connect then begin
 						LoginAction.Checked := True;
-						GikoForm.AddMessageList(GikoSys.GetGikoMessage(gmForceLogin) + GikoSys.Setting.UserID, nil, gmiOK);
+						GikoForm.AddMessageList(GikoSys.Setting.GetMessage(Ord(gmForceLogin)) + GikoSys.Setting.UserID, nil, gmiOK);
 						LoginAction.Caption := 'ƒƒOƒAƒEƒg(&L)';
 						//LoginToolButton.Style := tbsCheck;
 						end else begin
@@ -2043,9 +2122,9 @@ begin
 	end;
 end;
 // *************************************************************************
-//! ‘I‘ðƒXƒŒƒbƒh‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶‚·‚é
+//! ‘I‘ðƒXƒŒƒbƒh‚ðHTML‰»‚µ‚Ä•Û‘¶
 // *************************************************************************
-procedure TGikoDM.SelectThreadSaveToFile(dat: Boolean);
+procedure TGikoDM.SelectItemSaveForHTMLExecute(Sender: TObject);
 var
 	List: TList;
 	i: Integer;
@@ -2064,34 +2143,20 @@ begin
 		else if(List.Count = 0) then
 			ShowMessage('ƒXƒŒƒbƒh‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢')
 		else begin
-			if dat then begin
-				SaveDialog.Title := '‘I‘ðƒXƒŒƒbƒh‚ðdat‚Ì‚Ü‚Ü•Û‘¶';
-				SaveDialog.Filter := 'DATƒtƒ@ƒCƒ‹(*.dat)|*.dat';
-			end else begin
-				SaveDialog.Title := '‘I‘ðƒXƒŒƒbƒh‚ðHTML‰»‚µ‚Ä•Û‘¶';
-				SaveDialog.Filter := 'HTMLƒtƒ@ƒCƒ‹(*.html)|*.html';
-			end;
+			FileSaveAs1.Dialog.Title := '‘I‘ðƒXƒŒƒbƒh‚ðHTML‰»‚µ‚Ä•Û‘¶';
+			FileSaveAs1.Dialog.Filter := 'HTMLƒtƒ@ƒCƒ‹(*.html)|*.html';
 			for i := 0 to List.Count - 1 do begin
 				if (TObject(List[i]) is TThreadItem) and (TThreadItem(List[i]).IsLogFile) then begin
-					if dat then begin
-						SaveDialog.FileName := TThreadItem(List[i]).FileName;
-					end else begin
-						SaveDialog.FileName := ReplaseNoValidateChar(TThreadItem(List[i]).Title) + '.html';
-					end;
-					if SaveDialog.Execute then begin
-						if dat then begin
-							CopyFile(PChar(TThreadItem(List[i]).FilePath),
-									PChar(SaveDialog.FileName), true);
-						end else begin
-							html := TStringList.Create;
-							title := TThreadItem(List[i]).Title;
-							try
-								HTMLCreater.CreateHTML3(html, TThreadItem(List[i]), title);
-								html.SaveToFile(SaveDialog.FileName);
-								THTMLCreate.SkinorCSSFilesCopy(ExtractFilePath(SaveDialog.FileName));
-							finally
-								html.Free;
-							end;
+					FileSaveAs1.Dialog.FileName := ReplaseNoValidateChar(TThreadItem(List[i]).Title) + '.html';
+					if FileSaveAs1.Dialog.Execute then begin
+						html := TStringList.Create;
+						title := TThreadItem(List[i]).Title;
+						try
+							HTMLCreater.CreateHTML3(html, TThreadItem(List[i]), title);
+							html.SaveToFile(FileSaveAs1.Dialog.FileName);
+							THTMLCreate.SkinorCSSFilesCopy(ExtractFilePath(FileSaveAs1.Dialog.FileName));
+						finally
+							html.Free;
 						end;
 					end;
 				end;
@@ -2103,18 +2168,42 @@ begin
 	end;
 end;
 // *************************************************************************
-//! ‘I‘ðƒXƒŒƒbƒh‚ðHTML‰»‚µ‚Ä•Û‘¶
-// *************************************************************************
-procedure TGikoDM.SelectItemSaveForHTMLExecute(Sender: TObject);
-begin
-	SelectThreadSaveToFile(false);
-end;
-// *************************************************************************
 //! ‘I‘ðƒXƒŒƒbƒh‚ðDATŒ`Ž®‚Ì‚Ü‚Ü•Û‘¶
 // *************************************************************************
 procedure TGikoDM.SelectItemSaveForDatExecute(Sender: TObject);
+var
+	List: TList;
+	i: Integer;
 begin
-	SelectThreadSaveToFile(true);
+	List := TList.Create;
+	try
+		GikoForm.ScreenCursor := crHourGlass;
+		GikoForm.SelectListItem(List);
+		if ((GikoSys.Setting.ListOrientation = gloVertical) and
+			(GikoSys.Setting.ListHeightState = glsMax)) or
+			((GikoSys.Setting.ListOrientation = gloHorizontal) and
+			(GikoSys.Setting.ListWidthState = glsMax)) then
+			ShowMessage('ƒXƒŒƒbƒhˆê——‚ð•\Ž¦‚µ‚Ä‚­‚¾‚³‚¢')
+		else if(List.Count = 0) then
+			ShowMessage('ƒXƒŒƒbƒh‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢')
+		else begin
+			FileSaveAs1.Dialog.Title := '‘I‘ðƒXƒŒƒbƒh‚ðdat‚Ì‚Ü‚Ü•Û‘¶';
+			FileSaveAs1.Dialog.Filter := 'DATƒtƒ@ƒCƒ‹(*.dat)|*.dat';
+			for i := 0 to List.Count - 1 do begin
+				if (TObject(List[i]) is TThreadItem) and (TThreadItem(List[i]).IsLogFile) then begin
+					FileSaveAs1.Dialog.FileName := TThreadItem(List[i]).FileName;
+					if FileSaveAs1.Dialog.Execute then begin
+						CopyFile(PChar(TThreadItem(List[i]).FilePath),
+						PChar(FileSaveAs1.Dialog.FileName), true);
+					end;
+				end;
+			end;
+		end;
+	finally
+		GikoForm.ScreenCursor := crDefault;
+		List.Free;
+	end;
+
 end;
 // *************************************************************************
 //! ƒ^ƒu‚̏‡”Ô‚ð•Û‘¶
@@ -2227,7 +2316,7 @@ begin
 
 	Editor := TEditorForm.Create(GikoForm);
 	Editor.SetThreadItem(Item);
-	GikoSys.LoadKeySetting(Editor.ActionList, GikoSys.GetEditorKeyFileName); 
+	GikoSys.LoadEditorKeySetting(Editor.ActionList);
 	Editor.BodyEdit.Text := '>>' + IntToStr(Number) + #13#10;
 	Editor.Show;
 	Editor.BodyEdit.SetFocus;
@@ -3048,44 +3137,26 @@ begin
 
 end;
 // *************************************************************************
-//! ƒXƒŒˆê——‚Ì•\Ž¦‚µ‚Ä‚¢‚é“à—e‚É‚µ‚½‚ª‚Á‚āAƒ\[ƒgƒJƒ‰ƒ€‚̈ʒu‚Æ•ûŒü‚ðŽæ“¾‚·‚é
-// *************************************************************************
-function TGikoDM.GetSortProperties(List: TObject;
- var vSortOrder: Boolean): Boolean;
-begin
-	Result := True;
-	if (List <> nil) then begin
-		if (List is TBBS) then begin
-			vSortOrder := GikoSys.Setting.BBSSortOrder;
-		end else if (List is TCategory) then begin
-			vSortOrder := GikoSys.Setting.CategorySortOrder;
-		end else if (List is TBoard) then begin
-			vSortOrder := GikoSys.Setting.BoardSortOrder;
-		end else begin
-			Result := False;
-		end;
-	end else begin
-		Result := False;
-	end;
-end;
-// *************************************************************************
 //! Œ»Ý‚̃Jƒ‰ƒ€‚ðƒ\[ƒg‚·‚é
 // *************************************************************************
 procedure TGikoDM.SortActiveColumnActionExecute(Sender: TObject);
 var
 	i	: Integer;
 	so : boolean;
+	si : Integer;
 begin
-	if GetSortProperties(GikoForm.GetActiveList, so) then begin
-		for i := 0 to GikoForm.ListView.Columns.Count - 1 do begin
-			if (GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT1) or
-				(GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT2) then begin
-				so := not so;
-				TListViewUtils.ListViewSort(nil, GikoForm.ListView,
-					 GikoForm.ListView.Column[ i ], ListNumberVisibleAction.Checked,
-					 so);
-				break;
-			end;
+	for i := 0 to GikoForm.ListView.Columns.Count - 1 do begin
+		if (GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT1) or
+			(GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT2) then begin
+			GikoForm.SortOrder := not GikoForm.SortOrder;
+			so := GikoForm.SortOrder;
+			si := GikoForm.SortIndex;
+			TListViewUtils.ListViewSort(nil, GikoForm.ListView,
+				 GikoForm.ListView.Column[ i ], ListNumberVisibleAction.Checked,
+				 so, si );
+			GikoForm.SortIndex := si;
+			GikoForm.SortOrder := so;
+			break;
 		end;
 	end;
 end;
@@ -3095,6 +3166,8 @@ end;
 procedure TGikoDM.SortNextColumnActionExecute(Sender: TObject);
 var
 	i, id	: Integer;
+	so : boolean;
+	si : Integer;
 begin
 	for i := 0 to GikoForm.ListView.Columns.Count - 1 do begin
 		if (GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT1) or
@@ -3102,9 +3175,14 @@ begin
 			id := i + 1;
 			if id > GikoForm.ListView.Columns.Count - 1 then
 				id := 0;
+			GikoForm.SortOrder := id = 0;
+			so := GikoForm.SortOrder;
+			si := GikoForm.SortIndex;
 			TListViewUtils.ListViewSort( nil, GikoForm.ListView,
 				GikoForm.ListView.Column[ id ], ListNumberVisibleAction.Checked,
-				id = 0);
+				so, si );
+			GikoForm.SortIndex := si;
+			GikoForm.SortOrder := so;
 			break;
 		end;
 	end;
@@ -3115,6 +3193,8 @@ end;
 procedure TGikoDM.SortPrevColumnActionExecute(Sender: TObject);
 var
 	i, id	: Integer;
+	so : boolean;
+	si : Integer;
 begin
 	for i := 0 to GikoForm.ListView.Columns.Count - 1 do begin
 		if (GikoForm.ListView.Column[ i ].ImageIndex = ITEM_ICON_SORT1) or
@@ -3122,9 +3202,14 @@ begin
 			id := i - 1;
 			if id < 0 then
 				id := GikoForm.ListView.Columns.Count - 1;
+			GikoForm.SortOrder := id = 0;
+			so := GikoForm.SortOrder;
+			si := GikoForm.SortIndex;
 			TListViewUtils.ListViewSort( nil, GikoForm.ListView,
 				GikoForm.ListView.Column[ id ], ListNumberVisibleAction.Checked,
-				id = 0);
+				so, si );
+			GikoForm.SortIndex := si;
+			GikoForm.SortOrder := so;
 			break;
 		end;
 	end;
@@ -3649,20 +3734,33 @@ end;
 //! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚ðŠù“Ç‚É‚·‚é
 // *************************************************************************
 procedure TGikoDM.KidokuActionExecute(Sender: TObject);
+var
+	List: TList;
+	i: Integer;
 begin
-	SetThreadReadProperty(true);
+	List := TList.Create;
+	try
+		GikoForm.SelectListItem(List);
+		for i := 0 to List.Count - 1 do begin
+			if TObject(List[i]) is TThreadItem then begin
+				if (TThreadItem(List[i]).UnRead) then begin
+					TThreadItem(List[i]).UnRead := false;
+					TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead - 1;
+				end;
+			end;
+		end;
+		if GikoForm.TreeView.Visible then
+			GikoForm.TreeView.Refresh;
+		if GikoForm.ListView.Visible then
+			GikoForm.ListView.Refresh;
+	finally
+		List.Free;
+	end;
 end;
 // *************************************************************************
 //! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚𖢓ǂɂ·‚é
 // *************************************************************************
 procedure TGikoDM.MidokuActionExecute(Sender: TObject);
-begin
-	SetThreadReadProperty(false);
-end;
-// *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚Ì–¢“ǁEŠù“Ç‚ðÝ’è‚·‚é   true : Šù“Ç false : –¢“Ç
-// *************************************************************************
-procedure TGikoDM.SetThreadReadProperty(read: Boolean);
 var
 	List: TList;
 	i: Integer;
@@ -3672,8 +3770,9 @@ begin
 		GikoForm.SelectListItem(List);
 		for i := 0 to List.Count - 1 do begin
 			if TObject(List[i]) is TThreadItem then begin
-				if (TThreadItem(List[i]).IsLogFile) then begin
-					TThreadItem(List[i]).UnRead := not read;
+				if (TThreadItem(List[i]).IsLogFile) and (not TThreadItem(List[i]).UnRead) then begin
+					TThreadItem(List[i]).UnRead := true;
+					TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead + 1;
 				end;
 			end;
 		end;
@@ -3700,88 +3799,5 @@ begin
 	AllSelectAction.Enabled := GikoForm.ListView.SelCount > 0;
 end;
 ////////////////////////////////•ÒW‚Ü‚Å‚¨‚µ‚Ü‚¢/////////////////////
-//! ƒXƒŒƒbƒh‚̃TƒCƒY‚ðÄŒvŽZ‚·‚é
-procedure TGikoDM.ThreadSizeCalcForFileActionExecute(Sender: TObject);
-const
-	RECALC_MES : String = 'ƒXƒŒƒbƒh‚Ì—e—Ê‚ðƒtƒ@ƒCƒ‹‚©‚çÄŒvŽZ‚µ‚Ü‚·B'#13#10 +
-							'‚±‚Ì‘€ì’†AƒMƒRƒiƒr‚Ì‘¼‚Ì‘€ì‚ð‚·‚é‚ƃf[ƒ^‚ª”j‰ó‚³‚ê‚é‹°‚ꂪ‚ ‚è‚Ü‚·B' +
-							'‚Ü‚½‚±‚Ì‘€ì‚́A”ñí‚ÉŽžŠÔ‚ª‚©‚©‚éê‡‚ª‚ ‚è‚Ü‚·‚ªA‚æ‚낵‚¢‚Å‚·‚©H';
-	RECALC_TITLE : String = 'ƒXƒŒƒbƒh‚Ì—e—Ê‚ðƒtƒ@ƒCƒ‹‚©‚çÄŒvŽZ';
-	LIMIT_SIZE = 1024;
-var
-	limitSize : Integer;
-	limitStr  : String;
-begin
-{ ‚Ü‚¸AŽžŠÔ‚ª‚©‚©‚邱‚Æ‚ðŒx‚·‚郁ƒbƒZ[ƒW‚ðo—Í
-  ÄŒvŽZ‚·‚éƒXƒŒƒbƒh‚̃TƒCƒY‚Ì臒liƒfƒtƒHƒ‹ƒg1024B)‚ðŠm”F
-  ƒvƒ‰ƒOƒCƒ“‚ð—˜—p‚µ‚È‚¢‚Æ‚±‚ë‚Å‘S‚ẴƒO—L‚èƒXƒŒƒbƒh‚ðŒŸõ
-  臒lˆÈ‰º‚̃TƒCƒY‚̏ꍇADAT‚̃tƒ@ƒCƒ‹ƒTƒCƒY‚Æ”äŠrA‚¸‚ê‚Ä‚¢‚ê‚΁A
-  DAT‚̃tƒ@ƒCƒ‹ƒTƒCƒY‚ōXV‚·‚é
-}
-	if MsgBox(GikoForm.Handle, RECALC_MES,
-		RECALC_TITLE, MB_YESNO or MB_ICONWARNING) = ID_YES then begin
-		//臒l‚ÌŠm”F
-		limitSize := LIMIT_SIZE;
-		limitStr  := IntToStr(limitSize);
-		if InputQuery('臒l“ü—Í', 'Žw’肵‚½”’l BˆÈ‰º‚Ì—e—ʂ̃XƒŒƒbƒh‚̂ݍČvŽZ‚µ‚Ü‚·', limitStr) then begin
-			limitSize := StrToInt(MojuUtils.ZenToHan(limitStr));
-			if (limitSize < 0) then begin
-				ShowMessage('臒l‚É•‰‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñI');
-				ThreadSizeCalcForFileActionExecute(nil);
-			end else begin
-				RecalcThreadSize(limitSize);
-			end;
-		end;
-	end;
-end;
-//! limit‚æ‚è‚àƒTƒCƒY‚̏¬‚³‚¢ƒXƒŒƒbƒh‚Ì—e—Ê‚ðDATƒtƒ@ƒCƒ‹‚©‚çŒvŽZ
-procedure TGikoDM.RecalcThreadSize(limit : Integer);
-var
-	i, j, tmpSize : Integer;
-	Obj   : TObject;
-	Board : TBoard;
-	Thread: TThreadItem;
-	dat   : TStringList;
-begin
-	// ÄŒvŽZƒXƒ^[ƒg@ƒvƒ‰ƒOƒCƒ“‚ð—˜—p‚µ‚È‚¢‚Æ‚±‚ë‚ð‘S•”Œ©‚éI
-	GikoForm.ScreenCursor := crHourGlass;
-	try
-		GikoForm.ProgressBar.Max := BoardGroups[0].Count;
-		for i := 0 to BoardGroups[0].Count - 1 do begin
-			Obj := BoardGroups[0].Objects[i];
-			if (Obj <> nil) then begin
-				Board := TBoard(Obj);
-				if not Board.IsThreadDatRead then begin
-					GikoSys.ReadSubjectFile(Board);
-				end;
-				for j := 0 to Board.Count - 1 do begin
-					Thread := Board.Items[j];
-					if (Thread <> nil) and (Thread.IsLogFile)
-						and (Thread.Size <= limit) then begin
-						dat := TStringList.Create;
-						try
-							tmpSize := Thread.Size;
-							try
-								dat.LoadFromFile(Thread.GetThreadFileName);
-								tmpSize := Length(dat.Text);
-								tmpSize := tmpSize - dat.Count;
-							except
-							end;
-							Thread.Size := tmpSize;
-						finally
-							dat.Free;
-						end;
-					end;
-				end;
-			end;
-			GikoForm.ProgressBar.StepBy(1);
-		end;
-	finally
-		GikoForm.ScreenCursor := crDefault;
-	end;
-	GikoForm.ProgressBar.Position := 0;
-	ShowMessage('ŒvŽZI—¹‚µ‚Ü‚µ‚½B');
-end;
-
 end.
 

--- a/GikoMessage.pas
+++ /dev/null
@@ -1,68 +0,0 @@
-unit GikoMessage;
-
-interface
-
-uses
-	Classes, IniFiles;
-
-type
-	//! MessageList
-	TGikoMessageListType = (gmLogout, gmLogin, gmForceLogin, gmSureItiran,
-			gmUnKnown, gmSureSyutoku, gmSureDiff, gmNotMod, gmAbort, gmError,
-			gmNewRes, gmNewSure, gmResError, gmSureError);
-
-	TGikoMessage = class(THashedStringList)
-	private
-	public
-		constructor Create;
-		function GetMessage(MesType: TGikoMessageListType): String;
-	end;
-
-implementation
-
-const
-	DEF_MESSAGES : array[0..13] of string = (  'ƒƒOƒAƒEƒg‚µ‚Ü‚µ‚½',
-											   'ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
-											   '‹­§ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
-											   '[ƒXƒŒˆê——Žæ“¾Š®—¹]',
-											   '(–¼Ì•s–¾j',
-											   '[ƒXƒŒŽæ“¾Š®—¹]',
-											   '[ƒXƒŒ·•ªŽæ“¾Š®—¹]',
-											   '[–¢XV]',
-											   '[’†’f]',
-											   '[ƒGƒ‰[]',
-											   '[ƒŒƒX‘—MI—¹]',
-											   '[VƒXƒŒ‘—MI—¹]',
-											   '[ƒŒƒX‘—MŽ¸”s]',
-											   '[VƒXƒŒ‘—MŽ¸”s]');
-
-	MESSAGE_KEYS : array[0..13] of String = ( 'Logout', 'Login',
-											'ForceLogin', 'SureItiran',
-											'UnKnown', 'SureSyutoku',
-											'SureDiff', 'NotMod',
-											'Abort', 'Error',
-											'NewRes', 'NewSure',
-											'ResError', 'SureError');
-
-constructor TGikoMessage.Create;
-begin
-	inherited Create;
-	Self.Sorted := true;
-	Self.Duplicates := dupIgnore;
-end;
-//! MesType‚ÅŽw’肳‚ꂽƒƒbƒZ[ƒW•¶Žš—ñ‚ðŽæ“¾‚·‚é
-function TGikoMessage.GetMessage(MesType: TGikoMessageListType): String;
-begin
-	Result := '';
-	if MesType in [gmLogout..gmSureError] then begin
-		//Key‚ÅŒŸõ‚µ‚ÄŒ©‚‚©‚ê‚΂»‚ê‚ð•Ô‚·
-		Result := Self.Values[MESSAGE_KEYS[Ord(MesType)]];
-		if Result = '' then begin
-			//Œ©‚‚©‚ç‚È‚¢‚̂ŁAƒfƒtƒHƒ‹ƒg‚Å•Ô‚·
-			Result := DEF_MESSAGES[Ord(MesType)];
-		end;
-	end;
-end;
-
-end.
- 
\ No newline at end of file

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -4,7 +4,7 @@ interface
 
 uses
 	Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-	ComCtrls, {IniFiles,} ShellAPI, ActnList, Math,
+	ComCtrls, IniFiles, ShellAPI, ActnList, Math,
 {$IF Defined(DELPRO) }
 	SHDocVw,
 	MSHTML,
@@ -12,10 +12,10 @@ uses
 	SHDocVw_TLB,
 	MSHTML_TLB,
 {$IFEND}
-	{HttpApp,} URLMon, IdGlobal, IdURI, {Masks,}
+	{HttpApp,} YofUtils, URLMon, IdGlobal, IdURI, {Masks,}
 	Setting, BoardGroup, gzip, Dolib, bmRegExp, AbonUnit,
 	ExternalBoardManager, ExternalBoardPlugInMain,
-	GikoBayesian, GikoMessage;
+	Sort, GikoBayesian;
 
 type
 	TVerResourceKey = (
@@ -76,9 +76,6 @@ type
 		FCount: Integer;
 	end;
 
-	//! ƒŒƒXƒŒƒR[ƒh‚ւ̃|ƒCƒ“ƒ^
-	PResRec = ^TResRec;
-
 	//! ƒŒƒXƒŒƒR[ƒh
 	TResRec = record
 		FTitle: string;
@@ -102,6 +99,11 @@ type
 		FNoParam: Boolean;  //!< ƒŒƒX”Ôƒpƒ‰ƒ[ƒ^‚È‚µ
 	end;
 
+	//! MessageList
+	TGikoMessageListType = (gmLogout, gmLogin, gmForceLogin, gmSureItiran,
+			gmUnKnown, gmSureSyutoku, gmSureDiff, gmNotMod, gmAbort, gmError,
+			gmNewRes, gmNewSure, gmResError, gmSureError);
+
 	TGikoSys = class(TObject)
 	private
 		{ Private éŒ¾ }
@@ -111,7 +113,8 @@ type
 		FResRange : Longint;
 		FBayesian	: TGikoBayesian;	//!< ƒxƒCƒWƒAƒ“ƒtƒBƒ‹ƒ^
 		FVersion : String;		      //!< ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“
-		FGikoMessage: TGikoMessage;
+//		FExitWrite: TStringList;
+//		function StrToFloatDef(s: string; Default: Double): Double;
 	public
 		{ Public éŒ¾ }
 		FAbon : TAbon;
@@ -150,8 +153,6 @@ type
 		function GetUserAgent: string;
 				function GetSambaFileName : string;
 
-		function GetMainKeyFileName : String;
-		function GetEditorKeyFileName: String;
 		procedure ReadSubjectFile(Board: TBoard);
 		procedure CreateThreadDat(Board: TBoard);
 		procedure WriteThreadDat(Board: TBoard);
@@ -172,6 +173,7 @@ type
 
 		function GetFileSize(FileName : string) : longint;
 		function GetFileLineCount(FileName : string): longint;
+		function Get2chDate(aDate: TDateTime): string;
 		function IntToDateTime(val: Int64): TDateTime;
 		function DateTimeToInt(ADate: TDateTime): Int64;
 
@@ -181,13 +183,17 @@ type
 
 		function RemoveToken(var s:string; const delimiter:string):string;
 		function GetTokenIndex(s: string; delimiter: string; index: Integer): string;
+		function DeleteLink(const s: string): string;
 
 		function GetShortName(const LongName: string; ALength: integer): string;
 		function BoolToInt(b: Boolean): Integer;
 		function IntToBool(i: Integer): Boolean;
 		function GzipDecompress(ResStream: TStream; ContentEncoding: string): string;
-		procedure LoadKeySetting(ActionList: TActionList; FileName: String);
-		procedure SaveKeySetting(ActionList: TActionList; FileName: String);
+		procedure LoadKeySetting(ActionList: TActionList);
+		procedure SaveKeySetting(ActionList: TActionList);
+		procedure LoadEditorKeySetting(ActionList: TActionList);
+		procedure SaveEditorKeySetting(ActionList: TActionList);
+
 		procedure CreateProcess(const AppPath: string; const Param: string);
 		procedure OpenBrowser(URL: string; BrowserType: TGikoBrowserType);
 		function HTMLDecode(const AStr: String): String;
@@ -241,10 +247,6 @@ type
 		//! IE‚̃o[ƒWƒ‡ƒ“î•ñ‚̎擾
 		function GetIEVersion: string;
 		function SetUserOptionalStyle(): string;
-		//! ƒMƒRƒiƒr‚̃ƒbƒZ[ƒW‚ðÝ’è‚·‚é
-		procedure SetGikoMessage;
-		//! ƒMƒRƒiƒr‚̃ƒbƒZ[ƒW‚ðŽæ“¾‚·‚é
-		function GetGikoMessage(MesType: TGikoMessageListType): String;
 	end;
 
 var
@@ -263,8 +265,7 @@ const
 implementation
 
 uses
-	Giko, RoundData, Favorite, Registry, HTMLCreate, MojuUtils, Sort, YofUtils,
-	IniFiles;
+	Giko, RoundData, Favorite, Registry, HTMLCreate, MojuUtils;
 
 const
 	FOLDER_INDEX_VERSION					= '1.01';
@@ -321,8 +322,6 @@ begin
 	FVersion := Trim(GetVersionInfo(vrFileVersion));
 	FBayesian := TGikoBayesian.Create;
 	//FBoardURLList := TStringList.Create;
-	//ƒƒbƒZ[ƒW‚̍쐬
-	FGikoMessage := TGikoMessage.Create;
 end;
 
 // *************************************************************************
@@ -343,7 +342,6 @@ begin
 	FDolib.Free;
 	FAbon.Free;
 	FSelectResFilter.Free;
-    FGikoMessage.Free;
 	//FBoardURLList.Free;
 	//ƒeƒ“ƒ|ƒ‰ƒŠHTML‚ðíœ
 	FileList := TStringList.Create;
@@ -525,6 +523,19 @@ begin
 end;
 
 {!
+\brief ‚Q‚¿‚á‚ñ‚Ë‚é•ûŽ®ŽžŽæ“¾
+\param  •ÏŠ·‚·‚鎞
+\return 2‚¿‚á‚ñ‚Ë‚é•ûŽ®‚ÅŽž‚ð•\‚µ‚½•¶Žš—ñ
+}
+function TGikoSys.Get2chDate(aDate: TDateTime): string;
+var
+	d2: TDateTime;
+begin
+	d2 := aDate - EncodeTime(9, 0, 0, 0);
+	Result := FloatToStr(Trunc((d2 - ZERO_DATE) * 86400));
+end;
+
+{!
 \brief Œo‰ß•b‚ð TDateTime ‚É•ÏŠ·
 \param val 1970/1/1/ 00:00:00 ‚©‚ç‚ÌŒo‰ß•b
 \return val ‚ðŽ¦‚· TDateTime
@@ -699,13 +710,13 @@ begin
 					Board.BoardPlugIn,
 					Board,
 					Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), FileList[i] ) );
-				THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
+				ResRec := DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ));
 			end else begin
 				ThreadItem := TThreadItem.Create(
 					nil,
 					Board,
 					Get2chBoard2ThreadURL( Board, ChangeFileExt( FileList[i], '' ) ) );
-				THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
+				ResRec := DivideStrLine(ReadThreadFile(FileName, 1));
 			end;
 
 			ThreadItem.BeginUpdate;
@@ -720,7 +731,7 @@ begin
 			ThreadItem.RoundDate := ZERO_DATE;
 			ThreadItem.LastModified := ZERO_DATE;
 			ThreadItem.Kokomade := -1;
-			ThreadItem.NewReceive := 0;
+			ThreadItem.NewReceive := ThreadItem.Count;
 			ThreadItem.ParentBoard := Board;
 			ThreadItem.IsLogFile := True;
 			ThreadItem.Round := False;
@@ -1405,6 +1416,39 @@ begin
 		Result := RemoveToken(s, delimiter);
 end;
 
+{!
+\brief HTML ‚©‚çƒAƒ“ƒJ[ƒ^ƒO‚ðíœ
+\param s Œ³‚É‚È‚é HTML
+\return  ƒAƒ“ƒJ[ƒ^ƒO‚ªíœ‚³‚ꂽ HTML
+}
+function TGikoSys.DeleteLink(const s: string): string;
+var
+	s1: string;
+	s2: string;
+	idx: Integer;
+	i: Integer;
+begin
+	i := 0;
+	Result := '';
+	while True do begin
+		s1 := GetTokenIndex(s, '<a href="', i);
+		s2 := GetTokenIndex(s, '<a href="', i + 1);
+
+		idx := Pos('">', s1);
+		if idx <> 0 then
+			Delete(s1, 1, idx + 1);
+		idx := Pos('">', s2);
+		if idx <> 0 then
+			Delete(s2, 1, idx + 1);
+
+		Result := Result + s1 + s2;
+
+		if s2 = '' then
+			Break;
+
+		inc(i, 2);
+	end;
+end;
 
 //ƒCƒ“ƒfƒbƒNƒX–¢XVƒoƒbƒtƒ@‚ðƒtƒ‰ƒbƒVƒ…I
 {procedure TGikoSys.FlashExitWrite;
@@ -1554,9 +1598,11 @@ end;
 {!
 \brief ƒAƒNƒVƒ‡ƒ“‚ɃVƒ‡[ƒgƒJƒbƒgƒL[‚ðÝ’è
 \param ActionList Ý’è‚·‚éƒAƒNƒVƒ‡ƒ“ˆê——
-\param FileName Iniƒtƒ@ƒCƒ‹‚Ì–¼‘O
+\todo STD_SEC ‚ð GetXXXFileName() ‚É’Ç‚¢o‚¹
+
+KeySetting.ini ‚É•Û‘¶‚³‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ð ActionList ‚ɐݒ肵‚Ü‚·B
 }
-procedure TGikoSys.LoadKeySetting(ActionList: TActionList; FileName: String);
+procedure TGikoSys.LoadKeySetting(ActionList: TActionList);
 const
 	STD_SEC = 'KeySetting';
 var
@@ -1567,10 +1613,10 @@ var
 	SecList: TStringList;
 	Component: TComponent;
 begin
-	if not FileExists(fileName) then
+	if not FileExists(GetConfigDir + KEY_SETTING_FILE_NAME) then
 		Exit;
 	SecList := TStringList.Create;
-	ini := TMemIniFile.Create(fileName);
+	ini := TMemIniFile.Create(GetConfigDir + KEY_SETTING_FILE_NAME);
 	try
 		ini.ReadSection(STD_SEC, SecList);
 		for i := 0 to SecList.Count - 1 do begin
@@ -1592,18 +1638,18 @@ end;
 {!
 \brief ƒAƒNƒVƒ‡ƒ“‚ɐݒ肳‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶
 \param ActionList •Û‘¶‚·‚éƒAƒNƒVƒ‡ƒ“ˆê——
-\param FileName Iniƒtƒ@ƒCƒ‹–¼
+\todo STD_SEC ‚ð GetXXXFileName() ‚É’Ç‚¢o‚¹
 
-ActionList ‚ɐݒ肳‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ð FileName ‚É•Û‘¶‚µ‚Ü‚·B
+ActionList ‚ɐݒ肳‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ð KeySetting.ini ‚É•Û‘¶‚µ‚Ü‚·B
 }
-procedure TGikoSys.SaveKeySetting(ActionList: TActionList; FileName: String);
+procedure TGikoSys.SaveKeySetting(ActionList: TActionList);
 const
 	STD_SEC = 'KeySetting';
 var
 	i: Integer;
 	ini: TMemIniFile;
 begin
-	ini := TMemIniFile.Create(GetConfigDir + FileName);
+	ini := TMemIniFile.Create(GetConfigDir + KEY_SETTING_FILE_NAME);
 	try
 		for i := 0 to ActionList.ActionCount - 1 do begin
 			if ActionList.Actions[i].Tag = -1 then
@@ -1616,6 +1662,74 @@ begin
 	end;
 end;
 
+{!
+\brief ƒŒƒXƒGƒfƒBƒ^‚̃AƒNƒVƒ‡ƒ“‚ɃVƒ‡[ƒgƒJƒbƒg‚ðÝ’è
+\param ActionList Ý’è‚·‚éƒAƒNƒVƒ‡ƒ“ˆê——
+\todo STD_SEC, EKEY_SETTING_FILE_NAME ‚ð GetXXXFileName() ‚É’Ç‚¢o‚¹
+\todo LoadKeySetting ‚Æ“‡‚¹‚æ
+
+ƒtƒ@ƒCƒ‹‚É•Û‘¶‚³‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ð ActionList ‚ɐݒ肵‚Ü‚·B
+}
+procedure TGikoSys.LoadEditorKeySetting(ActionList: TActionList);
+const
+	STD_SEC = 'KeySetting';
+var
+	i: Integer;
+	ini: TMemIniFile;
+	ActionName: string;
+	ActionKey: Integer;
+	SecList: TStringList;
+	Component: TComponent;
+begin
+	if not FileExists(GetConfigDir + EKEY_SETTING_FILE_NAME) then
+		Exit;
+	SecList := TStringList.Create;
+	ini := TMemIniFile.Create(GetConfigDir + EKEY_SETTING_FILE_NAME);
+	try
+		ini.ReadSection(STD_SEC, SecList);
+		for i := 0 to SecList.Count - 1 do begin
+			ActionName := SecList[i];
+			ActionKey := ini.ReadInteger(STD_SEC, ActionName, -1);
+			if ActionKey <> -1 then begin
+				Component := ActionList.Owner.FindComponent(ActionName);
+				if TObject(Component) is TAction then begin
+					TAction(Component).ShortCut := ActionKey;
+				end;
+			end;
+		end;
+	finally
+		ini.Free;
+		SecList.Free;
+	end;
+end;
+
+{!
+\brief ƒŒƒXƒGƒfƒBƒ^‚ɐݒ肳‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶
+\param ActionList •Û‘¶‚·‚éƒAƒNƒVƒ‡ƒ“ˆê——
+\todo STD_SEC, EKEY_SETTING_FILE_NAME ‚ð GetXXXFileName() ‚É’Ç‚¢o‚¹
+\todo LoadKeySetting ‚Æ“‡‚¹‚æ
+
+ActionList ‚ɐݒ肳‚ê‚Ä‚¢‚éƒVƒ‡[ƒgƒJƒbƒgƒL[‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·B
+}
+procedure TGikoSys.SaveEditorKeySetting(ActionList: TActionList);
+const
+	STD_SEC = 'KeySetting';
+var
+	i: Integer;
+	ini: TMemIniFile;
+begin
+	ini := TMemIniFile.Create(GetConfigDir + EKEY_SETTING_FILE_NAME);
+	try
+		for i := 0 to ActionList.ActionCount - 1 do begin
+			if ActionList.Actions[i].Tag = -1 then
+				Continue;
+			ini.WriteInteger(STD_SEC, ActionList.Actions[i].Name, TAction(ActionList.Actions[i]).ShortCut);
+		end;
+		ini.UpdateFile;
+	finally
+		ini.Free;
+	end;
+end;
 
 {!
 \brief ƒvƒƒZƒX‚̐¶¬
@@ -2805,11 +2919,7 @@ begin
 				finally
 						body.Free;
 				end;
-
-		Result := HTMLCreater.ConvRes(
-			Result,
-			ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''),
-			'bbs', 'key', 'st', 'to', 'nofirst', 'true', false);
+		Result := HTMLCreater.ConvRes(Result, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', false);
 		end;
 end;
 
@@ -2836,7 +2946,7 @@ begin
 
 			for i := 0 to threadItem.Count - 1 do begin
 				// ƒŒƒX
-				THTMLCreate.DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), i + 1), @Res);
+				Res := DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), i + 1));
 				if(AnsiPos(AID, Res.FDateTime) > 0) then begin
 					body.Add(IntToStr(i+1));
 				end;
@@ -2846,7 +2956,7 @@ begin
 			try
 				ReadList.LoadFromFile(ThreadItem.GetThreadFileName);
 				for i := 0 to ReadList.Count - 1 do begin
-					THTMLCreate.DivideStrLine(ReadList[i], @Res);
+					Res := DivideStrLine(ReadList[i]);
 					if AnsiPos(AID, Res.FDateTime) > 0 then begin
 						body.Add(IntToStr(i+1));
 					end;
@@ -2888,11 +2998,7 @@ begin
 		finally
 			body.Free;
 		end;
-		Result := HTMLCreater.ConvRes(
-					Result, ThreadItem.ParentBoard.BBSID,
-					ChangeFileExt(ThreadItem.FileName, ''),
-					'bbs', 'key', 'st', 'to', 'nofirst', 'true',
-					false);
+		Result := HTMLCreater.ConvRes(Result, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', false);
 	end;
 end;
 
@@ -2917,9 +3023,9 @@ begin
 			//===== ƒvƒ‰ƒOƒCƒ“‚É‚æ‚é•\Ž¦
 			//boardPlugIn		:= ThreadItem.BoardPlugIn;
             boardPlugIn		:= ThreadItem.ParentBoard.BoardPlugIn;
-			THTMLCreate.DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), AIDNum), @Res);
+			Res := DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), AIDNum));
 		end else begin
-			THTMLCreate.DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum), @Res);
+			Res := DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum));
 		end;
 		AID := Res.FDateTime;
 		if AnsiPos('id', AnsiLowerCase(AID)) > 0 then begin
@@ -3238,44 +3344,7 @@ begin
 		R.Free;
 	end;
 end;
-//! mainƒtƒH[ƒ€‚̃Vƒ‡[ƒgƒJƒbƒgƒL[‚ÌIniƒtƒ@ƒCƒ‹–¼
-function TGikoSys.GetMainKeyFileName : String;
-begin
-	Result := Setting.GetMainKeyFileName;
-end;
-//! EditorƒtƒH[ƒ€‚̃Vƒ‡[ƒgƒJƒbƒgƒL[‚ÌIniƒtƒ@ƒCƒ‹–¼
-function TGikoSys.GetEditorKeyFileName: String;
-begin
-	Result := Setting.GetEditorKeyFileName;
-end;
 
-//! ƒMƒRƒiƒr‚̃ƒbƒZ[ƒW‚ðÝ’è‚·‚é
-procedure TGikoSys.SetGikoMessage;
-begin
-	if FGikoMessage = nil then begin
-		FGikoMessage := TGikoMessage.Create;
-	end else begin
-		FGikoMessage.Clear;
-	end;
-
-	if (Setting.GengoSupport) then begin
-		try
-			if (FileExists(Setting.GetLanguageFileName)) then begin
-				FGikoMessage.LoadFromFile(Setting.GetLanguageFileName);
-			end;
-		except
-			FGikoMessage.Clear;
-		end;
-	end;
-end;
-//! ƒMƒRƒiƒr‚̃ƒbƒZ[ƒW‚ðŽæ“¾‚·‚é
-function TGikoSys.GetGikoMessage(MesType: TGikoMessageListType): String;
-begin
-    Result := '';
-	if FGikoMessage <> nil then begin
-		Result := FGikoMessage.GetMessage(MesType);
-	end;
-end;
 
 initialization
 	GikoSys := TGikoSys.Create;

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -18,13 +18,6 @@ uses
 	{Sort,} ,GikoBayesian, HintWindow;
 
 type
-
-	PResLinkRec = ^TResLinkRec;
-	TResLinkRec = record
-		FBbs: string;
-		FKey : string;
-	end;
-
 	THTMLCreate = class(TObject)
 	private
 		{ Private éŒ¾ }
@@ -42,18 +35,15 @@ type
 		procedure CreateUseSKINHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList);
 		procedure CreateUseCSSHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 		procedure CreateDefaultHTML (doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
-		procedure ConvertResAnchor(PRes: PResRec);
+		function ConvertResAnchor(res: string): string;
 		procedure separateNumber(var st: String; var et: String; const Text, Separator: String);
-		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;
 	public
 		{ Public éŒ¾ }
-		procedure AddAnchorTag(PRes: PResRec);
+		function AddAnchorTag(s: string): string;
 		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 SkinedRes(skin: string; Res: TResRec; No: string): string;
 		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string; DatToHTML: boolean = false): string; overload;
+//		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue, FullURL : string): string; overload;
 		procedure CreateHTML2(doc: Variant; ThreadItem: TThreadItem; var sTitle: string);
 		procedure CreateHTML3(var html: TStringList; ThreadItem: TThreadItem; var sTitle: string);
 		//ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̍쐬
@@ -62,10 +52,6 @@ type
 		class function GetRespopupURL(AText, AThreadURL : string): string;
 		//Žw’肵‚½ƒpƒX‚ɃXƒLƒ“‚à‚µ‚­‚ÍCSS‚̃tƒ@ƒCƒ‹‚̃Rƒs[‚ðì‚é
 		class procedure SkinorCSSFilesCopy(path: string);
-		//dat‚Ps‚ðƒŒƒX‚É•ª‰ð‚·‚é
-		class procedure DivideStrLine(Line: string; PRes: PResRec);
-        //HTML‚©‚烊ƒ“ƒNƒ^ƒO‚ðíœ‚·‚é
-		class function DeleteLink(const s: string): string;
 	end;
 
 var
@@ -170,70 +156,58 @@ end;
 
 // ƒŒƒX‚Ì’l‚ð’uŠ·‚·‚é
 function THTMLCreate.SkinedRes(
-	const skin: string;
-	PRes: PResRec;
-	const No: string
+	skin: string;
+	Res: TResRec;
+	No: string
 ): string;
-const
-	FORMT_NAME = '<b>%s</b>';
-	FORMT_NUM  = '<a href="menu:%s" name="%s">%s</a>';
-	FORMT_MAILNAME  = '<a href="mailto:%s"><b>%s</b></a>';
 var
 	spamminess	: Extended;
-{$IFDEF SPAM_FILTER_ENABLED}
 	wordCount		: TWordCount;
-{$ENDIF}
 begin
-{$IFDEF SPAM_FILTER_ENABLED}
+
 	wordCount := TWordCount.Create;
 	try
 		spamminess := Floor( GikoSys.SpamParse(
 			Res.FName + '<>' + Res.FMailTo + '<>' + Res.FBody, wordCount ) * 100 );
-{$ELSE}
-	spamminess := 0;
-{$ENDIF}
-		Result := CustomStringReplace( skin, '<SPAMMINESS/>', FloatToStr( spamminess ) );
-		Result := CustomStringReplace( Result, '<NONSPAMMINESS/>', FloatToStr( 100 - spamminess ) );
-		Result := CustomStringReplace( Result, '<MAIL/>', PRes.FMailTo);
-		Result := CustomStringReplace( Result, '<DATE/>', PRes.FDateTime);
-		Result := CustomStringReplace( Result, '<PLAINNUMBER/>', No);
-		Result := CustomStringReplace( Result, '<NAME/>',
-			Format(FORMT_NAME, [PRes.FName]));
-		Result := CustomStringReplace( Result, '<NUMBER/>',
-			Format(FORMT_NUM, [No, No, No]));
-		Result := CustomStringReplace( Result, '<MAILNAME/>',
-			Format(FORMT_MAILNAME,[PRes.FMailTo, PRes.FName]));
-		Result := CustomStringReplace( Result, '<MESSAGE/>', PRes.FBody);
+
+		Skin := CustomStringReplace( Skin, '<NUMBER/>',
+			Format('<a href="menu:%s" name="%s">%s</a>', [No, No, No]));
+		Skin := CustomStringReplace( Skin, '<PLAINNUMBER/>', No);
+		Skin := CustomStringReplace( Skin, '<NAME/>', '<b>' + Res.FName + '</b>');
+		Skin := CustomStringReplace( Skin, '<MAILNAME/>',
+			Format('<a href="mailto:%s"><b>%s</b></a>',[Res.FMailTo, Res.FName]));
+		Skin := CustomStringReplace( Skin, '<MAIL/>', Res.FMailTo);
+		Skin := CustomStringReplace( Skin, '<DATE/>', Res.FDateTime);
+		Skin := CustomStringReplace( Skin, '<MESSAGE/>', Res.FBody);
+		Skin := CustomStringReplace( Skin, '<SPAMMINESS/>', FloatToStr( spamminess ) );
+		Skin := CustomStringReplace( Skin, '<NONSPAMMINESS/>', FloatToStr( 100 - spamminess ) );
 
 		//----- ‚©‚¿‚ã`‚µ‚áŒÝŠ·—pBƒRƒƒ“ƒgƒAƒEƒg‚µ‚Ä‚à‚悵
 		if GikoSys.Setting.UseKatjushaType then begin
-			Result := CustomStringReplace( Result, '&NUMBER',
+			Skin := CustomStringReplace( Skin, '&NUMBER',
 				'<a href="menu:' + No + '" name="' + No + '">' + No + '</a>');
-			Result := CustomStringReplace( Result, '&PLAINNUMBER', No);
-			Result := CustomStringReplace( Result, '&NAME', '<b>' + PRes.FName + '</b>');
-			Result := CustomStringReplace( Result, '&MAILNAME',
-				'<a href="mailto:' + PRes.FMailTo + '"><b>' + PRes.FName + '</b></a>');
-			Result := CustomStringReplace( Result, '&MAIL', PRes.FMailTo);
-			Result := CustomStringReplace( Result, '&DATE', PRes.FDateTime);
-			Result := CustomStringReplace( Result, '&MESSAGE', PRes.FBody);
-			Result := CustomStringReplace( Result, '&SPAMMINESS', FloatToStr( spamminess ) );
-			Result := CustomStringReplace( Result, '&NONSPAMMINESS', FloatToStr( 100 - spamminess ) );
+			Skin := CustomStringReplace( Skin, '&PLAINNUMBER', No);
+			Skin := CustomStringReplace( Skin, '&NAME', '<b>' + Res.FName + '</b>');
+			Skin := CustomStringReplace( Skin, '&MAILNAME',
+				'<a href="mailto:' + Res.FMailTo + '"><b>' + Res.FName + '</b></a>');
+			Skin := CustomStringReplace( Skin, '&MAIL', Res.FMailTo);
+			Skin := CustomStringReplace( Skin, '&DATE', Res.FDateTime);
+			Skin := CustomStringReplace( Skin, '&MESSAGE', Res.FBody);
+			Skin := CustomStringReplace( Skin, '&SPAMMINESS', FloatToStr( spamminess ) );
+			Skin := CustomStringReplace( Skin, '&NONSPAMMINESS', FloatToStr( 100 - spamminess ) );
 		end;
 		//----- ‚±‚±‚Ü‚Å
-{$IFDEF SPAM_FILTER_ENABLED}
+
+		Result := Skin;
 	finally
 		wordCount.Free;
 	end;
-{$ENDIF}
 
 end;
 (*************************************************************************
  *http://‚Ì•¶Žš—ñ‚ðanchorƒ^ƒO•t‚«‚É‚·‚éB
  *************************************************************************)
-procedure THTMLCreate.AddAnchorTag(PRes: PResRec);
-const
-	_HEAD : array[0..9] of String =
-		('', 'h', 'ht', '', 'htt', '', 'http://', '', '', '');
+function THTMLCreate.AddAnchorTag(s: string): string;
 var
 	url: string;
 	href: string;
@@ -242,14 +216,10 @@ var
 	idx, idx2: Integer;
 	pos : PChar;
 	pp, pe : PChar;
-	s : String;
-	len : Integer;
 begin
-	s := PRes.FBody;
-	PRes.FBody := '';
+	Result := '';
 
-	//while True do begin
-	repeat
+	while True do begin
 		idx  := MaxInt;
 		idx2 := MaxInt;
 		pp := PChar(s);
@@ -266,62 +236,63 @@ begin
 
 		if idx = MaxInt then begin
 			//ƒŠƒ“ƒN‚ª–³‚¢‚æB
-			len := Length(PRes.FBody);
-			SetLength(PRes.FBody, Length(s) + len);
-			Move(pp^, PRes.FBody[len + 1], Length(s));
-		end else begin
-			if (idx > anchorLen) and
-				(AnsiStrPosEx(pp + idx - 1 - anchorLen, pp + idx, pANCHORs, pANCHORe) <> nil) then begin
-				//Šù‚ɃŠƒ“ƒNƒ^ƒO‚ª‚‚¢‚Ä‚¢‚é‚Á‚Û‚¢‚Æ‚«‚̓€ƒV
-				//</a></A>‚ð’T‚·A¬•¶Žš‚ÅŒ©‚‚©‚ç‚È‚¯‚ê‚Α啶Žš‚ÅŒŸõ
-				pos := AnsiStrPosEx(pp + idx, pe, pCTAGLs, pCTAGLe);
-				if pos = nil then
-					pos := AnsiStrPosEx(pp + idx, pe, pCTAGUs, pCTAGUe);
-				if pos = nil then
-					b := Length(REF_MARK[idx2])
-				else
-					b := pos - pp + 1;
+			Result := Result + s;
+			Break;
+		end;
 
-				len := Length(PRes.FBody);
-				SetLength(PRes.FBody, len + idx + b);
-				Move(pp^, PRes.FBody[len + 1], idx + b);
-				Delete(s, 1, idx + b);
-			end else begin
-				pp      := PChar(s);
-				len 	:= Length(PRes.FBody);
-				SetLength(PRes.FBody, len + idx - 1);
-				Move(pp^, PRes.FBody[len + 1], idx - 1);
-
-				Delete(s, 1, idx - 1);
-				b := Length( s ) + 1;
-				pp      := PChar(s);
-				for i := 1 to b do begin
-					//‚PƒoƒCƒg•¶Žš‚ÅURL‚ÉŽg‚¦‚È‚¢•¶Žš‚È‚ç
-					if (AnsiStrPosEx(pURLCHARs, pURLCHARe, pp, pp + 1) = nil) then begin
-						url := Copy(s, 1, i - 1);
-						Delete(s, 1, i - 1);
-						href := Format('%s%s', [_HEAD[idx2], url]);
-						PRes.FBody
-							:= Format('%s<a href="%s" target="_blank">%s</a>', [PRes.FBody, href, url]);
-						Break;
-					end;
-					//ˆê•¶Žši‚ß‚éB
-					Inc(pp);
+		if (idx > 1) and (idx > anchorLen) and
+			(AnsiStrPosEx(pp + idx - 1 - anchorLen, pp + idx, pANCHORs, pANCHORe) <> nil) then begin
+			//Šù‚ɃŠƒ“ƒNƒ^ƒO‚ª‚‚¢‚Ä‚¢‚é‚Á‚Û‚¢‚Æ‚«‚̓€ƒV
+			//</a></A>‚ð’T‚·A¬•¶Žš‚ÅŒ©‚‚©‚ç‚È‚¯‚ê‚Α啶Žš‚ÅŒŸõ
+			pos := AnsiStrPosEx(pp + idx, pe, pCTAGLs, pCTAGLe);
+			if pos = nil then
+				pos := AnsiStrPosEx(pp + idx, pe, pCTAGUs, pCTAGUe);
+			if pos = nil then
+				b := Length(REF_MARK[idx2])
+			else
+				b := pos - pp + 1;
+
+			Result := Result + Copy(s, 1, idx + b);
+			Delete(s, 1, idx + b);
+			Continue;
+		end;
+
+		Result := Result + Copy(s, 1, idx - 1);
+		Delete(s, 1, idx - 1);
+		b := Length( s ) + 1;
+		pp      := PChar(s);
+		for i := 1 to b do begin
+			pe := AnsiStrPosEx(pURLCHARs, pURLCHARe, pp, pp + 1);
+
+			if pe = nil then begin
+				//URL‚¶‚á‚È‚¢•¶Žš”­Œ©I‚Æ‚©A•¶Žš‚ª‚È‚­‚È‚Á‚½B
+				url := Copy(s, 1, i - 1);
+				case idx2 of
+					1 : href := 'h' + url;
+					2 : href := 'ht' + url;
+					4 : href := 'htt' + url;
+					6 : href := 'http://' + url;
+				else
+					href := url;
 				end;
+
+				Result := Result + '<a href="' + href + '" target="_blank">' + url + '</a>';
+				Delete(s, 1, i - 1);
+				Break;
 			end;
+			//ˆê•¶Žši‚ß‚éB
+			Inc(pp);
 		end;
-	until idx = MaxInt;
+	end;
 end;
 
 //ˆø”AAIDF‘ΏۂƂȂé“ú•tID•¶Žš—ñAANum:ƒŒƒX”Ô AURLF‚»‚̃XƒŒƒbƒh‚ÌURL
 function THTMLCreate.AddBeProfileLink(AID : string; ANum: Integer):string ;
-const
-	BE_MARK : string = 'BE:';
 var
 	p : integer;
 	BNum, BMark : string;
 begin
-	p := AnsiPos(BE_MARK, AnsiUpperCase(AID));
+	p := AnsiPos('BE:', AnsiUpperCase(AID));
 	if p > 0 then begin
 		BNum := Copy(AID, p, Length(AID));
 		AID := Copy(AID, 1, p - 1);
@@ -336,7 +307,7 @@ begin
 	end else
 		Result := AID;
 end;
-procedure THTMLCreate.separateNumber(var st: String; var et: String; const Text:String; const Separator: String);
+procedure THTMLCreate.separateNumber(var st: String; var et: String; const Text, Separator: String);
 var
 	p : Integer;
 begin
@@ -349,203 +320,6 @@ begin
 		et := Text;
 	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;
-	//Œ‹‰Ê‚ðƒNƒŠƒA
-	PRes.FBody	 :=	'';
-
-	//
-	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[
-		PRes.FBody := PRes.FBody + 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);
-			PRes.FBody := PRes.FBody + 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 := '';
-				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;
-			len := Length(s);
-			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);
-		end;
-	end;
-	if Length(s) > 0 then begin
-		PRes.FBody := PRes.FBody + s;
-	end;
-end;
-function THTMLCreate.checkComma(
-	const s : String;
-	var j : Integer;
-	var No  : String
-) : boolean;
-var
-	bType : TMbcsByteType;
-begin
-	Result := false;
-	if (Length(s) > 0) then begin
-		bType := ByteType(s, j);
-		if ((bType = mbSingleByte) and (s[j] = ',') or
-			((bType = mbLeadByte) and (ZenToHan(Copy(s, j ,2)) = ','))) then begin
-			Result := true;
-			if (bType = mbSingleByte) then
-				Inc(j)
-			else
-				Inc(j, 2);
-			No := '';
-		end;
-	end;
-end;
-function THTMLCreate.addResAnchor(
-	PAddRes: PResRec; PResLink : PResLinkRec; dat : boolean;
-	var s : String; j : Integer; const No: String) : string;
-const
-	FORMAT_LINK = '<a href="../test/read.cgi?bbs=%s&key=%s&st=%s&to=%s&nofirst=true" target="_blank">';
-var
-	st,et : string;
-begin
-
-	//‰½‚à”Žš‚ªŒ©‚‚©‚ç‚È‚¢‚Æ‚«
-	if No = '' then begin
-		PAddRes.FBody := PAddRes.FBody + Copy(s, 1, j - 1);
-	end else begin
-		separateNumber(st, et, No, '-');
-
-		if not dat then begin
-			PAddRes.FBody := PAddRes.FBody +
-				Format(FORMAT_LINK, [PResLink.FBbs, PResLink.FKey, st, et]);
-		end else begin
-			PAddRes.FBody := PAddRes.FBody + Format('<a href="#%s">', [st]);
-		end;
-		PAddRes.FBody := PAddRes.FBody + Copy(s, 1, j - 1) + '</a>';
-	end;
-	Delete(s, 1, j - 1);
-end;
-
 (*************************************************************************
  *
  * from HotZonu
@@ -727,7 +501,7 @@ begin
 	Result := Result + s;
 end;
 
-procedure THTMLCreate.ConvertResAnchor(PRes: PResRec);
+function THTMLCreate.ConvertResAnchor(res: string): string;
 const
 	_HEAD : string = '<a href="../';
 	_TAIL : string = ' target="_blank">';
@@ -738,17 +512,15 @@ const
 var
 	i, j, k: Integer;
 	tmp: string;
-	res: string;
 begin
-	res := PRes.FBody;
-	PRes.FBody := '';
+	Result := '';
 	i := AnsiPos(_HEAD, res);
 	while i <> 0 do begin
-		PRes.FBody := PRes.FBody + Copy(res, 1, i -1);
+		Result := Result + Copy(res, 1, i -1);
 		Delete(res, 1, i - 1);
 		j := AnsiPos(_TAIL, res);
 		if j = 0 then begin
-			PRes.FBody := PRes.FBody + res;
+			Result := Result + res;
 			Exit;
 		end;
 		tmp := Copy(res, 1, j - 1);
@@ -756,11 +528,11 @@ begin
 		if (AnsiPos(_ST, tmp) <> 0) and (AnsiPos(_TO, tmp) <> 0) then begin
 			Delete(tmp, 1, AnsiPos(_ST, tmp) + 3);
 			Delete(tmp, AnsiPos(_TO, tmp), Length(tmp));
-			PRes.FBody := PRes.FBody + '<a href="#' + tmp + '">';
+			Result := Result + '<a href="#' + tmp + '">';
 		end else if (AnsiPos(_STA, tmp) <> 0) and (AnsiPos(_END, tmp) <> 0) then begin
 			Delete(tmp, 1, AnsiPos(_STA, tmp) + 6);
 			Delete(tmp, AnsiPos(_END, tmp), Length(tmp));
-			PRes.FBody := PRes.FBody + '<a href="#' + tmp + '">';
+			Result := Result + '<a href="#' + tmp + '">';
 		end else begin
 			k := LastDelimiter('/', tmp);
 			Delete(tmp, 1, k);
@@ -769,11 +541,11 @@ begin
 			else
 				Delete(tmp, AnsiPos('"', tmp), Length(tmp));
 
-			PRes.FBody := PRes.FBody + '<a href="#' + tmp + '">';
+			Result := Result + '<a href="#' + tmp + '">';
 		end;
 		i := AnsiPos(_HEAD, res);
 	end;
-	PRes.FBody := PRes.FBody + res;
+	Result := Result + res;
 
 end;
 
@@ -794,8 +566,8 @@ begin
 		doc.open;
 		// ƒwƒbƒ_
 		doc.Write( boardPlugIn.GetHeader( DWORD( threadItem ),
-			'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ));
-		doc.Write('<p id="idSearch"></p>');
+			'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ) + #13#10 );
+		doc.Write('<p id="idSearch"></p>'#13#10 );
 
 		for i := 0 to threadItem.Count - 1 do begin
 			// 1 ‚Í•K‚¸•\Ž¦
@@ -819,24 +591,24 @@ begin
 				try
 					if GikoSys.Setting.UseSkin then begin
 						if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-							doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
+							doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
 						else
-							doc.Write( '<a name="new"></a>');
+							doc.Write( '<a name="new"></a>'#13#10 );
 					end else if GikoSys.Setting.UseCSS then begin
-						doc.Write('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
+						doc.Write('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>'#13#10);
 					end else begin
 						doc.Write('</dl>');
 						doc.Write('<a name="new"></a>');
 						doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
-						doc.Write('<dl>');
+						doc.Write('<dl>'#13#10);
 					end;
 				except
-					doc.Write( '<a name="new"></a>');
+					doc.Write( '<a name="new"></a>'#13#10);
 				end;
 			end;
 
 			// ƒŒƒX
-			doc.Write( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ));
+			doc.Write( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ) + #13#10 );
 
 			if ThreadItem.Kokomade = (i + 1) then begin
 				// ‚±‚±‚Ü‚Å“Ç‚ñ‚¾
@@ -845,23 +617,23 @@ begin
 						if FileExists( GikoSys.GetSkinBookmarkFileName ) then
 							doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
 						else
-							doc.Write( '<a name="koko"></a>');
+							doc.Write( '<a name="koko"></a>'#13#10 );
 					end else if GikoSys.Setting.UseCSS then begin
-						doc.Write('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
+						doc.Write('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>'#13#10 );
 					end else begin
 						doc.Write('</dl>');
 						doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
-						doc.Write('<dl>');
+						doc.Write('<dl>'#13#10 );
 					end;
 				except
-					doc.Write( '<a name="koko"></a>');
+					doc.Write( '<a name="koko"></a>'#13#10 );
 				end;
 			end;
 		end;
 
 
 		// ƒXƒLƒ“(ƒtƒbƒ^)
-		doc.Write( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ));
+		doc.Write( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ) + #13#10 );
 	finally
 		doc.Close;
 	end;
@@ -869,27 +641,29 @@ end;
 
 
 procedure THTMLCreate.CreateUseSKINHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList);
-const
-	KOKO_TAG = '<a name="koko"></a>';
-	NEW_TAG = '<a name="new"></a>';
 var
 	i: integer;
+	No: string;
+	CSSFileName: string;
 	NewReceiveNo: Integer;
 	Res: TResRec;
 	UserOptionalStyle: string;
 	SkinHeader: string;
 	SkinNewRes: string;
 	SkinRes: string;
+	strTmp : string;
 	ThreadName : string;
-	ResLink :TResLinkRec;
+	function ReplaceRes( skin: string ): string;
+	begin
+		Result := SkinedRes( skin, Res, No );
+	end;
 begin
 	NewReceiveNo := ThreadItem.NewReceive;
 	// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
 	UserOptionalStyle := GikoSys.SetUserOptionalStyle;
+	CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
 	ThreadName := ChangeFileExt(ThreadItem.FileName, '');
-	ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-	ResLink.FKey := ThreadName;
-	//,
+
 	doc.open;
 	try
 		doc.charset := 'Shift_JIS';
@@ -904,8 +678,15 @@ begin
 		except
 		end;
 
-		SkinNewRes := LoadFromSkin( GikoSys.GetSkinNewResFileName, ThreadItem, ThreadItem.Size);
-		SkinRes := LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, ThreadItem.Size );
+		try
+			SkinNewRes := LoadFromSkin( GikoSys.GetSkinNewResFileName, ThreadItem, ThreadItem.Size);
+		except
+		end;
+
+		try
+			SkinRes := LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, ThreadItem.Size );
+		except
+		end;
 
 		doc.Write('<p id="idSearch"></p>'#13#10'<a name="top"></a>');
 
@@ -928,38 +709,55 @@ begin
 
 			// V’…ƒ}[ƒN
 			if (NewReceiveNo = i + 1) or ((NewReceiveNo = 0) and (i = 0)) then begin
-				if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-					doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
-				else
-					doc.Write( NEW_TAG );
+				try
+					if FileExists( GikoSys.GetSkinNewmarkFileName ) then
+						doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
+					else
+						doc.Write( '<a name="new"></a>');
+				except
+					doc.Write( '<a name="new"></a>' );
+				end;
 			end;
 
 			if (Trim(ReadList[i]) <> '') then begin
-				DivideStrLine(ReadList[i], @Res);
-				AddAnchorTag(@Res);
-				ConvRes(@Res, @ResLink);
+				No := IntToStr(i + 1);
+
+				Res := DivideStrLine(ReadList[i]);
+				Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ThreadName, 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
 				Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 
-				if NewReceiveNo <= (i + 1) then
-					// V’…ƒŒƒX
-					doc.Write(SkinedRes(SkinNewRes, @Res, IntToStr(i + 1)))
-				else
-					// ’ʏí‚̃ŒƒX
-					doc.Write(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
+				try
+					if NewReceiveNo <= (i + 1) then
+						// V’…ƒŒƒX
+						strTmp := ReplaceRes( SkinNewRes )
+					else
+						// ’ʏí‚̃ŒƒX
+						strTmp := ReplaceRes( SkinRes );
+
+					doc.Write( strTmp );
+				except
+				end;
 			end;
 
 			if ThreadItem.Kokomade = (i + 1) then begin
 				// ‚±‚±‚Ü‚Å“Ç‚ñ‚¾
-				if FileExists( GikoSys.GetSkinBookmarkFileName ) then
-					doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
-				else
-					doc.Write( KOKO_TAG );
+				try
+					if FileExists( GikoSys.GetSkinBookmarkFileName ) then
+						doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
+					else
+						doc.Write( '<a name="koko"></a>' );
+				except
+					doc.Write( '<a name="koko"></a>' );
+				end;
 			end;
 		end;
 
 		doc.Write('<a name="bottom"></a>');
 		// ƒXƒLƒ“(ƒtƒbƒ^)
-		doc.Write( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
+		try
+			doc.Write( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
+		except
+		end;
 	finally
 		doc.close;
 	end;
@@ -989,16 +787,11 @@ var
 	NewReceiveNo: Integer;
 	Res: TResRec;
 	UserOptionalStyle: string;
-	ThreadName :String;
-	ResLink :TResLinkRec;
 begin
 	doc.open;
 	try
 		doc.charset := 'Shift_JIS';
 		NewReceiveNo := ThreadItem.NewReceive;
-		ThreadName := ChangeFileExt(ThreadItem.FileName, '');
-		ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-		ResLink.FKey := ThreadName;
 		// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
 		UserOptionalStyle := GikoSys.SetUserOptionalStyle;
 		CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
@@ -1036,9 +829,8 @@ begin
 
 				if (Trim(ReadList[i]) <> '') then begin
 					No := IntToStr(i + 1);
-					DivideStrLine(ReadList[i], @Res);
-					AddAnchorTag(@Res);
-					ConvRes(@Res, @ResLink);
+					Res := DivideStrLine(ReadList[i]);
+					Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
 					Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 					if Res.FMailTo = '' then
 						doc.Write(Format(FORMAT_NOMAIL, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]))
@@ -1069,16 +861,11 @@ var
 	No: string;
 	NewReceiveNo: Integer;
 	Res: TResRec;
-	ThreadName: String;
-	ResLink : TResLinkRec;
 begin
 	doc.open;
 	try
 		doc.charset := 'Shift_JIS';
 		NewReceiveNo := ThreadItem.NewReceive;
-		ThreadName := ChangeFileExt(ThreadItem.FileName, '');
-		ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-		ResLink.FKey := ThreadName;
 		doc.Write('<html><head>'#13#10);
 		doc.Write('<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">'#13#10);
 		doc.Write('<title>' + sTitle + '</title></head>'#13#10);
@@ -1105,17 +892,16 @@ begin
 			end;
 
 			if (NewReceiveNo = (i + 1)) or ((NewReceiveNo = 0) and (i = 0)) then begin
-				doc.Write('</dl>');
-				doc.Write('<a name="new"></a>');
-				doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
-				doc.Write('<dl>');
+				doc.Write('</dl>'#13#10);
+				doc.Write('<a name="new"></a>'#13#10);
+				doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>'#13#10);
+				doc.Write('<dl>'#13#10);
 			end;
 
 			if (Trim(ReadList[i]) <> '') then begin
 				No := IntToStr(i + 1);
-				DivideStrLine(ReadList[i], @Res);
-				AddAnchorTag(@Res);
-				ConvRes(@Res, @ResLink);
+				Res := DivideStrLine(ReadList[i]);
+				Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
 				Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 				if Res.FMailTo = '' then
 					doc.Write('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
@@ -1125,12 +911,14 @@ begin
 					doc.Write('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
 			end;
 			if ThreadItem.Kokomade = (i + 1) then begin
-				doc.Write('</dl>');
-				doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
-				doc.Write('<dl>');
+				doc.Write('</dl>'#13#10);
+				doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>'#13#10);
+				doc.Write('<dl>'#13#10);
 			end;
 		end;
-		doc.Write('</dl>'#13#10'<a name="bottom"></a>'#13#10'</body></html>');
+		doc.Write('</dl>'#13#10);
+		doc.Write('<a name="bottom"></a>'#13#10);
+		doc.Write('</body></html>'#13#10);
 	finally
 		doc.Close;
 	end;
@@ -1162,15 +950,13 @@ begin
 			ReadList := TStringList.Create;
 			try
 				if ThreadItem.IsLogFile then begin
-					ReadList.BeginUpdate;
 					FileName := ThreadItem.GetThreadFileName;
 					ReadList.LoadFromFile(FileName);
-					ReadList.EndUpdate;
 					GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
 					GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
 					GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
 					if ThreadItem.Title = '' then begin
-						DivideStrLine(ReadList[0], @Res);
+						Res := DivideStrLine(ReadList[0]);
 						sTitle := Res.FTitle;
 					end else
 						sTitle := ThreadItem.Title
@@ -1186,7 +972,6 @@ begin
 				end else begin
 					CreateDefaultHTML(doc, ThreadItem, ReadList, sTitle);
 				end;
-
 			finally
 				ReadList.Free;
 			end;
@@ -1216,23 +1001,18 @@ var
 	SkinHeader: string;
 	SkinRes: string;
 	tmp, tmp1: string;
-	ThreadName: String;
-	ResLink : TResLinkRec;
 	function LoadSkin( fileName: string ): string;
 	begin
 		Result := LoadFromSkin( fileName, ThreadItem, ThreadItem.Size );
 	end;
 	function ReplaceRes( skin: string ): string;
 	begin
-		Result := SkinedRes( skin, @Res, No );
+		Result := SkinedRes( skin, Res, No );
 	end;
 
 begin
 	if ThreadItem <> nil then begin
 		CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
-		ThreadName := ChangeFileExt(ThreadItem.FileName, '');
-		ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-		ResLink.FKey := ThreadName;
 		html.Clear;
 		html.BeginUpdate;
 		//if ThreadItem.IsBoardPlugInAvailable then begin
@@ -1264,9 +1044,7 @@ begin
 				for i := 0 to threadItem.Count - 1 do begin
 
 					// ƒŒƒX
-					Res.FBody := boardPlugIn.GetRes( DWORD( threadItem ), i + 1 );
-					ConvertResAnchor(@Res);
-					html.Append( Res.FBody );
+					html.Append( ConvertResAnchor(boardPlugIn.GetRes( DWORD( threadItem ), i + 1 )) );
 
 				end;
 				// ƒXƒLƒ“(ƒtƒbƒ^)
@@ -1289,7 +1067,7 @@ begin
 					GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
 					GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
 					GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
-					DivideStrLine(ReadList[0], @Res);
+					Res := DivideStrLine(ReadList[0]);
 					//Res.FTitle := CustomStringReplace(Res.FTitle, '—M', ',');
 					sTitle := Res.FTitle;
 				end else begin
@@ -1324,10 +1102,9 @@ begin
 							if (Trim(ReadList[i]) <> '') then begin
 								No := IntToStr(i + 1);
 
-								DivideStrLine(ReadList[i], @Res);
-								AddAnchorTag(@Res);
-								ConvRes(@Res, @ResLink, true);
-								ConvertResAnchor(@Res);
+								Res := DivideStrLine(ReadList[i]);
+								Res.FBody := AddAnchorTag(Res.FBody);
+								Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
 
 								try
 									html.Append( ReplaceRes( SkinRes ) );
@@ -1363,10 +1140,9 @@ begin
 						for i := 0 to ReadList.Count - 1 do begin
 							if (Trim(ReadList[i]) <> '') then begin
 								No := IntToStr(i + 1);
-								DivideStrLine(ReadList[i], @Res);
-								AddAnchorTag(@Res);
-								ConvRes(@Res, @ResLink, true);
-								ConvertResAnchor(@Res);
+								Res := DivideStrLine(ReadList[i]);
+								Res.FBody := AddAnchorTag(Res.FBody);
+								Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
 								if Res.FMailTo = '' then
 									html.Append('<a name="' + No + '"></a>'
 													+ '<div class="header"><span class="no"><a href="menu:' + No + '">' + No + '</a></span> '
@@ -1410,10 +1186,9 @@ begin
 						for i := 0 to ReadList.Count - 1 do begin
 							if (Trim(ReadList[i]) <> '') then begin
 								No := IntToStr(i + 1);
-								DivideStrLine(ReadList[i], @Res);
-								AddAnchorTag(@Res);
-								ConvRes(@Res, @ResLink, true);
-								ConvertResAnchor(@Res);
+								Res := DivideStrLine(ReadList[i]);
+								Res.FBody := AddAnchorTag(Res.FBody);
+								Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
 								if Res.FMailTo = '' then
 									html.Append('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF ' + Res.FDateTime+ '<br><dd>' + Res.Fbody + ' <br><br><br>')
 								else if GikoSys.Setting.ShowMail then
@@ -1480,7 +1255,7 @@ begin
 					//‚±‚±‚Å‚Q‚¿‚á‚ñ‚Ë‚é‚Ìdat‚ÌŒ`Ž®‚Å‚Ps“ǂݍž‚ß‚ê‚Î¥¥¥B«“Ç‚ß‚é‚悤‚É‚È‚Á‚½
 					tmp := boardPlugIn.GetDat( DWORD( threadItem ), i );
                     if (tmp <> '') And ( not GikoSys.FAbon.CheckAbonPopupRes(tmp) And( not GikoSys.FAbon.CheckIndividualAbonList(line))) then begin
-						DivideStrLine(tmp, @Res);
+						Res := DivideStrLine(tmp);
                         if (GikoSys.Setting.ShowMail = false) or (Length(res.FMailTo) = 0) then
                         	Header := IntToStr(Line) + ' –¼‘OF ' + Res.FName + ' “Še“úF ' + Res.FDateTime
                         else
@@ -1491,7 +1266,7 @@ begin
 						Body := CustomStringReplace(Res.FBody, '<br> ', #10,true);
 						Body := CustomStringReplace(Body, '<br>', #10,true);
                         Body := CustomStringReplace(Body, '</a>', '',true);
-						Body := THTMLCreate.DeleteLink(Body);
+                        Body := GikoSys.DeleteLink(Body);
                         Body := CustomStringReplace(Body, '&lt;', '<');
                         Body := CustomStringReplace(Body, '&gt;', '>');
                         Body := CustomStringReplace(Body, '&quot;', '"');
@@ -1507,7 +1282,7 @@ begin
 					FileName := ThreadItem.FilePath;
 					tmp := GikoSys.ReadThreadFile(FileName, Line);
 					if (tmp <> '') And ( not GikoSys.FAbon.CheckAbonPopupRes(tmp) And( not GikoSys.FAbon.CheckIndividualAbonList(line))) then begin
-						DivideStrLine(tmp, @Res);
+						Res := DivideStrLine(tmp);
 						if (GikoSys.Setting.ShowMail = false) or (Length(res.FMailTo) = 0) then
 							Header := IntToStr(Line) + ' –¼‘OF ' + Res.FName + ' “Še“úF ' + Res.FDateTime
 						else
@@ -1517,7 +1292,7 @@ begin
 						Body := CustomStringReplace(Body, '<br> ', #10,true);
 						Body := CustomStringReplace(Body, '<br>', #10,true);
 						Body := CustomStringReplace(Body, '</a>', '',true);
-						Body := THTMLCreate.DeleteLink(Body);
+						Body := GikoSys.DeleteLink(Body);
 						Body := CustomStringReplace(Body, '&lt;', '<');
 						Body := CustomStringReplace(Body, '&gt;', '>');
 						Body := CustomStringReplace(Body, '&quot;', '"');
@@ -1598,9 +1373,9 @@ begin
 			for i := 0 to dirs.Count - 1 do begin
 				files := TStringList.Create;
 				try
-					files.BeginUpdate;
+                    files.BeginUpdate;
 					gikoSys.GetFileList(dirs[i], '*.*', files, true);
-					files.EndUpdate;
+                    files.EndUpdate;
 					tmpD := CustomStringReplace(dirs[i], GikoSys.GetConfigDir, path);
 					if (AnsiPos(dirs[i], tmp) <> 0) and not (DirectoryExists(tmpD)) then
 						ForceDirectories(tmpD);
@@ -1631,80 +1406,6 @@ begin
 	finally
 		dirs.Free;
 	end;
-end;{!
-\brief datƒtƒ@ƒCƒ‹‚̈ꃉƒCƒ“‚𕪉ð
-\param Line datƒtƒ@ƒCƒ‹‚ð\¬‚·‚é 1 s
-\return     ƒŒƒXî•ñ
-}
-class procedure THTMLCreate.DivideStrLine(Line: string; PRes: PResRec);
-const
-	delimiter = '<>';
-var
-	pds, pde : PChar;
-	pss, pse : PChar;
-	ppos : PChar;
-begin
-	//΁Տ
-	PRes.FType := glt2chNew;
-
-	pss := PChar(Line);
-	pse := pss + Length(Line);
-	pds := PChar(delimiter);
-	pde := pds + Length(delimiter);
-
-	ppos := AnsiStrPosEx(pss, pse, pds, pde);
-	if (ppos = nil) then begin
-		Line := CustomStringReplace(Line, '<>', '&lt;&gt;');
-		Line := CustomStringReplace(Line, ',', '<>');
-		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);
-	//‚Q‚¿‚á‚ñ‚Ë‚é‚Æ‚©‚¾‚ƁA–{•¶‚̐擪‚É‚P‚”¼Šp‹ó”’‚ª“ü‚Á‚Ä‚¢‚é‚̂ō폜‚·‚é
-	//‘¼‚ÌŒfŽ¦”‚ŁAƒŒƒXŽ©‘Ì‚Ì‹ó”’‚©‚à‚µ‚ê‚È‚¢‚¯‚Ç‚»‚ê‚Í’ú‚ß‚é
-	PRes.FBody := TrimLeft(PRes.FBody);
-	//‹ó‚¾‚Æ–â‘肪‹N‚«‚é‚©‚çA‹ó”’‚ðÝ’è‚·‚é
-	if PRes.FBody = '' then
-		PRes.FBody := '&nbsp;';
-
-	PRes.FTitle := RemoveToken(Line, delimiter);
-end;
-
-{!
-\brief HTML ‚©‚çƒAƒ“ƒJ[ƒ^ƒO‚ðíœ
-\param s Œ³‚É‚È‚é HTML
-\return  ƒAƒ“ƒJ[ƒ^ƒO‚ªíœ‚³‚ꂽ HTML
-}
-class function THTMLCreate.DeleteLink(const s: string): string;
-var
-	s1: string;
-	s2: string;
-	idx: Integer;
-	i: Integer;
-begin
-	i := 0;
-	Result := '';
-	while True do begin
-		s1 := GikoSys.GetTokenIndex(s, '<a href="', i);
-		s2 := GikoSys.GetTokenIndex(s, '<a href="', i + 1);
-
-		idx := Pos('">', s1);
-		if idx <> 0 then
-			Delete(s1, 1, idx + 1);
-		idx := Pos('">', s2);
-		if idx <> 0 then
-			Delete(s2, 1, idx + 1);
-
-		Result := Result + s1 + s2;
-
-		if s2 = '' then
-			Break;
-
-		inc(i, 2);
-	end;
 end;
 
 

--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -53,9 +53,7 @@ type
 		function ParseCgiStatus(Content: string): TCgiStatus;
 		function CgiDownload(ItemType: TGikoDownloadType; URL: string; Modified: TDateTime): Boolean;
 		function DatDownload(ItemType: TGikoDownloadType; URL: string; Modified: TDateTime; RangeStart: Integer; AdjustLen: Integer): Boolean;
-		procedure DeleteStatusLine(Item: TDownloadItem);
-		procedure InitHttpClient(client: TIdHttp);
-		procedure ClearHttpClient(client: TIdHttp);
+		function DeleteStatusLine(Content: string): string;
 	protected
 		procedure Execute; override;
 	public
@@ -106,7 +104,7 @@ type
 implementation
 
 uses
-	Y_TextConverter, MojuUtils, HTMLCreate;
+	Y_TextConverter, MojuUtils;
 
 constructor TDownloadThread.Create(CreateSuspended: Boolean);
 begin
@@ -120,7 +118,13 @@ end;
 
 destructor TDownloadThread.Destroy;
 begin
-	ClearHttpClient(FIndy);
+    FIndy.Request.CustomHeaders.Clear;
+    FIndy.Request.RawHeaders.Clear;
+    FIndy.Request.Clear;
+    FIndy.Response.CustomHeaders.Clear;
+    FIndy.Response.RawHeaders.Clear;
+    FIndy.Response.Clear;
+    FIndy.ProxyParams.Clear;
 	FIndy.Free;
 	inherited;
 end;
@@ -142,65 +146,7 @@ begin
 										[Day, Copy(StrMonth, 1 + 3 * (Month - 1), 3),
 										 Year, Hour, Min, Sec]);
 end;
-// ******************************************************************
-// HTTPClient‚̏‰Šú‰»
-// ******************************************************************
-procedure TDownloadThread.InitHttpClient(client: TIdHttp);
-begin
-	ClearHttpClient(client);
-	client.Disconnect;
-	client.Request.UserAgent := GikoSys.GetUserAgent;
-	client.RecvBufferSize := Gikosys.Setting.RecvBufferSize;
-	client.ProxyParams.BasicAuthentication := False;
-	client.ReadTimeout := GikoSys.Setting.ReadTimeOut;
-	{$IFDEF DEBUG}
-	Writeln('------------------------------------------------------------');
-	{$ENDIF}
-	//FIndy.AllowCookies := False;
-	if GikoSys.Setting.ReadProxy then begin
-		if GikoSys.Setting.ProxyProtocol then
-			client.ProtocolVersion := pv1_1
-		else
-			client.ProtocolVersion := pv1_0;
-		client.ProxyParams.ProxyServer := GikoSys.Setting.ReadProxyAddress;
-		client.ProxyParams.ProxyPort := GikoSys.Setting.ReadProxyPort;
-		client.ProxyParams.ProxyUsername := GikoSys.Setting.ReadProxyUserID;
-		client.ProxyParams.ProxyPassword := GikoSys.Setting.ReadProxyPassword;
-		if GikoSys.Setting.ReadProxyUserID <> '' then
-			client.ProxyParams.BasicAuthentication := True;
-		{$IFDEF DEBUG}
-		Writeln('ƒvƒƒLƒVÝ’è‚ ‚è');
-		Writeln('ƒzƒXƒg: ' + GikoSys.Setting.ReadProxyAddress);
-		Writeln('ƒ|[ƒg: ' + IntToStr(GikoSys.Setting.ReadProxyPort));
-		{$ENDIF}
-	end else begin
-		if GikoSys.Setting.Protocol then
-			client.ProtocolVersion := pv1_1
-		else
-			client.ProtocolVersion := pv1_0;
-		client.ProxyParams.ProxyServer := '';
-		client.ProxyParams.ProxyPort := 80;
-		client.ProxyParams.ProxyUsername := '';
-		client.ProxyParams.ProxyPassword := '';
-		{$IFDEF DEBUG}
-		Writeln('ƒvƒƒLƒVÝ’è‚È‚µ');
-		{$ENDIF}
-	end;
-end;
-// ******************************************************************
-// HTTPClient‚̃ŠƒNƒGƒXƒg‚ƃŒƒXƒ|ƒ“ƒX‚̃f[ƒ^‚̏Á‹Ž
-// ******************************************************************
-procedure TDownloadThread.ClearHttpClient(client: TIdHttp);
-begin
-	client.Request.CustomHeaders.Clear;
-	client.Request.RawHeaders.Clear;
-	client.Request.Clear;
-	client.Response.CustomHeaders.Clear;
-	client.Response.RawHeaders.Clear;
-	client.Response.Clear;
-
-	client.ProxyParams.Clear;
-end;
+
 procedure TDownloadThread.Execute;
 var
 	ResStream: TMemoryStream;
@@ -244,11 +190,11 @@ begin
 			begin
 				FDownloadTitle := FItem.FThreadItem.Title;
 				if FItem.FThreadItem <> nil then begin
-					if FItem.FThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
-						boardPlugIn := FItem.FThreadItem.ParentBoard.BoardPlugIn;
-						Item.State	:= TGikoDownloadState( boardPlugIn.DownloadThread( DWORD( FItem.FThreadItem ) ) );
-					end;
-					//if FItem.FThreadItem.IsBoardPlugInAvailable then begin
+                    if FItem.FThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
+                    	boardPlugIn := FItem.FThreadItem.ParentBoard.BoardPlugIn;
+                        Item.State	:= TGikoDownloadState( boardPlugIn.DownloadThread( DWORD( FItem.FThreadItem ) ) );
+                    end;
+                    //if FItem.FThreadItem.IsBoardPlugInAvailable then begin
 					//	boardPlugIn	:= FItem.FThreadItem.BoardPlugIn;
 					//	Item.State	:= TGikoDownloadState( boardPlugIn.DownloadThread( DWORD( FItem.FThreadItem ) ) );
 					//end;
@@ -271,9 +217,51 @@ begin
 			Continue;
 		end;
 
-		FAbort := False;
 		//===== ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚È‚¢ê‡
-		InitHttpClient(FIndy);
+		FAbort := False;
+		FIndy.Request.CustomHeaders.Clear;
+		FIndy.Response.Clear;
+		FIndy.Request.Clear;
+    FIndy.ProxyParams.Clear;
+    FIndy.Disconnect;
+		FIndy.Request.UserAgent := GikoSys.GetUserAgent;
+		FIndy.RecvBufferSize := Gikosys.Setting.RecvBufferSize;
+		FIndy.ProxyParams.BasicAuthentication := False;
+        FIndy.ReadTimeout := GikoSys.Setting.ReadTimeOut;
+		{$IFDEF DEBUG}
+		Writeln('------------------------------------------------------------');
+		{$ENDIF}
+		//FIndy.AllowCookies := False;
+		if GikoSys.Setting.ReadProxy then begin
+			if GikoSys.Setting.ProxyProtocol then
+				FIndy.ProtocolVersion := pv1_1
+			else
+				FIndy.ProtocolVersion := pv1_0;
+			FIndy.ProxyParams.ProxyServer := GikoSys.Setting.ReadProxyAddress;
+			FIndy.ProxyParams.ProxyPort := GikoSys.Setting.ReadProxyPort;
+			FIndy.ProxyParams.ProxyUsername := GikoSys.Setting.ReadProxyUserID;
+			FIndy.ProxyParams.ProxyPassword := GikoSys.Setting.ReadProxyPassword;
+			if GikoSys.Setting.ReadProxyUserID <> '' then
+				FIndy.ProxyParams.BasicAuthentication := True;
+			{$IFDEF DEBUG}
+			Writeln('ƒvƒƒLƒVÝ’è‚ ‚è');
+			Writeln('ƒzƒXƒg: ' + GikoSys.Setting.ReadProxyAddress);
+			Writeln('ƒ|[ƒg: ' + IntToStr(GikoSys.Setting.ReadProxyPort));
+			{$ENDIF}
+		end else begin
+			if GikoSys.Setting.Protocol then
+				FIndy.ProtocolVersion := pv1_1
+			else
+				FIndy.ProtocolVersion := pv1_0;
+			FIndy.ProxyParams.ProxyServer := '';
+			FIndy.ProxyParams.ProxyPort := 80;
+			FIndy.ProxyParams.ProxyUsername := '';
+			FIndy.ProxyParams.ProxyPassword := '';
+			{$IFDEF DEBUG}
+			Writeln('ƒvƒƒLƒVÝ’è‚È‚µ');
+			{$ENDIF}
+		end;
+
 		adjustMargin := 0;
 		if Item.DownType = gdtThread then begin
 			if FileExists( Item.ThreadItem.GetThreadFileName ) then begin
@@ -532,7 +520,8 @@ begin
 								Writeln('CGIStatus: OK');
 								{$ENDIF}
 								Item.ResponseCode := 200;
-								DeleteStatusLine(Item);
+								Item.Content := DeleteStatusLine(Item.Content);
+								Item.ContentLength := CgiStatus.FSize;
 							end;
 							gcsINCR: begin
 								//¡‚Í‚ ‚肦‚È‚¢
@@ -540,7 +529,8 @@ begin
 								Writeln('CGIStatus: 206');
 								{$ENDIF}
 								Item.ResponseCode := 206;
-								DeleteStatusLine(Item);
+								Item.Content := DeleteStatusLine(Item.Content);
+								Item.ContentLength := CgiStatus.FSize;
 							end;
 							gcsERR: begin
 								{$IFDEF DEBUG}
@@ -605,9 +595,68 @@ begin
 					else
 						Item.State := gdsError;
 				end;
+{
+				//–³‚¢‚ÆŽv‚¤‚¯‚ǁBBB
+				if (Item.ResponseCode in [200, 206]) and (Item.Content = '') then
+					Item.State := gdsError;
+				Item.LastModified := FIndy.Response.LastModified;
+				//·•ªŽæ“¾‚Å‚PƒoƒCƒg‘O‚©‚ç‚Æ‚Á‚Ä‚«‚½‚Æ‚«‚̓}ƒCƒiƒX‚·‚é
+				Item.ContentLength := FIndy.Response.ContentLength + AdjustLen;
+				try
+					ResStream.Clear;
+					FIndy.Get(URL, ResStream);
+					Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
+					if (Item.DownType = gdtThread) and (AdjustLen = -1) and (Item.Content[1] <> #10) then begin
+						//·•ªŽæ“¾‚©‚‚PƒoƒCƒg–Ú‚ªLF‚Å‚È‚¢ê‡‚́u‚ ‚ځ[‚ñv‚³‚ê‚Ä‚¢‚é‚©‚à‚µ‚ê‚ñ‚̂ōĎ擾
+						//‚±‚±‚сƒbƒZ[ƒW•\Ž¦ƒCƒxƒ“ƒg
+						//event
+						FMsg := 'u‚ ‚ځ[‚ñv‚ðŒŸo‚µ‚½‚̂ōĎ擾‚ðs‚¢‚Ü‚·';
+						if Assigned(OnDownloadMsg) then
+							Synchronize(FireDownloadMsg);
+						FIndy.Request.ContentRangeStart := 0;
+						FIndy.Request.ContentRangeEnd := 0;
+						AdjustLen := 0;
+						ResStream.Clear;
+						FIndy.Get(URL, ResStream);
+						Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
+					end else if (Item.DownType = gdtThread) and (AdjustLen = -1) and (Item.Content[1] = #10) then begin
+						//·•ªŽæ“¾‚©‚‚PƒoƒCƒg–Ú‚ªLF‚̏ꍇi³íŽæ“¾j‚Í“ª‚ÌLF‚ðíœ
+						Item.Content := Copy(Item.Content, 2, Length(Item.Content));
+					end;
+				except
+					Item.State := gdsError;
+				end;
+				Item.ResponseCode := FIndy.ResponseCode;
+}
+{
+				try
+					ResStream.Clear;
+					FIndy.Get(URL, ResStream);
+					Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
+				except
+					Item.State := gdsError;
+				end;
+
+				CgiStatus := ParseCgiStatus(Item.Content);
+				if CgiStatus.FStatus = gcsOK then begin
+					if CgiStatus.FSize = 0 then
+						Item.State := gdsNotModify
+					else if Item.DownType = gdtBoard then
+						Item.State := gdsComplete
+					else
+						Item.State := gdsDiffComplete;
+				end else if CgiStatus.FStatus = gcsINCR then begin
+					Item.State := gdsComplete;
+				end else if CgiStatus.FStatus = gcsERR then begin
+					Item.State := gdsError;
+					Item.ErrText := CgiStatus.FErrText;
+				end;
+				Item.ContentLength := CgiStatus.FSize;
+				}
 			except
 				Item.State := gdsError;
 			end;
+			//Item.ResponseCode := FIndy.ResponseCode;
 			if FAbort then
 				Item.State := gdsAbort;
 		finally
@@ -616,7 +665,13 @@ begin
 			ResStream.Free;
 		end;
 
-		ClearHttpClient(FIndy);
+		FIndy.Request.CustomHeaders.Clear;
+        FIndy.Request.RawHeaders.Clear;
+        FIndy.Request.Clear;
+        FIndy.Response.CustomHeaders.Clear;
+        FIndy.Response.RawHeaders.Clear;
+		FIndy.Response.Clear;
+	    FIndy.ProxyParams.Clear;
 
 		if Terminated then Break;
 		Suspend;
@@ -708,6 +763,8 @@ var
 begin
 	ResponseCode := -1;
 	if (ItemType = gdtThread) and (RangeStart > 0) then begin
+//	if (ItemType = gdtThread) and (Item.ThreadItem.Size > 0) then begin
+//		FIndy.Request.ContentRangeStart := Item.ThreadItem.Size + AdjustLen;
 		FIndy.Request.ContentRangeStart := RangeStart + AdjustLen;
 		FIndy.Request.ContentRangeEnd := 0;
 	end else begin
@@ -720,7 +777,9 @@ begin
 	FIndy.Request.CustomHeaders.Add('Pragma: no-cache');
 	if (Modified <> 0) and (Modified <> ZERO_DATE) then begin
 		FIndy.Request.LastModified := modified - OffsetFromUTC;
+		//FIndy.Request.CustomHeaders.Add('If-Modified-Since: ' + RFC1123_Date(modified - OffsetFromUTC) + ' GMT');
 	end;
+//	FIndy.Request.AcceptEncoding := 'gzip';
 	if RangeStart = 0 then
 		FIndy.Request.AcceptEncoding := 'gzip'
 	else
@@ -889,20 +948,17 @@ begin
 	end;
 end;
 
-//‚Ps–Ú‚ðÁ‚µ‚āAƒRƒ“ƒeƒ“ƒcƒTƒCƒY‚ðÝ’è‚·‚é
-procedure TDownloadThread.DeleteStatusLine(Item: TDownloadItem);
+//Žè”²‚«‚ȏˆ—‚Å1s–Ú‚ðÁ‚·
+function TDownloadThread.DeleteStatusLine(Content: string): string;
 var
 	SList: TStringList;
 begin
 	SList := TStringList.Create;
 	try
-		SList.Text := Item.Content;
-		//1s–Ú‚ðíœ
+		SList.Text := Content;
 		if SList.Count > 1 then
 			SList.Delete(0);
-        Item.Content := SList.Text;
-		//‰üsƒR[ƒh‚ðCRLF -> LF‚ƍl‚¦‚āAs”•ª‚¾‚¯ƒ}ƒCƒiƒX
-        Item.ContentLength := Length(SList.Text) - SList.Count;
+		Result := SList.Text;
 	finally
 		SList.Free;
 	end;
@@ -1194,6 +1250,11 @@ var
 	NewRes: Integer;
 	finish : Boolean;
 	loopCnt : Integer;
+//	KokoTxt	: string;
+//	KokoIdx	: Integer;
+//	NewTxt	: string;
+//	NewIdx	: Integer;
+//	LastTxt	: string;
 	LastIdx	: Integer;
 begin
 	FileName := ThreadItem.GetThreadFileName;
@@ -1292,7 +1353,7 @@ begin
 				Body.SaveToFile(FileName);
 
 				if ThreadItem.Title = '' then begin
-					THTMLCreate.DivideStrLine(Body[0], @Res);
+					Res := DivideStrLine(Body[0]);
 					ThreadItem.Title := Res.FTitle;
 				end;
 				ThreadItem.Size := 0;
@@ -1314,6 +1375,7 @@ begin
 	ThreadItem.RoundDate := Now;
 	if not ThreadItem.UnRead then begin
 		ThreadItem.UnRead := True;
+		ThreadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead + 1;
 	end;
 //	if ThreadItem.RoundNo = 6 then
 //		ThreadItem.RoundNo := 0;

--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -4,8 +4,8 @@ interface
 
 uses
 	Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-	Dialogs, ComCtrls, StdCtrls, ExtCtrls, ActnList, Menus,
-	Editor;
+	Dialogs, ComCtrls, StdCtrls, ExtCtrls, ActnList, Menus, GikoSystem, GikoUtil,
+    Editor;
 
 type
 	TKeySettingItem = class(TObject)
@@ -64,7 +64,7 @@ type
 		{ Private éŒ¾ }
 	public
 		{ Public éŒ¾ }
-		EditorForm: TEditorForm;
+        EditorForm: TEditorForm;
 	end;
 
 //var
@@ -72,8 +72,7 @@ type
 
 implementation
 
-uses
-	Giko, GikoUtil, Gesture, GikoDataModule, GikoSystem;
+uses Giko, Gesture, GikoDataModule;
 
 const
 	GUESTURE_NOTHING	= '‚È‚µ';
@@ -111,7 +110,7 @@ begin
 	if ListView.Items.Count > 0 then
 		ListView.Selected := ListView.Items[0];
 	EditorForm := TEditorForm.Create(Self);
-	GikoSys.LoadKeySetting(EditorForm.ActionList, GikoSys.GetEditorKeyFileName);
+	GikoSys.LoadEditorKeySetting(EditorForm.ActionList);
 	try
 		for i := 0 to EditorForm.ActionList.ActionCount - 1 do begin
 			if EditorForm.ActionList.Actions[i] is TAction then begin

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -136,7 +136,7 @@ begin
 	GikoSys.Setting.TimeAdjust := PutPostTimeRadioButton.Checked;
 		//2chŒ¾ŒêƒTƒ|[ƒg
 		GikoSys.Setting.GengoSupport := GengoSupport.Checked;
-        GikoSys.SetGikoMessage;
+        GikoSys.Setting.SetMessages;
 		//ƒ[ƒJƒ‹EƒŠƒ‚[ƒg̼±ÅŒx
 		GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
 		GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;

--- a/ListViewUtils.pas
+++ b/ListViewUtils.pas
@@ -10,24 +10,20 @@ type
 	TListViewUtils = class(TObject)
 	private
 		{Private éŒ¾}
-		class procedure DrawCategoryItem(BBS: TBBS; Item: TListItem; ListView: TListView);
-		class procedure DrawBoardItem(Category: TCategory; Item: TListItem; ListView: TListView);
-		class procedure DrawThreadItem(Board: TBoard; Item: TListItem; ListView: TListView);
-		class procedure DrawItemLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
-		class procedure DrawItemNoLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
 	public
 		{Public éŒ¾}
 		class procedure SetBoardTreeNode(inBBS : TBBS; treeView: TTreeView);
 		class function SetCategoryListItem(ABBS2ch: TBBS; ListView: TListView;
-			NumberVisible: Boolean): Integer;
+			NumberVisible: Boolean; var vSortIndex: Integer; var vSortOrder: Boolean): Integer;
 		class procedure ListViewSort(Sender: TObject; ListView: TListView; Column: TListColumn;
-			NumberVisible: Boolean; vSortOrder: Boolean);
+			NumberVisible: Boolean; var vSortOrder: Boolean;	var vSortIndex: Integer);
 		class function	ActiveListTrueColumn( column : TListColumn ) : TListColumn;
 		class function SetBoardListItem(Category: TCategory; ListView: TListView;
-			NumberVisible: Boolean): Integer;
+			NumberVisible: Boolean;	var vSortIndex: Integer; var vSortOrder: Boolean): Integer;
 		class function SetThreadListItem(Board: TBoard; ListView: TListView;
-			NumberVisible: Boolean): Integer;
+			NumberVisible: Boolean; var vSortIndex: Integer; var vSortOrder: Boolean): Integer;
 		class procedure ListViewData(Sender: TObject; Item: TListItem);
+
 	end;
 
 
@@ -141,7 +137,9 @@ end;
 class function TListViewUtils.SetCategoryListItem(
 	ABBS2ch: TBBS;
 	ListView: TListView;
-	NumberVisible: Boolean
+	NumberVisible: Boolean;
+	var vSortIndex: Integer;
+	var vSortOrder: Boolean
 ): Integer;
 var
 	TitleColumn	: TListColumn;
@@ -181,13 +179,12 @@ begin
 		GikoForm.FolderImage.Picture := nil;
 		GikoForm.ItemIcon16.GetBitmap(1, GikoForm.FolderImage.Picture.Bitmap);
 
+		vSortIndex := GikoSys.Setting.BBSSortIndex;
+		vSortOrder := GikoSys.Setting.BBSSortOrder;
 		for i := ListView.Columns.Count - 1 downto 0 do begin
-			if (GikoSys.Setting.BBSSortIndex
-					= Integer(GikoSys.Setting.BBSColumnOrder[ ListView.Column[ i ].Tag ])) then begin
-				ListViewSort( nil, ListView, ListView.Column[ i ],
-					 NumberVisible, GikoSys.Setting.BBSSortOrder);
-				Break;
-			end;
+			idx := ListView.Column[ i ].Tag;
+			if vSortIndex = Ord( GikoSys.Setting.BBSColumnOrder[ idx ] ) then
+				ListViewSort( nil, ListView, ListView.Column[ i ], NumberVisible, vSortOrder, vSortIndex );
 		end;
 
 		Result := ABBS2ch.Count;
@@ -201,10 +198,11 @@ class procedure TListViewUtils.ListViewSort(
 	ListView: TListView;
 	Column: TListColumn;
 	NumberVisible: Boolean;
-	vSortOrder: Boolean
+	var vSortOrder: Boolean;
+	var vSortIndex: Integer
 );
 var
-	i, idx	: Integer;
+	i, id, idx	: Integer;
 	orderList		: TList;
 	wkBBS: TBBS;
 	wkCategory: TCategory;
@@ -215,41 +213,53 @@ begin
 	for i := 0 to ListView.Columns.Count - 1 do begin
 		ListView.Column[i].ImageIndex := -1;
 	end;
-	if vSortOrder then
+
+	if SortOrder then
 		ListView.Column[ idx ].ImageIndex := ITEM_ICON_SORT1
 	else
 		ListView.Column[ idx ].ImageIndex := ITEM_ICON_SORT2;
 
-
 	Sort.SortNoFlag := NumberVisible;
 
+	//if TObject(TreeView.Selected.Data) is TBBS then begin
 	if TObject( GikoForm.ActiveList ) is TBBS then begin
+		//wkBBS := TBBS(TreeView.Selected.Data);
 		wkBBS := TBBS( GikoForm.ActiveList );
 		orderList := GikoSys.Setting.BBSColumnOrder;
+		id := Integer( orderList[ idx ] );
 		Sort.SortOrder := vSortOrder;
-		Sort.SortIndex := Integer( orderList[ idx ] );
-		GikoSys.Setting.BBSSortIndex := Sort.SortIndex;
-		GikoSys.Setting.BBSSortOrder := Sort.SortOrder;
+		Sort.SortIndex := id;
+		GikoSys.Setting.BBSSortIndex := id;
+		GikoSys.Setting.BBSSortOrder := vSortOrder;
 		wkBBS.Sort(Sort.CategorySortProc);
+	//end else if TObject(TreeView.Selected.Data) is TCategory then begin
 	end else if TObject( GikoForm.ActiveList ) is TCategory then begin
+		//wkCategory := TCategory(TreeView.Selected.Data);
 		wkCategory := TCategory( GikoForm.ActiveList );
 		orderList := GikoSys.Setting.CategoryColumnOrder;
+		id := Integer( orderList[ idx ] );
 		Sort.SortOrder := vSortOrder;
-		Sort.SortIndex := Integer( orderList[ idx ] );
-		GikoSys.Setting.CategorySortIndex := Sort.SortIndex;
-		GikoSys.Setting.CategorySortOrder := Sort.SortOrder;
+		Sort.SortIndex := id;
+		GikoSys.Setting.CategorySortIndex := id;
+		GikoSys.Setting.CategorySortOrder := vSortOrder;
 		wkCategory.CustomSort(BoardSortProc);
+	//end else if TObject(TreeView.Selected.Data) is TBoard then begin
 	end else if TObject( GikoForm.ActiveList ) is TBoard then begin
+		//wkBoard := TBoard(TreeView.Selected.Data);
 		wkBoard := TBoard( GikoForm.ActiveList );
 		orderList := GikoSys.Setting.BoardColumnOrder;
+		id := Integer( orderList[ idx ] );
 		Sort.SortOrder := vSortOrder;
-		Sort.SortIndex := Integer( orderList[ idx ] );
-		GikoSys.Setting.BoardSortIndex := Sort.SortIndex;
-		GikoSys.Setting.BoardSortOrder := Sort.SortOrder;
+		Sort.SortIndex := id;
+		GikoSys.Setting.BoardSortIndex := id;
+		GikoSys.Setting.BoardSortOrder := vSortOrder;
 		wkBoard.CustomSort(ThreadItemSortProc);
+	end else begin
+		id := 0;
 	end;
 
 	ListView.Refresh;
+	vSortIndex := id;
 end;
 
 {!
@@ -259,16 +269,49 @@ Delphi 6 Personal 
 ³‚µ‚¢ƒJƒ‰ƒ€‚ª“n‚³‚ê‚È‚¢‚½‚߁A³‚µ‚¢ƒJƒ‰ƒ€‚É•ÏŠ·‚µ‚Ü‚·B
 }
 class function	TListViewUtils.ActiveListTrueColumn( column : TListColumn ) : TListColumn;
+{*
+var
+	i, idx		: Integer;
+	orderList	: TList;
+*}
 begin
+
 	// ³‚µ‚­•ÏŠ·‚·‚é•û–@‚ª•ª‚©‚ç‚È‚¢‚Ì‚Å•Û—¯
 	Result := column;
 	Exit;
+{*
+	Result := column;
+
+	if TObject( FActiveList ) is TBBS then
+		orderList := GikoSys.Setting.BBSColumnOrder
+	else if TObject( FActiveList ) is TCategory then
+		orderList := GikoSys.Setting.CategoryColumnOrder
+	else if TObject( FActiveList ) is TBoard then
+		orderList := GikoSys.Setting.BoardColumnOrder
+	else
+		Exit;
+
+	idx := column.Tag;
+
+	for i := 0 to ListView.Columns.Count - 1 do begin
+		if Integer( orderList[ ListView.Column[ i ].Tag ] ) = 0 then begin
+			if idx = 0 then
+				Result := ListView.Column[ i ]
+			else if idx <= i then
+				Result := ListView.Column[ idx - 1 ];
+			Exit;
+		end;
+	end;
+*}
+
 end;
 //ListView‚ÉBoardItem‚ðÝ’è‚·‚é
 class function TListViewUtils.SetBoardListItem(
 	Category: TCategory;
 	ListView: TListView;
-	NumberVisible: Boolean
+	NumberVisible: Boolean;
+	var vSortIndex: Integer;
+	var vSortOrder: Boolean
 ): Integer;
 var
 	TitleColumn	: TListColumn;
@@ -323,13 +366,12 @@ begin
 		GikoForm.FolderImage.Picture := nil;
 		GikoForm.ItemIcon16.GetBitmap(3, GikoForm.FolderImage.Picture.Bitmap);
 
+		vSortIndex := GikoSys.Setting.CategorySortIndex;
+		vSortOrder := GikoSys.Setting.CategorySortOrder;
 		for i := ListView.Columns.Count - 1 downto 0 do begin
-			if (GikoSys.Setting.CategorySortIndex =
-				Integer( GikoSys.Setting.CategoryColumnOrder[ ListView.Columns[i].Tag ] )) then begin
-				ListViewSort( nil, ListView, ListView.Column[ i ],
-					 NumberVisible, GikoSys.Setting.CategorySortOrder);
-				Break;
-			end;
+			idx := ListView.Column[ i ].Tag;
+			if vSortIndex = Ord( GikoSys.Setting.CategoryColumnOrder[ idx ] ) then
+				ListViewSort( nil, ListView, ListView.Column[ i ], NumberVisible, vSortOrder, vSortIndex );
 		end;
 
 		Result := Category.Count;
@@ -341,7 +383,9 @@ end;
 class function TListViewUtils.SetThreadListItem(
 	Board: TBoard;
 	ListView: TListView;
-	NumberVisible: Boolean
+	NumberVisible: Boolean;
+	var vSortIndex: Integer;
+	var vSortOrder: Boolean
 ): Integer;
 var
 	TitleColumn	: TListColumn;
@@ -416,13 +460,12 @@ begin
 		GikoForm.FolderImage.Picture := nil;
 		GikoForm.ItemIcon16.GetBitmap(5, GikoForm.FolderImage.Picture.Bitmap);
 
+		vSortIndex := GikoSys.Setting.BoardSortIndex;
+		vSortOrder := GikoSys.Setting.BoardSortOrder;
 		for i := ListView.Columns.Count - 1 downto 0 do begin
-			if (GikoSys.Setting.BoardSortIndex
-				= Integer( GikoSys.Setting.BoardColumnOrder[ ListView.Columns[ i ].Tag ] )) then begin
-				ListViewSort( nil, ListView, ListView.Column[ i ],
-					 NumberVisible, GikoSys.Setting.BoardSortOrder);
-				Break;
-			end;
+			idx := ListView.Column[ i ].Tag;
+			if vSortIndex = Ord( GikoSys.Setting.BoardColumnOrder[ idx ] ) then
+				ListViewSort( nil, ListView, ListView.Column[ i ], NumberVisible, vSortOrder, vSortIndex );
 		end;
 
 		Result := Board.Count;
@@ -433,268 +476,285 @@ end;
 
 class procedure TListViewUtils.ListViewData(Sender: TObject; Item: TListItem);
 var
-	ActivListObj : TObject;
+//	FileName: string;
+//	DateTime: TDateTime;
+	BoardCnt: Integer;
+	BBS: TBBS;
+	Category: TCategory;
+	Board: TBoard;
+	ThreadItem: TThreadItem;
+	RepStr: string;
+		ActivListObj : TObject;
+	i, idx : Integer;
 	ListView : TListView;
 begin
 	if (Sender <> nil) and (Sender is TListView) then begin
-		ListView := TListView(Sender);
-		ActivListObj := GikoForm.ActiveList;
-		if ActivListObj is TBBS then begin
-			DrawCategoryItem(TBBS(ActivListObj), Item, ListView);
-		end else if ActivListObj is TCategory then begin
-			DrawBoardItem(TCategory(ActivListObj), Item, ListView);
-		end else if ActivListObj is TBoard then begin
-			DrawThreadItem(TBoard(ActivListObj), Item, ListView);
-		end;
+		ListView := TListView(Sender)
+	end else begin
+		Exit;
 	end;
-end;
-//! ƒŠƒXƒgƒrƒ…[‚̃AƒCƒeƒ€‚ð•`‰æ‚·‚éiƒJƒeƒSƒŠ[—pj
-class procedure TListViewUtils.DrawCategoryItem(
-	BBS: TBBS; Item: TListItem; ListView: TListView
-);
-var
-	Category : TCategory;
-begin
 
-	//===== ƒJƒeƒSƒŠƒŠƒXƒg =====
-	ListView.StateImages := nil;
+	ActivListObj := GikoForm.ActiveList;
+	if ActivListObj is TBBS then begin
+		//===== ƒJƒeƒSƒŠƒŠƒXƒg =====
+		BBS := TBBS(ActivListObj);
 
-	if (BBS = nil) or (BBS.Count <= 0) or (Item = nil)
-		or (Item.Index >= BBS.Count) or (ListView.Items.Count = 0)
-		or (not (BBS.Items[Item.index] is TCategory)) then Exit;
+		GikoForm.ListView.StateImages := nil;
 
-	Category := TCategory(BBS.Items[Item.index]);
+		if (BBS = nil) or (BBS.Count <= 0) or (Item = nil)
+			or (Item.Index >= BBS.Count) or (ListView.Items.Count = 0)
+			or (not (BBS.Items[Item.index] is TCategory)) then Exit;
+		//if BBS.Count <= 0 then Exit;
+		//if Item = nil then Exit;
+		//if Item.Index >= BBS.Count then Exit;
+		//if ListView.Items.Count = 0 then Exit;
 
-	if (Category = nil) then Exit;
+		//if not (BBS.Items[Item.index] is TCategory) then Exit;
+		Category := TCategory(BBS.Items[Item.index]);
 
-    if GikoDM.ListNumberVisibleAction.Checked then
-		Item.Caption := IntToStr(Category.No) + ': ' + Category.Title
-	else
-		Item.Caption := Category.Title;
+		if Category = nil then Exit;
 
-	Item.ImageIndex := ITEM_ICON_CATEGORY1;
-	Item.Data := Category;
-end;
-//! ƒŠƒXƒgƒrƒ…[‚̃AƒCƒeƒ€‚ð•`‰æ‚·‚éi”—pj
-class procedure TListViewUtils.DrawBoardItem(
-	Category: TCategory; Item: TListItem; ListView: TListView
-);
-var
-	Board: TBoard;
-	i, idx : Integer;
-begin
-	//===== ”ƒŠƒXƒg =====
-	ListView.StateImages := nil;
+		if GikoDM.ListNumberVisibleAction.Checked then
+			Item.Caption := IntToStr(Category.No) + ': ' + Category.Title
+		else
+			Item.Caption := Category.Title;
 
-	if (Category = nil) or (Category.Count <= 0) or (Item = nil)
-		or (Item.Index >= Category.Count) or (ListView.Items.Count = 0)
-		or (not (Category.Items[Item.Index] is TBoard))  then Exit;
+		Item.ImageIndex := ITEM_ICON_CATEGORY1;
+		Item.Data := Category;
 
-	Board := TBoard(Category.Items[Item.Index]);
+	end else if ActivListObj is TCategory then begin
 
-	if (Board = nil)  then Exit;
+		//===== ”ƒŠƒXƒg =====
+		Category := TCategory(ActivListObj);
 
-	if GikoDM.ListNumberVisibleAction.Checked then
-		Item.Caption := IntToStr(Board.No) + ': ' + Board.Title
-	else
-		Item.Caption := Board.Title;
+		ListView.StateImages := nil;
 
-	if Item.SubItems.Count <> ListView.Columns.Count then begin
-		Item.SubItems.Clear;
-		Item.SubItems.Capacity := GikoSys.Setting.CategoryColumnOrder.Count;
-		for i := GikoSys.Setting.CategoryColumnOrder.Count - 1 downto 1 do
-			Item.SubItems.Add('');
-	end;
+		if (Category = nil) or (Category.Count <= 0) or (Item = nil)
+			or (Item.Index >= Category.Count) or (ListView.Items.Count = 0)
+			or (not (Category.Items[Item.Index] is TBoard))  then Exit;
+		//if Category.Count <= 0 then Exit;
+		//if Item = nil then Exit;
+		//if Item.Index >= Category.Count then Exit;
+		//if ListView.Items.Count = 0 then Exit;
 
-	Item.ImageIndex := ITEM_ICON_BOARD1;
-	idx := 0;
-	for i := 0 to ListView.Columns.Count - 1 do begin
-		if GikoSys.Setting.CategoryColumnOrder.Count <= i then
-			Break;
-		case GikoSys.Setting.CategoryColumnOrder[ i ] of
-		gccTitle:
-			// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
-			Dec( idx );
-
-		gccRoundName:
-			if Board.Round then
-				Item.SubItems[ idx ] := Board.RoundName	// '—\–ñ'
-			else
-				Item.SubItems[ idx ] := '';
+		//if not (Category.Items[Item.Index] is TBoard) then Exit;
+		Board := TBoard(Category.Items[Item.Index]);
 
-		gccLastModified:
-			if Board.RoundDate = ZERO_DATE then begin
-				Item.SubItems[ idx ] := '';
-			end else
-				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Board.RoundDate);
-		end;
-		Inc( idx );
-	end;
+		if Board = nil then Exit;
 
-	Item.Data := Board;
+		if GikoDM.ListNumberVisibleAction.Checked then
+			Item.Caption := IntToStr(Board.No) + ': ' + Board.Title
+			//Item.Caption := IntToStr(Item.Index + 1) + ': ' + Board.Title
+		else
+			Item.Caption := Board.Title;
 
-end;
-//! ƒŠƒXƒgƒrƒ…[‚̃AƒCƒeƒ€‚ð•`‰æ‚·‚éiƒXƒŒƒbƒh—pj
-class procedure TListViewUtils.DrawThreadItem(
-	Board: TBoard; Item: TListItem;ListView : TListView
-);
-var
-	ThreadItem: TThreadItem;
-	BoardCnt: Integer;
-	RepStr: String;
-	i: Integer;
-begin
-	//===== ƒXƒŒƒŠƒXƒg =====
-	if GikoSys.Setting.ListIconVisible then
-		ListView.StateImages := GikoForm.StateIconImageList
-	else
-		ListView.StateImages := nil;
+		if Item.SubItems.Count <> ListView.Columns.Count then begin
+			Item.SubItems.Clear;
+			Item.SubItems.Capacity := GikoSys.Setting.CategoryColumnOrder.Count;
+			for i := GikoSys.Setting.CategoryColumnOrder.Count - 1 downto 1 do
+				Item.SubItems.Add('');
+		end;
 
+		Item.ImageIndex := ITEM_ICON_BOARD1;
+		idx := 0;
+		for i := 0 to ListView.Columns.Count - 1 do begin
+			if GikoSys.Setting.CategoryColumnOrder.Count <= i then
+				Break;
+//				case TGikoCategoryColumnID( ListView.Column[ i ].Tag ) of
+			case GikoSys.Setting.CategoryColumnOrder[ i ] of
+			gccTitle:
+				// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
+				Dec( idx );
+
+			gccRoundName:
+				if Board.Round then
+					Item.SubItems[ idx ] := Board.RoundName	// '—\–ñ'
+				else
+					Item.SubItems[ idx ] := '';
+
+			gccLastModified:
+				if Board.RoundDate = ZERO_DATE then begin
+					Item.SubItems[ idx ] := '';
+				end else
+					Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Board.RoundDate);
+			end;
+			Inc( idx );
+		end;
 
-	case GikoForm.ViewType of
-		gvtAll: BoardCnt := Board.Count;
-		gvtLog: BoardCnt := Board.LogThreadCount;
-		gvtNew: BoardCnt := Board.NewThreadCount;
-		gvtUser: BoardCnt := Board.UserThreadCount;
-		else
-			BoardCnt := 0;
-	end;
+		Item.Data := Board;
 
-	if (BoardCnt <= 0) or (Item = nil) or (Item.Index > BoardCnt)
-		or (ListView.Items.Count = 0) or (not (Board.Items[Item.Index] is TThreadItem)) then Exit;
-
-	//‰ü‘P‚·‚ׂ«ƒuƒƒbƒN/////////////////////////////////////////////////////
-	ThreadItem := nil;
-	case GikoForm.ViewType of
-		gvtAll: if Item.Index >= Board.Count then Exit else
-							ThreadItem := TThreadItem(Board.Items[Item.Index]);
-		gvtLog: 	ThreadItem := Board.GetLogThread(Item.Index);
-		gvtNew:		ThreadItem := Board.GetNewThread(Item.Index);
-		gvtUser:	ThreadItem := Board.GetUserThread(Item.Index);
-	end;
-	//////////////////////////////////////////////////////////////////////////
-
-	if (ThreadItem = nil)  then Exit;
-
-	RepStr := CustomStringReplace(ThreadItem.Title, '&lt;', '<' );
-	RepStr := CustomStringReplace(RepStr, '&gt;', '>' );
-	RepStr := CustomStringReplace(RepStr, '&quot;', '"' );
-	RepStr := CustomStringReplace(RepStr, '&amp;', '&' );
-	//RepStr := StringReplace(RepStr, '—M', ',', [rfReplaceAll]);
-	if Item.SubItems.Count <> ListView.Columns.Count then begin
-		Item.SubItems.Clear;
-		Item.SubItems.Capacity := GikoSys.Setting.BoardColumnOrder.Count;
-		for i := GikoSys.Setting.BoardColumnOrder.Count - 1 downto 1 do
-			Item.SubItems.Add('');
-	end;
+	end else if ActivListObj is TBoard then begin
 
-	if GikoDM.ListNumberVisibleAction.Checked then
-		Item.Caption := IntToStr(ThreadItem.No) + ': ' + RepStr
-	else
-		Item.Caption := RepStr;
+		//===== ƒXƒŒƒŠƒXƒg =====
+		Board := TBoard(ActivListObj);
 
-	case ThreadItem.AgeSage of
-		gasNone: Item.StateIndex := -1;
-		gasNew:	Item.StateIndex := 0;
-		gasAge:	Item.StateIndex := 1;
-		gasSage: Item.StateIndex := 2;
-	end;
+		if GikoSys.Setting.ListIconVisible then
+			ListView.StateImages := GikoForm.StateIconImageList
+		else
+			ListView.StateImages := nil;
 
-	if ThreadItem.IsLogFile then begin
-		DrawItemLogThread(ThreadItem, Item, ListView.Columns.Count);
-	end else begin
-		DrawItemNoLogThread(ThreadItem, Item, GikoSys.Setting.BoardColumnOrder.Count);
-	end;
 
-	Item.Data := ThreadItem;
-end;
-//! ƒƒO—L‚èƒXƒŒƒbƒh‚ð•`‰æ‚·‚é
-class procedure TListViewUtils.DrawItemLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
-var
-	i, idx : Integer;
-begin
-	idx := 0;
-	for i := 0 to ColumnCount - 1 do begin
-		if GikoSys.Setting.BoardColumnOrder.Count <= i then
-			Break;
-
-		case GikoSys.Setting.BoardColumnOrder[ i ] of
-		gbcTitle:
-			// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
-			Dec( idx );
-		gbcAllCount:
-			Item.SubItems[ idx ] := IntToStr(Thread.AllResCount);
-		gbcLocalCount:
-			Item.SubItems[ idx ] := IntToStr(Thread.Count);
-		gbcNonAcqCount:
-			Item.SubItems[ idx ] := IntToStr(Thread.AllResCount - Thread.Count);
-		gbcNewCount:
-			if Thread.NewResCount = 0 then
-				Item.SubItems[ idx ] := ''
+		case GikoForm.ViewType of
+			gvtAll: BoardCnt := Board.Count;
+			gvtLog: BoardCnt := Board.LogThreadCount;
+			gvtNew: BoardCnt := Board.NewThreadCount;
+			gvtUser: BoardCnt := Board.UserThreadCount;
 			else
-				Item.SubItems[ idx ] := IntToStr(Thread.NewResCount);
-		gbcUnReadCount:
-			Item.SubItems[ idx ] := '';
-		gbcRoundName:
-			if Thread.Round then
-				Item.SubItems[ idx ] := Thread.RoundName
+				BoardCnt := 0;
+		end;
+		{
+		case GikoForm.ViewType of
+			gvtAll: BoardCnt := Board.Count;
+			gvtLog: BoardCnt := Board.GetLogThreadCount;
+			gvtNew: BoardCnt := Board.GetNewThreadCount;
+			gvtUser: BoardCnt := Board.GetUserThreadCount;
 			else
-				Item.SubItems[ idx ] := '';
-		gbcRoundDate://gbcLastModified:
-			if (Thread.RoundDate = ZERO_DATE)  then begin
-				Item.SubItems[ idx ] := '';
-			end else
-				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.RoundDate);
-		gbcCreated:
-			if Thread.CreateDate = ZERO_DATE then begin
-				Item.SubItems[ idx ] := '';
-			end else
-				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.CreateDate);
-		gbcLastModified:
-			if (Thread.LastModified = ZERO_DATE)  then begin
-				Item.SubItems[ idx ] := '';
-			end else
-				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.LastModified);
+				BoardCnt := 0;
 		end;
-		Inc( idx );
-	end;
+		}
+//		if Board = nil then Exit;
+		if (BoardCnt <= 0) or (Item = nil) or (Item.Index > BoardCnt)
+			or (ListView.Items.Count = 0) or (not (Board.Items[Item.Index] is TThreadItem)) then Exit;
 
-	if Thread.NewArrival then
-		Item.ImageIndex := ITEM_ICON_THREADNEW1
-	else
-		Item.ImageIndex := ITEM_ICON_THREADLOG1;
-end;
-//! ƒƒO‚È‚µƒXƒŒƒbƒh‚ð•`‰æ‚·‚é
-class procedure TListViewUtils.DrawItemNoLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
-var
-	i, idx: Integer;
-begin
-	idx := 0;
-	for i := 0 to ColumnCount - 1do begin
-		case GikoSys.Setting.BoardColumnOrder[ i ] of
-		gbcTitle:
-			// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
-			Dec( idx );
-		gbcAllCount:
-			Item.SubItems[ idx ] := IntToStr(Thread.AllResCount);
-		gbcRoundDate://gbcLastModified:
-			Item.SubItems[ idx ] := '';
-		gbcCreated:
-			if Thread.CreateDate = ZERO_DATE then begin
-				Item.SubItems[ idx ] := '';
-			end else
-				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.CreateDate);
-		gbcLastModified:
-			Item.SubItems[ idx ] := '';
+		//‰ü‘P‚·‚ׂ«ƒuƒƒbƒN/////////////////////////////////////////////////////
+		ThreadItem := nil;
+		case GikoForm.ViewType of
+			gvtAll: if Item.Index >= Board.Count then Exit else
+								ThreadItem := TThreadItem(Board.Items[Item.Index]);
+			gvtLog: 	ThreadItem := Board.GetLogThread(Item.Index);
+			gvtNew:		ThreadItem := Board.GetNewThread(Item.Index);
+			gvtUser:	ThreadItem := Board.GetUserThread(Item.Index);
+		end;
+		//////////////////////////////////////////////////////////////////////////
+		
+		if ThreadItem = nil then Exit;
+
+		RepStr := CustomStringReplace(ThreadItem.Title, '&lt;', '<' );
+		RepStr := CustomStringReplace(RepStr, '&gt;', '>' );
+		RepStr := CustomStringReplace(RepStr, '&quot;', '"' );
+		RepStr := CustomStringReplace(RepStr, '&amp;', '&' );
+		//RepStr := StringReplace(RepStr, '—M', ',', [rfReplaceAll]);
+		if Item.SubItems.Count <> ListView.Columns.Count then begin
+			Item.SubItems.Clear;
+			Item.SubItems.Capacity := GikoSys.Setting.BoardColumnOrder.Count;
+			for i := GikoSys.Setting.BoardColumnOrder.Count - 1 downto 1 do
+				Item.SubItems.Add('');
+		end;
+
+		if GikoDM.ListNumberVisibleAction.Checked then
+			Item.Caption := IntToStr(ThreadItem.No) + ': ' + RepStr
 		else
-			Item.SubItems[ idx ] := '';
+			Item.Caption := RepStr;
+
+		case ThreadItem.AgeSage of
+			gasNone: Item.StateIndex := -1;
+			gasNew:	Item.StateIndex := 0;
+			gasAge:	Item.StateIndex := 1;
+			gasSage: Item.StateIndex := 2;
+		end;
+
+		if ThreadItem.IsLogFile then begin
+			idx := 0;
+			for i := 0 to ListView.Columns.Count - 1 do begin
+			if GikoSys.Setting.BoardColumnOrder.Count <= i then
+				Break;
+//				case TGikoBoardColumnID( ListView.Column[ i ].Tag ) of
+				case GikoSys.Setting.BoardColumnOrder[ i ] of
+				gbcTitle:
+					// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
+					Dec( idx );
+
+				gbcAllCount:
+					Item.SubItems[ idx ] := IntToStr(ThreadItem.AllResCount);
+
+				gbcLocalCount:
+					Item.SubItems[ idx ] := IntToStr(ThreadItem.Count);
+
+				gbcNonAcqCount:
+					Item.SubItems[ idx ] := IntToStr(ThreadItem.AllResCount - ThreadItem.Count);
+
+				gbcNewCount:
+					if ThreadItem.NewResCount = 0 then
+						Item.SubItems[ idx ] := ''
+					else
+						Item.SubItems[ idx ] := IntToStr(ThreadItem.NewResCount);
+
+				gbcUnReadCount:
+					Item.SubItems[ idx ] := '';
+
+				gbcRoundName:
+					if ThreadItem.Round then
+						Item.SubItems[ idx ] := ThreadItem.RoundName
+					else
+						Item.SubItems[ idx ] := '';
+
+				gbcRoundDate://gbcLastModified:
+					if (ThreadItem.RoundDate = ZERO_DATE)  then begin
+						Item.SubItems[ idx ] := '';
+					end else
+						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.RoundDate);
+
+				gbcCreated:
+					if ThreadItem.CreateDate = ZERO_DATE then begin
+						Item.SubItems[ idx ] := '';
+					end else
+						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.CreateDate);
+
+				gbcLastModified:
+					if (ThreadItem.LastModified = ZERO_DATE)  then begin
+						Item.SubItems[ idx ] := '';
+					end else
+						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.LastModified);
+
+
+				end;
+				Inc( idx );
+			end;
+
+			if ThreadItem.NewArrival then
+				Item.ImageIndex := ITEM_ICON_THREADNEW1
+			else
+				Item.ImageIndex := ITEM_ICON_THREADLOG1;
+
+
+		end else begin
+			idx := 0;
+			for i := 0 to GikoSys.Setting.BoardColumnOrder.Count - 1 do begin
+//				case TGikoBoardColumnID( ListView.Column[ i ].Tag ) of
+				case GikoSys.Setting.BoardColumnOrder[ i ] of
+				gbcTitle:
+					// Item.Caption ‚Í SubItems ‚ÉŠÜ‚Ü‚ê–³‚¢‚Ì‚Å
+					Dec( idx );
+
+				gbcAllCount:
+					Item.SubItems[ idx ] := IntToStr(ThreadItem.AllResCount);
+
+				gbcRoundDate://gbcLastModified:
+					Item.SubItems[ idx ] := '';
+
+				gbcCreated:
+					if ThreadItem.CreateDate = ZERO_DATE then begin
+						Item.SubItems[ idx ] := '';
+					end else
+						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.CreateDate);
+
+				gbcLastModified:
+					Item.SubItems[ idx ] := '';
+
+				else
+					Item.SubItems[ idx ] := '';
+				end;
+				Inc( idx );
+			end;
+			if ThreadItem.NewArrival then
+				Item.ImageIndex := ITEM_ICON_THREADNEW1
+			else
+				Item.ImageIndex := ITEM_ICON_THREAD1;
 		end;
-		Inc( idx );
+
+		Item.Data := ThreadItem;
+
 	end;
-	if Thread.NewArrival then
-		Item.ImageIndex := ITEM_ICON_THREADNEW1
-	else
-		Item.ImageIndex := ITEM_ICON_THREAD1;
 end;
 
 end.

--- a/MojuUtils.pas
+++ b/MojuUtils.pas
@@ -14,23 +14,24 @@ unit MojuUtils;
 interface
 
 uses
-	Windows, Classes, SysUtils;
+	Windows, Classes, SysUtils, GikoSystem;
 
 	function StrPosEx(StrStart, StrEnd, SubstrStart, SubstrEnd: PChar): PChar;
 	function AnsiStrPosEx(StrStart, StrEnd, SubstrStart, SubstrEnd: PChar): PChar;
-	function ReplaceString(const S: String; const OldPattern: String; const NewPattern: string): String;
-	function IgnoCaseReplaceString(const S: String; const OldPattern:String; const NewPattern: string): String;
+	function ReplaceString(const S, OldPattern, NewPattern: string): string;
+	function IgnoCaseReplaceString(const S, OldPattern, NewPattern: string): string;
 
-	function CustomStringReplace(const S: String; const OldPattern: String; const  NewPattern: string; IgnoreCase : Boolean = False): String; overload;
-	procedure CustomStringReplace(var S : TStringList;const OldPattern: String;const  NewPattern: string; IgnoreCase : Boolean = False); overload;
+	function CustomStringReplace(S , OldPattern: String;const  NewPattern: string; IgnoreCase : Boolean = False): String; overload;
+	procedure CustomStringReplace(var S : TStringList; OldPattern: String;const  NewPattern: string; IgnoreCase : Boolean = False); overload;
 
 	function ZenToHan(const s: string): string;
-	function VaguePos(const Substr: String; const S: string): Integer;
+	function VaguePos(const Substr, S: string): Integer;
 
 	function ReplaseNoValidateChar( inVal : String): String;
 	function IsNoValidID( inID :String): Boolean;
 	//<font>ƒ^ƒO‚ð‘S‚č폜‚·‚é
-	function DeleteFontTag( inSource : string) : string;
+	function	DeleteFontTag( inSource : string) : string;
+	function DivideStrLine(Line: string): TResRec;
 	function RemoveToken(var s: string;const delimiter: string): string;
 
 implementation
@@ -110,49 +111,48 @@ begin
     Result := nil;
 end;
 
+{$R-}
 //‚‘¬•¶Žš—ñ’uŠ·ŠÖ”i‘啶Žš¬•¶Žš‚̈Ⴂ‚𖳎‹‚µ‚È‚¢j
-function ReplaceString(const S: String; const OldPattern: String; const NewPattern: string): String;
+function ReplaceString(const S, OldPattern, NewPattern: string): string;
 var
-	ReplaceCount: Integer;
-	DestIndex: Integer;
-	i, l: Integer;
-	p, e, ps, pe: PChar;
-	Count: Integer;
-	olen: Integer;
+    ReplaceCount: Integer;
+    DestIndex: Integer;
+    i, l: Integer;
+    p, e, ps, pe: PChar;
+    Count: Integer;
 begin
-	Result := S;
-	olen := Length(OldPattern);
-	if olen = 0 then Exit;
+    Result := S;
+    if OldPattern = '' then Exit;
 	p := PChar(S);
 	e := p + Length(S);
 	ps := PChar(OldPattern);
-	pe := ps + olen;
+	pe := ps + Length(OldPattern);
 	ReplaceCount := 0;
 	while p < e do begin
 		p := AnsiStrPosEx(p, e, ps, pe);
 		if p = nil then Break;
 		Inc(ReplaceCount);
-		Inc(p, olen);
+		Inc(p, Length(OldPattern));
 	end;
 	if ReplaceCount = 0 then Exit;
 	SetString(Result, nil, Length(S) +
-	(Length(NewPattern) - olen) * ReplaceCount);
-	p := PChar(S);
-	DestIndex := 1;
-	l := Length( NewPattern );
-	for i := 0 to ReplaceCount - 1 do begin
-		Count := AnsiStrPosEx(p, e, ps, pe) - p;
-		Move(p^, Result[DestIndex], Count);
-		Inc(p, Count);//p := pp;
-		Inc(DestIndex, Count);
-		Move(NewPattern[1], Result[DestIndex], l);
-		Inc(p, olen);
-		Inc(DestIndex, l);
-	end;
-	Move(p^, Result[DestIndex], e - p);
+    (Length(NewPattern) - Length(OldPattern)) * ReplaceCount);
+    p := PChar(S);
+    DestIndex := 1;
+    l := Length( NewPattern );
+    for i := 0 to ReplaceCount - 1 do begin
+        Count := AnsiStrPosEx(p, e, ps, pe) - p;
+        Move(p^, Result[DestIndex], Count);
+        Inc(p, Count);//p := pp;
+        Inc(DestIndex, Count);
+        Move(NewPattern[1], Result[DestIndex], l);
+        Inc(p, Length(OldPattern));
+        Inc(DestIndex, l);
+    end;
+    Move(p^, Result[DestIndex], e - p);
 end;
 //‚‘¬•¶Žš—ñ’uŠ·ŠÖ”i‘啶Žš¬•¶Žš‚̈Ⴂ‚𖳎‹‚·‚éj
-function IgnoCaseReplaceString(const S: String;const OldPattern:String;const NewPattern: string): String;
+function IgnoCaseReplaceString(const S, OldPattern, NewPattern: string): string;
 var
 	ReplaceCount: Integer;
 	DestIndex: Integer;
@@ -203,14 +203,18 @@ begin
 	end;
 	Move(p^, Result[DestIndex], e - p);
 end;
+{$IFDEF DEBUG}
+{$R+}
+{$ENDIF}
+
 //‚‘¬•¶Žš—ñ’uŠ·ŠÖ”i”Ä—p”Å‚Pj
 function CustomStringReplace(
-	const S :String;
-	const OldPattern: String;
+	S , OldPattern: String;
 	const  NewPattern: string;
 	IgnoreCase : Boolean
 ): String;
 begin
+	Result := '';
 	if not IgnoreCase then begin
 		Result := ReplaceString(S,OldPattern,NewPattern);
 	end else begin
@@ -221,7 +225,7 @@ end;
 //‚‘¬•¶Žš—ñ’uŠ·ŠÖ”i”Ä—p”Å‚Qj
 procedure CustomStringReplace(
 	var S : TStringList;
-	const OldPattern: String;
+	OldPattern: String;
 	const  NewPattern: string;
 	IgnoreCase : Boolean
 );
@@ -265,7 +269,7 @@ end;
 (*************************************************************************
  * ‘SŠp”¼Šp‚Ђ炪‚È‚©‚½‚©‚È‚ð‹æ•Ê‚µ‚È‚¢¦‚¢Pos
  *************************************************************************)
-function VaguePos(const Substr:String; const S: string): Integer;
+function VaguePos(const Substr, S: string): Integer;
 begin
 	Result := AnsiPos(ZenToHan(Substr), ZenToHan(S));
 end;
@@ -331,6 +335,45 @@ begin
 end;
 // *************************************************************************
 
+{!
+\brief datƒtƒ@ƒCƒ‹‚̈ꃉƒCƒ“‚𕪉ð
+\param Line datƒtƒ@ƒCƒ‹‚ð\¬‚·‚é 1 s
+\return     ƒŒƒXî•ñ
+}
+function DivideStrLine(Line: string): TResRec;
+const
+	delimiter = '<>';
+var
+	pds, pde : PChar;
+	pss, pse : PChar;
+begin
+	pss := PChar(Line);
+	pse := pss + Length(Line);
+	pds := PChar(delimiter);
+	pde := pds + Length(delimiter);
+
+	if AnsiStrPosEx(pss, pse, pds, pde) = nil then begin
+		Line := CustomStringReplace(Line, '<>', '&lt;&gt;');
+		Line := CustomStringReplace(Line, ',', '<>');
+		Line := CustomStringReplace(Line, '—M', ',');
+	end;
+	//Delim := '<>';
+	Result.FType := glt2chNew;
+	//Trim‚µ‚Ä‚Í‚¢‚¯‚È‚¢‹C‚ª‚·‚é@by‚à‚¶‚ã
+	Result.FName := RemoveToken(Line, delimiter);
+	Result.FMailTo := RemoveToken(Line, delimiter);
+	Result.FDateTime := RemoveToken(Line, delimiter);
+	Result.FBody := RemoveToken(Line, delimiter);
+	//‚Q‚¿‚á‚ñ‚Ë‚é‚Æ‚©‚¾‚ƁA–{•¶‚̐擪‚É‚P‚”¼Šp‹ó”’‚ª“ü‚Á‚Ä‚¢‚é‚̂ō폜‚·‚é
+	//‘¼‚ÌŒfŽ¦”‚ŁAƒŒƒXŽ©‘Ì‚Ì‹ó”’‚©‚à‚µ‚ê‚È‚¢‚¯‚Ç‚»‚ê‚Í’ú‚ß‚é
+	Result.FBody := TrimLeft(Result.FBody);
+	//‹ó‚¾‚Æ–â‘肪‹N‚«‚é‚©‚çA‹ó”’‚ðÝ’è‚·‚é
+	if Result.FBody = '' then
+		Result.FBody := '&nbsp;';
+
+	Result.FTitle := RemoveToken(Line, delimiter);
+
+end;
 
 (*************************************************************************
  *

--- a/NewBoard.pas
+++ b/NewBoard.pas
@@ -36,9 +36,8 @@ type
 		{ Private éŒ¾ }
 		IgnoreLists : TStringList;
 		FAbort: Boolean;
-		function BoardDownload(const URL: String): TNewBoardItem;
-		function BoardLoardFromFile(const FilePath: String): String;
-		function UpdateURL(s: string): boolean;
+		function BoardDownload: TNewBoardItem;
+		procedure UpdateURL(s: string);
 		procedure SetIgnoreCategory(b: boolean);
 		procedure EditIgnoreList(Sender: TObject);
 		procedure UpdateIgnoreList(Sender: TObject);
@@ -59,24 +58,15 @@ uses Giko, IdHeaderList, MojuUtils, GikoDataModule;
 procedure TNewBoardDialog.UpdateButtonClick(Sender: TObject);
 var
 	Item: TNewBoardItem;
-	URL : String;
-	protocol, host, path, document, port, bookmark: String;
 begin
 	try
-		MessageMemo.Clear;
 		GikoSys.Setting.BoardURLSelected := BoardURLComboBox.ItemIndex + 1;
 		FAbort := False;
 		UpdateButton.Enabled := False;
 		StopButton.Enabled := True;
 		CloseButton.Enabled := False;
 		EditIgnoreListsButton.Enabled := False;
-		URL := BoardURLComboBox.Text;
-		GikoSys.ParseURI(URL, protocol, host, path, document, port, bookmark);
-		if (protocol = '') then begin
-			Item.FContent := BoardLoardFromFile(URL);
-		end else if (AnsiPos('http', protocol) > 0) then begin
-			Item := BoardDownload(URL);
-		end;
+		Item := BoardDownload;
 		StopButton.Enabled := False;
 		if FAbort then
 			Exit;
@@ -84,9 +74,8 @@ begin
 			GikoDM.TabsSaveAction.Tag := 1;
 			GikoDM.TabsOpenAction.Tag := 1;
 			GikoDM.TabsSaveAction.Execute;
-			if (UpdateURL(Item.FContent)) then begin
-				GikoForm.ReloadBBS;
-			end;
+			UpdateURL(Item.FContent);
+			GikoForm.ReloadBBS;
 			GikoDM.TabsSaveAction.Tag := 0;
 			GikoDM.TabsOpenAction.Tag := 0;
 		end else
@@ -110,12 +99,14 @@ begin
 	Close;
 end;
 
-function TNewBoardDialog.BoardDownload(const URL: String): TNewBoardItem;
+function TNewBoardDialog.BoardDownload: TNewBoardItem;
 var
+	URL: string;
 	Stream: TMemoryStream;
 	s: string;
 	i: Integer;
 begin
+	MessageMemo.Clear;
 	Indy.Request.Clear;
 	Indy.RecvBufferSize := Gikosys.Setting.RecvBufferSize;
 	Indy.ProxyParams.BasicAuthentication := False;
@@ -141,7 +132,7 @@ begin
 		Indy.ProxyParams.ProxyPassword := '';
 	end;
 	//URL := GikoSys.Setting.BoardURL2ch;
-	//URL := BoardURLComboBox.Text;
+    URL := BoardURLComboBox.Text;
 	Indy.Request.UserAgent := GikoSys.GetUserAgent;
 	Indy.Request.Referer := '';
 	Indy.Request.AcceptEncoding := 'gzip';
@@ -196,9 +187,10 @@ begin
 	end;
 end;
 
-function TNewBoardDialog.UpdateURL(s: string): boolean;
+procedure TNewBoardDialog.UpdateURL(s: string);
 var
 	i: Integer;
+//	j: Integer;
 	idx: Integer;
 	idx1: Integer;
 	idx2: Integer;
@@ -334,7 +326,6 @@ begin
     	oldURLs.Free;
     	newURLs.Free;
 	end;
-	Result := Change;
 end;
 
 procedure TNewBoardDialog.FormCreate(Sender: TObject);
@@ -413,21 +404,5 @@ procedure TNewBoardDialog.FormClose(Sender: TObject;
 begin
 	IgnoreLists.Free;
 end;
-//! ƒ[ƒJƒ‹ƒtƒ@ƒCƒ‹‚ðƒ[ƒh‚·‚é
-function TNewBoardDialog.BoardLoardFromFile(const FilePath: String): String;
-var
-	html : TStringList;
-begin
-	Result := '';
-	// ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ä‚¢‚é‚©ƒ`ƒFƒbƒN
-	if (FileExists(FilePath)) then begin
-		html := TStringList.Create();
-		try
-			html.LoadFromFile(FilePath);
-			Result := html.Text;
-		finally
-			html.Free;
-		end;
-	end;
-end;
+
 end.

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet3
+    ActivePage = CSSTabSheet
     MultiLine = True
-    TabIndex = 3
+    TabIndex = 2
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -687,7 +687,7 @@ object OptionDialog: TOptionDialog
         Left = 12
         Top = 52
         Width = 477
-        Height = 45
+        Height = 64
         Caption = #12473#12524#20316#25104#26085#26178#34920#31034#35373#23450
         TabOrder = 1
         object CreationTimeLogsCheckBox: TCheckBox
@@ -699,8 +699,8 @@ object OptionDialog: TOptionDialog
           TabOrder = 0
         end
         object FutureThreadCheckBox: TCheckBox
-          Left = 204
-          Top = 16
+          Left = 12
+          Top = 40
           Width = 265
           Height = 17
           Caption = #26085#20184#12364#26410#26469#12398#12418#12398#12399#34920#31034#12375#12394#12356#65288'492'#12473#12524#31995#65289
@@ -709,7 +709,7 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox5: TGroupBox
         Left = 12
-        Top = 105
+        Top = 121
         Width = 477
         Height = 86
         Caption = #12502#12521#12454#12470#12398#26368#22823#21270
@@ -737,35 +737,35 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox17: TGroupBox
         Left = 12
-        Top = 196
+        Top = 212
         Width = 477
-        Height = 45
+        Height = 63
         Caption = #12502#12521#12454#12470#12479#12502#38750#34920#31034#26178#35373#23450
         TabOrder = 3
         object SelectIntervalLabel: TLabel
-          Left = 10
-          Top = 20
+          Left = 13
+          Top = 24
           Width = 199
           Height = 12
           Caption = #12459#12540#12477#12523#12461#12540#12391#12398#31227#21205#26178#12398#28961#21453#24540#26178#38291
         end
         object Label4: TLabel
-          Left = 271
-          Top = 20
+          Left = 292
+          Top = 24
           Width = 29
           Height = 12
           Caption = #12511#12522#31186
         end
         object Label6: TLabel
-          Left = 305
-          Top = 20
+          Left = 14
+          Top = 40
           Width = 164
           Height = 12
           Caption = #65288'55'#12511#12522#31186#20197#19978#12395#35373#23450#12375#12390#19979#12373#12356#65289
         end
         object SelectIntervalEdit: TEdit
-          Left = 214
-          Top = 16
+          Left = 235
+          Top = 20
           Width = 49
           Height = 20
           ImeMode = imClose
@@ -775,7 +775,7 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox18: TGroupBox
         Left = 12
-        Top = 246
+        Top = 278
         Width = 477
         Height = 43
         Caption = 'dat'#33853#12385#12473#12524#12477#12540#12488#38918
@@ -800,29 +800,6 @@ object OptionDialog: TOptionDialog
             #12473#12524#26368#32066#26356#26032#26085#26178#65288#38477#38918#65289)
         end
       end
-      object GroupBox20: TGroupBox
-        Left = 12
-        Top = 291
-        Width = 477
-        Height = 41
-        Caption = #12473#12524#12483#12489#19968#35239#12480#12454#12531#12525#12540#12489#24460#12398#21205#20316
-        TabOrder = 5
-        object Label24: TLabel
-          Left = 219
-          Top = 18
-          Width = 142
-          Height = 12
-          Caption = #65288#12481#12455#12483#12463#12375#12394#12356#22580#21512#28961#20966#29702#65289
-        end
-        object AutoSortCheckBox: TCheckBox
-          Left = 10
-          Top = 16
-          Width = 207
-          Height = 17
-          Caption = #33258#21205#12391#12473#12524#12483#12489#21517#12391#26119#38918#12477#12540#12488#12377#12427
-          TabOrder = 0
-        end
-      end
     end
     object ThreadSheet: TTabSheet
       Caption = #12473#12524#12483#12489#65297

--- a/Option.pas
+++ b/Option.pas
@@ -202,9 +202,6 @@ type
     UnFocusedBoldCheckBox: TCheckBox;
     IgnoreKanaCheckBox: TCheckBox;
     UseKatjuTypeSkinCheckBox: TCheckBox;
-    GroupBox20: TGroupBox;
-    AutoSortCheckBox: TCheckBox;
-    Label24: TLabel;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure ApplyButtonClick(Sender: TObject);
@@ -356,7 +353,7 @@ begin
 		FClose := False;
 		Exit;
 	end;
-		SetAbonpropertys;
+        SetAbonpropertys;
 	SaveSetting;
 	SettingApply;
 
@@ -824,8 +821,7 @@ begin
 	else
 		DatOchiSortCombo.ItemIndex := 0;
 	end;
-	AutoSortCheckBox.Checked := GikoSys.Setting.AutoSortThreadList;
-	
+
 	//‚ ‚ځ`‚ñ
 	RloCheckBox.Checked := GikoSys.Setting.AbonDeleterlo;
 	ReplaceulCheckBox.Checked := GikoSys.Setting.AbonReplaceul;
@@ -1102,7 +1098,6 @@ begin
 			GikoSys.Setting.DatOchiSortIndex := Ord( gbcLastModified );{gbcLastModified}
 			end;
 	end;
-	GikoSys.Setting.AutoSortThreadList := AutoSortCheckBox.Checked;
 
 	GikoSys.Setting.WriteSystemSettingFile;
 	GikoSys.Setting.WriteBoardURLSettingFile;
@@ -1551,8 +1546,8 @@ begin
 			html :=
 				HTMLCreater.LoadFromSkin( GikoSys.GetSkinHeaderFileName, ThreadItem, 0 ) +
 				'<a name="top"></a>' +
-				HTMLCreater.SkinedRes( HTMLCreater.LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, 0 ), @Res[0], '1' ) +
-				HTMLCreater.SkinedRes( HTMLCreater.LoadFromSkin( GikoSys.GetSkinNewResFileName, ThreadItem, 0 ), @Res[1], '2' ) +
+				HTMLCreater.SkinedRes( HTMLCreater.LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, 0 ), Res[0], '1' ) +
+				HTMLCreater.SkinedRes( HTMLCreater.LoadFromSkin( GikoSys.GetSkinNewResFileName, ThreadItem, 0 ), Res[1], '2' ) +
 				'<a name="bottom"></a>' +
 				HTMLCreater.LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, 0 );
 

--- a/Setting.pas
+++ b/Setting.pas
@@ -1,10 +1,9 @@
 unit Setting;
 
-
 interface
 
 uses
-	SysUtils, Classes, Graphics, Forms, {Math, IniFiles, UCryptAuto, UBase64,}
+	SysUtils, Classes, Graphics, Forms, Math, IniFiles, UCryptAuto, UBase64,
 	ComCtrls, GestureModel;
 
 const
@@ -12,7 +11,33 @@ const
 	LIST_COOLBAND_COUNT = 2;		//”ÂCoolBand‚̐”
 	BROWSER_COOLBAND_COUNT = 3;	//ƒuƒ‰ƒEƒUCoolBand‚̐”
 
-
+	BOARD_FILE_NAME							 	= 'board.2ch';
+	CUSTOMBOARD_FILE_NAME				 	= 'custom.2ch';
+	BOARD_DIR_NAME								= 'Board';
+	KEY_SETTING_FILE_NAME				 	= 'key.ini';
+	EKEY_SETTING_FILE_NAME			 	= 'Ekey.ini';
+	TEMP_FOLDER									 	= 'Temp';
+	OUTBOX_FILE_NAME							= 'outbox.ini';
+	SENT_FILE_NAME								= 'sent.ini';
+	CONFIG_DIR_NAME							 	= 'config';
+	CSS_DIR_NAME									= 'css';
+	SKIN_DIR_NAME							 		= 'skin';
+	SKIN_HEADER_FILE_NAME					= 'Header.html';
+	SKIN_FOOTER_FILE_NAME					= 'Footer.html';
+	SKIN_NEWRES_FILE_NAME	 				= 'NewRes.html';
+	SKIN_RES_FILE_NAME						= 'Res.html';
+	SKIN_BOOKMARK_FILE_NAME				= 'Bookmark.html';
+	SKIN_NEWMARK_FILE_NAME				= 'Newmark.html';
+	NGWORDs_DIR_NAME : String 		= 'NGwords';
+	BOARD_PLUGIN_DIR_NAME					= 'BoardPlugin';
+	SAMBATIME_FILE_NAME : String	= 'Samba.ini';
+	IGNORE_FILE_NAME : String		= 'Ignore.txt';
+//	DOLIB_LOGIN_URL     = '/~tora3n2c/futen.cgi';
+	MAX_POPUP_RES : Integer = 10;
+	GESTURE_FILE_NAME							= 'Gestures.ini';
+	SPAMFILTER_FILE_NAME					= 'SpamFilter.ini';
+        LANGUAGE_FILE_NAME    = 'language.ini';
+    
 type
 	TGikoTabPosition = (gtpTop, gtpBottom);								// ƒ^ƒuˆÊ’u
 	TGikoTabAppend = (gtaFirst, gtpLast);									// ƒ^ƒu’ljÁˆÊ’u
@@ -399,6 +424,9 @@ type
 		//! ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚ðŽg—p‚·‚é‚©‚Ç‚¤‚©
 		FGestureEnabled : Boolean;
 
+		//2chŒ¾ŒêÝ’è
+		//F2chLanguage : TStringList;
+
 		//ƒtƒVƒAƒiƒgƒ‰ƒbƒvÝ’è
 		FLocalTrapAtt : Boolean;
 		FRemoteTrapAtt : Boolean;
@@ -410,6 +438,8 @@ type
 		FMute: Boolean;
 		//ƒXƒŒiž‚Ý‚Å–¢Šm’蕶Žš‚à—LŒø‚É‚·‚é‚©
 		FUseUndecided: Boolean;
+                //MessageList‚ɏo—Í‚³‚ê‚郁ƒbƒZ[ƒW
+                FMessageList : array[0..13] of string;
 
                 //Be2ch
                 //”FØ—pƒ†[ƒUIDEƒpƒXƒ[ƒh
@@ -420,8 +450,6 @@ type
 		//—š—ð‚̍őå•Û‘¶Œ”
 		FMaxRecordCount : Integer;
 
-		//ƒXƒŒƒbƒhˆê——‚ðƒ_ƒEƒ“ƒ[ƒhŒã‚Ƀ\[ƒg‚·‚é‚©
-		FAutoSortThreadList : Boolean;
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -487,9 +515,9 @@ type
 		function GetIgnoreFileName: string;
 		function GetGestureFileName : string;
 		function GetSpamFilterFileName : string;
-		function GetLanguageFileName: string;
-		function GetMainKeyFileName: String;
-		function GetEditorKeyFileName: String;
+                function GetLanguageFileName: string;
+                procedure SetMessages;
+                function GetMessage(AType :Integer): string;
 		procedure WriteLogFolder(AVal : String);
 
 		//ŽóMƒoƒbƒtƒ@ƒTƒCƒY
@@ -737,50 +765,13 @@ type
 		property BeAutoLogin: Boolean read FBeAutoLogin write FBeAutoLogin;
 		property BeLogin: Boolean read FBeLogin write FBeLogin;
 		property MaxRecordCount : Integer read FMaxRecordCount write FMaxRecordCount;
-		//! ƒXƒŒƒbƒhˆê——ƒ_ƒEƒ“ƒ[ƒhŒã‚ɃXƒŒƒbƒh–¼‚ŏ¸‡ƒ\[ƒg‚·‚é‚©
-		property AutoSortThreadList : Boolean read FAutoSortThreadList write FAutoSortThreadList;
-end;
 
-
-const
-//	MAIN_COOLBAND_COUNT = 4;		//ƒƒCƒ“CoolBand‚̐”
-//	LIST_COOLBAND_COUNT = 2;		//”ÂCoolBand‚̐”
-//	BROWSER_COOLBAND_COUNT = 3;	//ƒuƒ‰ƒEƒUCoolBand‚̐”
-
-	BOARD_FILE_NAME							 	= 'board.2ch';
-	CUSTOMBOARD_FILE_NAME				 	= 'custom.2ch';
-	BOARD_DIR_NAME								= 'Board';
-	KEY_SETTING_FILE_NAME				 	= 'key.ini';
-	EKEY_SETTING_FILE_NAME			 	= 'Ekey.ini';
-	TEMP_FOLDER									 	= 'Temp';
-	OUTBOX_FILE_NAME							= 'outbox.ini';
-	SENT_FILE_NAME								= 'sent.ini';
-	CONFIG_DIR_NAME							 	= 'config';
-	CSS_DIR_NAME									= 'css';
-	SKIN_DIR_NAME							 		= 'skin';
-	SKIN_HEADER_FILE_NAME					= 'Header.html';
-	SKIN_FOOTER_FILE_NAME					= 'Footer.html';
-	SKIN_NEWRES_FILE_NAME	 				= 'NewRes.html';
-	SKIN_RES_FILE_NAME						= 'Res.html';
-	SKIN_BOOKMARK_FILE_NAME				= 'Bookmark.html';
-	SKIN_NEWMARK_FILE_NAME				= 'Newmark.html';
-	NGWORDs_DIR_NAME : String 		= 'NGwords';
-	BOARD_PLUGIN_DIR_NAME					= 'BoardPlugin';
-	SAMBATIME_FILE_NAME : String	= 'Samba.ini';
-	IGNORE_FILE_NAME : String		= 'Ignore.txt';
-//	DOLIB_LOGIN_URL     = '/~tora3n2c/futen.cgi';
-	MAX_POPUP_RES : Integer = 10;
-	GESTURE_FILE_NAME							= 'Gestures.ini';
-	SPAMFILTER_FILE_NAME					= 'SpamFilter.ini';
-        LANGUAGE_FILE_NAME    = 'language.ini';
+end;
 
 
 
 implementation
 
-uses
-	Math, IniFiles, UCryptAuto, UBase64;
-
 type
 	TSoundName = record
 		Name: string;
@@ -798,8 +789,26 @@ const
 	DEFAULT_TAB_FONT_NAME: string		 = '‚l‚r ‚oƒSƒVƒbƒN';
 	DEFAULT_TAB_FONT_SIZE: Integer		= 9;
 	DEFAULT_2CH_BOARD_URL1: string = 'http://menu.2ch.net/bbsmenu.html';
+        //OCN‚ðíœ‚µ‚Ü‚µ‚½
+	//DEFAULT_2CH_BOARD_URL2: string = 'http://menu.2ch.net/bbsmenu.html';
+                                         //2005/10/1‚Éiij4u‚Ì•û‚͏Á–Å																//'http://www.2ch.net/newbbsmenu.html';
 	GIKO_ENCRYPT_TEXT: string		 = 'gikoNaviEncryptText';
 
+        DEF_MESSAGES : array[0..13] of string = (  'ƒƒOƒAƒEƒg‚µ‚Ü‚µ‚½',
+                                                   'ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
+                                                   '‹­§ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
+                                                   '[ƒXƒŒˆê——Žæ“¾Š®—¹]',
+                                                   '(–¼Ì•s–¾j',
+                                                   '[ƒXƒŒŽæ“¾Š®—¹]',
+                                                   '[ƒXƒŒ·•ªŽæ“¾Š®—¹]',
+                                                   '[–¢XV]',
+                                                   '[’†’f]',
+                                                   '[ƒGƒ‰[]',
+                                                   '[ƒŒƒX‘—MI—¹]',
+                                                   '[VƒXƒŒ‘—MI—¹]',
+                                                   '[ƒŒƒX‘—MŽ¸”s]',
+                                                   '[VƒXƒŒ‘—MŽ¸”s]');
+
 var
 	SOUND_NAME: array[0..4] of TSoundName = (
 		(Name: 'New';				ViewName: 'Žæ“¾¬Œ÷';					 FileName: ''),
@@ -1256,8 +1265,6 @@ begin
 		FCategorySortOrder := ini.ReadBool('ThreadList', 'CategorySortOrder', True);
 		FBoardSortIndex := ini.ReadInteger('ThreadList', 'BoardSortIndex', 0);
 		FBoardSortOrder := ini.ReadBool('ThreadList', 'BoardSortOrder', True);
-		// DLŒã‚ÌŽ©“®ƒ\[ƒg
-		FAutoSortThreadList := ini.ReadBool('ThreadList', 'AutoSort', True);
 		//Dat—Ž‚¿ƒXƒŒƒ\[ƒg‡
 		FDatOchiSortIndex := ini.ReadInteger('ThreadList', 'DatOchiSortIndex', -1);
 		FDatOchiSortOrder := ini.ReadBool('ThreadList', 'DatOchiSortOrder', False);
@@ -1592,8 +1599,6 @@ begin
 		ini.WriteBool('ThreadList', 'BoardSortOrder', FBoardSortOrder);
 		ini.WriteInteger('ThreadList', 'DatOchiSortIndex', FDatOchiSortIndex);
 		ini.WriteBool('ThreadList', 'DatOchiSortOrder', FDatOchiSortOrder);
-		// DLŒã‚ÌŽ©“®ƒ\[ƒg
-		ini.WriteBool('ThreadList', 'AutoSort', FAutoSortThreadList);
 
 		//‘‚«ž‚ÝŽžƒ}ƒVƒ“ŽžŽg—pÝ’è
 		ini.WriteBool('PostTime', 'UseMachineTime', FUseMachineTime);
@@ -2164,19 +2169,68 @@ function TSetting.GetLanguageFileName: string;
 begin
     Result := GetConfigDir + LANGUAGE_FILE_NAME;
 end;
+//Messagelist‚ɏo—Í‚³‚ê‚郁ƒbƒZ[ƒW‚̐ݒè
+procedure TSetting.SetMessages;
+var
+    i :Integer;
+    ini : TMemIniFile;
+begin
+    //2chŒ¾Œê“ǂݏo‚µ
+	if (GengoSupport) and (FileExists(GetLanguageFileName)) then begin
+        ini := TmemIniFile.Create(GetLanguageFileName);
+        try
+            {
+            'ƒƒOƒAƒEƒg‚µ‚Ü‚µ‚½',
+            'ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
+            '‹­§ƒƒOƒCƒ“‚µ‚Ü‚µ‚½ - ',
+            '[ƒXƒŒˆê——Žæ“¾Š®—¹]',
+            '(–¼Ì•s–¾j',
+            '[ƒXƒŒŽæ“¾Š®—¹]',
+            '[ƒXƒŒ·•ªŽæ“¾Š®—¹]',
+            '[–¢XV]',
+            '[’†’f]',
+            '[ƒGƒ‰[]',
+            '[ƒŒƒX‘—MI—¹]',
+            '[VƒXƒŒ‘—MI—¹]',
+            '[ƒŒƒX‘—MŽ¸”s]',
+            '[VƒXƒŒ‘—MŽ¸”s]');            }
+            FMessageList[0] := ini.ReadString('Language', 'Logout', DEF_MESSAGES[0]);
+            FMessageList[1] := ini.ReadString('Language', 'Login', DEF_MESSAGES[1]);
+            FMessageList[2] := ini.ReadString('Language', 'ForceLogin', DEF_MESSAGES[2]);
+            FMessageList[3] := ini.ReadString('Language', 'ThreadList', DEF_MESSAGES[3]);
+            FMessageList[4] := ini.ReadString('Language', 'UnKnown', DEF_MESSAGES[4]);
+            FMessageList[5] := ini.ReadString('Language', 'ThreadGet', DEF_MESSAGES[5]);
+            FMessageList[6] := ini.ReadString('Language', 'ThreadDiffGet', DEF_MESSAGES[6]);
+            FMessageList[7] := ini.ReadString('Language', 'NotMod', DEF_MESSAGES[7]);
+            FMessageList[8] := ini.ReadString('Language', 'Abort', DEF_MESSAGES[8]);
+            FMessageList[9] := ini.ReadString('Language', 'Error', DEF_MESSAGES[9]);
+            FMessageList[10] := ini.ReadString('Language', 'NewReply', DEF_MESSAGES[10]);
+            FMessageList[11] := ini.ReadString('Language', 'NewThread', DEF_MESSAGES[11]);
+            FMessageList[12] := ini.ReadString('Language', 'ReplyError', DEF_MESSAGES[12]);
+            FMessageList[13] := ini.ReadString('Language', 'ThreadError', DEF_MESSAGES[13]);
+        finally
+            ini.Free;
+        end;
+
+	end else begin
+        for i := 0 to 13 do begin
+            FMessageList[i] := DEF_MESSAGES[i];
+        end;
+    end;
+end;
+function TSetting.GetMessage(AType :Integer): string;
+begin
+    if (AType >= 0) and (AType <= Length(FMessageList)) then
+        Result := FMessageList[AType]
+    else
+		Result := '';
+end;
 procedure TSetting.WriteLogFolder(AVal : String);
 begin
 	FLogFolder := AVal;
 	FLogFolderP := IncludeTrailingPathDelimiter(LogFolder);
 end;
-function TSetting.GetMainKeyFileName: String;
-begin
-	Result := GetConfigDir + KEY_SETTING_FILE_NAME;
-end;
-function TSetting.GetEditorKeyFileName: String;
-begin
-    Result := GetConfigDir + EKEY_SETTING_FILE_NAME;
-end;
+
 end.
 
 

--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -70,8 +70,7 @@ uses
   HTMLCreate in 'HTMLCreate.pas',
   ListViewUtils in 'ListViewUtils.pas',
   GikoDataModule in 'GikoDataModule.pas' {GikoDM: TDataModule},
-  BrowserRecord in 'BrowserRecord.pas',
-  GikoMessage in 'GikoMessage.pas';
+  BrowserRecord in 'BrowserRecord.pas';
 
 {$R *.RES}
 {$R gikoResource.res}

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

--- a/readme/language.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[Language]
-Logout=ƒƒOƒAƒEƒg‚µ‚Ü‚·‚½
-Login=ƒƒOƒCƒ“‚µ‚Ü‚·‚½ - 
-ForceLogin=‹­§ƒƒOƒCƒ“‚µ‚Ü‚·‚½ - 
-SureItiran=[ƒXƒŒˆê——Žæ“¾‚µ‚Ü‚·‚½]
-Unknown=i–¼Ì•s–¾‚łj
-SureSyutoku=[ƒXƒŒŽæ“¾Š®—¹‚µ‚Ü‚·‚½]
-SureDiff=[ƒXƒŒ·•ªŽæ“¾Š®—¹‚µ‚Ü‚·‚½]
-NotMod=[–¢XV@‚à‚¿‚¯‚Â]
-Abort=[’†’f¥¥¥Q|P|›]
-Error=[ƒGƒ‰[”­¶·À„ª(߁Íß)„ª!!]
-NewRes=[VƒŒƒX‘—MI—¹‚µ‚Ü‚·‚½(M¥ƒÖ¥L)]
-NewSure=[VƒXƒŒ‘—MI—¹‚µ‚Ü‚·‚½(M¥ƒÖ¥L)]
-ResError=[ƒŒƒX‘—MŽ¸”s(L¥ƒÖ¥`)]
-SureError= [VƒXƒŒ‘—MŽ¸”s(L¥ƒÖ¥`)]

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -109,19 +109,6 @@ LICENSE
 ------------------------------
 200X/XX/XX
   Version ÊÞÀ51
-@ƒXƒŒƒbƒh•`‰æˆ—‚̍œK‰»
-@ƒŒƒX”ÔŽw’èURL‚ðƒNƒŠƒbƒN‚µ‚½‚Æ‚«‚Ì“®ì‚ŁAŽæ“¾Ï‚ÝŠO‚̃ŒƒX”Ԃ̏ꍇŽ©“®‚ÅDL‚·‚é‚悤‚ɕύX
-@ƒŒƒXƒGƒfƒBƒ^‚©‚çSamba‚̐ݒè’l‚ð•ÏX‚Å‚«‚é‚悤‚ɕύX
-@ƒLƒƒƒrƒlƒbƒgã‚ŃNƒŠƒbƒNEƒ_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg‚ª‰ßè‚É”­¶‚·‚é•s‹ï‡‚̏C³
-@ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[—LŒøŽž‚ɃvƒŒƒrƒ…[ã‚ʼnEƒNƒŠƒbƒN‚Å‚«‚È‚¢•s‹ï‡‚̏C³
-@ƒƒCƒ“ƒtƒH[ƒ€ã‚ł̃Vƒ‡[ƒgƒJƒbƒgƒL[‚Ì—Dæ‡ˆÊ‚ªƒMƒRƒiƒrŽ©‘Ì‚ªÅãˆÊ‚ɕύX
-@ƒƒCƒ“ƒƒjƒ…[‚Ì‚¨‹C‚É“ü‚è‚Ì•`‰æ‚̍‚‘¬‰»
-@ƒXƒe[ƒ^ƒXƒo[‚ÉŒ»Ý•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒƒbƒh‚Ì—e—Ê‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚½
-@DAT—Ž‚¿‚µ‚½ƒXƒŒ‚Ì—e—Ê‚ðŽæ“¾‚Å‚«‚È‚¢•s‹ï‡‚̏C³
-@”XV‚э[ƒJƒ‹ƒtƒ@ƒCƒ‹‚ðŽw’è‚Å‚«‚é‚悤‚ɕύX
-@ƒXƒŒƒbƒhˆê——ƒ_ƒEƒ“ƒ[ƒhŒã‚̃\[ƒg‚ðƒIƒvƒVƒ‡ƒ“‰»
-@NGƒ[ƒh‚É‘S”¼Šp‚Ђ炪‚ȃJƒ^ƒJƒi‚̈Ⴂ‚𓯈ꎋ‚·‚éƒIƒvƒVƒ‡ƒ“‚̒ljÁ
-@ƒŒƒX‚̍iž‚Ý‚Å‘S”¼Šp‚Ђ炪‚ȃJƒ^ƒJƒ^‚̈Ⴂ‚𖳎‹‚·‚é‚悤‚ɕύX
 
 2005/10/10
   Version ÊÞÀ50 ƒŠƒŠ[ƒX3