X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Giko.pas;h=c57e798d7c635a00ffd831190cd64cc260ce3988;hb=refs%2Fheads%2FBb62;hp=4448633b332b138e5951b943a9e9d411e19806bf;hpb=752f672cfc0feab11987f00382190c9a1cf51f84;p=gikonavigoeson%2Fgikonavi.git diff --git a/Giko.pas b/Giko.pas index 4448633..c57e798 100644 --- a/Giko.pas +++ b/Giko.pas @@ -24,8 +24,7 @@ uses const NGWORDNAME_PANEL = 3; THREADSIZE_PANEL = 2; - USER_RESPOPUPCLEAR = WM_USER + 2005; ///< wParam : TWebBrowser - + USER_POPUPCLEAR = WM_USER + 2005; ///< wParam : TWebBrowser type TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser); @@ -422,8 +421,14 @@ type N83: TMenuItem; UpdateGikonaviAction1: TMenuItem; N84: TMenuItem; + N85: TMenuItem; + URL2: TMenuItem; + URLPATHINFO1: TMenuItem; + URLQUERYSTRING1: TMenuItem; + N86: TMenuItem; procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); + procedure SaveSettingAll(); procedure BrowserStatusTextChange(Sender: TObject; const Text: WideString); procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); @@ -608,6 +613,9 @@ type FPreviewBrowserRect: TRect; ///< ƒvƒŒƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ð‹L‰¯‚·‚é FActionListGroupIndexes: array of Integer; /// '') then begin if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin - PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 ); - end; - if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and (FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin - Application.ProcessMessages; + // ƒƒbƒZ[ƒW‚ðŽó‚¯Žæ‚ç‚È‚¢‚悤‚ɃXƒŠ[ƒv‚ɕύX + Sleep(1); end; end; item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL ); + GikoSys.Setting.LastCloseTabURL := ''; if (item <> nil) and (item.IsLogFile) then begin OpenThreadItem(item, item.URL); end; - GikoSys.Setting.LastCloseTabURL := ''; + //ShowWindow(Self.Handle, SW_SHOW); end; end; - - //ActionList‚ÌGroupIndex‚ðŒ³‚É–ß‚· - SetGroupIndex(GikoDM.GikoFormActionList); - - FStartUp := false; end; end; @@ -1552,38 +1579,25 @@ begin Application.UnhookMainWindow(Hook); //ƒAƒvƒŠƒP[ƒVƒ‡ƒ“I—¹‚Ì‘O‚Ƀ_ƒEƒ“ƒ[ƒhƒXƒŒƒbƒh‚ɐ³íI—¹‚𑣂· + FControlThread.DownloadAbort; FControlThread.Terminate; + + //OnDestory‚¾‚ƍċN“®‚ð‚©‚¯‚½‚Æ‚«‚È‚Ç‚É•Û‘¶‚³‚ê‚È‚¢‚Ì‚ÅOnCloseQuery‚Őݒè•Û‘¶ + SaveSettingAll(); + Application.Terminate; end; -procedure TGikoForm.FormDestroy(Sender: TObject); +procedure TGikoForm.SaveSettingAll(); var - i : Integer; wp : TWindowPlacement; - tmpBool : Boolean; WindowPlacement: TWindowPlacement; begin - // ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ - if (FIconData.uID <> 0) then begin - Shell_NotifyIcon(NIM_DELETE, @FIconData); - end; - - // ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ŠJ•ú - try - if GikoSys.Setting.GestureEnabled then begin - MouseGesture.OnGestureStart := nil; - MouseGesture.OnGestureMove := nil; - MouseGesture.OnGestureEnd := nil; - end; - MouseGesture.Clear; - MouseGesture.UnHook; - MouseGesture.Free; - except - end; try ActiveListColumnSave; except end; + try WindowPlacement.length := SizeOf(TWindowPlacement); GetWindowPlacement(Self.Handle, @WindowPlacement); @@ -1616,21 +1630,13 @@ begin GikoSys.Setting.ResRange := FResRangeMenuSelect; except end; - if WindowState <> wsNormal then - WindowState := wsNormal; - SaveCoolBarSettings; - try - GikoSys.Setting.WriteWindowSettingFile; - GikoSys.Setting.WriteNameMailSettingFile; - except - end; - // ƒŠƒAƒ‹ƒ^ƒCƒ€‚É•Û‘¶‚³‚ê‚é‚̂ŁA‚Ü‚½AƒEƒBƒ“ƒhƒEƒTƒCƒY‚ª CoolBar ‚æ‚è - // ¬‚³‚­‚È‚Á‚Ä‚¢‚é‚Æ‚«‚É•Û‘¶‚·‚é‚Æ’l‚ªã‘‚«‚³‚ê‚Ä‚µ‚Ü‚¤‚Ì‚Å‚±‚±‚Å‚Í•Û‘¶‚µ‚È‚¢ - - // ªFormDestroy’†‚Ɉړ®‚µ‚½‚̂ŁA‚±‚±‚Å•Û‘¶‚µ‚È‚¢‚Æ‚¢‚¯‚È‚¢‚ÆŽv‚¤Bi‚à‚¶‚ã@2004/04/09j - // CoolBar •Û‘¶ - //if (GikoForm.WindowState <> wsMinimized) and (GikoForm.WindowState <> wsMaximized) then - + //¡‚Ìwinodw‚̃Xƒ^ƒCƒ‹‚ÅCoolBar‚̈ʒuAƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•Û‘¶ + SaveCoolBarSettings; + GikoSys.Setting.WriteWindowSettingFile; + // –¼‘O‚ƃ[ƒ‹‚Ì•Û‘¶‚Ȃ̂ŃGƒfƒBƒ^‚ª•Â‚¶‚½Œã‚È‚ç‚¢‚Â‚Å‚à‚¢‚¢ + GikoSys.Setting.WriteNameMailSettingFile; + // –`Œ¯‚̏‘‚Ì•Û‘¶ + GikoSys.Setting.WriteBoukenSettingFile; //“ü—̓AƒVƒXƒg‹@\‚̐ݒè‚Ì•Û‘¶ InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName); @@ -1641,10 +1647,71 @@ begin if not (FavoriteDM.AbEnd) then begin FavoriteDM.WriteFavorite; end; + except + end; + + //ƒAƒhƒŒƒX—š—ð•Û‘¶ + try + //AddressHistoryDM‚ÍŽ©“®¶¬ƒtƒH[ƒ€‚Ȃ̂ŁA‰ð•ú‚ÍŽ©“®“I‚É‚³‚ê‚éB + AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount); + except + end; + + //ƒqƒXƒgƒŠƒŠƒXƒg•Û‘¶ + try + FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml'); + except + end; + + //„‰ñƒŠƒXƒg•Û‘¶ + try + RoundList.SaveRoundFile; + except + end; + + // ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ + if (FIconData.uID <> 0) then begin + Shell_NotifyIcon(NIM_DELETE, @FIconData); + end; + +end; + +procedure TGikoForm.FormDestroy(Sender: TObject); +var + i : Integer; + tmpBool : Boolean; +begin + //ˆêŽž“I‚ɒʏíƒXƒ^ƒCƒ‹‚É–ß‚µ‚ÄCoolBar‚̈ʒuAƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•Û‘¶ + //¦’ˆÓFOnDestroy‚ÅŽg‚¤‚±‚Æ‚µ‚©l—¶‚³‚ê‚Ä‚¢‚È‚¢ + // ‘¼‚Å‚â‚é‚ƍĕ`‰æ‚ª”­¶‚·‚é + if WindowState <> wsNormal then begin + WindowState := wsNormal; + try + SaveCoolBarSettings; + GikoSys.Setting.WriteWindowSettingFile; + except + end; + end; + + // ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ŠJ•ú + try + if GikoSys.Setting.GestureEnabled then begin + MouseGesture.OnGestureStart := nil; + MouseGesture.OnGestureMove := nil; + MouseGesture.OnGestureEnd := nil; + end; + MouseGesture.Clear; + MouseGesture.UnHook; + MouseGesture.Free; + except + end; + + //‚¨‹C‚É“ü‚è”jŠü + try FavoriteDM.Clear; except end; - //LockWindowUpdate(Self.Handle); + try //ƒ^ƒuƒNƒ[ƒY tmpBool := GikoSys.Setting.ShowDialogForAllTabClose; @@ -1653,6 +1720,7 @@ begin GikoSys.Setting.ShowDialogForAllTabClose := tmpBool; except end; + try for i := FBrowsers.Count - 1 downto 0 do begin GikoSys.ShowRefCount('browser' + IntToStr(i), TWebBrowser(FBrowsers[i]).ControlInterface); @@ -1667,6 +1735,7 @@ begin finally FBrowsers.Free; end; + try if BrowserNullTab <> nil then begin BrowserNullTab.Browser := nil; {*BrowserNullTab‚ÌBrowser‚͐݌vŽž‚É“\‚è•t‚¯‚Ä‚é“z @@ -1685,18 +1754,6 @@ begin except end; - //ƒAƒhƒŒƒX—š—ð•Û‘¶ - try - //AddressHistoryDM‚ÍŽ©“®¶¬ƒtƒH[ƒ€‚Ȃ̂ŁA‰ð•ú‚ÍŽ©“®“I‚É‚³‚ê‚éB - AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount); - except - end; - - //ƒqƒXƒgƒŠƒŠƒXƒg•Û‘¶ - try - FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml'); - except - end; try try FHistoryList.Clear; @@ -1706,11 +1763,7 @@ begin FHistoryList.Free; end; - //„‰ñƒŠƒXƒg•Û‘¶&”jŠü - try - RoundList.SaveRoundFile; - except - end; + try try RoundList.Clear; @@ -1722,7 +1775,7 @@ begin try try - FControlThread.DownloadAbort; + //FControlThread.DownloadAbort; FControlThread.Terminate; FControlThread.WaitFor; except @@ -1774,7 +1827,12 @@ begin end; except end; - //LockWindowUpdate(0); + + // Update‚ª‚¢‚ê‚ÎŽÀs‚·‚é + if FileExists(FUpdateExePath) then begin + // ƒAƒbƒvƒf[ƒgŽÀs + GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs); + end; end; // ŠeŠ‚É‚ ‚éƒLƒƒƒrƒlƒbƒgE BBS ƒƒjƒ…[‚ðƒZƒbƒg^XV @@ -2041,7 +2099,8 @@ begin s := ''; Ext := AnsiLowerCase(ExtractFileExt(Text2)); if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and - ((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) then begin + ((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) or + (Pos('http://www.nicovideo.jp/watch/', Text2) = 1) then begin if FPreviewBrowser = nil then begin FPreviewBrowser := TPreviewBrowser.Create(Self); ShowWindow(FPreviewBrowser.Handle, SW_HIDE); @@ -2328,9 +2387,10 @@ begin {$IFDEF DEBUG} Writeln(URL); {$ENDIF} + FKokoPopupThreadItem := nil; if Pos(kMenuName, URL) <> 0 then begin sNo := Copy( URL, Pos( kMenuName, URL ) + Length( kMenuName ), Length( URL ) ); - + if not GikoSys.IsNumeric(sNo) then Exit; Cancel := True; @@ -2338,6 +2398,17 @@ begin KokoPopupMenu.PopupComponent := nil; if (Sender is TComponent) then KokoPopupMenu.PopupComponent := TComponent(Sender); + // Œë”š‘΍ô ƒNƒŠƒbƒN‚µ‚½ƒuƒ‰ƒEƒU‚ƈقȂé‚Æ‚«‚ɏÁ‚·ˆ—‚ð’ljÁ + if not (Sender is TResPopupBrowser) then begin + if (FResPopupBrowser <> nil) and (FResPopupBrowser.CurrentBrowser.Visible = True) then begin + FResPopupBrowser.Clear; + end; + end else begin + if (Sender <> FResPopupBrowser.CurrentBrowser) then begin + TResPopupBrowser(Sender).ChildClear; + end; + end; + FKokoPopupThreadItem := GetActiveContent(true); KokoPopupMenu.Tag := StrToInt(sNo); KokoPopupMenu.Popup(p.x, p.y); end else if Pos('mailto', LowerCase(URL)) <> 0 then begin @@ -3800,6 +3871,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := False; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := False; end else if TObject(FClickNode.Data) is TBoard then begin TreeSelectThreadPupupMenu.Visible := False; TreeSelectBoardPupupMenu.Visible := True; @@ -3810,6 +3882,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := True; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := True; end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin TreeSelectThreadPupupMenu.Visible := False; TreeSelectBoardPupupMenu.Visible := True; @@ -3820,6 +3893,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := True; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := False; end else if (TObject(FClickNode.Data) is TThreadItem) then begin TreeSelectThreadPupupMenu.Visible := True; TreeSelectBoardPupupMenu.Visible := False; @@ -3830,6 +3904,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := True; TreeSelectLogDeleteSeparator.Visible := True; TreeSelectLogDeletePopupMenu.Visible := True; + SearchBoardName.Visible := False; end else if (TObject(FClickNode.Data) is TFavoriteThreadItem) then begin TreeSelectThreadPupupMenu.Visible := True; TreeSelectBoardPupupMenu.Visible := False; @@ -3840,6 +3915,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := True; TreeSelectLogDeleteSeparator.Visible := True; TreeSelectLogDeletePopupMenu.Visible := True; + SearchBoardName.Visible := False; end else if (TObject(FClickNode.Data) is TCategory) then begin TreeSelectThreadPupupMenu.Visible := False; TreeSelectBoardPupupMenu.Visible := False; @@ -3850,6 +3926,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := False; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := True; end else if FClickNode.IsFirstNode then begin TreeSelectThreadPupupMenu.Visible := False; TreeSelectBoardPupupMenu.Visible := False; @@ -3860,6 +3937,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := False; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := True; end else begin TreeSelectThreadPupupMenu.Visible := False; TreeSelectBoardPupupMenu.Visible := False; @@ -3870,6 +3948,7 @@ begin TreeSelectFavoriteAddPupupMenu.Visible := False; TreeSelectLogDeleteSeparator.Visible := False; TreeSelectLogDeletePopupMenu.Visible := False; + SearchBoardName.Visible := False; end; end; @@ -4325,7 +4404,7 @@ procedure TGikoForm.SetSelectItemRound(RoundFlag: Boolean; RoundName: string; Pa var threadItem : TThreadItem; begin - if ParentName <> 'dummy1' then begin + if ParentName <> 'RoundItem' then begin SetSelectItemRound(RoundFlag, RoundName); end else begin threadItem := GetActiveContent; @@ -4642,7 +4721,7 @@ begin end; end; -procedure TGikoForm.MoveToURL(const inURL: string); +procedure TGikoForm.MoveToURL(const inURL: string; KeyMask: Boolean = False); var protocol, host, path, document, port, bookmark : string; URL, protocol2, host2, path2, document2, port2, bookmark2 : string; @@ -4659,17 +4738,18 @@ begin GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark ); GikoSys.Parse2chURL( inURL, path, document, BBSID, BBSKey ); - - - shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001); - ctrlDown := GetAsyncKeyState(VK_CONTROL) = Smallint($8001); - if shiftDown then begin - GikoSys.OpenBrowser(inURL, gbtUserApp); - Exit; - end else if ctrlDown then begin - GikoSys.OpenBrowser(inURL, gbtIE); - Exit; - end; + // ƒAƒNƒVƒ‡ƒ“‚©‚çŒÄ‚΂ê‚é‚Æshift/ctrl‚Í‚¨‚µ‚Á‚ς̏ꍇ‚ª‚Ù‚Æ‚ñ‚ǂȂ̂Ń}ƒXƒN‚·‚é + if not KeyMask then begin + shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001); + ctrlDown := GetAsyncKeyState(VK_CONTROL) = Smallint($8001); + if shiftDown then begin + GikoSys.OpenBrowser(inURL, gbtUserApp); + Exit; + end else if ctrlDown then begin + GikoSys.OpenBrowser(inURL, gbtIE); + Exit; + end; + end; //===== ƒvƒ‰ƒOƒCƒ“ try @@ -4868,12 +4948,16 @@ begin senderBrowser := TWebBrowser( Message.WParam ); BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url ); end; - USER_RESPOPUPCLEAR: + USER_POPUPCLEAR: if (TObject(Message.WParam) is TResPopupBrowser) then begin try TResPopupBrowser( Message.WParam ).Clear; except end; + end else if (TObject(Message.WParam) is TPreviewBrowser) then begin + if FPreviewBrowser <> nil then begin + ShowWindow(FPreviewBrowser.Handle, SW_HIDE); + end; end; end; @@ -6426,17 +6510,24 @@ end; procedure TGikoForm.BrowserTabPopupMenuPopup(Sender: TObject); +var + i:Integer; begin - AddRoundNameMenu(dummy1); - AddMenuSameBoardThread; + for i := 0 to BrowserTabPopupMenu.Items.Count - 1 do begin + if (BrowserTabPopupMenu.Items[i].Name='RoundItem') then begin + AddRoundNameMenu(BrowserTabPopupMenu.Items[i]); + end else if (BrowserTabPopupMenu.Items[i].Name='BoardThreadItem') then begin + AddMenuSameBoardThread(BrowserTabPopupMenu.Items[i]) + end; + end; end; //! ƒAƒNƒeƒBƒu‚ȃ^ƒu‚Æ“¯‚¶”‚̊J‚¢‚Ä‚¢‚éƒXƒŒƒbƒh‚ðƒƒjƒ…[ƒAƒCƒeƒ€‚ɒljÁ -procedure TGikoForm.AddMenuSameBoardThread; +procedure TGikoForm.AddMenuSameBoardThread(MenuItem: TMenuItem); var i: Integer; Item: TMenuItem; begin - SameBoardThreadItem.Clear; + MenuItem.Clear; for i := 0 to BrowserTab.Tabs.Count - 1 do begin // “¯‚¶”‚©‚Ç‚¤‚© if (FActiveContent.Thread.ParentBoard = @@ -6446,23 +6537,23 @@ begin TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread then begin Item := TMenuItem.Create(Self); Item.Caption := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.Title; + Item.Hint := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.URL; Item.OnClick := SameBoardThreadSubItemOnClick; - SameBoardThreadItem.Add(Item); + MenuItem.Add(Item); end; end; end; // ‰½‚à–³‚¢‚È‚çŽg—p‚Å‚«‚È‚¢‚悤‚É‚·‚é - SameBoardThreadItem.Enabled := SameBoardThreadItem.Count > 0; + MenuItem.Enabled := MenuItem.Count > 0; end; //! ƒAƒNƒeƒBƒu‚ȃ^ƒu‚Æ“¯‚¶”‚̊J‚¢‚Ä‚¢‚éƒXƒŒƒbƒhƒNƒŠƒbƒNƒCƒxƒ“ƒg procedure TGikoForm.SameBoardThreadSubItemOnClick(Sender: TObject); var - i, j: Integer; + i: Integer; MenuItem: TMenuItem; begin if Sender is TMenuItem then begin try - j := 0; MenuItem := TMenuItem(Sender); for i := 0 to BrowserTab.Tabs.Count - 1 do begin // “¯‚¶”‚©‚Ç‚¤‚© @@ -6470,12 +6561,11 @@ begin TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ParentBoard) then begin if FActiveContent.Thread <> TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread then begin - if (SameBoardThreadItem.Items[j] = MenuItem) then begin - MoveToURL( TBrowserRecord(BrowserTab.Tabs.Objects[i]) - .Thread.URL); + if (MenuItem.Hint = TBrowserRecord(BrowserTab.Tabs.Objects[i]) + .Thread.URL) then begin + MoveToURL( MenuItem.Hint); Exit; end; - Inc(j); end; end; end; @@ -7284,7 +7374,7 @@ var begin No := KokoPopupMenu.Tag; if No = 0 then Exit; - ThreadItem := GetActiveContent(True); + ThreadItem := GikoForm.KokoPopupThreadItem; if ThreadItem = nil then Exit; id := GikoSys.GetResID(No, ThreadItem); @@ -7343,7 +7433,7 @@ var begin No := KokoPopupMenu.Tag; if No = 0 then Exit; - ThreadItem := GetActiveContent(True); + ThreadItem := GikoForm.KokoPopupThreadItem; if ThreadItem = nil then Exit; body := TStringList.Create; try @@ -8006,6 +8096,12 @@ begin GikoSys.Setting.GetAppDir + ICONTOOL, clPurple); end; end; +//! ƒ|ƒbƒvƒAƒbƒvƒƒjƒ…[“ǂݍž‚Ý +procedure TGikoForm.LoadPopupMenu(); +begin + + +end; initialization OleInitialize(nil);