[sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr InstallManager.bpr,1.4,1.5 InstallManager.res,1.3,1.4 MainFrm.cpp,1.23,1.24 MainFrm.dfm,1.9,1.10

sword@www.crosswire.org sword@www.crosswire.org
Sun, 17 Aug 2003 02:26:30 -0700


Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr
In directory www:/tmp/cvs-serv6080/apps/windoze/CBuilder5/InstallMgr

Modified Files:
	InstallManager.bpr InstallManager.res MainFrm.cpp MainFrm.dfm 
Log Message:
build of 1.5.6 for windows


Index: InstallManager.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallManager.bpr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- InstallManager.bpr	15 Aug 2003 08:52:15 -0000	1.4
+++ InstallManager.bpr	17 Aug 2003 09:26:28 -0000	1.5
@@ -61,8 +61,8 @@
 AutoIncBuild=0
 MajorVer=1
 MinorVer=5
-Release=5
-Build=4
+Release=6
+Build=0
 Debug=0
 PreRelease=0
 Special=0
@@ -74,13 +74,13 @@
 [Version Info Keys]
 CompanyName=CrossWire Bible Society
 FileDescription=SWORD Installation Manager
-FileVersion=1.5.5.4
+FileVersion=1.5.6.0
 InternalName=InstallMgr
 LegalCopyright=Copyright 2002 by CrossWire Bible Society
 LegalTrademarks=
 OriginalFilename=
 ProductName=The SWORD Project
-ProductVersion=1.5.6rc3
+ProductVersion=1.5.6
 Comments=Seek Jesus who exchanges temporary for eternal
 
 [HistoryLists\hlIncludePath]

Index: InstallManager.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallManager.res,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsyo8PCQ and /tmp/cvsW6XoL7 differ

Index: MainFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MainFrm.cpp	15 Aug 2003 08:52:15 -0000	1.23
+++ MainFrm.cpp	17 Aug 2003 09:26:28 -0000	1.24
@@ -237,6 +237,7 @@
 	SWBuf nodeName;
 	SWBuf targetVersion;
 	SWBuf sourceVersion;
+	SWBuf softwareVersion;
 	bool cipher;
 	bool showLocked = LockedModules1->Checked;
 	
@@ -290,11 +291,16 @@
 		
 		targetVersion = "0.0";
 		sourceVersion = "1.0";
+		softwareVersion = (const char *)SWVersion::currentVersion;
 		
 		entry = sections->second.find("Version");
 		if (entry != sections->second.end())
 			sourceVersion = entry->second.c_str();
 
+		entry = sections->second.find("MinimumVersion");
+		if (entry != sections->second.end())
+			softwareVersion = entry->second.c_str();
+
 		targetSection = manager->config->Sections.find(sections->first);
 		if (targetSection != manager->config->Sections.end()) {
 			targetVersion = "1.0";
@@ -330,6 +336,10 @@
 				node->ImageIndex += 2;
 				node->SelectedIndex += 2;
 			}
+			if (SWVersion::currentVersion < SWVersion(softwareVersion.c_str())) {
+				node->ImageIndex = 5;
+				node->SelectedIndex = 5;
+			}
 			node->StateIndex = 0;
 		}
 	}
@@ -352,6 +362,22 @@
 	TTreeNode *node = tree->Selected;
 	if (node) {
 		if (node->Parent) {
+			if (node->ImageIndex == 5) {
+				SWMgr *mgr = (tree == localTree) ? manager : ((InstallSourceTab *) PageControl1->ActivePage->Controls[0])->is->getMgr();
+				SWBuf minVer = (*mgr->config)[(const char *)node->Data]["MinimumVersion"];
+
+				InfoForm->Caption = "Need To Upgrade";
+				InfoForm->info = "\\qc {\\b \\fs20 Newer Software Version Required.}\\par\\par\\pard ";
+				InfoForm->info += "This module requires a newer version of the SWORD software engine. \\par\\par ";
+				InfoForm->info += "Your Current Version: ";
+				InfoForm->info += (const char *)SWVersion::currentVersion;
+				InfoForm->info += "\\par Required Version: ";
+				InfoForm->info += minVer.c_str();
+				InfoForm->info += "\\par\\par\\b\\qc Please visit http://www.crosswire.org to upgrade.";
+				InfoForm->ShowModal();
+				return;
+			}
+
 			if (node->StateIndex == 1)
 				node->StateIndex = 0; //node->StateIndex;
 			else	node->StateIndex = 1;
@@ -373,16 +399,18 @@
 	
 	for (node = tree->Items->GetFirstNode(); node; node = node->getNextSibling()) {
 		for (node2 = node->getFirstChild(); node2; node2 = node2->getNextSibling()) {
-			if (node2->StateIndex == 1) {
-				if (!sel) {
-					node2->StateIndex = 0; //node2->StateIndex;
-					retCount++;
+			if (node2->ImageIndex != 5) {
+				if (node2->StateIndex == 1) {
+					if (!sel) {
+						node2->StateIndex = 0; //node2->StateIndex;
+						retCount++;
+					}
 				}
-			}
-			else	{
-				if (sel) {
-					node2->StateIndex = 1;
-					retCount++;
+				else	{
+					if (sel) {
+						node2->StateIndex = 1;
+						retCount++;
+					}
 				}
 			}
 		}

Index: MainFrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.dfm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MainFrm.dfm	31 Oct 2001 02:40:31 -0000	1.9
+++ MainFrm.dfm	17 Aug 2003 09:26:28 -0000	1.10
@@ -1,6 +1,6 @@
 object MainForm: TMainForm
-  Left = 361
-  Top = 228
+  Left = 275
+  Top = 237
   Width = 597
   Height = 475
   Caption = 'Install Manager'
@@ -1672,171 +1672,12 @@
     Top = 78
   end
   object ImageList1: TImageList
+    AllocBy = 5
     Left = 524
     Top = 110
     Bitmap = {
-      494C010105000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
-      0000000000003600000028000000400000003000000001002000000000000030
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FFFF000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      494C010106000900040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      0000000000003600000028000000400000003000000001001000000000000018
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1846,7 +1687,6 @@
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1854,47 +1694,34 @@
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000FFFFFF0000FFFF00FFFFFF0000000000FFFF
-      FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFF0000000000000000
-      000000000000000000008080800000000000FFFFFF0000FFFF000000000000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFF0000808080008080
-      80008080800080808000808080000000000000000000FFFFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFF0000000000000000
-      0000000000000000000080808000000000000000000000FFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFF0000FFFF0000FFFF
-      0000FFFF0000FFFF0000FFFF00000000000000000000FFFFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1902,28 +1729,24 @@
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000FFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFF00000000
-      00000000000080808000000000000000000000000000FFFFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFF0000FFFF
-      0000FFFF0000FFFF000000000000000000000000000000FFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000E07F00000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1931,285 +1754,206 @@
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000000000000000FF03FF03
+      FF03FF03FF03FF03000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000E07F
+      FF7FE07FFF7FE07F000000000000000000000000FF7FF75EF75EFF7FFF7FFF7F
+      FF7FF75EFF7FFF7FFF7FF75EF75EFF7F00000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000000000000000E07FFF7F
+      E07FFF7FE07FFF7FE07F00000000000000000000FF7FFF7FFF7F007CFF7FFF7F
+      FF7FF75EFF7FFF7FFF7FFF7FFF7FEF3D00000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      FF7FE07FFF7F0000FF7F00000000000000000000FF7FFF7F007C007C007CFF7F
+      FF7FF75E00000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000FF0300000000000000001042
+      0000FF7FE07F0000E07F00000000000000000000FF7FFF7FFF7F007CFF7FFF7F
+      FF7F0000F75EF75EF75EF75E0000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000FF000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000FF0310421042104210421042
+      00000000FF7F0000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+      FF7F0000F75EF75EF75E00000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000FF0300000000000000001042
+      00000000E07F000000000000000000000000EF3D000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000FFFF000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000FF03FF03FF03FF03FF03FF03
+      00000000FF7F0000000000000000000000000000000000000000000000000000
+      007C0000007C007C007C0000007C000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000E07F0000000000000000000000000000000000000000000000000000
+      000000000000007C000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000FF00000000000000FF0000000000000000000000000000000000
+      00000000000000000000000000000000000000000000FF030000000010420000
+      00000000FF7F0000000000000000000000000000000000000000000000000000
+      0000007C000000000000007C0000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000BFBFBF000000000000000000000000000000
+      00000000000000000000000000000000000000000000FF03FF03FF03FF030000
+      00000000E07F0000000000000000000000000000000000000000000000000000
+      000000000000007C000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000C0C0C0000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000FF00000000000000FFFFFF0000000000FF00000000000000000000000000
-      000000000000000000000000000000000000000000000000000000FFFF000000
-      00000000000000FFFF0000000000000000000000000000FFFF00000000000000
-      000000FFFF000000000000000000000000000000000000000000000000000000
-      000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000
-      000000000000000000000000000000000000000000000000000000FFFF000000
-      00000000000000FFFF0000000000000000000000000000FFFF00000000000000
-      000000FFFF00000000000000000000000000000000000000000000000000FF00
-      000000000000FFFFFF00FFFFFF00FFFFFF0000000000FF000000000000000000
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF000000000000FFFF000000000000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF000000000000FFFF000000000000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000FF000000FF00
-      0000FF00000000000000FFFFFF00FFFFFF00FFFFFF0000000000FF0000000000
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF0000000000FFFFFF000000000000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF000000
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF0000000000FFFFFF000000000000FFFF0000FFFF0000FF
-      FF000000000000000000000000000000000000000000FF000000FF000000FF00
-      0000FF000000FF00000000000000FFFFFF00FFFFFF00FFFFFF0000000000FF00
-      000000000000000000000000000000000000000000000000000000FFFF0000FF
-      FF0000FFFF0000000000FFFFFF007F7F7F00FFFFFF000000000000FFFF0000FF
-      FF0000FFFF000000000000000000000000000000000000000000000000000000
-      00000000000000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FF
-      FF0000000000000000000000000000000000000000000000000000FFFF0000FF
-      FF0000FFFF0000000000FFFFFF0080808000FFFFFF000000000000FFFF0000FF
-      FF0000FFFF0000000000000000000000000080000000FF000000FF000000FF00
-      0000FF000000FF000000FF00000000000000FFFFFF00FFFFFF00FFFFFF000000
-      0000FF000000000000000000000000000000000000000000000000FFFF0000FF
-      FF0000000000FFFFFF0000FFFF007F7F7F0000FFFF00FFFFFF000000000000FF
-      FF0000FFFF000000000000000000000000000000000000000000000000000000
-      000000000000FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000000000FFFF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000008080800000FFFF00FFFFFF000000000000FF
-      FF0000FFFF00000000000000000000000000FF00000080000000FF000000FF00
-      0000FF000000FF000000FF000000FF00000000000000FFFFFF00FFFFFF00FFFF
-      FF0000000000FF000000000000000000000000FFFF0000FFFF0000FFFF0000FF
-      FF000000000000FFFF00FFFFFF007F7F7F00FFFFFF0000FFFF000000000000FF
-      FF0000FFFF0000FFFF0000FFFF00000000000000000000000000000000000000
-      00000000000000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF000000000000FF
-      FF000000000000000000000000000000000000000000FFFF0000000000000000
-      000000000000000000008080800000000000FFFFFF0000FFFF000000000000FF
-      FF0000FFFF0000FFFF0000FFFF000000000000000000FF00000080000000FF00
-      0000FF00000000000000FF000000FF000000FF00000000000000FFFFFF00FFFF
-      FF00FFFFFF0000000000FF00000000000000000000000000000000FFFF0000FF
-      FF0000000000FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF000000000000FF
-      FF0000FFFF000000000000000000000000000000000000000000000000000000
-      000000000000FFFFFF0000000000FFFFFF0000000000FFFFFF00000000000000
-      00000000000000000000000000000000000000000000FFFF0000808080008080
-      80008080800080808000808080000000000000FFFF00FFFFFF000000000000FF
-      FF0000FFFF000000000000000000000000000000000000000000FF0000008000
-      0000FF000000FF000000FF00000000000000FF000000FF00000000000000FFFF
-      FF0000000000FF0000000000000000000000000000000000000000FFFF0000FF
-      FF0000FFFF0000000000FFFFFF0000FFFF00FFFFFF000000000000FFFF0000FF
-      FF0000FFFF000000000000000000000000000000000000000000000000000000
-      00000000000000FFFF000000000000FFFF000000000000FFFF00000000000000
-      00000000000000000000000000000000000000000000FFFF0000000000000000
-      000000000000000000008080800000000000FFFFFF000000000000FFFF0000FF
-      FF0000FFFF00000000000000000000000000000000000000000000000000FF00
-      000080000000FF0000000000000000000000FF000000FF000000FF0000000000
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF0000000000000000000000000000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000FFFFFF0000000000FFFFFF00000000000000
-      00000000000000000000000000000000000000000000FFFF0000FFFF0000FFFF
-      0000FFFF0000FFFF0000FFFF0000000000000000000000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000FF00000080000000FF000000FF000000FF000000FF000000FF000000FF00
-      00000000000000000000000000000000000000000000000000000000000000FF
-      FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000FFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000FFFF0000FFFF0000FFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      000000000000FF00000080000000FF000000FF000000FF000000FF0000000000
-      000000000000000000000000000000000000000000000000000000FFFF000000
-      00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000000000
-      000000FFFF000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00000000000000
-      0000000000000000000000000000000000000000000000000000FFFF00000000
-      000000000000808080000000000000FFFF0000FFFF0000FFFF00000000000000
-      000000FFFF000000000000000000000000000000000000000000000000000000
-      00000000000000000000FF00000080000000FF00000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000FFFF000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000FFFF00000000000000
-      0000000000000000000000000000000000000000000000000000FFFF0000FFFF
-      0000FFFF0000FFFF00000000000000FFFF000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000001F00
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000E07F00000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000FFFF000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000001F000000
+      1F00000000000000000000000000000000000000000000000000000000000000
+      F75E000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      18630000000000000000000000000000000000000000000000001F000000FF7F
+      00001F00000000000000000000000000000000000000E07F00000000E07F0000
+      00000000E07F00000000E07F00000000000000000000000000000000FF03FF03
+      FF03FF03FF03FF030000000000000000000000000000E07F00000000E07F0000
+      00000000E07F00000000E07F0000000000000000000000001F000000FF7FFF7F
+      FF7F00001F00000000000000000000000000000000000000E07FE07FE07F0000
+      E07F0000E07FE07FE07F00000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000E07FE07FE07F0000
+      E07F0000E07FE07FE07F0000000000000000000000001F001F001F000000FF7F
+      FF7FFF7F00001F0000000000000000000000000000000000E07FE07FE07F0000
+      FF7F0000E07FE07FE07F0000000000000000000000000000000000000000E07F
+      FF7FE07FFF7FE07F00000000000000000000000000000000E07FE07FE07F0000
+      FF7F0000E07FE07FE07F000000000000000000001F001F001F001F001F000000
+      FF7FFF7FFF7F00001F00000000000000000000000000E07FE07FE07F0000FF7F
+      EF3DFF7F0000E07FE07FE07F00000000000000000000000000000000E07FFF7F
+      E07FFF7FE07FFF7FE07F000000000000000000000000E07FE07FE07F0000FF7F
+      1042FF7F0000E07FE07FE07F00000000000010001F001F001F001F001F001F00
+      0000FF7FFF7FFF7F00001F0000000000000000000000E07FE07F0000FF7FE07F
+      EF3DE07FFF7F0000E07FE07F00000000000000000000000000000000FF7FE07F
+      FF7FE07FFF7F0000FF7F00000000000000000000000000000000000000000000
+      1042E07FFF7F0000E07FE07F0000000000001F0010001F001F001F001F001F00
+      1F000000FF7FFF7FFF7F00001F0000000000E07FE07FE07FE07F0000E07FFF7F
+      EF3DFF7FE07F0000E07FE07FE07FE07F000000000000000000000000E07FFF7F
+      E07FFF7FE07F0000E07F00000000000000000000FF0300000000000000001042
+      0000FF7FE07F0000E07FE07FE07FE07F000000001F0010001F001F0000001F00
+      1F001F000000FF7FFF7FFF7F00001F00000000000000E07FE07F0000FF7FE07F
+      FF7FE07FFF7F0000E07FE07F00000000000000000000000000000000FF7F0000
+      FF7F0000FF7F0000000000000000000000000000FF0310421042104210421042
+      0000E07FFF7F0000E07FE07F000000000000000000001F0010001F001F001F00
+      00001F001F000000FF7F00001F000000000000000000E07FE07FE07F0000FF7F
+      E07FFF7F0000E07FE07FE07F00000000000000000000000000000000E07F0000
+      E07F0000E07F0000000000000000000000000000FF0300000000000000001042
+      0000FF7F0000E07FE07FE07F0000000000000000000000001F0010001F000000
+      00001F001F001F0000000000000000000000000000000000E07FE07FE07F0000
+      00000000E07FE07FE07F00000000000000000000000000000000000000000000
+      FF7F0000FF7F0000000000000000000000000000FF03FF03FF03FF03FF03FF03
+      00000000E07FE07FE07F000000000000000000000000000000001F0010001F00
+      1F001F001F001F001F000000000000000000000000000000E07FE07FE07FE07F
+      E07FE07FE07FE07FE07F00000000000000000000000000000000000000000000
+      00000000E07F0000000000000000000000000000000000000000000000000000
+      0000E07FE07FE07FE07F0000000000000000000000000000000000001F001000
+      1F001F001F001F000000000000000000000000000000E07F00000000E07FE07F
+      E07FE07FE07F00000000E07F0000000000000000000000000000000000000000
+      00000000FF7F00000000000000000000000000000000FF030000000010420000
+      E07FE07FE07F00000000E07F0000000000000000000000000000000000001F00
+      10001F0000000000000000000000000000000000000000000000000000000000
+      E07F000000000000000000000000000000000000000000000000000000000000
+      00000000E07F00000000000000000000000000000000FF03FF03FF03FF030000
+      E07F000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      E07F000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000FFFF000000000000000000000000000000
-      000000000000000000000000000000000000424D3E000000000000003E000000
+      E07F00000000000000000000000000000000424D3E000000000000003E000000
       2800000040000000300000000100010000000000800100000000000000000000
       000000000000000000000000FFFFFF0000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000E00F000000000000E00F000000000000
-      E00F000000000000F00F000000000000F00F000000000000F80F000000000000
-      F00700000000000080070000000000000007000000000000000F000000000000
-      001F000000000000001F000000000000001F000000000000811F000000000000
-      811F000000000000C3BF000000000000FFFFFEFFE00FFEFFFDFFFC7FE00FFC7F
+      00000000000000000000000000000000E00FFFFF00000000E00FFFFF00000000
+      E00FCFF300000000F00F87E100000000F00F000000000000F80F000000000000
+      F00700000000000080070001000000000007000300000000000F000700000000
+      001F000F00000000001FFE8B00000000001FFFDF00000000811FFF7700000000
+      811FFFDF00000000C3BFFFFF00000000FFFFFEFFE00FFEFFFDFFFC7FE00FFC7F
       F8FFFC7FE00FFC7FF07FD837F00FD837E03FE00FF00FE00FC01FE00FF80FE00F
       800FC007F007C0070007C007F007800700030001F00700018001C007F00F0007
       C003C007F01F0007E00FE00FF81F000FF00FE00FFE1F000FF81FD837FF1F8037
-      FC7FFEFFFF1F80FFFFFFFEFFFFBFC2FF00000000000000000000000000000000
-      000000000000}
+      FC7FFEFFFF1F80FFFFFFFEFFFFBFC2FF}
   end
   object ImageList2: TImageList
     Left = 524
     Top = 142
     Bitmap = {
       494C010102000400040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
-      0000000000003600000028000000400000001000000001002000000000000010
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000007F7F7F007F7F7F00FFFFFF00FFFF
-      FF00FFFFFF000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000080000000800000007F7F7F000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000007F7F7F007F7F7F007F7F
-      7F0000000000FFFFFF00FFFFFF00000000000000000000000000000000000000
-      0000000000000000000000000000000000007F7F7F0080000000800000008000
-      00007F7F7F000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000007F7F7F0000000000FFFF
-      FF007F7F7F007F7F7F0000000000FFFFFF00FFFFFF0000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      000080000000800000007F7F7F00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000007F7F7F000000
-      0000FFFFFF00000000007F7F7F007F7F7F0000000000FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000008000000080000000800000007F7F7F0000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000007F7F
-      7F00FFFFFF000000000000000000000000007F7F7F007F7F7F0000000000FFFF
-      FF00FFFFFF0000000000000000000000000000000000000000007F7F7F008000
-      00008000000080000000800000008000000080000000800000007F7F7F000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000007F7F
-      7F0000000000FFFFFF00000000000000000000000000000000007F7F7F007F7F
-      7F0000000000FFFFFF00FFFFFF00000000000000000000000000000000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      00007F7F7F000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF007F7F7F00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF007F7F7F007F7F7F00FFFFFF00FFFFFF000000000000000000000000000000
-      0000800000008000000080000000800000008000000080000000800000008000
-      000080000000800000007F7F7F00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000007F7F7F007F7F7F007F7F7F007F7F
-      7F007F7F7F007F7F7F007F7F7F007F7F7F007F7F7F007F7F7F007F7F7F007F7F
-      7F0000000000000000007F7F7F007F7F7F000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00007F7F7F00000000000000000000000000000000000000000000000000FFFF
-      FF007F7F7F007F7F7F0000000000000000000000000000000000000000000000
-      0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00
-      0000FF000000FF00000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000007F7F
-      7F00FFFFFF0000000000000000000000000000000000FFFFFF007F7F7F007F7F
-      7F0000000000000000000000000000000000000000000000000000000000FF00
-      0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000003600000028000000400000001000000001001000000000000008
+      0000000000000000000000000000000000000000FF7FFF7F0000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000007F7F
-      7F00000000000000000000000000FFFFFF007F7F7F007F7F7F00000000000000
-      000000000000000000000000000000000000000000000000000000000000FF00
-      0000FF000000FF000000FF000000FF000000FF000000FF000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000EF3DEF3DFF7FFF7FFF7F00000000
+      00000000000000000000000000000000000010001000EF3D0000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000007F7F7F000000
-      000000000000FFFFFF007F7F7F007F7F7F000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FF000000FF00
-      0000FF000000FF000000FF000000FF0000000000000000000000000000000000
+      0000000000000000000000000000000000000000EF3DEF3DEF3D0000FF7FFF7F
+      000000000000000000000000000000000000EF3D100010001000EF3D00000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000EF3D0000FF7FEF3DEF3D0000
+      FF7FFF7F0000000000000000000000000000000010001000100010001000EF3D
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000007F7F7F00FFFFFF00FFFF
-      FF007F7F7F007F7F7F0000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FF000000FF000000FF00
-      0000FF000000FF00000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000EF3D0000FF7F0000EF3D
+      EF3D0000FF7FFF7F000000000000000000000000000010001000100010001000
+      1000EF3D00000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000EF3DFF7F00000000
+      0000EF3DEF3D0000FF7FFF7F00000000000000000000EF3D1000100010001000
+      100010001000EF3D000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000EF3D0000FF7F0000
+      000000000000EF3DEF3D0000FF7FFF7F00000000000000001000100010001000
+      10001000100010001000EF3D0000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000FF7FFF7FFF7FEF3DFF7FFF7F
+      FF7FFF7FFF7FFF7FFF7FEF3DEF3DFF7FFF7F0000000000000000100010001000
+      1000100010001000100010001000EF3D00000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000007F7F7F007F7F7F007F7F
-      7F00000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FF000000FF000000FF00
+      000000000000000000000000000000000000EF3DEF3DEF3DEF3DEF3DEF3DEF3D
+      EF3DEF3DEF3DEF3DEF3D00000000EF3DEF3D007C007C007C007C007C007C007C
+      007C007C007C007C007C007C007C007C007C0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000EF3D00000000
+      0000000000000000FF7FEF3DEF3D0000000000000000000000001F001F001F00
+      1F001F001F001F001F001F001F00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000EF3DFF7F00000000
+      00000000FF7FEF3DEF3D00000000000000000000000000001F001F001F001F00
+      1F001F001F001F001F0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000EF3D000000000000
+      FF7FEF3DEF3D0000000000000000000000000000000000001F001F001F001F00
+      1F001F001F000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000EF3D00000000FF7FEF3D
+      EF3D00000000000000000000000000000000000000001F001F001F001F001F00
+      1F00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000007F7F7F007F7F7F00000000000000
+      0000000000000000000000000000000000000000EF3DFF7FFF7FEF3DEF3D0000
+      00000000000000000000000000000000000000001F001F001F001F001F000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000FF000000FF000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000EF3DEF3DEF3D000000000000
+      00000000000000000000000000000000000000001F001F001F00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000EF3DEF3D00000000000000000000
+      0000000000000000000000000000000000001F001F0000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000424D3E000000000000003E000000