From e1ee37db3691f377f607923403b7911a6e6e2bc8 Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Sun, 7 Mar 2004 16:38:04 +0000
Subject: [PATCH] =?utf8?q?=E3=83=BB=E3=83=84=E3=83=BC=E3=83=AB=E3=83=90?=
 =?utf8?q?=E3=83=BC=E3=81=AE=E3=80=8C=E3=82=AD=E3=83=A3=E3=83=93=E3=83=8D?=
 =?utf8?q?=E3=83=83=E3=83=88=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=82=92=E6=8E=B2?=
 =?utf8?q?=E7=A4=BA=E6=9D=BF=E3=81=AB=E3=81=99=E3=82=8B=E3=80=8D=E3=83=9C?=
 =?utf8?q?=E3=82=BF=E3=83=B3=E3=81=8B=E3=82=89=20BBS=20=E3=81=8C=E9=81=B8?=
 =?utf8?q?=E3=81=B9=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20=E3=80=80?=
 =?utf8?q?=E3=83=89=E3=83=AD=E3=83=83=E3=83=97=E3=83=80=E3=82=A6=E3=83=B3?=
 =?utf8?q?=E5=BC=8F=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB=E3=81=AA?=
 =?utf8?q?=E3=81=A3=E3=81=9F=E3=80=82(#3770)=20=E3=80=80=E2=80=BB=E5=88=B6?=
 =?utf8?q?=E9=99=90=E4=BA=8B=E9=A0=85=E3=81=A8=E3=81=97=E3=81=A6=E3=80=81?=
 =?utf8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC=E3=81=99=E3=81=A8?=
 =?utf8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C=E3=81=B8=E3=81=93=E3=82=93?=
 =?utf8?q?=E3=81=A0=E3=81=BE=E3=81=BE=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=93?=
 =?utf8?q?=E3=81=A8=E3=81=AF=E3=81=AA=E3=81=8F=E3=80=81=E4=B8=8A=E3=81=AB?=
 =?utf8?q?=E4=B8=8A=E3=81=8C=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.pas        | 31 ++++++++++++++++++++++++++-----
 ToolBarUtil.pas |  5 +++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Giko.pas b/Giko.pas
index 0af3057..bbf4384 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -504,7 +504,7 @@ type
 		ExportFavoriteFileAction1: TMenuItem;
 		ExportFavoriteFile: TFileSaveAs;
 		ToolButton21: TToolButton;
-		ToolButton22: TToolButton;
+    CabinetBBSToolButton: TToolButton;
 		ToolButton23: TToolButton;
 		ToolButton24: TToolButton;
 		N6: TMenuItem;
@@ -524,6 +524,7 @@ type
     Browser: TWebBrowser;
     TreeSelectLogDeletePopupMenu: TMenuItem;
     N65: TMenuItem;
+    BBSSelectPopupMenu: TPopupMenu;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure CabinetPanelHide(Sender: TObject);
@@ -1008,6 +1009,8 @@ type
 		property UseOddResOddColor : Boolean read FUseOddResOddColor write FUseOddResOddColor;
 		property OddColor : TColor read FOddColor write FOddColor;
 
+		function FindToolBarButton( bar : TToolBar; action : TAction ) : TToolButton;
+
 	published
 		property EnabledCloseButton: Boolean read FEnabledCloseButton write SetEnabledCloseButton;
 	end;
@@ -1163,6 +1166,11 @@ 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;
@@ -7512,6 +7520,20 @@ begin
 	end;
 end;
 
+function TGikoForm.FindToolBarButton( bar : TToolBar; action : TAction ) : TToolButton;
+var
+	i : Integer;
+begin
+
+	for i := 0 to bar.ButtonCount - 1 do begin
+		if bar.Buttons[ i ].Action = action then begin
+			Result := bar.Buttons[ i ];
+			Exit;
+		end;
+	end;
+
+end;
+
 procedure TGikoForm.SetToolBarPopup;
 var
 	i: Integer;
@@ -7524,10 +7546,8 @@ begin
 		if ListToolBar.Buttons[i].Action = SelectReservAction then
 			ListToolBar.Buttons[i].DropdownMenu := RoundNamePopupMenu;
 	end;
-	for i := 0 to BrowserToolBar.ButtonCount - 1 do begin
-		if BrowserToolBar.Buttons[i].Action = IEAction then
-			BrowserToolBar.Buttons[i].DropdownMenu := BrowserPopupMenu;
-	end;
+	FindToolBarButton( BrowserToolBar, IEAction ).DropdownMenu := BrowserPopupMenu;
+	FindToolBarButton( StdToolBar, CabinetBBSAction ).DropdownMenu := BBSSelectPopupMenu;
 end;
 
 procedure TGikoForm.FormMouseWheel(Sender: TObject; Shift: TShiftState;
@@ -8771,6 +8791,7 @@ begin
 	if CabinetPanel.Visible then begin
 		if FTreeType = gtt2ch then begin
 			CabinetVisible( False );
+
 			CabinetBBSAction.Checked := False;
 		end else begin
 			CabinetBBSAction.Checked := True;
diff --git a/ToolBarUtil.pas b/ToolBarUtil.pas
index 14fa90f..b05daa3 100644
--- a/ToolBarUtil.pas
+++ b/ToolBarUtil.pas
@@ -93,8 +93,9 @@ const
 																					);
 
 	//ƒ{ƒ^ƒ“‚̃Xƒ^ƒCƒ‹‚ª"tbsDropDown"ƒ{ƒ^ƒ“‚̃AƒNƒVƒ‡ƒ“
-	DROPDOWN_STYLE: array[0..1] of string = ('IconStyle',
-																					 'IEAction');
+	DROPDOWN_STYLE: array[0..2] of string = ('IconStyle',
+																					 'IEAction',
+                                           'CabinetBBSAction');
 
 	INI_FILENAME: string = 'ToolBar.ini';
 
-- 
2.11.0