From da6247975d37d7de3151b3360675e32bf7a245fa Mon Sep 17 00:00:00 2001 From: h677 Date: Sun, 25 Jun 2006 13:54:59 +0000 Subject: [PATCH] =?utf8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E4=B8=AD=E3=81=AE?= =?utf8?q?=E5=9B=BA=E5=AE=9A=E6=96=87=E5=AD=97=E5=88=97=E3=81=AE=E8=A6=8B?= =?utf8?q?=E7=9B=B4=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Editor.pas | 194 ++++++++++++++++++++++++++--------------------------- Giko.pas | 7 +- GikoDataModule.pas | 37 +++++----- 3 files changed, 121 insertions(+), 117 deletions(-) diff --git a/Editor.pas b/Editor.pas index 8c8d31f..156916b 100644 --- a/Editor.pas +++ b/Editor.pas @@ -306,14 +306,14 @@ const RES2CH_COOKIE = ''; - BBS2CH_NAME: string = '‚Q‚¿‚á‚ñ‚Ë‚é'; - BBS2CH_LOG_FOLDER: string = '2ch'; - EXTERNAL_LOG_FOLDER: string = 'exboard'; + //BBS2CH_NAME: string = '‚Q‚¿‚á‚ñ‚Ë‚é'; + //BBS2CH_LOG_FOLDER: string = '2ch'; + //EXTERNAL_LOG_FOLDER: string = 'exboard'; - FOLDER_INI_FILENAME: string = 'Folder.ini'; - FOLDER_INDEX_FILENAME: string = 'Folder.idx'; - SUBJECT_FILENAME: string = 'subject.txt'; - PATH_DELIM: string = '\'; + //FOLDER_INI_FILENAME: string = 'Folder.ini'; + //FOLDER_INDEX_FILENAME: string = 'Folder.idx'; + //SUBJECT_FILENAME: string = 'subject.txt'; + //PATH_DELIM: string = '\'; type @@ -679,6 +679,8 @@ begin end; function TEditorForm.Check: Boolean; +const + REQUIRED: string = '‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB'; var Msg: string; rc: Integer; @@ -698,11 +700,11 @@ begin MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); Result := False; end else if BodyEdit.Text = '' then begin - Msg := '–{•¶‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB'; + Msg := '–{•¶' + REQUIRED; MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); Result := False; end else if (FBoard <> nil) and (Trim(TitleEdit.Text) = '') then begin - Msg := 'ƒ^ƒCƒgƒ‹‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB'; + Msg := 'ƒ^ƒCƒgƒ‹' + REQUIRED; MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); Result := False; end else begin @@ -816,6 +818,10 @@ begin end; procedure TEditorForm.Send(ACOOKIE: string; SPID: string; PON: string; FirstWriting: Boolean); +const + MSG_FUSIANA : string = 'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·'#13#10 + + '‚à‚µ‚àŠÔˆá‚Á‚Ä‚±‚Ì•û–@‚ŃzƒXƒg‚ª•\Ž¦‚³‚ꂽ‚Æ‚µ‚Ä‚àAŽ©ŒÈÓ”C‚Ȃ̂ō폜ˆË—Š‚ɂ͉ž‚¶‚Ü‚¹‚ñB' + + #13#10#13#10'Ó”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H'; var TextStream: TStringStream; Source: TStringStream; @@ -920,100 +926,88 @@ begin if GikoSys.Setting.LocalTrapAtt then begin if LFusianaGet(Namae) then begin MsgResult := MsgBox( - Handle, - 'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #13#10 + - '‚à‚µ‚àŠÔˆá‚Á‚Ä‚±‚Ì•û–@‚ŃzƒXƒg‚ª•\Ž¦‚³‚ꂽ‚Æ‚µ‚Ä‚àAŽ©ŒÈÓ”C‚Ȃ̂ō폜ˆË—Š‚ɂ͉ž‚¶‚Ü‚¹‚ñB' + #13#10#13#10 + - 'Ó”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', - 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; - FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; - end; - end; - if ((Namae = 'ŽRèÂ') or (Namae = 'fusianasan')) then begin - MsgResult := MsgBox( - Handle, - 'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #13#10 + - '‚à‚µ‚àŠÔˆá‚Á‚Ä‚±‚Ì•û–@‚ŃzƒXƒg‚ª•\Ž¦‚³‚ꂽ‚Æ‚µ‚Ä‚àAŽ©ŒÈÓ”C‚Ȃ̂ō폜ˆË—Š‚ɂ͉ž‚¶‚Ü‚¹‚ñB' + #13#10#13#10 + - 'Ó”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', - 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; - FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; - end; - end; - end; - - if GikoSys.Setting.RemoteTrapAtt then begin - if FThreadItem = nil then - ABoard := FBoard - else - ABoard := FThreadItem.ParentBoard; - - if ABoard = nil then Exit; - - if FileExists(ABoard.GetSETTINGTXTFileName) then begin - body := TStringList.Create; - try - body.LoadFromFile(ABoard.GetSETTINGTXTFileName); - Remote := GetFusianaName(body, ABoard); - finally - body.Free; - end; - end; - - //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾ - //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤... - if not FileExists(ABoard.GetSETTINGTXTFileName) then begin - //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA - //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ - tmpRawheader := Indy.Response.RawHeaders.Text; - GetSETTINGTXTAction.Execute; - body := TStringList.Create; - try - if FileExists(ABoard.GetSETTINGTXTFileName) then begin - body.LoadFromFile(ABoard.GetSETTINGTXTFileName); - Remote := GetFusianaName(body, ABoard); - end; - finally - body.Free; - end; - end; - - if Remote = 'fusianasan' then begin - MsgResult := MsgBox( - Handle, - 'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #13#10 + - '‚à‚µ‚àŠÔˆá‚Á‚Ä‚±‚Ì•û–@‚ŃzƒXƒg‚ª•\Ž¦‚³‚ꂽ‚Æ‚µ‚Ä‚àAŽ©ŒÈÓ”C‚Ȃ̂ō폜ˆË—Š‚ɂ͉ž‚¶‚Ü‚¹‚ñB' + #13#10#13#10 + - 'Ó”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', - 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; + Handle, MSG_FUSIANA, 'î•ñ', + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + Board.SPID := ''; + Board.PON := ''; FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; + EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); + DrawMenuBar(Handle); + Exit; + end; + end; + if ((Namae = 'ŽRèÂ') or (Namae = 'fusianasan')) then begin + MsgResult := MsgBox( + Handle, MSG_FUSIANA, 'î•ñ', + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + Board.SPID := ''; + Board.PON := ''; + FWork := false; + EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); + DrawMenuBar(Handle); + Exit; + end; + end; end; - end; - end; - if ResultType = grtOK then begin - if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then - WriteSambaTime(FHost, Now()); - State := gdsComplete; - end else if ResultType = grtCookie then begin + if GikoSys.Setting.RemoteTrapAtt then begin + if FThreadItem = nil then + ABoard := FBoard + else + ABoard := FThreadItem.ParentBoard; + + if ABoard = nil then Exit; + + if FileExists(ABoard.GetSETTINGTXTFileName) then begin + body := TStringList.Create; + try + body.LoadFromFile(ABoard.GetSETTINGTXTFileName); + Remote := GetFusianaName(body, ABoard); + finally + body.Free; + end; + end; + + //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾ + //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤... + if not FileExists(ABoard.GetSETTINGTXTFileName) then begin + //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA + //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ + tmpRawheader := Indy.Response.RawHeaders.Text; + GetSETTINGTXTAction.Execute; + body := TStringList.Create; + try + if FileExists(ABoard.GetSETTINGTXTFileName) then begin + body.LoadFromFile(ABoard.GetSETTINGTXTFileName); + Remote := GetFusianaName(body, ABoard); + end; + finally + body.Free; + end; + end; + + if Remote = 'fusianasan' then begin + MsgResult := MsgBox( + Handle, MSG_FUSIANA, 'î•ñ', + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + Board.SPID := ''; + Board.PON := ''; + FWork := false; + EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); + DrawMenuBar(Handle); + Exit; + end; + end; + end; + + if ResultType = grtOK then begin + if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then + WriteSambaTime(FHost, Now()); + State := gdsComplete; + end else if ResultType = grtCookie then begin //ƒ‹[ƒv–hŽ~ if not FirstWriting then raise Exception.Create(''); diff --git a/Giko.pas b/Giko.pas index a5a71f6..0c0374c 100644 --- a/Giko.pas +++ b/Giko.pas @@ -4507,6 +4507,9 @@ begin end; procedure TGikoForm.ShowFavoriteAddDialog( Item : TObject ); +const + MsgAdd : String = 'Šù‚É‚¨‹C‚É“ü‚è‚É“o˜^‚³‚ê‚Ä‚¢‚Ü‚·B‚»‚ê‚Å‚à’ljÁ‚µ‚Ü‚·‚©H'; + TitleAdd: String = '‚¨‹C‚É“ü‚è‚̒ljÁ'; var Dlg : TFavoriteAddDialog; ItemURL : string; @@ -4526,7 +4529,7 @@ begin Data := Node.Data; if TObject( Data ) is TFavoriteBoardItem then begin if ItemURL = TFavoriteBoardItem( Data ).URL then begin - if Application.MessageBox( 'Šù‚É‚¨‹C‚É“ü‚è‚É“o˜^‚³‚ê‚Ä‚¢‚Ü‚·B‚»‚ê‚Å‚à’ljÁ‚µ‚Ü‚·‚©H', '‚¨‹C‚É“ü‚è‚̒ljÁ', MB_YESNO ) = IDNO then + if Application.MessageBox(PChar(MsgAdd) , PChar(TitleAdd), MB_YESNO ) = IDNO then Exit; Break; end; @@ -4546,7 +4549,7 @@ begin Data := Node.Data; if TObject( Data ) is TFavoriteThreadItem then begin if ItemURL = TFavoriteThreadItem( Data ).URL then begin - if Application.MessageBox( 'Šù‚É‚¨‹C‚É“ü‚è‚É“o˜^‚³‚ê‚Ä‚¢‚Ü‚·B‚»‚ê‚Å‚à’ljÁ‚µ‚Ü‚·‚©H', '‚¨‹C‚É“ü‚è‚̒ljÁ', MB_YESNO ) = IDNO then + if Application.MessageBox( PChar(MsgAdd), PChar(TitleAdd), MB_YESNO ) = IDNO then Exit; Break; end; diff --git a/GikoDataModule.pas b/GikoDataModule.pas index 664923c..c996a6e 100644 --- a/GikoDataModule.pas +++ b/GikoDataModule.pas @@ -33,14 +33,16 @@ const TOOL_ICON_FAV_BOARD = 31; //!< ‚¨‹C‚É“ü‚蔃AƒCƒRƒ“ TOOL_ICON_FAV_THREAD = 32; //!< ‚¨‹C‚É“ü‚èƒXƒŒƒAƒCƒRƒ“ + //! HTTP + PROTOCOL_HTTP : string = 'http://'; //! ƒMƒRƒiƒrƒTƒCƒg‚ÌURL - URL_GIKONAVI: string = 'http://gikonavi.sourceforge.jp/'; + URL_GIKONAVI: string = 'gikonavi.sourceforge.jp/'; //! MonazillaƒTƒCƒg‚ÌURL - URL_MONAZILLA: string = 'http://www.monazilla.org/'; + URL_MONAZILLA: string = 'www.monazilla.org/'; //! 2‚¿‚á‚ñ‚Ë‚é‚ÌURL - URL_2ch: string = 'http://www.2ch.net/'; + URL_2ch: string = 'www.2ch.net/'; //! ƒMƒRƒiƒrWiki‚ÌURL - URL_Wiki: string = 'http://gikowiki.dyndns.info/index.php?FAQ'; + URL_Wiki: string = 'gikowiki.dyndns.info/index.php?FAQ'; SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ'; SELECTCOMBOBOX_COLOR: TColor = clWindow; @@ -448,7 +450,9 @@ uses RoundName, RoundData, Menus, ListViewUtils, ThreadControl, GikoMessage, InputAssist; - +const + MSG_ERROR : string = 'ƒGƒ‰['; + {$R *.dfm} // ************************************************************************* //! TAction‚ÅGetActiveContent‚ªnilˆÈŠO‚Å—LŒø‚É‚È‚é @@ -487,7 +491,8 @@ procedure TGikoDM.ReloadActionExecute(Sender: TObject); begin //ƒŠƒ[ƒh‚ðŽÀs@Ž¸”s‚µ‚½‚烁ƒbƒZ[ƒWo—Í if GikoSys.FAbon.ReLoadFromNGwordFile =false then begin - MsgBox(GikoForm.Handle, 'NGƒ[ƒhƒtƒ@ƒCƒ‹‚̍ēǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', 'ƒGƒ‰[', MB_OK or MB_ICONEXCLAMATION); + MsgBox(GikoForm.Handle, 'NGƒ[ƒhƒtƒ@ƒCƒ‹‚̍ēǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', + MSG_ERROR, MB_OK or MB_ICONEXCLAMATION); end else begin //‘S‚Ẵ^ƒu‚ɍĕ`‰æ‚ðÝ’è GikoForm.RepaintAllTabsBrowser(); @@ -500,7 +505,8 @@ procedure TGikoDM.GoFowardActionExecute(Sender: TObject); begin //ˆê‚ÂŒã‚ë‚̓ǂݍž‚݁@Ž¸”s‚µ‚½‚烁ƒbƒZ[ƒWo—Í if GikoSys.FAbon.GoBack =false then begin - MsgBox(GikoForm.Handle, 'ˆê‚ÂŒã‚ë‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', 'ƒGƒ‰[', MB_OK or MB_ICONEXCLAMATION); + MsgBox(GikoForm.Handle, 'ˆê‚ÂŒã‚ë‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', + MSG_ERROR, MB_OK or MB_ICONEXCLAMATION); end else begin //ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV RepaintStatusBar; @@ -515,7 +521,8 @@ procedure TGikoDM.GoBackActionExecute(Sender: TObject); begin //ˆê‚ÂŒã‚ë‚̓ǂݍž‚݁@Ž¸”s‚µ‚½‚烁ƒbƒZ[ƒWo—Í if GikoSys.FAbon.GoForward =false then begin - MsgBox(GikoForm.Handle, 'ˆê‚‘O‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', 'ƒGƒ‰[', MB_OK or MB_ICONEXCLAMATION); + MsgBox(GikoForm.Handle, 'ˆê‚‘O‚ÌNGƒ[ƒhƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½', + MSG_ERROR, MB_OK or MB_ICONEXCLAMATION); end else begin //ƒXƒe[ƒ^ƒX‚É•\Ž¦‚³‚ê‚éNGƒ[ƒhƒtƒ@ƒCƒ‹–¼‚ðXV RepaintStatusBar; @@ -1904,7 +1911,7 @@ var begin if GikoForm.EditorFormExists then begin Msg := 'ƒŒƒXƒGƒfƒBƒ^‚ð‘S‚ĕ‚¶‚Ä‚­‚¾‚³‚¢'; - MsgBox(GikoForm.Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); + MsgBox(GikoForm.Handle, Msg, MSG_ERROR, MB_OK or MB_ICONSTOP); Exit; end; Dlg := TNewBoardDialog.Create(GikoForm); @@ -2395,21 +2402,21 @@ end; // ************************************************************************* procedure TGikoDM.GikoNaviWebPageActionExecute(Sender: TObject); begin - GikoSys.OpenBrowser(URL_GIKONAVI, gbtAuto); + GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_GIKONAVI, gbtAuto); end; // ************************************************************************* //! ƒ‚ƒiƒWƒ‰‚̃EƒFƒuƒTƒCƒg‚ð•\Ž¦‚·‚é // ************************************************************************* procedure TGikoDM.MonazillaWebPageActionExecute(Sender: TObject); begin - GikoSys.OpenBrowser(URL_MONAZILLA, gbtAuto); + GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_MONAZILLA, gbtAuto); end; // ************************************************************************* //! ‚Q‚¿‚á‚ñ‚Ë‚éƒgƒbƒvƒy[ƒW‚ð•\Ž¦‚·‚é // ************************************************************************* procedure TGikoDM.BBS2chWebPageActionExecute(Sender: TObject); begin - GikoSys.OpenBrowser(URL_2ch, gbtAuto); + GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_2ch, gbtAuto); end; // ************************************************************************* //! ƒMƒRƒiƒr‚̃tƒHƒ‹ƒ_‚ðŠJ‚­ @@ -2446,7 +2453,7 @@ begin 'ƒwƒ‹ƒv‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½' + #13#10 + 'ƒwƒ‹ƒvƒtƒ@ƒCƒ‹‚ðƒMƒRƒiƒr‚̃tƒHƒ‹ƒ_‚É’u‚¢‚Ä‚­‚¾‚³‚¢' + #13#10 + 'ƒwƒ‹ƒv‚̓MƒRƒiƒr‚̃TƒCƒg‚É’u‚¢‚Ä‚ ‚è‚Ü‚·', - 'ƒGƒ‰[', + MSG_ERROR, MB_ICONSTOP); Exit; end; @@ -2457,7 +2464,7 @@ end; // ************************************************************************* procedure TGikoDM.WikiFAQWebPageActionExecute(Sender: TObject); begin - GikoSys.OpenBrowser(URL_Wiki, gbtAuto); + GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_Wiki, gbtAuto); end; ////////////////////////////////ƒwƒ‹ƒv‚Ü‚Å‚¨‚µ‚Ü‚¢///////////////////// // ************************************************************************* @@ -2941,7 +2948,7 @@ begin cnt := RoundList.Count[grtBoard]; cnt := cnt + RoundList.Count[grtItem]; if cnt > 500 then begin - MsgBox(GikoForm.Handle, '„‰ñ‚Í500ˆÈã“o˜^‚Å‚«‚Ü‚¹‚ñ', 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); + MsgBox(GikoForm.Handle, '„‰ñ‚Í500ˆÈã“o˜^‚Å‚«‚Ü‚¹‚ñ', MSG_ERROR, MB_OK or MB_ICONSTOP); Exit; end; -- 2.11.0