Revision | dead7d8384f675f9fbeead75a8ba46f14b95e83c (tree) |
---|---|
Time | 2007-03-21 22:43:50 |
Author | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_55_0_695'.
@@ -266,8 +266,6 @@ type | ||
266 | 266 | const PON : string; Board : TBoard) : string; |
267 | 267 | //! fusiana警告ダイアログ |
268 | 268 | function FusianaMsgBox: Integer; |
269 | - //! sent.iniファイルの生成 | |
270 | - function CreateSentIniFile: TMemIniFile; | |
271 | 269 | protected |
272 | 270 | procedure CreateParams(var Params: TCreateParams); override; |
273 | 271 | public |
@@ -1023,60 +1021,33 @@ var | ||
1023 | 1021 | sDate: string; |
1024 | 1022 | ini: TMemIniFile; |
1025 | 1023 | begin |
1026 | - ini := CreateSentIniFile; | |
1027 | - if (ini <> nil) then begin | |
1028 | - try | |
1029 | - sDate := IntToStr(GikoSys.DateTimeToInt(Now)); | |
1030 | - | |
1031 | - ini.WriteString(sDate, 'Name', NameComboBox.Text); | |
1032 | - ini.WriteString(sDate, 'EMail', MailComboBox.Text); | |
1033 | - ini.WriteString(sDate, 'Body', HttpEncode(BodyEdit.Text)); | |
1034 | - ini.WriteInteger(sDate, 'Status', FStatusCode); | |
1035 | - ini.WriteDateTime(sDate, 'Date', Now); | |
1036 | - if FThreadItem = nil then begin | |
1037 | - ini.WriteString(sDate, 'Title', MojuUtils.Sanitize(TitleEdit.Text)); | |
1038 | - //ini.WriteString(sDate, 'BBS', FBoard.BBSID); | |
1039 | - ini.WriteString(sDate, 'URL', FBoard.URL); | |
1040 | - ini.WriteInteger(sDate, 'NewThread', 1); | |
1041 | - end else begin | |
1042 | - ini.WriteString(sDate, 'Title', FThreadItem.Title); | |
1043 | - //ini.WriteString(sDate, 'BBS', FThreadItem.ParentBoard.BBSID); | |
1044 | - ini.WriteString(sDate, 'URL', FThreadItem.URL); | |
1045 | - ini.WriteString(sDate, 'Key', ChangeFileExt(FThreadItem.FileName, '')); | |
1046 | - end; | |
1024 | + ini := TMemIniFile.Create(GikoSys.GetSentFileName); | |
1025 | + try | |
1026 | + sDate := IntToStr(GikoSys.DateTimeToInt(Now)); | |
1047 | 1027 | |
1048 | - ini.UpdateFile; | |
1049 | - finally | |
1050 | - ini.Free; | |
1051 | - end; | |
1052 | - end; | |
1053 | -end; | |
1054 | -function TEditorForm.CreateSentIniFile: TMemIniFile; | |
1055 | -var | |
1056 | - maxSize, fileSize, i: Integer; | |
1057 | - newName: String; | |
1058 | -begin | |
1059 | - Result := nil; | |
1060 | - // MB -> bytes | |
1061 | - maxSize := GikoSys.Setting.SentIniFileSize * 1024 * 1024; | |
1062 | - // ファイルサイズが0の場合は、sent.iniに書き込まないのでnilを返す | |
1063 | - if (maxSize > 0) then begin | |
1064 | - fileSize := GikoSys.GetFileSize(GikoSys.Setting.GetSentFileName); | |
1065 | - // 最大サイズを超えていた場合はリネームする | |
1066 | - if (fileSize >= maxSize) then begin | |
1067 | - i := 0; | |
1068 | - // 今の時刻をファイル名の後ろにつける | |
1069 | - repeat | |
1070 | - // 10回以上失敗したらあきらめる | |
1071 | - if (i > 10) then break; | |
1072 | - DateTimeToString(newName, 'yyhhnnsszzz', Now()); | |
1073 | - Inc(i); | |
1074 | - until RenameFile(GikoSys.Setting.GetSentFileName, | |
1075 | - GikoSys.Setting.GetSentFileName + '.' + newName); | |
1076 | - end; | |
1077 | - Result := TMemIniFile.Create(GikoSys.Setting.GetSentFileName); | |
1078 | - end; | |
1028 | + ini.WriteString(sDate, 'Name', NameComboBox.Text); | |
1029 | + ini.WriteString(sDate, 'EMail', MailComboBox.Text); | |
1030 | + ini.WriteString(sDate, 'Body', HttpEncode(BodyEdit.Text)); | |
1031 | + ini.WriteInteger(sDate, 'Status', FStatusCode); | |
1032 | + ini.WriteDateTime(sDate, 'Date', Now); | |
1033 | + if FThreadItem = nil then begin | |
1034 | + ini.WriteString(sDate, 'Title', MojuUtils.Sanitize(TitleEdit.Text)); | |
1035 | + //ini.WriteString(sDate, 'BBS', FBoard.BBSID); | |
1036 | + ini.WriteString(sDate, 'URL', FBoard.URL); | |
1037 | + ini.WriteInteger(sDate, 'NewThread', 1); | |
1038 | + end else begin | |
1039 | + ini.WriteString(sDate, 'Title', FThreadItem.Title); | |
1040 | + //ini.WriteString(sDate, 'BBS', FThreadItem.ParentBoard.BBSID); | |
1041 | + ini.WriteString(sDate, 'URL', FThreadItem.URL); | |
1042 | + ini.WriteString(sDate, 'Key', ChangeFileExt(FThreadItem.FileName, '')); | |
1043 | + end; | |
1044 | + | |
1045 | + ini.UpdateFile; | |
1046 | + finally | |
1047 | + ini.Free; | |
1048 | + end; | |
1079 | 1049 | end; |
1050 | + | |
1080 | 1051 | procedure TEditorForm.SendActionExecute(Sender: TObject); |
1081 | 1052 | const |
1082 | 1053 | TITLE_SAMBA : string = 'Samba24警告'; |
@@ -678,8 +678,6 @@ type | ||
678 | 678 | procedure UnStoredTaskTray; |
679 | 679 | //! レスエディタの表示非表示 |
680 | 680 | procedure ShowEditors(nCmdShow: Integer); |
681 | - //! もっとも古いBrowserの開放 | |
682 | - procedure ReleaseOldestBrowser; | |
683 | 681 | protected |
684 | 682 | procedure CreateParams(var Params: TCreateParams); override; |
685 | 683 | procedure WndProc(var Message: TMessage); override; |
@@ -2523,19 +2521,6 @@ begin | ||
2523 | 2521 | end; |
2524 | 2522 | end; |
2525 | 2523 | |
2526 | -//! もっとも古いBrowserの開放 | |
2527 | -procedure TGikoForm.ReleaseOldestBrowser; | |
2528 | -var | |
2529 | - i: Integer; | |
2530 | -begin | |
2531 | - for i := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2532 | - if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = | |
2533 | - TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
2534 | - ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[i])); | |
2535 | - break; | |
2536 | - end; | |
2537 | - end; | |
2538 | -end; | |
2539 | 2524 | |
2540 | 2525 | function TGikoForm.InsertBrowserTab( |
2541 | 2526 | ThreadItem : TThreadItem; |
@@ -2545,7 +2530,6 @@ var | ||
2545 | 2530 | i, j, idx : Integer; |
2546 | 2531 | favItem : TFavoriteThreadItem; |
2547 | 2532 | newBrowser : TBrowserRecord; |
2548 | - ins : Integer; | |
2549 | 2533 | begin |
2550 | 2534 | |
2551 | 2535 | Result := nil; |
@@ -2569,8 +2553,12 @@ begin | ||
2569 | 2553 | if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin |
2570 | 2554 | Result := TBrowserRecord( BrowserTab.Tabs.Objects[i] ); |
2571 | 2555 | if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = nil then begin |
2572 | - //一番古いブラウザを開放する | |
2573 | - ReleaseOldestBrowser; | |
2556 | + for j := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2557 | + if TBrowserRecord(BrowserTab.Tabs.Objects[j]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
2558 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[j])); | |
2559 | + break; | |
2560 | + end; | |
2561 | + end; | |
2574 | 2562 | TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); |
2575 | 2563 | TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true; |
2576 | 2564 | FBrowsers.Move(BROWSER_COUNT - 1, 0); |
@@ -2585,15 +2573,21 @@ begin | ||
2585 | 2573 | end; |
2586 | 2574 | end; |
2587 | 2575 | idx := BrowserTab.TabIndex; |
2588 | - newBrowser := TBrowserRecord.Create; | |
2589 | - // 一番古いブラウザを開放する | |
2590 | - ReleaseOldestBrowser; | |
2591 | - newBrowser.Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); | |
2592 | - FBrowsers.Move(BROWSER_COUNT - 1, 0); | |
2593 | - newBrowser.thread := ThreadItem; | |
2594 | - newBrowser.Repaint := true; | |
2595 | - | |
2596 | 2576 | if GikoSys.Setting.BrowserTabAppend = gtaFirst then begin |
2577 | + newBrowser := TBrowserRecord.Create; | |
2578 | + for j := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2579 | + if TBrowserRecord(BrowserTab.Tabs.Objects[j]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
2580 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[j])); | |
2581 | + break; | |
2582 | + end; | |
2583 | + end; | |
2584 | + newBrowser.Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); | |
2585 | + FBrowsers.Move(BROWSER_COUNT - 1, 0); | |
2586 | + //newBrowser.Browser.Navigate(BLANK_HTML); | |
2587 | + newBrowser.thread := ThreadItem; | |
2588 | + newBrowser.Repaint := true; | |
2589 | +// newBrowser.OnlyHundred := GikoSys.OnlyAHundredRes; | |
2590 | + | |
2597 | 2591 | BrowserTab.Tabs.InsertObject(0, GikoSys.GetShortName(ThreadItem.Title, 20), newBrowser); |
2598 | 2592 | if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 1) then begin |
2599 | 2593 | DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 1 ] ) ); |
@@ -2603,7 +2597,22 @@ begin | ||
2603 | 2597 | if ActiveTab then begin |
2604 | 2598 | BrowserTab.TabIndex := 0; |
2605 | 2599 | end; |
2606 | - end else if GikoSys.Setting.BrowserTabAppend = gtaLast then begin | |
2600 | + | |
2601 | + end else begin | |
2602 | + newBrowser := TBrowserRecord.Create; | |
2603 | + for j := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2604 | + if TBrowserRecord(BrowserTab.Tabs.Objects[j]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
2605 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[j])); | |
2606 | + break; | |
2607 | + end; | |
2608 | + end; | |
2609 | + newBrowser.Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); | |
2610 | + FBrowsers.Move(BROWSER_COUNT - 1, 0); | |
2611 | + //newBrowser.Browser.Navigate(BLANK_HTML); | |
2612 | + newBrowser.thread := ThreadItem; | |
2613 | +// newBrowser.OnlyHundred := GikoSys.OnlyAHundredRes; | |
2614 | + newBrowser.Repaint := true; | |
2615 | + | |
2607 | 2616 | i := BrowserTab.Tabs.AddObject(GikoSys.GetShortName(ThreadItem.Title, 20), newBrowser); |
2608 | 2617 | if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 1) then begin |
2609 | 2618 | DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 0 ] ) ); |
@@ -2616,40 +2625,7 @@ begin | ||
2616 | 2625 | else |
2617 | 2626 | BrowserTab.TabIndex := i; |
2618 | 2627 | end; |
2619 | - end else begin | |
2620 | - // タブ位置を取得 | |
2621 | - ins := -1; | |
2622 | - for i := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2623 | - if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = | |
2624 | - TWebBrowser(FBrowsers[1]) then begin | |
2625 | - ins := i; | |
2626 | - break; | |
2627 | - end; | |
2628 | - end; | |
2629 | - if GikoSys.Setting.BrowserTabAppend = gtaRight then begin | |
2630 | - Inc(ins); | |
2631 | - end; | |
2632 | - // タブが無いときなど対策 | |
2633 | - if (ins < 0) then begin | |
2634 | - ins := 0; | |
2635 | - end; | |
2636 | - BrowserTab.Tabs.InsertObject(ins, GikoSys.GetShortName(ThreadItem.Title, 20), newBrowser); | |
2637 | - if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 1) then begin | |
2638 | - if GikoSys.Setting.BrowserTabAppend = gtaRight then begin | |
2639 | - DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 0 ] ) ); | |
2640 | - end else begin | |
2641 | - DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 1 ] ) ); | |
2642 | - end; | |
2643 | - end; | |
2644 | - //end; | |
2645 | - BrowserTab.Repaint; | |
2646 | - if ActiveTab then begin | |
2647 | - if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 0) then | |
2648 | - BrowserTab.TabIndex := 0 | |
2649 | - else | |
2650 | - BrowserTab.TabIndex := ins; | |
2651 | - end; | |
2652 | - end; | |
2628 | + end; | |
2653 | 2629 | Result := newBrowser; |
2654 | 2630 | if(ActiveTab) or (idx = -1) then begin |
2655 | 2631 | BrowserTab.OnChange(nil); |
@@ -2680,6 +2656,7 @@ var | ||
2680 | 2656 | sTitle: string; |
2681 | 2657 | doc: Variant; |
2682 | 2658 | s: string; |
2659 | + i: Integer; | |
2683 | 2660 | idx: Integer; |
2684 | 2661 | ThreadItem: TThreadItem; |
2685 | 2662 | Thread: TBrowserRecord; |
@@ -2716,8 +2693,12 @@ begin | ||
2716 | 2693 | end else if Thread.Browser = nil then begin |
2717 | 2694 | if FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then |
2718 | 2695 | FBrowsers.Move(BROWSER_COUNT - 1, 0); |
2719 | - // 一番古いブラウザを開放する | |
2720 | - ReleaseOldestBrowser; | |
2696 | + for i := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
2697 | + if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
2698 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[i])); | |
2699 | + break; | |
2700 | + end; | |
2701 | + end; | |
2721 | 2702 | Thread.Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); |
2722 | 2703 | FBrowsers.Move(BROWSER_COUNT - 1, 0); |
2723 | 2704 | end; |
@@ -3544,9 +3525,14 @@ begin | ||
3544 | 3525 | end; |
3545 | 3526 | if(BrowserTab.TabIndex <> -1) and |
3546 | 3527 | ( TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Browser = nil) then begin |
3547 | - // 一番古いブラウザを開放する | |
3548 | - ReleaseOldestBrowser; | |
3549 | - | |
3528 | + for j := BrowserTab.Tabs.Count - 1 downto 0 do begin | |
3529 | + if(TBrowserRecord(BrowserTab.Tabs.Objects[j]).Browser | |
3530 | + = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) )then | |
3531 | + begin | |
3532 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[j])); | |
3533 | + break; | |
3534 | + end; | |
3535 | + end; | |
3550 | 3536 | TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Browser |
3551 | 3537 | := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); |
3552 | 3538 | TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Repaint := true; |
@@ -3571,7 +3557,7 @@ end; | ||
3571 | 3557 | |
3572 | 3558 | procedure TGikoForm.ListPopupMenuPopup(Sender: TObject); |
3573 | 3559 | var |
3574 | - bBoard, bCategory : Boolean; | |
3560 | + bBoard, bCategory, bBBS : Boolean; | |
3575 | 3561 | begin |
3576 | 3562 | bBoard := (GetActiveList is TBoard); |
3577 | 3563 | bCategory := (GetActiveList is TCategory); |
@@ -3818,7 +3804,7 @@ end; | ||
3818 | 3804 | |
3819 | 3805 | procedure TGikoForm.BrowserTabChange(Sender: TObject); |
3820 | 3806 | var |
3821 | - j: Integer; | |
3807 | + i, j: Integer; | |
3822 | 3808 | idx: Integer; |
3823 | 3809 | begin |
3824 | 3810 | BrowserTab.Tabs.BeginUpdate; |
@@ -3841,9 +3827,12 @@ begin | ||
3841 | 3827 | (FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1])) then |
3842 | 3828 | FBrowsers.Move(BROWSER_COUNT - 1, 0); |
3843 | 3829 | |
3844 | - // 一番古いブラウザを開放する | |
3845 | - ReleaseOldestBrowser; | |
3846 | - | |
3830 | + for i := 0 to BrowserTab.Tabs.Count - 1 do begin | |
3831 | + if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin | |
3832 | + ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[i])); | |
3833 | + break; | |
3834 | + end; | |
3835 | + end; | |
3847 | 3836 | TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]); |
3848 | 3837 | TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Repaint := true; |
3849 | 3838 | FBrowsers.Move(BROWSER_COUNT - 1, 0); |
@@ -6520,16 +6509,14 @@ end; | ||
6520 | 6509 | //! お気に入りツリーのマウスアップイベント |
6521 | 6510 | // ************************************************************************* |
6522 | 6511 | function TGikoForm.WebBrowserClick(Sender: TObject): WordBool; |
6523 | -const | |
6524 | - LIMIT = 20; | |
6525 | 6512 | var |
6526 | 6513 | p : TPoint; |
6527 | 6514 | e: IHTMLElement; |
6528 | 6515 | AID: string; |
6529 | 6516 | stlist : TStringList; |
6530 | - i, count: Integer; | |
6517 | + i, count, rc : Integer; | |
6531 | 6518 | body : String; |
6532 | - limited : Integer; | |
6519 | + limited : boolean; | |
6533 | 6520 | begin |
6534 | 6521 | result := true; |
6535 | 6522 | try |
@@ -6565,14 +6552,13 @@ begin | ||
6565 | 6552 | end; |
6566 | 6553 | end; |
6567 | 6554 | count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread); |
6568 | - limited := LIMIT; | |
6569 | - if count > LIMIT then begin | |
6570 | - if (GikoUtil.MsgBox(Handle, | |
6571 | - IntToStr(LIMIT) + '個以上ありますが、すべて表示しますか?', | |
6555 | + limited := false; | |
6556 | + if count > 20 then begin | |
6557 | + rc := GikoUtil.MsgBox(Handle, | |
6558 | + '20個以上ありますが、すべて表示しますか?', | |
6572 | 6559 | 'IDポップアップ警告', |
6573 | - MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin | |
6574 | - limited := -1; | |
6575 | - end | |
6560 | + MB_YESNO or MB_ICONQUESTION); | |
6561 | + limited := rc <> ID_YES; | |
6576 | 6562 | end; |
6577 | 6563 | body := GikoSys.GetSameIDResAnchor(AID, FActiveContent.Thread, limited); |
6578 | 6564 | FActiveContent.IDAnchorPopup(body); |
@@ -2246,7 +2246,7 @@ begin | ||
2246 | 2246 | try |
2247 | 2247 | bound := AStringList.Count - 1; |
2248 | 2248 | if bound > -1 then begin |
2249 | - GikoSys.Setting.BrowserTabAppend := gtaLast; | |
2249 | + GikoSys.Setting.BrowserTabAppend := gtpLast; | |
2250 | 2250 | for i := 0 to bound do begin |
2251 | 2251 | item := BBSsFindThreadFromURL( AStringList[ i ] ); |
2252 | 2252 | if item <> nil then |
@@ -2385,27 +2385,24 @@ end; | ||
2385 | 2385 | //! 選択したレスをコピーする |
2386 | 2386 | // ************************************************************************* |
2387 | 2387 | procedure TGikoDM.SameIDResAnchorActionExecute(Sender: TObject); |
2388 | -const | |
2389 | - LIMIT = 20; | |
2390 | 2388 | var |
2391 | 2389 | ThreadItem : TThreadItem; |
2392 | - No, count: Integer; | |
2390 | + No, count, rc : Integer; | |
2393 | 2391 | body : string; |
2394 | - limited: Integer; | |
2392 | + limited: boolean; | |
2395 | 2393 | begin |
2396 | 2394 | No := GikoForm.KokoPopupMenu.Tag; |
2397 | 2395 | if No = 0 then Exit; |
2398 | 2396 | ThreadItem := GikoForm.GetActiveContent; |
2399 | 2397 | if ThreadItem = nil then Exit; |
2400 | 2398 | count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread); |
2401 | - limited := LIMIT; | |
2402 | - if count > LIMIT then begin | |
2403 | - if ( GikoUtil.MsgBox(GikoForm.Handle, | |
2404 | - IntToStr(LIMIT) + '個以上ありますが、すべて表示しますか?', | |
2399 | + limited := false; | |
2400 | + if count > 20 then begin | |
2401 | + rc := GikoUtil.MsgBox(GikoForm.Handle, | |
2402 | + '20個以上ありますが、すべて表示しますか?', | |
2405 | 2403 | 'IDポップアップ警告', |
2406 | - MB_YESNO or MB_ICONQUESTION) = ID_YES ) then begin | |
2407 | - limited := -1; | |
2408 | - end; | |
2404 | + MB_YESNO or MB_ICONQUESTION); | |
2405 | + limited := rc <> ID_YES; | |
2409 | 2406 | end; |
2410 | 2407 | body := GikoSys.GetSameIDResAnchor(No, ThreadItem, limited); |
2411 | 2408 | GikoForm.ActiveContent.IDAnchorPopup(body); |
@@ -216,8 +216,8 @@ type | ||
216 | 216 | procedure GetPopupResNumber(URL : string; var stRes, endRes : Int64); |
217 | 217 | |
218 | 218 | property Bayesian : TGikoBayesian read FBayesian write FBayesian; |
219 | - function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: Integer):string; overload; | |
220 | - function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: Integer):string; overload; | |
219 | + function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: boolean):string; overload; | |
220 | + function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: boolean):string; overload; | |
221 | 221 | procedure GetSameIDRes(const AID : string; ThreadItem: TThreadItem;var body: TStringList); overload; |
222 | 222 | procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload; |
223 | 223 | function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload; |
@@ -2699,12 +2699,11 @@ end; | ||
2699 | 2699 | \brief 同じ投稿 ID を持つレスをアンカーにして列挙 |
2700 | 2700 | \param AID 個人を特定する投稿 ID |
2701 | 2701 | \param ThreadItem 列挙するスレッド |
2702 | -\param limited 列挙する数を制限するなら1以上 | |
2702 | +\param limited 列挙する数を制限するなら True | |
2703 | 2703 | \return 列挙されたレスアンカー |
2704 | +\todo limited を Integer にするか、20 を外に出す | |
2704 | 2705 | } |
2705 | -function TGikoSys.GetSameIDResAnchor( | |
2706 | - const AID : string; ThreadItem: TThreadItem; | |
2707 | - limited: Integer):string; | |
2706 | +function TGikoSys.GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: boolean):string; | |
2708 | 2707 | var |
2709 | 2708 | i: integer; |
2710 | 2709 | body: TStringList; |
@@ -2721,8 +2720,8 @@ begin | ||
2721 | 2720 | body := TStringList.Create; |
2722 | 2721 | try |
2723 | 2722 | GetSameIDRes(AID, ThreadItem, body); |
2724 | - if (limited > 0) and (body.Count > limited) then begin | |
2725 | - for i := body.Count - limited to body.Count - 1 do begin | |
2723 | + if (limited) and (body.Count > 20) then begin | |
2724 | + for i := body.Count - 20 to body.Count - 1 do begin | |
2726 | 2725 | Res.FBody := Res.FBody + '>' + body[i] + ' '; |
2727 | 2726 | end; |
2728 | 2727 | end else begin |
@@ -2789,12 +2788,11 @@ end; | ||
2789 | 2788 | \brief 同じ投稿 ID を持つレスを列挙 |
2790 | 2789 | \param AIDNum 個人を特定する投稿 ID |
2791 | 2790 | \param ThreadItem 列挙するスレッド |
2792 | -\param limited 列挙する数を制限するなら1以上 | |
2791 | +\param limited 列挙する数を制限するなら True | |
2793 | 2792 | \return |
2793 | +\todo limited を Integer にするか、20 を外に出す | |
2794 | 2794 | } |
2795 | -function TGikoSys.GetSameIDResAnchor(AIDNum : Integer; | |
2796 | - ThreadItem: TThreadItem; | |
2797 | - limited: Integer):string; | |
2795 | +function TGikoSys.GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: boolean):string; | |
2798 | 2796 | var |
2799 | 2797 | i: integer; |
2800 | 2798 | body: TStringList; |
@@ -2810,10 +2808,10 @@ begin | ||
2810 | 2808 | body := TStringList.Create; |
2811 | 2809 | try |
2812 | 2810 | GetSameIDRes(AIDNum, ThreadItem, body); |
2813 | - if (limited > 0) and ( body.Count > limited) then begin | |
2814 | - for i := body.Count - 20 to body.Count - 1 do begin | |
2815 | - Res.FBody := Res.FBody + '>' + body[i] + ' '; | |
2816 | - end; | |
2811 | + if (limited) and (body.Count > 20) then begin | |
2812 | + for i := body.Count - 20 to body.Count - 1 do begin | |
2813 | + Res.FBody := Res.FBody + '>' + body[i] + ' '; | |
2814 | + end; | |
2817 | 2815 | end else begin |
2818 | 2816 | for i := 0 to body.Count - 1 do begin |
2819 | 2817 | Res.FBody := Res.FBody + '>' + body[i] + ' '; |
@@ -21,8 +21,8 @@ object KuroutOption: TKuroutOption | ||
21 | 21 | Top = 0 |
22 | 22 | Width = 517 |
23 | 23 | Height = 393 |
24 | - ActivePage = TabSheet1 | |
25 | - TabIndex = 0 | |
24 | + ActivePage = TabSheet2 | |
25 | + TabIndex = 3 | |
26 | 26 | TabOrder = 0 |
27 | 27 | object TabSheet1: TTabSheet |
28 | 28 | Caption = #35443#32048#35373#23450#65297 |
@@ -186,47 +186,6 @@ object KuroutOption: TKuroutOption | ||
186 | 186 | TabOrder = 0 |
187 | 187 | end |
188 | 188 | end |
189 | - object GroupBox4: TGroupBox | |
190 | - Left = 14 | |
191 | - Top = 293 | |
192 | - Width = 473 | |
193 | - Height = 57 | |
194 | - Caption = #26360#12365#36796#12415'Ini'#12501#12449#12452#12523 | |
195 | - TabOrder = 3 | |
196 | - object Label13: TLabel | |
197 | - Left = 13 | |
198 | - Top = 24 | |
199 | - Width = 58 | |
200 | - Height = 12 | |
201 | - Caption = #26368#22823#12469#12452#12474 | |
202 | - end | |
203 | - object Label14: TLabel | |
204 | - Left = 160 | |
205 | - Top = 24 | |
206 | - Width = 282 | |
207 | - Height = 12 | |
208 | - Caption = 'MB ('#26368#22823#12469#12452#12474#12434#36229#12360#12427#12392#12501#12449#12452#12523#12399#12522#12493#12540#12512#12373#12428#12414#12377#65289 | |
209 | - end | |
210 | - object SentIniFileSizeEdit: TEdit | |
211 | - Left = 83 | |
212 | - Top = 20 | |
213 | - Width = 54 | |
214 | - Height = 20 | |
215 | - TabOrder = 0 | |
216 | - Text = '100' | |
217 | - end | |
218 | - object SentIniFileSizeUpDown: TUpDown | |
219 | - Left = 137 | |
220 | - Top = 20 | |
221 | - Width = 15 | |
222 | - Height = 20 | |
223 | - Associate = SentIniFileSizeEdit | |
224 | - Min = 0 | |
225 | - Position = 100 | |
226 | - TabOrder = 1 | |
227 | - Wrap = False | |
228 | - end | |
229 | - end | |
230 | 189 | end |
231 | 190 | object ColumnTabSheet: TTabSheet |
232 | 191 | Caption = #35443#32048#35373#23450'2' |
@@ -74,11 +74,6 @@ type | ||
74 | 74 | RemoteTrapAtt: TCheckBox; |
75 | 75 | ReplaceDatCheckBox: TCheckBox; |
76 | 76 | Label12: TLabel; |
77 | - GroupBox4: TGroupBox; | |
78 | - SentIniFileSizeEdit: TEdit; | |
79 | - SentIniFileSizeUpDown: TUpDown; | |
80 | - Label13: TLabel; | |
81 | - Label14: TLabel; | |
82 | 77 | procedure OkBottonClick(Sender: TObject); |
83 | 78 | procedure FormCreate(Sender: TObject); |
84 | 79 | procedure CDeleteButtonClick(Sender: TObject); |
@@ -151,7 +146,6 @@ begin | ||
151 | 146 | AddKeywordCheckBox.Checked := GikoSys.Setting.AddKeywordLink; |
152 | 147 | // 誤反応対策 |
153 | 148 | ReplaceDatCheckBox.Checked := GikoSys.Setting.ReplaceDat; |
154 | - SentIniFileSizeUpDown.Position := GikoSys.Setting.SentIniFileSize; | |
155 | 149 | end; |
156 | 150 | |
157 | 151 | procedure TKuroutOption.SaveSetting; |
@@ -192,7 +186,6 @@ begin | ||
192 | 186 | GikoSys.Setting.AddKeywordLink := AddKeywordCheckBox.Checked; |
193 | 187 | // 誤反応対策 |
194 | 188 | GikoSys.Setting.ReplaceDat := ReplaceDatCheckBox.Checked; |
195 | - GikoSys.Setting.SentIniFileSize := SentIniFileSizeUpDown.Position; | |
196 | 189 | end; |
197 | 190 | |
198 | 191 | procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject); |
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog | ||
61 | 61 | Top = 4 |
62 | 62 | Width = 509 |
63 | 63 | Height = 389 |
64 | - ActivePage = TabSheet1 | |
64 | + ActivePage = TabSheet4 | |
65 | 65 | MultiLine = True |
66 | - TabIndex = 5 | |
66 | + TabIndex = 7 | |
67 | 67 | TabOrder = 3 |
68 | 68 | OnChange = OptionTabChange |
69 | 69 | object ConnectSheet: TTabSheet |
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog | ||
253 | 253 | Top = 43 |
254 | 254 | Width = 417 |
255 | 255 | Height = 20 |
256 | - ItemHeight = 12 | |
256 | + ItemHeight = 0 | |
257 | 257 | TabOrder = 0 |
258 | 258 | Text = 'BoardURLComboBox' |
259 | 259 | end |
@@ -978,12 +978,10 @@ object OptionDialog: TOptionDialog | ||
978 | 978 | Width = 477 |
979 | 979 | Height = 49 |
980 | 980 | Caption = #12473#12524#12483#12489#12398#12479#12502#36861#21152#20301#32622'(&D)' |
981 | - Columns = 4 | |
981 | + Columns = 2 | |
982 | 982 | Items.Strings = ( |
983 | 983 | #19968#30058#22987#12417 |
984 | - #19968#30058#26368#24460 | |
985 | - #29694#22312#12398#21491 | |
986 | - #29694#22312#12398#24038) | |
984 | + #19968#30058#26368#24460) | |
987 | 985 | TabOrder = 3 |
988 | 986 | end |
989 | 987 | object GroupBox8: TGroupBox |
@@ -15,7 +15,7 @@ const | ||
15 | 15 | |
16 | 16 | type |
17 | 17 | TGikoTabPosition = (gtpTop, gtpBottom); // タブ位置 |
18 | - TGikoTabAppend = (gtaFirst, gtaLast, gtaRight, gtaLeft); // タブ追加位置 | |
18 | + TGikoTabAppend = (gtaFirst, gtpLast); // タブ追加位置 | |
19 | 19 | TGikoTabStyle = (gtsTab, gtsButton, gtsFlat); // タブスタイル |
20 | 20 | TGikoListOrientation = (gloHorizontal, gloVertical); // リスト垂直・水平 |
21 | 21 | TGikoListState = (glsMax, glsNormal, glsMin); // リストサイズ状態 |
@@ -445,8 +445,6 @@ type | ||
445 | 445 | FAddKeywordLink: Boolean; |
446 | 446 | //! dat置換を有効にする |
447 | 447 | FReplaceDat: Boolean; |
448 | - //! sent.iniファイルのサイズ(単位MB) | |
449 | - FSentIniFileSize: Integer; | |
450 | 448 | |
451 | 449 | function GetMainCoolSet(Index: Integer): TCoolSet; |
452 | 450 | function GetBoardCoolSet(Index: Integer): TCoolSet; |
@@ -802,9 +800,6 @@ type | ||
802 | 800 | property AddKeywordLink: Boolean read FAddKeywordLink write FAddKeywordLink; |
803 | 801 | //! datの置換を有効にするか |
804 | 802 | property ReplaceDat: Boolean read FReplaceDat write FReplaceDat; |
805 | - //! sent.iniファイルのサイズ(単位MB) | |
806 | - property SentIniFileSize: Integer read FSentIniFileSize write FSentIniFileSize; | |
807 | - | |
808 | 803 | end; |
809 | 804 | |
810 | 805 |
@@ -1289,9 +1284,6 @@ begin | ||
1289 | 1284 | end else begin |
1290 | 1285 | FReplaceDat := ini.ReadBool('Thread', 'ReplaceDat', False); |
1291 | 1286 | end; |
1292 | - | |
1293 | - FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3); | |
1294 | - | |
1295 | 1287 | ini.UpdateFile; |
1296 | 1288 | finally |
1297 | 1289 | ini.Free; |
@@ -1671,7 +1663,6 @@ begin | ||
1671 | 1663 | ini.WriteBool('Function', 'LoopBrowserTabs', FLoopBrowserTabs); |
1672 | 1664 | ini.WriteBool('Thread', 'AddKeywordLink', FAddKeywordLink); |
1673 | 1665 | ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat); |
1674 | - ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize); | |
1675 | 1666 | ini.UpdateFile; |
1676 | 1667 | finally |
1677 | 1668 | ini.Free; |
@@ -107,11 +107,9 @@ LICENSE | ||
107 | 107 | ------------------------------ |
108 | 108 | 履歴 |
109 | 109 | ------------------------------ |
110 | -2007/04/01 | |
110 | +2007/XX/YY | |
111 | 111 | Version バタ55 |
112 | 112 | 詳細設定に、関連キーワードのリンクを追加するオプションを追加 |
113 | - セキュリティ関連ソフトのスクリプト誤反応対策機能追加 | |
114 | - スレッドの追加位置に現在タブの右/左を追加 | |
115 | 113 | |
116 | 114 | 2007/01/28 |
117 | 115 | Version バタ54 |
@@ -1,44 +1,55 @@ | ||
1 | 1 | [Setting] |
2 | -@ascii2d=30 | |
3 | -@chiri=30 | |
4 | -@gline=30 | |
2 | +@ascii2d=120 | |
3 | +@chiri=120 | |
4 | +@gline=120 | |
5 | 5 | @newsplus=120 |
6 | -@operate=30 | |
7 | -@tv=30 | |
8 | -aa6=30 | |
9 | -academy6=30 | |
10 | -anime2=45 | |
11 | -book4=30 | |
12 | -bubble5=30 | |
13 | -etc6=30 | |
14 | -ex20=30 | |
15 | -ex21=30 | |
16 | -ex22=30 | |
17 | -food7=30 | |
18 | -game11=30 | |
19 | -game12=30 | |
20 | -hobby9=30 | |
21 | -human6=30 | |
22 | -life8=30 | |
6 | +@operate=120 | |
7 | +@tv=120 | |
8 | +aa5=30 | |
9 | +academy4=30 | |
10 | +anime=45 | |
11 | +book3=30 | |
12 | +bubble4=30 | |
13 | +comic6=30 | |
14 | +etc3=30 | |
15 | +etc4=30 | |
16 | +ex11=15 | |
17 | +ex13=15 | |
18 | +ex16=15 | |
19 | +ex9=15 | |
20 | +food6=30 | |
21 | +game10=30 | |
22 | +game9=30 | |
23 | +hobby7=30 | |
24 | +hobby8=30 | |
25 | +human5=30 | |
26 | +life7=30 | |
27 | +live14=10 | |
28 | +live19=10 | |
29 | +live22x=10 | |
23 | 30 | live23=10 |
24 | -live24=10 | |
25 | -live25=10 | |
26 | -love5=30 | |
27 | -money5=30 | |
28 | -music8=30 | |
29 | -news21=30 | |
30 | -news22=30 | |
31 | -off4=30 | |
32 | -pc9=30 | |
33 | -pc11=30 | |
31 | +love3=30 | |
32 | +money4=30 | |
33 | +music5=30 | |
34 | +music6=30 | |
35 | +news18=30 | |
36 | +news19=30 | |
37 | +news20=120 | |
38 | +off3=30 | |
39 | +pc7=30 | |
40 | +pc8=30 | |
41 | +qa=30 | |
34 | 42 | qb5=30 |
35 | -school6=30 | |
36 | -science6=30 | |
37 | -sports10=60 | |
43 | +qb6=30 | |
44 | +school5=30 | |
45 | +science4=30 | |
46 | +society3=30 | |
47 | +sports9=60 | |
48 | +that4=30 | |
38 | 49 | tmp6=45 |
39 | -travel3=30 | |
40 | -tv11=60 | |
41 | -wwwww=20 | |
50 | +travel2=30 | |
51 | +tv7=30 | |
52 | +tv8=60 | |
42 | 53 | |
43 | 54 | idol=30 |
44 | 55 | pie=30 |
@@ -1,7 +1,2 @@ | ||
1 | 1 | \.vbs |
2 | 2 | body onload=window\(\) |
3 | -\.hta | |
4 | -GetSpecialFolder\( | |
5 | -CodeModule\.Lines | |
6 | -ms-its:mhtml: | |
7 | - |