OSDN Git Service

・メニューバーのキャビネットにも BBS の一覧が表示されるようになった。
authoryoffy <yoffy>
Sat, 22 Nov 2003 13:44:49 +0000 (13:44 +0000)
committeryoffy <yoffy>
Sat, 22 Nov 2003 13:44:49 +0000 (13:44 +0000)
Giko.dfm
Giko.pas

index 85a77c3..8dfa12c 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8660,10 +8660,6 @@ object GikoForm: TGikoForm
       end
       object CabinetMenu: TMenuItem
         Caption = #12461#12515#12499#12493#12483#12488'(&C)'
-        object N6: TMenuItem
-          Action = Cabinet2chAction
-          RadioItem = True
-        end
         object H1: TMenuItem
           Action = CabinetHistoryAction
           RadioItem = True
index 439f01f..f9e0f61 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -91,7 +91,6 @@ type
                ViewMenu: TMenuItem;
                StdToolBarMenu: TMenuItem;
                CabinetMenu: TMenuItem;
-               N6: TMenuItem;
                H1: TMenuItem;
                N4: TMenuItem;
                CabinetVisibleMenu: TMenuItem;
@@ -1109,14 +1108,19 @@ begin
 //     SetBoardTreeNode;                                                                               //\83c\83\8a\81[\82É\83{\81[\83h\92Ç\89Á
        // \83\81\83j\83\85\81[\82É\92Ç\89Á
        for i := Length( BBSs ) - 1 downto 0 do begin
-       try
-      item                                     := TBBSMenuItem.Create( PopupMenu );
-      item.Caption     := BBSs[ i ].Title;
-      item.Data                        := BBSs[ i ];
-      item.OnClick     := BBSMenuItemOnClick;
-      CabinetSelectPopupMenu.Items.Insert( 0, item );
-    except
-    end;
+               try
+                       item                                    := TBBSMenuItem.Create( PopupMenu );
+                       item.Caption    := BBSs[ i ].Title;
+                       item.Data                       := BBSs[ i ];
+                       item.OnClick    := BBSMenuItemOnClick;
+                       CabinetSelectPopupMenu.Items.Insert( 0, item );
+                       item                                    := TBBSMenuItem.Create( PopupMenu );
+                       item.Caption    := BBSs[ i ].Title;
+                       item.Data                       := BBSs[ i ];
+                       item.OnClick    := BBSMenuItemOnClick;
+                       CabinetMenu.Insert( 0, item );
+               except
+               end;
        end;
 
        //\82¨\8bC\82É\93ü\82è\93Ç\82Ý\8d\9e\82Ý
@@ -1223,7 +1227,7 @@ begin
 
        //\83X\83\8c\91S\95\94\95\\8e¦\83{\83^\83\93\82ð\89\9f\82³\82ê\82½\8fó\91Ô\82É\82·\82é
        AllItemAction.Checked := True;
-                               AllResAction.Checked := True;
+       AllResAction.Checked := True;
 
        //TreeView\82Ì\8e×\96\82\8fL\82¢ToolTip\82ð\94ñ\95\\8e¦
        Style := GetWindowLong(TreeView.Handle, GWL_STYLE);
@@ -1392,7 +1396,7 @@ begin
        end;
        ReadToolBarSetting(ActionList, BrowserToolBar);
        SetToolBarPopup;
-               OnlyAHundredRes.Checked := GikoSys.Setting.OnlyAHundredRes;
+       OnlyAHundredRes.Checked := GikoSys.Setting.OnlyAHundredRes;
        //\83A\83h\83\8c\83X\83o\81[
        AddressComboBox.TabStop := GikoSys.Setting.AddressBarTabStop;
 
@@ -1741,14 +1745,14 @@ begin
        except
        end;
 
-  try
-       for i := 0 to Length( BoardPlugIns ) - 1 do begin
-       if BoardPlugIns[ i ] <> nil then
-       BoardPlugIns[ i ].Free;
-      BoardPlugIns[ i ] := nil;
-    end;
-  except
-  end;
+       try
+               for i := 0 to Length( BoardPlugIns ) - 1 do begin
+                       if BoardPlugIns[ i ] <> nil then
+                               BoardPlugIns[ i ].Free;
+                       BoardPlugIns[ i ] := nil;
+               end;
+       except
+       end;
 
        try
                for i := 0 to Length( BBSs ) - 1 do begin
@@ -1759,15 +1763,16 @@ begin
        except
        end;
 
-  try
-       for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
-       if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
-        //CabinetSelectPopupMenu.Items[ i ].Free;
-        CabinetSelectPopupMenu.Items.Delete( i );
-      end;
-    end;
-  except
-  end;
+       try
+               for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
+                       if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
+                               //CabinetSelectPopupMenu.Items[ i ].Free;
+                               CabinetSelectPopupMenu.Items.Delete( i );
+                               CabinetMenu.Delete( i );
+                       end;
+               end;
+       except
+       end;
 
        try
                //Hint\94j\8aü
@@ -1840,11 +1845,11 @@ begin
        TreeView.Items.Clear;
 
        //BBS\94j\8aü
-  for i := 0 to Length( BBSs ) - 1 do begin
-    if BBSs[ i ] <> nil then
-      BBSs[ i ].Free;
-    BBSs[ i ] := nil;
-  end;
+       for i := 0 to Length( BBSs ) - 1 do begin
+               if BBSs[ i ] <> nil then
+                       BBSs[ i ].Free;
+               BBSs[ i ] := nil;
+       end;
 
        ActiveList := nil;
 
@@ -1853,24 +1858,30 @@ begin
        GikoSys.ReadBoardFile;          //\83{\81[\83h\83t\83@\83C\83\8b\93Ç\8d\9e
        // \83\81\83j\83\85\81[\82ð\8dí\8f\9c
        for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
-       try
-      if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
-        CabinetSelectPopupMenu.Items[ i ].Free;
-        CabinetSelectPopupMenu.Items.Delete( i );
-      end;
+               try
+                       if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
+                               CabinetSelectPopupMenu.Items[ i ].Free;
+                               CabinetSelectPopupMenu.Items.Delete( i );
+                               CabinetMenu.Delete( i );
+                       end;
                except
-    end;
+               end;
        end;
        // \83\81\83j\83\85\81[\82É\92Ç\89Á
        for i := Length( BBSs ) - 1 downto 0 do begin
-       try
-      item                                     := TBBSMenuItem.Create( PopupMenu );
-      item.Caption     := BBSs[ i ].Title;
-      item.Data                        := BBSs[ i ];
-      item.OnClick     := BBSMenuItemOnClick;
-      CabinetSelectPopupMenu.Items.Insert( 0, item );
+               try
+                       item                                    := TBBSMenuItem.Create( PopupMenu );
+                       item.Caption    := BBSs[ i ].Title;
+                       item.Data                       := BBSs[ i ];
+                       item.OnClick    := BBSMenuItemOnClick;
+                       CabinetSelectPopupMenu.Items.Insert( 0, item );
+                       item                                    := TBBSMenuItem.Create( PopupMenu );
+                       item.Caption    := BBSs[ i ].Title;
+                       item.Data                       := BBSs[ i ];
+                       item.OnClick    := BBSMenuItemOnClick;
+                       CabinetMenu.Insert( 0, item );
                except
-    end;
+               end;
        end;
        ShowBBSTree( BBSs[ 0 ] );
 end;
@@ -3475,10 +3486,14 @@ begin
                                        lastBBS := TBBSMenuItem( item ).Data;
                                if TBBSMenuItem( item ).Data = inBBS then 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;
                                        Continue;
                                end;
                        end;
                        item.Checked := False;
+                       // CabinetMenu \82Í CabinetSelectPopupMenu \82Æ\93¯\82\82Æ\8c\88\82ß\82¤\82¿\82µ\82¿\82á\82¤
+                       CabinetMenu.Items[ i ].Checked := False;
                end;
                CabinetSelectToolButton.Caption := inBBS.Title;
 
@@ -3490,14 +3505,17 @@ begin
                        HistoryToolBar.Hide;
                        SetBoardTreeNode( inBBS );
                        TreeView.TopItem.Expanded := True;                              //\83c\83\8a\81[\83g\83b\83v\8d\80\96Ú\82¾\82¯\82ð\8aJ\82­
-                       //TreeView.Selected := TreeView.Items[0];               //\83c\83\8a\81[\82Ì\83g\83b\83v\8d\80\96Ú\82ð\91I\91ð\82·\82é
+                       //\83c\83\8a\81[\82Ì\83g\83b\83v\8d\80\96Ú\82ð\91I\91ð\82·\82é
                        if GetActiveList = nil then
                                TreeView.Selected := TreeView.Items[0]
                        else begin
                                for i := 0 to TreeView.Items.Count - 1 do begin
-                                       if TreeView.Items[i].Data = GetActiveList then
+                                       if TreeView.Items[i].Data = GetActiveList then begin
                                                TreeView.Selected := TreeView.Items[i];
+                                               Exit;
+                                       end;
                                end;
+                               TreeView.Selected := TreeView.Items[0]
                        end;
                end;
        except
@@ -3506,6 +3524,9 @@ begin
 end;
 
 procedure TGikoForm.ShowHistoryTree;
+var
+       i, b : Integer;
+       item : TMenuItem;
 begin
        GikoSys.Setting.CabinetIndex := 1;
 
@@ -3517,6 +3538,16 @@ begin
        CabinetFavoriteAction.Checked := False;
        
        if FTreeType <> gttHistory then begin
+               b := CabinetSelectPopupMenu.Items.Count - 1;
+               for i := 0 to b do begin
+                       item := CabinetSelectPopupMenu.Items[ i ];
+                       if item is TBBSMenuItem then begin
+                               item.Checked := False;
+                               // CabinetMenu \82Í CabinetSelectPopupMenu \82Æ\93¯\82\82Æ\8c\88\82ß\82¤\82¿\82µ\82¿\82á\82¤
+                               CabinetMenu.Items[ i ].Checked := False;
+                       end;
+               end;
+
                FTreeType := gttHistory;
                HistoryToolBar.Show;
                FavoriteToolBar.Hide;
@@ -7707,10 +7738,23 @@ begin
 end;
 
 procedure TGikoForm.CabinetFavoriteActionExecute(Sender: TObject);
+var
+       i, b : Integer;
+       item : TMenuItem;
 begin
 
        GikoSys.Setting.CabinetIndex := 2;
 
+       b := CabinetSelectPopupMenu.Items.Count - 1;
+       for i := 0 to b do begin
+               item := CabinetSelectPopupMenu.Items[ i ];
+               if item is TBBSMenuItem then begin
+                       item.Checked := False;
+                       // CabinetMenu \82Í CabinetSelectPopupMenu \82Æ\93¯\82\82Æ\8c\88\82ß\82¤\82¿\82µ\82¿\82á\82¤
+                       CabinetMenu.Items[ i ].Checked := False;
+               end;
+       end;
+
        // \83L\83\83\83r\83l\83b\83g\83c\81[\83\8b\83o\81[\8by\82Ñ\83L\83\83\83r\83l\83b\83g\82Ì\95\\8e¦\90Ø\91Ö
        HistoryToolBar.Hide;
        FavoriteToolBar.Show;