・最後に表示したキャビネットを記憶するようになった。

　（今までも記憶していたが、BBS が複数から選べるようになったのでその対応）
・お気に入りの名前を編集するときに、
　閉じたツリーの中に入っていたらツリーを展開するようになった。

diff --git a/Giko.pas b/Giko.pas
index ae5e144..610d6f4 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -69,7 +69,7 @@ type
                SmallIconAction: TAction;
                ListIconAction: TAction;
                DetailIconAction: TAction;
-    CabinetBBSAction: TAction;
+               CabinetBBSAction: TAction;
                CabinetHistoryAction: TAction;
                CabinetVisibleAction: TAction;
                MidokuAction: TAction;
@@ -507,10 +507,10 @@ type
                N61: TMenuItem;
                ExportFavoriteFileAction1: TMenuItem;
                ExportFavoriteFile: TFileSaveAs;
-    ToolButton21: TToolButton;
-    ToolButton22: TToolButton;
-    ToolButton23: TToolButton;
-    ToolButton24: TToolButton;
+               ToolButton21: TToolButton;
+               ToolButton22: TToolButton;
+               ToolButton23: TToolButton;
+               ToolButton24: TToolButton;
                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure CabinetPanelHide(Sender: TObject);
@@ -1430,21 +1430,22 @@ begin
        //ResHint
        FHint := TResPopup.Create(Self);
 
-       // \82Q\82¿\82á\82ñ\82Ë\82é\83L\83\83\83r\83l\83b\83g\82Ì\8fó\91Ô\95\9c\8c³(\96¢\8eÀ\91\95)
-       // \82¨\82æ\82Ñ\83X\83\8c\88ê\97\97\83y\83C\83\93\82Ì\8fó\91Ô\95\9c\8c³(\96¢\8eÀ\91\95\81A\8c»\8dÝ\82Í\8f\89\8aú\95\\8e¦\97p)
-       //i := GikoSys.Setting.CabinetIndex;
-       //ShowBBSTree( BBSs[ 0 ] );
-       //GikoSys.Setting.CabinetIndex := i;
-
        // \8dÅ\8cã\82É\91I\91ð\82³\82ê\82½\83L\83\83\83r\83l\83b\83g\82Ì\95\9c\8c³
        CabinetVisible( False );
-  if GikoSys.Setting.CabinetVisible then begin
-    Case GikoSys.Setting.CabinetIndex of
-    0: CabinetBBSAction.Execute;
-    1: CabinetHistoryAction.Execute;
-    2: CabinetFavoriteAction.Execute;
-    end;
-  end;
+       if GikoSys.Setting.CabinetVisible then begin
+               i := CabinetSelectPopupMenu.Items.Count - 1;
+               if GikoSys.Setting.CabinetIndex = i - 1 then
+                       CabinetHistoryAction.Execute
+               else if GikoSys.Setting.CabinetIndex = i then
+                       CabinetFavoriteAction.Execute
+               else begin
+                       if GikoSys.Setting.CabinetIndex < Length( BBSs ) then
+                               ShowBBSTree( BBSs[ GikoSys.Setting.CabinetIndex ] );
+                       CabinetBBSAction.Execute;
+               end;
+       end else begin
+               ShowBBSTree( BBSs[ 0 ] );
+       end;
 
        //\83I\81[\83g\83\8d\83O\83C\83\93
        if GikoSys.Setting.AutoLogin then
@@ -3585,8 +3586,6 @@ var
        item            : TMenuItem;
 begin
        try
-               GikoSys.Setting.CabinetIndex := 0;
-
                FavoriteTreeView.Visible := False;
                FavoriteToolBar.Hide;
                TreeView.Visible := True;
@@ -3599,6 +3598,7 @@ begin
                                        item.Checked := True;
                                        // CabinetMenu \82Í CabinetSelectPopupMenu \82Æ\93¯\82¶\82Æ\8c\88\82ß\82¤\82¿\82µ\82¿\82á\82¤
                                        CabinetMenu.Items[ i ].Checked := True;
+                                       GikoSys.Setting.CabinetIndex := i;
                                        Continue;
                                end;
                        end;
@@ -3651,7 +3651,8 @@ begin
                CabinetHistoryAction.Checked := True;
        end;
 
-       GikoSys.Setting.CabinetIndex := 1;
+       // BBS...BBS, History, Favorite
+       GikoSys.Setting.CabinetIndex := CabinetSelectPopupMenu.Items.Count - 2;
 
        FavoriteTreeView.Visible := False;
        TreeView.Visible := True;
@@ -7943,7 +7944,8 @@ begin
                CabinetFavoriteAction.Checked := True;
        end;
 
-       GikoSys.Setting.CabinetIndex := 2;
+       // BBS...BBS, History, Favorite
+       GikoSys.Setting.CabinetIndex := CabinetSelectPopupMenu.Items.Count - 1;
 
        b := CabinetSelectPopupMenu.Items.Count - 1;
        for i := 0 to b do begin
@@ -8256,6 +8258,8 @@ begin
 end;
 
 procedure TGikoForm.FavoriteTreeViewRenameActionExecute(Sender: TObject);
+var
+       node : TTreeNode;
 begin
 
        if FClickNode = nil then
@@ -8265,10 +8269,16 @@ begin
        if FClickNode.Text = Favorite.FAVORITE_LINK_NAME then
                Exit;
        FavoriteTreeView.ReadOnly := False;
-       if (FTreeType = gttFavorite) and (CabinetPanel.Visible) then
-               FClickNode.EditText
-       else
+       if (FTreeType = gttFavorite) and (CabinetPanel.Visible) then begin
+               node := FClickNode.Parent;
+               while node <> nil do begin
+                       node.Expanded   := True;
+                       node                                    := node.Parent;
+               end;
+               FClickNode.EditText;
+       end else begin
                FClickNode.Text := InputBox( '\96¼\91O\82Ì\95Ï\8dX', '\82¨\8bC\82É\93ü\82è\82Ì\90V\82µ\82¢\96¼\91O\82ð\93ü\97Í\82µ\82Ä\82­\82¾\82³\82¢', FClickNode.Text );
+       end;
 
        SetLinkBar;