• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revision242b287b35d66bb0249843a65d1d76a33124e667 (tree)
Time2007-08-23 00:04:24
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

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;
@@ -905,6 +906,32 @@ begin
905906 Result := Result + AString;
906907 end;
907908
909+// NGワードファイルに追加 追加された場合、Trueがかえる
910+function TAbon.AddToken(AString: string; Invisible: Boolean): Boolean;
911+var
912+ bufStringList : TStringList;
913+ ngword: String;
914+begin
915+ Result := False;
916+ if FileExists(GetNGwordpath) then begin
917+ bufStringList := TStringList.Create;
918+ try
919+ bufStringList.LoadFromFile(GetNGwordpath);
920+ if (Invisible) then begin
921+ ngword := #9 + AString;
922+ end else begin
923+ ngword := AString;
924+ end;
925+ if (bufStringList.IndexOf(ngword) = -1) then begin
926+ bufStringList.Add(ngword);
927+ bufStringList.SaveToFile(GetNGwordpath);
928+ Result := True;
929+ end;
930+ finally
931+ bufStringList.Free;
932+ end;
933+ end;
934+end;
908935
909936
910937 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
@@ -419,6 +419,10 @@ type
419419 N80: TMenuItem;
420420 SameBoardThreadItem: TMenuItem;
421421 N81: TMenuItem;
422+ N82: TMenuItem;
423+ IDNG1: TMenuItem;
424+ IDNG2: TMenuItem;
425+ ResPopupClearTimer: TTimer;
422426 procedure FormCreate(Sender: TObject);
423427 procedure FormDestroy(Sender: TObject);
424428 procedure BrowserStatusTextChange(Sender: TObject;
@@ -555,6 +559,7 @@ type
555559 procedure GetResURLMenuClick(Sender: TObject);
556560 procedure MainCoolBarContextPopup(Sender: TObject; MousePos: TPoint;
557561 var Handled: Boolean);
562+ procedure ResPopupClearTimerTimer(Sender: TObject);
558563 private
559564 { Private 宣言 }
560565 FEnabledCloseButton: Boolean;
@@ -686,6 +691,10 @@ type
686691 procedure SameBoardThreadSubItemOnClick(Sender: TObject);
687692 //! ポップアップブラウザ作成
688693 procedure CreateResPopupBrowser;
694+ //! D&Dを受け取る
695+ procedure WMDropFiles(var Msg: TWMDropFiles); Message WM_DropFiles;
696+ //! ファイルチェック
697+ function isValidFile(FileName: String) : boolean;
689698 protected
690699 procedure CreateParams(var Params: TCreateParams); override;
691700 procedure WndProc(var Message: TMessage); override;
@@ -756,6 +765,8 @@ type
756765 procedure IndividualAbonID(Atype : Integer);
757766 //このレスあぼ〜ん
758767 procedure IndividualAbon(Atag, Atype : Integer);
768+ //同一IDをNGワードに登録
769+ procedure AddIDtoNGWord(invisible : boolean);
759770 //ブラウザの再描画 true:全てのタブ false:アクティブなタブのみ
760771 procedure RepaintAllTabsBrowser();
761772 //リンクバー設定
@@ -1312,6 +1323,12 @@ begin
13121323
13131324 //置換設定ファイルの読み込み
13141325 ReplaceDM.LoadFromFile(GikoSys.GetReplaceFileName);
1326+
1327+ //レスポップアップ消去タイマー
1328+ ResPopupClearTimer.Interval := GikoSys.Setting.RespopupWait;
1329+
1330+ // D&Dを受け取る
1331+ DragAcceptFiles(Self.Handle, True);
13151332 end;
13161333
13171334 // CoolBar の設定を変数に保存
@@ -1467,6 +1484,13 @@ begin
14671484 GikoDM.TabsOpenAction.Execute;
14681485 GikoDM.TabsOpenAction.Tag := 0;
14691486 if (GikoSys.Setting.LastCloseTabURL <> '') then begin
1487+ PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
1488+ if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
1489+ while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and
1490+ (FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
1491+ Application.ProcessMessages;
1492+ end;
1493+ end;
14701494 item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL );
14711495 if (item <> nil) and (item.IsLogFile) then begin
14721496 OpenThreadItem(item, item.URL);
@@ -1936,10 +1960,12 @@ begin
19361960 if FResPopupBrowser <> nil then begin
19371961 if not(Sender is TResPopupBrowser) then begin
19381962 if (FResPopupBrowser.Visible) then begin
1939- FResPopupBrowser.Clear;
1963+ ResPopupClearTimer.Enabled := True;
1964+ ResPopupClearTimer.Tag := 0;
19401965 end;
19411966 end else begin
1942- TResPopupBrowser(Sender).ChildClear;
1967+ ResPopupClearTimer.Enabled := True;
1968+ ResPopupClearTimer.Tag := 1;
19431969 end;
19441970 end;
19451971 cResPopup := nil;
@@ -1977,6 +2003,15 @@ begin
19772003 e := IHTMLDocument2(TWebBrowser(Sender).Document).elementFromPoint(p.x, p.y);
19782004 if (Assigned(e)) then begin
19792005 CreateResPopupBrowser;
2006+
2007+ if not(Sender is TResPopupBrowser) then begin
2008+ if (FResPopupBrowser.Visible) then begin
2009+ FResPopupBrowser.Clear;
2010+ end;
2011+ end else begin
2012+ TResPopupBrowser(Sender).ChildClear;
2013+ end;
2014+
19802015 cResPopup := FResPopupBrowser.CreateNewBrowser;
19812016 tmp2 := ZenToHan(e.Get_outerText);
19822017 if (GikoSys.IsNumeric(tmp2)) then begin
@@ -2044,6 +2079,15 @@ begin
20442079 wkIntTo := 1;
20452080 end;
20462081 CreateResPopupBrowser;
2082+
2083+ if not(Sender is TResPopupBrowser) then begin
2084+ if (FResPopupBrowser.Visible) then begin
2085+ FResPopupBrowser.Clear;
2086+ end;
2087+ end else begin
2088+ TResPopupBrowser(Sender).ChildClear;
2089+ end;
2090+
20472091 cResPopup := FResPopupBrowser.CreateNewBrowser;
20482092 cResPopup.PopupType := gptThread;
20492093 HTMLCreater.SetResPopupText(cResPopup, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
@@ -2051,6 +2095,8 @@ begin
20512095 end;
20522096 end;
20532097 if (cResPopup <> nil) then begin
2098+ ResPopupClearTimer.Enabled := False;
2099+
20542100 if cResPopup.PopupType = gptRaw then begin
20552101 if cResPopup.Title <> '' then begin
20562102 cResPopup.TitlePopup;
@@ -2740,7 +2786,8 @@ var
27402786 begin
27412787 Thread := inThread;
27422788 idx := BrowserTab.TabIndex;
2743- if (FActiveContent <> nil) and
2789+ if (not FStartUp) and
2790+ (FActiveContent <> nil) and
27442791 (FActiveContent.Thread <> Thread.Thread) and
27452792 (FActiveContent.Browser <> nil) and
27462793 (Assigned(FActiveContent.Browser.Document)) then begin
@@ -2777,6 +2824,12 @@ begin
27772824 ThreadTitle := Thread.Thread.Title;
27782825 ThreadPTitle := Thread.Thread.ParentBoard.Title;
27792826 //ThreadScrollTop := Thread.Thread.ScrollTop;
2827+ if Thread.Thread.IsLogFile then begin
2828+ if not FileExists(Thread.Thread.GetThreadFileName) then begin
2829+ Thread.Thread.DeleteLogFile;
2830+ end;
2831+ end;
2832+
27802833 ThreadIsLog := Thread.Thread.IsLogFile;
27812834 ThreadItem := Thread.Thread;
27822835 ThreadNewArraical := Thread.Thread.NewArrival;
@@ -6611,7 +6664,7 @@ begin
66116664
66126665 end;
66136666 // *************************************************************************
6614-//! お気に入りツリーのマウスアップイベント
6667+//! スレッドブラウザクリックイベント
66156668 // *************************************************************************
66166669 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
66176670 const
@@ -6662,7 +6715,9 @@ begin
66626715 end;
66636716 count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
66646717 limited := LIMIT;
6665- if count > LIMIT then begin
6718+ if not (GikoSys.Setting.LimitResCountMessage) then begin
6719+ limited := -1;
6720+ end else if (count > LIMIT) then begin
66666721 if (GikoUtil.MsgBox(Handle,
66676722 IntToStr(LIMIT) + '個以上ありますが、すべて表示しますか?',
66686723 'IDポップアップ警告',
@@ -6955,10 +7010,11 @@ end;
69557010
69567011 procedure TGikoForm.BrowserPanelResize(Sender: TObject);
69577012 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-
7013+ if (FIsMinimize <> mtMinimizing) then begin
7014+ if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
7015+ MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
7016+ end;
7017+ end;
69627018 end;
69637019 procedure TGikoForm.CoolBarResized(Sender: TObject; CoolBar: TCoolBar);
69647020 var
@@ -7091,6 +7147,60 @@ begin
70917147 if ThreadItem <> nil then
70927148 InsertBrowserTab( ThreadItem, True );
70937149 end;
7150+//同一IDをNGワードに登録
7151+procedure TGikoForm.AddIDtoNGWord(invisible : boolean);
7152+var
7153+ ThreadItem : TThreadItem;
7154+ No : Integer;
7155+{$IFDEF SPAM_FILTER_ENABLED}
7156+ body : TStringList;
7157+ ReadList : TStringList;
7158+ wordCount : TWordCount;
7159+{$ENDIF}
7160+ id: String;
7161+begin
7162+ No := KokoPopupMenu.Tag;
7163+ if No = 0 then Exit;
7164+ ThreadItem := GetActiveContent(True);
7165+ if ThreadItem = nil then Exit;
7166+
7167+ id := GikoSys.GetResID(No, ThreadItem);
7168+ if (id <> '') and (not IsNoValidID(id)) then begin
7169+ if (GikoSys.FAbon.AddToken(id, invisible)) then begin
7170+ GikoSys.FAbon.ReLoadFromNGwordFile;
7171+ FActiveContent.Repaint := True;
7172+ end;
7173+ end else begin
7174+ ShowMessage('IDを取得できませんでした。');
7175+ end;
7176+{$IFDEF SPAM_FILTER_ENABLED}
7177+ body := TStringList.Create;
7178+ try
7179+ GikoSys.GetSameIDRes(id, ThreadItem, body);
7180+ ReadList := TStringList.Create;
7181+ wordCount := TWordCount.Create;
7182+ try
7183+ // スパムに設定
7184+ ReadList.LoadFromFile( ThreadItem.GetThreadFileName );
7185+ for i := 0 to body.Count - 1 do begin
7186+ GikoSys.SpamCountWord( ReadList[ i ], wordCount );
7187+ GikoSys.SpamForget( wordCount, False ); // ハムを解除
7188+ GikoSys.SpamLearn( wordCount, True ); // スパムに設定
7189+ end;
7190+ finally
7191+ wordCount.Free;
7192+ ReadList.Free;
7193+ end;
7194+ finally
7195+ body.Free;
7196+ end;
7197+{$ENDIF}
7198+ if (FActiveContent.Repaint) then begin
7199+ ThreadItem.ScrollTop := OleVariant(IHTMLDocument2(FActiveContent.Browser.Document)).Body.ScrollTop;
7200+ if ThreadItem <> nil then
7201+ InsertBrowserTab( ThreadItem, True );
7202+ end;
7203+end;
70947204
70957205 //同一IDのあぼ〜ん
70967206 procedure TGikoForm.IndividualAbonID(Atype : Integer);
@@ -7582,6 +7692,103 @@ begin
75827692 FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
75837693 end;
75847694 end;
7695+//! 外からのD&D処理
7696+procedure TGikoForm.WMDropFiles(var Msg: TWMDropFiles);
7697+var
7698+ FileName: Array[0..MAX_PATH] of Char;
7699+ Cnt, K: Integer;
7700+ Board: TBoard;
7701+ LogFolder: String;
7702+ datList: TStringList;
7703+begin
7704+ // 表示しているの板のとき以外は拒否
7705+ if GetActiveList is TBoard then begin
7706+ Board := TBoard(GetActiveList);
7707+ if MsgBox(Handle, Board.Title
7708+ + ' 板に入れていいですか?', 'ギコナビ', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
7709+ // 板の時は、ログフォルダにコピーしてはぐれログ対応と同じ処理?
7710+ datList := TStringList.Create;
7711+ try
7712+ Cnt := DragQueryFile(Msg.Drop, $FFFFFFFF, FileName, SizeOf(FileName));
7713+ for K := 0 to Cnt - 1 do begin
7714+ DragQueryFile(Msg.Drop, K, FileName, SizeOf(FileName));
7715+ {FileNameにdropされたファイル名が入っているので、ここで何らかの処理をする。たとえば次の行}
7716+ // ファイルのチェック
7717+ if (isValidFile(FileName)) then begin
7718+ LogFolder := ExtractFilePath(Board.FilePath);
7719+ if (FileExists( LogFolder + ExtractFileName(FileName))) then begin
7720+ GikoUtil.MsgBox(Handle, LogFolder + 'に' + ExtractFileName(FileName) + 'が既に存在します。', 'エラー', MB_ICONSTOP or MB_OK);
7721+ end else begin
7722+ if (not DirectoryExists(LogFolder)) then begin
7723+ if (not GikoSys.ForceDirectoriesEx(LogFolder) ) then begin
7724+ GikoUtil.MsgBox(Handle, LogFolder + 'の生成に失敗しました。', 'エラー', MB_ICONSTOP or MB_OK);
7725+ end;
7726+ end;
7727+ if (not Windows.CopyFile(FileName, PChar(LogFolder + ExtractFileName(FileName)), true)) then begin
7728+ GikoUtil.MsgBox(Handle, FileName + 'のコピーに失敗しました。', 'エラー', MB_ICONSTOP or MB_OK);
7729+ end else begin
7730+ datList.Add(ExtractFileName(FileName));
7731+ end;
7732+ end;
7733+ end;
7734+ end;
7735+ DragFinish(Msg.Drop);
7736+ if (datList.Count > 0) then begin
7737+ GikoSys.AddOutofIndexDat(Board, datList, False);
7738+ ShowMessage(IntToStr(datList.Count) + '個のdatファイルがコピーされました。' );
7739+ if GikoForm.TreeView.Visible then
7740+ GikoForm.TreeView.Refresh;
7741+ if GikoForm.ListView.Visible then
7742+ GikoForm.ListView.Refresh;
7743+ end else begin
7744+ ShowMessage('一つもコピーされませんでした。' );
7745+ end;
7746+ finally
7747+ datList.Free;
7748+ end;
7749+
7750+ end;
7751+ end else begin
7752+ ShowMessage('板を表示してください。');
7753+ end;
7754+end;
7755+//! ファイルチェック
7756+function TGikoForm.isValidFile(FileName: String) : boolean;
7757+var
7758+ dt: TDateTime;
7759+begin
7760+ Result := True;
7761+ // 存在するか、拡張子dat、ファイル名
7762+ if ( not FileExists(FileName) ) then begin
7763+ Result := False;
7764+ GikoUtil.MsgBox(Handle, FileName + 'は存在しません。', 'エラー', MB_ICONSTOP or MB_OK);
7765+ end else if (ExtractFileExt(ExtractFileName(FileName)) <> '.dat' ) then begin
7766+ Result := False;
7767+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'の拡張子が".dat"でありません。', 'エラー', MB_ICONSTOP or MB_OK);
7768+ end else begin
7769+ // ログファイルの拡張子をはずしたものがスレ作成日時
7770+ try
7771+ dt := GikoSys.GetCreateDateFromName(FileName);
7772+ if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin
7773+ Result := False;
7774+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'のファイル名が不正です。', 'エラー', MB_ICONSTOP or MB_OK);
7775+ end;
7776+ except
7777+ Result := False;
7778+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'のファイル名が不正です。', 'エラー', MB_ICONSTOP or MB_OK);
7779+ end;
7780+ end;
7781+end;
7782+
7783+procedure TGikoForm.ResPopupClearTimerTimer(Sender: TObject);
7784+begin
7785+ ResPopupClearTimer.Enabled := False;
7786+ if ResPopupClearTimer.Tag = 0 then begin
7787+ FResPopupBrowser.Clear;
7788+ end else begin
7789+ FResPopupBrowser.CurrentBrowser.ChildClear;
7790+ end;
7791+end;
75857792
75867793 initialization
75877794 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/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 = 108
603+ Height = 12
604+ Caption = '(100 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 = 100
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
@@ -53,8 +53,7 @@ type
5353 end;
5454
5555 implementation
56-uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule;
57-
56+uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule, Preview;
5857
5958 constructor TResPopupBrowser.Create(AOwner: TComponent);
6059 begin
@@ -157,7 +156,7 @@ procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
157156 var
158157 p: TPoint;
159158 doc: Variant;
160- ARect, rect: TRect;
159+ ARect: TRect;
161160 FDispHtmlDocument: DispHTMLDocument;
162161 begin
163162 try
@@ -261,6 +260,7 @@ var
261260 ele: IHTMLElement2;
262261 h, w, dx1, dx2, dy1, dy2: Integer;
263262 MaxWidth, MaxHeight: Integer;
263+ DIV_X, DIV_Y: Integer;
264264 begin
265265 GetCursorpos(p);
266266 ele := ((Self.Document as IHTMLDocument2).body as IHTMLElement2);
@@ -272,6 +272,9 @@ begin
272272 w := ele.scrollWidth + 10;
273273 end;
274274
275+ DIV_X := GikoSys.Setting.RespopupDeltaX;
276+ DIV_Y := GikoSys.Setting.RespopupDeltaY;
277+
275278 dx1 := 0; dx2 := 0;
276279 dy1 := 0; dy2 := 0;
277280
@@ -279,44 +282,44 @@ begin
279282 case GikoSys.Setting.PopupPosition of
280283 gppRightTop:
281284 begin
282- dx1 := 0; dx2 := -2;
283- dy1 := -h; dy2 := -2;
285+ dx1 := 0; dx2 := + DIV_X;
286+ dy1 := -h; dy2 := - DIV_Y;
284287 end;
285288 gppRight:
286289 begin
287- dx1 := 0; dx2 := -2;
290+ dx1 := 0; dx2 := + DIV_X;
288291 dy1 := - (h div 2); dy2 := 0;
289292 end;
290293 gppRightBottom:
291294 begin
292- dx1 := 0; dx2 := -2;
293- dy1 := 0; dy2 := +2;
295+ dx1 := 0; dx2 := + DIV_X;
296+ dy1 := 0; dy2 := + DIV_Y;
294297 end;
295298 gppTop:
296299 begin
297300 dx1 := - (w div 2); dx2 := 0;
298- dy1 := -h; dy2 := -2;
301+ dy1 := -h; dy2 := - DIV_Y;
299302 end;
300303 // 廃止 gppCenter: OffsetRect(Result, p.x - (w div 2), p.y - (h div 2));
301304 gppBottom:
302305 begin
303306 dx1 := - (w div 2); dx2 := 0;
304- dy1 := 0; dy2 := +2;
307+ dy1 := 0; dy2 := + DIV_Y;
305308 end;
306309 gppLeftTop:
307310 begin
308- dx1 := -w; dx2 := +2;
309- dy1 := -h; dy2 := -2;
311+ dx1 := -w; dx2 := - DIV_X ;
312+ dy1 := -h; dy2 := - DIV_Y;
310313 end;
311314 gppLeft:
312315 begin
313- dx1 := -w; dx2 := +2;
316+ dx1 := -w; dx2 := - DIV_X;
314317 dy1 := - (h div 2); dy2 := 0;
315318 end;
316319 gppLeftBottom:
317320 begin
318- dx1 := -w; dx2 := +2;
319- dy1 := 0; dy2 := +2;
321+ dx1 := -w; dx2 := - DIV_X;
322+ dy1 := 0; dy2 := + DIV_Y;
320323 end;
321324 end;
322325 // 初期位置に移動
--- 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,16 @@ LICENSE
108108 ------------------------------
109109 履歴
110110 ------------------------------
111+2007/XX/XX
112+ Version バタ57
113+
114+2007/08/18
115+ Version バタ56 リリース2
116+ 入力アシストの設定で、挿入文字列をだけを変更できない不具合の修正
117+ 一部環境で、ギコナビを最小化して復元するとスレッドがスクロールする不具合の修正
118+ バタ55以前からアップデートするとレスポップアップ位置の設定の左右が逆転する不具合の修正
119+
120+
111121 2007/08/05
112122 Version バタ56
113123  レスポップアップの多段対応
--- 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