• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revisionc9436ace9a66fb70e205974f4b5a1ab3926fa728 (tree)
Time2005-04-02 18:01:38
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Change Summary

Incremental Difference

--- a/Editor.dfm
+++ b/Editor.dfm
@@ -337,12 +337,6 @@ object EditorForm: TEditorForm
337337 Action = SaveNameMailAction
338338 Style = tbsCheck
339339 end
340- object ToolButton7: TToolButton
341- Left = 262
342- Top = 0
343- Action = BeLogInOutEAction
344- Style = tbsCheck
345- end
346340 end
347341 object MainMenu: TMainMenu
348342 Left = 8
@@ -463,7 +457,7 @@ object EditorForm: TEditorForm
463457 Left = 72
464458 Top = 124
465459 Bitmap = {
466- 494C01010B000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
460+ 494C01010A000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
467461 0000000000003600000028000000400000004000000001002000000000000040
468462 0000000000000000000000000000000000000000000000000000000000000000
469463 0000000000000000000000000000000000000000000000000000000000000000
@@ -606,7 +600,7 @@ object EditorForm: TEditorForm
606600 0000000000000000000000000000000000000000000000000000000000000000
607601 0000000000000000000010101000000000000000000000000000000000000000
608602 0000000000000000000000000000000000000000000000000000000000000000
609- 0000000000008080800080808000808080008080800080808000808080000000
603+ 0000000000000000000000000000000000000000000000000000000000000000
610604 0000000000000000000000000000000000000000000000000000000000000000
611605 0000000000000000000000000000000000000000000000000000000000000000
612606 0000000000000000000000000000000000000000000000000000000000008484
@@ -614,103 +608,103 @@ object EditorForm: TEditorForm
614608 8400848484000000000000000000000000000000000000000000000000000000
615609 0000ADADAD001818180010101000000000001010100000000000000000000000
616610 0000000000000000000000000000000000000000000000000000000000000000
617- 000080808000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0008080
618- 8000000000000000000000000000000000000000000000000000000000000000
611+ 0000000000000000000000000000000000000000000000000000000000000000
612+ 0000000000000000000000000000000000000000000000000000000000000000
619613 0000000000000000000000000000000000000000000000000000000000000000
620614 0000000000000000000000000000000000000000000000000000848484008484
621615 8400848484008484840084848400848484008484840084848400848484008484
622616 8400848484008484840000000000000000000000000000000000000000001010
623617 1000F7F7F7004242420021212100101010001010100000000000101010000000
624- 0000000000000000000000000000000000000000000000000000000000008080
625- 8000C0C0C0000000000000000000000000000000000000000000000000000000
626- 0000808080000000000000000000000000000000000000000000000000000000
618+ 0000000000000000000000000000000000000000000000000000000000000000
619+ 0000000000000000000000000000000000000000000000000000000000000000
620+ 0000000000000000000000000000000000000000000000000000000000000000
627621 0000000000000000000000000000000000000000000000000000000000000000
628622 0000000000000000000000000000000000000000000000000000848484008484
629623 8400848484008484840084848400848484008484840084848400848484008484
630624 840084848400848484000000000000000000000000000000000010101000CECE
631625 CE00FFFFFF00EFEFEF00B5B5B500393939002121210010101000101010000000
632- 000010101000000000000000000000000000000000000000000080808000C0C0
633- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF00C0C0C0000000
634- 0000000000008080800000000000000000000000000000000000000000000000
626+ 0000101010000000000000000000000000000000000000000000000000000000
627+ 0000000000000000000000000000000000000000000000000000000000000000
628+ 0000000000000000000000000000000000000000000000000000000000000000
635629 0000000000000000000000000000000000000000000000000000000000000000
636630 0000000000000000000000000000000000000000000084848400848484008484
637631 8400848484008484840084848400848484008484840084848400848484008484
638632 84008484840084848400848484000000000000000000ADADAD007B7B7B00EFEF
639633 EF00EFEFEF00FFFFFF00F7F7F700E7E7E7009C9C9C0029292900212121000808
640- 0800101010000000000010101000000000000000000080808000C0C0C000C0C0
641- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000C0C0C0000000
642- 000000000000C0C0C00080808000000000000000000000000000000000000000
634+ 0800101010000000000010101000000000000000000000000000000000000000
635+ 0000000000000000000000000000000000000000000000000000000000000000
636+ 0000000000000000000000000000000000000000000000000000000000000000
643637 0000000000000000000000000000000000000000000000000000000000000000
644638 0000000000000000000000000000000000000000000084848400848484008484
645639 840084848400FFFFFF00FFFFFF008484840084848400FFFFFF00FFFFFF008484
646640 84008484840084848400848484000000000010101000FFFFFF00F7F7F700DEDE
647641 DE00FFFFFF00FFFFFF00F7F7F700F7F7F700F7F7F700DEDEDE009C9C9C002929
648- 2900212121000808080010101000000000000000000080808000C0C0C000C0C0
649- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000C0C0C0000000
650- 000000000000C0C0C00080808000000000000000000000000000000000000000
642+ 2900212121000808080010101000000000000000000000000000000000000000
643+ 0000000000000000000000000000000000000000000000000000000000000000
644+ 0000000000000000000000000000000000000000000000000000000000000000
651645 0000000000000000000000000000000000000000000000000000000000000000
652646 0000000000000000000000000000000000000000000084848400848484008484
653647 84008484840084848400FFFFFF00FFFFFF00FFFFFF00FFFFFF00848484008484
654648 84008484840084848400848484000000000010101000FFFFFF00FFFFFF00FFFF
655649 FF00FFFFFF00F7F7F700F7F7F700F7F7F700EFEFEF00EFEFEF00DEDEDE00D6D6
656- D6008C8C8C002121210018181800000000000000000080808000C0C0C000C0C0
657- C000C0C0C0000000000000000000000000000000000000000000000000000000
658- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
650+ D6008C8C8C002121210018181800000000000000000000000000000000000000
651+ 0000000000000000000000000000000000000000000000000000000000000000
652+ 0000000000000000000000000000000000000000000000000000000000000000
659653 0000000000000000000000000000000000000000000000000000000000000000
660654 0000000000000000000000000000000000000000000084848400848484008484
661655 8400848484008484840084848400FFFFFF00FFFFFF0084848400848484008484
662656 8400848484008484840084848400000000000000000010101000D6D6D600F7F7
663657 F700F7F7F700F7F7F700F7F7F700EFEFEF00EFEFEF00EFEFEF00E7E7E700D6D6
664- D600D6D6D600C6C6C60073737300000000000000000080808000C0C0C000C0C0
665- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF0000000000C0C0
666- C000C0C0C000C0C0C00080808000000000000000000000000000000000000000
658+ D600D6D6D600C6C6C60073737300000000000000000000000000000000000000
659+ 0000000000000000000000000000000000000000000000000000000000000000
660+ 0000000000000000000000000000000000000000000000000000000000000000
667661 0000000000000000000000000000000000000000000000000000000000000000
668662 0000000000000000000000000000000000000000000084848400848484008484
669663 84008484840084848400FFFFFF00FFFFFF00FFFFFF00FFFFFF00848484008484
670664 8400848484008484840084848400000000000000000000000000000000001010
671665 1000D6D6D600F7F7F700F7F7F700EFEFEF00E7E7E700E7E7E700D6D6D600D6D6
672- D600CECECE00C6C6C60000000000000000000000000080808000C0C0C000C0C0
673- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000000000000000
674- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
666+ D600CECECE00C6C6C60000000000000000000000000000000000000000000000
667+ 0000000000000000000000000000000000000000000000000000000000000000
668+ 0000000000000000000000000000000000000000000000000000000000000000
675669 0000000000000000000000000000000000000000000000000000000000000000
676670 0000000000000000000000000000000000000000000084848400848484008484
677671 840084848400FFFFFF00FFFFFF008484840084848400FFFFFF00FFFFFF008484
678672 8400848484008484840084848400000000000000000000000000000000000000
679673 00000000000010101000CECECE00E7E7E700DEDEDE00D6D6D600D6D6D600CECE
680- CE00C6C6C6000000000000000000000000000000000080808000C0C0C000C0C0
681- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000000000000000
682- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
674+ CE00C6C6C6000000000000000000000000000000000000000000000000000000
675+ 0000000000000000000000000000000000000000000000000000000000000000
676+ 0000000000000000000000000000000000000000000000000000000000000000
683677 0000000000000000000000000000000000000000000000000000000000000000
684678 0000000000000000000000000000000000000000000000000000848484008484
685679 8400848484008484840084848400848484008484840084848400848484008484
686680 8400848484008484840000000000000000000000000000000000000000000000
687681 000000000000000000000000000010101000C6C6C600D6D6D600CECECE00CECE
688- CE0000000000000000000000000000000000000000000000000080808000C0C0
689- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000000000
690- 0000C0C0C0008080800000000000000000000000000000000000000000000000
682+ CE00000000000000000000000000000000000000000000000000000000000000
683+ 0000000000000000000000000000000000000000000000000000000000000000
684+ 0000000000000000000000000000000000000000000000000000000000000000
691685 0000000000000000000000000000000000000000000000000000000000000000
692686 0000000000000000000000000000000000000000000000000000848484008484
693687 8400848484008484840084848400848484008484840084848400848484008484
694688 8400848484008484840000000000000000000000000000000000000000000000
695689 0000000000000000000000000000000000000000000010101000BDBDBD000000
696- 0000000000000000000000000000000000000000000000000000000000008080
697- 8000C0C0C000000000000000000000000000000000000000000000000000C0C0
698- C000808080000000000000000000000000000000000000000000000000000000
690+ 0000000000000000000000000000000000000000000000000000000000000000
691+ 0000000000000000000000000000000000000000000000000000000000000000
692+ 0000000000000000000000000000000000000000000000000000000000000000
699693 0000000000000000000000000000000000000000000000000000000000000000
700694 0000000000000000000000000000000000000000000000000000000000008484
701695 8400848484008484840084848400848484008484840084848400848484008484
702696 8400848484000000000000000000000000000000000000000000000000000000
703697 0000000000000000000000000000000000000000000000000000000000000000
704698 0000000000000000000000000000000000000000000000000000000000000000
705- 000080808000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0008080
706- 8000000000000000000000000000000000000000000000000000000000000000
699+ 0000000000000000000000000000000000000000000000000000000000000000
700+ 0000000000000000000000000000000000000000000000000000000000000000
707701 0000000000000000000000000000000000000000000000000000000000000000
708702 0000000000000000000000000000000000000000000000000000000000000000
709703 0000000000008484840084848400848484008484840084848400848484000000
710704 0000000000000000000000000000000000000000000000000000000000000000
711705 0000000000000000000000000000000000000000000000000000000000000000
712706 0000000000000000000000000000000000000000000000000000000000000000
713- 0000000000008080800080808000808080008080800080808000808080000000
707+ 0000000000000000000000000000000000000000000000000000000000000000
714708 0000000000000000000000000000000000000000000000000000000000000000
715709 0000000000000000000000000000000000000000000000000000000000000000
716710 0000000000000000000000000000000000000000000000000000000000000000
@@ -983,11 +977,11 @@ object EditorForm: TEditorForm
983977 0000000000000000000000000000000000000000000000000000000000000000
984978 0000000000000000000000000000000000000000000000000000000000000000
985979 0000000000000000000000000000000000000000000000000000000000000000
986- 00000000000000000000000000000000F81FFFFFFFFF0000E007FDFFF81F0000
987- C003F17FF00F00008001E05FE00700008001C017C00300000000800580010000
988- 0000000180010000000000018001000000008001800100000000E00180010000
989- 0000F803800100008001FE07C00300008001FF8FE0070000C003FFFFF00F0000
990- E007FFFFF81F0000F81FFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
980+ 00000000000000000000000000000000F81FFFFF00000000E007FDFF00000000
981+ C003F17F000000008001E05F000000008001C017000000000000800500000000
982+ 0000000100000000000000010000000000008001000000000000E00100000000
983+ 0000F803000000008001FE07000000008001FF8F00000000C003FFFF00000000
984+ E007FFFF00000000F81FFFFF00000000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
991985 FE00C000F000F000FE008000F000F000FE008000F000F0008000800000000000
992986 8000800070000000800080017000000080008001700000008001800170000000
993987 8003800170000000800780017FDF001F807F8001001F001F80FFC003001F001F
@@ -995,13 +989,14 @@ object EditorForm: TEditorForm
995989 FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFF7F887
996990 0003003FC1F7FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
997991 0003C400DCF7FEBF0003CC00FF0FFC9F0003D400FFFFFDDF0003F800FFFFFDDF
998- FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
992+ FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
993+ 000000000000}
999994 end
1000995 object HotToobarImageList: TImageList
1001996 Left = 104
1002997 Top = 124
1003998 Bitmap = {
1004- 494C01010B000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
999+ 494C01010A000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
10051000 0000000000003600000028000000400000004000000001002000000000000040
10061001 0000000000000000000000000000000000000000000000000000000000000000
10071002 0000000000000000000000000000000000000000000000000000000000000000
@@ -1144,7 +1139,7 @@ object EditorForm: TEditorForm
11441139 0000000000000000000000000000000000000000000000000000000000000000
11451140 0000000000000000000042424200000000000000000000000000000000000000
11461141 0000000000000000000000000000000000000000000000000000000000000000
1147- 0000000000000040800000408000004080000040800000408000004080000000
1142+ 0000000000000000000000000000000000000000000000000000000000000000
11481143 0000000000000000000000000000000000000000000000000000000000000000
11491144 0000000000000000000000000000000000000000000000000000000000000000
11501145 0000000000000000000000000000000000000000000000000000000000000000
@@ -1152,103 +1147,103 @@ object EditorForm: TEditorForm
11521147 8400000084000000000000000000000000000000000000000000000000000000
11531148 0000949494004242420039393900000000003939390000000000000000000000
11541149 0000000000000000000000000000000000000000000000000000000000000000
1155- 0000004080004080E0004080E0004080E0004080E0004080E0004080E0000040
1156- 8000000000000000000000000000000000000000000000000000000000000000
1150+ 0000000000000000000000000000000000000000000000000000000000000000
1151+ 0000000000000000000000000000000000000000000000000000000000000000
11571152 0000000000000000000000000000000000000000000000000000000000000000
11581153 0000000000000000000000000000000000000000000000000000000084000000
11591154 8400000084000000840000008400000084000000840000008400000084000000
11601155 8400000084000000840000000000000000000000000000000000000000003939
11611156 3900D6CED600636363004A525200424242004242420000000000424242000000
1162- 0000000000000000000000000000000000000000000000000000000000000040
1163- 80004080E0000000000000000000000000000000000000000000000000000000
1164- 0000004080000000000000000000000000000000000000000000000000000000
1157+ 0000000000000000000000000000000000000000000000000000000000000000
1158+ 0000000000000000000000000000000000000000000000000000000000000000
1159+ 0000000000000000000000000000000000000000000000000000000000000000
11651160 0000000000000000000000000000000000000000000000000000000000000000
11661161 0000000000000000000000000000000000000000000000000000000084000000
11671162 8400000084000000840000008400000084000000840000008400000084000000
11681163 840000008400000084000000000000000000000000000000000039393900A5A5
11691164 A500DEDEDE00BDCECE008C9C9C005A635A004A52520042424200393939000000
1170- 0000393939000000000000000000000000000000000000000000004080004080
1171- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF004080E0000000
1172- 0000000000000040800000000000000000000000000000000000000000000000
1165+ 0000393939000000000000000000000000000000000000000000000000000000
1166+ 0000000000000000000000000000000000000000000000000000000000000000
1167+ 0000000000000000000000000000000000000000000000000000000000000000
11731168 0000000000000000000000000000000000000000000000000000000000000000
11741169 0000000000000000000000000000000000000000000000008400000084000000
11751170 8400000084000000840000008400000084000000840000008400000084000000
11761171 84000000840000008400000084000000000018181800949494007B7B7B00C6C6
11771172 C600C6C6C600D6D6D600CECECE00ADBDBD00848C8C00525A5200425252003939
1178- 39004242420000000000424242000000000000000000004080004080E0004080
1179- E0004080E0000000000000000000FFFFFF004080E0004080E0004080E0000000
1180- 0000000000004080E00000408000000000000000000000000000000000000000
1173+ 3900424242000000000042424200000000000000000000000000000000000000
1174+ 0000000000000000000000000000000000000000000000000000000000000000
1175+ 0000000000000000000000000000000000000000000000000000000000000000
11811176 0000000000000000000000000000000000000000000000000000000000000000
11821177 0000000000000000000000000000000000000000000000008400000084000000
11831178 840000008400FFFFFF00FFFFFF000000840000008400FFFFFF00FFFFFF000000
11841179 84000000840000008400000084000000000042424200D6D6D600D6D6D600ADAD
11851180 AD00D6D6D600D6D6D600CECECE00CECECE00C6C6C600ADB5BD00848C8C00525A
1186- 52004252520039393900424242000000000000000000004080004080E0004080
1187- E0004080E0000000000000000000FFFFFF004080E0004080E0004080E0000000
1188- 0000000000004080E00000408000000000000000000000000000000000000000
1181+ 5200425252003939390042424200000000000000000000000000000000000000
1182+ 0000000000000000000000000000000000000000000000000000000000000000
1183+ 0000000000000000000000000000000000000000000000000000000000000000
11891184 0000000000000000000000000000000000000000000000000000000000000000
11901185 0000000000000000000000000000000000000000000000008400000084000000
11911186 84000000840000008400FFFFFF00FFFFFF00FFFFFF00FFFFFF00000084000000
11921187 84000000840000008400000084000000000042424200EFE7EF00DEDEDE00DEDE
11931188 DE00D6D6D600D6D6D600CECECE00CECECE00C6BDC600BDBDBD00B5ADB500A5AD
1194- AD007B8C8C004A524A00424A4A000000000000000000004080004080E0004080
1195- E0004080E0000000000000000000000000000000000000000000000000000000
1196- 00004080E0004080E00000408000000000000000000000000000000000000000
1189+ AD007B8C8C004A524A00424A4A00000000000000000000000000000000000000
1190+ 0000000000000000000000000000000000000000000000000000000000000000
1191+ 0000000000000000000000000000000000000000000000000000000000000000
11971192 0000000000000000000000000000000000000000000000000000000000000000
11981193 0000000000000000000000000000000000000000000000008400000084000000
11991194 8400000084000000840000008400FFFFFF00FFFFFF0000008400000084000000
12001195 84000000840000008400000084000000000000000000424242009CADAD00D6D6
12011196 D600D6D6D600CECECE00CEC6CE00C6C6C600BDBDBD00BDBDBD00B5B5B500ADAD
1202- AD00ADA5AD0094A5A500738484000000000000000000004080004080E0004080
1203- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000004080
1204- E0004080E0004080E00000408000000000000000000000000000000000000000
1197+ AD00ADA5AD0094A5A50073848400000000000000000000000000000000000000
1198+ 0000000000000000000000000000000000000000000000000000000000000000
1199+ 0000000000000000000000000000000000000000000000000000000000000000
12051200 0000000000000000000000000000000000000000000000000000000000000000
12061201 0000000000000000000000000000000000000000000000008400000084000000
12071202 84000000840000008400FFFFFF00FFFFFF00FFFFFF00FFFFFF00000084000000
12081203 8400000084000000840000008400000000000000000000000000000000004242
12091204 42009CADAD00CECECE00CEC6CE00C6BDC600BDB5BD00B5B5B500ADADAD00ADA5
1210- AD00A5A5A5009C9C9C00212121000000000000000000004080004080E0004080
1211- E0004080E0000000000000000000FFFFFF004080E0004080E000000000000000
1212- 00004080E0004080E00000408000000000000000000000000000000000000000
1205+ AD00A5A5A5009C9C9C0021212100000000000000000000000000000000000000
1206+ 0000000000000000000000000000000000000000000000000000000000000000
1207+ 0000000000000000000000000000000000000000000000000000000000000000
12131208 0000000000000000000000000000000000000000000000000000000000000000
12141209 0000000000000000000000000000000000000000000000008400000084000000
12151210 840000008400FFFFFF00FFFFFF000000840000008400FFFFFF00FFFFFF000000
12161211 8400000084000000840000008400000000000000000000000000000000000000
12171212 000000000000424242009CA5A500BDB5BD00B5ADB500ADADAD00ADADAD00A5A5
1218- A500A59CA50021212100000000000000000000000000004080004080E0004080
1219- E0004080E0000000000000000000FFFFFF004080E0004080E000000000000000
1220- 00004080E0004080E00000408000000000000000000000000000000000000000
1213+ A500A59CA5002121210000000000000000000000000000000000000000000000
1214+ 0000000000000000000000000000000000000000000000000000000000000000
1215+ 0000000000000000000000000000000000000000000000000000000000000000
12211216 0000000000000000000000000000000000000000000000000000000000000000
12221217 0000000000000000000000000000000000000000000000000000000084000000
12231218 8400000084000000840000008400000084000000840000008400000084000000
12241219 8400000084000000840000000000000000000000000000000000000000000000
12251220 00000000000000000000000000004242420094A5A500ADADAD00A5A5A500A5A5
1226- A500292929000000000000000000000000000000000000000000004080004080
1227- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000000000
1228- 00004080E0000040800000000000000000000000000000000000000000000000
1221+ A500292929000000000000000000000000000000000000000000000000000000
1222+ 0000000000000000000000000000000000000000000000000000000000000000
1223+ 0000000000000000000000000000000000000000000000000000000000000000
12291224 0000000000000000000000000000000000000000000000000000000000000000
12301225 0000000000000000000000000000000000000000000000000000000084000000
12311226 8400000084000000840000008400000084000000840000008400000084000000
12321227 8400000084000000840000000000000000000000000000000000000000000000
12331228 0000000000000000000000000000000000000000000042424200949C9C002929
1234- 2900000000000000000000000000000000000000000000000000000000000040
1235- 80004080E0000000000000000000000000000000000000000000000000004080
1236- E000004080000000000000000000000000000000000000000000000000000000
1229+ 2900000000000000000000000000000000000000000000000000000000000000
1230+ 0000000000000000000000000000000000000000000000000000000000000000
1231+ 0000000000000000000000000000000000000000000000000000000000000000
12371232 0000000000000000000000000000000000000000000000000000000000000000
12381233 0000000000000000000000000000000000000000000000000000000000000000
12391234 8400000084000000840000008400000084000000840000008400000084000000
12401235 8400000084000000000000000000000000000000000000000000000000000000
12411236 0000000000000000000000000000000000000000000000000000000000000000
12421237 0000000000000000000000000000000000000000000000000000000000000000
1243- 0000004080004080E0004080E0004080E0004080E0004080E0004080E0000040
1244- 8000000000000000000000000000000000000000000000000000000000000000
1238+ 0000000000000000000000000000000000000000000000000000000000000000
1239+ 0000000000000000000000000000000000000000000000000000000000000000
12451240 0000000000000000000000000000000000000000000000000000000000000000
12461241 0000000000000000000000000000000000000000000000000000000000000000
12471242 0000000000000000840000008400000084000000840000008400000084000000
12481243 0000000000000000000000000000000000000000000000000000000000000000
12491244 0000000000000000000000000000000000000000000000000000000000000000
12501245 0000000000000000000000000000000000000000000000000000000000000000
1251- 0000000000000040800000408000004080000040800000408000004080000000
1246+ 0000000000000000000000000000000000000000000000000000000000000000
12521247 0000000000000000000000000000000000000000000000000000000000000000
12531248 0000000000000000000000000000000000000000000000000000000000000000
12541249 0000000000000000000000000000000000000000000000000000000000000000
@@ -1521,11 +1516,11 @@ object EditorForm: TEditorForm
15211516 0000000000000000000000000000000000000000000000000000000000000000
15221517 0000000000000000000000000000000000000000000000000000000000000000
15231518 0000000000000000000000000000000000000000000000000000000000000000
1524- 00000000000000000000000000000000F81FFFFFFFFF0000E007FDFFF81F0000
1525- C003F17FF00F00008001E05FE00700008001C017C00300000000000580010000
1526- 0000000180010000000000018001000000008001800100000000E00180010000
1527- 0000F803800100008001FE07C00300008001FF8FE0070000C003FFFFF00F0000
1528- E007FFFFF81F0000F81FFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
1519+ 00000000000000000000000000000000F81FFFFF00000000E007FDFF00000000
1520+ C003F17F000000008001E05F000000008001C017000000000000000500000000
1521+ 0000000100000000000000010000000000008001000000000000E00100000000
1522+ 0000F803000000008001FE07000000008001FF8F00000000C003FFFF00000000
1523+ E007FFFF00000000F81FFFFF00000000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
15291524 FE00C000F000F000FE008000F000F000FE008000F000F0008000800000000000
15301525 8000800070000000800080017000000080008001700000008001800170000000
15311526 8003800170000000800780017FDF001F807F8001001F001F80FFC003001F001F
@@ -1533,7 +1528,8 @@ object EditorForm: TEditorForm
15331528 FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFE7F887
15341529 0003003FC1F3FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
15351530 0003C400DCF3FEBF0003CC00FF07FC9F0003D400FFFFFDDF0003F800FFFFFDDF
1536- FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
1531+ FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
1532+ 000000000000}
15371533 end
15381534 object Indy: TIdHTTP
15391535 Intercept = IdLogDebug
@@ -1709,14 +1705,6 @@ object EditorForm: TEditorForm
17091705 ImageIndex = 9
17101706 OnExecute = SaveNameMailActionExecute
17111707 end
1712- object BeLogInOutEAction: TAction
1713- Category = #12501#12449#12452#12523
1714- Caption = 'Be2ch'#12395#12525#12464#12452#12531'/'#12525#12464#12450#12454#12488
1715- Hint = 'Be2ch'#12395#12525#12464#12452#12531'/'#12525#12464#12450#12454#12488
1716- ImageIndex = 10
1717- OnExecute = BeLogInOutEActionExecute
1718- OnUpdate = BeLogInOutEActionUpdate
1719- end
17201708 end
17211709 object IdLogDebug: TIdLogDebug
17221710 OnReceive = IdLogDebugReceive
--- a/Editor.pas
+++ b/Editor.pas
@@ -122,8 +122,6 @@ type
122122 ToolButton4: TToolButton;
123123 ToolButton6: TToolButton;
124124 SaveNameMailAction: TAction;
125- ToolButton7: TToolButton;
126- BeLogInOutEAction: TAction;
127125
128126 procedure EditorPageChange(Sender: TObject);
129127 procedure FormCreate(Sender: TObject);
@@ -174,8 +172,6 @@ type
174172 procedure FormDeactivate(Sender: TObject);
175173 procedure LocalRuleBrowseClick(Sender: TObject);
176174 procedure SaveNameMailActionExecute(Sender: TObject);
177- procedure BeLogInOutEActionExecute(Sender: TObject);
178- procedure BeLogInOutEActionUpdate(Sender: TObject);
179175 private
180176 FThreadItem: TThreadItem;
181177 FBoard: TBoard;
@@ -792,7 +788,6 @@ var
792788 body : TStringList;
793789 Remote : String;
794790 ABoard : TBoard;
795- Protocol,Host, Path, Document, Port, Bookmark : String;
796791 begin
797792 FAbort := False;
798793 State := gdsError;
@@ -822,11 +817,6 @@ begin
822817 Cookie := Cookie + 'SPID=' + SPID + '; ';
823818 if PON <> '' then
824819 Cookie := Cookie + 'PON=' + PON + '; ';
825- //ホストが2chで、BeにLoginしていればBEのデータを送る
826- GikoSys.ParseURI( URL, Protocol,Host, Path, Document, Port, Bookmark );
827- if GikoSys.Is2chHost(Host) and GikoSys.Setting.BeLogin then
828- Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
829- + 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
830820 Cookie := 'Cookie: ' + Cookie + 'NAME=' + NameComboBox.Text + '; MAIL=' + MailComboBox.Text;
831821
832822 sysMenu := GetSystemMenu( Handle, false );
@@ -2090,20 +2080,4 @@ begin
20902080 if (i > 0) then Result := True else Result := False;
20912081 end;
20922082
2093-procedure TEditorForm.BeLogInOutEActionExecute(Sender: TObject);
2094-begin
2095- GikoSys.Setting.BeLogin := not GikoSys.Setting.BeLogin;
2096-end;
2097-
2098-procedure TEditorForm.BeLogInOutEActionUpdate(Sender: TObject);
2099-begin
2100- if (GikoSys.Setting.BeUserID <> '') and (GikoSys.Setting.BeCode <> '') then begin
2101- if (GikoSys.Setting.BeLogin) then BeLogInOutEAction.Checked := true
2102- else BeLogInOutEAction.Checked := false;
2103- BeLogInOutEAction.Enabled := true
2104- end else
2105- BeLogInOutEAction.Enabled := false;
2106-
2107-end;
2108-
21092083 end.
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
11 object GikoForm: TGikoForm
2- Left = 308
3- Top = 229
2+ Left = 355
3+ Top = 37
44 HorzScrollBar.Visible = False
55 VertScrollBar.Visible = False
66 AutoScroll = False
@@ -569,6 +569,7 @@ object GikoForm: TGikoForm
569569 Align = alClient
570570 TabOrder = 0
571571 OnEnter = BrowserEnter
572+ OnExit = BrowserExit
572573 OnStatusTextChange = BrowserStatusTextChange
573574 OnBeforeNavigate2 = BrowserBeforeNavigate2
574575 OnNewWindow2 = BrowserNewWindow2
@@ -1018,7 +1019,7 @@ object GikoForm: TGikoForm
10181019 ImageIndex = -1
10191020 MinHeight = 22
10201021 Visible = False
1021- Width = 275
1022+ Width = 238
10221023 end
10231024 item
10241025 Break = False
@@ -1026,7 +1027,7 @@ object GikoForm: TGikoForm
10261027 ImageIndex = -1
10271028 MinHeight = 22
10281029 Text = #12450#12489#12524#12473
1029- Width = 537
1030+ Width = 574
10301031 end
10311032 item
10321033 Control = LinkToolBar
@@ -1061,7 +1062,7 @@ object GikoForm: TGikoForm
10611062 object StdToolBar: TToolBar
10621063 Left = 9
10631064 Top = 20
1064- Width = 262
1065+ Width = 225
10651066 Height = 22
10661067 AutoSize = True
10671068 ButtonWidth = 25
@@ -1145,9 +1146,9 @@ object GikoForm: TGikoForm
11451146 end
11461147 end
11471148 object AddressToolBar: TToolBar
1148- Left = 330
1149+ Left = 293
11491150 Top = 20
1150- Width = 480
1151+ Width = 517
11511152 Height = 22
11521153 ButtonWidth = 51
11531154 EdgeBorders = []
@@ -4660,99 +4661,8 @@ object GikoForm: TGikoForm
46604661 Left = 4
46614662 Top = 244
46624663 Bitmap = {
4663- 494C010136003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
4664- 000000000000360000002800000040000000F0000000010020000000000000F0
4665- 0000000000000000000000000000000000000000000000000000000000000000
4666- 0000000000000000000000000000000000000000000000000000000000000000
4667- 0000000000000000000000000000000000000000000000000000000000000000
4668- 0000000000000000000000000000000000000000000000000000000000000000
4669- 0000000000000000000000000000000000000000000000000000000000000000
4670- 0000000000000000000000000000000000000000000000000000000000000000
4671- 0000000000000000000000000000000000000000000000000000000000000000
4672- 0000000000000000000000000000000000000000000000000000000000000000
4673- 0000000000000000000000000000000000000000000000000000000000000000
4674- 0000000000000000000000000000000000000000000000000000000000000000
4675- 0000000000000000000000000000000000000000000000000000000000000000
4676- 0000000000000000000000000000000000000000000000000000000000000000
4677- 0000000000000000000000000000000000000000000000000000000000000000
4678- 0000000000000000000000000000000000000000000000000000000000000000
4679- 0000000000000000000000000000000000000000000000000000000000000000
4680- 0000000000000000000000000000000000000000000000000000000000000000
4681- 0000000000000000000000000000000000000000000000000000000000000000
4682- 0000000000000000000000000000000000000000000000000000000000000000
4683- 0000000000000000000000000000000000000000000000000000000000000000
4684- 0000000000000000000000000000000000000000000000000000000000000000
4685- 0000000000000000000000000000000000000000000000000000000000000000
4686- 0000000000000000000000000000000000000000000000000000000000000000
4687- 0000000000000000000000000000000000000000000000000000000000000000
4688- 0000000000000000000000000000000000000000000000000000000000000000
4689- 0000000000000000000000000000000000000000000000000000000000000000
4690- 0000000000000000000000000000000000000000000000000000000000000000
4691- 0000000000000000000000000000000000000000000000000000000000000000
4692- 0000000000000000000000000000000000000000000000000000000000000000
4693- 0000000000000000000000000000000000000000000000000000000000000000
4694- 0000000000000000000000000000000000000000000000000000000000000000
4695- 0000000000000000000000000000000000000000000000000000000000000000
4696- 0000000000000000000000000000000000000000000000000000000000000000
4697- 0000000000000000000000000000000000000000000000000000000000000000
4698- 0000000000000000000000000000000000000000000000000000000000000000
4699- 0000000000000000000000000000000000000000000000000000000000000000
4700- 0000000000000000000000000000000000000000000000000000000000000000
4701- 0000000000000000000000000000000000000000000000000000000000000000
4702- 0000000000000000000000000000000000000000000000000000000000000000
4703- 0000000000000000000000000000000000000000000000000000000000000000
4704- 0000000000000000000000000000000000000000000000000000000000000000
4705- 0000000000000000000000000000000000000000000000000000000000000000
4706- 0000000000000000000000000000000000000000000000000000000000000000
4707- 0000000000000000000000000000000000000000000000000000000000000000
4708- 0000000000000000000000000000000000000000000000000000000000000000
4709- 0000000000000000000000000000000000000000000000000000000000000000
4710- 0000000000000000000000000000000000000000000000000000000000000000
4711- 0000000000000000000000000000000000000000000000000000000000000000
4712- 0000000000000000000000000000000000000000000000000000000000000000
4713- 0000000000000000000000000000000000000000000000000000000000000000
4714- 0000000000000000000000000000000000000000000000000000000000000000
4715- 0000000000000000000000000000000000000000000000000000000000000000
4716- 0000000000000000000000000000000000000000000000000000000000000000
4717- 0000000000000000000000000000000000000000000000000000000000000000
4718- 0000000000000000000000000000000000000000000000000000000000000000
4719- 0000000000000000000000000000000000000000000000000000000000000000
4720- 0000000000000000000000000000000000000000000000000000000000000000
4721- 0000000000000000000000000000000000000000000000000000000000000000
4722- 0000000000000000000000000000000000000000000000000000000000000000
4723- 0000000000000000000000000000000000000000000000000000000000000000
4724- 0000000000000000000000000000000000000000000000000000000000000000
4725- 0000000000000000000000000000000000000000000000000000000000000000
4726- 0000000000000000000000000000000000000000000000000000000000000000
4727- 0000000000000000000000000000000000000000000000000000000000000000
4728- 0000000000000000000000000000000000000000000000000000000000000000
4729- 0000000000000000000000000000000000000000000000000000000000000000
4730- 0000000000000000000000000000000000000000000000000000000000000000
4731- 0000000000000000000000000000000000000000000000000000000000000000
4732- 0000000000000000000000000000000000000000000000000000000000000000
4733- 0000000000000000000000000000000000000000000000000000000000000000
4734- 0000000000000000000000000000000000000000000000000000000000000000
4735- 0000000000000000000000000000000000000000000000000000000000000000
4736- 0000000000000000000000000000000000000000000000000000000000000000
4737- 0000000000000000000000000000000000000000000000000000000000000000
4738- 0000000000000000000000000000000000000000000000000000000000000000
4739- 0000000000000000000000000000000000000000000000000000000000000000
4740- 0000000000000000000000000000000000000000000000000000000000000000
4741- 0000000000000000000000000000000000000000000000000000000000000000
4742- 0000000000000000000000000000000000000000000000000000000000000000
4743- 0000000000000000000000000000000000000000000000000000000000000000
4744- 0000000000000000000000000000000000000000000000000000000000000000
4745- 0000000000000000000000000000000000000000000000000000000000000000
4746- 0000000000000000000000000000000000000000000000000000000000000000
4747- 0000000000000000000000000000000000000000000000000000000000000000
4748- 0000000000000000000000000000000000000000000000000000000000000000
4749- 0000000000000000000000000000000000000000000000000000000000000000
4750- 0000000000000000000000000000000000000000000000000000000000000000
4751- 0000000000000000000000000000000000000000000000000000000000000000
4752- 0000000000000000000000000000000000000000000000000000000000000000
4753- 0000000000000000000000000000000000000000000000000000000000000000
4754- 0000000000000000000000000000000000000000000000000000000000000000
4755- 0000000000000000000000000000000000000000000000000000000000000000
4664+ 494C010135003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
4665+ 000000000000360000002800000040000000E0000000010020000000000000E0
47564666 0000000000000000000000000000000000000000000000000000000000000000
47574667 0000000000000000000000000000000000000000000000000000000000000000
47584668 0000000000000000000000000000000000000000000000000000000000000000
@@ -4762,6 +4672,7 @@ object GikoForm: TGikoForm
47624672 0000000000000000000000000000000000000000000000000000000000000000
47634673 0000000000000000000000000000000000000000000000000000000000000000
47644674 0000000000000000000000000000000000000000000000000000000000000000
4675+ 000000000000000000000000FF000000FF000000FF000000FF000000FF000000
47654676 0000000000000000000000000000000000000000000000000000000000000000
47664677 0000000000000000000000000000000000000000000000000000000000000000
47674678 0000000000000000000000000000000000000000000000000000000000000000
@@ -4769,143 +4680,105 @@ object GikoForm: TGikoForm
47694680 0000000000000000000000000000000000000000000000000000000000000000
47704681 0000000000000000000000000000000000000000000000000000000000000000
47714682 0000000000000000000000000000000000000000000000000000000000000000
4683+ 00000000FF000000FF000084840000000000C6C6C600C6C6C600848484000000
4684+ FF000000FF000000000084848400000000000000000000000000000000000000
47724685 0000000000000000000000000000000000000000000000000000000000000000
47734686 0000000000000000000000000000000000000000000000000000000000000000
47744687 0000000000000000000000000000000000000000000000000000000000000000
47754688 0000000000000000000000000000000000000000000000000000000000000000
47764689 0000000000000000000000000000000000000000000000000000000000000000
47774690 0000000000000000000000000000000000000000000000000000000000000000
4691+ FF00000000000000FF008484840084848400FFFFFF00FFFFFF00848484000000
4692+ 0000000000000000FF0000000000000000000000000000000000000000000000
47784693 0000000000000000000000000000000000000000000000000000000000000000
47794694 0000000000000000000000000000000000000000000000000000000000000000
47804695 0000000000000000000000000000000000000000000000000000000000000000
47814696 0000000000000000000000000000000000000000000000000000000000000000
47824697 0000000000000000000000000000000000000000000000000000000000000000
4698+ 00000000000000000000000000000000000000000000000000000000FF000000
4699+ 0000008484000000FF000000FF00C6C6C600FFFFFF00FFFFFF00848484000000
4700+ 000084848400000000000000FF00000000000000000000000000000000000000
47834701 0000000000000000000000000000000000000000000000000000000000000000
47844702 0000000000000000000000000000000000000000000000000000000000000000
47854703 0000000000000000000000000000000000000000000000000000000000000000
47864704 0000000000000000000000000000000000000000000000000000000000000000
47874705 0000000000000000000000000000000000000000000000000000000000000000
4706+ 00000000000000000000000000000000000000000000000000000000FF000084
4707+ 840000FFFF00FFFFFF000000FF000000FF00FFFFFF00FFFFFF00848484000000
4708+ 000000000000000000000000FF00000000000000000000000000000000000000
47884709 0000000000000000000000000000000000000000000000000000000000000000
47894710 0000000000000000000000000000000000000000000000000000000000000000
47904711 0000000000000000000000000000000000000000000000000000000000000000
47914712 0000000000000000000000000000000000000000000000000000000000000000
47924713 0000000000000000000000000000000000000000000000000000000000000000
4714+ 000000000000000000000000000000000000000000000000FF008484840000FF
4715+ FF00FFFFFF0000FFFF00000000000000FF000000FF00FFFFFF00848484000000
4716+ 00000000000000000000000000000000FF000000000000000000000000000000
47934717 0000000000000000000000000000000000000000000000000000000000000000
47944718 0000000000000000000000000000000000000000000000000000000000000000
47954719 0000000000000000000000000000000000000000000000000000000000000000
47964720 0000000000000000000000000000000000000000000000000000000000000000
47974721 0000000000000000000000000000000000000000000000000000000000000000
4722+ 000000000000000000000000000000000000008484000000FF00C6C6C600FFFF
4723+ FF0000FFFF00FFFFFF0000000000848484000000FF000000FF00848484000000
4724+ 00008484840084848400848484000000FF000000000000000000000000000000
47984725 0000000000000000000000000000000000000000000000000000000000000000
47994726 0000000000000000000000000000000000000000000000000000000000000000
48004727 0000000000000000000000000000000000000000000000000000000000000000
48014728 0000000000000000000000000000000000000000000000000000000000000000
4802- 000000000000000000000000FF000000FF000000FF000000FF000000FF000000
48034729 0000000000000000000000000000000000000000000000000000000000000000
4804- 0000000000000040800000408000004080000040800000408000004080000000
4730+ 000000000000000000000000000000000000008484000000FF00C6C6C60000FF
4731+ FF00FFFFFF0000FFFF0000000000C6C6C600000000000000FF000000FF000000
4732+ 00000000000000000000000000000000FF000000000000000000000000000000
48054733 0000000000000000000000000000000000000000000000000000000000000000
48064734 0000000000000000000000000000000000000000000000000000000000000000
48074735 0000000000000000000000000000000000000000000000000000000000000000
48084736 0000000000000000000000000000000000000000000000000000000000000000
48094737 0000000000000000000000000000000000000000000000000000000000000000
4810- 00000000FF000000FF000084840000000000C6C6C600C6C6C600848484000000
4811- FF000000FF000000000084848400000000000000000000000000000000000000
4812- 0000004080004080E0004080E0004080E0004080E0004080E0004080E0000040
4813- 8000000000000000000000000000000000000000000000000000000000000000
4738+ 000000000000000000000000000000000000008484000000FF00C6C6C600FFFF
4739+ FF0000FFFF00FFFFFF000000000000000000FFFFFF00FFFFFF000000FF000000
4740+ FF000000000000000000000000000000FF000000000000000000000000000000
48144741 0000000000000000000000000000000000000000000000000000000000000000
48154742 0000000000000000000000000000000000000000000000000000000000000000
48164743 0000000000000000000000000000000000000000000000000000000000000000
48174744 0000000000000000000000000000000000000000000000000000000000000000
4818- FF00000000000000FF008484840084848400FFFFFF00FFFFFF00848484000000
4819- 0000000000000000FF0000000000000000000000000000000000000000000040
4820- 80004080E0000000000000000000000000000000000000000000000000000000
4821- 0000004080000000000000000000000000000000000000000000000000000000
48224745 0000000000000000000000000000000000000000000000000000000000000000
4746+ 00000000000000000000000000000000000000000000008484000000FF0000FF
4747+ FF00FFFFFF0000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
4748+ FF000000FF00000000000000FF00000000000000000000000000000000000000
48234749 0000000000000000000000000000000000000000000000000000000000000000
48244750 0000000000000000000000000000000000000000000000000000000000000000
4825- 00000000000000000000000000000000000000000000000000000000FF000000
4826- 0000008484000000FF000000FF00C6C6C600FFFFFF00FFFFFF00848484000000
4827- 000084848400000000000000FF00000000000000000000000000004080004080
4828- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF004080E0000000
4829- 0000000000000040800000000000000000000000000000000000000000000000
48304751 0000000000000000000000000000000000000000000000000000000000000000
48314752 0000000000000000000000000000000000000000000000000000000000000000
48324753 0000000000000000000000000000000000000000000000000000000000000000
48334754 00000000000000000000000000000000000000000000000000000000FF000084
4834- 840000FFFF00FFFFFF000000FF000000FF00FFFFFF00FFFFFF00848484000000
4835- 000000000000000000000000FF000000000000000000004080004080E0004080
4836- E0004080E0000000000000000000FFFFFF004080E0004080E0004080E0000000
4837- 0000000000004080E00000408000000000000000000000000000000000000000
4838- 0000000000000000000000000000000000000000000000000000000000000000
4839- 0000000000000000000000000000000000000000000000000000000000000000
4840- 0000000000000000000000000000000000000000000000000000000000000000
4841- 000000000000000000000000000000000000000000000000FF008484840000FF
4842- FF00FFFFFF0000FFFF00000000000000FF000000FF00FFFFFF00848484000000
4843- 00000000000000000000000000000000FF0000000000004080004080E0004080
4844- E0004080E0000000000000000000FFFFFF004080E0004080E0004080E0000000
4845- 0000000000004080E00000408000000000000000000000000000000000000000
4846- 0000000000000000000000000000000000000000000000000000000000000000
4847- 0000000000000000000000000000000000000000000000000000000000000000
4848- 0000000000000000000000000000000000000000000000000000000000000000
4849- 000000000000000000000000000000000000008484000000FF00C6C6C600FFFF
4850- FF0000FFFF00FFFFFF0000000000848484000000FF000000FF00848484000000
4851- 00008484840084848400848484000000FF0000000000004080004080E0004080
4852- E0004080E0000000000000000000000000000000000000000000000000000000
4853- 00004080E0004080E00000408000000000000000000000000000000000000000
4854- 0000000000000000000000000000000000000000000000000000000000000000
4855- 0000000000000000000000000000000000000000000000000000000000000000
4856- 0000000000000000000000000000000000000000000000000000000000000000
4857- 000000000000000000000000000000000000008484000000FF00C6C6C60000FF
4858- FF00FFFFFF0000FFFF0000000000C6C6C600000000000000FF000000FF000000
4859- 00000000000000000000000000000000FF0000000000004080004080E0004080
4860- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000004080
4861- E0004080E0004080E00000408000000000000000000000000000000000000000
4862- 0000000000000000000000000000000000000000000000000000000000000000
4863- 0000000000000000000000000000000000000000000000000000000000000000
4864- 0000000000000000000000000000000000000000000000000000000000000000
4865- 000000000000000000000000000000000000008484000000FF00C6C6C600FFFF
4866- FF0000FFFF00FFFFFF000000000000000000FFFFFF00FFFFFF000000FF000000
4867- FF000000000000000000000000000000FF0000000000004080004080E0004080
4868- E0004080E0000000000000000000FFFFFF004080E0004080E000000000000000
4869- 00004080E0004080E00000408000000000000000000000000000000000000000
4755+ 840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
4756+ 00000000FF000000FF000000FF00000000000000000000000000000000000000
48704757 0000000000000000000000000000000000000000000000000000000000000000
48714758 0000000000000000000000000000000000000000000000000000000000000000
48724759 0000000000000000000000000000000000000000000000000000000000000000
4873- 00000000000000000000000000000000000000000000008484000000FF0000FF
4874- FF00FFFFFF0000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
4875- FF000000FF00000000000000FF000000000000000000004080004080E0004080
4876- E0004080E0000000000000000000FFFFFF004080E0004080E000000000000000
4877- 00004080E0004080E00000408000000000000000000000000000000000000000
48784760 0000000000000000000000000000000000000000000000000000000000000000
48794761 0000000000000000000000000000000000000000000000000000000000000000
48804762 0000000000000000000000000000000000000000000000000000000000000000
4881- 00000000000000000000000000000000000000000000000000000000FF000084
4882- 840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
4883- 00000000FF000000FF000000FF00000000000000000000000000004080004080
4884- E0004080E0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000000000
4885- 00004080E0000040800000000000000000000000000000000000000000000000
4886- 0000000000000000000000000000000000000000000000000000000000000000
4887- 0000000000000000000000000000000000000000000000000000000000000000
4763+ FF000084840000FFFF008484840084848400C6C6C600FFFFFF00848484000000
4764+ 0000000000000000FF0084848400000000000000000000000000000000000000
48884765 0000000000000000000000000000000000000000000000000000000000000000
48894766 0000000000000000000000000000000000000000000000000000000000000000
4890- FF000084840000FFFF008484840084848400C6C6C600FFFFFF00848484000000
4891- 0000000000000000FF0084848400000000000000000000000000000000000040
4892- 80004080E0000000000000000000000000000000000000000000000000004080
4893- E000004080000000000000000000000000000000000000000000000000000000
48944767 0000000000000000000000000000000000000000000000000000000000000000
48954768 0000000000000000000000000000000000000000000000000000000000000000
48964769 0000000000000000000000000000000000000000000000000000000000000000
48974770 0000000000000000000000000000000000000000000000000000000000000000
48984771 00000000FF000000FF0000FFFF0000000000C6C6C600C6C6C600000000000000
48994772 FF000000FF000000000000000000000000000000000000000000000000000000
4900- 0000004080004080E0004080E0004080E0004080E0004080E0004080E0000040
4901- 8000000000000000000000000000000000000000000000000000000000000000
4773+ 0000000000000000000000000000000000000000000000000000000000000000
4774+ 0000000000000000000000000000000000000000000000000000000000000000
49024775 0000000000000000000000000000000000000000000000000000000000000000
49034776 0000000000000000000000000000000000000000000000000000000000000000
49044777 0000000000000000000000000000000000000000000000000000000000000000
49054778 0000000000000000000000000000000000000000000000000000000000000000
49064779 000000000000000000000000FF000000FF000000FF000000FF000000FF000000
49074780 0000000000000000000000000000000000000000000000000000000000000000
4908- 0000000000000040800000408000004080000040800000408000004080000000
4781+ 0000000000000000000000000000000000000000000000000000000000000000
49094782 0000000000000000000000000000000000000000000000000000000000000000
49104783 0000000000000000000000000000000000000000000000000000000000000000
49114784 0000000000000000000000000000000000000000000000000000000000000000
@@ -6583,16 +6456,12 @@ object GikoForm: TGikoForm
65836456 0000000000000000000000000000000000000000000000000000000000000000
65846457 0000000000000000000000000000000000000000000000000000000000000000
65856458 000000000000000000000000000000000000424D3E000000000000003E000000
6586- 2800000040000000F00000000100010000000000800700000000000000000000
6587- 000000000000000000000000FFFFFF0000000000000000000000000000000000
6588- 0000000000000000000000000000000000000000000000000000000000000000
6589- 0000000000000000000000000000000000000000000000000000000000000000
6590- 0000000000000000000000000000000000000000000000000000000000000000
6591- 00000000000000000000000000000000FE7FFFFF00000000FC1FF81F00000000
6592- F005F00F00000000E01BE00700000000C015C00300000000801D800100000000
6593- 001E8001000000000010800100000000001E800100000000000E800100000000
6594- 8005800100000000C011C00300000000E019E00700000000F027F00F00000000
6595- FC1FF81F00000000FE7FFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFC003
6459+ 2800000040000000E00000000100010000000000000700000000000000000000
6460+ 000000000000000000000000FFFFFF00FE7F000000000000FC1F000000000000
6461+ F005000000000000E01B000000000000C015000000000000801D000000000000
6462+ 001E0000000000000010000000000000001E000000000000000E000000000000
6463+ 8005000000000000C011000000000000E019000000000000F027000000000000
6464+ FC1F000000000000FE7F000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFC003
65966465 FFFFFFFFFFFFC003FC01803FFC01C003FC01803C3C01C003FC01803C3C01C003
65976466 FC01803C3C01C003FC01803C3C01C003FC01803C3C01C003C00180000001C003
65986467 C00180000001C003C00180000001C003C00180000001C003FFFFFFFC3FFFC003
@@ -6651,95 +6520,8 @@ object GikoForm: TGikoForm
66516520 Left = 36
66526521 Top = 244
66536522 Bitmap = {
6654- 494C010136003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
6655- 000000000000360000002800000040000000F0000000010020000000000000F0
6656- 0000000000000000000000000000000000000000000000000000000000000000
6657- 0000000000000000000000000000000000000000000000000000000000000000
6658- 0000000000000000000000000000000000000000000000000000000000000000
6659- 0000000000000000000000000000000000000000000000000000000000000000
6660- 0000000000000000000000000000000000000000000000000000000000000000
6661- 0000000000000000000000000000000000000000000000000000000000000000
6662- 0000000000000000000000000000000000000000000000000000000000000000
6663- 0000000000000000000000000000000000000000000000000000000000000000
6664- 0000000000000000000000000000000000000000000000000000000000000000
6665- 0000000000000000000000000000000000000000000000000000000000000000
6666- 0000000000000000000000000000000000000000000000000000000000000000
6667- 0000000000000000000000000000000000000000000000000000000000000000
6668- 0000000000000000000000000000000000000000000000000000000000000000
6669- 0000000000000000000000000000000000000000000000000000000000000000
6670- 0000000000000000000000000000000000000000000000000000000000000000
6671- 0000000000000000000000000000000000000000000000000000000000000000
6672- 0000000000000000000000000000000000000000000000000000000000000000
6673- 0000000000000000000000000000000000000000000000000000000000000000
6674- 0000000000000000000000000000000000000000000000000000000000000000
6675- 0000000000000000000000000000000000000000000000000000000000000000
6676- 0000000000000000000000000000000000000000000000000000000000000000
6677- 0000000000000000000000000000000000000000000000000000000000000000
6678- 0000000000000000000000000000000000000000000000000000000000000000
6679- 0000000000000000000000000000000000000000000000000000000000000000
6680- 0000000000000000000000000000000000000000000000000000000000000000
6681- 0000000000000000000000000000000000000000000000000000000000000000
6682- 0000000000000000000000000000000000000000000000000000000000000000
6683- 0000000000000000000000000000000000000000000000000000000000000000
6684- 0000000000000000000000000000000000000000000000000000000000000000
6685- 0000000000000000000000000000000000000000000000000000000000000000
6686- 0000000000000000000000000000000000000000000000000000000000000000
6687- 0000000000000000000000000000000000000000000000000000000000000000
6688- 0000000000000000000000000000000000000000000000000000000000000000
6689- 0000000000000000000000000000000000000000000000000000000000000000
6690- 0000000000000000000000000000000000000000000000000000000000000000
6691- 0000000000000000000000000000000000000000000000000000000000000000
6692- 0000000000000000000000000000000000000000000000000000000000000000
6693- 0000000000000000000000000000000000000000000000000000000000000000
6694- 0000000000000000000000000000000000000000000000000000000000000000
6695- 0000000000000000000000000000000000000000000000000000000000000000
6696- 0000000000000000000000000000000000000000000000000000000000000000
6697- 0000000000000000000000000000000000000000000000000000000000000000
6698- 0000000000000000000000000000000000000000000000000000000000000000
6699- 0000000000000000000000000000000000000000000000000000000000000000
6700- 0000000000000000000000000000000000000000000000000000000000000000
6701- 0000000000000000000000000000000000000000000000000000000000000000
6702- 0000000000000000000000000000000000000000000000000000000000000000
6703- 0000000000000000000000000000000000000000000000000000000000000000
6704- 0000000000000000000000000000000000000000000000000000000000000000
6705- 0000000000000000000000000000000000000000000000000000000000000000
6706- 0000000000000000000000000000000000000000000000000000000000000000
6707- 0000000000000000000000000000000000000000000000000000000000000000
6708- 0000000000000000000000000000000000000000000000000000000000000000
6709- 0000000000000000000000000000000000000000000000000000000000000000
6710- 0000000000000000000000000000000000000000000000000000000000000000
6711- 0000000000000000000000000000000000000000000000000000000000000000
6712- 0000000000000000000000000000000000000000000000000000000000000000
6713- 0000000000000000000000000000000000000000000000000000000000000000
6714- 0000000000000000000000000000000000000000000000000000000000000000
6715- 0000000000000000000000000000000000000000000000000000000000000000
6716- 0000000000000000000000000000000000000000000000000000000000000000
6717- 0000000000000000000000000000000000000000000000000000000000000000
6718- 0000000000000000000000000000000000000000000000000000000000000000
6719- 0000000000000000000000000000000000000000000000000000000000000000
6720- 0000000000000000000000000000000000000000000000000000000000000000
6721- 0000000000000000000000000000000000000000000000000000000000000000
6722- 0000000000000000000000000000000000000000000000000000000000000000
6723- 0000000000000000000000000000000000000000000000000000000000000000
6724- 0000000000000000000000000000000000000000000000000000000000000000
6725- 0000000000000000000000000000000000000000000000000000000000000000
6726- 0000000000000000000000000000000000000000000000000000000000000000
6727- 0000000000000000000000000000000000000000000000000000000000000000
6728- 0000000000000000000000000000000000000000000000000000000000000000
6729- 0000000000000000000000000000000000000000000000000000000000000000
6730- 0000000000000000000000000000000000000000000000000000000000000000
6731- 0000000000000000000000000000000000000000000000000000000000000000
6732- 0000000000000000000000000000000000000000000000000000000000000000
6733- 0000000000000000000000000000000000000000000000000000000000000000
6734- 0000000000000000000000000000000000000000000000000000000000000000
6735- 0000000000000000000000000000000000000000000000000000000000000000
6736- 0000000000000000000000000000000000000000000000000000000000000000
6737- 0000000000000000000000000000000000000000000000000000000000000000
6738- 0000000000000000000000000000000000000000000000000000000000000000
6739- 0000000000000000000000000000000000000000000000000000000000000000
6740- 0000000000000000000000000000000000000000000000000000000000000000
6741- 0000000000000000000000000000000000000000000000000000000000000000
6742- 0000000000000000000000000000000000000000000000000000000000000000
6523+ 494C010135003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
6524+ 000000000000360000002800000040000000E0000000010020000000000000E0
67436525 0000000000000000000000000000000000000000000000000000000000000000
67446526 0000000000000000000000000000000000000000000000000000000000000000
67456527 0000000000000000000000000000000000000000000000000000000000000000
@@ -6749,6 +6531,7 @@ object GikoForm: TGikoForm
67496531 0000000000000000000000000000000000000000000000000000000000000000
67506532 0000000000000000000000000000000000000000000000000000000000000000
67516533 0000000000000000000000000000000000000000000000000000000000000000
6534+ 0000000000000000000000000000008484000000000084848400000000000000
67526535 0000000000000000000000000000000000000000000000000000000000000000
67536536 0000000000000000000000000000000000000000000000000000000000000000
67546537 0000000000000000000000000000000000000000000000000000000000000000
@@ -6756,147 +6539,105 @@ object GikoForm: TGikoForm
67566539 0000000000000000000000000000000000000000000000000000000000000000
67576540 0000000000000000000000000000000000000000000000000000000000000000
67586541 0000000000000000000000000000000000000000000000000000000000000000
6542+ 000000000000000000000084840000000000C6C6C600C6C6C600848484000000
6543+ 0000000000000000000084848400000000000000000000000000000000000000
67596544 0000000000000000000000000000000000000000000000000000000000000000
67606545 0000000000000000000000000000000000000000000000000000000000000000
67616546 0000000000000000000000000000000000000000000000000000000000000000
67626547 0000000000000000000000000000000000000000000000000000000000000000
67636548 0000000000000000000000000000000000000000000000000000000000000000
67646549 0000000000000000000000000000000000000000000000000000000000000000
6550+ 000000000000008484008484840084848400FFFFFF00FFFFFF00848484000000
6551+ 0000000000008484840000000000000000000000000000000000000000000000
67656552 0000000000000000000000000000000000000000000000000000000000000000
67666553 0000000000000000000000000000000000000000000000000000000000000000
67676554 0000000000000000000000000000000000000000000000000000000000000000
67686555 0000000000000000000000000000000000000000000000000000000000000000
67696556 0000000000000000000000000000000000000000000000000000000000000000
67706557 0000000000000000000000000000000000000000000000000000000000000000
6558+ 00000084840000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6559+ 0000848484000000000000000000000000000000000000000000000000000000
67716560 0000000000000000000000000000000000000000000000000000000000000000
67726561 0000000000000000000000000000000000000000000000000000000000000000
67736562 0000000000000000000000000000000000000000000000000000000000000000
67746563 0000000000000000000000000000000000000000000000000000000000000000
67756564 0000000000000000000000000000000000000000000000000000000000000000
6565+ 0000000000000000000000000000000000000000000000000000000000000084
6566+ 840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
67766567 0000000000000000000000000000000000000000000000000000000000000000
67776568 0000000000000000000000000000000000000000000000000000000000000000
67786569 0000000000000000000000000000000000000000000000000000000000000000
67796570 0000000000000000000000000000000000000000000000000000000000000000
67806571 0000000000000000000000000000000000000000000000000000000000000000
67816572 0000000000000000000000000000000000000000000000000000000000000000
6573+ 00000000000000000000000000000000000000000000008484008484840000FF
6574+ FF00FFFFFF0000FFFF000000000000000000FFFFFF00FFFFFF00848484000000
67826575 0000000000000000000000000000000000000000000000000000000000000000
67836576 0000000000000000000000000000000000000000000000000000000000000000
67846577 0000000000000000000000000000000000000000000000000000000000000000
67856578 0000000000000000000000000000000000000000000000000000000000000000
67866579 0000000000000000000000000000000000000000000000000000000000000000
67876580 0000000000000000000000000000000000000000000000000000000000000000
6581+ 0000000000000000000000000000000000000084840000FFFF00C6C6C600FFFF
6582+ FF0000FFFF00FFFFFF00000000008484840000000000FFFFFF00848484000000
6583+ 0000848484008484840084848400848484000000000000000000000000000000
67886584 0000000000000000000000000000000000000000000000000000000000000000
67896585 0000000000000000000000000000000000000000000000000000000000000000
67906586 0000000000000000000000000000000000000000000000000000000000000000
67916587 0000000000000000000000000000000000000000000000000000000000000000
67926588 0000000000000000000000000000000000000000000000000000000000000000
6793- 0000000000000000000000000000008484000000000084848400000000000000
6589+ 0000000000000000000000000000000000000084840000FFFF00C6C6C60000FF
6590+ FF00FFFFFF0000FFFF0000000000C6C6C60000000000FFFFFF00848484000000
67946591 0000000000000000000000000000000000000000000000000000000000000000
6795- 0000000000008080800080808000808080008080800080808000808080000000
67966592 0000000000000000000000000000000000000000000000000000000000000000
67976593 0000000000000000000000000000000000000000000000000000000000000000
67986594 0000000000000000000000000000000000000000000000000000000000000000
67996595 0000000000000000000000000000000000000000000000000000000000000000
68006596 0000000000000000000000000000000000000000000000000000000000000000
6801- 000000000000000000000084840000000000C6C6C600C6C6C600848484000000
6802- 0000000000000000000084848400000000000000000000000000000000000000
6803- 000080808000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0008080
6804- 8000000000000000000000000000000000000000000000000000000000000000
6597+ 00000000000000000000000000000000000000848400FFFFFF00C6C6C600FFFF
6598+ FF0000FFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00848484000000
68056599 0000000000000000000000000000000000000000000000000000000000000000
68066600 0000000000000000000000000000000000000000000000000000000000000000
68076601 0000000000000000000000000000000000000000000000000000000000000000
68086602 0000000000000000000000000000000000000000000000000000000000000000
6809- 000000000000008484008484840084848400FFFFFF00FFFFFF00848484000000
6810- 0000000000008484840000000000000000000000000000000000000000008080
6811- 8000C0C0C0000000000000000000000000000000000000000000000000000000
6812- 0000808080000000000000000000000000000000000000000000000000000000
68136603 0000000000000000000000000000000000000000000000000000000000000000
68146604 0000000000000000000000000000000000000000000000000000000000000000
6605+ 00000000000000000000000000000000000000000000008484000084840000FF
6606+ FF00FFFFFF0000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6607+ 0000848484000000000000000000000000000000000000000000000000000000
68156608 0000000000000000000000000000000000000000000000000000000000000000
68166609 0000000000000000000000000000000000000000000000000000000000000000
6817- 00000084840000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6818- 000084848400000000000000000000000000000000000000000080808000C0C0
6819- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF00C0C0C0000000
6820- 0000000000008080800000000000000000000000000000000000000000000000
68216610 0000000000000000000000000000000000000000000000000000000000000000
68226611 0000000000000000000000000000000000000000000000000000000000000000
68236612 0000000000000000000000000000000000000000000000000000000000000000
68246613 0000000000000000000000000000000000000000000000000000000000000084
68256614 840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6826- 0000000000000000000000000000000000000000000080808000C0C0C000C0C0
6827- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000C0C0C0000000
6828- 000000000000C0C0C00080808000000000000000000000000000000000000000
6829- 0000000000000000000000000000000000000000000000000000000000000000
6830- 0000000000000000000000000000000000000000000000000000000000000000
6831- 0000000000000000000000000000000000000000000000000000000000000000
6832- 00000000000000000000000000000000000000000000008484008484840000FF
6833- FF00FFFFFF0000FFFF000000000000000000FFFFFF00FFFFFF00848484000000
6834- 0000000000000000000000000000000000000000000080808000C0C0C000C0C0
6835- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000C0C0C0000000
6836- 000000000000C0C0C00080808000000000000000000000000000000000000000
6837- 0000000000000000000000000000000000000000000000000000000000000000
6838- 0000000000000000000000000000000000000000000000000000000000000000
6839- 0000000000000000000000000000000000000000000000000000000000000000
6840- 0000000000000000000000000000000000000084840000FFFF00C6C6C600FFFF
6841- FF0000FFFF00FFFFFF00000000008484840000000000FFFFFF00848484000000
6842- 0000848484008484840084848400848484000000000080808000C0C0C000C0C0
6843- C000C0C0C0000000000000000000000000000000000000000000000000000000
6844- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
6845- 0000000000000000000000000000000000000000000000000000000000000000
6846- 0000000000000000000000000000000000000000000000000000000000000000
6847- 0000000000000000000000000000000000000000000000000000000000000000
6848- 0000000000000000000000000000000000000084840000FFFF00C6C6C60000FF
6849- FF00FFFFFF0000FFFF0000000000C6C6C60000000000FFFFFF00848484000000
6850- 0000000000000000000000000000000000000000000080808000C0C0C000C0C0
6851- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF0000000000C0C0
6852- C000C0C0C000C0C0C00080808000000000000000000000000000000000000000
6853- 0000000000000000000000000000000000000000000000000000000000000000
6854- 0000000000000000000000000000000000000000000000000000000000000000
6855- 0000000000000000000000000000000000000000000000000000000000000000
6856- 00000000000000000000000000000000000000848400FFFFFF00C6C6C600FFFF
6857- FF0000FFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00848484000000
6858- 0000000000000000000000000000000000000000000080808000C0C0C000C0C0
6859- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000000000000000
6860- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
6615+ 0000000000008484840000000000000000000000000000000000000000000000
68616616 0000000000000000000000000000000000000000000000000000000000000000
68626617 0000000000000000000000000000000000000000000000000000000000000000
68636618 0000000000000000000000000000000000000000000000000000000000000000
6864- 00000000000000000000000000000000000000000000008484000084840000FF
6865- FF00FFFFFF0000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6866- 0000848484000000000000000000000000000000000080808000C0C0C000C0C0
6867- C000C0C0C0000000000000000000FFFFFF00C0C0C000C0C0C000000000000000
6868- 0000C0C0C000C0C0C00080808000000000000000000000000000000000000000
68696619 0000000000000000000000000000000000000000000000000000000000000000
68706620 0000000000000000000000000000000000000000000000000000000000000000
68716621 0000000000000000000000000000000000000000000000000000000000000000
6872- 0000000000000000000000000000000000000000000000000000000000000084
6873- 840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
6874- 000000000000848484000000000000000000000000000000000080808000C0C0
6875- C000C0C0C0000000000000000000FFFFFF00FFFFFF00FFFFFF00000000000000
6876- 0000C0C0C0008080800000000000000000000000000000000000000000000000
6622+ 00000084840000FFFF008484840084848400C6C6C600FFFFFF00848484000000
6623+ 0000000000000000000084848400000000000000000000000000000000000000
68776624 0000000000000000000000000000000000000000000000000000000000000000
68786625 0000000000000000000000000000000000000000000000000000000000000000
68796626 0000000000000000000000000000000000000000000000000000000000000000
68806627 0000000000000000000000000000000000000000000000000000000000000000
6881- 00000084840000FFFF008484840084848400C6C6C600FFFFFF00848484000000
6882- 0000000000000000000084848400000000000000000000000000000000008080
6883- 8000C0C0C000000000000000000000000000000000000000000000000000C0C0
6884- C000808080000000000000000000000000000000000000000000000000000000
68856628 0000000000000000000000000000000000000000000000000000000000000000
68866629 0000000000000000000000000000000000000000000000000000000000000000
6630+ 0000000000000084840000FFFF0000000000C6C6C600C6C6C600000000000000
68876631 0000000000000000000000000000000000000000000000000000000000000000
68886632 0000000000000000000000000000000000000000000000000000000000000000
6889- 0000000000000084840000FFFF0000000000C6C6C600C6C6C600000000000000
68906633 0000000000000000000000000000000000000000000000000000000000000000
6891- 000080808000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0008080
6892- 8000000000000000000000000000000000000000000000000000000000000000
68936634 0000000000000000000000000000000000000000000000000000000000000000
68946635 0000000000000000000000000000000000000000000000000000000000000000
68956636 0000000000000000000000000000000000000000000000000000000000000000
68966637 0000000000000000000000000000000000000000000000000000000000000000
68976638 0000000000000000000000848400848484000000000084848400000000000000
68986639 0000000000000000000000000000000000000000000000000000000000000000
6899- 0000000000008080800080808000808080008080800080808000808080000000
6640+ 0000000000000000000000000000000000000000000000000000000000000000
69006641 0000000000000000000000000000000000000000000000000000000000000000
69016642 0000000000000000000000000000000000000000000000000000000000000000
69026643 0000000000000000000000000000000000000000000000000000000000000000
@@ -8574,16 +8315,12 @@ object GikoForm: TGikoForm
85748315 0000000000000000000000000000000000000000000000000000000000000000
85758316 0000000000000000000000000000000000000000000000000000000000000000
85768317 000000000000000000000000000000000000424D3E000000000000003E000000
8577- 2800000040000000F00000000100010000000000800700000000000000000000
8578- 000000000000000000000000FFFFFF0000000000000000000000000000000000
8579- 0000000000000000000000000000000000000000000000000000000000000000
8580- 0000000000000000000000000000000000000000000000000000000000000000
8581- 0000000000000000000000000000000000000000000000000000000000000000
8582- 00000000000000000000000000000000FE7FFFFF00000000FC3FF81F00000000
8583- F81DF00F00000000F01BE00700000000E017C00300000000801F800100000000
8584- 001F8001000000000010800100000000001F800100000000001F800100000000
8585- 8017800100000000E01BC00300000000F01DE00700000000F83FF00F00000000
8586- FC3FF81F00000000FE7FFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFC003
8318+ 2800000040000000E00000000100010000000000000700000000000000000000
8319+ 000000000000000000000000FFFFFF00FE7F000000000000FC3F000000000000
8320+ F81D000000000000F01B000000000000E017000000000000801F000000000000
8321+ 001F0000000000000010000000000000001F000000000000001F000000000000
8322+ 8017000000000000E01B000000000000F01D000000000000F83F000000000000
8323+ FC3F000000000000FE7F000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFC003
85878324 FFFFFFFFFFFFC003FC01803FFC01C003FC01803C3C01C003FC01803C3C01C003
85888325 FC01803C3C01C003FC01803C3C01C003FC01803C3C01C003C00180000001C003
85898326 C00180000001C003C00180000001C003C00180000001C003FFFFFFFC3FFFC003
@@ -11353,14 +11090,6 @@ object GikoForm: TGikoForm
1135311090 Hint = #24038#38563#12398#12459#12521#12512#12434#12477#12540#12488
1135411091 OnExecute = SortPrevColumnActionExecute
1135511092 end
11356- object BeLogInOutAction: TAction
11357- Category = #12501#12449#12452#12523
11358- Caption = 'Be2ch'#12395#12525#12464#12452#12531'/'#12525#12464#12450#12454#12488#12377#12427
11359- Hint = 'Be2ch'#12395#12525#12464#12452#12531'/'#12525#12464#12450#12454#12488#12377#12427
11360- ImageIndex = 53
11361- OnExecute = BeLogInOutActionExecute
11362- OnUpdate = BeLogInOutActionUpdate
11363- end
1136411093 end
1136511094 object BrowserPopupMenu: TPopupMenu
1136611095 Left = 68
--- a/Giko.pas
+++ b/Giko.pas
@@ -600,7 +600,6 @@ type
600600 SortActiveColumnAction: TAction;
601601 SortNextColumnAction: TAction;
602602 SortPrevColumnAction: TAction;
603- BeLogInOutAction: TAction;
604603 procedure FormCreate(Sender: TObject);
605604 procedure FormDestroy(Sender: TObject);
606605 procedure CabinetPanelHide(Sender: TObject);
@@ -954,11 +953,10 @@ type
954953 procedure SortActiveColumnActionExecute(Sender: TObject);
955954 procedure SortNextColumnActionExecute(Sender: TObject);
956955 procedure SortPrevColumnActionExecute(Sender: TObject);
956+ procedure BrowserExit(Sender: TObject);
957957 procedure MessageListViewAdvancedCustomDrawItem(
958958 Sender: TCustomListView; Item: TListItem; State: TCustomDrawState;
959959 Stage: TCustomDrawStage; var DefaultDraw: Boolean);
960- procedure BeLogInOutActionExecute(Sender: TObject);
961- procedure BeLogInOutActionUpdate(Sender: TObject);
962960 private
963961 { Private 宣言 }
964962 //RoundList : TRoundList;
@@ -1136,8 +1134,6 @@ type
11361134 procedure SetSelectWord( const text : string );
11371135 //ブラウザの再描画 true:全てのタブ false:アクティブなタブのみ
11381136 procedure RepaintAllTabsBrowser();
1139- //リンクの文字列からレスポップアップ用のURLに変換する
1140- function GetRespopupURL(AText, AThreadURL : string): string;
11411137 protected
11421138 procedure CreateParams(var Params: TCreateParams); override;
11431139 procedure WndProc(var Message: TMessage); override;
@@ -1346,8 +1342,8 @@ begin
13461342 {$ENDIF}
13471343 FStartUp := true;
13481344 // LockWindowUpdate(Self.Handle);
1349- Application.OnDeactivate := AppFormDeactivate;
1350- //Self.OnDeactivate := AppFormDeactivate;
1345+ //Application.OnDeactivate := AppFormDeactivate;
1346+ Self.OnDeactivate := AppFormDeactivate;
13511347 Application.HookMainWindow(Hook);
13521348 // Application.OnMessage := HandleAppMessage; //なんか無くても大丈夫になった by もじゅ
13531349 FTreeType := gttNone;
@@ -1361,12 +1357,12 @@ begin
13611357 FBrowsers.Add(TWebBrowser.Create(nil));
13621358 newBrowser := FBrowsers[FBrowsers.Count - 1];
13631359 TOleControl(newBrowser).Parent := BrowserPanel;
1364- TOleControl(newBrowser).Align := alNone;
1365- TOleControl(newBrowser).Left := 0;
1366- TOleControl(newBrowser).Top := 0;
1367- //newBrowser.StatusBar := false;
1368- //newBrowser.MenuBar := false;
1369- //newBrowser.AddressBar := false;
1360+ newBrowser.Align := alNone;
1361+ newBrowser.Left := 0;
1362+ newBrowser.Top := 0;
1363+ newBrowser.StatusBar := false;
1364+ newBrowser.MenuBar := false;
1365+ newBrowser.AddressBar := false;
13701366 newBrowser.OnDocumentComplete := BrowserDocumentComplete;
13711367 newBrowser.OnBeforeNavigate2 := BrowserBeforeNavigate2;
13721368 newBrowser.OnEnter := BrowserEnter;
@@ -1809,8 +1805,6 @@ begin
18091805 LoginAction.Execute;
18101806
18111807 MuteAction.Checked := GikoSys.Setting.Mute;
1812-
1813- GikoSys.Setting.BeLogin := GikoSys.Setting.BeAutoLogin;
18141808 // LockWindowUpdate(0);
18151809 end;
18161810
@@ -2998,7 +2992,37 @@ begin
29982992 end;
29992993 end else begin
30002994 threadItem := GetActiveContent;
3001- URL := GetRespopupURL(Text, threadItem.URL);
2995+ if Pos('about:blank..', Text) = 1 then begin
2996+ wkInt := LastDelimiter( '/', threadItem.URL );
2997+ if Pos( '?', Copy( threadItem.URL, wkInt, MaxInt ) ) = 0 then begin
2998+ // Thread.URL は PATH_INFO 渡し
2999+ URL := Copy( threadItem.URL, 1, LastDelimiter( '/', threadItem.URL ) );
3000+ wkInt := LastDelimiter( '/', Text );
3001+ if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then
3002+ // Text も PATH_INFO 渡し
3003+ URL := URL + Copy( Text, LastDelimiter( '/', Text ) + 1, MaxInt )
3004+ else
3005+ // Text は QUERY_STRING 渡し
3006+ URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt );
3007+ end else begin
3008+ // Thread.URL は QUERY_STRING 渡し
3009+ URL := Copy( threadItem.URL, 1, LastDelimiter( '?', threadItem.URL ) );
3010+ wkInt := LastDelimiter( '/', Text );
3011+ if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin
3012+ // Text は PATH_INFO 渡し
3013+ // URL に板とキーが足らないので Text から頂戴する
3014+ wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) );
3015+ wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) );
3016+ URL := Copy( URL, 1, Length( URL ) - 1 ) + Copy( Text, wkInt, MaxInt );
3017+ end else begin
3018+ // Text も QUERY_STRING 渡し
3019+ URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt )
3020+ end;
3021+ end;
3022+ end else begin
3023+ URL := Text;
3024+ end;
3025+
30023026 PathRec := Gikosys.Parse2chURL2(URL);
30033027 if (PathRec.FNoParam) then begin
30043028 PathRec.FSt := 1;
@@ -3026,6 +3050,18 @@ begin
30263050 wkIntTo := wkIntSt;
30273051 wkIntSt := wkInt;
30283052 end;
3053+ //if wkIntSt = 0 then
3054+ // wkIntSt := 1;
3055+ //if wkINtTo = 0 then
3056+ // wkIntTo := 1;
3057+ //if PathRec.FFirst then
3058+ // wkIntSt := 1;
3059+ //if PathRec.FStBegin then //http://〜〜〜〜/-50というとき
3060+ // wkIntSt := 1; //
3061+ //if PathRec.FToEnd then //http://〜〜〜〜/50-というとき
3062+ // wkIntTo := 9999; // どちらの場合も、GetPopupResNumberでうまく番号を調整するのでふよう。
3063+
3064+ //ATitle := ActiveFileName <> PathRec.FKey;
30293065 if (FActiveContent <> nil) and (FActiveContent.Thread.URL = URL) then
30303066 ATitle := false
30313067 else
@@ -6377,8 +6413,6 @@ var
63776413 wkIntSt: Integer;
63786414 wkIntTo: Integer;
63796415 document: IHTMLDocument2;
6380- BNum, BRes: string;
6381- threadItem: TThreadItem;
63826416 begin
63836417
63846418 Cancel := True;
@@ -6413,19 +6447,8 @@ begin
64136447
64146448 end;
64156449 end else begin
6416- ////'http://be.2ch.net/test/p.php?i='+id+'&u=d:'+bas+num
6417-
64186450 URL := GikoSys.GetHRefText(Html);
64196451 URL := GikoSys.HTMLDecode(URL);
6420- if AnsiPos('BE:', URL) = 1 then begin
6421- BNum := Copy(URL, 4, AnsiPos('/', URL) - 4);
6422- BRes := Copy(URL, AnsiPos('/', URL) + 1, Length(URL));
6423- threadItem := FActiveContent.Thread;
6424- if threadItem = nil then Exit;
6425- URL := BE_PHP_URL + BNum + '&u=d'
6426- + CustomStringReplace(threadItem.URL, 'l50', '') + BRes;
6427- end;
6428-
64296452 if( AnsiPos('http://', URL) = 1) or (AnsiPos('https://', URL) = 1) or
64306453 ( AnsiPos('ftp://', URL) = 1) then begin
64316454 //アドレスバーの履歴
@@ -12146,6 +12169,11 @@ begin
1214612169
1214712170 end;
1214812171
12172+procedure TGikoForm.BrowserExit(Sender: TObject);
12173+begin
12174+ IDAnchorPopup('');
12175+end;
12176+
1214912177 procedure TGikoForm.RepaintAllTabsBrowser();
1215012178 var
1215112179 i : Integer;
@@ -12170,66 +12198,6 @@ begin
1217012198 // end;
1217112199 end;
1217212200
12173-procedure TGikoForm.BeLogInOutActionExecute(Sender: TObject);
12174-begin
12175- GikoSys.Setting.BeLogin := not GikoSys.Setting.BeLogin;
12176-end;
12177-
12178-procedure TGikoForm.BeLogInOutActionUpdate(Sender: TObject);
12179-begin
12180- if (GikoSys.Setting.BeUserID <> '') and (GikoSys.Setting.BeCode <> '') then begin
12181- if (GikoSys.Setting.BeLogin) then BeLogInOutAction.Checked := true
12182- else BeLogInOutAction.Checked := false;
12183- BeLogInOutAction.Enabled := true
12184- end else
12185- BeLogInOutAction.Enabled := false;
12186-
12187-end;
12188-//リンクの文字列からレスポップアップ用のURLに変換する
12189-function TGikoForm.GetRespopupURL(AText, AThreadURL : string): string;
12190-var
12191- wkInt: Integer;
12192-begin
12193- Result := '';
12194- if Pos('about:blank..', AText) = 1 then begin
12195- wkInt := LastDelimiter( '/', AThreadURL );
12196- if Pos( '?', Copy( AThreadURL, wkInt, MaxInt ) ) = 0 then begin
12197- // Thread.URL は PATH_INFO 渡し
12198- Result := Copy( AThreadURL, 1, LastDelimiter( '/', AThreadURL ) );
12199- wkInt := LastDelimiter( '/', AText );
12200- if Pos( '?', Copy( AText, wkInt, MaxInt ) ) = 0 then
12201- // Text も PATH_INFO 渡し
12202- Result := Result + Copy( AText, LastDelimiter( '/', AText ) + 1, MaxInt )
12203- else
12204- // Text は QUERY_STRING 渡し
12205- Result := Result + Copy( AText, LastDelimiter( '?', AText ) + 1, MaxInt );
12206- end else begin
12207- // Thread.URL は QUERY_STRING 渡し
12208- Result := Copy( AThreadURL, 1, LastDelimiter( '?', AThreadURL ) );
12209- wkInt := LastDelimiter( '/', AText );
12210- if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin
12211- // Text は PATH_INFO 渡し
12212- // URL に板とキーが足らないので Text から頂戴する
12213- wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
12214- wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
12215- Result := Copy( Result, 1, Length( Result ) - 1 ) + Copy( AText, wkInt, MaxInt );
12216- end else begin
12217- // Text も QUERY_STRING 渡し
12218- Result := Result + Copy( Text, LastDelimiter( '?', AText ) + 1, MaxInt )
12219- end;
12220- end;
12221- end else if Pos('about:blank/bbs/', AText) = 1 then begin
12222- //したらばJBBSの仕変の吸収
12223- AText := CustomStringReplace(AText, 'about:blank/bbs/', 'about:blank../../bbs/');
12224- Result := GetRespopupURL(AText, AThreadURL);
12225- end else begin
12226- Result := AText;
12227- end;
12228-
12229-end;
12230-
12231-
12232-
1223312201 initialization
1223412202 OleInitialize(nil);
1223512203 finalization
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -236,8 +236,6 @@ type
236236 function SpamParse( const text : string; wordCount : TWordCount ) : Extended;
237237 //引数が、日付でも時刻でもないことを調べる
238238 function NotDateorTimeString(const AStr : string): boolean;
239- //引数に送られてきた日付/ID部にBEの文字列があったら、プロファイルへのリンクを追加
240- function AddBeProfileLink(AID : string; ANum: Integer): string;
241239 end;
242240
243241 var
@@ -250,7 +248,6 @@ const
250248 BETA_VERSION = 50;
251249 BETA_VERSION_BUILD = ''; //debug版など
252250 APP_NAME = 'gikoNavi';
253- BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
254251
255252 implementation
256253
@@ -267,7 +264,6 @@ const
267264 OLD_READ_PATH: string = '/test/read.cgi?';
268265 KAKO_PATH: string = '/kako/';
269266
270-
271267 (*************************************************************************
272268 *GikoSysコンストラクタ
273269 *************************************************************************)
@@ -1096,7 +1092,7 @@ var
10961092 SkinRes: string;
10971093
10981094 strTmp : string;
1099-// threadURL : string;
1095+
11001096 function LoadSkin( fileName: string ): string;
11011097 begin
11021098 Result := LoadFromSkin( fileName, ThreadItem, ThreadItem.Size );
@@ -1208,7 +1204,6 @@ begin
12081204 BBSID := ThreadItem.ParentBoard.BBSID;
12091205 NewReceiveNo := ThreadItem.NewReceive;
12101206 ReadList := TStringList.Create;
1211-
12121207 try
12131208 if ThreadItem.IsLogFile then begin
12141209 FileName := ThreadItem.GetThreadFileName;
@@ -1225,7 +1220,6 @@ begin
12251220 sTitle := CustomStringReplace(ThreadItem.Title, '@`', ',');
12261221 end;
12271222 SaveList := TStringList.Create;
1228- //threadURL := CustomStringReplace(ThreadItem.URL, 'l50', '');
12291223 try
12301224 doc.open;
12311225 doc.charset := 'Shift_JIS';
@@ -1288,7 +1282,6 @@ begin
12881282
12891283 Res := DivideStrLine(ReadList[i]);
12901284 Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
1291- Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
12921285 try
12931286 if NewReceiveNo <= (i + 1) then
12941287 // 新着レス
@@ -1365,7 +1358,6 @@ begin
13651358 No := IntToStr(i + 1);
13661359 Res := DivideStrLine(ReadList[i]);
13671360 Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
1368- Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
13691361 if Res.FMailTo = '' then
13701362 SaveList.Add('<a name="' + No + '"></a>'
13711363 + '<div class="header"><span class="no"><a href="menu:' + No + '">' + No + '</a></span> '
@@ -1446,7 +1438,6 @@ begin
14461438 No := IntToStr(i + 1);
14471439 Res := DivideStrLine(ReadList[i]);
14481440 Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
1449- Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
14501441 if Res.FMailTo = '' then
14511442 SaveList.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> 名前:<font color="forestgreen"><b> ' + Res.FName + ' </b></font> 投稿日: <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>')
14521443 else if GikoSys.Setting.ShowMail then
@@ -1594,6 +1585,12 @@ begin
15941585 No := IntToStr(i + 1);
15951586
15961587 Res := DivideStrLine(ReadList[i]);
1588+ {if Res.FType = glt2chOld then begin
1589+ Res.FMailTo := CustomStringReplace(Res.FMailTo, '@`', ',');
1590+ Res.FName := CustomStringReplace(Res.FName, '@`', ',');
1591+ Res.FBody := CustomStringReplace(Res.FBody, '@`', ',');
1592+ end;
1593+ }
15971594 Res.FBody := AddAnchorTag(Res.FBody);
15981595 Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
15991596
@@ -1632,6 +1629,12 @@ begin
16321629 if (Trim(ReadList[i]) <> '') then begin
16331630 No := IntToStr(i + 1);
16341631 Res := DivideStrLine(ReadList[i]);
1632+ {if Res.FType = glt2chOld then begin
1633+ Res.FMailTo := CustomStringReplace(Res.FMailTo, '@`', ',');
1634+ Res.FName := CustomStringReplace(Res.FName, '@`', ',');
1635+ Res.FBody := CustomStringReplace(Res.FBody, '@`', ',');
1636+ end;
1637+ }
16351638 Res.FBody := AddAnchorTag(Res.FBody);
16361639 Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
16371640 if Res.FMailTo = '' then
@@ -1663,6 +1666,7 @@ begin
16631666 end;
16641667 end;
16651668 html.Append('<a name="bottom"></a>');
1669+ //html.Append('</body></html>');
16661670 html.Append('<a name="last"></a>');
16671671 html.Append('</body></html>');
16681672 end else begin
@@ -1678,6 +1682,12 @@ begin
16781682 if (Trim(ReadList[i]) <> '') then begin
16791683 No := IntToStr(i + 1);
16801684 Res := DivideStrLine(ReadList[i]);
1685+ {if Res.FType = glt2chOld then begin
1686+ Res.FMailTo := CustomStringReplace(Res.FMailTo, '@`', ',');
1687+ Res.FName := CustomStringReplace(Res.FName, '@`', ',');
1688+ Res.FBody := CustomStringReplace(Res.FBody, '@`', ',');
1689+ end;
1690+ }
16811691 Res.FBody := AddAnchorTag(Res.FBody);
16821692 Res.FBody := ConvertResAnchor(ConvRes(Res.FBody, ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true', true));
16831693 if Res.FMailTo = '' then
@@ -4031,27 +4041,6 @@ begin
40314041 1: Result := Result + 'font-style:italic;';
40324042 end;
40334043 end;
4034-//引数、AID:対象となる日付ID文字列、ANum:レス番 AURL:そのスレッドのURL
4035-function TGikoSys.AddBeProfileLink(AID : string; ANum: Integer):string ;
4036-var
4037- p : integer;
4038- BNum, BMark : string;
4039-begin
4040- p := AnsiPos('BE:', AnsiUpperCase(AID));
4041- if p > 0 then begin
4042- BNum := Copy(AID, p, Length(AID));
4043- AID := Copy(AID, 1, p - 1);
4044- p := AnsiPos('-', BNum);
4045- if p > 0 then begin
4046- BMark := '?' + Trim(Copy(BNum, p + 1, Length(BNum)));
4047- BNum := Copy(BNum, 1, p - 1);
4048- end;
4049- BNum := Trim(BNum);
4050- Result := AID + ' <a href="' + BNum + '/' + IntToStr(ANum)
4051- + '" target=_blank>' + BMark + '</a>';
4052- end else
4053- Result := AID;
4054-end;
40554044
40564045 initialization
40574046 GikoSys := TGikoSys.Create;
--- a/Option.dfm
+++ b/Option.dfm
@@ -1472,7 +1472,7 @@ object OptionDialog: TOptionDialog
14721472 Top = 59
14731473 Width = 54
14741474 Height = 12
1475- Caption = #35469#35388#12467#12540#12489
1475+ Caption = #12497#12473#12527#12540#12489
14761476 end
14771477 object BeUserIDEdit: TEdit
14781478 Left = 88
@@ -1481,7 +1481,7 @@ object OptionDialog: TOptionDialog
14811481 Height = 20
14821482 TabOrder = 0
14831483 end
1484- object BeCodeEdit: TEdit
1484+ object BePasswordEdit: TEdit
14851485 Left = 88
14861486 Top = 56
14871487 Width = 369
--- a/Option.pas
+++ b/Option.pas
@@ -193,7 +193,7 @@ type
193193 Label7: TLabel;
194194 BeUserIDEdit: TEdit;
195195 Label8: TLabel;
196- BeCodeEdit: TEdit;
196+ BePasswordEdit: TEdit;
197197 BeAutoLoginCheckBox: TCheckBox;
198198 procedure FormCreate(Sender: TObject);
199199 procedure FormDestroy(Sender: TObject);
@@ -847,7 +847,7 @@ begin
847847
848848 //Be2ch認証
849849 BeUserIDEdit.Text := GikoSys.Setting.BeUserID;
850- BeCodeEdit.Text := GikoSys.Setting.BeCode;
850+ BePasswordEdit.Text := GikoSys.Setting.BePassword;
851851 BeAutoLoginCheckBox.Checked := GikoSys.Setting.BeAutoLogin;
852852 end;
853853
@@ -1126,7 +1126,7 @@ begin
11261126 GikoSys.Setting.UseUndecided := UseUndecidedCheckBox.Checked;
11271127 //Be2ch
11281128 GikoSys.Setting.BeUserID := BeUserIDEdit.Text;
1129- GikoSys.Setting.BeCode := BeCodeEdit.Text;
1129+ GikoSys.Setting.BePassword := BePasswordEdit.Text;
11301130 GikoSys.Setting.BeAutoLogin := BeAutoLoginCheckBox.Checked;
11311131 end;
11321132
--- a/Round.dfm
+++ b/Round.dfm
@@ -1,6 +1,6 @@
11 object RoundDialog: TRoundDialog
2- Left = 423
3- Top = 180
2+ Left = 101
3+ Top = 170
44 Width = 600
55 Height = 427
66 BorderIcons = [biSystemMenu]
@@ -54,7 +54,7 @@ object RoundDialog: TRoundDialog
5454 Left = 0
5555 Top = 49
5656 Width = 592
57- Height = 314
57+ Height = 307
5858 Align = alClient
5959 BevelOuter = bvNone
6060 BorderWidth = 4
@@ -63,7 +63,7 @@ object RoundDialog: TRoundDialog
6363 Left = 4
6464 Top = 4
6565 Width = 584
66- Height = 306
66+ Height = 299
6767 Align = alClient
6868 Checkboxes = True
6969 Columns = <
@@ -90,7 +90,7 @@ object RoundDialog: TRoundDialog
9090 end
9191 object Panel3: TPanel
9292 Left = 0
93- Top = 363
93+ Top = 356
9494 Width = 592
9595 Height = 37
9696 Align = alBottom
--- a/Round.pas
+++ b/Round.pas
@@ -64,22 +64,38 @@ var
6464 ThreadItem: TThreadItem;
6565 RoundItem: TRoundItem;
6666 begin
67+// if CompareTime(GikoForm.LastRoundTime, Now, 5) then begin
68+// msg := '一度巡回すると5分間巡回は出来ません';
69+// GikoSys.MsgBox(msg, 'エラー', MB_OK or MB_ICONSTOP);
70+// Exit;
71+// end;
6772 {$IF Defined(FRCRND) }
6873 Giko.GikoForm.LoginAction.Checked := true; // 動作試験用途
6974 {$IFEND}
7075
71- cnt := GetRoundCount;
76+ if not Giko.GikoForm.LoginAction.Checked then begin
77+ if GikoSys.Setting.UserID <> '' then begin
78+ msg := 'ログインしないと巡回は出来ません' + #13#10
79+ + '今ログインしますか';
80+ if MsgBox(Handle, msg, '確認', MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) <> IDYES then begin
81+ Exit;
82+ end;
83+ Giko.GikoForm.LoginAction.Execute;
84+ end;
85+ end;
86+
7287 if not Giko.GikoForm.LoginAction.Checked then begin
73- if CompareTime(GikoForm.LastRoundTime, Now, 30) then begin
74- msg := '一度巡回すると15分間巡回は出来ません';
75- MsgBox(Handle, msg, 'エラー', MB_OK or MB_ICONSTOP);
76- Exit;
77- end;
78- if cnt > 100 then begin
79- msg := '100個以上は一度に巡回できません';
80- MsgBox(Handle, msg, 'エラー', MB_OK or MB_ICONSTOP);
81- Exit;
82- end;
88+ msg := 'ログインしないと巡回は出来ません';// + #13#10
89+// + '分からない人はギコナビスレッドで聞いてください';
90+ MsgBox(Handle, msg, 'エラー', MB_OK or MB_ICONSTOP);
91+ Exit;
92+ end;
93+
94+ cnt := GetRoundCount;
95+ if cnt = 0 then begin
96+ msg := '巡回したい項目に1つ以上チェックを入れてください';
97+ MsgBox(Handle, msg, 'エラー', MB_OK or MB_ICONSTOP);
98+ Exit;
8399 end;
84100
85101 for i := 0 to RoundList.Count[grtBoard] - 1 do begin
@@ -109,7 +125,7 @@ begin
109125 end;
110126 end;
111127 end;
112- GikoForm.LastRoundTime := Now;
128+// GikoForm.LastRoundTime := Now;
113129 Close;
114130 end;
115131
--- a/RoundName.dfm
+++ b/RoundName.dfm
@@ -1,6 +1,6 @@
11 object RoundNameDialog: TRoundNameDialog
2- Left = 303
3- Top = 210
2+ Left = 69
3+ Top = 203
44 BorderStyle = bsDialog
55 Caption = #24033#22238#21517#25351#23450
66 ClientHeight = 104
--- a/Setting.pas
+++ b/Setting.pas
@@ -439,9 +439,8 @@ type
439439 //Be2ch
440440 //認証用ユーザID・パスワード
441441 FBeUserID: String;
442- FBeCode: String;
443- FBeAutoLogin: Boolean;
444- FBeLogin: Boolean;
442+ FBePassword: String;
443+ FBeAutoLogin: Boolean;
445444
446445 function GetMainCoolSet(Index: Integer): TCoolSet;
447446 function GetBoardCoolSet(Index: Integer): TCoolSet;
@@ -751,9 +750,8 @@ type
751750 property UseUndecided: Boolean read FUseUndecided write FUseUndecided;
752751
753752 property BeUserID: string read FBeUserID write FBeUserID;
754- property BeCode: string read FBeCode write FBeCode;
753+ property BePassword: string read FBePassword write FBePassword;
755754 property BeAutoLogin: Boolean read FBeAutoLogin write FBeAutoLogin;
756- property BeLogin: Boolean read FBeLogin write FBeLogin;
757755 end;
758756
759757
@@ -1330,10 +1328,10 @@ begin
13301328 FMute := ini.ReadBool('Function', 'Mute', false);
13311329 FUseUndecided := ini.ReadBool('ThreadList', 'UseUndecided', False);
13321330
1333- //Be2ch
1334- //認証用ユーザID・認証コード
1331+ //Be2ch
1332+ //認証用ユーザID・パスワード
13351333 FBeUserID := ini.ReadString('Be', 'UserID', '');
1336- FBeCode := Decrypt(ini.ReadString('Be', 'Code', ''));
1334+ FBePassword := Decrypt(ini.ReadString('Be', 'Password', ''));
13371335 FBeAutoLogin := ini.ReadBool('Be', 'AutoLogin', False);
13381336 ini.UpdateFile;
13391337 finally
@@ -1686,7 +1684,7 @@ begin
16861684
16871685 //認証用ユーザID・パスワード
16881686 ini.WriteString('Be', 'UserID', FBeUserID);
1689- ini.WriteString('Be', 'Code', Encrypt(FBeCode));
1687+ ini.WriteString('Be', 'Password', Encrypt(FBePassword));
16901688 ini.WriteBool('Be', 'AutoLogin', FBeAutoLogin);
16911689
16921690 ini.UpdateFile;
--- a/ToolBarUtil.pas
+++ b/ToolBarUtil.pas
@@ -9,7 +9,7 @@ uses
99
1010 const
1111 //標準ツールバーデフォルト
12- DEF_STANDARD: array[0..11] of string = ('RoundAction',
12+ DEF_STANDARD: array[0..10] of string = ('RoundAction',
1313 '',
1414 'ArrangeAction',
1515 '',
@@ -19,8 +19,7 @@ const
1919 'CabinetBBSAction',
2020 'CabinetHistoryAction',
2121 'CabinetFavoriteAction',
22- 'MuteAction',
23- 'BeLogInOutAction');
22+ 'MuteAction');
2423 //リストツールバーデフォルト
2524 DEF_LIST: array[0..16] of string = ('ListNumberVisibleAction',
2625 'IconStyle',
@@ -61,7 +60,7 @@ const
6160
6261
6362 /// ボタンスタイルが"tbsCheck"ボタンのアクション
64- CHECK_STYLE: array[0..35] of string = ('CabinetVisibleAction',
63+ CHECK_STYLE: array[0..34] of string = ('CabinetVisibleAction',
6564 'MuteAction',
6665 'ArrangeAction',
6766 'AllItemAction',
@@ -96,8 +95,7 @@ const
9695 'SelectResAction',
9796 'OnlyAHundredResAction',
9897 'OnlyKokoResAction',
99- 'OnlyNewResAction',
100- 'BeLogInOutAction'
98+ 'OnlyNewResAction'
10199 );
102100
103101 /// ボタンのスタイルが"tbsDropDown"ボタンのアクション
Binary files a/gikoNavi.res and b/gikoNavi.res differ
Show on old repository browser