• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revisiondead7d8384f675f9fbeead75a8ba46f14b95e83c (tree)
Time2007-03-21 22:43:50
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Change Summary

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -266,8 +266,6 @@ type
266266 const PON : string; Board : TBoard) : string;
267267 //! fusiana警告ダイアログ
268268 function FusianaMsgBox: Integer;
269- //! sent.iniファイルの生成
270- function CreateSentIniFile: TMemIniFile;
271269 protected
272270 procedure CreateParams(var Params: TCreateParams); override;
273271 public
@@ -1023,60 +1021,33 @@ var
10231021 sDate: string;
10241022 ini: TMemIniFile;
10251023 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));
10471027
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;
10791049 end;
1050+
10801051 procedure TEditorForm.SendActionExecute(Sender: TObject);
10811052 const
10821053 TITLE_SAMBA : string = 'Samba24警告';
--- a/Giko.pas
+++ b/Giko.pas
@@ -678,8 +678,6 @@ type
678678 procedure UnStoredTaskTray;
679679 //! レスエディタの表示非表示
680680 procedure ShowEditors(nCmdShow: Integer);
681- //! もっとも古いBrowserの開放
682- procedure ReleaseOldestBrowser;
683681 protected
684682 procedure CreateParams(var Params: TCreateParams); override;
685683 procedure WndProc(var Message: TMessage); override;
@@ -2523,19 +2521,6 @@ begin
25232521 end;
25242522 end;
25252523
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;
25392524
25402525 function TGikoForm.InsertBrowserTab(
25412526 ThreadItem : TThreadItem;
@@ -2545,7 +2530,6 @@ var
25452530 i, j, idx : Integer;
25462531 favItem : TFavoriteThreadItem;
25472532 newBrowser : TBrowserRecord;
2548- ins : Integer;
25492533 begin
25502534
25512535 Result := nil;
@@ -2569,8 +2553,12 @@ begin
25692553 if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin
25702554 Result := TBrowserRecord( BrowserTab.Tabs.Objects[i] );
25712555 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;
25742562 TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
25752563 TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
25762564 FBrowsers.Move(BROWSER_COUNT - 1, 0);
@@ -2585,15 +2573,21 @@ begin
25852573 end;
25862574 end;
25872575 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-
25962576 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+
25972591 BrowserTab.Tabs.InsertObject(0, GikoSys.GetShortName(ThreadItem.Title, 20), newBrowser);
25982592 if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 1) then begin
25992593 DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 1 ] ) );
@@ -2603,7 +2597,22 @@ begin
26032597 if ActiveTab then begin
26042598 BrowserTab.TabIndex := 0;
26052599 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+
26072616 i := BrowserTab.Tabs.AddObject(GikoSys.GetShortName(ThreadItem.Title, 20), newBrowser);
26082617 if (not GikoSys.Setting.BrowserTabVisible) and (BrowserTab.Tabs.Count > 1) then begin
26092618 DeleteTab( TBrowserRecord( BrowserTab.Tabs.Objects[ 0 ] ) );
@@ -2616,40 +2625,7 @@ begin
26162625 else
26172626 BrowserTab.TabIndex := i;
26182627 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;
26532629 Result := newBrowser;
26542630 if(ActiveTab) or (idx = -1) then begin
26552631 BrowserTab.OnChange(nil);
@@ -2680,6 +2656,7 @@ var
26802656 sTitle: string;
26812657 doc: Variant;
26822658 s: string;
2659+ i: Integer;
26832660 idx: Integer;
26842661 ThreadItem: TThreadItem;
26852662 Thread: TBrowserRecord;
@@ -2716,8 +2693,12 @@ begin
27162693 end else if Thread.Browser = nil then begin
27172694 if FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then
27182695 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;
27212702 Thread.Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
27222703 FBrowsers.Move(BROWSER_COUNT - 1, 0);
27232704 end;
@@ -3544,9 +3525,14 @@ begin
35443525 end;
35453526 if(BrowserTab.TabIndex <> -1) and
35463527 ( 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;
35503536 TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Browser
35513537 := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
35523538 TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Repaint := true;
@@ -3571,7 +3557,7 @@ end;
35713557
35723558 procedure TGikoForm.ListPopupMenuPopup(Sender: TObject);
35733559 var
3574- bBoard, bCategory : Boolean;
3560+ bBoard, bCategory, bBBS : Boolean;
35753561 begin
35763562 bBoard := (GetActiveList is TBoard);
35773563 bCategory := (GetActiveList is TCategory);
@@ -3818,7 +3804,7 @@ end;
38183804
38193805 procedure TGikoForm.BrowserTabChange(Sender: TObject);
38203806 var
3821- j: Integer;
3807+ i, j: Integer;
38223808 idx: Integer;
38233809 begin
38243810 BrowserTab.Tabs.BeginUpdate;
@@ -3841,9 +3827,12 @@ begin
38413827 (FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1])) then
38423828 FBrowsers.Move(BROWSER_COUNT - 1, 0);
38433829
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;
38473836 TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
38483837 TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Repaint := true;
38493838 FBrowsers.Move(BROWSER_COUNT - 1, 0);
@@ -6520,16 +6509,14 @@ end;
65206509 //! お気に入りツリーのマウスアップイベント
65216510 // *************************************************************************
65226511 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
6523-const
6524- LIMIT = 20;
65256512 var
65266513 p : TPoint;
65276514 e: IHTMLElement;
65286515 AID: string;
65296516 stlist : TStringList;
6530- i, count: Integer;
6517+ i, count, rc : Integer;
65316518 body : String;
6532- limited : Integer;
6519+ limited : boolean;
65336520 begin
65346521 result := true;
65356522 try
@@ -6565,14 +6552,13 @@ begin
65656552 end;
65666553 end;
65676554 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個以上ありますが、すべて表示しますか?',
65726559 '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;
65766562 end;
65776563 body := GikoSys.GetSameIDResAnchor(AID, FActiveContent.Thread, limited);
65786564 FActiveContent.IDAnchorPopup(body);
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2246,7 +2246,7 @@ begin
22462246 try
22472247 bound := AStringList.Count - 1;
22482248 if bound > -1 then begin
2249- GikoSys.Setting.BrowserTabAppend := gtaLast;
2249+ GikoSys.Setting.BrowserTabAppend := gtpLast;
22502250 for i := 0 to bound do begin
22512251 item := BBSsFindThreadFromURL( AStringList[ i ] );
22522252 if item <> nil then
@@ -2385,27 +2385,24 @@ end;
23852385 //! 選択したレスをコピーする
23862386 // *************************************************************************
23872387 procedure TGikoDM.SameIDResAnchorActionExecute(Sender: TObject);
2388-const
2389- LIMIT = 20;
23902388 var
23912389 ThreadItem : TThreadItem;
2392- No, count: Integer;
2390+ No, count, rc : Integer;
23932391 body : string;
2394- limited: Integer;
2392+ limited: boolean;
23952393 begin
23962394 No := GikoForm.KokoPopupMenu.Tag;
23972395 if No = 0 then Exit;
23982396 ThreadItem := GikoForm.GetActiveContent;
23992397 if ThreadItem = nil then Exit;
24002398 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個以上ありますが、すべて表示しますか?',
24052403 '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;
24092406 end;
24102407 body := GikoSys.GetSameIDResAnchor(No, ThreadItem, limited);
24112408 GikoForm.ActiveContent.IDAnchorPopup(body);
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -216,8 +216,8 @@ type
216216 procedure GetPopupResNumber(URL : string; var stRes, endRes : Int64);
217217
218218 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;
221221 procedure GetSameIDRes(const AID : string; ThreadItem: TThreadItem;var body: TStringList); overload;
222222 procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload;
223223 function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload;
@@ -2699,12 +2699,11 @@ end;
26992699 \brief 同じ投稿 ID を持つレスをアンカーにして列挙
27002700 \param AID 個人を特定する投稿 ID
27012701 \param ThreadItem 列挙するスレッド
2702-\param limited 列挙する数を制限するなら1以上
2702+\param limited 列挙する数を制限するなら True
27032703 \return 列挙されたレスアンカー
2704+\todo limited を Integer にするか、20 を外に出す
27042705 }
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;
27082707 var
27092708 i: integer;
27102709 body: TStringList;
@@ -2721,8 +2720,8 @@ begin
27212720 body := TStringList.Create;
27222721 try
27232722 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
27262725 Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
27272726 end;
27282727 end else begin
@@ -2789,12 +2788,11 @@ end;
27892788 \brief 同じ投稿 ID を持つレスを列挙
27902789 \param AIDNum 個人を特定する投稿 ID
27912790 \param ThreadItem 列挙するスレッド
2792-\param limited 列挙する数を制限するなら1以上
2791+\param limited 列挙する数を制限するなら True
27932792 \return
2793+\todo limited を Integer にするか、20 を外に出す
27942794 }
2795-function TGikoSys.GetSameIDResAnchor(AIDNum : Integer;
2796- ThreadItem: TThreadItem;
2797- limited: Integer):string;
2795+function TGikoSys.GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: boolean):string;
27982796 var
27992797 i: integer;
28002798 body: TStringList;
@@ -2810,10 +2808,10 @@ begin
28102808 body := TStringList.Create;
28112809 try
28122810 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 + '&gt;' + 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 + '&gt;' + body[i] + ' ';
2814+ end;
28172815 end else begin
28182816 for i := 0 to body.Count - 1 do begin
28192817 Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -21,8 +21,8 @@ object KuroutOption: TKuroutOption
2121 Top = 0
2222 Width = 517
2323 Height = 393
24- ActivePage = TabSheet1
25- TabIndex = 0
24+ ActivePage = TabSheet2
25+ TabIndex = 3
2626 TabOrder = 0
2727 object TabSheet1: TTabSheet
2828 Caption = #35443#32048#35373#23450#65297
@@ -186,47 +186,6 @@ object KuroutOption: TKuroutOption
186186 TabOrder = 0
187187 end
188188 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
230189 end
231190 object ColumnTabSheet: TTabSheet
232191 Caption = #35443#32048#35373#23450'2'
--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -74,11 +74,6 @@ type
7474 RemoteTrapAtt: TCheckBox;
7575 ReplaceDatCheckBox: TCheckBox;
7676 Label12: TLabel;
77- GroupBox4: TGroupBox;
78- SentIniFileSizeEdit: TEdit;
79- SentIniFileSizeUpDown: TUpDown;
80- Label13: TLabel;
81- Label14: TLabel;
8277 procedure OkBottonClick(Sender: TObject);
8378 procedure FormCreate(Sender: TObject);
8479 procedure CDeleteButtonClick(Sender: TObject);
@@ -151,7 +146,6 @@ begin
151146 AddKeywordCheckBox.Checked := GikoSys.Setting.AddKeywordLink;
152147 // 誤反応対策
153148 ReplaceDatCheckBox.Checked := GikoSys.Setting.ReplaceDat;
154- SentIniFileSizeUpDown.Position := GikoSys.Setting.SentIniFileSize;
155149 end;
156150
157151 procedure TKuroutOption.SaveSetting;
@@ -192,7 +186,6 @@ begin
192186 GikoSys.Setting.AddKeywordLink := AddKeywordCheckBox.Checked;
193187 // 誤反応対策
194188 GikoSys.Setting.ReplaceDat := ReplaceDatCheckBox.Checked;
195- GikoSys.Setting.SentIniFileSize := SentIniFileSizeUpDown.Position;
196189 end;
197190
198191 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);
--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
6161 Top = 4
6262 Width = 509
6363 Height = 389
64- ActivePage = TabSheet1
64+ ActivePage = TabSheet4
6565 MultiLine = True
66- TabIndex = 5
66+ TabIndex = 7
6767 TabOrder = 3
6868 OnChange = OptionTabChange
6969 object ConnectSheet: TTabSheet
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
253253 Top = 43
254254 Width = 417
255255 Height = 20
256- ItemHeight = 12
256+ ItemHeight = 0
257257 TabOrder = 0
258258 Text = 'BoardURLComboBox'
259259 end
@@ -978,12 +978,10 @@ object OptionDialog: TOptionDialog
978978 Width = 477
979979 Height = 49
980980 Caption = #12473#12524#12483#12489#12398#12479#12502#36861#21152#20301#32622'(&D)'
981- Columns = 4
981+ Columns = 2
982982 Items.Strings = (
983983 #19968#30058#22987#12417
984- #19968#30058#26368#24460
985- #29694#22312#12398#21491
986- #29694#22312#12398#24038)
984+ #19968#30058#26368#24460)
987985 TabOrder = 3
988986 end
989987 object GroupBox8: TGroupBox
--- a/Setting.pas
+++ b/Setting.pas
@@ -15,7 +15,7 @@ const
1515
1616 type
1717 TGikoTabPosition = (gtpTop, gtpBottom); // タブ位置
18- TGikoTabAppend = (gtaFirst, gtaLast, gtaRight, gtaLeft); // タブ追加位置
18+ TGikoTabAppend = (gtaFirst, gtpLast); // タブ追加位置
1919 TGikoTabStyle = (gtsTab, gtsButton, gtsFlat); // タブスタイル
2020 TGikoListOrientation = (gloHorizontal, gloVertical); // リスト垂直・水平
2121 TGikoListState = (glsMax, glsNormal, glsMin); // リストサイズ状態
@@ -445,8 +445,6 @@ type
445445 FAddKeywordLink: Boolean;
446446 //! dat置換を有効にする
447447 FReplaceDat: Boolean;
448- //! sent.iniファイルのサイズ(単位MB)
449- FSentIniFileSize: Integer;
450448
451449 function GetMainCoolSet(Index: Integer): TCoolSet;
452450 function GetBoardCoolSet(Index: Integer): TCoolSet;
@@ -802,9 +800,6 @@ type
802800 property AddKeywordLink: Boolean read FAddKeywordLink write FAddKeywordLink;
803801 //! datの置換を有効にするか
804802 property ReplaceDat: Boolean read FReplaceDat write FReplaceDat;
805- //! sent.iniファイルのサイズ(単位MB)
806- property SentIniFileSize: Integer read FSentIniFileSize write FSentIniFileSize;
807-
808803 end;
809804
810805
@@ -1289,9 +1284,6 @@ begin
12891284 end else begin
12901285 FReplaceDat := ini.ReadBool('Thread', 'ReplaceDat', False);
12911286 end;
1292-
1293- FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3);
1294-
12951287 ini.UpdateFile;
12961288 finally
12971289 ini.Free;
@@ -1671,7 +1663,6 @@ begin
16711663 ini.WriteBool('Function', 'LoopBrowserTabs', FLoopBrowserTabs);
16721664 ini.WriteBool('Thread', 'AddKeywordLink', FAddKeywordLink);
16731665 ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat);
1674- ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize);
16751666 ini.UpdateFile;
16761667 finally
16771668 ini.Free;
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -107,11 +107,9 @@ LICENSE
107107 ------------------------------
108108 履歴
109109 ------------------------------
110-2007/04/01
110+2007/XX/YY
111111 Version バタ55
112112  詳細設定に、関連キーワードのリンクを追加するオプションを追加
113- セキュリティ関連ソフトのスクリプト誤反応対策機能追加
114- スレッドの追加位置に現在タブの右/左を追加
115113
116114 2007/01/28
117115 Version バタ54
--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,44 +1,55 @@
11 [Setting]
2-@ascii2d=30
3-@chiri=30
4-@gline=30
2+@ascii2d=120
3+@chiri=120
4+@gline=120
55 @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
2330 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
3442 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
3849 tmp6=45
39-travel3=30
40-tv11=60
41-wwwww=20
50+travel2=30
51+tv7=30
52+tv8=60
4253
4354 idol=30
4455 pie=30
--- a/res/default/replace.default
+++ b/res/default/replace.default
@@ -1,7 +1,2 @@
11 \.vbs
22 body onload=window\(\)
3-\.hta
4-GetSpecialFolder\(
5-CodeModule\.Lines
6-ms-its:mhtml:
7-
Show on old repository browser