・デザインや名称の変更。

diff --git a/Giko.dfm b/Giko.dfm
index d0165fb..d01555c 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -984,7 +984,7 @@ object GikoForm: TGikoForm
             ImageIndex = -1
             MinHeight = 22
             Visible = False
-            Width = 161
+            Width = 213
           end
           item
             Break = False
@@ -992,7 +992,7 @@ object GikoForm: TGikoForm
             ImageIndex = -1
             MinHeight = 22
             Text = #12450#12489#12524#12473
-            Width = 589
+            Width = 537
           end
           item
             Control = LinkToolBar
@@ -1026,7 +1026,7 @@ object GikoForm: TGikoForm
         object StdToolBar: TToolBar
           Left = 9
           Top = 20
-          Width = 148
+          Width = 200
           Height = 22
           AutoSize = True
           ButtonWidth = 25
@@ -1052,40 +1052,57 @@ object GikoForm: TGikoForm
             Width = 8
             Style = tbsSeparator
           end
-          object CabinetToolButton: TToolButton
-            Left = 33
-            Top = 0
-            Action = CabinetVisibleAction
-            Style = tbsCheck
-          end
           object ToolButton4: TToolButton
-            Left = 58
+            Left = 33
             Top = 0
             Action = ArrangeAction
             Style = tbsCheck
           end
           object ToolButton13: TToolButton
-            Left = 83
+            Left = 58
             Top = 0
             Width = 8
             Style = tbsSeparator
           end
           object AbortToolButton: TToolButton
-            Left = 91
+            Left = 66
             Top = 0
             Action = StopAction
           end
           object LoginToolButton: TToolButton
-            Left = 116
+            Left = 91
             Top = 0
             Action = LoginAction
             Style = tbsCheck
           end
+          object ToolButton21: TToolButton
+            Left = 116
+            Top = 0
+            Width = 8
+            Caption = 'ToolButton21'
+            ImageIndex = 4
+            Style = tbsSeparator
+          end
+          object ToolButton22: TToolButton
+            Left = 124
+            Top = 0
+            Action = CabinetBBSAction
+          end
+          object ToolButton23: TToolButton
+            Left = 149
+            Top = 0
+            Action = CabinetHistoryAction
+          end
+          object ToolButton24: TToolButton
+            Left = 174
+            Top = 0
+            Action = CabinetFavoriteAction
+          end
         end
         object AddressToolBar: TToolBar
-          Left = 216
+          Left = 268
           Top = 20
-          Width = 532
+          Width = 480
           Height = 22
           ButtonWidth = 51
           EdgeBorders = []
@@ -7831,12 +7848,12 @@ object GikoForm: TGikoForm
       Hint = #12473#12486#12540#12479#12473#12496#12540#12398#34920#31034#29366#24907#12434#22793#26356#12377#12427
       OnExecute = StatusBarVisibleActionExecute
     end
-    object Cabinet2chAction: TAction
+    object CabinetBBSAction: TAction
       Category = #34920#31034
-      Caption = #65298#12385#12419#12435#12397#12427'(&N)'
-      Hint = #12461#12515#12499#12493#12483#12488#12398#34920#31034#12434#65298#12385#12419#12435#12397#12427#12395#12377#12427
+      Caption = #25522#31034#26495'(&N)'
+      Hint = #12461#12515#12499#12493#12483#12488#12398#34920#31034#12434#25522#31034#26495#12395#12377#12427
       ImageIndex = 35
-      OnExecute = Cabinet2chActionExecute
+      OnExecute = CabinetBBSActionExecute
     end
     object CabinetHistoryAction: TAction
       Category = #34920#31034

diff --git a/Giko.pas b/Giko.pas
index b6369f1..efcd66a 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -69,7 +69,7 @@ type
                SmallIconAction: TAction;
                ListIconAction: TAction;
                DetailIconAction: TAction;
-               Cabinet2chAction: TAction;
+    CabinetBBSAction: TAction;
                CabinetHistoryAction: TAction;
                CabinetVisibleAction: TAction;
                MidokuAction: TAction;
@@ -346,7 +346,6 @@ type
                StdToolBar: TToolBar;
                RoundToolButton: TToolButton;
                ToolButton6: TToolButton;
-               CabinetToolButton: TToolButton;
                ToolButton4: TToolButton;
                ToolButton13: TToolButton;
                AbortToolButton: TToolButton;
@@ -508,6 +507,10 @@ type
                N61: TMenuItem;
                ExportFavoriteFileAction1: TMenuItem;
                ExportFavoriteFile: TFileSaveAs;
+    ToolButton21: TToolButton;
+    ToolButton22: TToolButton;
+    ToolButton23: TToolButton;
+    ToolButton24: TToolButton;
                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure CabinetPanelHide(Sender: TObject);
@@ -806,7 +809,7 @@ type
                        var Handled: Boolean);
                procedure ExportFavoriteFileAccept(Sender: TObject);
                procedure ExportFavoriteFileBeforeExecute(Sender: TObject);
-               procedure Cabinet2chActionExecute(Sender: TObject);
+               procedure CabinetBBSActionExecute(Sender: TObject);
        private
                { Private \90é\8c¾ }
 
@@ -1438,7 +1441,7 @@ begin
        // \8dÅ\8cã\82É\91I\91ð\82³\82ê\82½\83L\83\83\83r\83l\83b\83g\82Ì\95\9c\8c³
        if GikoSys.Setting.CabinetVisible then begin
                Case GikoSys.Setting.CabinetIndex of
-               0: Cabinet2chAction.Execute;
+               0: CabinetBBSAction.Execute;
                1: CabinetHistoryAction.Execute;
                2: CabinetFavoriteAction.Execute;
                end;
@@ -3654,7 +3657,7 @@ begin
        FavoriteTreeView.Visible := False;
        TreeView.Visible := True;
 
-       Cabinet2chAction.Checked := False;
+       CabinetBBSAction.Checked := False;
        CabinetFavoriteAction.Checked := False;
        
        if FTreeType <> gttHistory then begin
@@ -4141,7 +4144,7 @@ begin
        gttHistory:             CabinetHistoryAction.Execute;
        gttFavorite:    CabinetFavoriteAction.Execute;
        else
-               Cabinet2chAction.Execute;
+               CabinetBBSAction.Execute;
        end;
 end;
 
@@ -7963,7 +7966,7 @@ begin
        FTreeType := gttFavorite;
 
        // \83\81\83j\83\85\81[\8by\82Ñ\83{\83^\83\93\82Ì\83`\83F\83b\83N\82ð\90Ý\92è
-       Cabinet2chAction.Checked := False;
+       CabinetBBSAction.Checked := False;
        CabinetHistoryAction.Checked := False;
 
        // \82¨\8bC\82É\93ü\82è\82Ì\83c\83\8a\81[\82ð\93W\8aJ
@@ -8660,19 +8663,19 @@ begin
        ExportFavoriteFile.Dialog.FileName := FavoriteDM.GetFavoriteFilePath;
 end;
 
-procedure TGikoForm.Cabinet2chActionExecute(Sender: TObject);
+procedure TGikoForm.CabinetBBSActionExecute(Sender: TObject);
 begin
 
        if CabinetPanel.Visible then begin
                if FTreeType = gtt2ch then begin
                        CabinetVisible( False );
-                       Cabinet2chAction.Checked := False;
+                       CabinetBBSAction.Checked := False;
                end else begin
-                       Cabinet2chAction.Checked := True;
+                       CabinetBBSAction.Checked := True;
                end;
        end else begin
                CabinetVisible( True );
-               Cabinet2chAction.Checked := True;
+               CabinetBBSAction.Checked := True;
        end;
 
        if FActiveBBS = nil then

diff --git a/ToolBarUtil.pas b/ToolBarUtil.pas
index fdcf04d..14fa90f 100644 (file)
--- a/ToolBarUtil.pas
+++ b/ToolBarUtil.pas
@@ -16,7 +16,7 @@ const
                                                                                                                                                                        'StopAction',
                                                                                                                                                                        'LoginAction',
                                                                                                                                                                        '',
-                                                                                                                                                                       'Cabinet2chAction',
+                                                                                                                                                                       'CabinetBBSAction',
                                                                                                                                                                        'CabinetHistoryAction',
                                                                                                                                                                        'CabinetFavoriteAction');
        //\83\8a\83X\83g\83c\81[\83\8b\83o\81[\83f\83t\83H\83\8b\83g
@@ -73,7 +73,7 @@ const
                                                                                                                                                                        'BrowserNameBarVisibleAction',
                                                                                                                                                                        'MsgBarVisibleAction',
                                                                                                                                                                        'StatusBarVisibleAction',
-                                                                                                                                                                       'Cabinet2chAction',
+                                                                                                                                                                       'CabinetBBSAction',
                                                                                                                                                                        'CabinetHistoryAction',
                                           'CabinetFavoriteAction',
                                                                                                                                                                        'LargeIconAction',