ブラウザタブの移動（？）でループを許可するオプション追加

diff --git a/GikoDataModule.dfm b/GikoDataModule.dfm
index 81ea92a..16b74b6 100644 (file)
--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -696,7 +696,7 @@ object GikoDM: TGikoDM
       Hint = #24038#12398#12479#12502#12434#36984#25246#12377#12427
       ImageIndex = 48
       OnExecute = LeftTabSelectActionExecute
-      OnUpdate = LeftmostTabSelectActionUpdate
+      OnUpdate = LeftTabSelectActionUpdate
     end
     object RightTabSelectAction: TAction
       Category = #12473#12524#12483#12489
@@ -712,7 +712,7 @@ object GikoDM: TGikoDM
       Hint = #19968#30058#21491#12398#12479#12502#12434#36984#25246#12377#12427
       ImageIndex = 49
       OnExecute = RightmostTabSelectActionExecute
-      OnUpdate = RightTabSelectActionUpdate
+      OnUpdate = RightmostTabSelectActionUpdate
     end
     object FavoriteAddAction: TAction
       Category = #12362#27671#12395#20837#12426

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index ffa78de..8c4aeea 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -424,6 +424,8 @@ type
     procedure VKRightActionExecute(Sender: TObject);
     procedure VKLeftActionExecute(Sender: TObject);
     procedure StoredTaskTrayActionExecute(Sender: TObject);
+    procedure LeftTabSelectActionUpdate(Sender: TObject);
+    procedure RightmostTabSelectActionUpdate(Sender: TObject);
   private
        { Private \90é\8c¾ }
        procedure ClearResFilter;
@@ -1283,6 +1285,18 @@ begin
        end;
 end;
 // *************************************************************************
+//! \8d¶\82Ì\83^\83u\82ð\91I\91ð\82·\82é\82ÌUpdate\83C\83x\83\93\83g
+// *************************************************************************
+procedure TGikoDM.LeftTabSelectActionUpdate(Sender: TObject);
+begin
+    if ( not GikoSys.Setting.LoopBrowserTabs ) then begin
+        LeftmostTabSelectActionUpdate(Sender);
+    end else begin
+        TAction(Sender).Enabled := (GikoForm.BrowserTab.Tabs.Count > 1);
+    end;
+end;
+
+// *************************************************************************
 //! \83^\83u\82Ì\90\94\82ª\82P\88È\8fã\82Å\81A\83^\83u\82Ì\83C\83\93\83f\83b\83N\83X\82ª\82O\88È\8aO\82Å\97L\8cø\82É\82È\82éUpdate\83C\83x\83\93\83g
 // *************************************************************************
 procedure TGikoDM.LeftmostTabSelectActionUpdate(Sender: TObject);
@@ -1302,7 +1316,13 @@ begin
                end else if GikoForm.BrowserTab.TabIndex > 0 then begin
                        GikoForm.BrowserTab.TabIndex := GikoForm.BrowserTab.TabIndex - 1;
                        GikoForm.BrowserTab.OnChange(nil);
-               end;
+               end else begin
+            if (GikoSys.Setting.LoopBrowserTabs) and
+                (GikoForm.BrowserTab.TabIndex = 0) then begin
+                       GikoForm.BrowserTab.TabIndex := GikoForm.BrowserTab.Tabs.Count - 1;
+                       GikoForm.BrowserTab.OnChange(nil);
+            end;
+        end;
        end;
 end;
 // *************************************************************************
@@ -1317,17 +1337,27 @@ begin
                end else if GikoForm.BrowserTab.TabIndex < (GikoForm.BrowserTab.Tabs.Count - 1) then begin
                        GikoForm.BrowserTab.TabIndex := GikoForm.BrowserTab.TabIndex + 1;
                        GikoForm.BrowserTab.OnChange(nil);
-               end;
+               end else begin
+            if (GikoSys.Setting.LoopBrowserTabs) and
+                (GikoForm.BrowserTab.TabIndex = (GikoForm.BrowserTab.Tabs.Count - 1)) then begin
+                       GikoForm.BrowserTab.TabIndex := 0;
+                       GikoForm.BrowserTab.OnChange(nil);
+            end;
+        end;
        end;
 end;
 // *************************************************************************
-//! \83^\83u\82Ì\90\94\82ª\82P\88È\8fã\82Å\81A\83^\83u\82ª\89E\92[\88È\8aO\82Å\97L\8cø\82É\82È\82éUpdate\83C\83x\83\93\83g
+//! \89E\82Ì\83^\83u\82ð\91I\91ð\82·\82éUpdate\83C\83x\83\93\83g
 // *************************************************************************
 procedure TGikoDM.RightTabSelectActionUpdate(Sender: TObject);
 begin
-       TAction(Sender).Enabled := (GikoForm.BrowserTab.Tabs.Count > 0)
-                                                               and (GikoForm.BrowserTab.TabIndex <> GikoForm.BrowserTab.Tabs.Count - 1);
+    if ( not GikoSys.Setting.LoopBrowserTabs ) then begin
+        RightmostTabSelectActionUpdate(Sender);
+    end else begin
+        TAction(Sender).Enabled := (GikoForm.BrowserTab.Tabs.Count > 1);
+    end;
 end;
+
 // *************************************************************************
 //! \88ê\94Ô\89E\82Ì\83^\83u\82ð\91I\91ð\82·\82é
 // *************************************************************************
@@ -1339,6 +1369,15 @@ begin
        end;
 end;
 // *************************************************************************
+//! \88ê\94Ô\89E\82Ì\83^\83u\82ð\91I\91ð\82·\82é\82ÌUpdate\83C\83x\83\93\83g
+// *************************************************************************
+procedure TGikoDM.RightmostTabSelectActionUpdate(Sender: TObject);
+begin
+       TAction(Sender).Enabled := (GikoForm.BrowserTab.Tabs.Count > 0)
+                                                               and (GikoForm.BrowserTab.TabIndex <> GikoForm.BrowserTab.Tabs.Count - 1);
+
+end;
+// *************************************************************************
 //! \91I\91ð\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82ð\82¨\8bC\82É\93ü\82è\82É\92Ç\89Á
 // *************************************************************************
 procedure TGikoDM.ThreadFavoriteAddActionExecute(Sender: TObject);
@@ -4177,5 +4216,7 @@ begin
     StoredTaskTrayAction.Tag := -1;
 end;
 
+
+
 end.
 

diff --git a/Option.dfm b/Option.dfm
index 712f6f3..42e036b 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -1607,6 +1607,22 @@ object OptionDialog: TOptionDialog
     TabOrder = 4
     OnClick = OkBottonClick
   end
+  object GroupBox22: TGroupBox
+    Left = 20
+    Top = 240
+    Width = 473
+    Height = 52
+    Caption = #12502#12521#12454#12470#12479#12502
+    TabOrder = 5
+    object LoopBrowserTabsCB: TCheckBox
+      Left = 11
+      Top = 24
+      Width = 134
+      Height = 17
+      Caption = #12523#12540#12503#12375#12390#31227#21205#12377#12427
+      TabOrder = 0
+    end
+  end
   object FontDialog: TFontDialog
     Font.Charset = SHIFTJIS_CHARSET
     Font.Color = clWindowText

diff --git a/gikoNavi.res b/gikoNavi.res
index aa17619..5bfbb0d 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ