From: yoffy <yoffy>
Date: Wed, 21 Apr 2004 00:08:41 +0000 (+0000)
Subject: ・板更新した際に BBS メニューが再構築されないバグを修正。
X-Git-Tag: v1_64_1_820~1241
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=907ede57c0eda116d9e2b77c059cb2c81b00a21a;p=gikonavigoeson%2Fgikonavi.git

・板更新した際に BBS メニューが再構築されないバグを修正。
---

diff --git a/Giko.pas b/Giko.pas
index 39cfa86..0e1e982 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -992,6 +992,8 @@ type
 		// ƒuƒ‰ƒEƒU‚̃L[ƒ_ƒEƒ“ƒCƒxƒ“ƒg
 		// ƒCƒxƒ“ƒg‚ðŽæ‚舵‚Á‚½ê‡‚Í True ‚ð•Ô‚·
 		function BrowserKeydown(var Msg: TMsg; Key: Word; State:TShiftState) : Boolean;
+		// ŠeŠ‚É‚ ‚éƒLƒƒƒrƒlƒbƒgE BBS ƒƒjƒ…[‚ðƒZƒbƒg^XV
+		procedure SetBBSMenu;
 
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
@@ -1165,7 +1167,6 @@ var
 	i: Integer;
 	wp: TWindowPlacement;
 	s: string;
-	item : TBBSMenuItem;
 begin
 {$IFDEF DEBUG}
 	AllocConsole;
@@ -1214,27 +1215,7 @@ begin
 		GikoSys.ListBoardFile;
 
 	// ƒƒjƒ…[‚ɒljÁ
-	for i := Length( BBSs ) - 1 downto 0 do begin
-		try
-			item					:= TBBSMenuItem.Create( PopupMenu );
-			item.Caption	:= BBSs[ i ].Title;
-			item.Data			:= BBSs[ i ];
-			item.OnClick	:= BBSMenuItemOnClick;
-			CabinetSelectPopupMenu.Items.Insert( 0, item );
-			item					:= TBBSMenuItem.Create( PopupMenu );
-			item.Caption	:= BBSs[ i ].Title;
-			item.Data			:= BBSs[ i ];
-			item.OnClick	:= BBSMenuItemOnClick;
-			CabinetMenu.Insert( 0, item );
-			item					:= TBBSMenuItem.Create( PopupMenu );
-			item.Caption	:= BBSs[ i ].Title;
-			item.Data			:= BBSs[ i ];
-			item.OnClick	:= BBSMenuItemOnClick;
-			BBSSelectPopupMenu.Items.Insert( 0, Item );
-		except
-		end;
-	end;
-
+	SetBBSMenu;
 
 	// ƒqƒXƒgƒŠƒŠƒXƒg(LoadHistory ‚æ‚è‚àæ‚ɍs‚¤‚±‚Æ)
 	FHistoryList := TList.Create;
@@ -1899,44 +1880,26 @@ begin
 //	CabinetPanelVisible(false);
 end;
 
-procedure TGikoForm.ReloadBBS;
+// ŠeŠ‚É‚ ‚éƒLƒƒƒrƒlƒbƒgE BBS ƒƒjƒ…[‚ðƒZƒbƒg^XV
+procedure TGikoForm.SetBBSMenu;
 var
 	i			: Integer;
 	item	: TBBSMenuItem;
 begin
-	//ƒ^ƒuƒNƒ[ƒY
-	NotSelectTabCloseAction.Execute;
-	if BrowserTab.Tabs.Count >= 1 then
-		DeleteTab(TThreadItem(BrowserTab.Tabs.Objects[0]));
-	//TreeViewƒNƒŠƒAiBBS2ch.Free‚ÌŒã‚ɃNƒŠƒA‚·‚é‚ÆXPƒXƒ^ƒCƒ‹Žž‚ɃGƒ‰[o‚éj
-	TreeView.Items.Clear;
-
-	//BBS”jŠü
-	try
-		for i := Length( BBSs ) - 1 downto 0 do begin
-			if BBSs[ i ] <> nil then
-				BBSs[ i ].Free;
-			BBSs[ i ] := nil;
-		end;
-	except
-	end;
 
-	ActiveList := nil;
-
-	FTreeType := gttNone;
-
-	GikoSys.ListBoardFile;		//ƒ{[ƒhƒtƒ@ƒCƒ‹“Ǎž
 	// ƒƒjƒ…[‚ðíœ
 	for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
 		try
 			if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
 				CabinetSelectPopupMenu.Items[ i ].Free;
 				CabinetMenu.Items[ i ].Free;
+				BBSSelectPopupMenu.Items[ i ].Free;
 			end;
 		except
 		end;
 	end;
-	// ƒƒjƒ…[‚ɒljÁ
+
+	// ƒƒjƒ…[‚ðÝ’è
 	for i := Length( BBSs ) - 1 downto 0 do begin
 		try
 			item					:= TBBSMenuItem.Create( PopupMenu );
@@ -1949,9 +1912,47 @@ begin
 			item.Data			:= BBSs[ i ];
 			item.OnClick	:= BBSMenuItemOnClick;
 			CabinetMenu.Insert( 0, item );
+			item					:= TBBSMenuItem.Create( PopupMenu );
+			item.Caption	:= BBSs[ i ].Title;
+			item.Data			:= BBSs[ i ];
+			item.OnClick	:= BBSMenuItemOnClick;
+			BBSSelectPopupMenu.Items.Insert( 0, Item );
 		except
 		end;
 	end;
+
+end;
+
+procedure TGikoForm.ReloadBBS;
+var
+	i			: Integer;
+begin
+	//ƒ^ƒuƒNƒ[ƒY
+	NotSelectTabCloseAction.Execute;
+	if BrowserTab.Tabs.Count >= 1 then
+		DeleteTab(TThreadItem(BrowserTab.Tabs.Objects[0]));
+	//TreeViewƒNƒŠƒAiBBS2ch.Free‚ÌŒã‚ɃNƒŠƒA‚·‚é‚ÆXPƒXƒ^ƒCƒ‹Žž‚ɃGƒ‰[o‚éj
+	TreeView.Items.Clear;
+
+	//BBS”jŠü
+	try
+		for i := Length( BBSs ) - 1 downto 0 do begin
+			if BBSs[ i ] <> nil then
+				BBSs[ i ].Free;
+			BBSs[ i ] := nil;
+		end;
+	except
+	end;
+
+	ActiveList := nil;
+
+	FTreeType := gttNone;
+
+	GikoSys.ListBoardFile;		//ƒ{[ƒhƒtƒ@ƒCƒ‹“Ǎž
+
+	// BBS ƒƒjƒ…[‚̍XV
+	SetBBSMenu;
+
 	ShowBBSTree( BBSs[ 0 ] );
 
 	// —š—ð“ǂݍž‚Ý
@@ -9346,7 +9347,7 @@ var
 	toolbar				: TToolBar;
 	band					: TCoolBand;
 	affectedBand	: TCoolBand;
-	i, j					: Integer;
+	i							: Integer;
 begin
 	if (FOldFormWidth = Width) and not IsIconic( Handle ) and not FIsIgnoreResize then begin
 		FIsIgnoreResize := True;