Commit: 5c2b9e640c1427fd769849cbd5272e640eec802a - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 5c2b9e640c1427fd769849cbd5272e640eec802a (tree)
• Time: 2005-12-28 02:12:59
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Editor.dfm
• modified: Editor.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: KuroutSetting.pas
• modified: ListViewUtils.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

Incremental Difference

--- 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/Favorite.pas
+++ b/Favorite.pas
@@ -50,7 +50,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 +61,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
@@ -288,8 +287,7 @@ begin
 	end;
 		TreeView.Items.Clear;
 		TreeView.Items.EndUpdate;
-
-    FavoriteDM.Modified := true;
+    //TreeView.Free;
 end;
 
 procedure TFavoriteDM.SetFavTreeView(TreeView: TTreeView);
@@ -307,7 +305,7 @@ var
 	FavFolder: TFavoriteFolder;
 	LinkExists: Boolean;
 begin
-	FavoriteDM.Modified := true;
+
 	FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
 
 	FavFolder := TFavoriteFolder.Create;
@@ -479,7 +477,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 +488,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,7 +833,7 @@ 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
 	BLANK_HTML: string = 'about:blank';
@@ -859,6 +872,7 @@ var
 	msg: string;
 	i: Integer;
 	wp: TWindowPlacement;
+	s: string;
 begin
 {$IFDEF DEBUG}
 	AllocConsole;
@@ -885,6 +899,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;
@@ -1162,7 +1177,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 +1205,7 @@ begin
 		MouseGesture.SetHook( Handle );
 
 	//2chŒ¾Œê“ǂݏo‚µ
-	GikoSys.SetGikoMessage;
+	GikoSys.Setting.SetMessages;
 
 	//ƒI[ƒgƒƒOƒCƒ“
 	if GikoSys.Setting.AutoLogin then
@@ -1200,7 +1217,6 @@ begin
 	FavoriteAddToolButton.Caption := '’ljÁ...';
 	AntiIndivAbonMenuItem.Caption := 'ŒÂ•Ê‚ ‚ځ`‚ñ‰ðœ';
 
-
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1521,6 +1537,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 +1672,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 +2003,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 +2222,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;
@@ -2234,21 +2262,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;
@@ -2295,12 +2318,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 +2356,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 +2547,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 +2576,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 +2594,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;
@@ -2632,8 +2651,6 @@ begin
 
 		if not ThreadIsLog then begin
 			Self.Caption := GikoDataModule.CAPTION_NAME ;
-            //ƒXƒe[ƒ^ƒXƒo[‚É•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒ‚Ì—e—Ê‚ðÁ‹Ž
-			StatusBar.Panels[THREADSIZE_PANEL].Text := '';
 			try
 				s := '<HTML><BODY><CENTER>‚±‚̃XƒŒƒbƒh‚͎擾‚µ‚Ä‚¢‚Ü‚¹‚ñ</CENTER></BODY></HTML>';
 				doc := Idispatch( olevariant(Thread.Browser.ControlInterface).Document) as IHTMLDocument2;
@@ -2645,10 +2662,6 @@ begin
 			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);
 			//Thread.Repaint‚́AƒXƒLƒ““™‚̐ݒè‚ð•ÏX‚µ‚½‚Æ‚«AThread‚ðƒ_ƒEƒ“ƒ[ƒh‚µ‚½‚Æ‚«
 			//V‹K‚ÉThread‚ðŠJ‚¢‚½‚Æ‚«‚ɐ^‚É‚È‚Á‚Ä‚¢‚éB
 			if Thread.Repaint then begin
@@ -2660,7 +2673,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,19 +2741,9 @@ 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
+			and (FActiveContent.Thread.IsLogFile) then
+			Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']'
+		else
 			Self.Caption := GikoDataModule.CAPTION_NAME;
 		//Application.Title := CAPTION_NAME;
 
@@ -2749,11 +2752,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 +3503,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);
@@ -3928,11 +3931,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 +3964,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 +4152,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;
@@ -4322,52 +4325,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 := GikoDataModule.TOOL_ICON_FAV_FOLDER;
+			CreateFavMenu(Node.Item[i], NewMenu);
+		end else if TObject(Node.Item[i].Data) is TFavoriteBoardItem then begin
+			NewMenu.ImageIndex := GikoDataModule.TOOL_ICON_FAV_BOARD;
+			NewMenu.OnClick := FavoriteClick;
+		end else if TObject(Node.Item[i].Data) is TFavoriteThreadItem then begin
+			NewMenu.ImageIndex := GikoDataModule.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 +4429,9 @@ end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject);
 begin
+
 	FavoriteClick( Sender, True );
+
 end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject; ActiveTab: Boolean);
@@ -4950,42 +4950,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;
@@ -5913,9 +5897,8 @@ 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
@@ -6053,8 +6036,6 @@ begin
 			FDropSpaceNode := nil;
 		end;
 	end;
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	SetLinkBar;
 
@@ -6063,8 +6044,6 @@ end;
 procedure TGikoForm.FavoriteTreeViewEdited(Sender: TObject;
 	Node: TTreeNode; var S: String);
 begin
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	FavoriteTreeView.ReadOnly := True;
 	SetLinkBar;
@@ -6092,10 +6071,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 +6204,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 +6310,6 @@ begin
 		finally
 			FDropSpaceNode := nil;
 		end;
-		//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-		FavoriteDM.Modified := true;
 		SetLinkBar;
 	end;
 
@@ -6658,8 +6653,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 +6672,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 +6746,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 +6834,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 +6860,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 +6876,6 @@ begin
 end;
 
 function TGikoForm.LoadTabURLs : Boolean;
-const
-	TABFILE = 'tab.sav';
 var
 	i, bound    : Integer;
 	item        : TThreadItem;
@@ -6896,7 +6884,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 +6900,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 +7619,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 +7781,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
@@ -1195,12 +1195,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

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -211,7 +211,6 @@ type
 	WikiFAQWebPageAction: TAction;
 	ToobarImageList: TImageList;
     SaveDialog: TSaveDialog;
-    ThreadSizeCalcForFileAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -393,9 +392,9 @@ type
 	procedure MidokuActionExecute(Sender: TObject);
 	procedure AllSelectActionExecute(Sender: TObject);
 	procedure AllSelectActionUpdate(Sender: TObject);
-    procedure ThreadSizeCalcForFileActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
+	procedure RepaintStatusBar;
 	procedure ClearResFilter;
 	procedure SetResRange(range: Integer);
 	procedure SetThreadAreaHorNormal;
@@ -404,11 +403,8 @@ type
 	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Œø‚É‚È‚é
@@ -434,7 +430,7 @@ uses
 	ToolBarUtil, NewBoard, HTMLCreate, IndividualAbon,
 	GikoBayesian, About, ShellAPI,
 	RoundName, RoundData, Menus, ListViewUtils,
-	ThreadControl, GikoMessage;
+	ThreadControl;
 
 
 {$R *.dfm}
@@ -520,10 +516,9 @@ var
 begin
 	//ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV
 	s := GikoSys.FAbon.NGwordname;
-	GikoForm.StatusBar.Panels.Items[GiKo.NGWORDNAME_PANEL].Text := s;
+	GikoForm.StatusBar.Panels.Items[2].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.StatusBar.Panels[2].Width := Max(GikoForm.StatusBar.Canvas.TextWidth(s), 100);
 	GikoForm.StatusBarResize(nil);
 end;
 // *************************************************************************
@@ -615,8 +610,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 +638,6 @@ begin
 	//			FClickNode.Selected.Expanded := True;
 		GikoForm.FavoriteTreeView.Selected := Node;
 		GikoForm.ClickNode := Node;
-		//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-		FavoriteDM.Modified := true;
 		FavoriteTreeViewRenameAction.Execute;
 	finally
 	end;
@@ -676,8 +668,6 @@ begin
 	end;
 
 	GikoForm.ClickNode.Delete;
-	//XV‚µ‚½‚±‚Æ‚ð‹³‚¦‚é
-	FavoriteDM.Modified := true;
 
 	GikoForm.SetLinkBar;
 
@@ -695,21 +685,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;
@@ -1822,7 +1817,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 +1837,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 +1867,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
@@ -3048,44 +3043,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 +3072,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 +3081,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 +3099,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 +3108,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;
@@ -3700,88 +3691,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
@@ -15,7 +15,7 @@ uses
 	{HttpApp,} URLMon, IdGlobal, IdURI, {Masks,}
 	Setting, BoardGroup, gzip, Dolib, bmRegExp, AbonUnit,
 	ExternalBoardManager, ExternalBoardPlugInMain,
-	GikoBayesian, GikoMessage;
+	GikoBayesian;
 
 type
 	TVerResourceKey = (
@@ -102,6 +102,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 +116,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;
@@ -241,10 +247,7 @@ 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
@@ -321,8 +324,6 @@ begin
 	FVersion := Trim(GetVersionInfo(vrFileVersion));
 	FBayesian := TGikoBayesian.Create;
 	//FBoardURLList := TStringList.Create;
-	//ƒƒbƒZ[ƒW‚̍쐬
-	FGikoMessage := TGikoMessage.Create;
 end;
 
 // *************************************************************************
@@ -343,7 +344,6 @@ begin
 	FDolib.Free;
 	FAbon.Free;
 	FSelectResFilter.Free;
-    FGikoMessage.Free;
 	//FBoardURLList.Free;
 	//ƒeƒ“ƒ|ƒ‰ƒŠHTML‚ðíœ
 	FileList := TStringList.Create;
@@ -720,7 +720,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;
@@ -3249,33 +3249,6 @@ 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
@@ -506,18 +506,17 @@ function THTMLCreate.checkComma(
 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;
+	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 else begin
+		Result := false;
 	end;
 end;
 function THTMLCreate.addResAnchor(

--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -53,7 +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);
+		function DeleteStatusLine(Content: string): string;
 		procedure InitHttpClient(client: TIdHttp);
 		procedure ClearHttpClient(client: TIdHttp);
 	protected
@@ -532,7 +532,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 +541,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}
@@ -889,20 +891,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;

--- 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/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;

--- a/Setting.pas
+++ b/Setting.pas
@@ -1,6 +1,5 @@
 unit Setting;
 
-
 interface
 
 uses
@@ -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,7 +515,9 @@ type
 		function GetIgnoreFileName: string;
 		function GetGestureFileName : string;
 		function GetSpamFilterFileName : string;
-		function GetLanguageFileName: string;
+                function GetLanguageFileName: string;
+                procedure SetMessages;
+				function GetMessage(AType :Integer): string;
 		function GetMainKeyFileName: String;
 		function GetEditorKeyFileName: String;
 		procedure WriteLogFolder(AVal : String);
@@ -737,42 +767,8 @@ 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;
 
 
 
@@ -798,8 +794,25 @@ 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 +1269,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 +1603,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,6 +2173,62 @@ 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;

--- 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