• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

ギコナビ


Commit MetaInfo

Revisionaef62a02dc3cd36fcc24fc357fc886d27da99a8f (tree)
Zeit2007-09-09 16:11:59
Autorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Ändern Zusammenfassung

Diff

--- 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+ // >> ‚ÅŽn‚Ü‚éƒg[ƒNƒ“‚̓Rƒƒ“ƒgˆµ‚¢‚Å–³Ž‹‚·‚é
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+ // >> ‚ÅŽn‚Ü‚éƒg[ƒNƒ“‚̓Rƒƒ“ƒgˆµ‚¢‚Å–³Ž‹‚·‚é
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ƒ[ƒhƒtƒ@ƒCƒ‹‚ɒljÁ ’ljÁ‚³‚ꂽê‡ATrue‚ª‚©‚¦‚é
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 // ƒtƒ@ƒCƒ‹–¼‚©‚çƒXƒŒì¬“úŽž‚ð‹‚ß‚é
17851782 try
@@ -1787,18 +1784,7 @@ begin
17871784 Result := ZERO_DATE
17881785 else begin
17891786 // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
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/Editor.pas
+++ b/Editor.pas
@@ -1438,12 +1438,13 @@ end;
14381438
14391439 procedure TEditorForm.BoardTopClick(Sender: TObject);
14401440 var
1441- ini: TIniFile;
1441+ ini: TMemIniFile;
14421442 begin
1443- ini := TIniFile.Create(GikoSys.Setting.GetFileName);
1443+ ini := TMemIniFile.Create(GikoSys.Setting.GetFileName);
14441444 try
14451445 BoardtopTab.TabVisible := BoardTop.Checked;
14461446 ini.WriteBool('EditorForm', 'BoardTopTab', BoardtopTab.TabVisible);
1447+ ini.UpdateFile;
14471448 finally
14481449 ini.Free;
14491450 end;
--- 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 //! ƒ|ƒbƒvƒAƒbƒvƒuƒ‰ƒEƒUì¬
688694 procedure CreateResPopupBrowser;
695+ //! D&D‚ðŽó‚¯Žæ‚é
696+ procedure WMDropFiles(var Msg: TWMDropFiles); Message WM_DropFiles;
697+ //! ƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
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 //‚±‚̃ŒƒX‚ ‚ځ`‚ñ
758768 procedure IndividualAbon(Atag, Atype : Integer);
769+ //“¯ˆêID‚ðNGƒ[ƒh‚É“o˜^
770+ procedure AddIDtoNGWord(invisible : boolean);
759771 //ƒuƒ‰ƒEƒU‚̍ĕ`‰æ true:‘S‚Ẵ^ƒu false:ƒAƒNƒeƒBƒu‚ȃ^ƒu‚Ì‚Ý
760772 procedure RepaintAllTabsBrowser();
761773 //ƒŠƒ“ƒNƒo[Ý’è
@@ -1312,6 +1324,12 @@ begin
13121324
13131325 //’uŠ·Ý’èƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý
13141326 ReplaceDM.LoadFromFile(GikoSys.GetReplaceFileName);
1327+
1328+ //ƒŒƒXƒ|ƒbƒvƒAƒbƒvÁ‹Žƒ^ƒCƒ}[
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);
@@ -1529,6 +1554,7 @@ var
15291554 begin
15301555 // ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ŠJ•ú
15311556 try
1557+ MouseGesture.Clear;
15321558 MouseGesture.UnHook;
15331559 except
15341560 end;
@@ -1698,7 +1724,6 @@ begin
16981724 if FEvent <> nil then
16991725 FEvent.Free;
17001726
1701- // TODO ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”jŠü
17021727 try
17031728 if FResPopupBrowser <> nil then begin
17041729 TOleControl(FResPopupBrowser).Parent := nil;
@@ -1714,6 +1739,14 @@ begin
17141739 end;
17151740 except
17161741 end;
1742+ try
1743+ MouseGesture.Free;
1744+ except
1745+ end;
1746+ try
1747+ DeleteObject(MainCoolBar.Font.Handle);
1748+ except
1749+ end;
17171750 LockWindowUpdate(0);
17181751 end;
17191752
@@ -1936,10 +1969,20 @@ begin
19361969 if FResPopupBrowser <> nil then begin
19371970 if not(Sender is TResPopupBrowser) then begin
19381971 if (FResPopupBrowser.Visible) then begin
1939- FResPopupBrowser.Clear;
1972+ if ResPopupClearTimer.Interval > 0 then begin
1973+ ResPopupClearTimer.Enabled := True;
1974+ ResPopupClearTimer.Tag := 0;
1975+ end else begin
1976+ FResPopupBrowser.Clear;
1977+ end;
19401978 end;
19411979 end else begin
1942- TResPopupBrowser(Sender).ChildClear;
1980+ if ResPopupClearTimer.Interval > 0 then begin
1981+ ResPopupClearTimer.Enabled := True;
1982+ ResPopupClearTimer.Tag := 1;
1983+ end else begin
1984+ TResPopupBrowser(Sender).ChildClear;
1985+ end;
19431986 end;
19441987 end;
19451988 cResPopup := nil;
@@ -1977,6 +2020,15 @@ begin
19772020 e := IHTMLDocument2(TWebBrowser(Sender).Document).elementFromPoint(p.x, p.y);
19782021 if (Assigned(e)) then begin
19792022 CreateResPopupBrowser;
2023+
2024+ if not(Sender is TResPopupBrowser) then begin
2025+ if (FResPopupBrowser.Visible) then begin
2026+ FResPopupBrowser.Clear;
2027+ end;
2028+ end else begin
2029+ TResPopupBrowser(Sender).ChildClear;
2030+ end;
2031+
19802032 cResPopup := FResPopupBrowser.CreateNewBrowser;
19812033 tmp2 := ZenToHan(e.Get_outerText);
19822034 if (GikoSys.IsNumeric(tmp2)) then begin
@@ -1991,6 +2043,16 @@ begin
19912043 end;
19922044 end;
19932045 end else begin
2046+ CreateResPopupBrowser;
2047+
2048+ if not(Sender is TResPopupBrowser) then begin
2049+ if (FResPopupBrowser.Visible) then begin
2050+ FResPopupBrowser.Clear;
2051+ end;
2052+ end else begin
2053+ TResPopupBrowser(Sender).ChildClear;
2054+ end;
2055+
19942056 threadItem := GetActiveContent(true);
19952057 URL := THTMLCreate.GetRespopupURL(Text2, threadItem.URL);
19962058 PathRec := Gikosys.Parse2chURL2(URL);
@@ -2043,7 +2105,6 @@ begin
20432105 wkIntSt := 1;
20442106 wkIntTo := 1;
20452107 end;
2046- CreateResPopupBrowser;
20472108 cResPopup := FResPopupBrowser.CreateNewBrowser;
20482109 cResPopup.PopupType := gptThread;
20492110 HTMLCreater.SetResPopupText(cResPopup, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
@@ -2051,6 +2112,8 @@ begin
20512112 end;
20522113 end;
20532114 if (cResPopup <> nil) then begin
2115+ ResPopupClearTimer.Enabled := False;
2116+
20542117 if cResPopup.PopupType = gptRaw then begin
20552118 if cResPopup.Title <> '' then begin
20562119 cResPopup.TitlePopup;
@@ -2181,6 +2244,7 @@ var
21812244 ARect: TRect;
21822245 begin
21832246 DefaultDraw := True;
2247+// ‚È‚º‚©–³ðŒ‚ÅExit‚µ‚Ä‚¢‚é
21842248 Exit;
21852249 DefaultDraw := False;
21862250 if (cdsSelected in State) or (cdsHot in State) then begin
@@ -2740,7 +2804,8 @@ var
27402804 begin
27412805 Thread := inThread;
27422806 idx := BrowserTab.TabIndex;
2743- if (FActiveContent <> nil) and
2807+ if (not FStartUp) and
2808+ (FActiveContent <> nil) and
27442809 (FActiveContent.Thread <> Thread.Thread) and
27452810 (FActiveContent.Browser <> nil) and
27462811 (Assigned(FActiveContent.Browser.Document)) then begin
@@ -2777,6 +2842,12 @@ begin
27772842 ThreadTitle := Thread.Thread.Title;
27782843 ThreadPTitle := Thread.Thread.ParentBoard.Title;
27792844 //ThreadScrollTop := Thread.Thread.ScrollTop;
2845+ if Thread.Thread.IsLogFile then begin
2846+ if not FileExists(Thread.Thread.GetThreadFileName) then begin
2847+ Thread.Thread.DeleteLogFile;
2848+ end;
2849+ end;
2850+
27802851 ThreadIsLog := Thread.Thread.IsLogFile;
27812852 ThreadItem := Thread.Thread;
27822853 ThreadNewArraical := Thread.Thread.NewArrival;
@@ -4279,7 +4350,6 @@ begin
42794350 MenuToolBar.Buttons[0].AutoSize := True;
42804351 MainCoolBar.AutoSize := False;
42814352 MainCoolBar.AutoSize := True;
4282-
42834353 GikoSys.MenuFont(ListCoolBar.Font);
42844354 GikoSys.MenuFont(BrowserCoolBar.Font);
42854355 // MenuToolBar.Font.Color := clMenuText;
@@ -4733,6 +4803,13 @@ begin
47334803 senderBrowser := TWebBrowser( Message.WParam );
47344804 BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
47354805 end;
4806+ USER_RESPOPUPCLEAR:
4807+ if (TObject(Message.WParam) is TResPopupBrowser) then begin
4808+ try
4809+ TResPopupBrowser( Message.WParam ).Clear;
4810+ except
4811+ end;
4812+ end;
47364813 end;
47374814
47384815 inherited;
@@ -6611,7 +6688,7 @@ begin
66116688
66126689 end;
66136690 // *************************************************************************
6614-//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃}ƒEƒXƒAƒbƒvƒCƒxƒ“ƒg
6691+//! ƒXƒŒƒbƒhƒuƒ‰ƒEƒUƒNƒŠƒbƒNƒCƒxƒ“ƒg
66156692 // *************************************************************************
66166693 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
66176694 const
@@ -6662,7 +6739,9 @@ begin
66626739 end;
66636740 count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
66646741 limited := LIMIT;
6665- if count > LIMIT then begin
6742+ if not (GikoSys.Setting.LimitResCountMessage) then begin
6743+ limited := -1;
6744+ end else if (count > LIMIT) then begin
66666745 if (GikoUtil.MsgBox(Handle,
66676746 IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
66686747 'IDƒ|ƒbƒvƒAƒbƒvŒx',
@@ -6955,10 +7034,11 @@ end;
69557034
69567035 procedure TGikoForm.BrowserPanelResize(Sender: TObject);
69577036 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-
7037+ if (FIsMinimize <> mtMinimizing) then begin
7038+ if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
7039+ MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
7040+ end;
7041+ end;
69627042 end;
69637043 procedure TGikoForm.CoolBarResized(Sender: TObject; CoolBar: TCoolBar);
69647044 var
@@ -7091,6 +7171,63 @@ begin
70917171 if ThreadItem <> nil then
70927172 InsertBrowserTab( ThreadItem, True );
70937173 end;
7174+//“¯ˆêID‚ðNGƒ[ƒh‚É“o˜^
7175+procedure TGikoForm.AddIDtoNGWord(invisible : boolean);
7176+var
7177+ ThreadItem : TThreadItem;
7178+ No : Integer;
7179+{$IFDEF SPAM_FILTER_ENABLED}
7180+ body : TStringList;
7181+ ReadList : TStringList;
7182+ wordCount : TWordCount;
7183+{$ENDIF}
7184+ id, dateStr: String;
7185+begin
7186+ No := KokoPopupMenu.Tag;
7187+ if No = 0 then Exit;
7188+ ThreadItem := GetActiveContent(True);
7189+ if ThreadItem = nil then Exit;
7190+
7191+ id := GikoSys.GetResID(No, ThreadItem);
7192+ if (id <> '') and (not IsNoValidID(id)) then begin
7193+ // ƒRƒƒ“ƒg‚Æ‚µ‚āAƒXƒŒƒbƒh–¼‚ƍ¡“ú‚Ì“ú•t‚ð’ljÁ
7194+ DateTimeToString(dateStr, 'yyyymmdd', Now);
7195+ id := id + #9'>>add ' + dateStr + ',' + ThreadItem.Title;
7196+ if (GikoSys.FAbon.AddToken(id, invisible)) then begin
7197+ GikoSys.FAbon.ReLoadFromNGwordFile;
7198+ FActiveContent.Repaint := True;
7199+ end;
7200+ end else begin
7201+ ShowMessage('ID‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B');
7202+ end;
7203+{$IFDEF SPAM_FILTER_ENABLED}
7204+ body := TStringList.Create;
7205+ try
7206+ GikoSys.GetSameIDRes(id, ThreadItem, body);
7207+ ReadList := TStringList.Create;
7208+ wordCount := TWordCount.Create;
7209+ try
7210+ // ƒXƒpƒ€‚ɐݒè
7211+ ReadList.LoadFromFile( ThreadItem.GetThreadFileName );
7212+ for i := 0 to body.Count - 1 do begin
7213+ GikoSys.SpamCountWord( ReadList[ i ], wordCount );
7214+ GikoSys.SpamForget( wordCount, False ); // ƒnƒ€‚ð‰ðœ
7215+ GikoSys.SpamLearn( wordCount, True ); // ƒXƒpƒ€‚ɐݒè
7216+ end;
7217+ finally
7218+ wordCount.Free;
7219+ ReadList.Free;
7220+ end;
7221+ finally
7222+ body.Free;
7223+ end;
7224+{$ENDIF}
7225+ if (FActiveContent.Repaint) then begin
7226+ ThreadItem.ScrollTop := OleVariant(IHTMLDocument2(FActiveContent.Browser.Document)).Body.ScrollTop;
7227+ if ThreadItem <> nil then
7228+ InsertBrowserTab( ThreadItem, True );
7229+ end;
7230+end;
70947231
70957232 //“¯ˆêID‚Ì‚ ‚ځ`‚ñ
70967233 procedure TGikoForm.IndividualAbonID(Atype : Integer);
@@ -7582,6 +7719,103 @@ begin
75827719 FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
75837720 end;
75847721 end;
7722+//! ŠO‚©‚ç‚ÌD&Dˆ—
7723+procedure TGikoForm.WMDropFiles(var Msg: TWMDropFiles);
7724+var
7725+ FileName: Array[0..MAX_PATH] of Char;
7726+ Cnt, K: Integer;
7727+ Board: TBoard;
7728+ LogFolder: String;
7729+ datList: TStringList;
7730+begin
7731+ // •\Ž¦‚µ‚Ä‚¢‚é‚̔‚̂Ƃ«ˆÈŠO‚Í‹‘”Û
7732+ if GetActiveList is TBoard then begin
7733+ Board := TBoard(GetActiveList);
7734+ if MsgBox(Handle, Board.Title
7735+ + ' ”‚ɓü‚ê‚Ä‚¢‚¢‚Å‚·‚©H', 'ƒMƒRƒiƒr', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
7736+ // ”‚̎ž‚́AƒƒOƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚Í‚®‚ꃍƒO‘Ήž‚Æ“¯‚¶ˆ—H
7737+ datList := TStringList.Create;
7738+ try
7739+ Cnt := DragQueryFile(Msg.Drop, $FFFFFFFF, FileName, SizeOf(FileName));
7740+ for K := 0 to Cnt - 1 do begin
7741+ DragQueryFile(Msg.Drop, K, FileName, SizeOf(FileName));
7742+ {FileName‚Édrop‚³‚ꂽƒtƒ@ƒCƒ‹–¼‚ª“ü‚Á‚Ä‚¢‚é‚̂ŁA‚±‚±‚ʼn½‚ç‚©‚̏ˆ—‚ð‚·‚éB‚½‚Æ‚¦‚ÎŽŸ‚̍s}
7743+ // ƒtƒ@ƒCƒ‹‚̃`ƒFƒbƒN
7744+ if (isValidFile(FileName)) then begin
7745+ LogFolder := ExtractFilePath(Board.FilePath);
7746+ if (FileExists( LogFolder + ExtractFileName(FileName))) then begin
7747+ GikoUtil.MsgBox(Handle, LogFolder + '‚É' + ExtractFileName(FileName) + '‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7748+ end else begin
7749+ if (not DirectoryExists(LogFolder)) then begin
7750+ if (not GikoSys.ForceDirectoriesEx(LogFolder) ) then begin
7751+ GikoUtil.MsgBox(Handle, LogFolder + '‚̐¶¬‚ÉŽ¸”s‚µ‚Ü‚µ‚½B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7752+ end;
7753+ end;
7754+ if (not Windows.CopyFile(FileName, PChar(LogFolder + ExtractFileName(FileName)), true)) then begin
7755+ GikoUtil.MsgBox(Handle, FileName + '‚̃Rƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7756+ end else begin
7757+ datList.Add(ExtractFileName(FileName));
7758+ end;
7759+ end;
7760+ end;
7761+ end;
7762+ DragFinish(Msg.Drop);
7763+ if (datList.Count > 0) then begin
7764+ GikoSys.AddOutofIndexDat(Board, datList, False);
7765+ ShowMessage(IntToStr(datList.Count) + 'ŒÂ‚Ìdatƒtƒ@ƒCƒ‹‚ªƒRƒs[‚³‚ê‚Ü‚µ‚½B' );
7766+ if GikoForm.TreeView.Visible then
7767+ GikoForm.TreeView.Refresh;
7768+ if GikoForm.ListView.Visible then
7769+ GikoForm.ListView.Refresh;
7770+ end else begin
7771+ ShowMessage('ˆê‚‚àƒRƒs[‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B' );
7772+ end;
7773+ finally
7774+ datList.Free;
7775+ end;
7776+
7777+ end;
7778+ end else begin
7779+ ShowMessage('”‚ð•\Ž¦‚µ‚Ä‚­‚¾‚³‚¢B');
7780+ end;
7781+end;
7782+//! ƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
7783+function TGikoForm.isValidFile(FileName: String) : boolean;
7784+var
7785+ dt: TDateTime;
7786+begin
7787+ Result := True;
7788+ // ‘¶Ý‚·‚é‚©AŠg’£ŽqdatAƒtƒ@ƒCƒ‹–¼
7789+ if ( not FileExists(FileName) ) then begin
7790+ Result := False;
7791+ GikoUtil.MsgBox(Handle, FileName + '‚Í‘¶Ý‚µ‚Ü‚¹‚ñB', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7792+ end else if (ExtractFileExt(ExtractFileName(FileName)) <> '.dat' ) then begin
7793+ Result := False;
7794+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚ÌŠg’£Žq‚ª".dat"‚Å‚ ‚è‚Ü‚¹‚ñB', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7795+ end else begin
7796+ // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
7797+ try
7798+ dt := GikoSys.GetCreateDateFromName(FileName);
7799+ if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin
7800+ Result := False;
7801+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚̃tƒ@ƒCƒ‹–¼‚ª•s³‚Å‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7802+ end;
7803+ except
7804+ Result := False;
7805+ GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚̃tƒ@ƒCƒ‹–¼‚ª•s³‚Å‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
7806+ end;
7807+ end;
7808+end;
7809+
7810+procedure TGikoForm.ResPopupClearTimerTimer(Sender: TObject);
7811+begin
7812+ ResPopupClearTimer.Enabled := False;
7813+ if ResPopupClearTimer.Tag = 0 then begin
7814+ FResPopupBrowser.Clear;
7815+ end else begin
7816+ FResPopupBrowser.CurrentBrowser.ChildClear;
7817+ end;
7818+end;
75857819
75867820 initialization
75877821 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- //Å‰‚Ì‚P–‡‚ÉÝ’è ƒAƒhƒŒƒX‚̐ݒè‚Ì‚½‚߂̃Jƒ‰ŒÄ‚Ñ
2265- if GikoForm.BrowserTab.Tabs.Count > 0 then begin
2266- GikoForm.BrowserTab.OnChange(nil);
2268+ //Å‰‚Ì‚P–‡‚ɐݒè
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) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
24142422 'IDƒ|ƒbƒvƒAƒbƒvŒx',
@@ -4434,6 +4442,16 @@ begin
44344442 end;
44354443
44364444
4445+//! ‚±‚̃ŒƒX‚ÌID‚ðNGƒ[ƒh‚ɒljÁ‚·‚éi“§–¾)
4446+procedure TGikoDM.AddIDtoNGWord0ActionExecute(Sender: TObject);
4447+begin
4448+ GikoForm.AddIDtoNGWord(true);
4449+end;
4450+//! ‚±‚̃ŒƒX‚ÌID‚ðNGƒ[ƒh‚ɒljÁ‚·‚é
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 //! ˆêŽžƒtƒ@ƒCƒ‹‚©‚ç‚Ì•œ‹Œ
118118 procedure RestoreThreadData(Board: TBoard);
119- //! ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
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 //! ƒo[ƒWƒ‡ƒ“î•ñ
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 //! ’PŒê‰ðÍ
229224 procedure SpamCountWord( const text : string; wordCount : TWordCount );
230225 //! ŠwKƒNƒŠƒA
@@ -257,6 +252,10 @@ type
257252 function GetOEIndentChar : string;
258253 //! ’uŠ·Ý’èƒtƒ@ƒCƒ‹Žæ“¾
259254 function GetReplaceFileName: String;
255+ //! ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
256+ procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: boolean = True);
257+ //! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
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=';
@@ -345,18 +344,6 @@ var
345344 i: Integer;
346345 FileList: TStringList;
347346 begin
348- //ƒXƒŒƒbƒhƒf[ƒ^ƒtƒ@ƒCƒ‹‚ðXV
349-// FlashExitWrite;
350-
351-// FExitWrite.Free;
352- FBayesian.Free;
353- FAWKStr.Free;
354- FSetting.Free;
355- FDolib.Free;
356- FAbon.Free;
357- FSelectResFilter.Free;
358- FGikoMessage.Free;
359- //FBoardURLList.Free;
360347 //ƒeƒ“ƒ|ƒ‰ƒŠHTML‚ðíœ
361348 FileList := TStringList.Create;
362349 try
@@ -369,6 +356,13 @@ begin
369356 finally
370357 FileList.Free;
371358 end;
359+ FGikoMessage.Free;
360+ FBayesian.Free;
361+ FSelectResFilter.Free;
362+ FAbon.Free;
363+ FAWKStr.Free;
364+ FDolib.Free;
365+ FSetting.Free;
372366 inherited;
373367 end;
374368
@@ -572,11 +566,18 @@ var
572566 usePlugIn : Boolean;
573567 islog : Boolean;
574568 urlHead: String;
569+ datFileCheck: Boolean;
575570 {*
576571 FavoThreadItem : TFavoriteThreadItem;
577572 Node: TTreeNode;
578573 *}
574+{$IFDEF DEBUG}
575+ st, rt: Cardinal;
576+{$ENDIF}
579577 begin
578+{$IFDEF DEBUG}
579+ st := GetTickCount;
580+{$ENDIF}
580581 if Board.IsThreadDatRead then
581582 Exit;
582583 Board.Clear;
@@ -592,12 +593,16 @@ begin
592593
593594 FileName := Board.GetFolderIndexFileName;
594595
595- FileList := TStringList.Create;
596- FileList.Sorted := True;
597- FileList.BeginUpdate;
598- //IsLogFile—pDATƒtƒ@ƒCƒ‹ƒŠƒXƒg
599- GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
600- FileList.EndUpdate;
596+ //
597+ datFileCheck := (Setting.CheckDatFile) or (not FileExists(FileName));
598+ if (datFileCheck) then begin
599+ FileList := TStringList.Create;
600+ FileList.Sorted := True;
601+ FileList.BeginUpdate;
602+ //IsLogFile—pDATƒtƒ@ƒCƒ‹ƒŠƒXƒg
603+ GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
604+ FileList.EndUpdate;
605+ end;
601606
602607 // d•¡‚ð–h‚®
603608 Board.BeginUpdate;
@@ -609,7 +614,11 @@ begin
609614 //‚Qs–Ú‚©‚çi‚Ps–ڂ̓o[ƒWƒ‡ƒ“j
610615 for i := sl.Count - 1 downto 1 do begin
611616 Rec := ParseIndexLine(sl[i]);
612- islog := FileList.Find( Rec.FFileName, Index );
617+ if (datFileCheck) then begin
618+ islog := FileList.Find( Rec.FFileName, Index );
619+ end else begin
620+ islog := (Rec.FSize <> 0) and (Rec.FCount <> 0);
621+ end;
613622 if usePlugIn then
614623 ThreadItem := TThreadItem.Create(
615624 Board.BoardPlugIn,
@@ -636,7 +645,7 @@ begin
636645 end;
637646
638647 ThreadItem.BeginUpdate;
639- if islog then
648+ if (datFileCheck) and (islog) then
640649 FileList.Delete( Index );
641650
642651 ThreadItem.No := Rec.FNo;
@@ -671,50 +680,75 @@ begin
671680 if UnRead <> Board.UnRead then
672681 Board.UnRead := UnRead;
673682
674- //ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
675- AddOutofIndexDat(Board, FileList);
683+ if (datFileCheck) then begin
684+ //ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
685+ AddOutofIndexDat(Board, FileList);
686+ end;
676687 Board.EndUpdate;
677688
678689 //‘O‰ñˆÙíI—¹Žžƒ`ƒFƒbƒN
679690 RestoreThreadData( Board );
680691 finally
681692 sl.Free;
682- FileList.Free;
693+ if (datFileCheck) then begin
694+ FileList.Free;
695+ end;
683696 Board.Sorted := False;
684697 end;
685698 Board.IsThreadDatRead := True;
699+{$IFDEF DEBUG}
700+ rt := GetTickCount - st;
701+ Writeln('Read Done.' + IntToStr(rt) + ' ms');
702+{$ENDIF}
686703 end;
687704 {!
688705 \brief ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
689706 \param Board ’ljÁ‚·‚é”Â
690707 \param DatList datƒtƒ@ƒCƒ‹–¼
691708 }
692-procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList);
709+procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: Boolean = True);
693710 var
694711 i : Integer;
695712 Boardpath,FileName : String;
696713 ResRec: TResRec;
697714 ThreadItem: TThreadItem;
715+ create: Boolean;
698716 begin
717+ create := False;
699718 Boardpath := ExtractFilePath(Board.GetFolderIndexFileName);
700719 //ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
701720 for i := 0 to DatList.Count - 1 do begin
702721 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);
722+ ThreadItem := nil;
723+ if (not AllCreate) then begin
724+ create := False;
725+ ThreadItem := Board.FindThreadFromFileName(DatList[i]);
726+ if (ThreadItem = nil) then begin
727+ create := True;
728+ end else begin
729+ if Board.IsBoardPlugInAvailable then begin
730+ THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
731+ end else begin
732+ THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
733+ end;
734+ end;
717735 end;
736+ if (ThreadItem = nil) then begin
737+ if Board.IsBoardPlugInAvailable then begin
738+ ThreadItem := TThreadItem.Create(
739+ Board.BoardPlugIn,
740+ Board,
741+ Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) );
742+ THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
743+ end else begin
744+ ThreadItem := TThreadItem.Create(
745+ nil,
746+ Board,
747+ Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) );
748+ THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
749+ end;
750+ end;
751+
718752
719753 ThreadItem.BeginUpdate;
720754 ThreadItem.FileName := DatList[i];
@@ -736,7 +770,9 @@ begin
736770 ThreadItem.ScrollTop := 0;
737771 ThreadItem.AgeSage := gasNone;
738772 ThreadItem.EndUpdate;
739- Board.Add(ThreadItem);
773+ if (AllCreate) or (create) then begin
774+ Board.Add(ThreadItem);
775+ end;
740776 end;
741777 end;
742778 {!
@@ -1307,17 +1343,14 @@ var
13071343 nm: NONCLIENTMETRICS;
13081344 begin
13091345 nm.cbSize := sizeof(NONCLIENTMETRICS);
1310-
1311- SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, @nm, 0);
1312- lf := nm.lfMenuFont;
1313-
1314- Font.Name := lf.lfFaceName;
1315- Font.Height := lf.lfHeight;
1316- Font.Style := [];
1317- if lf.lfWeight >= 700 then
1318- Font.Style := Font.Style + [fsBold];
1319- if lf.lfItalic = 1 then
1320- Font.Style := Font.Style + [fsItalic];
1346+ SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, @nm, 0);
1347+ lf := nm.lfMenuFont;
1348+ Font.Handle := CreateFontIndirect(lf);
1349+ Font.Style := [];
1350+ if lf.lfWeight >= 700 then
1351+ Font.Style := Font.Style + [fsBold];
1352+ if lf.lfItalic = 1 then
1353+ Font.Style := Font.Style + [fsItalic];
13211354 end;
13221355
13231356 {!
@@ -2849,12 +2882,27 @@ end;
28492882 }
28502883 procedure TGikoSys.GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList);
28512884 var
2885+ AID : String;
2886+begin
2887+ AID := GetResID(AIDNum, ThreadItem);
2888+ if not IsNoValidID(AID) then begin
2889+ GetSameIDRes(AID, ThreadItem, body);
2890+ end;
2891+end;
2892+{!
2893+\brief “Še ID Žæ“¾
2894+\param AIDNum “Še ƒŒƒX”ԍ†
2895+\param ThreadItem “ŠeƒXƒŒƒbƒh
2896+\param body OUT:“ŠeID
2897+}
2898+function TGikoSys.GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
2899+var
28522900 Res: TResRec;
28532901 boardPlugIn : TBoardPlugIn;
2854- AID : String;
28552902 stList: TStringList;
28562903 i : Integer;
28572904 begin
2905+ Result := '';
28582906 if (ThreadItem <> nil) and (ThreadItem.IsLogFile)
28592907 and (AIDNum > 0) and (AIDNum <= ThreadItem.Count) then begin
28602908 //if ThreadItem.IsBoardPlugInAvailable then begin
@@ -2866,21 +2914,21 @@ begin
28662914 end else begin
28672915 THTMLCreate.DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum), @Res);
28682916 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)
2917+ Result := Res.FDateTime;
2918+ if AnsiPos('id', AnsiLowerCase(Result)) > 0 then begin
2919+ Result := Copy(Result, AnsiPos('id', AnsiLowerCase(Result)) - 1, 11);
2920+ if AnsiPos(' be:', AnsiLowerCase(Result)) > 0 then begin
2921+ Result := Copy(Result, 1, AnsiPos(' BE:', AnsiLowerCase(Result)) - 1)
28742922 end;
28752923 end else begin
28762924 stlist := TStringList.Create;
28772925 try
2878- stList.DelimitedText := AID;
2879- AID := '';
2926+ stList.DelimitedText := Result;
2927+ Result := '';
28802928 for i := 0 to stList.Count - 1 do
28812929 if Length(WideString(stList[i])) = 8 then begin
28822930 if NotDateorTimeString(stList[i]) then begin
2883- AID := stList[i];
2931+ Result := stList[i];
28842932 break;
28852933 end;
28862934 end;
@@ -2888,11 +2936,8 @@ begin
28882936 stList.Free;
28892937 end;
28902938 end;
2891- if not IsNoValidID(AID) then
2892- GetSameIDRes(AID, ThreadItem, body);
28932939 end;
28942940 end;
2895-
28962941 {!
28972942 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
28982943 \param AID ŒÂl‚ð“Á’è‚·‚é“Še ID
@@ -3309,7 +3354,8 @@ begin
33093354 ThreadItem.NewReceive := ini.ReadInteger(SECTION, 'NewReceive', 0);
33103355
33113356 ThreadItem.Size := ini.ReadInteger(SECTION, 'Size', 0);
3312- if(ThreadItem.Size = 0) and (FileExists(ThreadItem.GetThreadFileName)) then begin
3357+ ThreadItem.IsLogFile := FileExists(ThreadItem.GetThreadFileName);
3358+ if(ThreadItem.Size = 0) and (ThreadItem.IsLogFile) then begin
33133359 try
33143360 ThreadItem.Size := GetFileSize(ThreadItem.GetThreadFileName) - ThreadItem.Count;
33153361 except
@@ -3399,6 +3445,26 @@ function TGikoSys.GetReplaceFileName: String;
33993445 begin
34003446 Result := Setting.GetReplaceFileName;
34013447 end;
3448+//! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
3449+function TGikoSys.GetCreateDateFromName(FileName: String): TDateTime;
3450+var
3451+ tmp : String;
3452+ unixtime: Int64;
3453+begin
3454+ // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
3455+ tmp := ChangeFileExt(FileName, '');
3456+ if AnsiPos('_', tmp) <> 0 then
3457+ if AnsiPos('_', tmp) > 9 then
3458+ tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1)
3459+ else
3460+ Delete(tmp, AnsiPos('_', tmp), 1);
3461+
3462+ if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then
3463+ Insert('1', tmp, 1);
3464+
3465+ unixtime := StrToInt64Def(tmp, ZERO_DATE);
3466+ Result := UnixToDateTime(unixtime) + OffsetFromUTC;
3467+end;
34023468
34033469 initialization
34043470 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+ // •ÏX‘O‚̃L[^ƒJƒeƒSƒŠ‚Æ“¯ˆê‚à‚µ‚­‚́A‘¼‚Əd•¡–³‚µ
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+ // ƒL[‚ª•Ï‚í‚é‚Æ‚«‚́AChangeKey‚ðŒÄ‚Ô
201+ if (resWord.GetKey <> KeyNameEdit.Text) then begin
202+ resWord.SetKey(KeyNameEdit.Text);
203+ InputAssistDM.ChangeKey(resWord);
204+ end;
198205 // ˆê——‚̍XV
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ƒ`ƒFƒbƒN
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ƒ`ƒFƒbƒN
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ƒ|ƒbƒvƒAƒbƒvˆÊ’uX
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+// ƒŒƒXƒ|ƒbƒvƒAƒbƒvˆÊ’uY
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/NewBoardURL.pas
+++ b/NewBoardURL.pas
@@ -47,20 +47,32 @@ var
4747 sec : TStringList;
4848 begin
4949 sec := TStringList.Create;
50- ini := TMemIniFile.Create(GikoSys.GetBoardFileName);
51- ini.ReadSections(sec);
50+ try
51+ ini := TMemIniFile.Create(GikoSys.GetBoardFileName);
52+ try
53+ ini.ReadSections(sec);
5254
53- CategoryComboBox.Clear;
54- CategoryComboBox.Items.BeginUpdate;
55- for i := 0 to sec.Count - 1 do begin
56- CategoryComboBox.Items.Add(sec[i]);
57- end;
58- CategoryComboBox.Items.EndUpdate;
59- CategoryComboBox.ItemIndex := 0;
55+ CategoryComboBox.Clear;
56+ CategoryComboBox.Items.BeginUpdate;
57+ for i := 0 to sec.Count - 1 do begin
58+ CategoryComboBox.Items.Add(sec[i]);
59+ end;
60+ CategoryComboBox.Items.EndUpdate;
61+ CategoryComboBox.ItemIndex := 0;
6062
61- ResultMemo.Lines.Clear;
63+ ResultMemo.Lines.Clear;
64+ finally
65+ if ini <> nil then begin
66+ ini.Free;
67+ end;
68+ end;
69+ finally
70+ if sec <> nil then begin
71+ sec.Free;
72+ end;
73+ end;
6274 end;
63-
75+//! ƒfƒXƒgƒ‰ƒNƒ^
6476 procedure TNewBoardURLForm.SearchButtonClick(Sender: TObject);
6577 var
6678 i : Integer;
@@ -186,9 +198,13 @@ begin
186198 keys := TStringList.Create;
187199 try
188200 ini := TMemIniFile.Create(GikoSys.GetBoardFileName);
189- ini.ReadSection(sec, keys);
190- for i := 0 to keys.Count - 1 do begin
191- urls.Add(ini.ReadString(sec, keys[i], ''));
201+ try
202+ ini.ReadSection(sec, keys);
203+ for i := 0 to keys.Count - 1 do begin
204+ urls.Add(ini.ReadString(sec, keys[i], ''));
205+ end;
206+ finally
207+ ini.Free;
192208 end;
193209 finally
194210 keys.Free;
--- 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 //ƒƒOíœŽžƒƒbƒZ[ƒW
768768 LogDeleteMessageCheckBox.Checked := GikoSys.Setting.DeleteMsg;
769+ //“¯IDƒŒƒXƒAƒ“ƒJ[•\Ž¦‚̐§ŒÀ”‰z‚¦ƒƒbƒZ[ƒW
770+ IgnoreLimitResCountCheckBox.Checked := GikoSys.Setting.LimitResCountMessage;
769771
770772 //I—¹ŽžŠm”Fƒ_ƒCƒAƒƒO
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 //I—¹ŽžŠm”Fƒ_ƒCƒAƒƒO
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 //ƒvƒŒƒrƒ…[ƒtƒ@ƒCƒ‹–¼
3130 HTML_FILE_NAME = 'temp_preview.html';
31+ // ƒ}ƒEƒXƒJ[ƒ\ƒ‹‚©‚ç‚Ì‚¸‚炵ˆÊ’u
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ˆÈ‘O‚͍¶‰E‚ªŠÔˆá‚Á‚Ä‚½
152154 // o‚µˆÊ’u‚É‚æ‚é•â³
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); //ƒMƒRƒiƒrƒXƒŒ ƒp[ƒg‚P‚Ì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); //ƒMƒRƒiƒrƒXƒŒ ƒp[ƒg‚P‚Ì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 // ”pŽ~ 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 // ‰ŠúˆÊ’u‚Ɉړ®
@@ -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+ // ƒMƒRƒiƒr‚̃tƒH[ƒJƒX‚ð’D‚Á‚Ä‚é‚̂ŃtƒH[ƒ€‚É–³—‚â‚è•Ô‚·
450+ Blur;
451+ // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
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); // ƒŠƒXƒg‚’¼E…•½
2121 TGikoListState = (glsMax, glsNormal, glsMin); // ƒŠƒXƒgƒTƒCƒYó‘Ô
2222 // ƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’u
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 //ƒvƒŒƒrƒ…[ƒTƒCƒY
2727 TGikoPreviewSize = (gpsXLarge, gpsLarge, gpsMedium, gpsSmall, gpsXSmall);
2828 TGikoBrowserAutoMaximize = (gbmNone, gbmClick, gbmDoubleClick);
@@ -450,6 +450,16 @@ type
450450 FExtList: String;
451451 //! SkinŠÖ˜A
452452 FSkinFiles: TSkinFiles;
453+ //! indexƒtƒ@ƒCƒ‹‚ð“Ç‚ÝŽž‚Édat‚ðŒŸõ‚·‚é
454+ FCheckDatFile: Boolean;
455+ //! “¯IDƒŒƒXƒAƒ“ƒJ[•\Ž¦
456+ FLimitResCountMessage: Boolean;
457+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’udeltaX
458+ FRespopupDeltaX: Integer;
459+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’udeltaY
460+ FRespopupDeltaY: Integer;
461+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒvƒ^ƒCƒ}[
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ƒtƒ@ƒCƒ‹ŠÇ—
809819 property SkinFiles: TSkinFiles read FSkinFiles;
810-
820+ //! ƒCƒ“ƒfƒbƒNƒX“ǂݍž‚ÝŽždatƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
821+ property CheckDatFile: Boolean read FCheckDatFile write FCheckDatFile;
822+ property LimitResCountMessage: Boolean read FLimitResCountMessage write FLimitResCountMessage;
823+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’udeltaX
824+ property RespopupDeltaX: Integer read FRespopupDeltaX write FRespopupDeltaX;
825+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’udeltaY
826+ property RespopupDeltaY: Integer read FRespopupDeltaY write FRespopupDeltaY;
827+ //! ƒŒƒXƒ|ƒbƒvƒAƒbƒvƒ^ƒCƒ}[
828+ property RespopupWait: Integer read FRespopupWait write FRespopupWait;
811829 end;
812830
813831
@@ -972,15 +990,16 @@ end;
972990 //ƒfƒXƒgƒ‰ƒNƒ^
973991 destructor TSetting.Destroy();
974992 begin
975- inherited;
993+ FSkinFiles.Free;
994+ FGestures.Free;
976995 FBoardColumnOrder.Free;
977996 FCategoryColumnOrder.Free;
978997 FBBSColumnOrder.Free;
979- FSelectTextList.Free;
980998 FBoardURLs.Free;
999+ FSelectTextList.Free;
9811000 FMailList.Free;
9821001 FNameList.Free;
983- FGestures.Free;
1002+ inherited;
9841003 end;
9851004
9861005 //‰Šú‰»ƒtƒ@ƒCƒ‹–¼Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
@@ -1147,6 +1166,10 @@ begin
11471166 if (FPopupPosition = gppCenter) then begin
11481167 FPopupPosition := gppTop;
11491168 end;
1169+ FRespopupDeltaX := ini.ReadInteger('Browser', 'RespopupDelteX', 5);
1170+ FRespopupDeltaY := ini.ReadInteger('Browser', 'RespopupDelteY', 5);
1171+ FRespopupWait := ini.ReadInteger('Browser', 'RespopupWait', 1000);
1172+
11501173 //ƒAƒhƒŒƒXƒo[
11511174 FURLDisplay := ini.ReadBool('AddressBar', 'URLDisplay', False);
11521175 FAddressBarTabStop := ini.ReadBool('AddressBar', 'TabStop', True);
@@ -1293,6 +1316,9 @@ begin
12931316
12941317 FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3);
12951318 FExtList := ini.ReadString('Function', 'ExtList', '*.gif;*.jpg;*.jpeg;*.png;*.zip;*.rar');
1319+
1320+ FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
1321+ FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
12961322 ini.UpdateFile;
12971323 finally
12981324 ini.Free;
@@ -1517,6 +1543,9 @@ begin
15171543
15181544 //ƒ|ƒbƒvƒAƒbƒvˆÊ’u
15191545 ini.WriteInteger('Browser', 'PopupPosition', Ord(FPopupPosition));
1546+ ini.WriteInteger('Browser', 'RespopupDelteX', FRespopupDeltaX);
1547+ ini.WriteInteger('Browser', 'RespopupDelteY', FRespopupDeltaY);
1548+ ini.WriteInteger('Browser', 'RespopupWait', FRespopupWait);
15201549
15211550 //ƒAƒhƒŒƒXƒo[
15221551 ini.WriteBool('AddressBar', 'URLDisplay', FURLDisplay);
@@ -1675,6 +1704,8 @@ begin
16751704 ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat);
16761705 ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize);
16771706 ini.WriteString('Function', 'ExtList', FExtList);
1707+ ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile);
1708+ ini.WriteBool('Thread', 'LimitResCountMessage', FLimitResCountMessage);
16781709 ini.UpdateFile;
16791710 finally
16801711 ini.Free;
--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -78,7 +78,8 @@ uses
7878 HistoryList in 'HistoryList.pas',
7979 ReplaceDataModule in 'ReplaceDataModule.pas' {ReplaceDM: TDataModule},
8080 ResPopupBrowser in 'ResPopupBrowser.pas',
81- SkinFiles in 'SkinFiles.pas';
81+ SkinFiles in 'SkinFiles.pas',
82+ NewBoardURL in 'NewBoardURL.pas' {NewBoardURLForm};
8283
8384 {$R *.RES}
8485 {$R gikoResource.res}
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=ƒMƒRƒiƒr
1111 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
1212 SourceDir=G:\Release
13-OutputDir=G:\Output
13+OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
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 + 'ƒtƒHƒ‹ƒ_ˆÈ‰º‚ðŠ®‘S‚ɏÁ‹Ž‚µ‚Ä‚æ‚낵‚¢‚Å‚µ‚傤‚©H', mbConfirmation, MB_YESNO) = IDYES then
9696 begin
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
1-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ56 Readme.txt
1+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ57 Readme.txt
22
33
44 ------------------------------
@@ -108,6 +108,19 @@ LICENSE
108108 ------------------------------
109109 —š—ð
110110 ------------------------------
111+2007/XX/XX
112+ Version ÊÞÀ57
113+ EÚ×Ý’è‚ɁAƒXƒŒƒbƒhˆê——“ǂݍž‚ÝŽž‚Ƀ[ƒJƒ‹‚Ìdatƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒN‚µ‚È‚¢ƒIƒvƒVƒ‡ƒ“‚ð’ljÁ
114+ EƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃EƒBƒ“ƒhƒE‚ðƒ_ƒuƒ‹ƒNƒŠƒbƒN‚ŏÁ‚¹‚é‚悤‚ɏC³
115+ EƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì•\Ž¦ˆÊ’u‚È‚Ç‚Ì’²®‚ðÚ×Ý’è‚ɒljÁ
116+ ENGƒ[ƒh‚ŁA">>"‚ÅŽn‚܂镶Žš—ñ‚̓Rƒƒ“ƒgˆµ‚¢‚Æ‚·‚é‚悤‚ɏC³
117+
118+2007/08/18
119+ Version ÊÞÀ56 ƒŠƒŠ[ƒX2
120+ “ü—̓AƒVƒXƒg‚̐ݒè‚ŁA‘}“ü•¶Žš—ñ‚ð‚¾‚¯‚ð•ÏX‚Å‚«‚È‚¢•s‹ï‡‚̏C³
121+ ˆê•”ŠÂ‹«‚ŁAƒMƒRƒiƒr‚ðÅ¬‰»‚µ‚Ä•œŒ³‚·‚é‚ƃXƒŒƒbƒh‚ªƒXƒNƒ[ƒ‹‚·‚é•s‹ï‡‚̏C³
122+ ÊÞÀ55ˆÈ‘O‚©‚çƒAƒbƒvƒf[ƒg‚·‚é‚ƃŒƒXƒ|ƒbƒvƒAƒbƒvˆÊ’u‚̐ݒè‚̍¶‰E‚ª‹t“]‚·‚é•s‹ï‡‚̏C³
123+
111124 2007/08/05
112125 Version ÊÞÀ56
113126 @ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž
--- 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