OSDN Git Service

レス表示範囲ボタンに[すべてのレスを表示]も含めるようにし、
authoryoffy <yoffy>
Wed, 4 Aug 2004 04:08:17 +0000 (04:08 +0000)
committeryoffy <yoffy>
Wed, 4 Aug 2004 04:08:17 +0000 (04:08 +0000)
[すべてのレスを表示]ボタンをデフォルトの配置から排除。

Giko.dfm
Giko.pas
ToolBarUtil.pas

index 1725d6d..599d042 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -646,7 +646,7 @@ object GikoForm: TGikoForm
               Width = 408
               Height = 22
               AutoSize = True
-              ButtonWidth = 25
+              ButtonWidth = 24
               Caption = #12502#12521#12454#12470#12484#12540#12523#12496#12540
               EdgeBorders = []
               Flat = True
@@ -664,63 +664,57 @@ object GikoForm: TGikoForm
                 Action = BrowserMaxAction
               end
               object ToolButton7: TToolButton
-                Left = 25
+                Left = 24
                 Top = 0
                 Action = BrowserMinAction
               end
               object ToolButton3: TToolButton
-                Left = 50
+                Left = 48
                 Top = 0
                 Width = 8
                 Style = tbsSeparator
               end
               object TopButton: TToolButton
-                Left = 58
+                Left = 56
                 Top = 0
                 Action = ScrollTopAction
               end
               object LastBotton: TToolButton
-                Left = 83
+                Left = 80
                 Top = 0
                 Action = ScrollLastAction
               end
               object NewButton: TToolButton
-                Left = 108
+                Left = 104
                 Top = 0
                 Action = ScrollNewAction
               end
               object KokoButton: TToolButton
-                Left = 133
+                Left = 128
                 Top = 0
                 Action = ScrollKokoAction
               end
               object ToolButton9: TToolButton
-                Left = 158
+                Left = 152
                 Top = 0
                 Width = 8
                 Style = tbsSeparator
               end
-              object AllResToolButton: TToolButton
-                Left = 166
-                Top = 0
-                Action = AllResAction
-                Style = tbsCheck
-              end
               object SelectResToolButton: TToolButton
-                Left = 191
+                Left = 160
                 Top = 0
                 Action = SelectResAction
                 Style = tbsCheck
               end
               object ResRangeButton: TToolButton
-                Left = 216
+                Left = 184
                 Top = 0
                 Action = ResRangeAction
                 DropdownMenu = ResRangePopupMenu
                 Style = tbsDropDown
               end
               object ToolButton16: TToolButton
-                Left = 252
+                Left = 219
                 Top = 0
                 Width = 8
                 Caption = 'ToolButton16'
@@ -728,36 +722,36 @@ object GikoForm: TGikoForm
                 Style = tbsSeparator
               end
               object EditorButton: TToolButton
-                Left = 260
+                Left = 227
                 Top = 0
                 Action = EditorAction
               end
               object ToolButton11: TToolButton
-                Left = 285
+                Left = 251
                 Top = 0
                 Width = 8
                 Style = tbsSeparator
               end
               object IEButton: TToolButton
-                Left = 293
+                Left = 259
                 Top = 0
                 Action = IEAction
                 DropdownMenu = BrowserPopupMenu
                 Style = tbsDropDown
               end
               object ToolButton5: TToolButton
-                Left = 329
+                Left = 294
                 Top = 0
                 Width = 8
                 Style = tbsSeparator
               end
               object ItemReloadButton: TToolButton
-                Left = 337
+                Left = 302
                 Top = 0
                 Action = ItemReloadAction
               end
               object ToolButton20: TToolButton
-                Left = 362
+                Left = 326
                 Top = 0
                 Width = 8
                 Caption = 'ToolButton20'
@@ -765,7 +759,7 @@ object GikoForm: TGikoForm
                 Style = tbsSeparator
               end
               object UpBoardButton: TToolButton
-                Left = 370
+                Left = 334
                 Top = 0
                 Action = UpBoardAction
               end
@@ -9409,7 +9403,7 @@ object GikoForm: TGikoForm
     object OnlyAHundredRes: TAction
       Category = #12473#12524#12483#12489
       AutoCheck = True
-      Caption = #26368#26032'100'#12524#12473#12398#12415#34920#31034
+      Caption = #26368#26032'100'#12524#12473#12398#12415#34920#31034'(&H)'
       GroupIndex = 2
       Hint = #26368#26032'100'#12524#12473#12398#12415#34920#31034
       ImageIndex = 38
@@ -9418,7 +9412,7 @@ object GikoForm: TGikoForm
     object OnlyKokoResAction: TAction
       Category = #12473#12524#12483#12489
       AutoCheck = True
-      Caption = #26410#35501#12524#12473#12398#12415#34920#31034
+      Caption = #26410#35501#12524#12473#12398#12415#34920#31034'(&K)'
       GroupIndex = 2
       Hint = #26410#35501#12524#12473#12398#12415#34920#31034
       ImageIndex = 38
@@ -9609,7 +9603,7 @@ object GikoForm: TGikoForm
     object OnlyNewResAction: TAction
       Category = #12473#12524#12483#12489
       AutoCheck = True
-      Caption = #26032#30528#12524#12473#12398#12415#34920#31034
+      Caption = #26032#30528#12524#12473#12398#12415#34920#31034'(&N)'
       GroupIndex = 2
       Hint = #26032#30528#12524#12473#12398#12415#34920#31034
       ImageIndex = 38
@@ -10869,6 +10863,10 @@ object GikoForm: TGikoForm
   object ResRangePopupMenu: TPopupMenu
     Left = 37
     Top = 468
+    object A14: TMenuItem
+      Action = AllResAction
+      AutoCheck = True
+    end
     object N1001: TMenuItem
       Action = OnlyAHundredRes
       AutoCheck = True
index 72536ac..0f33839 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -446,7 +446,6 @@ type
                SelectResAction: TAction;
                ToolButton16: TToolButton;
                AllResAction: TAction;
-               AllResToolButton: TToolButton;
                N50: TMenuItem;
                A11: TMenuItem;
                S5: TMenuItem;
@@ -562,6 +561,7 @@ type
     OnlyAHundredRes: TAction;
     OnlyNewResAction: TAction;
     OnlyKokoResAction: TAction;
+    A14: TMenuItem;
                                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure CabinetPanelHide(Sender: TObject);
@@ -1886,7 +1886,7 @@ begin
        try
                // \83\8c\83X\95\\8e¦\94Í\88Í
                if not GikoSys.Setting.ResRangeHold then
-                       GikoSys.Setting.ResRange := GikoSys.ResRange;
+                       GikoSys.Setting.ResRange := FResRangeMenuSelect;
        except
        end;
 
@@ -1942,7 +1942,7 @@ begin
        LockWindowUpdate(0);
        try
                TreeView.Items.BeginUpdate;
-               Node := TreeView.Items.GetFirstNode.Free;
+               TreeView.Items.GetFirstNode.Free;
                TreeView.Items.Clear;
                TreeView.Items.EndUpdate;
        except
@@ -8651,18 +8651,11 @@ begin
                Dlg.SelectComboBox.Text := FSelectResWord;
                Dlg.ShowModal;
                if Dlg.ModalResult = mrOK then begin
+                       SelectResAction.Checked := True;
                        if Length( Dlg.SelectComboBox.Text ) = 0 then begin
-                               // \8bó\93ü\97Í\82Å OK \82Í\83L\83\83\83\93\83Z\83\8b\82Æ\93¯\88Ó\8b`
-                               case GikoSys.ResRange of
-                               Ord( grrAll ):          AllResAction.Execute;
-                               Ord( grrSelect ):       AllResAction.Execute;
-                               else                                                    ResRangeAction.Execute;
-                               end;
+                               // \8bó\93ü\97Í\82Å OK \82Í\8di\82è\8d\9e\82Ý\89ð\8f\9c\82Æ\93¯\88Ó\8b`
+                               ResRangeAction.Execute;
                        end else begin
-                               // \83{\83^\83\93\82Ì\8dX\90V
-                               AllResAction.Checked := False;
-                               SelectResAction.Checked := True;
-                               ResRangeAction.Checked := False;
                                GikoSys.ResRange := Ord( grrSelect );
 
                                // \8dÅ\8cã\82É\90Ý\92è\82µ\82½\82à\82Ì\82ð\8ao\82¦\82Ä\82¨\82­
@@ -8705,11 +8698,8 @@ begin
                        end;
                end else begin
                        // \83L\83\83\83\93\83Z\83\8b
-                       case GikoSys.ResRange of
-                       Ord( grrAll ):          AllResAction.Execute;
-                       Ord( grrSelect ):       {* nothing *};
-                       else                                                    ResRangeAction.Execute;
-                       end;
+                       if GikoSys.ResRange <> Ord( grrSelect ) then
+                               ResRangeAction.Execute;
                end;
        finally
                Dlg.Release;
@@ -8737,10 +8727,7 @@ begin
        if(FActiveContent <> nil) and (FActiveContent.FBrowser <> nil )
                and (FActiveContent.FBrowser.Busy) then Exit;
 
-       // \83{\83^\83\93\82Ì\8dX\90V
-       AllResAction.Checked := True;
-       SelectResAction.Checked := False;
-       ResRangeAction.Checked := False;
+       FResRangeMenuSelect                             := Ord( grrAll );
 
        if GikoSys.ResRange <> Ord( grrAll ) then begin
                GikoSys.ResRange := Ord( grrAll );
@@ -9742,38 +9729,12 @@ var
        FilterList : TStringList;
        i: Integer;
 begin
-       if (FActiveContent <> nil) and (FActiveContent.FBrowser <> nil)
-               and (FActiveContent.FBrowser.Busy) then Exit;
-
-       // \95\\8e¦\82Ì\8dX\90V
-       AllResAction.Checked            := False;
-       SelectResAction.Checked := False;
-       ResRangeButton.Down                     := True;
-       GikoSys.ResRange                                := FResRangeMenuSelect;
        case FResRangeMenuSelect of
-       Ord( grrKoko ): OnlyKokoResAction.Checked       := True;
-       Ord( grrNew ):  OnlyNewResAction.Checked        := True;
-       100:                                            OnlyAHundredRes.Checked         := True;
-       end;
-
-       // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
-       FilterList := TStringList.Create;
-       try
-               GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
-               GikoSys.FSelectResFilter.Reverse := False;
-       finally
-               FilterList.Destroy;
-       end;
-
-       FSelectResWord := '';
-
-       // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
-       for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+       Ord( grrAll ):  AllResAction.Execute;
+       Ord( grrKoko ): OnlyKokoResAction.Execute;
+       Ord( grrNew ):  OnlyNewResAction.Execute;
+       100:                                            OnlyAHundredRes.Execute;
        end;
-       ThreadItem := GetActiveContent;
-       if ThreadItem <> nil then
-               InsertBrowserTab( ThreadItem, True );
 end;
 
 procedure TGikoForm.FavoriteTreeViewEndDrag(Sender, Target: TObject; X,
@@ -10932,34 +10893,30 @@ begin
        if (FActiveContent <> nil) and (FActiveContent.FBrowser <> nil)
                and (FActiveContent.FBrowser.Busy) then Exit;
 
-       // \95\\8e¦\82Ì\8dX\90V
-       AllResAction.Checked                    := False;
-       SelectResAction.Checked         := False;
-       ResRangeButton.Down                             := True;
-       OnlyAHundredRes.Checked         := True;
-       OnlyKokoResAction.Checked       := False;
-       OnlyNewResAction.Checked        := False;
-       GikoSys.ResRange                                        := 100;
        FResRangeMenuSelect                             := 100;
 
-       // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
-       FilterList := TStringList.Create;
-       try
-               GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
-               GikoSys.FSelectResFilter.Reverse := False;
-       finally
-               FilterList.Destroy;
-       end;
+       if GikoSys.ResRange <> 100 then begin
+               GikoSys.ResRange                                        := 100;
 
-       FSelectResWord := '';
+               // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
+               FilterList := TStringList.Create;
+               try
+                       GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+                       GikoSys.FSelectResFilter.Reverse := False;
+               finally
+                       FilterList.Destroy;
+               end;
 
-       // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
-       for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               FSelectResWord := '';
+
+               // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
+               for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
+                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               end;
+               ThreadItem := GetActiveContent;
+               if ThreadItem <> nil then
+                       InsertBrowserTab( ThreadItem, True );
        end;
-       ThreadItem := GetActiveContent;
-       if ThreadItem <> nil then
-               InsertBrowserTab( ThreadItem, True );
 end;
 
 procedure TGikoForm.OnlyKokoResActionExecute(Sender: TObject);
@@ -10971,34 +10928,30 @@ begin
        if (FActiveContent <> nil) and (FActiveContent.FBrowser <> nil)
                and (FActiveContent.FBrowser.Busy) then Exit;
 
-       // \95\\8e¦\82Ì\8dX\90V
-       AllResAction.Checked                    := False;
-       SelectResAction.Checked         := False;
-       ResRangeButton.Down                             := True;
-       OnlyAHundredRes.Checked         := False;
-       OnlyKokoResAction.Checked       := True;
-       OnlyNewResAction.Checked        := False;
-       GikoSys.ResRange                                        := Ord( grrKoko );
        FResRangeMenuSelect                             := Ord( grrKoko );
 
-       // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
-       FilterList := TStringList.Create;
-       try
-               GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
-               GikoSys.FSelectResFilter.Reverse := False;
-       finally
-               FilterList.Destroy;
-       end;
+       if GikoSys.ResRange <> Ord( grrKoko ) then begin
+               GikoSys.ResRange                                        := Ord( grrKoko );
 
-       FSelectResWord := '';
+               // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
+               FilterList := TStringList.Create;
+               try
+                       GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+                       GikoSys.FSelectResFilter.Reverse := False;
+               finally
+                       FilterList.Destroy;
+               end;
 
-       // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
-       for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               FSelectResWord := '';
+
+               // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
+               for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
+                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               end;
+               ThreadItem := GetActiveContent;
+               if ThreadItem <> nil then
+                       InsertBrowserTab( ThreadItem, True );
        end;
-       ThreadItem := GetActiveContent;
-       if ThreadItem <> nil then
-               InsertBrowserTab( ThreadItem, True );
 end;
 
 procedure TGikoForm.OnlyNewResActionExecute(Sender: TObject);
@@ -11010,34 +10963,30 @@ begin
        if (FActiveContent <> nil) and (FActiveContent.FBrowser <> nil)
                and (FActiveContent.FBrowser.Busy) then Exit;
 
-       // \95\\8e¦\82Ì\8dX\90V
-       AllResAction.Checked                    := False;
-       SelectResAction.Checked         := False;
-       ResRangeButton.Down                             := True;
-       OnlyAHundredRes.Checked         := False;
-       OnlyKokoResAction.Checked       := False;
-       OnlyNewResAction.Checked        := True;
-       GikoSys.ResRange                                        := Ord( grrNew );
        FResRangeMenuSelect                             := Ord( grrNew );
 
-       // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
-       FilterList := TStringList.Create;
-       try
-               GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
-               GikoSys.FSelectResFilter.Reverse := False;
-       finally
-               FilterList.Destroy;
-       end;
+       if GikoSys.ResRange <> Ord( grrNew ) then begin
+               GikoSys.ResRange                                        := Ord( grrNew );
 
-       FSelectResWord := '';
+               // \83t\83B\83\8b\83^\95\8e\9a\97ñ\82ð\8bó\82É\82·\82é
+               FilterList := TStringList.Create;
+               try
+                       GikoSys.FSelectResFilter.LoadFromStringList( FilterList );
+                       GikoSys.FSelectResFilter.Reverse := False;
+               finally
+                       FilterList.Destroy;
+               end;
 
-       // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
-       for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               FSelectResWord := '';
+
+               // \83X\83\8c\83b\83h\82ð\8dÄ\95`\89æ
+               for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
+                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
+               end;
+               ThreadItem := GetActiveContent;
+               if ThreadItem <> nil then
+                       InsertBrowserTab( ThreadItem, True );
        end;
-       ThreadItem := GetActiveContent;
-       if ThreadItem <> nil then
-               InsertBrowserTab( ThreadItem, True );
 end;
 
 initialization
index 7d76c81..5b4018e 100644 (file)
@@ -38,7 +38,7 @@ const
                                                                                                                                                                        '',
                                                                                                                                                                        'SelectReservAction');
        //\83u\83\89\83E\83U\83c\81[\83\8b\83o\81[\83f\83t\83H\83\8b\83g
-       DEF_BROWSER:  array[0..17] of string = ('BrowserMaxAction',
+       DEF_BROWSER:  array[0..16] of string = ('BrowserMaxAction',
                                                                                                                                                                        'BrowserMinAction',
                                                                                                                                                                        '',
                                                                                                                                                                        'ScrollTopAction',
@@ -46,7 +46,6 @@ const
                                                                                                                                                                        'ScrollNewAction',
                                                                                                                                                                        'ScrollKokoAction',
                                                                                                                                                                        '',
-                                                                                                                                                                       'AllResAction',
                                                                                                                                                                        'SelectResAction',
                                                                                                                                                                        'ResRangeAction',
                                                                                                                                                                        '',