From 470800956af7f3dd0316904338ab8a45d0ed963d Mon Sep 17 00:00:00 2001 From: yoffy Date: Mon, 24 Nov 2003 17:15:20 +0000 Subject: [PATCH] =?utf8?q?=E3=83=BB=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?utf8?q?=E3=81=AE=E5=90=8D=E7=A7=B0=E3=82=84=E9=85=8D=E7=BD=AE=E3=81=AA?= =?utf8?q?=E3=81=A9=E5=85=A8=E8=88=AC=E7=9A=84=E3=81=AB=E6=95=B4=E7=90=86?= =?utf8?q?=E3=80=81=E7=B5=B1=E4=B8=80=E3=80=82=20=E3=83=BB=E4=BD=9C?= =?utf8?q?=E3=82=8A=E3=81=8B=E3=81=91=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=AE?= =?utf8?q?=E3=81=8B=E3=80=81=E3=80=8C=E6=9D=BF=E3=82=92=E3=83=96=E3=83=A9?= =?utf8?q?=E3=82=A6=E3=82=B6=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=80=8D=E3=81=8C?= =?utf8?q?=20=E3=80=80=E5=90=8D=E5=89=8D=E9=80=9A=E3=82=8A=E3=81=AB?= =?utf8?q?=E3=81=AF=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?= =?utf8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=82=88=E3=81=86=E3=81=AA=E3=81=AE?= =?utf8?q?=E3=81=A7=E5=AE=9F=E8=A3=85=E3=80=82=20=E3=83=BB=E3=81=8A?= =?utf8?q?=E6=B0=97=E3=81=AB=E5=85=A5=E3=82=8A=E3=82=92=E5=8F=B3=E3=82=AF?= =?utf8?q?=E3=83=AA=E3=83=83=E3=82=AF=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D?= =?utf8?q?=E3=81=AE=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AB=E3=82=82?= =?utf8?q?=E3=83=96=E3=83=A9=E3=82=A6=E3=82=B6=E3=81=A7=E8=A1=A8=E7=A4=BA?= =?utf8?q?=E3=81=99=E3=82=8B=E9=A0=85=E7=9B=AE=E3=82=92=E8=BF=BD=E5=8A=A0?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Giko.dfm | 120 ++++++++++++++++++++++++++++++++++++++--------------------- Giko.pas | 86 ++++++++++++++++++++++++++++++++++++------ gikoNavi.res | Bin 4288 -> 4288 bytes 3 files changed, 152 insertions(+), 54 deletions(-) diff --git a/Giko.dfm b/Giko.dfm index d01555c..65fde8a 100644 --- a/Giko.dfm +++ b/Giko.dfm @@ -8078,6 +8078,7 @@ object GikoForm: TGikoForm Category = #12473#12524#12483#12489 Caption = #12473#12524#12483#12489#12434#12502#12521#12454#12470#12391#34920#31034'(&S)' Hint = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12434#12502#12521#12454#12470#12391#34920#31034#12377#12427 + ImageIndex = 27 OnExecute = ShowThreadActionExecute OnUpdate = ShowThreadActionUpdate end @@ -8085,6 +8086,7 @@ object GikoForm: TGikoForm Category = #12473#12524#12483#12489 Caption = #26495#12434#12502#12521#12454#12470#12391#34920#31034'(&B)' Hint = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12398#26495#12434#12502#12521#12454#12470#12391#34920#31034#12377#12427 + ImageIndex = 27 OnExecute = ShowBoardActionExecute OnUpdate = ShowBoardActionUpdate end @@ -8504,7 +8506,7 @@ object GikoForm: TGikoForm end object FavoriteTreeViewReloadAction: TAction Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503 - Caption = #26356#26032'(&R)' + Caption = #12480#12454#12531#12525#12540#12489'(&R)' Hint = #36984#25246#12373#12428#12390#12356#12427#12362#27671#12395#20837#12426#12434#12480#12454#12531#12525#12540#12489#12377#12427 ImageIndex = 14 OnExecute = FavoriteTreeViewReloadActionExecute @@ -8549,6 +8551,19 @@ object GikoForm: TGikoForm BeforeExecute = ExportFavoriteFileBeforeExecute OnAccept = ExportFavoriteFileAccept end + object FavoriteTreeViewBrowseBoardAction: TAction + Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503 + Caption = #26495#12434#12502#12521#12454#12470#12391#34920#31034'(&B)' + Hint = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12398#26495#12434#12502#12521#12454#12470#12391#34920#31034#12377#12427 + ImageIndex = 27 + end + object FavoriteTreeViewBrowseThreadAction: TAction + Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503 + Caption = #12473#12524#12483#12489#12434#12502#12521#12454#12470#12391#34920#31034'(&S)' + Hint = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12434#12502#12521#12454#12470#12391#34920#31034#12377#12427 + ImageIndex = 27 + OnExecute = FavoriteTreeViewBrowseThreadActionExecute + end end object MainMenu: TMainMenu Images = HotToobarImageList @@ -8889,56 +8904,74 @@ object GikoForm: TGikoForm object N14: TMenuItem Caption = '-' end - object C1: TMenuItem - Action = BrowserTabCloseAction - end - object V1: TMenuItem - Action = NotSelectTabCloseAction - end - object D4: TMenuItem - Action = ActiveLogDeleteAction - end - object A6: TMenuItem - Action = AllTabCloseAction + object N6: TMenuItem + Caption = #12479#12502'(&T)' + GroupIndex = 1 + object C1: TMenuItem + Action = BrowserTabCloseAction + GroupIndex = 1 + end + object V1: TMenuItem + Action = NotSelectTabCloseAction + GroupIndex = 1 + end + object A6: TMenuItem + Action = AllTabCloseAction + GroupIndex = 1 + end + object D4: TMenuItem + Action = ActiveLogDeleteAction + GroupIndex = 1 + end + object N17: TMenuItem + Caption = '-' + GroupIndex = 1 + end + object L5: TMenuItem + Action = LeftmostTabSelectAction + GroupIndex = 1 + end + object L6: TMenuItem + Action = LeftTabSelectAction + GroupIndex = 1 + end + object A7: TMenuItem + Action = RightTabSelectAction + GroupIndex = 1 + end + object R3: TMenuItem + Action = RightmostTabSelectAction + GroupIndex = 1 + end end object N31: TMenuItem Caption = '-' - end - object L5: TMenuItem - Action = LeftmostTabSelectAction - end - object L6: TMenuItem - Action = LeftTabSelectAction - end - object A7: TMenuItem - Action = RightTabSelectAction - end - object R3: TMenuItem - Action = RightmostTabSelectAction - end - object N18: TMenuItem - Caption = '-' + GroupIndex = 1 end object T1: TMenuItem Action = ShowThreadAction + GroupIndex = 1 end object B2: TMenuItem Action = ShowBoardAction + GroupIndex = 1 end object URLC2: TMenuItem Action = URLCopyAction + GroupIndex = 1 end object T9: TMenuItem Action = NameCopyAction - end - object N49: TMenuItem - Caption = '-' GroupIndex = 1 end object URLN1: TMenuItem Action = NameURLCopyAction GroupIndex = 1 end + object N49: TMenuItem + Caption = '-' + GroupIndex = 1 + end object A2: TMenuItem Action = ItemReloadAction GroupIndex = 1 @@ -9244,24 +9277,18 @@ object GikoForm: TGikoForm object N37: TMenuItem Caption = '-' end + object Close1: TMenuItem + Action = BrowserTabCloseAction + end object A3: TMenuItem Action = NotSelectTabCloseAction end object A5: TMenuItem Action = AllTabCloseAction end - object N20: TMenuItem - Caption = '-' - end object D3: TMenuItem Action = ActiveLogDeleteAction end - object N24: TMenuItem - Caption = '-' - end - object Close1: TMenuItem - Action = BrowserTabCloseAction - end end object TreePopupMenu: TPopupMenu OnPopup = TreePopupMenuPopup @@ -10302,11 +10329,12 @@ object GikoForm: TGikoForm object N58: TMenuItem Caption = '-' end - object FavoriteTreeReloadPopupMenu: TMenuItem - Action = FavoriteTreeViewReloadAction + object FavoriteTreeBrowseBoardPopupMenu: TMenuItem + Action = FavoriteTreeViewBrowseBoardAction + OnClick = FavoriteTreeBrowseBoardPopupMenuClick end - object N60: TMenuItem - Caption = '-' + object FavoriteTreeBrowseThreadPopupMenu: TMenuItem + Action = FavoriteTreeViewBrowseThreadAction end object FavoriteTreeURLCopyPopupMenu: TMenuItem Action = FavoriteTreeViewURLCopyAction @@ -10317,6 +10345,12 @@ object GikoForm: TGikoForm object FavoriteTreeNameURLCopyPopupMenu: TMenuItem Action = FavoriteTreeViewNameURLCopyAction end + object N60: TMenuItem + Caption = '-' + end + object FavoriteTreeReloadPopupMenu: TMenuItem + Action = FavoriteTreeViewReloadAction + end object N59: TMenuItem Caption = '-' end diff --git a/Giko.pas b/Giko.pas index 610d6f4..f4dc9bf 100644 --- a/Giko.pas +++ b/Giko.pas @@ -229,14 +229,12 @@ type K2: TMenuItem; AllTabCloseAction: TAction; A5: TMenuItem; - N18: TMenuItem; A6: TMenuItem; C1: TMenuItem; V1: TMenuItem; N19: TMenuItem; D1: TMenuItem; D2: TMenuItem; - N20: TMenuItem; MessageImageList: TImageList; ProgressBar: TProgressBar; ArrangeAction: TAction; @@ -287,7 +285,6 @@ type ItemImage: TImage; BrowserNameLabel: TLabel; ActiveLogDeleteAction: TAction; - N24: TMenuItem; D3: TMenuItem; N25: TMenuItem; N26: TMenuItem; @@ -511,6 +508,12 @@ type ToolButton22: TToolButton; ToolButton23: TToolButton; ToolButton24: TToolButton; + N6: TMenuItem; + N17: TMenuItem; + FavoriteTreeViewBrowseBoardAction: TAction; + FavoriteTreeViewBrowseThreadAction: TAction; + FavoriteTreeBrowseBoardPopupMenu: TMenuItem; + FavoriteTreeBrowseThreadPopupMenu: TMenuItem; procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); procedure CabinetPanelHide(Sender: TObject); @@ -810,6 +813,8 @@ type procedure ExportFavoriteFileAccept(Sender: TObject); procedure ExportFavoriteFileBeforeExecute(Sender: TObject); procedure CabinetBBSActionExecute(Sender: TObject); + procedure FavoriteTreeViewBrowseThreadActionExecute(Sender: TObject); + procedure FavoriteTreeBrowseBoardPopupMenuClick(Sender: TObject); private { Private éŒ¾ } @@ -4479,7 +4484,7 @@ var begin ThreadItem := GetActiveContent; if ThreadItem = nil then Exit; - GikoSys.OpenBrowser(ThreadItem.URL, gbtAuto); + GikoSys.OpenBrowser(ThreadItem.ParentBoard.URL, gbtAuto); end; //(Thread)URL‚ðƒRƒs[ @@ -8167,70 +8172,84 @@ begin FavoriteTreeDeletePopupMenu.Enabled := False; FavoriteTreeRenamePopupMenu.Enabled := False; FavoriteTreeNewFolderPopupMenu.Enabled := False; - FavoriteTreeReloadPopupMenu.Enabled := False; + FavoriteTreeBrowseBoardPopupMenu.Enabled := False; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := False; FavoriteTreeNameCopyPopupMenu.Enabled := False; FavoriteTreeNameURLCopyPopupMenu.Enabled := False; + FavoriteTreeReloadPopupMenu.Enabled := False; FavoriteTreeLogDeletePopupMenu.Enabled := False; end else if FClickNode.IsFirstNode then begin FavoriteTreeBrowseFolderPopupMenu.Enabled := True; FavoriteTreeDeletePopupMenu.Enabled := False; FavoriteTreeRenamePopupMenu.Enabled := False; FavoriteTreeNewFolderPopupMenu.Enabled := True; - FavoriteTreeReloadPopupMenu.Enabled := False; + FavoriteTreeBrowseBoardPopupMenu.Enabled := False; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := False; FavoriteTreeNameCopyPopupMenu.Enabled := False; FavoriteTreeNameURLCopyPopupMenu.Enabled := False; + FavoriteTreeReloadPopupMenu.Enabled := False; FavoriteTreeLogDeletePopupMenu.Enabled := False; end else if FClickNode.Text = Favorite.FAVORITE_LINK_NAME then begin FavoriteTreeBrowseFolderPopupMenu.Enabled := True; FavoriteTreeDeletePopupMenu.Enabled := True; FavoriteTreeRenamePopupMenu.Enabled := False; FavoriteTreeNewFolderPopupMenu.Enabled := True; - FavoriteTreeReloadPopupMenu.Enabled := False; + FavoriteTreeBrowseBoardPopupMenu.Enabled := False; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := False; FavoriteTreeNameCopyPopupMenu.Enabled := False; FavoriteTreeNameURLCopyPopupMenu.Enabled := False; + FavoriteTreeReloadPopupMenu.Enabled := False; FavoriteTreeLogDeletePopupMenu.Enabled := False; end else if TObject(FClickNode.Data) is TFavoriteFolder then begin FavoriteTreeBrowseFolderPopupMenu.Enabled := True; FavoriteTreeDeletePopupMenu.Enabled := True; FavoriteTreeRenamePopupMenu.Enabled := True; FavoriteTreeNewFolderPopupMenu.Enabled := True; - FavoriteTreeReloadPopupMenu.Enabled := False; + FavoriteTreeBrowseBoardPopupMenu.Enabled := False; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := False; FavoriteTreeNameCopyPopupMenu.Enabled := False; FavoriteTreeNameURLCopyPopupMenu.Enabled := False; + FavoriteTreeReloadPopupMenu.Enabled := False; FavoriteTreeLogDeletePopupMenu.Enabled := False; end else if TObject(FClickNode.Data) is TFavoriteThreadItem then begin FavoriteTreeBrowseFolderPopupMenu.Enabled := False; FavoriteTreeDeletePopupMenu.Enabled := True; FavoriteTreeRenamePopupMenu.Enabled := True; FavoriteTreeNewFolderPopupMenu.Enabled := True; - FavoriteTreeReloadPopupMenu.Enabled := True; + FavoriteTreeBrowseBoardPopupMenu.Enabled := True; + FavoriteTreeBrowseThreadPopupMenu.Enabled := True; FavoriteTreeURLCopyPopupMenu.Enabled := True; FavoriteTreeNameCopyPopupMenu.Enabled := True; FavoriteTreeNameURLCopyPopupMenu.Enabled := True; + FavoriteTreeReloadPopupMenu.Enabled := True; FavoriteTreeLogDeletePopupMenu.Enabled := True; end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin FavoriteTreeBrowseFolderPopupMenu.Enabled := False; FavoriteTreeDeletePopupMenu.Enabled := True; FavoriteTreeRenamePopupMenu.Enabled := True; FavoriteTreeNewFolderPopupMenu.Enabled := True; - FavoriteTreeReloadPopupMenu.Enabled := True; + FavoriteTreeBrowseBoardPopupMenu.Enabled := True; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := True; FavoriteTreeNameCopyPopupMenu.Enabled := True; FavoriteTreeNameURLCopyPopupMenu.Enabled := True; + FavoriteTreeReloadPopupMenu.Enabled := True; FavoriteTreeLogDeletePopupMenu.Enabled := False; end else begin FavoriteTreeBrowseFolderPopupMenu.Enabled := False; FavoriteTreeDeletePopupMenu.Enabled := False; FavoriteTreeRenamePopupMenu.Enabled := False; FavoriteTreeNewFolderPopupMenu.Enabled := False; - FavoriteTreeReloadPopupMenu.Enabled := False; + FavoriteTreeBrowseBoardPopupMenu.Enabled := False; + FavoriteTreeBrowseThreadPopupMenu.Enabled := False; FavoriteTreeURLCopyPopupMenu.Enabled := False; FavoriteTreeNameCopyPopupMenu.Enabled := False; FavoriteTreeNameURLCopyPopupMenu.Enabled := False; + FavoriteTreeReloadPopupMenu.Enabled := False; FavoriteTreeLogDeletePopupMenu.Enabled := False; end; @@ -8694,6 +8713,51 @@ begin end; +procedure TGikoForm.FavoriteTreeViewBrowseThreadActionExecute( + Sender: TObject); +var + threadItem : TThreadItem; +begin + + if FClickNode = nil then Exit; + + if (TObject(FClickNode.Data) is TFavoriteThreadItem) then begin + + threadItem := TFavoriteThreadItem( FClickNode.Data ).Item; + if threadItem = nil then + Exit; + GikoSys.OpenBrowser( threadItem.URL, gbtAuto ); + + end; + +end; + +procedure TGikoForm.FavoriteTreeBrowseBoardPopupMenuClick(Sender: TObject); +var + threadItem : TThreadItem; + boardItem : TBoard; +begin + + if FClickNode = nil then Exit; + + if (TObject(FClickNode.Data) is TFavoriteThreadItem) then begin + + threadItem := TFavoriteThreadItem( FClickNode.Data ).Item; + if threadItem = nil then + Exit; + GikoSys.OpenBrowser( threadItem.ParentBoard.URL, gbtAuto ); + + end else if (TObject(FClickNode.Data) is TFavoriteBoardItem) then begin + + boardItem := TFavoriteBoardItem( FClickNode.Data ).Item; + if threadItem = nil then + Exit; + GikoSys.OpenBrowser( boardItem.URL, gbtAuto ); + + end; + +end; + initialization OleInitialize(nil); finalization diff --git a/gikoNavi.res b/gikoNavi.res index 75c2bfb3cd72a915397cc10b5a74d712789208a9..a3378c80a173e56d1127cc256a7b9ab5c1565b5c 100644 GIT binary patch delta 28 jcmX@0ctCN(8(z*6j0`})$Z%rvSKi-@W}83qoo569l7|XV delta 28 jcmX@0ctCN(8(z-ij0`})$Z&k}SKi-@rkg+Voo569l3@x> -- 2.11.0