From a8fc698afe30bd7c47434e47bd24c2ba1c4aadb0 Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Wed, 7 Apr 2004 14:19:16 +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=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9?=
 =?utf8?q?=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B=E3=82=89?=
 =?utf8?q?=20[=E3=83=84=E3=83=BC=E3=83=AB=E3=83=90=E3=83=BC=E8=A8=AD?=
 =?utf8?q?=E5=AE=9A]=20=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F=E5=A0=B4?=
 =?utf8?q?=E5=90=88=E3=80=81=20=E3=80=80=E3=82=B3=E3=83=B3=E3=83=86?=
 =?utf8?q?=E3=82=AD=E3=82=B9=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?utf8?q?=E3=82=92=E5=87=BA=E3=81=97=E3=81=9F=E3=83=84=E3=83=BC=E3=83=AB?=
 =?utf8?q?=E3=83=90=E3=83=BC=E3=81=8C=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?utf8?q?=E3=82=B0=E3=81=AE=E5=88=9D=E6=9C=9F=E5=80=A4=E3=81=A8=E3=81=97?=
 =?utf8?q?=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88?=
 =?utf8?q?=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.pas           | 11 +++++++++++
 ToolBarSetting.pas |  3 +++
 readme/readme.txt  |  3 ++-
 3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Giko.pas b/Giko.pas
index f467231..a03382f 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -25,6 +25,7 @@ uses
 
 type
 	TGikoTreeType = (gttNone, gtt2ch, gttHistory, gttFavorite);
+	TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
 
 	TGikoForm = class(TForm)
 		StatusBar: TStatusBar;
@@ -904,6 +905,7 @@ type
 		FSelectResWord : string;	// Xi[h
 		FIsIgnoreResize : Boolean;	// TCYCxgð³·é©Ç¤©
 		FOldFormWidth : Integer;	// ¼OÌEBhEÌ
+		FToolBarSettingSender : TToolBarSettingSenderType;	// c[o[ÝèðNbNµ½N[o[
 		procedure SetBoardTreeNode( inBBS : TBBS );
 		function SetCategoryListItem(ABBS2ch: TBBS): Integer;
 		function SetBoardListItem(Category: TCategory): Integer;
@@ -7751,6 +7753,11 @@ begin
 		Dlg.AddToolBar(StdToolBar, gttStandard);
 		Dlg.AddToolBar(ListToolBar, gttList);
 		Dlg.AddToolBar(BrowserToolBar, gttBrowser);
+		case FToolBarSettingSender of
+		tssMain:		Dlg.ToolBarIndex := 0;
+		tssList:		Dlg.ToolBarIndex := 1;
+		tssBrowser: Dlg.ToolBarIndex := 2;
+		end;
 		{
 		if ToolBarSettingAction.ActionComponent.GetParentComponent is TPopupMenu then begin
 			Component := TPopupMenu( ToolBarSettingAction.ActionComponent.GetParentComponent ).PopupComponent;
@@ -7808,6 +7815,7 @@ begin
 		end;
 	finally
 		Dlg.Release;
+		FToolBarSettingSender := tssNone;
 	end;
 end;
 
@@ -9044,6 +9052,7 @@ procedure TGikoForm.ListCoolBarContextPopup(Sender: TObject;
 	MousePos: TPoint; var Handled: Boolean);
 begin
 
+	FToolBarSettingSender := tssList;
 	MousePos := ListCoolBar.ClientToScreen( MousePos );
 	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
 
@@ -9053,6 +9062,7 @@ procedure TGikoForm.MainCoolBarContextPopup(Sender: TObject;
 	MousePos: TPoint; var Handled: Boolean);
 begin
 
+	FToolBarSettingSender := tssMain;
 	MousePos := MainCoolBar.ClientToScreen( MousePos );
 	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
 
@@ -9062,6 +9072,7 @@ procedure TGikoForm.BrowserCoolBarContextPopup(Sender: TObject;
 	MousePos: TPoint; var Handled: Boolean);
 begin
 
+	FToolBarSettingSender := tssBrowser;
 	MousePos := BrowserCoolBar.ClientToScreen( MousePos );
 	MainCoolBarPopupMenu.Popup( MousePos.X, MousePos.Y );
 
diff --git a/ToolBarSetting.pas b/ToolBarSetting.pas
index 9d3467f..5f1196c 100644
--- a/ToolBarSetting.pas
+++ b/ToolBarSetting.pas
@@ -60,6 +60,7 @@ type
 		{ Private é¾ }
 		FActionList: TActionList;
 		FAllList: TList;
+		FToolBarIndex : Integer;	// ú\¦·éc[o[
 		procedure CreateListData(ToolBarItem: TToolBarItem);
 		procedure MoveItem(Offset: Integer);
 		procedure Sort;
@@ -68,6 +69,7 @@ type
 		{ Public é¾ }
 		constructor Create(AOwner: TComponent; ActionList: TActionList); reintroduce; overload; virtual;
 		procedure AddToolBar(ToolBar: TToolBar; ToolType: TGikoToolType);
+		property	ToolBarIndex : Integer read FToolBarIndex write FToolBarIndex;
 	end;
 
 var
@@ -130,6 +132,7 @@ begin
 	ToolBarComboBoxChange(Self);
 	AllListViewChange(Sender, nil, ctState);
 	CurrentListViewChange(Sender, nil, ctState);
+	ToolBarComboBox.ItemIndex := FToolBarIndex;
 end;
 
 //±Ì_CAOÅJX^}CY·éc[o[ðo^·é
diff --git a/readme/readme.txt b/readme/readme.txt
index edab2eb..31fe464 100644
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -110,7 +110,8 @@ Windows Server 2003 Enterprise Edition IE6
   XXgÉ éXðzC[NbN·é±ÆÅuEUÉtH[JXðÚ·±ÆÈ­XªJ¯éæ¤ÉÈÁ½
   uEUyCªÅ¬»³êÄ¢éÆ«ÉEBhETCYðÏXµÄàAXXgÆuEUÌ«EüªEBhEº[ÉÂ¢Ä­éæ¤ÉÈÁ½B
   ¨CÉüèðí·éÉíÌÂðßéæ¤ÉÈÁ½BShift L[ðµÄ¢éêÍÂðßÈ¢B
-
+  c[o[ÌReLXgj[©ç [c[o[Ýè] ðsÁ½êAReLXgj[ðoµ½c[o[ª_CAOÌúlÆµÄ\¦³êéæ¤ÉÈÁ½B
+  
 2004/03/06
   Version ÊÞÀ46
   o^44ÈOÌtH[}bgÌñt@CÌ©®Ï·ÅG[ªÅ½ÌÌsïÌC³
-- 
2.11.0

