• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

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

ギコナビ


Commit MetaInfo

Revision46506773ba83cfaad00ea9f99268bf29ea8eea67 (tree)
Time2008-03-26 01:17:52
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Change Summary

Incremental Difference

--- a/BrowserRecord.pas
+++ b/BrowserRecord.pas
@@ -183,37 +183,17 @@ const
183183 var
184184 CmdTarget : IOleCommandTarget;
185185 vaIn, vaOut: OleVariant;
186- PtrGUID: PGUID;
187186 begin
188- if (Self.Browser <> nil) and (Self.Browser.Document <> nil) then begin
189- //ƒuƒ‰ƒEƒU‚ªƒf[ƒ^‚̓ǂݍž‚Ý’†‚ÌŽž‚͓ǂݍž‚Ý‚ð‘Ò‚Â
190- while (Self.Browser.ReadyState <> READYSTATE_COMPLETE) and
191- (Self.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
192- Sleep(1);
193- Application.ProcessMessages;
187+ if Assigned(Self.Browser) then begin
188+ vaIn := 0;
189+ vaOut := 0;
190+ try
191+ CmdTarget := Self.Browser.ControlInterface.Document as IOleCommandTarget;
192+ if Assigned(CmdTarget) then begin
193+ CmdTarget.Exec(@CGID_WebBrowser, HTMLID_FIND, 0, vaIn, vaOut);
194+ end;
195+ except
194196 end;
195- vaIn := 0;
196- vaOut := 0;
197- New(PtrGUID);
198- PtrGUID^ := CGID_WebBrowser;
199- try
200- try
201- if Self.Browser.Document
202- .QueryInterface(IOleCommandTarget, CmdTarget)
203- = S_OK then begin
204- if CmdTarget <> nil then begin
205- try
206- CmdTarget.Exec(PtrGUID, HTMLID_FIND, 0, vaIn, vaOut);
207- finally
208- CmdTarget._Release;
209- end;
210- end;
211- end;
212- except
213- end;
214- finally
215- Dispose(PtrGUID);
216- end;
217197 end;
218198 end;
219199
--- a/Editor.dfm
+++ b/Editor.dfm
@@ -356,6 +356,19 @@ object EditorForm: TEditorForm
356356 Top = 0
357357 Action = ShowInputAssistForm
358358 end
359+ object ToolButton11: TToolButton
360+ Left = 316
361+ Top = 0
362+ Width = 8
363+ Caption = 'ToolButton11'
364+ ImageIndex = 0
365+ Style = tbsSeparator
366+ end
367+ object ToolButton10: TToolButton
368+ Left = 324
369+ Top = 0
370+ Action = ContinueModeAction
371+ end
359372 end
360373 object MainMenu: TMainMenu
361374 Left = 8
@@ -444,6 +457,20 @@ object EditorForm: TEditorForm
444457 Caption = '-'
445458 GroupIndex = 1
446459 end
460+ object N10: TMenuItem
461+ Action = OpenSendTargetAction
462+ GroupIndex = 1
463+ ShortCut = 49235
464+ end
465+ object N9: TMenuItem
466+ Action = ReloadTargetAction
467+ GroupIndex = 1
468+ ShortCut = 49234
469+ end
470+ object N8: TMenuItem
471+ Caption = '-'
472+ GroupIndex = 1
473+ end
447474 object S1: TMenuItem
448475 Action = AbortAction
449476 GroupIndex = 1
@@ -485,7 +512,7 @@ object EditorForm: TEditorForm
485512 Left = 72
486513 Top = 124
487514 Bitmap = {
488- 494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
515+ 494C01010D000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
489516 0000000000003600000028000000400000004000000001002000000000000040
490517 0000000000000000000000000000000000000000000000000000000000000000
491518 0000000000000000000000000000000000000000000000000000000000000000
@@ -505,94 +532,94 @@ object EditorForm: TEditorForm
505532 0000000000000000000000000000000000000000000000000000000000000000
506533 0000000000000000000000000000000000000000000000000000000000000000
507534 0000000000000000000000000000000000000000000000000000000000000000
535+ 0000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
508536 0000000000000000000000000000000000000000000000000000000000000000
509537 0000000000000000000000000000000000000000000000000000000000000000
510538 0000000000000000000000000000000000000000000000000000000000000000
511539 0000000000000000000000000000000000000000000000000000000000000000
512540 0000000000000000000000000000000000000000000000000000000000000000
541+ 0000000000000000000000000000000000000000000000000000000000008484
542+ 84008484840084848400848484008484840000000000FFFFFF00FFFFFF00FFFF
543+ FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
513544 0000000000000000000000000000000000000000000000000000000000000000
514545 0000000000000000000000000000000000000000000000000000000000000000
515546 0000000000000000000000000000000000000000000000000000000000000000
516547 0000000000000000000000000000000000000000000000000000000000000000
517548 0000000000000000000000000000000000000000000000000000000000000000
549+ 000000000000000000000000000000000000000000000000000000000000C6C6
550+ C600FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
551+ 0000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
518552 0000000000000000000000000000000000000000000000000000000000000000
519553 0000000000000000000000000000000000000000000000000000000000000000
520554 0000000000000000000000000000000000000000000000000000000000000000
521555 0000000000000000000000000000000000000000000000000000000000000000
522556 0000000000000000000000000000000000000000000000000000000000000000
557+ 000000000000000000000000000000000000000000000000000000000000C6C6
558+ C600FFFFFF00000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
559+ FF00000000000000000000000000000000000000000000000000000000000000
523560 0000000000000000000000000000000000000000000000000000000000000000
524561 0000000000000000000000000000000000000000000000000000000000000000
525562 0000000000000000000000000000000000000000000000000000000000000000
526563 0000000000000000000000000000000000000000000000000000000000000000
527564 0000000000000000000000000000000000000000000000000000000000000000
565+ 0000000000000000000000000000000000008484840084848400848484008484
566+ 840084848400848484008484840084848400848484008484840084848400FFFF
567+ FF00000000008484840000000000000000000000000000000000000000000000
528568 0000000000000000000000000000000000000000000000000000000000000000
529569 0000000000000000000000000000000000000000000000000000000000000000
530570 0000000000000000000000000000000000000000000000000000000000000000
531571 0000000000000000000000000000000000000000000000000000000000000000
532572 0000000000000000000000000000000000000000000000000000000000000000
573+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF00FFFF
574+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0084848400FFFF
575+ FF00FFFFFF008484840000000000000000000000000000000000000000000000
533576 0000000000000000000000000000000000000000000000000000000000000000
534577 0000000000000000000000000000000000000000000000000000000000000000
535578 0000000000000000000000000000000000000000000000000000000000000000
536579 0000000000000000000000000000000000000000000000000000000000000000
537580 0000000000000000000000000000000000000000000000000000000000000000
581+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF00FFFF
582+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00848484000000
583+ 0000FFFFFF008484840000000000000000000000000000000000000000000000
538584 0000000000000000000000000000000000000000000000000000000000000000
539585 0000000000000000000000000000000000000000000000000000000000000000
540586 0000000000000000000000000000000000000000000000000000000000000000
541587 0000000000000000000000000000000000000000000000000000000000000000
542588 0000000000000000000000000000000000000000000000000000000000000000
589+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF000000
590+ 000000000000000000000000000000000000FFFFFF00FFFFFF0084848400FFFF
591+ FF00FFFFFF008484840000000000000000000000000000000000000000000000
543592 0000000000000000000000000000000000000000000000000000000000000000
544593 0000000000000000000000000000000000000000000000000000000000000000
545594 0000000000000000000000000000000000000000000000000000000000000000
546595 0000000000000000000000000000000000000000000000000000000000000000
547596 0000000000000000000000000000000000000000000000000000000000000000
597+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF00FFFF
598+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0084848400C6C6
599+ C600C6C6C600C6C6C60000000000000000000000000000000000000000000000
548600 0000000000000000000000000000000000000000000000000000000000000000
549601 0000000000000000000000000000000000000000000000000000000000000000
550602 0000000000000000000000000000000000000000000000000000000000000000
551603 0000000000000000000000000000000000000000000000000000000000000000
552604 0000000000000000000000000000000000000000000000000000000000000000
605+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF000000
606+ 00000000000000000000000000000000000000000000FFFFFF00848484000000
553607 0000000000000000000000000000000000000000000000000000000000000000
554608 0000000000000000000000000000000000000000000000000000000000000000
555609 0000000000000000000000000000000000000000000000000000000000000000
556610 0000000000000000000000000000000000000000000000000000000000000000
557611 0000000000000000000000000000000000000000000000000000000000000000
558612 0000000000000000000000000000000000000000000000000000000000000000
613+ 000000000000000000000000000000000000C6C6C600FFFFFF00FFFFFF00FFFF
614+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00848484000000
559615 0000000000000000000000000000000000000000000000000000000000000000
560616 0000000000000000000000000000000000000000000000000000000000000000
561617 0000000000000000000000000000000000000000000000000000000000000000
562618 0000000000000000000000000000000000000000000000000000000000000000
563619 0000000000000000000000000000000000000000000000000000000000000000
564620 0000000000000000000000000000000000000000000000000000000000000000
565- 0000000000000000000000000000000000000000000000000000000000000000
566- 0000000000000000000000000000000000000000000000000000000000000000
567- 0000000000000000000000000000000000000000000000000000000000000000
568- 0000000000000000000000000000000000000000000000000000000000000000
569- 0000000000000000000000000000000000000000000000000000000000000000
570- 0000000000000000000000000000000000000000000000000000000000000000
571- 0000000000000000000000000000000000000000000000000000000000000000
572- 0000000000000000000000000000000000000000000000000000000000000000
573- 0000000000000000000000000000000000000000000000000000000000000000
574- 0000000000000000000000000000000000000000000000000000000000000000
575- 0000000000000000000000000000000000000000000000000000000000000000
576- 0000000000000000000000000000000000000000000000000000000000000000
577- 0000000000000000000000000000000000000000000000000000000000000000
578- 0000000000000000000000000000000000000000000000000000000000000000
579- 0000000000000000000000000000000000000000000000000000000000000000
580- 0000000000000000000000000000000000000000000000000000000000000000
581- 0000000000000000000000000000000000000000000000000000000000000000
582- 0000000000000000000000000000000000000000000000000000000000000000
583- 0000000000000000000000000000000000000000000000000000000000000000
584- 0000000000000000000000000000000000000000000000000000000000000000
585- 0000000000000000000000000000000000000000000000000000000000000000
586- 0000000000000000000000000000000000000000000000000000000000000000
587- 0000000000000000000000000000000000000000000000000000000000000000
588- 0000000000000000000000000000000000000000000000000000000000000000
589- 0000000000000000000000000000000000000000000000000000000000000000
590- 0000000000000000000000000000000000000000000000000000000000000000
591- 0000000000000000000000000000000000000000000000000000000000000000
592- 0000000000000000000000000000000000000000000000000000000000000000
593- 0000000000000000000000000000000000000000000000000000000000000000
594- 0000000000000000000000000000000000000000000000000000000000000000
595- 0000000000000000000000000000000000000000000000000000000000000000
621+ 000000000000000000000000000000000000C6C6C600C6C6C600C6C6C600C6C6
622+ C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C6000000
596623 0000000000000000000000000000000000000000000000000000000000000000
597624 0000000000000000000000000000000000000000000000000000000000000000
598625 0000000000000000000000000000000000000000000000000000000000000000
@@ -1001,11 +1028,11 @@ object EditorForm: TEditorForm
10011028 0000000000000000000000000000000000000000000000000000000000000000
10021029 000000000000000000000000000000000000424D3E000000000000003E000000
10031030 2800000040000000400000000100010000000000000200000000000000000000
1004- 000000000000000000000000FFFFFF0000000000000000000000000000000000
1005- 0000000000000000000000000000000000000000000000000000000000000000
1006- 0000000000000000000000000000000000000000000000000000000000000000
1007- 0000000000000000000000000000000000000000000000000000000000000000
1008- 00000000000000000000000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
1031+ 000000000000000000000000FFFFFF00FFF7000000000000FFF3000000000000
1032+ FF01000000000000E000000000000000E001000000000000E003000000000000
1033+ 0003000000000000000300000000000000030000000000000003000000000000
1034+ 0003000000000000001F000000000000001F000000000000001F000000000000
1035+ FFFF000000000000FFFF000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
10091036 C003F17FF00FF9F38001E05FE007F9F38001C017C003F80300008005800184E7
10101037 000000018001CCE7000000018001CE4F000080018001CE4F0000E0018001CE4F
10111038 0000F8038001CF1F8001FE07C0038F1F8001FF8FE007FFFFC003FFFFF00F8FFF
@@ -1024,7 +1051,7 @@ object EditorForm: TEditorForm
10241051 Left = 104
10251052 Top = 124
10261053 Bitmap = {
1027- 494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
1054+ 494C01010D000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
10281055 0000000000003600000028000000400000004000000001002000000000000040
10291056 0000000000000000000000000000000000000000000000000000000000000000
10301057 0000000000000000000000000000000000000000000000000000000000000000
@@ -1044,94 +1071,94 @@ object EditorForm: TEditorForm
10441071 0000000000000000000000000000000000000000000000000000000000000000
10451072 0000000000000000000000000000000000000000000000000000000000000000
10461073 0000000000000000000000000000000000000000000000000000000000000000
1074+ 000000FF000000FF000000000000000000000000000000000000000000000000
10471075 0000000000000000000000000000000000000000000000000000000000000000
10481076 0000000000000000000000000000000000000000000000000000000000000000
10491077 0000000000000000000000000000000000000000000000000000000000000000
10501078 0000000000000000000000000000000000000000000000000000000000000000
10511079 0000000000000000000000000000000000000000000000000000000000000000
1080+ 0000000000000000000000000000000000000000000000000000000000008484
1081+ 8400848484008484840084848400848484000000000000FF000000FF000000FF
1082+ 000000FF000000FF000000FF0000000000000000000000000000000000000000
10521083 0000000000000000000000000000000000000000000000000000000000000000
10531084 0000000000000000000000000000000000000000000000000000000000000000
10541085 0000000000000000000000000000000000000000000000000000000000000000
10551086 0000000000000000000000000000000000000000000000000000000000000000
10561087 0000000000000000000000000000000000000000000000000000000000000000
1088+ 000000000000000000000000000000000000000000000000000000000000C6C6
1089+ C60080FFFF0000FFFF0080FFFF0000FFFF000000000000000000000000000000
1090+ 000000FF000000FF000000000000000000000000000000000000000000000000
10571091 0000000000000000000000000000000000000000000000000000000000000000
10581092 0000000000000000000000000000000000000000000000000000000000000000
10591093 0000000000000000000000000000000000000000000000000000000000000000
10601094 0000000000000000000000000000000000000000000000000000000000000000
10611095 0000000000000000000000000000000000000000000000000000000000000000
1096+ 000000000000000000000000000000000000000000000000000000000000C6C6
1097+ C60000FFFF0000000000000000000000000000FFFF0080FFFF0000FFFF0080FF
1098+ FF00000000000000000000000000000000000000000000000000000000000000
10621099 0000000000000000000000000000000000000000000000000000000000000000
10631100 0000000000000000000000000000000000000000000000000000000000000000
10641101 0000000000000000000000000000000000000000000000000000000000000000
10651102 0000000000000000000000000000000000000000000000000000000000000000
10661103 0000000000000000000000000000000000000000000000000000000000000000
1104+ 0000000000000000000000000000000000008484840084848400848484008484
1105+ 84008484840084848400848484008484840084848400848484008484840000FF
1106+ FF00000000008484840000000000000000000000000000000000000000000000
10671107 0000000000000000000000000000000000000000000000000000000000000000
10681108 0000000000000000000000000000000000000000000000000000000000000000
10691109 0000000000000000000000000000000000000000000000000000000000000000
10701110 0000000000000000000000000000000000000000000000000000000000000000
10711111 0000000000000000000000000000000000000000000000000000000000000000
1112+ 000000000000000000000000000000000000C6C6C60000FFFF00FFFFFF0000FF
1113+ FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF008484840080FF
1114+ FF0000FFFF008484840000000000000000000000000000000000000000000000
10721115 0000000000000000000000000000000000000000000000000000000000000000
10731116 0000000000000000000000000000000000000000000000000000000000000000
10741117 0000000000000000000000000000000000000000000000000000000000000000
10751118 0000000000000000000000000000000000000000000000000000000000000000
10761119 0000000000000000000000000000000000000000000000000000000000000000
1120+ 000000000000000000000000000000000000C6C6C600FFFFFF0000FFFF00FFFF
1121+ FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00848484000000
1122+ 000080FFFF008484840000000000000000000000000000000000000000000000
10771123 0000000000000000000000000000000000000000000000000000000000000000
10781124 0000000000000000000000000000000000000000000000000000000000000000
10791125 0000000000000000000000000000000000000000000000000000000000000000
10801126 0000000000000000000000000000000000000000000000000000000000000000
10811127 0000000000000000000000000000000000000000000000000000000000000000
1128+ 000000000000000000000000000000000000C6C6C60000FFFF00FFFFFF000000
1129+ 000000000000000000000000000000000000FFFFFF0000FFFF008484840080FF
1130+ FF0000FFFF008484840000000000000000000000000000000000000000000000
10821131 0000000000000000000000000000000000000000000000000000000000000000
10831132 0000000000000000000000000000000000000000000000000000000000000000
10841133 0000000000000000000000000000000000000000000000000000000000000000
10851134 0000000000000000000000000000000000000000000000000000000000000000
10861135 0000000000000000000000000000000000000000000000000000000000000000
1136+ 000000000000000000000000000000000000C6C6C600FFFFFF0000FFFF00FFFF
1137+ FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0084848400C6C6
1138+ C600C6C6C600C6C6C60000000000000000000000000000000000000000000000
10871139 0000000000000000000000000000000000000000000000000000000000000000
10881140 0000000000000000000000000000000000000000000000000000000000000000
10891141 0000000000000000000000000000000000000000000000000000000000000000
10901142 0000000000000000000000000000000000000000000000000000000000000000
10911143 0000000000000000000000000000000000000000000000000000000000000000
1144+ 000000000000000000000000000000000000C6C6C60000FFFF00FFFFFF000000
1145+ 0000000000000000000000000000000000000000000000FFFF00848484000000
10921146 0000000000000000000000000000000000000000000000000000000000000000
10931147 0000000000000000000000000000000000000000000000000000000000000000
10941148 0000000000000000000000000000000000000000000000000000000000000000
10951149 0000000000000000000000000000000000000000000000000000000000000000
10961150 0000000000000000000000000000000000000000000000000000000000000000
10971151 0000000000000000000000000000000000000000000000000000000000000000
1152+ 000000000000000000000000000000000000C6C6C600FFFFFF0000FFFF00FFFF
1153+ FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00848484000000
10981154 0000000000000000000000000000000000000000000000000000000000000000
10991155 0000000000000000000000000000000000000000000000000000000000000000
11001156 0000000000000000000000000000000000000000000000000000000000000000
11011157 0000000000000000000000000000000000000000000000000000000000000000
11021158 0000000000000000000000000000000000000000000000000000000000000000
11031159 0000000000000000000000000000000000000000000000000000000000000000
1104- 0000000000000000000000000000000000000000000000000000000000000000
1105- 0000000000000000000000000000000000000000000000000000000000000000
1106- 0000000000000000000000000000000000000000000000000000000000000000
1107- 0000000000000000000000000000000000000000000000000000000000000000
1108- 0000000000000000000000000000000000000000000000000000000000000000
1109- 0000000000000000000000000000000000000000000000000000000000000000
1110- 0000000000000000000000000000000000000000000000000000000000000000
1111- 0000000000000000000000000000000000000000000000000000000000000000
1112- 0000000000000000000000000000000000000000000000000000000000000000
1113- 0000000000000000000000000000000000000000000000000000000000000000
1114- 0000000000000000000000000000000000000000000000000000000000000000
1115- 0000000000000000000000000000000000000000000000000000000000000000
1116- 0000000000000000000000000000000000000000000000000000000000000000
1117- 0000000000000000000000000000000000000000000000000000000000000000
1118- 0000000000000000000000000000000000000000000000000000000000000000
1119- 0000000000000000000000000000000000000000000000000000000000000000
1120- 0000000000000000000000000000000000000000000000000000000000000000
1121- 0000000000000000000000000000000000000000000000000000000000000000
1122- 0000000000000000000000000000000000000000000000000000000000000000
1123- 0000000000000000000000000000000000000000000000000000000000000000
1124- 0000000000000000000000000000000000000000000000000000000000000000
1125- 0000000000000000000000000000000000000000000000000000000000000000
1126- 0000000000000000000000000000000000000000000000000000000000000000
1127- 0000000000000000000000000000000000000000000000000000000000000000
1128- 0000000000000000000000000000000000000000000000000000000000000000
1129- 0000000000000000000000000000000000000000000000000000000000000000
1130- 0000000000000000000000000000000000000000000000000000000000000000
1131- 0000000000000000000000000000000000000000000000000000000000000000
1132- 0000000000000000000000000000000000000000000000000000000000000000
1133- 0000000000000000000000000000000000000000000000000000000000000000
1134- 0000000000000000000000000000000000000000000000000000000000000000
1160+ 000000000000000000000000000000000000C6C6C600C6C6C600C6C6C600C6C6
1161+ C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C6000000
11351162 0000000000000000000000000000000000000000000000000000000000000000
11361163 0000000000000000000000000000000000000000000000000000000000000000
11371164 0000000000000000000000000000000000000000000000000000000000000000
@@ -1540,11 +1567,11 @@ object EditorForm: TEditorForm
15401567 0000000000000000000000000000000000000000000000000000000000000000
15411568 000000000000000000000000000000000000424D3E000000000000003E000000
15421569 2800000040000000400000000100010000000000000200000000000000000000
1543- 000000000000000000000000FFFFFF0000000000000000000000000000000000
1544- 0000000000000000000000000000000000000000000000000000000000000000
1545- 0000000000000000000000000000000000000000000000000000000000000000
1546- 0000000000000000000000000000000000000000000000000000000000000000
1547- 00000000000000000000000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
1570+ 000000000000000000000000FFFFFF00FFF7000000000000FFF3000000000000
1571+ FF01000000000000E000000000000000E001000000000000E003000000000000
1572+ 0003000000000000000300000000000000030000000000000003000000000000
1573+ 0003000000000000001F000000000000001F000000000000001F000000000000
1574+ FFFF000000000000FFFF000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
15481575 C003F17FF00FF9F38001E05FE007F9F38001C017C003F80300000005800184E7
15491576 000000018001CCE7000000018001CE4F000080018001CE4F0000E0018001CE4F
15501577 0000F8038001CF1F8001FE07C0038F1F8001FF8FE007FFFFC003FFFFF00F8FFF
@@ -1770,6 +1797,26 @@ object EditorForm: TEditorForm
17701797 Hint = 'Cookie'#12398#24773#22577#12434#21066#38500#12377#12427
17711798 OnExecute = ReleaseCookieActionExecute
17721799 end
1800+ object ContinueModeAction: TAction
1801+ Category = #32232#38598
1802+ Caption = #36899#25237#12514#12540#12489
1803+ Hint = #36865#20449#12375#12390#12418#12454#12451#12531#12489#12454#12434#38281#12376#12394#12356
1804+ ImageIndex = 12
1805+ OnExecute = ContinueModeActionExecute
1806+ OnUpdate = ContinueModeActionUpdate
1807+ end
1808+ object OpenSendTargetAction: TAction
1809+ Category = #34920#31034
1810+ Caption = #26360#12365#36796#12416#26495'/'#12473#12524#12483#12489#12434#34920#31034#12377#12427
1811+ Hint = #26360#12365#36796#12416#26495'/'#12473#12524#12483#12489#12434#34920#31034#12377#12427
1812+ OnExecute = OpenSendTargetActionExecute
1813+ end
1814+ object ReloadTargetAction: TAction
1815+ Category = #34920#31034
1816+ Caption = #26360#12365#36796#12416#26495'/'#12473#12524#12483#12489#12434#12522#12525#12540#12489#12377#12427
1817+ Hint = #26360#12365#36796#12416#26495'/'#12473#12524#12483#12489#12434#12522#12525#12540#12489#12377#12427
1818+ OnExecute = ReloadTargetActionExecute
1819+ end
17731820 end
17741821 object IdLogDebug: TIdLogDebug
17751822 OnReceive = IdLogDebugReceive
--- a/Editor.pas
+++ b/Editor.pas
@@ -134,6 +134,14 @@ type
134134 ShowInputAssistForm: TAction;
135135 ReleaseCookieAction: TAction;
136136 Cookie1: TMenuItem;
137+ ContinueModeAction: TAction;
138+ ToolButton10: TToolButton;
139+ ToolButton11: TToolButton;
140+ OpenSendTargetAction: TAction;
141+ ReloadTargetAction: TAction;
142+ N8: TMenuItem;
143+ N9: TMenuItem;
144+ N10: TMenuItem;
137145
138146 procedure EditorPageChange(Sender: TObject);
139147 procedure FormCreate(Sender: TObject);
@@ -194,6 +202,10 @@ type
194202 procedure ReleaseCookieActionExecute(Sender: TObject);
195203 procedure GetSETTINGTXTActionUpdate(Sender: TObject);
196204 procedure GetHeadTXTActionUpdate(Sender: TObject);
205+ procedure ContinueModeActionExecute(Sender: TObject);
206+ procedure ContinueModeActionUpdate(Sender: TObject);
207+ procedure OpenSendTargetActionExecute(Sender: TObject);
208+ procedure ReloadTargetActionExecute(Sender: TObject);
197209 private
198210 FThreadItem: TThreadItem;
199211 FBoard: TBoard;
@@ -914,14 +926,18 @@ begin
914926 GikoForm.PlaySound('ResEnd');
915927 SaveSendFile;
916928 AddFormMessageNew( gmiOK );
917- Close;
918- Exit;
929+ if (not ContinueModeAction.Enabled) or (not ContinueModeAction.Checked) then begin
930+ Close;
931+ Exit;
932+ end;
919933 end;
920934 if State = gdsComplete then begin
921935 GikoForm.PlaySound('ResEnd');
922936 SaveSendFile;
923937 AddFormMessageNew( gmiOK );
924- Close;
938+ if (not ContinueModeAction.Enabled) or (not ContinueModeAction.Checked) then begin
939+ Close;
940+ end;
925941 end else if State = gdsError then begin
926942 AddFormMessageNew( gmiOK );
927943 EditorPage.ActivePage := PreviewTab;
@@ -2340,5 +2356,70 @@ begin
23402356 Result := MsgBox(Handle, MSG_FUSIANA, 'î•ñ',
23412357 MB_YESNO or MB_ICONQUESTION);
23422358 end;
2359+{
2360+\brief ˜A“Šƒ‚[ƒhON/OFFØ‚è‘Ö‚¦
2361+}
2362+procedure TEditorForm.ContinueModeActionExecute(Sender: TObject);
2363+begin
2364+ ContinueModeAction.Checked := not ContinueModeAction.Checked;
2365+end;
2366+{
2367+\brief ˜A“Šƒ‚[ƒhXVˆ—
2368+}
2369+procedure TEditorForm.ContinueModeActionUpdate(Sender: TObject);
2370+begin
2371+ // ƒXƒŒ‚½‚Ä‚Ì‚Æ‚«‚Í–³Œø
2372+ ContinueModeAction.Enabled := FThreadItem <> nil;
2373+end;
2374+{
2375+\brief ‘‚«ž‚Þ”Â/ƒXƒŒƒbƒh‚ð•\Ž¦‚·‚é
2376+}
2377+procedure TEditorForm.OpenSendTargetActionExecute(Sender: TObject);
2378+begin
2379+ if (FThreadItem <> nil) then begin
2380+ // ƒƒCƒ“‚ðXV‚µ‚Ä‚µ‚Ü‚¤‚̂ʼnæ–Ê‚ªƒpƒ^ƒpƒ^Ø‚è‘Ö‚í‚é‚Ì‚ð–h‚®‚½‚ß‚É
2381+ // ‘O–ʂŌŒ肷‚é
2382+ if not (fsShowing in Self.FormState) then begin
2383+ // ƒXƒeƒCó‘Ԃɐݒè
2384+ SetWindowPos(Handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
2385+ end;
2386+ try
2387+ // ƒXƒŒƒbƒh
2388+ GikoForm.InsertBrowserTab(FThreadItem, True);
2389+ finally
2390+ if not TopAction.Checked then begin // ƒXƒeƒCó‘Ô‰ðœ
2391+ SetWindowPos(Handle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
2392+ end;
2393+ end;
2394+ Self.SetFocus;
2395+ end else begin
2396+ // ”Â
2397+ GikoForm.SelectTreeNode(
2398+ GetBoard, True );
2399+ end;
2400+end;
2401+procedure TEditorForm.ReloadTargetActionExecute(Sender: TObject);
2402+begin
2403+ if (FThreadItem <> nil) then begin
2404+ // ƒXƒŒƒbƒh
2405+ // ƒƒCƒ“‚ðXV‚µ‚Ä‚µ‚Ü‚¤‚̂ʼnæ–Ê‚ªƒpƒ^ƒpƒ^Ø‚è‘Ö‚í‚é‚Ì‚ð–h‚®‚½‚ß‚É
2406+ // ‘O–ʂŌŒ肷‚é(ƒ_ƒEƒ“ƒ[ƒh‚ª”­¶‚·‚é‚Ɛ؂è‘Ö‚í‚Á‚Ä‚µ‚Ü‚¤‚ª‚ ‚«‚ç‚ß‚é)
2407+ if not (fsShowing in Self.FormState) then begin
2408+ // ƒXƒeƒCó‘Ԃɐݒè
2409+ SetWindowPos(Handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
2410+ end;
2411+ try
2412+ GikoForm.DownloadContent(FThreadItem);
2413+ finally
2414+ if not TopAction.Checked then begin // ƒXƒeƒCó‘Ô‰ðœ
2415+ SetWindowPos(Handle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
2416+ end;
2417+ end;
2418+ Self.SetFocus;
2419+ end else begin
2420+ // ”Â
2421+ GikoForm.DownloadList(GetBoard);
2422+ end;
2423+end;
23432424
23442425 end.
--- /dev/null
+++ b/ExtPreviewDatamodule.dfm
@@ -0,0 +1,16 @@
1+object ExtPreviewDM: TExtPreviewDM
2+ OldCreateOrder = False
3+ OnCreate = DataModuleCreate
4+ OnDestroy = DataModuleDestroy
5+ Left = 200
6+ Top = 120
7+ Height = 150
8+ Width = 215
9+ object ExecuteTimer: TTimer
10+ Enabled = False
11+ Interval = 200
12+ OnTimer = ExecuteTimerTimer
13+ Left = 120
14+ Top = 40
15+ end
16+end
--- /dev/null
+++ b/ExtPreviewDatamodule.pas
@@ -0,0 +1,185 @@
1+unit ExtPreviewDatamodule;
2+
3+interface
4+
5+uses
6+ SysUtils, Classes, bmRegExp, ExtCtrls, GikoSystem;
7+
8+type
9+ TCommand = class(TObject)
10+ private
11+ FCommand: String;
12+ FConfirm: Boolean;
13+ FContinue: Boolean;
14+ FToURL: String;
15+ public
16+ constructor Create(const comm: String);
17+ property Command: String read FCommand;
18+ property Confirm: Boolean read FConfirm write FConfirm;
19+ property Continue: Boolean read FContinue write FContinue;
20+ property ToURL: String read FToURL write FToURL;
21+ end;
22+
23+ TExtPreviewDM = class(TDataModule)
24+ ExecuteTimer: TTimer;
25+ procedure DataModuleCreate(Sender: TObject);
26+ procedure DataModuleDestroy(Sender: TObject);
27+ procedure ExecuteTimerTimer(Sender: TObject);
28+ private
29+ { Private éŒ¾ }
30+ FAWKStr: TAWKStr;
31+ FRegs: TStringList;
32+ FExecCommand: TCommand;
33+ function ReadCommand(const Line: String): TCommand;
34+ public
35+ { Public éŒ¾ }
36+ function PreviewURL(const URL: String): Boolean;
37+ end;
38+
39+var
40+ ExtPreviewDM: TExtPreviewDM;
41+
42+implementation
43+
44+uses
45+ IniFiles, GikoUtil, Windows;
46+
47+constructor TCommand.Create(const comm: String);
48+begin
49+ FCommand := comm;
50+ FConfirm := False;
51+ FContinue := False;
52+ FToURL := '';
53+end;
54+{$R *.dfm}
55+{
56+\brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
57+}
58+procedure TExtPreviewDM.DataModuleCreate(Sender: TObject);
59+var
60+ values: TStringList;
61+ i, pos: Integer;
62+begin
63+ FAWKStr := TAWKStr.Create(Self);
64+ FRegs := TStringList.Create;
65+ if (FileExists(GikoSys.GetExtpreviewFileName)) then begin
66+ values := TStringList.Create;
67+ try
68+ values.LoadFromFile(GikoSys.GetExtpreviewFileName);
69+ for i := 0 to values.Count - 1 do begin
70+ if ( AnsiPos('#',values[i]) = 1 ) then begin
71+ // æ“ª#‚ÅŽn‚Ü‚é‚̓Rƒƒ“ƒgs
72+ end else begin
73+ pos := AnsiPos(#9,values[i]);
74+ if (pos > 0) then begin
75+ FRegs.AddObject(
76+ Copy(values[i], 1, pos - 1),
77+ ReadCommand(
78+ Copy(values[i], pos + 1, Length(values[i])))
79+ );
80+ end;
81+ end;
82+ end;
83+ finally
84+ values.Free;
85+ end;
86+ end;
87+end;
88+{
89+\brief ƒfƒXƒgƒ‰ƒNƒ^
90+}
91+procedure TExtPreviewDM.DataModuleDestroy(Sender: TObject);
92+begin
93+ FRegs.Clear;
94+ FRegs.Free;
95+ FAWKStr.Free;
96+end;
97+{
98+\brief ƒRƒ}ƒ“ƒhs‰ðŽß
99+}
100+function TExtPreviewDM.ReadCommand(const Line: String): TCommand;
101+var
102+ pos: Integer;
103+ sub: String;
104+begin
105+
106+ // FCommand , FConfirm , FContinue ‚̏‡
107+ pos := AnsiPos(#9, Line);
108+ if (pos > 0) then begin
109+ Result := TCommand.Create( Copy(Line, 1, pos - 1) );
110+ sub := Copy(Line, pos + 1, Length(Line));
111+ end else begin
112+ Result := TCommand.Create( '' );
113+ sub := '';
114+ end;
115+ pos := AnsiPos(#9, sub);
116+ if (pos > 0) then begin
117+ if (AnsiLowerCase(Copy(sub, 1, pos - 1)) = 'true' ) then begin
118+ Result.Confirm := True;
119+ end;
120+ sub := Copy(Line, pos + 1, Length(Line));
121+ end;
122+ sub := Trim(sub);
123+ if (AnsiLowerCase(sub) = 'true' ) then begin
124+ Result.Continue := True;
125+ end;
126+end;
127+{
128+\brief “o˜^‚³‚ꂽURL‚ðˆ—‚·‚éƒRƒ}ƒ“ƒh‚ð•Ô‚·
129+}
130+function TExtPreviewDM.PreviewURL(const URL: String): Boolean;
131+var
132+ i: Integer;
133+ RStart: Integer;
134+ RLength: Integer;
135+ EsqURL: String;
136+begin
137+ Result := False;
138+ ExecuteTimer.Interval := 0;
139+ ExecuteTimer.Enabled := False;
140+ FExecCommand := nil;
141+ if (Length(URL) > 0) and (FRegs.Count > 0) then begin
142+ EsqURL := FAWKStr.ProcessEscSeq(URL);
143+ for i := 0 to FRegs.Count - 1 do begin
144+ FAWKStr.RegExp := FRegs[i];
145+ if ( FAWKStr.Match(EsqURL, RStart, RLength ) <> 0 ) then begin
146+ FExecCommand := TCommand(FRegs.Objects[i]);
147+ FExecCommand.ToURL := Copy(EsqURL, RStart, RLength);
148+ ExecuteTimer.Interval := GikoSys.Setting.PreviewWait;
149+ ExecuteTimer.Enabled := True;
150+ Result := not FExecCommand.FContinue;
151+ break;
152+ end;
153+ end;
154+ end;
155+end;
156+
157+procedure TExtPreviewDM.ExecuteTimerTimer(Sender: TObject);
158+var
159+ rc: Integer;
160+begin
161+ // ƒ^ƒCƒ}[’âŽ~
162+ ExecuteTimer.Interval := 0;
163+ ExecuteTimer.Enabled := False;
164+
165+ if (FExecCommand <> nil) then begin
166+ rc := ID_YES;
167+ if (FExecCommand.Confirm) then begin
168+ // Msg
169+ rc := GikoUtil.MsgBox(0, FExecCommand.Command + '‚É'#13#10 +
170+ FExecCommand.ToURL + ' ‚ð“n‚µ‚Ü‚·‚©H',
171+ 'Šm”F', MB_ICONQUESTION or MB_YESNO);
172+ end;
173+
174+ if (rc = ID_YES) then begin
175+ // “ÁŽêƒRƒ}ƒ“ƒh
176+ // nop ‰½‚à‚µ‚È‚¢
177+ if (AnsiLowerCase(FExecCommand.Command) <> 'nop') then begin
178+ GikoSys.CreateProcess(
179+ FExecCommand.Command, '"' + FExecCommand.ToURL + '"');
180+ end;
181+ end;
182+ end;
183+end;
184+
185+end.
--- a/Favorite.pas
+++ b/Favorite.pas
@@ -48,10 +48,9 @@ type
4848 private
4949 { Private éŒ¾ }
5050 FAbEnd: Boolean;
51- FStack: TStack;
5251 FTreeView: TTreeView;
5352 FModified: boolean;
54- procedure ReadNode(Node: IXMLNode);
53+ procedure ReadNode(Node: IXMLNode; Stack: TStack; TreeView: TTreeView);
5554 procedure AddSaveString(Node: TTreeNode; SaveList: TStringList);
5655 public
5756 { Public éŒ¾ }
@@ -288,6 +287,7 @@ var
288287 i: Integer;
289288 FavFolder: TFavoriteFolder;
290289 LinkExists: Boolean;
290+ Stack: TStack;
291291 begin
292292 FABend := False;
293293
@@ -306,13 +306,13 @@ begin
306306 LoadXMLDocument(FileName, XMLDoc);
307307 XMLNode := XMLDoc.DocumentElement;
308308
309- FStack := TStack.Create;
309+ Stack := TStack.Create;
310310 try
311- FStack.Push(Node);
311+ Stack.Push(Node);
312312 LinkExists := False;
313313 if XMLNode.NodeName = 'favorite' then begin
314314 for i := XMLNode.ChildNodes.Count - 1 downto 0 do begin
315- ReadNode(XMLNode.ChildNodes[i]);
315+ ReadNode(XMLNode.ChildNodes[i], Stack, FTreeView);
316316 if (XMLNode.ChildNodes[i].NodeName = 'folder') and
317317 (XMLNode.ChildNodes[i].Attributes['title'] = FAVORITE_LINK_NAME) then begin
318318 LinkExists := True;
@@ -327,7 +327,7 @@ begin
327327 end;
328328
329329 finally
330- FStack.Free;
330+ Stack.Free;
331331 XMLDoc.Free;
332332 end;
333333 except
@@ -337,29 +337,9 @@ begin
337337 end;
338338 end;
339339
340-{
341- FavFolder := TFavoriteFolder.Create;
342- Node := FTreeView.Items.AddChildObjectFirst(nil, FAVORITE_ROOT_NAME, FavFolder);
343- Node.ImageIndex := 12;
344- Node.SelectedIndex := 13;
345-
346- FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
347- if not FileExists(FileName) then
348- Exit;
349-
350- FavSAXHandler.OnStartDocument := SAXStartDocument;
351- FavSAXHandler.OnEndDocument := SAXEndDocument;
352- FavSAXHandler.OnStartElement := SAXStartElement;
353- FavSAXHandler.OnStartElement := SAXStartElement;
354- FavSAXHandler.OnEndElement := SAXEndElement;
355- FavSAXHandler.OnCharacters := SAXCharacters;
356-
357- FavSAXReader.Vendor := 'Keith Wood';
358- FavSAXReader.URL := FileName;
359- FavSAXReader.Parse;}
360340 end;
361341
362-procedure TFavoriteDM.ReadNode(Node: IXMLNode);
342+procedure TFavoriteDM.ReadNode(Node: IXMLNode; Stack: TStack; TreeView: TTreeView);
363343 var
364344 i: Integer;
365345
@@ -372,24 +352,25 @@ var
372352 threadItem : TThreadItem;
373353 begin
374354 if Node.NodeName = 'folder' then begin
375- ParentNode := FStack.Peek;
355+ CurrentNode := nil;
356+ ParentNode := Stack.Peek;
376357 if TObject(ParentNode.Data) is TFavoriteFolder then begin
377358 FavFolder := TFavoriteFolder.Create;
378- CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, Node.Attributes['title'], FavFolder);
359+ CurrentNode := TreeView.Items.AddChildObjectFirst(ParentNode, Node.Attributes['title'], FavFolder);
379360 CurrentNode.ImageIndex := 14;
380361 CurrentNode.SelectedIndex := 14;
381- FStack.Push(CurrentNode);
362+ Stack.Push(CurrentNode);
382363 end;
383364 for i := Node.ChildNodes.Count - 1 downto 0 do begin
384- ReadNode(Node.ChildNodes[i]);
365+ ReadNode(Node.ChildNodes[i], Stack, TreeView);
385366 end;
386- if TObject(ParentNode.Data) is TFavoriteFolder then
367+ if CurrentNode <> nil then
387368 CurrentNode.Expanded := Node.Attributes[ 'expanded' ] = 'true';
388- if FStack.Count <> 0 then
389- FStack.Pop;
369+ if Stack.Count <> 0 then
370+ Stack.Pop;
390371 end else if Node.NodeName = 'favitem' then begin
391372 try
392- ParentNode := FStack.Peek;
373+ ParentNode := Stack.Peek;
393374 if TObject(ParentNode.Data) is TFavoriteFolder then begin
394375 if Node.Attributes['favtype'] = 'board' then begin
395376 FavBoard := nil;
@@ -403,7 +384,7 @@ begin
403384 FavBoard := TFavoriteBoardItem.Create(
404385 Node.Attributes[ 'url' ], MojuUtils.UnSanitize(Node.Attributes[ 'title' ]), nil );
405386 end;
406- CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavBoard);
387+ CurrentNode := TreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavBoard);
407388 CurrentNode.ImageIndex := 15;
408389 CurrentNode.SelectedIndex := 15;
409390 end else if Node.Attributes['favtype'] = 'thread' then begin
@@ -431,7 +412,7 @@ begin
431412 FavThread := TFavoriteThreadItem.Create(
432413 Node.Attributes[ 'url' ], UnSanitize(Node.Attributes[ 'title' ]), nil );
433414 end;
434- CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavThread);
415+ CurrentNode := TreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavThread);
435416 CurrentNode.ImageIndex := 16;
436417 CurrentNode.SelectedIndex := 16;
437418 end;
--- a/Giko.pas
+++ b/Giko.pas
@@ -19,7 +19,7 @@ uses
1919 {HintWindow,} GikoCoolBar, GikoListView, Search, ExternalBoardManager,
2020 ExternalBoardPlugInMain, StdActns, Variants, ExtActns,IdTCPConnection,
2121 IdBaseComponent, IdTCPClient, AppEvnts, BrowserRecord, MoveHistoryItem,
22- ShellAPI,Preview, HistoryList, ResPopupBrowser;
22+ ShellAPI,Preview, HistoryList, ResPopupBrowser, ExtPreviewDatamodule;
2323
2424 const
2525 NGWORDNAME_PANEL = 3;
@@ -1992,7 +1992,10 @@ begin
19921992
19931993 //file:///C:/Borland/Projects/gikoNavi/test/read.cgi/qa/990576336/10
19941994 //file:///C:/Borland/Projects/gikoNavi/test/read.cgi/qa/990576336/10-15
1995-
1995+ // ‘¼‚̃AƒvƒŠ‚ŏˆ—‚·‚éURL‚©Šm”F
1996+ if (ExtPreviewDM.PreviewURL(Text2)) then begin
1997+ Exit;
1998+ end;
19961999 s := '';
19972000 Ext := AnsiLowerCase(ExtractFileExt(Text2));
19982001 if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and
@@ -2026,7 +2029,7 @@ begin
20262029 end;
20272030
20282031 cResPopup := FResPopupBrowser.CreateNewBrowser;
2029- tmp2 := ZenToHan(e.Get_outerText);
2032+ tmp2 := Trim(ZenToHan(e.Get_outerText));
20302033 if (GikoSys.IsNumeric(tmp2)) then begin
20312034 //‚“‚̓ŒƒX”ԍ†‚Á‚Û‚¢‚Á‚·B
20322035 wkIntSt := StrToInt64(tmp2);
@@ -2533,9 +2536,11 @@ begin
25332536
25342537 //„‰ñ‚ ‚è‚̏ꍇ•‚P‚O‚O‚O’´‚͏„‰ñíœ
25352538 if (Item.ThreadItem.Round) and (Item.ThreadItem.Count > 1000) then begin
2536- Item.ThreadItem.Round := False;
2537- //Item.ThreadItem.RoundName := '';
2538- AddMessageList('š1000”­Œ¾‚ð’´‚¦‚½‚̂ŏ„‰ñ‚ðíœ‚µ‚Ü‚µ‚½ - [' + Item.ThreadItem.Title + ']', nil, gmiOK);
2539+ // 2chˆÈŠO‚́A1000‚ªÅ‚‚©•s–¾‚Ȃ̂ŁA2chŒÀ’è‚É‚·‚é
2540+ if (Item.ThreadItem.ParentBoard.Is2ch) then begin
2541+ Item.ThreadItem.Round := False;
2542+ AddMessageList('š1000”­Œ¾‚ð’´‚¦‚½‚̂ŏ„‰ñ‚ðíœ‚µ‚Ü‚µ‚½ - [' + Item.ThreadItem.Title + ']', nil, gmiOK);
2543+ end;
25392544 end;
25402545 TreeView.Refresh;
25412546 //ListView‚Å‚±‚̃XƒŒ‚ªŠÜ‚Ü‚ê‚锂ð•\Ž¦‚µ‚Ä‚¢‚é‚Æ‚«‚̍XVˆ—
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -256,6 +256,7 @@ type
256256 procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: boolean = True);
257257 //! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
258258 function GetCreateDateFromName(FileName: String): TDateTime;
259+ function GetExtpreviewFileName: String;
259260 end;
260261
261262 var
@@ -265,7 +266,7 @@ const
265266 ZERO_DATE: Integer = 25569;
266267 BETA_VERSION_NAME_E = 'beta';
267268 BETA_VERSION_NAME_J = 'ÊÞÀ';
268- BETA_VERSION = 57;
269+ BETA_VERSION = 58;
269270 BETA_VERSION_BUILD = ''; //!< debug”Å‚È‚Ç
270271 APP_NAME = 'gikoNavi';
271272 BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -3447,6 +3448,12 @@ function TGikoSys.GetReplaceFileName: String;
34473448 begin
34483449 Result := Setting.GetReplaceFileName;
34493450 end;
3451+//! ƒvƒŒƒrƒ…[Šg’£‚̐ݒèƒtƒ@ƒCƒ‹Žæ“¾
3452+function TGikoSys.GetExtpreviewFileName: String;
3453+begin
3454+ Result := Setting.GetExtprevieFileName;
3455+end;
3456+
34503457 //! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
34513458 function TGikoSys.GetCreateDateFromName(FileName: String): TDateTime;
34523459 var
--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -937,6 +937,7 @@ var
937937 begin
938938 No := IntToStr(index + 1);
939939 DivideStrLine(Line, @Res);
940+ Res.FBody := DeleteLink(Res.FBody);
940941 AddAnchorTag(@Res);
941942 ConvRes(@Res, PResLink);
942943 Res.FDateTime := AddBeProfileLink(Res.FDateTime, index + 1);
--- a/Setting.pas
+++ b/Setting.pas
@@ -538,9 +538,10 @@ type
538538 procedure WriteLogFolder(AVal : String);
539539 function GetInputAssistFileName : String;
540540 function GetReplaceFileName: String;
541+ function GetExtprevieFileName: String;
541542 {
542543 \brief ƒŠƒ“ƒN—š—ð‚Ì•ÛŽƒTƒCƒY‚Ìsetter
543- \param AVal Ý’è‚·‚éƒTƒCƒY( >0)
544+ \param AVal Ý’è‚·‚éƒTƒCƒY( >0)
544545 }
545546 procedure SetMoveHistorySize(AVal : Integer);
546547 //ŽóMƒoƒbƒtƒ@ƒTƒCƒY
@@ -860,6 +861,7 @@ const
860861 INPUTASSIST_FILE_NAME = 'InputAssist.ini';
861862 FIXED_COOKIE = 'hana=mogera';
862863 REPLACE_FILE_NAME = 'replace.ini';
864+ EXT_PREVIEW_FILE_NAME = 'extpreview.ini';
863865
864866 implementation
865867
@@ -2167,6 +2169,10 @@ function TSetting.GetReplaceFileName: String;
21672169 begin
21682170 Result := GetConfigDir + REPLACE_FILE_NAME;
21692171 end;
2172+function TSetting.GetExtprevieFileName: String;
2173+begin
2174+ Result := GetConfigDir + EXT_PREVIEW_FILE_NAME;
2175+end;
21702176 procedure TSetting.SetMoveHistorySize(AVal : Integer);
21712177 begin
21722178 if (AVal > 0) then begin
--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -79,7 +79,8 @@ uses
7979 ReplaceDataModule in 'ReplaceDataModule.pas' {ReplaceDM: TDataModule},
8080 ResPopupBrowser in 'ResPopupBrowser.pas',
8181 SkinFiles in 'SkinFiles.pas',
82- NewBoardURL in 'NewBoardURL.pas' {NewBoardURLForm};
82+ NewBoardURL in 'NewBoardURL.pas' {NewBoardURLForm},
83+ ExtPreviewDatamodule in 'ExtPreviewDatamodule.pas' {ExtPreviewDM: TDataModule};
8384
8485 {$R *.RES}
8586 {$R gikoResource.res}
@@ -136,6 +137,7 @@ begin
136137 Application.CreateForm(TGikoDM, GikoDM);
137138 Application.CreateForm(TInputAssistDM, InputAssistDM);
138139 Application.CreateForm(TReplaceDM, ReplaceDM);
140+ Application.CreateForm(TExtPreviewDM, ExtPreviewDM);
139141 Application.CreateForm(TGikoForm, GikoForm);
140142 Application.Run;
141143 ReleaseMutex(hMutex);
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/defaultFiles.ini
+++ b/readme/defaultFiles.ini
@@ -21,3 +21,7 @@ TO=config\Board\
2121 [replace]
2222 FROM=config\default\replace.default
2323 TO=config\replace.ini
24+
25+[extpreview]
26+FROM=config\default\extpreview.default
27+TO=config\extpreview.ini
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -13,8 +13,8 @@ SourceDir=G:\Release
1313 OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
16-VersionInfoVersion=1.56.1.716
17-OutputBaseFilename=gikoNavi_b56_setup
16+VersionInfoVersion=1.57.1.744
17+OutputBaseFilename=gikoNavi_b57_setup
1818
1919
2020 [Tasks]
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
1-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ57 Readme.txt
1+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ58 Readme.txt
22
33
44 ------------------------------
@@ -108,7 +108,12 @@ LICENSE
108108 ------------------------------
109109 —š—ð
110110 ------------------------------
111-2008/XX/XX
111+2008/0X/XX
112+ Version ÊÞÀ58
113+ ƒvƒŒƒrƒ…[‚ÌURL‚©‚ç“o˜^‚µ‚Ä‚ ‚éŠO•”ƒAƒvƒŠ‚ð‹N“®‚·‚é‹@”\‚ð’ljÁ
114+ ƒŒƒX‘—MƒGƒfƒBƒ^‚ŁA˜A‘±‚µ‚Ä“Še‚Å‚«‚é‚悤‚É‚·‚é‹@”\‚ð’ljÁ
115+
116+2008/03/08
112117 Version ÊÞÀ57
113118 Ú×Ý’è‚ɁAƒXƒŒƒbƒhˆê——“ǂݍž‚ÝŽž‚Ƀ[ƒJƒ‹‚Ìdatƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒN‚µ‚È‚¢ƒIƒvƒVƒ‡ƒ“‚ð’ljÁ
114119 ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃EƒBƒ“ƒhƒE‚ðƒ_ƒuƒ‹ƒNƒŠƒbƒN‚ŏÁ‚¹‚é‚悤‚ɏC³
--- a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
@@ -83,7 +83,7 @@ const
8383 MAJOR_VERSION = 1;
8484 MINOR_VERSION = 0;
8585 RELEASE_VERSION = 'beta';
86- REVISION_VERSION = 17;
86+ REVISION_VERSION = 18;
8787
8888 // =========================================================================
8989 // ŽG—pŠÖ”
@@ -519,22 +519,27 @@ begin
519519 NewReceive := 1;
520520 Count := content.Count;
521521 end else begin
522- Result := dsDiffComplete;
523- // ’Ç‹L
524- logStream := TFileStream.Create( FilePath, fmOpenReadWrite or fmShareDenyWrite );
525- try
526- logStream.Position := logStream.Size;
527- logStream.Write( PChar( content.Text )^, Length( content.Text ) );
528- finally
529- logStream.Free;
530- end;
531- NewReceive := Count + 1;
532- Count := Count + content.Count;
522+ if (content.Count > 1) or (Trim(content.Text) <> '') then begin
523+ Result := dsDiffComplete;
524+ // ’Ç‹L
525+ logStream := TFileStream.Create( FilePath, fmOpenReadWrite or fmShareDenyWrite );
526+ try
527+ logStream.Position := logStream.Size;
528+ logStream.Write( PChar( content.Text )^, Length( content.Text ) );
529+ finally
530+ logStream.Free;
531+ end;
532+ NewReceive := Count + 1;
533+ Count := Count + content.Count;
534+ end else begin
535+ Result := dsNotModify;
536+ end;
533537 end;
534-
535- // CGI ‚©‚ç‚͐³‚µ‚¢“ú•t‚ª“¾‚ç‚ê‚È‚¢‚Ì‚ÅŒ»Ý‚ɐݒè
536- LastModified := Now;
537- NewResCount := content.Count;
538+ if (Result <> dsNotModify) then begin
539+ // CGI ‚©‚ç‚͐³‚µ‚¢“ú•t‚ª“¾‚ç‚ê‚È‚¢‚Ì‚ÅŒ»Ý‚ɐݒè
540+ LastModified := Now;
541+ NewResCount := content.Count;
542+ end;
538543 end else begin
539544 Result := dsNotModify;
540545 end;
Binary files a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res and b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res differ
--- /dev/null
+++ b/res/default/extpreview.default
@@ -0,0 +1,6 @@
1+# s“ª‚Ì#‚̓Rƒƒ“ƒg
2+# ‘ΏÛURL‚̐³‹K•\Œ»(AWK)[TAB]ŽÀsƒvƒƒOƒ‰ƒ€(“à•”‚Å"‚Ɉ͂܂ê‚é)[TAB]Šm”Fƒ_ƒCƒAƒƒO‚ðo‚·(true/other)[TAB]ƒMƒRƒiƒr‚Å‚àˆ—‚·‚é(true/other)
3+# youtube‚ÍFirefox‚É‘—‚éiŠm”F•s—vj
4+#http://jp.youtube.com/watch\?.* C:\Program Files\Mozilla Firefox\firefox.exe false false
5+# ƒjƒRƒjƒR“®‰æ‚àAFirefox‚É‘—‚éi–ˆ‰ñŠm”F‚·‚éj
6+#http://www.nicovideo.jp/watch/sm[0-9]+$ C:\Program Files\Mozilla Firefox\firefox.exe true false