・ツールバーのコンテキストメニューから [ツールバー設定] を行った場合、

　コンテキストメニューを出したツールバーがダイアログの初期値として表示されるようになった。

diff --git a/Giko.pas b/Giko.pas
index f467231..a03382f 100644 (file)
--- 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;        // \83\8c\83X\8di\8d\9e\83\8f\81[\83h
                FIsIgnoreResize : Boolean;      // \83\8a\83T\83C\83Y\83C\83x\83\93\83g\82ð\96³\8e\8b\82·\82é\82©\82Ç\82¤\82©
                FOldFormWidth : Integer;        // \92¼\91O\82Ì\83E\83B\83\93\83h\83E\82Ì\95\9d
+               FToolBarSettingSender : TToolBarSettingSenderType;      // \83c\81[\83\8b\83o\81[\90Ý\92è\82ð\83N\83\8a\83b\83N\82µ\82½\83N\81[\83\8b\83o\81[
                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 (file)
--- a/ToolBarSetting.pas
+++ b/ToolBarSetting.pas
@@ -60,6 +60,7 @@ type
                { Private \90é\8c¾ }
                FActionList: TActionList;
                FAllList: TList;
+               FToolBarIndex : Integer;        // \8f\89\8aú\95\\8e¦\82·\82é\83c\81[\83\8b\83o\81[
                procedure CreateListData(ToolBarItem: TToolBarItem);
                procedure MoveItem(Offset: Integer);
                procedure Sort;
@@ -68,6 +69,7 @@ type
                { Public \90é\8c¾ }
                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;
 
 //\82±\82Ì\83_\83C\83A\83\8d\83O\82Å\83J\83X\83^\83}\83C\83Y\82·\82é\83c\81[\83\8b\83o\81[\82ð\93o\98^\82·\82é

diff --git a/readme/readme.txt b/readme/readme.txt
index edab2eb..31fe464 100644 (file)
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -110,7 +110,8 @@ Windows Server 2003 Enterprise Edition IE6
   \83X\83\8c\83\8a\83X\83g\82É\82 \82é\83X\83\8c\82ð\83z\83C\81[\83\8b\83N\83\8a\83b\83N\82·\82é\82±\82Æ\82Å\83u\83\89\83E\83U\82É\83t\83H\81[\83J\83X\82ð\88Ú\82·\82±\82Æ\82È\82­\83X\83\8c\82ª\8aJ\82¯\82é\82æ\82¤\82É\82È\82Á\82½
   \83u\83\89\83E\83U\83y\83C\83\93\82ª\8dÅ\8f¬\89»\82³\82ê\82Ä\82¢\82é\82Æ\82«\82É\83E\83B\83\93\83h\83E\83T\83C\83Y\82ð\95Ï\8dX\82µ\82Ä\82à\81A\83X\83\8c\83\8a\83X\83g\82Æ\83u\83\89\83E\83U\82Ì\8b«\8aE\90ü\82ª\83E\83B\83\93\83h\83E\89º\92[\82É\82Â\82¢\82Ä\82­\82é\82æ\82¤\82É\82È\82Á\82½\81B
   \82¨\8bC\82É\93ü\82è\82ð\8dí\8f\9c\82·\82é\8e\9e\82É\8dí\8f\9c\82Ì\8b\96\89Â\82ð\8b\81\82ß\82é\82æ\82¤\82É\82È\82Á\82½\81BShift \83L\81[\82ð\89\9f\82µ\82Ä\82¢\82é\8fê\8d\87\82Í\8b\96\89Â\82ð\8b\81\82ß\82È\82¢\81B
-
+  \83c\81[\83\8b\83o\81[\82Ì\83R\83\93\83e\83L\83X\83g\83\81\83j\83\85\81[\82©\82ç [\83c\81[\83\8b\83o\81[\90Ý\92è] \82ð\8ds\82Á\82½\8fê\8d\87\81A\83R\83\93\83e\83L\83X\83g\83\81\83j\83\85\81[\82ð\8fo\82µ\82½\83c\81[\83\8b\83o\81[\82ª\83_\83C\83A\83\8d\83O\82Ì\8f\89\8aú\92l\82Æ\82µ\82Ä\95\\8e¦\82³\82ê\82é\82æ\82¤\82É\82È\82Á\82½\81B
+  
 2004/03/06
   Version ÊÞÀ46
   \83o\83^44\88È\91O\82Ì\83t\83H\81[\83}\83b\83g\82Ì\8f\84\89ñ\83t\83@\83C\83\8b\82Ì\8e©\93®\95Ï\8a·\82Å\83G\83\89\81[\82ª\82Å\82½\8e\9e\82Ì\8f\88\97\9d\82Ì\95s\8bï\8d\87\82Ì\8fC\90³