OSDN Git Service

したらばJBBSの板検索のHTMLが変わっていたので対応した。
[gikonavigoeson/gikonavi.git] / GikoDataModule.dfm
index 5ce12da..589305c 100644 (file)
@@ -1,8 +1,8 @@
 object GikoDM: TGikoDM
   OldCreateOrder = False
   OnCreate = DataModuleCreate
-  Left = 660
-  Top = 170
+  Left = 518
+  Top = 174
   Height = 336
   Width = 286
   object GikoFormActionList: TActionList
@@ -315,7 +315,7 @@ object GikoDM: TGikoDM
       ImageIndex = 9
       ShortCut = 16433
       OnExecute = AllItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object LogItemAction: TAction
       Category = #26495
@@ -326,7 +326,7 @@ object GikoDM: TGikoDM
       ImageIndex = 10
       ShortCut = 16434
       OnExecute = LogItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object NewItemAction: TAction
       Category = #26495
@@ -337,7 +337,7 @@ object GikoDM: TGikoDM
       ImageIndex = 11
       ShortCut = 16435
       OnExecute = NewItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object ArchiveItemAction: TAction
       Category = #26495
@@ -347,7 +347,7 @@ object GikoDM: TGikoDM
       Hint = 'DAT'#33853#12385#12473#12524#12483#12489#12398#12415#34920#31034#12377#12427
       ImageIndex = 55
       OnExecute = ArchiveItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object LiveItemAction: TAction
       Category = #26495
@@ -357,7 +357,7 @@ object GikoDM: TGikoDM
       Hint = #29983#23384#12375#12390#12356#12427#12473#12524#12483#12489#12398#12415#12434#34920#31034#12377#12427
       ImageIndex = 54
       OnExecute = LiveItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object ThreadRangeAction: TAction
       Category = #26495
@@ -367,7 +367,7 @@ object GikoDM: TGikoDM
       Hint = #12473#12524#12483#12489#12398#34920#31034#31684#22258#12434#35373#23450
       ImageIndex = 10
       OnExecute = ThreadRangeActionExecute
-      OnUpdate = DependActiveCntentActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object SelectItemAction: TAction
       Category = #26495
@@ -378,7 +378,7 @@ object GikoDM: TGikoDM
       ImageIndex = 12
       ShortCut = 16436
       OnExecute = SelectItemActionExecute
-      OnUpdate = DependActiveListTBoardActionUpdate
+      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
     end
     object StopAction: TAction
       Category = #34920#31034
@@ -448,6 +448,20 @@ object GikoDM: TGikoDM
       OnExecute = ScrollKokoActionExecute
       OnUpdate = ScrollKokoActionUpdate
     end
+    object ScrollPageDownAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #27425#12506#12540#12472
+      Hint = #27425#12506#12540#12472#12473#12463#12525#12540#12523
+      OnExecute = ScrollPageDownActionExecute
+      OnUpdate = DependActiveCntentActionUpdate
+    end
+    object ScrollPageUpAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #21069#12506#12540#12472#12473#12463#12525#12540#12523
+      Hint = #21069#12506#12540#12472#12473#12463#12525#12540#12523
+      OnExecute = ScrollPageUpActionExecute
+      OnUpdate = DependActiveCntentActionUpdate
+    end
     object EditorAction: TAction
       Category = #12473#12524#12483#12489
       Caption = #12524#12473#26360#12365#36796#12415'(&R)'
@@ -696,7 +710,7 @@ object GikoDM: TGikoDM
       Hint = #24038#12398#12479#12502#12434#36984#25246#12377#12427
       ImageIndex = 48
       OnExecute = LeftTabSelectActionExecute
-      OnUpdate = LeftmostTabSelectActionUpdate
+      OnUpdate = LeftTabSelectActionUpdate
     end
     object RightTabSelectAction: TAction
       Category = #12473#12524#12483#12489
@@ -712,7 +726,7 @@ object GikoDM: TGikoDM
       Hint = #19968#30058#21491#12398#12479#12502#12434#36984#25246#12377#12427
       ImageIndex = 49
       OnExecute = RightmostTabSelectActionExecute
-      OnUpdate = RightTabSelectActionUpdate
+      OnUpdate = RightmostTabSelectActionUpdate
     end
     object FavoriteAddAction: TAction
       Category = #12362#27671#12395#20837#12426
@@ -913,7 +927,7 @@ object GikoDM: TGikoDM
     object FavoriteTreeViewURLCopyAction: TAction
       Tag = -1
       Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
-      Caption = 'URL'#12434#12467#12500#12540'(&C)'
+      Caption = 'URL'#12434#12467#12500#12540'(&U)'
       Hint = #36984#25246#12373#12428#12390#12356#12427#12473#12524#12483#12489#12398'URL'#12434#12467#12500#12540#12377#12427
       OnExecute = FavoriteTreeViewURLCopyActionExecute
     end
@@ -1079,18 +1093,6 @@ object GikoDM: TGikoDM
       OnExecute = BrowsBoradHeadActionExecute
       OnUpdate = LogFolderOpenActionUpdate
     end
-    object TabAutoSaveAction: TAction
-      Category = #12501#12449#12452#12523
-      Caption = #12479#12502#12398#38918#30058#12434#33258#21205#20445#23384
-      Hint = #12479#12502#12398#38918#30058#12434#33258#21205#20445#23384
-      OnExecute = TabAutoSaveActionExecute
-    end
-    object TabAutoLoadAction: TAction
-      Category = #12501#12449#12452#12523
-      Caption = #12479#12502#12398#38918#30058#12434#33258#21205#24489#20803
-      Hint = #12479#12502#12398#38918#30058#12434#33258#21205#24489#20803
-      OnExecute = TabAutoLoadActionExecute
-    end
     object JumpToNumOfResAction: TAction
       Category = #12473#12524#12483#12489
       Caption = #25351#23450#12375#12383#30058#21495#12398#12524#12473#12395#39131#12406
@@ -1234,6 +1236,147 @@ object GikoDM: TGikoDM
       ShortCut = 16454
       OnExecute = OpenFindDialogActionExecute
     end
+    object FavoriteTreeViewItemNameCopyAction: TAction
+      Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
+      Caption = #34920#31034#21517#12434#12467#12500#12540'(&S)'
+      Hint = #34920#31034#12375#12390#12356#12427#21517#21069#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
+      OnExecute = FavoriteTreeViewItemNameCopyActionExecute
+    end
+    object CloseAllEditorAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12377#12409#12390#12398#12524#12473#12456#12487#12451#12479#12434#38281#12376#12427
+      Hint = #12377#12409#12390#12398#12524#12473#12456#12487#12451#12479#12434#38281#12376#12427
+      OnExecute = CloseAllEditorActionExecute
+      OnUpdate = CloseAllEditorActionUpdate
+    end
+    object PrevMoveHistory: TAction
+      Category = #25805#20316
+      Caption = #12522#12531#12463#23653#27508#12434#25147#12427
+      Hint = #12522#12531#12463#23653#27508#12434#25147#12427
+      OnExecute = PrevMoveHistoryExecute
+      OnUpdate = PrevMoveHistoryUpdate
+    end
+    object NextMoveHistory: TAction
+      Category = #25805#20316
+      Caption = #12522#12531#12463#23653#27508#12434#36914#12416
+      Hint = #12522#12531#12463#23653#27508#12434#36914#12416
+      OnExecute = NextMoveHistoryExecute
+      OnUpdate = NextMoveHistoryUpdate
+    end
+    object ClickActiveElementAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12450#12463#12486#12451#12502#12394#35201#32032#12434#12463#12522#12483#12463#12377#12427
+      Hint = #12450#12463#12486#12451#12502#12394#35201#32032#12434#12463#12522#12483#12463#12377#12427
+      OnExecute = ClickActiveElementActionExecute
+    end
+    object VKDownAction: TAction
+      Category = #25805#20316
+      Caption = #19979#30690#21360#12461#12540#25276#19979
+      Hint = #19979#30690#21360#12461#12540#25276#19979
+      OnExecute = VKDownActionExecute
+    end
+    object VKUpAction: TAction
+      Category = #25805#20316
+      Caption = #19978#30690#21360#12461#12540#25276#19979
+      Hint = #19978#30690#21360#12461#12540#25276#19979
+      OnExecute = VKUpActionExecute
+    end
+    object VKRightAction: TAction
+      Category = #25805#20316
+      Caption = #21491#30690#21360#12461#12540#25276#19979
+      Hint = #21491#30690#21360#12461#12540#25276#19979
+      OnExecute = VKRightActionExecute
+    end
+    object VKLeftAction: TAction
+      Category = #25805#20316
+      Caption = #24038#30690#21360#12461#12540#25276#19979
+      Hint = #24038#30690#21360#12461#12540#25276#19979
+      OnExecute = VKLeftActionExecute
+    end
+    object StoredTaskTrayAction: TAction
+      Category = #25805#20316
+      Caption = #12479#12473#12463#12488#12524#12452#12395#26684#32013#12377#12427
+      Hint = #12479#12473#12463#12488#12524#12452#12395#26684#32013#12377#12427
+      OnExecute = StoredTaskTrayActionExecute
+    end
+    object AllImageLinkToClipbordAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12452#12513#12540#12472#12522#12531#12463'URL'#21462#24471
+      Hint = #34920#31034#12373#12428#12390#12356#12427#12377#12409#12390#12398#12524#12473#12363#12425#12452#12513#12540#12472#12408#12398#12522#12531#12463'URL'#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
+      OnExecute = AllImageLinkToClipbordActionExecute
+      OnUpdate = DependActiveCntentLogActionUpdate
+    end
+    object NewImageLinkToClipBoardAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #26032#30528#12524#12473#12452#12513#12540#12472#12522#12531#12463'URL'#21462#24471
+      Hint = #34920#31034#12373#12428#12390#12356#12427#26032#30528#12524#12473#12363#12425#12452#12513#12540#12472#12408#12398#12522#12531#12463'URL'#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
+      OnExecute = NewImageLinkToClipBoardActionExecute
+      OnUpdate = DependActiveCntentLogActionUpdate
+    end
+    object SetForcusForAddresBarAction: TAction
+      Category = #12450#12489#12524#12473#12496#12540
+      Caption = #12450#12489#12524#12473#12496#12540#12395#12501#12457#12540#12459#12473#12434#24403#12390#12427
+      Hint = #12450#12489#12524#12473#12496#12540#12395#12501#12457#12540#12459#12473#12434#24403#12390#12427
+      OnExecute = SetForcusForAddresBarActionExecute
+    end
+    object NewBoardSearchAction: TAction
+      Category = #12501#12449#12452#12523
+      Caption = #31227#36578#26495#26908#32034
+      Hint = #31227#36578#12375#12390#12356#12427#26495#12398'URL'#12434#26908#32034#12377#12427
+      OnExecute = NewBoardSearchActionExecute
+    end
+    object NGWordEditFormAction: TAction
+      Category = 'NGword'
+      Caption = 'NG'#12527#12540#12489#32232#38598#12501#12457#12540#12512
+      Hint = 'NG'#12527#12540#12489#32232#38598#12501#12457#12540#12512#12458#12540#12503#12531
+    end
+    object AllLinkToClipboardAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12522#12531#12463'URL'#21462#24471
+      Hint = #12522#12531#12463'URL'#21462#24471
+      OnExecute = AllLinkToClipboardActionExecute
+      OnUpdate = DependActiveCntentActionUpdate
+    end
+    object NewLinkToClipboardAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #26032#30528#12524#12473#12522#12531#12463'URL'#21462#24471
+      Hint = #26032#30528#12524#12473#12522#12531#12463'URL'#21462#24471
+      OnExecute = NewLinkToClipboardActionExecute
+      OnUpdate = DependActiveCntentActionUpdate
+    end
+    object AddIDtoNGWord0Action: TAction
+      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
+      Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')'
+      Hint = #12524#12473#12398'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427#65288#36879#26126#65289
+      OnExecute = AddIDtoNGWord0ActionExecute
+    end
+    object AddIDtoNGWord1Action: TAction
+      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
+      Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152
+      Hint = 'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427
+      OnExecute = AddIDtoNGWord1ActionExecute
+    end
+    object ExtractSameIDAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12463#12522#12483#12503#12508#12540#12489#12398#25991#23383#21015#12434#21547#12416'ID'#12398#12524#12473#12450#12531#12459#12540#34920#31034
+      Hint = #12463#12522#12483#12503#12508#12540#12489#12398#25991#23383#21015#12434#21547#12416'ID'#12398#12524#12473#12450#12531#12459#12540#34920#31034
+      OnExecute = ExtractSameIDActionExecute
+      OnUpdate = DependActiveCntentLogActionUpdate
+    end
+    object ShowTabListAction: TAction
+      Category = #34920#31034
+      Caption = #12479#12502#19968#35239#34920#31034
+      Hint = #12479#12502#19968#35239#34920#31034
+      OnExecute = ShowTabListActionExecute
+    end
+    object DereferenceResAction: TAction
+      Tag = 1
+      Category = #12473#12524#12483#12489
+      Caption = #12371#12398#12524#12473#12434#21442#29031#12375#12390#12356#12427#12524#12473#12450#12531#12459#12540#34920#31034
+      Hint = #12371#12398#12524#12473#12434#21442#29031#12375#12390#12356#12427#12524#12473#12450#12531#12459#12540#34920#31034
+      OnExecute = DereferenceResActionExecute
+      OnUpdate = DependActiveCntentLogActionUpdate
+    end
   end
   object ToobarImageList: TImageList
     Left = 44
@@ -1375,126 +1518,126 @@ object GikoDM: TGikoDM
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000004C4C4C000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C0000000
+      0000000000004A4A4A000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C6000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000008484000000000084848400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000008484840084848400848484008484840084848400848484000000
-      0000000000000000000000000000000000000000000000000000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000000000000000
-      00004C4C4C004C4C4C004C4C4C0000000000000000000000000080808000FFFF
-      FF001C1C1C001C1C1C001C1C1C001C1C1C001C1C1C00FFFFFF00C0C0C0000000
+      0000000000000000000000000000000000000000000000000000C6C6C600C6C6
+      C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600000000000000
+      00004A4A4A004A4A4A004A4A4A0000000000000000000000000084848400FFFF
+      FF001818180018181800181818001818180018181800FFFFFF00C6C6C6000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000084840000000000C6C6C600C6C6C600848484000000
       0000000000000000000084848400000000000000000000000000000000000000
       000084848400C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C6008484
-      8400000000000000000000000000000000000000000000000000C0C0C000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C000000000000000
-      0000000000004C4C4C000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C0000000
+      8400000000000000000000000000000000000000000000000000C6C6C600FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C600000000000000
+      0000000000004A4A4A000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C6000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000008484008484840084848400FFFFFF00FFFFFF00848484000000
       0000000000008484840000000000000000000000000000000000000000008484
       8400C6C6C6000000000000000000000000000000000000000000000000000000
-      0000848484000000000000000000000000000000000000000000C0C0C000FFFF
-      FF00C0C0C000C0C0C000C0C0C000C0C0C000FFFFFF00C0C0C000000000000000
-      0000000000004C4C4C000000000000000000000000000000000080808000FFFF
-      FF001C1C1C001C1C1C001C1C1C001C1C1C001C1C1C00FFFFFF00C0C0C0000000
+      0000848484000000000000000000000000000000000000000000C6C6C600FFFF
+      FF00C6C6C600C6C6C600C6C6C600C6C6C600FFFFFF00C6C6C600000000000000
+      0000000000004A4A4A000000000000000000000000000000000084848400FFFF
+      FF001818180018181800181818001818180018181800FFFFFF00C6C6C6000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000084840000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
       000084848400000000000000000000000000000000000000000084848400C6C6
       C600C6C6C6000000000000000000FFFFFF00FFFFFF00FFFFFF00C6C6C6000000
       0000000000008484840000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000080808000FFFF
+      000000000000000000000000000000000000000000000000000084848400FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000084
       840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
       0000000000000000000000000000000000000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000FFFFFF00C6C6C600C6C6C600C6C6C6000000
-      000000000000C6C6C6008484840000000000000000000000000080808000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000000000000000
-      000000000000000000000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C000FFFFFF00808080000000
+      000000000000C6C6C6008484840000000000000000000000000084848400C6C6
+      C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C600FFFFFF00848484000000
       00000000000000000000000000000000000000000000008484008484840000FF
       FF00FFFFFF0000FFFF000000000000000000FFFFFF00FFFFFF00848484000000
       0000000000000000000000000000000000000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000FFFFFF00C6C6C600C6C6C600C6C6C6000000
-      000000000000C6C6C6008484840000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C000000000000000
-      000000000000848484000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C00080808000000000000000
+      000000000000C6C6C6008484840000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C600000000000000
+      000000000000848484000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C60084848400000000000000
       0000000000000000000000000000000000000084840000FFFF00C6C6C600FFFF
       FF0000FFFF00FFFFFF00000000008484840000000000FFFFFF00848484000000
       0000848484008484840084848400848484000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000000000000000000000000000000000000000
-      0000C6C6C600C6C6C6008484840000000000000000000000000080808000FFFF
-      FF001C1C1C001C1C1C001C1C1C001C1C1C00FFFFFF00C0C0C000000000000000
-      0000848484008484840084848400000000000000000000000000808080008080
-      8000808080008080800080808000808080008080800000000000000000000000
+      0000C6C6C600C6C6C6008484840000000000000000000000000084848400FFFF
+      FF0018181800181818001818180018181800FFFFFF00C6C6C600000000000000
+      0000848484008484840084848400000000000000000000000000848484008484
+      8400848484008484840084848400848484008484840000000000000000000000
       0000000000000000000000000000000000000084840000FFFF00C6C6C60000FF
       FF00FFFFFF0000FFFF0000000000C6C6C60000000000FFFFFF00848484000000
       0000000000000000000000000000000000000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000FFFFFF00FFFFFF00FFFFFF0000000000C6C6
-      C600C6C6C600C6C6C6008484840000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C000000000000000
+      C600C6C6C600C6C6C6008484840000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C600000000000000
       0000000000008484840000000000000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000848400FFFFFF00C6C6C600FFFF
       FF0000FFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00848484000000
       0000000000000000000000000000000000000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000FFFFFF00C6C6C600C6C6C600000000000000
-      0000C6C6C600C6C6C6008484840000000000000000000000000080808000FFFF
-      FF001C1C1C001C1C1C001C1C1C001C1C1C00FFFFFF00C0C0C000000000000000
+      0000C6C6C600C6C6C6008484840000000000000000000000000084848400FFFF
+      FF0018181800181818001818180018181800FFFFFF00C6C6C600000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000008484000084840000FF
       FF00FFFFFF0000FFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
       0000848484000000000000000000000000000000000084848400C6C6C600C6C6
       C600C6C6C6000000000000000000FFFFFF00C6C6C600C6C6C600000000000000
-      0000C6C6C600C6C6C6008484840000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C0C0C000000000000000
+      0000C6C6C600C6C6C6008484840000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6C600000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000084
       840000FFFF00FFFFFF0000000000C6C6C600FFFFFF00FFFFFF00848484000000
       000000000000848484000000000000000000000000000000000084848400C6C6
       C600C6C6C6000000000000000000FFFFFF00FFFFFF00FFFFFF00000000000000
-      0000C6C6C600848484000000000000000000000000000000000080808000FFFF
-      FF001C1C1C001C1C1C001C1C1C001C1C1C00FFFFFF00C0C0C000000000000000
-      0000000000004C4C4C0000000000000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      0000C6C6C600848484000000000000000000000000000000000084848400FFFF
+      FF0018181800181818001818180018181800FFFFFF00C6C6C600000000000000
+      0000000000004A4A4A0000000000000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000084840000FFFF008484840084848400C6C6C600FFFFFF00848484000000
       0000000000000000000084848400000000000000000000000000000000008484
       8400C6C6C600000000000000000000000000000000000000000000000000C6C6
-      C60084848400000000000000000000000000000000000000000080808000FFFF
+      C60084848400000000000000000000000000000000000000000084848400FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
-      0000000000004C4C4C000000000000000000000000000000000000000000E2E2
-      E200E2E2E200E2E2E200E2E2E200E2E2E2000000000000000000000000000000
+      0000000000004A4A4A000000000000000000000000000000000000000000E7E7
+      E700E7E7E700E7E7E700E7E7E700E7E7E7000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000084840000FFFF0000000000C6C6C600C6C6C600000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000084848400C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C6008484
-      840000000000000000000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00C0C0C000FFFFFF0080808000000000000000
-      00004C4C4C004C4C4C004C4C4C00000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      840000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00C6C6C600FFFFFF0084848400000000000000
+      00004A4A4A004A4A4A004A4A4A00000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000848400848484000000000084848400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000008484840084848400848484008484840084848400848484000000
-      000000000000000000000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00C0C0C0008080800000000000000000000000
-      0000000000004C4C4C0000000000000000000000000000000000000000000000
-      000000000000E2E2E20000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00C6C6C6008484840000000000000000000000
+      0000000000004A4A4A0000000000000000000000000000000000000000000000
+      000000000000E7E7E70000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000808080008080
-      8000808080008080800080808000808080000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000848484008484
+      8400848484008484840084848400848484000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000