• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revision6ee721bc1a2ed05954cca97173397810e58bff67 (tree)
Time2007-09-02 19:50:38
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_57_0_729'.

Change Summary

Incremental Difference

--- a/AbonUnit.pas
+++ b/AbonUnit.pas
@@ -115,6 +115,7 @@ type
115115 //--
116116 function TreatSyria(AString: string): string;
117117 //--
118+ function AddToken(AString: string; Invisible: Boolean): Boolean;
118119 end;
119120 var
120121 Abon1 :TAbon;
@@ -383,14 +384,20 @@ begin
383384 buftoken := Copy(argline,1,pos-1);
384385 Delete(argline,1,pos);
385386 if Length(buftoken) > 0 then begin
386- bufstl.Append(buftoken);
387+ // >> で始まるトークンはコメント扱いで無視する
388+ if AnsiPos('>>', buftoken) <> 1 then begin
389+ bufstl.Append(buftoken);
390+ end;
387391 end else if ( bufstl.Count = 0 ) then begin
388392 bufstl.Append('');
389393 end;
390394 pos := AnsiPos(#9,argline);
391395 end;
392396 if Length(argline) > 0 then begin
393- bufstl.Append(argline);
397+ // >> で始まるトークンはコメント扱いで無視する
398+ if AnsiPos('>>', argline) <> 1 then begin
399+ bufstl.Append(argline);
400+ end;
394401 end;
395402 ret := bufstl.Count;
396403 SetLength(Ftokens[index],ret);
@@ -448,6 +455,9 @@ begin
448455 trgLen := Length(target);
449456
450457 for lines := 0 to High(Ftokens) do begin
458+ if Length(Ftokens[lines]) = 0 then begin
459+ Continue;
460+ end;
451461 hit := true;
452462 bufline := target;
453463 pts := PChar(bufline);
@@ -905,6 +915,32 @@ begin
905915 Result := Result + AString;
906916 end;
907917
918+// NGワードファイルに追加 追加された場合、Trueがかえる
919+function TAbon.AddToken(AString: string; Invisible: Boolean): Boolean;
920+var
921+ bufStringList : TStringList;
922+ ngword: String;
923+begin
924+ Result := False;
925+ if FileExists(GetNGwordpath) then begin
926+ bufStringList := TStringList.Create;
927+ try
928+ bufStringList.LoadFromFile(GetNGwordpath);
929+ if (Invisible) then begin
930+ ngword := #9 + AString;
931+ end else begin
932+ ngword := AString;
933+ end;
934+ if (bufStringList.IndexOf(ngword) = -1) then begin
935+ bufStringList.Add(ngword);
936+ bufStringList.SaveToFile(GetNGwordpath);
937+ Result := True;
938+ end;
939+ finally
940+ bufStringList.Free;
941+ end;
942+ end;
943+end;
908944
909945
910946 end.
--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -1777,9 +1777,6 @@ begin
17771777 end;
17781778
17791779 function TThreadItem.GetCreateDate: TDateTime;
1780-var
1781- unixtime: Int64;
1782- tmp: string;
17831780 begin
17841781 // ファイル名からスレ作成日時を求める
17851782 try
@@ -1787,18 +1784,7 @@ begin
17871784 Result := ZERO_DATE
17881785 else begin
17891786 // ログファイルの拡張子をはずしたものがスレ作成日時
1790- tmp := ChangeFileExt(FFileName, '');
1791- if AnsiPos('_', tmp) <> 0 then
1792- if AnsiPos('_', tmp) > 9 then
1793- tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1)
1794- else
1795- Delete(tmp, AnsiPos('_', tmp), 1);
1796-
1797- if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then
1798- Insert('1', tmp, 1);
1799-
1800- unixtime := StrToInt64Def(tmp, ZERO_DATE);
1801- Result := UnixToDateTime(unixtime) + OffsetFromUTC;
1787+ Result := GikoSys.GetCreateDateFromName(FFileName);
18021788 if GikoSys.Setting.FutureThread then begin
18031789 if CompareDateTime(Result, Now) = 1 then
18041790 Result := ZERO_DATE;
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8419,6 +8419,17 @@ object GikoForm: TGikoForm
84198419 object N71: TMenuItem
84208420 Action = GikoDM.IndividualAbonID0Action
84218421 end
8422+ object N82: TMenuItem
8423+ Caption = '-'
8424+ end
8425+ object IDNG1: TMenuItem
8426+ Action = GikoDM.AddIDtoNGWord1Action
8427+ Caption = 'NG'#12527#12540#12489#12395#36861#21152
8428+ end
8429+ object IDNG2: TMenuItem
8430+ Action = GikoDM.AddIDtoNGWord0Action
8431+ Caption = 'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')'
8432+ end
84228433 end
84238434 object N52: TMenuItem
84248435 Caption = #20491#21029#12354#12412#65374#12435#35299#38500
@@ -8781,4 +8792,11 @@ object GikoForm: TGikoForm
87818792 Left = 4
87828793 Top = 373
87838794 end
8795+ object ResPopupClearTimer: TTimer
8796+ Tag = 1
8797+ Enabled = False
8798+ OnTimer = ResPopupClearTimerTimer
8799+ Left = 8
8800+ Top = 440
8801+ end
87848802 end
--- a/Giko.pas
+++ b/Giko.pas
@@ -24,7 +24,8 @@ uses
2424 const
2525 NGWORDNAME_PANEL = 3;
2626 THREADSIZE_PANEL = 2;
27-
27+ USER_RESPOPUPCLEAR = WM_USER + 2005; ///< wParam : TWebBrowser
28+
2829 type
2930
3031 TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
@@ -419,6 +420,10 @@ type
419420 N80: TMenuItem;
420421 SameBoardThreadItem: TMenuItem;
421422 N81: TMenuItem;
423+ N82: TMenuItem;
424+ IDNG1: TMenuItem;
425+ IDNG2: TMenuItem;
426+ ResPopupClearTimer: TTimer;
422427 procedure FormCreate(Sender: TObject);
423428 procedure FormDestroy(Sender: TObject);
424429 procedure BrowserStatusTextChange(Sender: TObject;
@@ -555,6 +560,7 @@ type
555560 procedure GetResURLMenuClick(Sender: TObject);
556561 procedure MainCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
557562 var Handled: Boolean);
563+ procedure ResPopupClearTimerTimer(Sender: TObject);
558564 private
559565 { Private 宣言 }
560566 FEnabledCloseButton: Boolean;
@@ -686,6 +692,10 @@ type
686692 procedure SameBoardThreadSubItemOnClick(Sender: TObject);
687693 //! ポップアップブラウザ作成
688694 procedure CreateResPopupBrowser;
695+ //! D&Dを受け取る
696+ procedure WMDropFiles(var Msg: TWMDropFiles); Message WM_DropFiles;
697+ //! ファイルチェック
698+ function isValidFile(FileName: String) : boolean;
689699 protected
690700 procedure CreateParams(var Params: TCreateParams); override;
691701 procedure WndProc(var Message: TMessage); override;
@@ -756,6 +766,8 @@ type
756766 procedure IndividualAbonID(Atype : Integer);
757767 //このレスあぼ〜ん
758768 procedure IndividualAbon(Atag, Atype : Integer);
769+ //同一IDをNGワードに登録
770+ procedure AddIDtoNGWord(invisible : boolean);
759771 //ブラウザの再描画 true:全てのタブ false:アクティブなタブのみ
760772 procedure RepaintAllTabsBrowser();
761773 //リンクバー設定
@@ -1312,6 +1324,12 @@ begin
13121324
13131325 //置換設定ファイルの読み込み
13141326 ReplaceDM.LoadFromFile(GikoSys.GetReplaceFileName);
1327+
1328+ //レスポップアップ消去タイマー
1329+ ResPopupClearTimer.Interval := GikoSys.Setting.RespopupWait;
1330+
1331+ // D&Dを受け取る
1332+ DragAcceptFiles(Self.Handle, True);
13151333 end;
13161334
13171335 // CoolBar の設定を変数に保存
@@ -1467,6 +1485,13 @@ begin
14671485 GikoDM.TabsOpenAction.Execute;
14681486 GikoDM.TabsOpenAction.Tag := 0;
14691487 if (GikoSys.Setting.LastCloseTabURL <> '') then begin
1488+ PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
1489+ if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
1490+ while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and
1491+ (FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
1492+ Application.ProcessMessages;
1493+ end;
1494+ end;
14701495 item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL );
14711496 if (item <> nil) and (item.IsLogFile) then begin
14721497 OpenThreadItem(item, item.URL);
@@ -1936,10 +1961,20 @@ begin
19361961 if FResPopupBrowser <> nil then begin
19371962 if not(Sender is TResPopupBrowser) then begin
19381963 if (FResPopupBrowser.Visible) then begin
1939- FResPopupBrowser.Clear;
1964+ if ResPopupClearTimer.Interval > 0 then begin
1965+ ResPopupClearTimer.Enabled := True;
1966+ ResPopupClearTimer.Tag := 0;
1967+ end else begin
1968+ FResPopupBrowser.Clear;
1969+ end;
19401970 end;
19411971 end else begin
1942- TResPopupBrowser(Sender).ChildClear;
1972+ if ResPopupClearTimer.Interval > 0 then begin
1973+ ResPopupClearTimer.Enabled := True;
1974+ ResPopupClearTimer.Tag := 1;
1975+ end else begin
1976+ TResPopupBrowser(Sender).ChildClear;
1977+ end;
19431978 end;
19441979 end;
19451980 cResPopup := nil;
@@ -1977,6 +2012,15 @@ begin
19772012 e := IHTMLDocument2(TWebBrowser(Sender).Document).elementFromPoint(p.x, p.y);
19782013 if (Assigned(e)) then begin
19792014 CreateResPopupBrowser;
2015+
2016+ if not(Sender is TResPopupBrowser) then begin
2017+ if (FResPopupBrowser.Visible) then begin
2018+ FResPopupBrowser.Clear;
2019+ end;
2020+ end else begin
2021+ TResPopupBrowser(Sender).ChildClear;
2022+ end;
2023+
19802024 cResPopup := FResPopupBrowser.CreateNewBrowser;
19812025 tmp2 := ZenToHan(e.Get_outerText);
19822026 if (GikoSys.IsNumeric(tmp2)) then begin
@@ -1991,6 +2035,16 @@ begin
19912035 end;
19922036 end;
19932037 end else begin
2038+ CreateResPopupBrowser;
2039+
2040+ if not(Sender is TResPopupBrowser) then begin
2041+ if (FResPopupBrowser.Visible) then begin
2042+ FResPopupBrowser.Clear;
2043+ end;
2044+ end else begin
2045+ TResPopupBrowser(Sender).ChildClear;
2046+ end;
2047+
19942048 threadItem := GetActiveContent(true);
19952049 URL := THTMLCreate.GetRespopupURL(Text2, threadItem.URL);
19962050 PathRec := Gikosys.Parse2chURL2(URL);
@@ -2043,7 +2097,6 @@ begin
20432097 wkIntSt := 1;
20442098 wkIntTo := 1;
20452099 end;
2046- CreateResPopupBrowser;
20472100 cResPopup := FResPopupBrowser.CreateNewBrowser;
20482101 cResPopup.PopupType := gptThread;
20492102 HTMLCreater.SetResPopupText(cResPopup, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
@@ -2051,6 +2104,8 @@ begin
20512104 end;
20522105 end;
20532106 if (cResPopup <> nil) then begin
2107+ ResPopupClearTimer.Enabled := False;
2108+
20542109 if cResPopup.PopupType = gptRaw then begin
20552110 if cResPopup.Title <> '' then begin
20562111 cResPopup.TitlePopup;
@@ -2740,7 +2795,8 @@ var
27402795 begin
27412796 Thread := inThread;
27422797 idx := BrowserTab.TabIndex;
2743- if (FActiveContent <> nil) and
2798+ if (not FStartUp) and
2799+ (FActiveContent <> nil) and
27442800 (FActiveContent.Thread <> Thread.Thread) and
27452801 (FActiveContent.Browser <> nil) and
27462802 (Assigned(FActiveContent.Browser.Document)) then begin
@@ -2777,6 +2833,12 @@ begin
27772833 ThreadTitle := Thread.Thread.Title;
27782834 ThreadPTitle := Thread.Thread.ParentBoard.Title;
27792835 //ThreadScrollTop := Thread.Thread.ScrollTop;
2836+ if Thread.Thread.IsLogFile then begin
2837+ if not FileExists(Thread.Thread.GetThreadFileName) then begin
2838+ Thread.Thread.DeleteLogFile;
2839+ end;
2840+ end;
2841+
27802842 ThreadIsLog := Thread.Thread.IsLogFile;
27812843 ThreadItem := Thread.Thread;
27822844 ThreadNewArraical := Thread.Thread.NewArrival;
@@ -4733,6 +4795,13 @@ begin
47334795 senderBrowser := TWebBrowser( Message.WParam );
47344796 BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
47354797 end;
4798+ USER_RESPOPUPCLEAR:
4799+ if (TObject(Message.WParam) is TResPopupBrowser) then begin
4800+ try
4801+ TResPopupBrowser( Message.WParam ).Clear;
4802+ except
4803+ end;
4804+ end;
47364805 end;
47374806
47384807 inherited;
@@ -6611,7 +6680,7 @@ begin
66116680
66126681 end;
66136682 // *************************************************************************
6614-//! お気に入りツリーのマウスアップイベント
6683+//! スレッドブラウザクリックイベント
66156684 // *************************************************************************
66166685 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
66176686 const
@@ -6662,7 +6731,9 @@ begin
66626731 end;
66636732 count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
66646733 limited := LIMIT;
6665- if count > LIMIT then begin
6734+ if not (GikoSys.Setting.LimitResCountMessage) then begin
6735+ limited := -1;
6736+ end else if (count > LIMIT) then begin
66666737 if (GikoUtil.MsgBox(Handle,
66676738 IntToStr(LIMIT) + '個以上ありますが、すべて表示しますか?',
66686739 'IDポップアップ警告',
@@ -6955,10 +7026,11 @@ end;
69557026
69567027 procedure TGikoForm.BrowserPanelResize(Sender: TObject);
69577028 begin
6958- if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
6959- MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
6960- end;
6961-
7029+ if (FIsMinimize <> mtMinimizing) then begin
7030+ if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
7031+ MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
7032+ end;
7033+ end;
69627034 end;
69637035 procedure TGikoForm.CoolBarResized(Sender: TObject; CoolBar: TCoolBar);
69647036 var
@@ -7091,6 +7163,63 @@ begin
70917163 if ThreadItem <> nil then
70927164 InsertBrowserTab( ThreadItem, True );
70937165 end;
7166+//同一IDをNGワードに登録
7167+procedure TGikoForm.AddIDtoNGWord(invisible : boolean);
7168+var
7169+ ThreadItem : TThreadItem;
7170+ No : Integer;
7171+{$IFDEF SPAM_FILTER_ENABLED}
7172+ body : TStringList;
7173+ ReadList : TStringList;
7174+ wordCount : TWordCount;
7175+{$ENDIF}
7176+ id, dateStr: String;
7177+begin
7178+ No := KokoPopupMenu.Tag;
7179+ if No = 0 then Exit;
7180+ ThreadItem := GetActiveContent(True);
7181+ if ThreadItem = nil then Exit;
7182+
7183+ id := GikoSys.GetResID(No, ThreadItem);
7184+ if (id <> '') and (not IsNoValidID(id)) then begin
7185+ // コメントとして、スレッド名と今日の日付を追加
7186+ DateTimeToString(dateStr, 'yyyymmdd', Now);
7187+ id := id + #9'>>add ' + dateStr + ',' + ThreadItem.Title;
7188+ if (GikoSys.FAbon.AddToken(id, invisible)) then begin
7189+ GikoSys.FAbon.ReLoadFromNGwordFile;
7190+ FActiveContent.Repaint := True;
7191+ end;
7192+ end else begin
7193+ ShowMessage('IDを取得できませんでした。');
7194+ end;
7195+{$IFDEF SPAM_FILTER_ENABLED}
7196+ body := TStringList.Create;
7197+ try
7198+ GikoSys.GetSameIDRes(id, ThreadItem, body);
7199+ ReadList := TStringList.Create;
7200+ wordCount := TWordCount.Create;
7201+ try
7202+ // スパムに設定
7203+ ReadList.LoadFromFile( ThreadItem.GetThreadFileName );
7204+ for i := 0 to body.Count - 1 do begin
7205+ GikoSys.SpamCountWord( ReadList[ i ], wordCount );
7206+ GikoSys.SpamForget( wordCount, False ); // ハムを解除
7207+ GikoSys.SpamLearn( wordCount, True ); // スパムに設定
7208+ end;
7209+ finally
7210+ wordCount.Free;
7211+ ReadList.Free;
7212+ end;
7213+ finally
7214+ body.Free;
7215+ end;
7216+{$ENDIF}
7217+ if (FActiveContent.Repaint) then begin
7218+ ThreadItem.ScrollTop := OleVariant(IHTMLDocument2(FActiveContent.Browser.Document)).Body.ScrollTop;
7219+ if ThreadItem <> nil then
7220+ InsertBrowserTab( ThreadItem, True );
7221+ end;
7222+end;
70947223
70957224 //同一IDのあぼ〜ん
70967225 procedure TGikoForm.IndividualAbonID(Atype : Integer);
@@ -7582,6 +7711,103 @@ begin
75827711 FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
75837712 end;
75847713 end;
7714+//! 外からのD&D処理
7715+procedure TGikoForm.WMDropFiles(var Msg: TWMDropFiles);
7716+var
7717+ FileName: Array[0..MAX_PATH] of Char;
7718+ Cnt, K: Integer;
7719+ Board: TBoard;
7720+ LogFolder: String;
7721+ datList: TStringList;
7722+begin
7723+ // 表示しているの板のとき以外は拒否
7724+ if GetActiveList is TBoard then begin
7725+ Board := TBoard(GetActiveList);
7726+ if MsgBox(Handle, Board.Title
7727+ + ' 板に入れていいですか?', 'ギコナビ', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
7728+ // 板の時は、ログフォルダにコピーしてはぐれログ対応と同じ処理?
7729+ datList := TStringList.Create;
7730+ try
7731+ Cnt := DragQueryFile(Msg.Drop, $FFFFFFFF, FileName, SizeOf(FileName));
7732+ for K := 0 to Cnt - 1 do begin
7733+ DragQueryFile(Msg.Drop, K, FileName, SizeOf(FileName));
7734+ {FileNameにdropされたファイル名が入っているので、ここで何らかの処理をする。たとえば次の行}
7735+ // ファイルのチェック
7736+ if (isValidFile(FileName)) then begin
7737+ LogFolder := ExtractFilePath(Board.FilePath);
7738+ if (FileExists( LogFolder + ExtractFileName(FileName))) then begin
7739+ GikoUtil.MsgBox(Handle, LogFolder + 'に' + ExtractFileName(FileName) + 'が既に存在します。', 'エラー', MB_ICONSTOP or MB_OK);
7740+ end else begin
7741+ if (not DirectoryExists(LogFolder)) then begin
7742+ if (not GikoSys.ForceDirectoriesEx(LogFolder) ) then begin
7743+ GikoUtil.MsgBox(Handle, LogFolder + 'の生成に失敗しました。', 'エラー', MB_ICONSTOP or MB_OK);
7744+ end;
7745+ end;
7746+ if (not Windows.CopyFile(FileName, PChar(LogFolder + ExtractFileName(FileName)), true)) then begin
7747+ GikoUtil.MsgBox(Handle, FileName + 'のコピーに失敗しました。', 'エラー', MB_ICONSTOP or MB_OK);
7748+ end else begin
7749+ datList.Add(ExtractFileName(FileName));
7750+ end;
7751+ end;
7752+ end;
7753+ end;
7754+ DragFinish(Msg.Drop);
7755+ if (datList.Count > 0) then begin
7756+ GikoSys.AddOutofIndexDat(Board, datList, False);
7757+ ShowMessage(IntToStr(datList.Count) + '個のdatファイルがコピーされました。' );
7758+ if GikoForm.TreeView.Visible then
7759+ GikoForm.TreeView.Refresh;
7760+ if GikoForm.ListView.Visible then
7761+ GikoForm.ListView.Refresh;
7762+ end else begin
7763+ ShowMessage('一つもコピーされませんでした。' );
7764+ end;
7765+ finally
7766+ datList.Free;
7767+ end;
7768+
7769+ end;
7770+ end else begin
7771+ ShowMessage('板を表示してください。');
7772+ end;
7773+end;
7774+//! ファイルチェック
7775+function TGikoForm.isValidFile(FileName: String) : boolean;
7776+var
7777+ dt: TDateTime;
7778+begin
7779+ Result := True;
7780+ // 存在するか、拡張子dat、ファイル名
7781+ if ( not FileExists(FileName) ) then begin
7782+ Result := False;
7783+ GikoUtil.MsgBox(Handle, FileName + 'は存在しません。', 'エラー', MB_ICONSTOP or MB_OK);
7784+ end else if (ExtractFileExt(ExtractFileName(FileName)) <> '.dat' ) then begin
7785+ Result := False;
7786+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'の拡張子が".dat"でありません。', 'エラー', MB_ICONSTOP or MB_OK);
7787+ end else begin
7788+ // ログファイルの拡張子をはずしたものがスレ作成日時
7789+ try
7790+ dt := GikoSys.GetCreateDateFromName(FileName);
7791+ if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin
7792+ Result := False;
7793+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'のファイル名が不正です。', 'エラー', MB_ICONSTOP or MB_OK);
7794+ end;
7795+ except
7796+ Result := False;
7797+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'のファイル名が不正です。', 'エラー', MB_ICONSTOP or MB_OK);
7798+ end;
7799+ end;
7800+end;
7801+
7802+procedure TGikoForm.ResPopupClearTimerTimer(Sender: TObject);
7803+begin
7804+ ResPopupClearTimer.Enabled := False;
7805+ if ResPopupClearTimer.Tag = 0 then begin
7806+ FResPopupBrowser.Clear;
7807+ end else begin
7808+ FResPopupBrowser.CurrentBrowser.ChildClear;
7809+ end;
7810+end;
75857811
75867812 initialization
75877813 OleInitialize(nil);
--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1344,6 +1344,18 @@ object GikoDM: TGikoDM
13441344 OnExecute = NewLinkToClipboardActionExecute
13451345 OnUpdate = DependActiveCntentActionUpdate
13461346 end
1347+ object AddIDtoNGWord0Action: TAction
1348+ Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
1349+ Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')'
1350+ Hint = #12524#12473#12398'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427#65288#36879#26126#65289
1351+ OnExecute = AddIDtoNGWord0ActionExecute
1352+ end
1353+ object AddIDtoNGWord1Action: TAction
1354+ Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
1355+ Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152
1356+ Hint = 'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427
1357+ OnExecute = AddIDtoNGWord1ActionExecute
1358+ end
13471359 end
13481360 object ToobarImageList: TImageList
13491361 Left = 44
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -237,6 +237,8 @@ type
237237 ScrollPageUpAction: TAction;
238238 AllLinkToClipboardAction: TAction;
239239 NewLinkToClipboardAction: TAction;
240+ AddIDtoNGWord0Action: TAction;
241+ AddIDtoNGWord1Action: TAction;
240242 procedure EditNGActionExecute(Sender: TObject);
241243 procedure ReloadActionExecute(Sender: TObject);
242244 procedure GoFowardActionExecute(Sender: TObject);
@@ -444,6 +446,8 @@ type
444446 procedure ScrollPageUpActionExecute(Sender: TObject);
445447 procedure AllLinkToClipboardActionExecute(Sender: TObject);
446448 procedure NewLinkToClipboardActionExecute(Sender: TObject);
449+ procedure AddIDtoNGWord0ActionExecute(Sender: TObject);
450+ procedure AddIDtoNGWord1ActionExecute(Sender: TObject);
447451 private
448452 { Private 宣言 }
449453 procedure ClearResFilter;
@@ -2261,9 +2265,11 @@ begin
22612265 if item <> nil then
22622266 GikoForm.InsertBrowserTab( item, false );
22632267 end;
2264- //最初の1枚に設定 アドレスの設定のためのカラ呼び
2265- if GikoForm.BrowserTab.Tabs.Count > 0 then begin
2266- GikoForm.BrowserTab.OnChange(nil);
2268+ //最初の1枚に設定
2269+ if (GikoSys.Setting.URLDisplay) and
2270+ (GikoForm.BrowserTab.Tabs.Count > 0) then begin
2271+ GikoForm.AddressComboBox.Text :=
2272+ TBrowserRecord(GikoForm.BrowserTab.Tabs.Objects[0]).Thread.URL;
22672273 end;
22682274 end;
22692275 finally
@@ -2408,7 +2414,9 @@ begin
24082414 if ThreadItem = nil then Exit;
24092415 count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
24102416 limited := LIMIT;
2411- if count > LIMIT then begin
2417+ if not (GikoSys.Setting.LimitResCountMessage) then begin
2418+ limited := -1;
2419+ end else if count > LIMIT then begin
24122420 if ( GikoUtil.MsgBox(GikoForm.Handle,
24132421 IntToStr(LIMIT) + '個以上ありますが、すべて表示しますか?',
24142422 'IDポップアップ警告',
@@ -4434,6 +4442,16 @@ begin
44344442 end;
44354443
44364444
4445+//! このレスのIDをNGワードに追加する(透明)
4446+procedure TGikoDM.AddIDtoNGWord0ActionExecute(Sender: TObject);
4447+begin
4448+ GikoForm.AddIDtoNGWord(true);
4449+end;
4450+//! このレスのIDをNGワードに追加する
4451+procedure TGikoDM.AddIDtoNGWord1ActionExecute(Sender: TObject);
4452+begin
4453+ GikoForm.AddIDtoNGWord(false);
4454+end;
44374455
44384456 end.
44394457
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -116,8 +116,6 @@ type
116116 function ChooseString(const Text, Separator: string; Index: integer): string;
117117 //! 一時ファイルからの復旧
118118 procedure RestoreThreadData(Board: TBoard);
119- //! インデックスにないdat(はぐれdat)の追加
120- procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList);
121119 public
122120 { Public 宣言 }
123121 FAbon : TAbon;
@@ -129,13 +127,10 @@ type
129127 property ResRange : Longint read FResRange write FResRange;
130128 //! バージョン情報
131129 property Version : String read FVersion;
132-// function MsgBox(Msg: string; Title: string; Flags: Longint): integer; overload;
133-// function MsgBox(Handle: THandle; Msg: string; Title: string; Flags: Longint): integer; overload;
134130 function IsNumeric(s: string): boolean;
135131 function IsFloat(s: string): boolean;
136132 function DirectoryExistsEx(const Name: string): Boolean;
137133 function ForceDirectoriesEx(Dir: string): Boolean;
138-// function GetVersion: string;
139134
140135 function GetBoardFileName: string;
141136 function GetCustomBoardFileName: string;
@@ -224,7 +219,7 @@ type
224219 procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload;
225220 function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload;
226221 function GetSameIDResCount(AIDNum : Integer; ThreadItem: TThreadItem):Integer; overload;
227-
222+ function GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
228223 //! 単語解析
229224 procedure SpamCountWord( const text : string; wordCount : TWordCount );
230225 //! 学習クリア
@@ -257,6 +252,10 @@ type
257252 function GetOEIndentChar : string;
258253 //! 置換設定ファイル取得
259254 function GetReplaceFileName: String;
255+ //! インデックスにないdat(はぐれdat)の追加
256+ procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: boolean = True);
257+ //! ファイル名からのスレッド作成日の取得
258+ function GetCreateDateFromName(FileName: String): TDateTime;
260259 end;
261260
262261 var
@@ -266,7 +265,7 @@ const
266265 ZERO_DATE: Integer = 25569;
267266 BETA_VERSION_NAME_E = 'beta';
268267 BETA_VERSION_NAME_J = 'バタ';
269- BETA_VERSION = 56;
268+ BETA_VERSION = 57;
270269 BETA_VERSION_BUILD = ''; //!< debug版など
271270 APP_NAME = 'gikoNavi';
272271 BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -572,11 +571,18 @@ var
572571 usePlugIn : Boolean;
573572 islog : Boolean;
574573 urlHead: String;
574+ datFileCheck: Boolean;
575575 {*
576576 FavoThreadItem : TFavoriteThreadItem;
577577 Node: TTreeNode;
578578 *}
579+{$IFDEF DEBUG}
580+ st, rt: Cardinal;
581+{$ENDIF}
579582 begin
583+{$IFDEF DEBUG}
584+ st := GetTickCount;
585+{$ENDIF}
580586 if Board.IsThreadDatRead then
581587 Exit;
582588 Board.Clear;
@@ -592,12 +598,16 @@ begin
592598
593599 FileName := Board.GetFolderIndexFileName;
594600
595- FileList := TStringList.Create;
596- FileList.Sorted := True;
597- FileList.BeginUpdate;
598- //IsLogFile用DATファイルリスト
599- GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
600- FileList.EndUpdate;
601+ //
602+ datFileCheck := (Setting.CheckDatFile) or (not FileExists(FileName));
603+ if (datFileCheck) then begin
604+ FileList := TStringList.Create;
605+ FileList.Sorted := True;
606+ FileList.BeginUpdate;
607+ //IsLogFile用DATファイルリスト
608+ GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
609+ FileList.EndUpdate;
610+ end;
601611
602612 // 重複を防ぐ
603613 Board.BeginUpdate;
@@ -609,7 +619,11 @@ begin
609619 //2行目から(1行目はバージョン)
610620 for i := sl.Count - 1 downto 1 do begin
611621 Rec := ParseIndexLine(sl[i]);
612- islog := FileList.Find( Rec.FFileName, Index );
622+ if (datFileCheck) then begin
623+ islog := FileList.Find( Rec.FFileName, Index );
624+ end else begin
625+ islog := (Rec.FSize <> 0) and (Rec.FCount <> 0);
626+ end;
613627 if usePlugIn then
614628 ThreadItem := TThreadItem.Create(
615629 Board.BoardPlugIn,
@@ -636,7 +650,7 @@ begin
636650 end;
637651
638652 ThreadItem.BeginUpdate;
639- if islog then
653+ if (datFileCheck) and (islog) then
640654 FileList.Delete( Index );
641655
642656 ThreadItem.No := Rec.FNo;
@@ -671,50 +685,75 @@ begin
671685 if UnRead <> Board.UnRead then
672686 Board.UnRead := UnRead;
673687
674- //インデックスに無かったログを追加(腐れインデックス対応)
675- AddOutofIndexDat(Board, FileList);
688+ if (datFileCheck) then begin
689+ //インデックスに無かったログを追加(腐れインデックス対応)
690+ AddOutofIndexDat(Board, FileList);
691+ end;
676692 Board.EndUpdate;
677693
678694 //前回異常終了時チェック
679695 RestoreThreadData( Board );
680696 finally
681697 sl.Free;
682- FileList.Free;
698+ if (datFileCheck) then begin
699+ FileList.Free;
700+ end;
683701 Board.Sorted := False;
684702 end;
685703 Board.IsThreadDatRead := True;
704+{$IFDEF DEBUG}
705+ rt := GetTickCount - st;
706+ Writeln('Read Done.' + IntToStr(rt) + ' ms');
707+{$ENDIF}
686708 end;
687709 {!
688710 \brief インデックスにないdat(はぐれdat)の追加
689711 \param Board 追加する板
690712 \param DatList datファイル名
691713 }
692-procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList);
714+procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: Boolean = True);
693715 var
694716 i : Integer;
695717 Boardpath,FileName : String;
696718 ResRec: TResRec;
697719 ThreadItem: TThreadItem;
720+ create: Boolean;
698721 begin
722+ create := False;
699723 Boardpath := ExtractFilePath(Board.GetFolderIndexFileName);
700724 //インデックスに無かったログを追加(腐れインデックス対応)
701725 for i := 0 to DatList.Count - 1 do begin
702726 FileName := Boardpath + DatList[i];
703-
704- //ResRec := DivideStrLine(ReadThreadFile(FileName, 1));
705- if Board.IsBoardPlugInAvailable then begin
706- ThreadItem := TThreadItem.Create(
707- Board.BoardPlugIn,
708- Board,
709- Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) );
710- THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
711- end else begin
712- ThreadItem := TThreadItem.Create(
713- nil,
714- Board,
715- Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) );
716- THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
727+ ThreadItem := nil;
728+ if (not AllCreate) then begin
729+ create := False;
730+ ThreadItem := Board.FindThreadFromFileName(DatList[i]);
731+ if (ThreadItem = nil) then begin
732+ create := True;
733+ end else begin
734+ if Board.IsBoardPlugInAvailable then begin
735+ THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
736+ end else begin
737+ THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
738+ end;
739+ end;
717740 end;
741+ if (ThreadItem = nil) then begin
742+ if Board.IsBoardPlugInAvailable then begin
743+ ThreadItem := TThreadItem.Create(
744+ Board.BoardPlugIn,
745+ Board,
746+ Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) );
747+ THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
748+ end else begin
749+ ThreadItem := TThreadItem.Create(
750+ nil,
751+ Board,
752+ Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) );
753+ THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
754+ end;
755+ end;
756+
718757
719758 ThreadItem.BeginUpdate;
720759 ThreadItem.FileName := DatList[i];
@@ -736,7 +775,9 @@ begin
736775 ThreadItem.ScrollTop := 0;
737776 ThreadItem.AgeSage := gasNone;
738777 ThreadItem.EndUpdate;
739- Board.Add(ThreadItem);
778+ if (AllCreate) or (create) then begin
779+ Board.Add(ThreadItem);
780+ end;
740781 end;
741782 end;
742783 {!
@@ -2849,12 +2890,27 @@ end;
28492890 }
28502891 procedure TGikoSys.GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList);
28512892 var
2893+ AID : String;
2894+begin
2895+ AID := GetResID(AIDNum, ThreadItem);
2896+ if not IsNoValidID(AID) then begin
2897+ GetSameIDRes(AID, ThreadItem, body);
2898+ end;
2899+end;
2900+{!
2901+\brief 投稿 ID 取得
2902+\param AIDNum 投稿 レス番号
2903+\param ThreadItem 投稿スレッド
2904+\param body OUT:投稿ID
2905+}
2906+function TGikoSys.GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
2907+var
28522908 Res: TResRec;
28532909 boardPlugIn : TBoardPlugIn;
2854- AID : String;
28552910 stList: TStringList;
28562911 i : Integer;
28572912 begin
2913+ Result := '';
28582914 if (ThreadItem <> nil) and (ThreadItem.IsLogFile)
28592915 and (AIDNum > 0) and (AIDNum <= ThreadItem.Count) then begin
28602916 //if ThreadItem.IsBoardPlugInAvailable then begin
@@ -2866,21 +2922,21 @@ begin
28662922 end else begin
28672923 THTMLCreate.DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum), @Res);
28682924 end;
2869- AID := Res.FDateTime;
2870- if AnsiPos('id', AnsiLowerCase(AID)) > 0 then begin
2871- AID := Copy(AID, AnsiPos('id', AnsiLowerCase(AID)) - 1, 11);
2872- if AnsiPos(' be:', AnsiLowerCase(AID)) > 0 then begin
2873- AID := Copy(AID, 1, AnsiPos(' BE:', AnsiLowerCase(AID)) - 1)
2925+ Result := Res.FDateTime;
2926+ if AnsiPos('id', AnsiLowerCase(Result)) > 0 then begin
2927+ Result := Copy(Result, AnsiPos('id', AnsiLowerCase(Result)) - 1, 11);
2928+ if AnsiPos(' be:', AnsiLowerCase(Result)) > 0 then begin
2929+ Result := Copy(Result, 1, AnsiPos(' BE:', AnsiLowerCase(Result)) - 1)
28742930 end;
28752931 end else begin
28762932 stlist := TStringList.Create;
28772933 try
2878- stList.DelimitedText := AID;
2879- AID := '';
2934+ stList.DelimitedText := Result;
2935+ Result := '';
28802936 for i := 0 to stList.Count - 1 do
28812937 if Length(WideString(stList[i])) = 8 then begin
28822938 if NotDateorTimeString(stList[i]) then begin
2883- AID := stList[i];
2939+ Result := stList[i];
28842940 break;
28852941 end;
28862942 end;
@@ -2888,11 +2944,8 @@ begin
28882944 stList.Free;
28892945 end;
28902946 end;
2891- if not IsNoValidID(AID) then
2892- GetSameIDRes(AID, ThreadItem, body);
28932947 end;
28942948 end;
2895-
28962949 {!
28972950 \brief 同じ投稿 ID を持つレスをカウント
28982951 \param AID 個人を特定する投稿 ID
@@ -3309,7 +3362,8 @@ begin
33093362 ThreadItem.NewReceive := ini.ReadInteger(SECTION, 'NewReceive', 0);
33103363
33113364 ThreadItem.Size := ini.ReadInteger(SECTION, 'Size', 0);
3312- if(ThreadItem.Size = 0) and (FileExists(ThreadItem.GetThreadFileName)) then begin
3365+ ThreadItem.IsLogFile := FileExists(ThreadItem.GetThreadFileName);
3366+ if(ThreadItem.Size = 0) and (ThreadItem.IsLogFile) then begin
33133367 try
33143368 ThreadItem.Size := GetFileSize(ThreadItem.GetThreadFileName) - ThreadItem.Count;
33153369 except
@@ -3399,6 +3453,26 @@ function TGikoSys.GetReplaceFileName: String;
33993453 begin
34003454 Result := Setting.GetReplaceFileName;
34013455 end;
3456+//! ファイル名からのスレッド作成日の取得
3457+function TGikoSys.GetCreateDateFromName(FileName: String): TDateTime;
3458+var
3459+ tmp : String;
3460+ unixtime: Int64;
3461+begin
3462+ // ログファイルの拡張子をはずしたものがスレ作成日時
3463+ tmp := ChangeFileExt(FileName, '');
3464+ if AnsiPos('_', tmp) <> 0 then
3465+ if AnsiPos('_', tmp) > 9 then
3466+ tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1)
3467+ else
3468+ Delete(tmp, AnsiPos('_', tmp), 1);
3469+
3470+ if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then
3471+ Insert('1', tmp, 1);
3472+
3473+ unixtime := StrToInt64Def(tmp, ZERO_DATE);
3474+ Result := UnixToDateTime(unixtime) + OffsetFromUTC;
3475+end;
34023476
34033477 initialization
34043478 GikoSys := TGikoSys.Create;
--- a/HTMLDocumentEvent.pas
+++ b/HTMLDocumentEvent.pas
@@ -18,6 +18,7 @@ type
1818 FOnClick: TDocumentContextMenuEvent;
1919 FOnMouseMove: TDocumentContextMenuEvent;
2020 FOnMouseDown: TDocumentContextMenuEvent;
21+ FOnDoubleClick: TDocumentContextMenuEvent;
2122 protected
2223 { IUnknown }
2324 function QueryInterface(const IID:TGUID; out Obj): HRESULT; stdcall;
@@ -37,6 +38,7 @@ type
3738 property OnClick: TDocumentContextMenuEvent read FOnClick write FOnClick;
3839 property OnMouseMove: TDocumentContextMenuEvent read FOnMouseMove write FOnMouseMove;
3940 property OnMouseDown: TDocumentContextMenuEvent read FOnMouseDown write FOnMouseDown;
41+ property OnDoubleClick: TDocumentContextMenuEvent read FOnDoubleClick write FOnDoubleClick;
4042 end;
4143
4244 implementation
@@ -100,6 +102,10 @@ begin
100102 if Assigned(FOnClick) then begin
101103 PVariant(VarResult)^ := FOnClick(FOwner);
102104 end;
105+ DISPID_DBLCLICK:
106+ if Assigned(FOnDoubleClick) then begin
107+ PVariant(VarResult)^ := FOnDoubleClick(FOwner);
108+ end;
103109 1023:
104110 if Assigned(FOnContextMenu) then begin
105111 PVariant(VarResult)^ := FOnContextMenu(FOwner);
--- a/InputAssist.pas
+++ b/InputAssist.pas
@@ -189,12 +189,19 @@ var
189189 begin
190190 if GikoListView1.Selected <> nil then begin
191191 if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
192- if (not InputAssistDM.IsDupulicate(
192+ resWord := TResistWord(GikoListView1.Selected.Data);
193+ // 変更前のキー/カテゴリと同一もしくは、他と重複無し
194+ if ((resWord.GetKey = KeyNameEdit.Text)
195+ and (resWord.GetCategory = CategoryNameComboBox.Text)) or
196+ (not InputAssistDM.IsDupulicate(
193197 KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
194- resWord := TResistWord(GikoListView1.Selected.Data);
195- resWord.SetKey(KeyNameEdit.Text);
196- resWord.SetCategory(CategoryNameComboBox.Text);
197- resWord.SetText(TextMemo.Text);
198+ resWord.SetCategory(CategoryNameComboBox.Text);
199+ resWord.SetText(TextMemo.Text);
200+ // キーが変わるときは、ChangeKeyを呼ぶ
201+ if (resWord.GetKey <> KeyNameEdit.Text) then begin
202+ resWord.SetKey(KeyNameEdit.Text);
203+ InputAssistDM.ChangeKey(resWord);
204+ end;
198205 // 一覧の更新
199206 GikoListView1.Selected.Caption := resWord.GetKey;
200207 GikoListView1.Selected.SubItems[0] := resWord.GetCategory;
--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -21,8 +21,8 @@ object KuroutOption: TKuroutOption
2121 Top = 0
2222 Width = 517
2323 Height = 393
24- ActivePage = KakikomiTabSheet
25- TabIndex = 2
24+ ActivePage = RespopupTabSheet
25+ TabIndex = 4
2626 TabOrder = 0
2727 object TabSheet1: TTabSheet
2828 Caption = #35443#32048#35373#23450#65297
@@ -562,6 +562,128 @@ object KuroutOption: TKuroutOption
562562 TabOrder = 1
563563 end
564564 end
565+ object LogGroupBox: TGroupBox
566+ Left = 16
567+ Top = 160
568+ Width = 465
569+ Height = 65
570+ Caption = #12525#12464
571+ TabOrder = 1
572+ object CheckDatFileCheckBox: TCheckBox
573+ Left = 22
574+ Top = 14
575+ Width = 369
576+ Height = 17
577+ Caption = #12473#12524#12483#12489#19968#35239#65288'Folder.idx'#65289#35501#12415#36796#12415#26178#12395'dat'#12501#12449#12452#12523#12434#12481#12455#12483#12463#12377#12427#12290
578+ TabOrder = 0
579+ end
580+ end
581+ end
582+ object RespopupTabSheet: TTabSheet
583+ Caption = #35443#32048#35373#23450'5'
584+ ImageIndex = 4
585+ object RespopuGroupBox: TGroupBox
586+ Left = 8
587+ Top = 16
588+ Width = 473
589+ Height = 105
590+ Caption = #12524#12473#12509#12483#12503#12450#12483#12503
591+ TabOrder = 0
592+ object Label16: TLabel
593+ Left = 16
594+ Top = 48
595+ Width = 292
596+ Height = 12
597+ Caption = '( '#12510#12454#12473#12459#12540#12477#12523#20301#32622#12363#12425#12398#12378#12425#12375#20301#32622' -25 px '#65374' 25'#12288'px)'
598+ end
599+ object Label19: TLabel
600+ Left = 192
601+ Top = 72
602+ Width = 96
603+ Height = 12
604+ Caption = '(0 ms '#65374' 5000 ms)'
605+ end
606+ object DeltaXLabeledEdit: TLabeledEdit
607+ Left = 120
608+ Top = 24
609+ Width = 49
610+ Height = 20
611+ EditLabel.Width = 97
612+ EditLabel.Height = 12
613+ EditLabel.Caption = #12509#12483#12503#12450#12483#12503#20301#32622' X'
614+ LabelPosition = lpLeft
615+ LabelSpacing = 10
616+ TabOrder = 0
617+ Text = '0'
618+ OnExit = DeltaXLabeledEditExit
619+ end
620+ object DeltaYLabeledEdit: TLabeledEdit
621+ Left = 304
622+ Top = 24
623+ Width = 49
624+ Height = 20
625+ EditLabel.Width = 97
626+ EditLabel.Height = 12
627+ EditLabel.Caption = #12509#12483#12503#12450#12483#12503#20301#32622' Y'
628+ LabelPosition = lpLeft
629+ LabelSpacing = 10
630+ TabOrder = 1
631+ Text = '0'
632+ OnExit = DeltaYLabeledEditExit
633+ end
634+ object DeltaXUpDown: TUpDown
635+ Left = 169
636+ Top = 24
637+ Width = 16
638+ Height = 20
639+ Associate = DeltaXLabeledEdit
640+ Min = -25
641+ Max = 25
642+ Position = 0
643+ TabOrder = 2
644+ Wrap = False
645+ end
646+ object DeltaYUpDown: TUpDown
647+ Left = 353
648+ Top = 24
649+ Width = 16
650+ Height = 20
651+ Associate = DeltaYLabeledEdit
652+ Min = -25
653+ Max = 25
654+ Position = 0
655+ TabOrder = 3
656+ Wrap = False
657+ end
658+ object RespopupWaitLabeledEdit: TLabeledEdit
659+ Left = 76
660+ Top = 66
661+ Width = 92
662+ Height = 20
663+ EditLabel.Width = 52
664+ EditLabel.Height = 12
665+ EditLabel.Caption = #12463#12522#12450'Wait'
666+ LabelPosition = lpLeft
667+ LabelSpacing = 10
668+ TabOrder = 4
669+ Text = '100'
670+ OnExit = RespopupWaitLabeledEditExit
671+ end
672+ object RespopupWaitUpDown: TUpDown
673+ Left = 168
674+ Top = 66
675+ Width = 17
676+ Height = 20
677+ Associate = RespopupWaitLabeledEdit
678+ Min = 0
679+ Max = 5000
680+ Increment = 100
681+ Position = 100
682+ TabOrder = 5
683+ Thousands = False
684+ Wrap = False
685+ end
686+ end
565687 end
566688 end
567689 object OkBotton: TButton
--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -81,6 +81,18 @@ type
8181 Label14: TLabel;
8282 ExtListLabeledEdit: TLabeledEdit;
8383 Label15: TLabel;
84+ LogGroupBox: TGroupBox;
85+ CheckDatFileCheckBox: TCheckBox;
86+ RespopupTabSheet: TTabSheet;
87+ RespopuGroupBox: TGroupBox;
88+ DeltaXLabeledEdit: TLabeledEdit;
89+ DeltaYLabeledEdit: TLabeledEdit;
90+ DeltaXUpDown: TUpDown;
91+ DeltaYUpDown: TUpDown;
92+ Label16: TLabel;
93+ RespopupWaitLabeledEdit: TLabeledEdit;
94+ RespopupWaitUpDown: TUpDown;
95+ Label19: TLabel;
8496 procedure OkBottonClick(Sender: TObject);
8597 procedure FormCreate(Sender: TObject);
8698 procedure CDeleteButtonClick(Sender: TObject);
@@ -94,6 +106,9 @@ type
94106 procedure MoveHistoryMaxEditExit(Sender: TObject);
95107 procedure AHandredLabeledEditExit(Sender: TObject);
96108 procedure ExtListLabeledEditExit(Sender: TObject);
109+ procedure DeltaXLabeledEditExit(Sender: TObject);
110+ procedure DeltaYLabeledEditExit(Sender: TObject);
111+ procedure RespopupWaitLabeledEditExit(Sender: TObject);
97112 private
98113 { Private 宣言 }
99114 procedure SetValue;
@@ -156,6 +171,12 @@ begin
156171 ReplaceDatCheckBox.Checked := GikoSys.Setting.ReplaceDat;
157172 SentIniFileSizeUpDown.Position := GikoSys.Setting.SentIniFileSize;
158173 ExtListLabeledEdit.Text := GikoSys.Setting.ExtList;
174+ // Folder.idx読み込み時datチェック
175+ CheckDatFileCheckBox.Checked := GikoSys.Setting.CheckDatFile;
176+ DeltaXUpDown.Position := GikoSys.Setting.RespopupDeltaX;
177+ DeltaYUpDown.Position := GikoSys.Setting.RespopupDeltaY;
178+ RespopupWaitUpDown.Position := GikoSys.Setting.RespopupWait;
179+
159180 end;
160181
161182 procedure TKuroutOption.SaveSetting;
@@ -198,6 +219,13 @@ begin
198219 GikoSys.Setting.ReplaceDat := ReplaceDatCheckBox.Checked;
199220 GikoSys.Setting.SentIniFileSize := SentIniFileSizeUpDown.Position;
200221 GikoSys.Setting.ExtList := ExtListLabeledEdit.Text;
222+ // Folder.idx読み込み時datチェック
223+ GikoSys.Setting.CheckDatFile := CheckDatFileCheckBox.Checked;
224+
225+ GikoSys.Setting.RespopupDeltaX := StrToInt(DeltaXLabeledEdit.Text);
226+ GikoSys.Setting.RespopupDeltaY := StrToInt(DeltaYLabeledEdit.Text);
227+ GikoSys.Setting.RespopupWait := StrToInt(RespopupWaitLabeledEdit.Text);
228+ GikoForm.ResPopupClearTimer.Interval := GikoSys.Setting.RespopupWait;
201229 end;
202230
203231 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);
@@ -229,6 +257,9 @@ begin
229257 MoveHistoryMaxEditExit(Sender);
230258 AHandredLabeledEditExit(Sender);
231259 ExtListLabeledEditExit(Sender);
260+ DeltaXLabeledEditExit(Sender);
261+ DeltaYLabeledEditExit(Sender);
262+ RespopupWaitLabeledEditExit(Sender);
232263 PostColumnData();
233264 SaveSetting;
234265 end;
@@ -448,8 +479,38 @@ begin
448479 if AnsiEndsStr(';', ExtListLabeledEdit.Text) then begin
449480 ExtListLabeledEdit.Text :=
450481 Copy(ExtListLabeledEdit.Text, 0,
451- Length(ExtListLabeledEdit.Text) - 1);
482+ Length(ExtListLabeledEdit.Text) - 1);
452483 end;
453484 end;
485+// レスポップアップ位置X
486+procedure TKuroutOption.DeltaXLabeledEditExit(Sender: TObject);
487+begin
488+ if not GikoSys.IsNumeric(DeltaXLabeledEdit.Text) then
489+ DeltaXLabeledEdit.Text := IntToStr(GikoSys.Setting.RespopupDeltaX);
490+ if StrToInt(DeltaXLabeledEdit.Text) < DeltaXUpDown.Min then
491+ DeltaXLabeledEdit.Text := IntToStr(DeltaXUpDown.Min);
492+ if StrToInt(DeltaXLabeledEdit.Text) > DeltaXUpDown.Max then
493+ DeltaXLabeledEdit.Text:= IntToStr(DeltaXUpDown.Max);
494+end;
495+// レスポップアップ位置Y
496+procedure TKuroutOption.DeltaYLabeledEditExit(Sender: TObject);
497+begin
498+ if not GikoSys.IsNumeric(DeltaYLabeledEdit.Text) then
499+ DeltaYLabeledEdit.Text := IntToStr(GikoSys.Setting.RespopupDeltaY);
500+ if StrToInt(DeltaYLabeledEdit.Text) < DeltaYUpDown.Min then
501+ DeltaYLabeledEdit.Text := IntToStr(DeltaYUpDown.Min);
502+ if StrToInt(DeltaYLabeledEdit.Text) > DeltaYUpDown.Max then
503+ DeltaYLabeledEdit.Text := IntToStr(DeltaYUpDown.Max);
504+end;
505+
506+procedure TKuroutOption.RespopupWaitLabeledEditExit(Sender: TObject);
507+begin
508+ if not GikoSys.IsNumeric(RespopupWaitLabeledEdit.Text) then
509+ RespopupWaitLabeledEdit.Text := IntToStr(GikoSys.Setting.RespopupWait);
510+ if StrToInt(RespopupWaitLabeledEdit.Text) < RespopupWaitUpDown.Min then
511+ RespopupWaitLabeledEdit.Text := IntToStr(RespopupWaitUpDown.Min);
512+ if StrToInt(RespopupWaitLabeledEdit.Text) > RespopupWaitUpDown.Max then
513+ RespopupWaitLabeledEdit.Text := IntToStr(RespopupWaitUpDown.Max);
514+end;
454515
455516 end.
--- a/Option.dfm
+++ b/Option.dfm
@@ -1,6 +1,6 @@
11 object OptionDialog: TOptionDialog
2- Left = 417
3- Top = 435
2+ Left = 300
3+ Top = 166
44 BorderStyle = bsDialog
55 Caption = #12458#12503#12471#12519#12531
66 ClientHeight = 428
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
6161 Top = 4
6262 Width = 509
6363 Height = 389
64- ActivePage = TabSheet1
64+ ActivePage = ThreadSheet
6565 MultiLine = True
66- TabIndex = 5
66+ TabIndex = 4
6767 TabOrder = 3
6868 OnChange = OptionTabChange
6969 object ConnectSheet: TTabSheet
@@ -870,7 +870,7 @@ object OptionDialog: TOptionDialog
870870 Left = 12
871871 Top = 92
872872 Width = 477
873- Height = 121
873+ Height = 157
874874 Caption = #12522#12531#12463#12463#12522#12483#12463#26178#21205#20316
875875 TabOrder = 1
876876 object AppFolderLabel: TLabel
@@ -915,13 +915,21 @@ object OptionDialog: TOptionDialog
915915 TabOrder = 3
916916 OnClick = URLAppCheckBoxClick
917917 end
918+ object ResAnchorCheckBox: TCheckBox
919+ Left = 12
920+ Top = 125
921+ Width = 333
922+ Height = 17
923+ Caption = #12524#12473#12450#12531#12459#12540#12398#22580#21512#12289#12381#12398#12524#12473#12414#12391#12472#12515#12531#12503#12377#12427
924+ TabOrder = 4
925+ end
918926 end
919927 object GroupBox6: TGroupBox
920928 Left = 12
921- Top = 220
929+ Top = 260
922930 Width = 477
923- Height = 49
924- Caption = #12525#12464#21066#38500
931+ Height = 77
932+ Caption = #30906#35469#12513#12483#12475#12540#12472
925933 TabOrder = 2
926934 object LogDeleteMessageCheckBox: TCheckBox
927935 Left = 12
@@ -932,21 +940,14 @@ object OptionDialog: TOptionDialog
932940 TabOrder = 0
933941 OnClick = URLAppCheckBoxClick
934942 end
935- end
936- object ResAnchorGroupBox: TGroupBox
937- Left = 12
938- Top = 279
939- Width = 477
940- Height = 49
941- Caption = #12524#12473#12450#12531#12459#12540#12463#12522#12483#12463#26178#21205#20316
942- TabOrder = 3
943- object ResAnchorCheckBox: TCheckBox
943+ object IgnoreLimitResCountCheckBox: TCheckBox
944944 Left = 12
945- Top = 21
946- Width = 165
945+ Top = 46
946+ Width = 389
947947 Height = 17
948- Caption = #12381#12398#12524#12473#12414#12391#12472#12515#12531#12503#12377#12427
949- TabOrder = 0
948+ Caption = #21516'ID'#12524#12473#12450#12531#12459#12540#34920#31034#12391#21046#38480#25968#36234#12360#12398#30906#35469#12513#12483#12475#12540#12472#12434#34920#31034#12377#12427'(&R)'
949+ TabOrder = 1
950+ OnClick = URLAppCheckBoxClick
950951 end
951952 end
952953 end
--- a/Option.pas
+++ b/Option.pas
@@ -116,8 +116,6 @@ type
116116 OpenMailerCheckBox: TCheckBox;
117117 GroupBox6: TGroupBox;
118118 LogDeleteMessageCheckBox: TCheckBox;
119- ResAnchorGroupBox: TGroupBox;
120- ResAnchorCheckBox: TCheckBox;
121119 TabSheet1: TTabSheet;
122120 TabAddRadioGroup: TRadioGroup;
123121 GroupBox8: TGroupBox;
@@ -219,6 +217,8 @@ type
219217 gppLeftBottomRB: TRadioButton;
220218 gppBottomRB: TRadioButton;
221219 gppRighBottomRB: TRadioButton;
220+ ResAnchorCheckBox: TCheckBox;
221+ IgnoreLimitResCountCheckBox: TCheckBox;
222222 procedure FormCreate(Sender: TObject);
223223 procedure FormDestroy(Sender: TObject);
224224 procedure ApplyButtonClick(Sender: TObject);
@@ -766,6 +766,8 @@ begin
766766
767767 //ログ削除時メッセージ
768768 LogDeleteMessageCheckBox.Checked := GikoSys.Setting.DeleteMsg;
769+ //同IDレスアンカー表示の制限数越えメッセージ
770+ IgnoreLimitResCountCheckBox.Checked := GikoSys.Setting.LimitResCountMessage;
769771
770772 //終了時確認ダイアログ
771773 ShowDialogForEndCheckBox.Checked := GikoSys.Setting.ShowDialogForEnd;
@@ -1031,6 +1033,8 @@ begin
10311033
10321034 GikoSys.Setting.OpenMailer := OpenMailerCheckBox.Checked;
10331035 GikoSys.Setting.DeleteMsg := LogDeleteMessageCheckBox.Checked;
1036+ GikoSys.Setting.LimitResCountMessage := IgnoreLimitResCountCheckBox.Checked;
1037+
10341038 //終了時確認ダイアログ
10351039 GikoSys.Setting.ShowDialogForEnd := ShowDialogForEndCheckBox.Checked;
10361040 //AllTabClose
--- a/Preview.pas
+++ b/Preview.pas
@@ -10,7 +10,6 @@ uses
1010 SHDocVw_TLB
1111 {$IFEND}
1212 ;
13-
1413 type
1514 TPreviewBrowser = class(TWebBrowser)
1615 private
@@ -29,6 +28,9 @@ uses MojuUtils, GikoSystem, Setting;
2928 const
3029 //プレビューファイル名
3130 HTML_FILE_NAME = 'temp_preview.html';
31+ // マウスカーソルからのずらし位置
32+ DIV_X = 15;
33+ DIV_Y = 15;
3234
3335 constructor TPreviewBrowser.Create(AOwner: TComponent);
3436 begin
@@ -148,26 +150,26 @@ begin
148150 end;
149151
150152 Result := Rect(0, 0, WindowWidth, WindowHeight);
151-
153+ // bata55以前は左右が間違ってた
152154 // 出し位置による補正
153155 case GikoSys.Setting.PopupPosition of
154- gppRightTop: OffsetRect(Result,
155- Point.x - WindowWidth - 15, Point.y - WindowHeight - 15);
156- gppRight: OffsetRect(Result,
157- Point.x - WindowWidth - 15, Point.y - (WindowHeight div 2));
158- gppRightBottom: OffsetRect(Result,
159- Point.x - WindowWidth - 15, Point.y + 15);
156+ gppLeftTop: OffsetRect(Result,
157+ Point.x - WindowWidth - DIV_X, Point.y - WindowHeight - DIV_Y);
158+ gppLeft: OffsetRect(Result,
159+ Point.x - WindowWidth - DIV_X, Point.y - (WindowHeight div 2));
160+ gppLeftBottom: OffsetRect(Result,
161+ Point.x - WindowWidth - DIV_X, Point.y + DIV_Y);
160162 gppTop: OffsetRect(Result,
161- Point.x - (WindowWidth div 2), Point.y - WindowHeight - 15);
163+ Point.x - (WindowWidth div 2), Point.y - WindowHeight - DIV_Y);
162164 gppCenter: OffsetRect(Result,
163165 Point.x - (WindowWidth div 2), Point.y - (WindowHeight div 2));
164166 gppBottom: OffsetRect(Result,
165- Point.x - (WindowWidth div 2), Point.y + 15);
166- gppLeftTop: OffsetRect(Result,
167- Point.x + 15, Point.y - WindowHeight - 15);
168- gppLeft: OffsetRect(Result,
169- Point.x + 15, Point.y - (WindowHeight div 2));
170- gppLeftBottom: OffsetRect(Result, Point.x + 15, Point.y + 15); //ギコナビスレ パート1の453氏に感謝
167+ Point.x - (WindowWidth div 2), Point.y + DIV_Y);
168+ gppRightTop: OffsetRect(Result,
169+ Point.x + DIV_X, Point.y - WindowHeight - DIV_Y);
170+ gppRight: OffsetRect(Result,
171+ Point.x + DIV_X, Point.y - (WindowHeight div 2));
172+ gppRightBottom: OffsetRect(Result, Point.x + DIV_X, Point.y + DIV_Y); //ギコナビスレ パート1の453氏に感謝
171173 end;
172174
173175 end;
--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -29,6 +29,7 @@ type
2929 function GetTitle(OnlyTitle: Boolean): string;
3030 function CalcRect(WorkArea: TRect; Scroll: Boolean): TRect;
3131 function ResPopupBrowserClick(Sender: TObject): WordBool;
32+ function ResPopupBrowserDbClick(Sender: TObject): WordBool;
3233 function GetThread: TThreadItem;
3334 protected
3435 procedure CreateParams(var Params: TCreateParams); override;
@@ -53,8 +54,7 @@ type
5354 end;
5455
5556 implementation
56-uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule;
57-
57+uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule, Preview;
5858
5959 constructor TResPopupBrowser.Create(AOwner: TComponent);
6060 begin
@@ -157,7 +157,7 @@ procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
157157 var
158158 p: TPoint;
159159 doc: Variant;
160- ARect, rect: TRect;
160+ ARect: TRect;
161161 FDispHtmlDocument: DispHTMLDocument;
162162 begin
163163 try
@@ -186,7 +186,7 @@ begin
186186 FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
187187 FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
188188 FEvent.OnClick := ResPopupBrowserClick;
189-
189+ FEvent.OnDoubleClick := ResPopupBrowserDbClick;
190190 Self.Visible := True;
191191 SetWindowPos(Self.Handle, HWND_TOPMOST,
192192 ARect.Left, ARect.Top,
@@ -261,6 +261,7 @@ var
261261 ele: IHTMLElement2;
262262 h, w, dx1, dx2, dy1, dy2: Integer;
263263 MaxWidth, MaxHeight: Integer;
264+ DIV_X, DIV_Y: Integer;
264265 begin
265266 GetCursorpos(p);
266267 ele := ((Self.Document as IHTMLDocument2).body as IHTMLElement2);
@@ -272,6 +273,9 @@ begin
272273 w := ele.scrollWidth + 10;
273274 end;
274275
276+ DIV_X := GikoSys.Setting.RespopupDeltaX;
277+ DIV_Y := GikoSys.Setting.RespopupDeltaY;
278+
275279 dx1 := 0; dx2 := 0;
276280 dy1 := 0; dy2 := 0;
277281
@@ -279,44 +283,44 @@ begin
279283 case GikoSys.Setting.PopupPosition of
280284 gppRightTop:
281285 begin
282- dx1 := 0; dx2 := -2;
283- dy1 := -h; dy2 := -2;
286+ dx1 := 0; dx2 := + DIV_X;
287+ dy1 := -h; dy2 := - DIV_Y;
284288 end;
285289 gppRight:
286290 begin
287- dx1 := 0; dx2 := -2;
291+ dx1 := 0; dx2 := + DIV_X;
288292 dy1 := - (h div 2); dy2 := 0;
289293 end;
290294 gppRightBottom:
291295 begin
292- dx1 := 0; dx2 := -2;
293- dy1 := 0; dy2 := +2;
296+ dx1 := 0; dx2 := + DIV_X;
297+ dy1 := 0; dy2 := + DIV_Y;
294298 end;
295299 gppTop:
296300 begin
297301 dx1 := - (w div 2); dx2 := 0;
298- dy1 := -h; dy2 := -2;
302+ dy1 := -h; dy2 := - DIV_Y;
299303 end;
300304 // 廃止 gppCenter: OffsetRect(Result, p.x - (w div 2), p.y - (h div 2));
301305 gppBottom:
302306 begin
303307 dx1 := - (w div 2); dx2 := 0;
304- dy1 := 0; dy2 := +2;
308+ dy1 := 0; dy2 := + DIV_Y;
305309 end;
306310 gppLeftTop:
307311 begin
308- dx1 := -w; dx2 := +2;
309- dy1 := -h; dy2 := -2;
312+ dx1 := -w; dx2 := - DIV_X ;
313+ dy1 := -h; dy2 := - DIV_Y;
310314 end;
311315 gppLeft:
312316 begin
313- dx1 := -w; dx2 := +2;
317+ dx1 := -w; dx2 := - DIV_X;
314318 dy1 := - (h div 2); dy2 := 0;
315319 end;
316320 gppLeftBottom:
317321 begin
318- dx1 := -w; dx2 := +2;
319- dy1 := 0; dy2 := +2;
322+ dx1 := -w; dx2 := - DIV_X;
323+ dy1 := 0; dy2 := + DIV_Y;
320324 end;
321325 end;
322326 // 初期位置に移動
@@ -440,7 +444,14 @@ begin
440444 FOleInPlaceActiveObject := Self.ControlInterface as IOleInPlaceActiveObject;
441445 FOleInPlaceActiveObject.OnFrameWindowActivate(False);
442446 end;
443-
447+function TResPopupBrowser.ResPopupBrowserDbClick(Sender: TObject): WordBool;
448+begin
449+ // ギコナビのフォーカスを奪ってるのでフォームに無理やり返す
450+ Blur;
451+ // 自分で自分は消せないので、メッセージ経由で消してもらう
452+ PostMessage( GikoForm.Handle , USER_RESPOPUPCLEAR, Integer( Self ), 0 );
453+ Result := True;
454+end;
444455 initialization
445456 OleInitialize(nil);
446457
--- a/Setting.pas
+++ b/Setting.pas
@@ -20,9 +20,9 @@ type
2020 TGikoListOrientation = (gloHorizontal, gloVertical); // リスト垂直・水平
2121 TGikoListState = (glsMax, glsNormal, glsMin); // リストサイズ状態
2222 // ポップアップ表示位置
23- TGikoPopupPosition = (gppRightTop, gppTop, gppLeftTop,
24- gppRight, gppCenter, gppLeft,
25- gppRightBottom, gppBottom, gppLeftBottom);
23+ TGikoPopupPosition = (gppLeftTop = 0, gppTop, gppRightTop,
24+ gppLeft, gppCenter, gppRight,
25+ gppLeftBottom, gppBottom, gppRightBottom);
2626 //プレビューサイズ
2727 TGikoPreviewSize = (gpsXLarge, gpsLarge, gpsMedium, gpsSmall, gpsXSmall);
2828 TGikoBrowserAutoMaximize = (gbmNone, gbmClick, gbmDoubleClick);
@@ -450,6 +450,16 @@ type
450450 FExtList: String;
451451 //! Skin関連
452452 FSkinFiles: TSkinFiles;
453+ //! indexファイルを読み時にdatを検索する
454+ FCheckDatFile: Boolean;
455+ //! 同IDレスアンカー表示
456+ FLimitResCountMessage: Boolean;
457+ //! レスポップアップ表示位置deltaX
458+ FRespopupDeltaX: Integer;
459+ //! レスポップアップ表示位置deltaY
460+ FRespopupDeltaY: Integer;
461+ //! レスポップアップタイマー
462+ FRespopupWait: Integer;
453463 function GetMainCoolSet(Index: Integer): TCoolSet;
454464 function GetBoardCoolSet(Index: Integer): TCoolSet;
455465 function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -807,7 +817,15 @@ type
807817 property ExtList: String read FExtList write FExtList;
808818 //! Skinファイル管理
809819 property SkinFiles: TSkinFiles read FSkinFiles;
810-
820+ //! インデックス読み込み時datファイルチェック
821+ property CheckDatFile: Boolean read FCheckDatFile write FCheckDatFile;
822+ property LimitResCountMessage: Boolean read FLimitResCountMessage write FLimitResCountMessage;
823+ //! レスポップアップ表示位置deltaX
824+ property RespopupDeltaX: Integer read FRespopupDeltaX write FRespopupDeltaX;
825+ //! レスポップアップ表示位置deltaY
826+ property RespopupDeltaY: Integer read FRespopupDeltaY write FRespopupDeltaY;
827+ //! レスポップアップタイマー
828+ property RespopupWait: Integer read FRespopupWait write FRespopupWait;
811829 end;
812830
813831
@@ -1147,6 +1165,10 @@ begin
11471165 if (FPopupPosition = gppCenter) then begin
11481166 FPopupPosition := gppTop;
11491167 end;
1168+ FRespopupDeltaX := ini.ReadInteger('Browser', 'RespopupDelteX', 5);
1169+ FRespopupDeltaY := ini.ReadInteger('Browser', 'RespopupDelteY', 5);
1170+ FRespopupWait := ini.ReadInteger('Browser', 'RespopupWait', 1000);
1171+
11501172 //アドレスバー
11511173 FURLDisplay := ini.ReadBool('AddressBar', 'URLDisplay', False);
11521174 FAddressBarTabStop := ini.ReadBool('AddressBar', 'TabStop', True);
@@ -1293,6 +1315,9 @@ begin
12931315
12941316 FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3);
12951317 FExtList := ini.ReadString('Function', 'ExtList', '*.gif;*.jpg;*.jpeg;*.png;*.zip;*.rar');
1318+
1319+ FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
1320+ FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
12961321 ini.UpdateFile;
12971322 finally
12981323 ini.Free;
@@ -1517,6 +1542,9 @@ begin
15171542
15181543 //ポップアップ位置
15191544 ini.WriteInteger('Browser', 'PopupPosition', Ord(FPopupPosition));
1545+ ini.WriteInteger('Browser', 'RespopupDelteX', FRespopupDeltaX);
1546+ ini.WriteInteger('Browser', 'RespopupDelteY', FRespopupDeltaY);
1547+ ini.WriteInteger('Browser', 'RespopupWait', FRespopupWait);
15201548
15211549 //アドレスバー
15221550 ini.WriteBool('AddressBar', 'URLDisplay', FURLDisplay);
@@ -1675,6 +1703,8 @@ begin
16751703 ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat);
16761704 ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize);
16771705 ini.WriteString('Function', 'ExtList', FExtList);
1706+ ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile);
1707+ ini.WriteBool('Thread', 'LimitResCountMessage', FLimitResCountMessage);
16781708 ini.UpdateFile;
16791709 finally
16801710 ini.Free;
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -10,11 +10,11 @@ VersionInfoDescription=
1010 DefaultGroupName=ギコナビ
1111 ; 自分の環境に合わせてください
1212 SourceDir=G:\Release
13-OutputDir=G:\Output
13+OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ギコナビのバージョンにあわせてください
16-VersionInfoVersion=1.56.0.714
17-OutputBaseFilename=gikoNavi_1.56.0.714_2_setup
16+VersionInfoVersion=1.56.1.716
17+OutputBaseFilename=gikoNavi_b56_setup
1818
1919
2020 [Tasks]
@@ -90,7 +90,7 @@ begin
9090 begin
9191 DelTree(path, True, True, True);
9292 end;
93-
93+
9494 path := ExpandConstant('{app}') + '\config';
9595 if MsgBox(path + 'フォルダ以下を完全に消去してよろしいでしょうか?', mbConfirmation, MB_YESNO) = IDYES then
9696 begin
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
1-■ギコナビ Version1.00 バタ56 Readme.txt
1+■ギコナビ Version1.00 バタ57 Readme.txt
22
33
44 ------------------------------
@@ -108,6 +108,19 @@ LICENSE
108108 ------------------------------
109109 履歴
110110 ------------------------------
111+2007/XX/XX
112+ Version バタ57
113+ ・詳細設定に、スレッド一覧読み込み時にローカルのdatファイルをチェックしないオプションを追加
114+ ・レスポップアップのウィンドウをダブルクリックで消せるように修正
115+ ・レスポップアップの表示位置などの調整を詳細設定に追加
116+ ・NGワードで、">>"で始まる文字列はコメント扱いとするように修正
117+
118+2007/08/18
119+ Version バタ56 リリース2
120+ 入力アシストの設定で、挿入文字列をだけを変更できない不具合の修正
121+ 一部環境で、ギコナビを最小化して復元するとスレッドがスクロールする不具合の修正
122+ バタ55以前からアップデートするとレスポップアップ位置の設定の左右が逆転する不具合の修正
123+
111124 2007/08/05
112125 Version バタ56
113126  レスポップアップの多段対応
--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,44 +1,36 @@
11 [Setting]
2-@ascii2d=30
3-@chiri=30
4-@gline=30
52 @newsplus=120
6-@operate=30
7-@tv=30
8-aa6=30
3+@skate=60
94 academy6=30
10-anime2=45
11-book4=30
12-bubble5=30
5+anime2=60
6+bubble6=30
137 etc6=30
148 ex20=30
159 ex21=30
16-ex22=30
17-food7=30
10+ex23=20
11+food8=30
1812 game11=30
1913 game12=30
2014 hobby9=30
21-human6=30
15+human7=30
2216 life8=30
2317 live23=10
2418 live24=10
2519 live25=10
26-love5=30
27-money5=30
20+love6=30
21+money6=30
2822 music8=30
2923 news21=30
3024 news22=30
31-off4=30
32-pc9=30
25+news23=128
3326 pc11=30
3427 qb5=30
35-school6=30
28+school7=30
3629 science6=30
37-sports10=60
30+sports11=60
3831 tmp6=45
39-travel3=30
4032 tv11=60
41-wwwww=20
33+wwwww=15
4234
4335 idol=30
4436 pie=30
Show on old repository browser