キャビネット周りのボタンのアクションを再設定

diff --git a/Giko.dfm b/Giko.dfm
index dcfb386..a9b96c3 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 117
-  Top = 96
+  Left = 321
+  Top = 67
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -125,7 +125,7 @@ object GikoForm: TGikoForm
           DesignSize = (
             145
             25)
-          object SpeedButton1: TSpeedButton
+          object CabinetCloseSpeedButton: TSpeedButton
             Left = 121
             Top = 4
             Width = 20
@@ -153,6 +153,7 @@ object GikoForm: TGikoForm
             ShowHint = True
             Spacing = 0
             Transparent = False
+            OnClick = CabinetCloseSpeedButtonClick
           end
           object ToolBar1: TToolBar
             Left = 2
@@ -192,20 +193,20 @@ object GikoForm: TGikoForm
           List = True
           ShowCaptions = True
           TabOrder = 2
-          object ToolButton15: TToolButton
+          object HistoryShowToolButton: TToolButton
             Left = 0
             Top = 0
             AutoSize = True
             Caption = #34920#31034
             ImageIndex = 0
           end
-          object ToolButton18: TToolButton
+          object HistoryAllClearToolButton: TToolButton
             Left = 40
             Top = 0
             AutoSize = True
             Caption = #20840#12463#12522#12450
             ImageIndex = 1
-            OnClick = ToolButton18Click
+            OnClick = HistoryAllClearToolButtonClick
           end
         end
         object FavoriteTreeView: TTreeView
@@ -249,19 +250,20 @@ object GikoForm: TGikoForm
           List = True
           ShowCaptions = True
           TabOrder = 4
-          object ToolButton17: TToolButton
+          object FavoriteAddToolButton: TToolButton
             Left = 0
             Top = 0
-            Hint = #12362#27671#12395#20837#12426#36861#21152#12480#12452#12450#12525#12464#12434#38283#12367
+            Action = GikoDM.FavoriteAddAction
             AutoSize = True
             Caption = #36861#21152'...'
           end
-          object ToolButton19: TToolButton
+          object FavoriteArrangeToolButton: TToolButton
             Left = 41
             Top = 0
+            Hint = #12362#27671#12395#20837#12426#25972#29702#12480#12452#12450#12525#12464#12434#38283#12367
             AutoSize = True
             Caption = #25972#29702'...'
-            ImageIndex = 1
+            OnClick = FavoriteArrangeToolButtonClick
           end
         end
       end

diff --git a/Giko.pas b/Giko.pas
index cf465fa..de2f74a 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -46,12 +46,12 @@ type
                MessageListView: TListView;
                MessageSplitter: TSplitter;
                Panel3: TPanel;
-               SpeedButton1: TSpeedButton;
+    CabinetCloseSpeedButton: TSpeedButton;
                ToolBar1: TToolBar;
                CabinetSelectToolButton: TToolButton;
                HistoryToolBar: TToolBar;
-               ToolButton15: TToolButton;
-               ToolButton18: TToolButton;
+    HistoryShowToolButton: TToolButton;
+    HistoryAllClearToolButton: TToolButton;
                ItemIcon16: TImageList;
                ItemIcon32: TImageList;
                HotToobarImageList: TImageList;
@@ -330,8 +330,8 @@ type
                N56: TMenuItem;
                FavoriteTreeDeletePopupMenu: TMenuItem;
                FavoriteToolBar: TToolBar;
-               ToolButton17: TToolButton;
-               ToolButton19: TToolButton;
+    FavoriteAddToolButton: TToolButton;
+    FavoriteArrangeToolButton: TToolButton;
                FavoriteTreeBrowseFolderPopupMenu: TMenuItem;
                N57: TMenuItem;
                FavoriteTreeReloadPopupMenu: TMenuItem;
@@ -454,7 +454,7 @@ type
                procedure FormShortCut(var Msg: TWMKey; var Handled: Boolean);
                procedure PreviewTimerTimer(Sender: TObject);
                procedure MessageHideButtonClick(Sender: TObject);
-               procedure ToolButton18Click(Sender: TObject);
+               procedure HistoryAllClearToolButtonClick(Sender: TObject);
                procedure MainCoolBarBandInfo(Sender: TObject;
                        var BandInfo: PReBarBandInfoA);
                procedure MainCoolBarChevronClick(Sender: TObject;
@@ -534,6 +534,8 @@ type
          Shift: TShiftState);
     procedure FavoriteTreeViewEditing(Sender: TObject; Node: TTreeNode;
       var AllowEdit: Boolean);
+    procedure CabinetCloseSpeedButtonClick(Sender: TObject);
+    procedure FavoriteArrangeToolButtonClick(Sender: TObject);
        private
                { Private \90é\8c¾ }
                FSortIndex: Integer;
@@ -1343,7 +1345,6 @@ begin
                PostMessage( Handle, USER_TREECLICK, 0, 0 );
        end;
 
-
        //\88ø\90\94\82ª\82 \82Á\82½\82ç\83X\83\8c\82ð\8aJ\82­\81i\96¢\8eæ\93¾\82È\82ç\83_\83E\83\93\83\8d\81[\83h\81j
        for i := 1 to ParamCount do     begin
                MoveToURL(ParamStr(i));
@@ -1386,7 +1387,11 @@ begin
        GikoDM.MuteAction.Checked := GikoSys.Setting.Mute;
 
        GikoSys.Setting.BeLogin := GikoSys.Setting.BeAutoLogin;
-//     LockWindowUpdate(0);
+
+       //\83L\83\83\83v\83V\83\87\83\93\82ª\8fã\8f\91\82«\82³\82ê\82Ä\82µ\82Ü\82¤\82Ì\82Å\81A\82±\82±\82Å\8dÄ\90Ý\92è
+       FavoriteAddToolButton.Caption := '\92Ç\89Á...';
+
+
 end;
 
 // CoolBar \82Ì\90Ý\92è\82ð\95Ï\90\94\82É\95Û\91¶
@@ -5291,7 +5296,7 @@ begin
        end;
 end;
 
-procedure TGikoForm.ToolButton18Click(Sender: TObject);
+procedure TGikoForm.HistoryAllClearToolButtonClick(Sender: TObject);
 const
        DEL_MSG = '\91S\97\9a\97ð\82ð\8dí\8f\9c\82µ\82Ü\82·\81B\82æ\82ë\82µ\82¢\82Å\82·\82©\81H';
        DEL_TITLE = '\8dí\8f\9c\8am\94F';
@@ -7859,6 +7864,26 @@ begin
 end;
 
 
+// *************************************************************************
+//! \83L\83\83\83r\83l\83b\83g\82ð\95Â\82¶\82é\81~\83{\83^\83\93\82Ì\83N\83\8a\83b\83N\83C\83x\83\93\83g
+// *************************************************************************
+procedure TGikoForm.CabinetCloseSpeedButtonClick(Sender: TObject);
+begin
+       //Action\82Å\90Ý\92è\82·\82é\82Æ\83L\83\83\83v\83V\83\87\83\93\82ª\8fÁ\82¹\82È\82¢\82Ì\82Å\81AOnClick\83C\83x\83\93\83g\82Å\82Ì
+       //\8cÄ\82Ñ\8fo\82µ\82É\82µ\82½\81@by \82à\82¶\82ã
+       if GikoDM.CabinetVisibleAction.Enabled then begin
+               GikoDM.CabinetVisibleAction.Execute;
+       end;
+end;
+// *************************************************************************
+//! \82¨\8bC\82É\93ü\82è\83L\83\83\83r\83l\83b\83g\82Ì\90®\97\9d\83{\83^\83\93\82Ì\83N\83\8a\83b\83N\83C\83x\83\93\83g
+// *************************************************************************
+procedure TGikoForm.FavoriteArrangeToolButtonClick(Sender: TObject);
+begin
+       if GikoDM.FavoriteArrangeAction.Enabled then begin
+               GikoDM.FavoriteArrangeAction.Execute;
+       end;
+end;
 
 initialization
                                OleInitialize(nil);