Commit: b9c443f9a50e625d70828ef4c842087742d62774 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: b9c443f9a50e625d70828ef4c842087742d62774 (tree)
• Time: 2005-12-28 02:13:04
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Editor.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: ItemDownload.pas
• modified: ListViewUtils.pas
• modified: NewBoard.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Setting.pas
• modified: gikoNavi.res
• modified: readme/readme.txt

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -967,7 +967,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 +976,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 +1045,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;

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 363
-  Top = 92
+  Left = 153
+  Top = 68
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -98,6 +98,7 @@ object GikoForm: TGikoForm
           Height = 167
           BorderStyle = bsNone
           ChangeDelay = 50
+          DragMode = dmAutomatic
           HideSelection = False
           Images = ItemIcon16
           Indent = 19
@@ -106,12 +107,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 +231,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
@@ -358,7 +358,7 @@ type
 	N63: TMenuItem;
     N64: TMenuItem;
     dummy1: TMenuItem;
-	TreeSelectLogDeletePopupMenu: TMenuItem;
+    TreeSelectLogDeletePopupMenu: TMenuItem;
 	N65: TMenuItem;
     BBSSelectPopupMenu: TPopupMenu;
 		PlugInMenu: TMenuItem;
@@ -378,7 +378,7 @@ type
     ResRangeKokoPMenuItem: TMenuItem;
     ResRangeNewPMenuItem: TMenuItem;
     ResRangeAllPMenuItem: TMenuItem;
-	BrowsBoradHeadAction1: TMenuItem;
+    BrowsBoradHeadAction1: TMenuItem;
     ThreadRangePopupMenu: TPopupMenu;
     A15: TMenuItem;
     L8: TMenuItem;
@@ -398,7 +398,7 @@ type
     N73: TMenuItem;
     SelectComboBoxPanel: TPanel;
     SelectComboBoxSplitter: TImage;
-	ToolButton1: TToolButton;
+    ToolButton1: TToolButton;
     N74: TMenuItem;
     WikiFAQ: TMenuItem;
     GikoApplicationEvents: TApplicationEvents;
@@ -423,6 +423,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 +495,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 +514,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 +538,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;
@@ -689,6 +705,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);
@@ -1200,7 +1218,6 @@ begin
 	FavoriteAddToolButton.Caption := '’ljÁ...';
 	AntiIndivAbonMenuItem.Caption := 'ŒÂ•Ê‚ ‚ځ`‚ñ‰ðœ';
 
-
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1985,35 +2002,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 +2221,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;
@@ -2244,11 +2271,6 @@ begin
 				AddMessageList(ATitle + ' ' + GikoSys.GetGikoMessage(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;
@@ -2524,9 +2546,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 +2575,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
@@ -2728,19 +2746,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 +2757,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;
@@ -4431,7 +4442,9 @@ end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject);
 begin
+
 	FavoriteClick( Sender, True );
+
 end;
 
 procedure TGikoForm.FavoriteClick(Sender: TObject; ActiveTab: Boolean);
@@ -6092,10 +6105,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 +6238,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;
@@ -6658,8 +6689,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 +6708,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 +6782,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;
@@ -7635,6 +7667,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 := Node;
+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 := Node;
+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 +7829,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,7 +392,6 @@ type
 	procedure MidokuActionExecute(Sender: TObject);
 	procedure AllSelectActionExecute(Sender: TObject);
 	procedure AllSelectActionUpdate(Sender: TObject);
-    procedure ThreadSizeCalcForFileActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -404,8 +402,6 @@ 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;
@@ -695,21 +691,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;
@@ -3048,44 +3049,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 +3078,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 +3087,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 +3105,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 +3114,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 +3697,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/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -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;

--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -900,7 +900,6 @@ begin
 		//1s–Ú‚ðíœ
 		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;
 	finally

--- a/ListViewUtils.pas
+++ b/ListViewUtils.pas
@@ -19,14 +19,14 @@ type
 		{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 +141,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 +183,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 +202,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 +217,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 +273,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 +370,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 +387,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 +464,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;

--- 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
@@ -420,8 +420,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;
@@ -737,8 +735,7 @@ 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;
 
 
@@ -1256,8 +1253,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 +1587,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);

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

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -118,10 +118,6 @@ LICENSE
 @ƒƒ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