[mapguide-commits] r4346 - in trunk/Tools/Maestro/Maestro: . MaestroEditorInterface ResourceEditors/FeatureSourceEditors/Gdal

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Nov 16 12:19:55 EST 2009


Author: ksgeograf
Date: 2009-11-16 12:19:54 -0500 (Mon, 16 Nov 2009)
New Revision: 4346

Modified:
   trunk/Tools/Maestro/Maestro/EditorInterface.cs
   trunk/Tools/Maestro/Maestro/FormMain.cs
   trunk/Tools/Maestro/Maestro/LengthyOperation.cs
   trunk/Tools/Maestro/Maestro/LengthyOperation.resx
   trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/ConfigUpdater.cs
Log:
Maestro:
Fixed issue #570, improve raster provider UI.

Modified: trunk/Tools/Maestro/Maestro/EditorInterface.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/EditorInterface.cs	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/EditorInterface.cs	2009-11-16 17:19:54 UTC (rev 4346)
@@ -325,12 +325,17 @@
 			return Save(m_resourceID);
 		}
 
-		public DialogResult LengthyOperation(object caller, System.Reflection.MethodInfo mi)
+        public DialogResult LengthyOperation(object caller, System.Reflection.MethodInfo mi)
+        {
+            return LengthyOperation(caller, mi, true);
+        }
+
+		public DialogResult LengthyOperation(object caller, System.Reflection.MethodInfo mi, bool waitForAccept)
 		{
 			OSGeo.MapGuide.Maestro.LengthyOperation lo = new OSGeo.MapGuide.Maestro.LengthyOperation();
 			lo.CallbackObject = caller;
 			lo.CallbackEnabledMethod = mi;
-			lo.InitializeDialog(m_editor.CurrentConnection, "", "", OSGeo.MapGuide.Maestro.LengthyOperation.OperationType.Other);
+			lo.InitializeDialog(m_editor.CurrentConnection, "", "", OSGeo.MapGuide.Maestro.LengthyOperation.OperationType.Other, waitForAccept);
 			return lo.ShowDialog(m_editor);
 		}
 

Modified: trunk/Tools/Maestro/Maestro/FormMain.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FormMain.cs	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/FormMain.cs	2009-11-16 17:19:54 UTC (rev 4346)
@@ -1738,11 +1738,11 @@
 				LengthyOperation lwdlg = new LengthyOperation();
 
 				if (sourceisFolder && move) 
-					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.MoveFolder);
+					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.MoveFolder, true);
 				else if (sourceisFolder)
-					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.CopyFolder);
+					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.CopyFolder, true);
 				else if (move)
-					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.MoveResource);
+					lwdlg.InitializeDialog(m_connection, sourcepath, targetpath, LengthyOperation.OperationType.MoveResource, true);
 				else
 				{
 					m_connection.CopyResource(sourcepath, targetpath, true);

Modified: trunk/Tools/Maestro/Maestro/LengthyOperation.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LengthyOperation.cs	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/LengthyOperation.cs	2009-11-16 17:19:54 UTC (rev 4346)
@@ -26,7 +26,9 @@
 namespace OSGeo.MapGuide.Maestro
 {
 	/// <summary>
-	/// Summary description for LengthyOperation.
+	/// Form that displays progress for a lengthy operation.
+    /// This implementation is really messy, and should be rewritten,
+    /// using a BackgroundWorker.
 	/// </summary>
 	public class LengthyOperation : System.Windows.Forms.Form
 	{
@@ -79,6 +81,7 @@
 		private Globalizator.Globalizator m_globalizor = null;
 		private object m_callbackobject = null;
 		private bool m_noCancelConfirmation = false;
+        private bool m_waitForAccept = true;
 
 		public LengthyOperation()
 		{
@@ -298,13 +301,14 @@
 			set { m_callbackobject = value; }
 		}
 
-		public void InitializeDialog(OSGeo.MapGuide.MaestroAPI.ServerConnectionI connection, string argument1, string argument2, OperationType operation)
+		public void InitializeDialog(OSGeo.MapGuide.MaestroAPI.ServerConnectionI connection, string argument1, string argument2, OperationType operation, bool waitForAccept)
 		{
 			m_connection = connection;
 			OSGeo.MapGuide.MaestroAPI.LengthyOperationCallBack callback = new OSGeo.MapGuide.MaestroAPI.LengthyOperationCallBack(CallbackMethod);
 			OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack pgcallback = new OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack(WaitOperationCallBack);
 			m_event = new System.Threading.ManualResetEvent(false);
 			m_operation = operation;
+            m_waitForAccept = waitForAccept;
 
 			switch(operation)
 			{
@@ -464,11 +468,15 @@
 				ProgressPanel.Visible = false;
 				OKBtn.Enabled = true;
 
-				if (workList.Items.Count == 0)
-					m_event.Set();
-				else
-					//Flash it
-					this.Focus();
+                if (workList.Items.Count == 0)
+                    m_event.Set();
+                else
+                {
+                    if (m_waitForAccept)
+                        this.Focus(); //Flash it
+                    else
+                        OKBtn_Click(OKBtn, null);
+                }
 			}
 			else
 			{

Modified: trunk/Tools/Maestro/Maestro/LengthyOperation.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/LengthyOperation.resx	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/LengthyOperation.resx	2009-11-16 17:19:54 UTC (rev 4346)
@@ -125,117 +125,117 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAA
-        MwAAAk1TRnQBSQFMAgEBCwEAAQ4BAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABMAMAAQEBAAEgBgABMP8AJwABbQGtAYEB/wEkAaMBVQH/AQwBqgFJAf8BDAGqAUkB/wEnAaMBVgH/
-        AW0BrQGBAf8oAAF1AXcBrgH/ATMBOwGmAf8BHwEqAa0B/wEfASoBrQH/ATYBPQGmAf8BegF8AbAB/6QA
-        ARABrwFOAf8BCwHSAVkB/wELAdwBXQH/AQsB4QFfAf8BCwHhAV8B/wELAdwBXQH/AQsB0gFZAf8BEAGv
-        AU4B/yAAASMBLwGzAf8BIgEzAdYB/wEjATUB4AH/ASMBNQHgAf8BJAE2AegB/wEjATUB4AH/ASIBMwHW
-        Af8BJQEvAbAB/5wAAQsBwAFSAf8BCwHcAV0B/wELAeoBYwH/ARoB5QFpAf8BDAH4AWgB/wEMAfgBaAH/
-        AQwB+AFoAf8BCwHhAV8B/wELAdwBXQH/AQsBvAFQAf8YAAEgAS8BxAH/ASMBNQHgAf8BJQE4Ae4B/wEn
-        ATsB+AH/ASkBPQH8Af8BKQE9AfwB/wEnATsB+AH/ASUBOAHuAf8BIwE1AeAB/wEgAS8BxAH/lAABDgGx
-        AU0B/wELAdwBXQH/AQwB+AFoAf8BLgHsAXgB/wHfAfoB6QH/AToB7wGBAf8BFQH+AXEB/wEVAf4BcQH/
-        AQ0B+wFqAf8BCwHvAWQB/wELAdsBXAH/ARABrwFOAf8QAAEjAS8BswH/ASMBNQHgAf8BJgE5AfEB/wGK
-        AZMB7gH/AUwBXQHxAf8BNgFKAf0B/wE2AUoB/QH/AXMBgAHvAf8BZgFzAe4B/wEmATkB8QH/ASMBNQHg
-        Af8BJQEvAbAB/4wAAWMBqwF9Af8BCwHSAVkB/wELAeoBYwH/ATkB6wF/Af8B5AH6Ae0B/wP+Af8B0wH4
-        AeEB/wEjAfQBdwH/ARkB/wF1Af8BFQH+AXEB/wENAfsBagH/AQsB6gFjAf8BCwHSAVkB/wFyAbABhAH/
-        CAABbAFvAawB/wEiATMB2AH/ASUBOAHuAf8BkQGaAfEB/wP+Af8B5gHoAfoB/wFVAWUB8AH/AXsBggHv
-        Af8D/gH/AvYB/QH/AV0BawHuAf8BJQE4Ae4B/wEiATMB1gH/AXoBfAGwAf+IAAEaAaQBTgH/AQ8B1wFe
-        Af8BfQHpAaMB/wH1Af0B+AH/A/4B/wGdAe8BvQH/A/4B/wGwAfMBywH/ASUB+AF7Af8BIgH/AXoB/wEZ
-        Af8BdQH/AQsB7wFkAf8BCwHcAV0B/wEnAaMBVgH/CAABKwE0AacB/wEjATUB4AH/AScBOwH4Af8BYgFw
-        Ae8B/wL2Af0B/wP+Af8B6gHsAfsB/wP+Af8D/gH/AdgB2wH4Af8BQwFVAfQB/wEnATsB+AH/ASMBNQHg
-        Af8BNgE9AaYB/4gAAQ4BsQFNAf8BCwHcAV0B/wFjAesBlAH/AeMB+gHsAf8BzAH3Ad0B/wE2AfIBgQH/
-        AdMB+AHhAf8D/gH/AaQB8wHDAf8BNQH4AYEB/wE1AfgBgQH/ARkB/wF1Af8BCwHhAV8B/wEOAaoBSgH/
-        CAABIwEvAbMB/wEkATYB6AH/ATYBSgH9Af8BTQFfAf4B/wF5AYEB8QH/AvYB/QH/A/4B/wP+Af8B3QHf
-        AfgB/wFiAXAB7wH/AU0BXwH+Af8BNgFKAf0B/wEkATYB5gH/AR8BKgGtAf+IAAEOAbEBTQH/ARsB4wFq
-        Af8BPgH5AYIB/wFLAfUBigH/AWIB9AGYAf8BSwH/AY8B/wFyAfIBoQH/A/4B/wP+Af8BugH2AdEB/wFL
-        AfUBigH/AT4B+QGCAf8BGgHlAWkB/wEQAa8BTgH/CAABJQEyAbcB/wEzAUQB6QH/AVUBZQH8Af8BYAFw
-        Af0B/wGRAZoB8QH/A/4B/wP+Af8D/gH/AeoB7AH7Af8BeAGBAfQB/wFgAXAB/QH/AVUBZQH8Af8BMgFD
-        AecB/wElATABrwH/iAABJgGnAVYB/wE+AeQBfwH/AVgB+AGSAf8BXAH+AZgB/wFiAf4BnAH/AWIB/gGc
-        Af8BYgH+AZwB/wGwAfMBywH/A/4B/wP+Af8BsAHzAcsB/wFYAfgBkgH/AT4B5AF/Af8BMQGnAV4B/wgA
-        ATUBPAGqAf8BUQFgAegB/wFrAXkB+gH/AZoBowH0Af8D/gH/A/4B/wHmAegB+gH/AvYB/QH/A/4B/wHq
-        AewB+wH/AYEBiAH1Af8BawF5AfoB/wFRAWAB5gH/AUABRgGpAf+IAAFoAawBgQH/AWEB4gGPAf8BcgHy
-        AaEB/wF0Af0BpQH/AXgB/wGpAf8BeAH/AakB/wF7Af8BrAH/AXsB/wGsAf8B2gH5AeUB/wP+Af8BqAH1
-        AcUB/wFyAfIBoQH/AWQB4gGRAf8BdQGwAYUB/wgAAXABcwGtAf8BcAF7AeUB/wGBAYgB9QH/Ab0BwwH2
-        Af8D/gH/AeoB7AH7Af8BkgGcAfgB/wGkAawB9QH/A/4B/wP+Af8BmgGjAfQB/wGBAYgB9QH/AXMBfgHl
-        Af8BfAF+AbIB/4wAAW4ByQGMAf8BiAHuAa8B/wGIAfgBswH/AYgB+AGzAf8BjAH+AbgB/wGMAf4BuAH/
-        AYwB/gG4Af8BkAH5AbgB/wHaAfkB5QH/AboB9gHRAf8BiAHuAa8B/wFtAcQBiQH/EAABeQF/AcsB/wGR
+        MwAAAk1TRnQBSQFMAgEBCwEAAQwBAAEMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABMAMAAQEBAAEgBgABMP8AJwABbAGtAYEB/wEjAaMBVAH/AQsBqgFIAf8BCwGqAUgB/wEmAaMBVQH/
+        AWwBrQGBAf8oAAF0AXYBrgH/ATIBOgGmAf8BHgEpAa0B/wEeASkBrQH/ATUBPAGmAf8BeQF7AbAB/6QA
+        AQ8BrwFNAf8BCgHSAVgB/wEKAdwBXAH/AQoB4QFeAf8BCgHhAV4B/wEKAdwBXAH/AQoB0gFYAf8BDwGv
+        AU0B/yAAASIBLgGzAf8BIQEyAdYB/wEiATQB4AH/ASIBNAHgAf8BIwE1AegB/wEiATQB4AH/ASEBMgHW
+        Af8BJAEuAbAB/5wAAQoBwAFRAf8BCgHcAVwB/wEKAeoBYgH/ARkB5QFoAf8BCwH4AWcB/wELAfgBZwH/
+        AQsB+AFnAf8BCgHhAV4B/wEKAdwBXAH/AQoBvAFPAf8YAAEfAS4BxAH/ASIBNAHgAf8BJAE3Ae4B/wEm
+        AToB+AH/ASgBPAH8Af8BKAE8AfwB/wEmAToB+AH/ASQBNwHuAf8BIgE0AeAB/wEfAS4BxAH/lAABDQGx
+        AUwB/wEKAdwBXAH/AQsB+AFnAf8BLQHsAXcB/wHfAfoB6QH/ATkB7wGBAf8BFAH+AXAB/wEUAf4BcAH/
+        AQwB+wFpAf8BCgHvAWMB/wEKAdsBWwH/AQ8BrwFNAf8QAAEiAS4BswH/ASIBNAHgAf8BJQE4AfEB/wGK
+        AZMB7gH/AUsBXAHxAf8BNQFJAf0B/wE1AUkB/QH/AXIBgAHvAf8BZQFyAe4B/wElATgB8QH/ASIBNAHg
+        Af8BJAEuAbAB/4wAAWIBqwF8Af8BCgHSAVgB/wEKAeoBYgH/ATgB6wF+Af8B5AH6Ae0B/wP+Af8B0wH4
+        AeEB/wEiAfQBdgH/ARgB/wF0Af8BFAH+AXAB/wEMAfsBaQH/AQoB6gFiAf8BCgHSAVgB/wFxAbABhAH/
+        CAABawFuAawB/wEhATIB2AH/ASQBNwHuAf8BkQGaAfEB/wP+Af8B5gHoAfoB/wFUAWQB8AH/AXoBggHv
+        Af8D/gH/AvYB/QH/AVwBagHuAf8BJAE3Ae4B/wEhATIB1gH/AXkBewGwAf+IAAEZAaQBTQH/AQ4B1wFd
+        Af8BfAHpAaMB/wH1Af0B+AH/A/4B/wGdAe8BvQH/A/4B/wGwAfMBywH/ASQB+AF6Af8BIQH/AXkB/wEY
+        Af8BdAH/AQoB7wFjAf8BCgHcAVwB/wEmAaMBVQH/CAABKgEzAacB/wEiATQB4AH/ASYBOgH4Af8BYQFv
+        Ae8B/wL2Af0B/wP+Af8B6gHsAfsB/wP+Af8D/gH/AdgB2wH4Af8BQgFUAfQB/wEmAToB+AH/ASIBNAHg
+        Af8BNQE8AaYB/4gAAQ0BsQFMAf8BCgHcAVwB/wFiAesBlAH/AeMB+gHsAf8BzAH3Ad0B/wE1AfIBgQH/
+        AdMB+AHhAf8D/gH/AaQB8wHDAf8BNAH4AYEB/wE0AfgBgQH/ARgB/wF0Af8BCgHhAV4B/wENAaoBSQH/
+        CAABIgEuAbMB/wEjATUB6AH/ATUBSQH9Af8BTAFeAf4B/wF4AYEB8QH/AvYB/QH/A/4B/wP+Af8B3QHf
+        AfgB/wFhAW8B7wH/AUwBXgH+Af8BNQFJAf0B/wEjATUB5gH/AR4BKQGtAf+IAAENAbEBTAH/ARoB4wFp
+        Af8BPQH5AYIB/wFKAfUBigH/AWEB9AGYAf8BSgH/AY8B/wFxAfIBoQH/A/4B/wP+Af8BugH2AdEB/wFK
+        AfUBigH/AT0B+QGCAf8BGQHlAWgB/wEPAa8BTQH/CAABJAExAbcB/wEyAUMB6QH/AVQBZAH8Af8BXwFv
+        Af0B/wGRAZoB8QH/A/4B/wP+Af8D/gH/AeoB7AH7Af8BdwGBAfQB/wFfAW8B/QH/AVQBZAH8Af8BMQFC
+        AecB/wEkAS8BrwH/iAABJQGnAVUB/wE9AeQBfgH/AVcB+AGSAf8BWwH+AZgB/wFhAf4BnAH/AWEB/gGc
+        Af8BYQH+AZwB/wGwAfMBywH/A/4B/wP+Af8BsAHzAcsB/wFXAfgBkgH/AT0B5AF+Af8BMAGnAV0B/wgA
+        ATQBOwGqAf8BUAFfAegB/wFqAXgB+gH/AZoBowH0Af8D/gH/A/4B/wHmAegB+gH/AvYB/QH/A/4B/wHq
+        AewB+wH/AYEBiAH1Af8BagF4AfoB/wFQAV8B5gH/AT8BRQGpAf+IAAFnAawBgQH/AWAB4gGPAf8BcQHy
+        AaEB/wFzAf0BpQH/AXcB/wGpAf8BdwH/AakB/wF6Af8BrAH/AXoB/wGsAf8B2gH5AeUB/wP+Af8BqAH1
+        AcUB/wFxAfIBoQH/AWMB4gGRAf8BdAGwAYUB/wgAAW8BcgGtAf8BbwF6AeUB/wGBAYgB9QH/Ab0BwwH2
+        Af8D/gH/AeoB7AH7Af8BkgGcAfgB/wGkAawB9QH/A/4B/wP+Af8BmgGjAfQB/wGBAYgB9QH/AXIBfQHl
+        Af8BewF9AbIB/4wAAW0ByQGMAf8BiAHuAa8B/wGIAfgBswH/AYgB+AGzAf8BjAH+AbgB/wGMAf4BuAH/
+        AYwB/gG4Af8BkAH5AbgB/wHaAfkB5QH/AboB9gHRAf8BiAHuAa8B/wFsAcQBiQH/EAABeAF+AcsB/wGR
         AZoB8QH/AZIBnAH4Af8BwQHGAfcB/wGiAasB+QH/AZ0BpwH+Af8BnQGnAf4B/wGxAbcB9wH/AbEBtwH3
-        Af8BkgGcAfgB/wGRAZoB8QH/AXYBfAHGAf+QAAGGAbgBlgH/AaUB5QG9Af8BpAHzAcMB/wGjAfsBxAH/
+        Af8BkgGcAfgB/wGRAZoB8QH/AXUBewHGAf+QAAGGAbgBlgH/AaUB5QG9Af8BpAHzAcMB/wGjAfsBxAH/
         AaMB+wHEAf8BowH7AcQB/wGjAfsBxAH/AaMB+wHEAf8BpAHzAcMB/wGvAe4BxwH/AaUB5QG9Af8UAAGM
         AY0BuQH/AawBsQHmAf8BsQG3AfcB/wGsAbMB+gH/AawBswH6Af8BrAGzAfoB/wGsAbMB+gH/AawBswH6
         Af8BrAGzAfoB/wGxAbcB9wH/AakBrgHjAf+YAAGKAbkBmQH/AaAB1gG0Af8BxgH2AdgB/wG6AfYB0QH/
         AboB9gHRAf8BugH2AdEB/wG6AfYB0QH/AcwB9wHdAf8BmwHRAa0B/xwAApABugH/AacBqQHXAf8BywHP
         AfcB/wHBAcYB+AH/AcEBxgH4Af8BwQHGAfgB/wHBAcYB+AH/AcwB0AH3Af8BoQGkAdIB/6QAAYEBswGQ
         Af8BigG5AZkB/wGnAdQBtwH/AacB1AG3Af8BigG5AZkB/wGBAbQBkQH/KAAChgG0Af8BkgGTAcAB/wGs
-        Aa4B1AH/AawBrgHUAf8BkgGTAcAB/wKGAbQB//8A/wCqAAGyAYEBeAH/AagBTgE8Af8BrgFBASwB/wGu
-        AUEBLAH/AagBUAE/Af8BtAGBAXwB/ygAAbIBgQF4Af8BqAFOATwB/wGuAUEBLAH/Aa4BQQEsAf8BqAFQ
-        AT8B/wG0AYEBfAH/KAABsgGBAXgB/wGoAU4BPAH/Aa4BQQEsAf8BrgFBASwB/wGoAVABPwH/AbQBgQF8
-        Af8oAAGyAYEBeAH/AagBTgE8Af8BrgFBASwB/wGuAUEBLAH/AagBUAE/Af8BtAGBAXwB/yQAAbQBRQEv
-        Af8B1AFQATUB/wHdAVMBNwH/AeMBVQE5Af8B4wFVATkB/wHdAVMBNwH/AdQBUAE1Af8BtAFFAS8B/yAA
-        AbQBRQEvAf8B1AFQATUB/wHdAVMBNwH/AeMBVQE5Af8B4wFVATkB/wHdAVMBNwH/AdQBUAE1Af8BtAFF
-        AS8B/yAAAbQBRQEvAf8B1AFQATUB/wHdAVMBNwH/AeMBVQE5Af8B4wFVATkB/wHdAVMBNwH/AdQBUAE1
-        Af8BtAFFAS8B/yAAAbQBRQEvAf8B1AFQATUB/wHdAVMBNwH/AeMBVQE5Af8B4wFVATkB/wHdAVMBNwH/
-        AdQBUAE1Af8BtAFFAS8B/xwAAcIBSgExAf8B3QFTATcB/wHkAVoBPwH/AesBowGVAf8B6gF7AWUB/wH5
-        AV0BPwH/AfUBWwE9Af8B7AFYATsB/wHdAVMBNwH/Ab8BSAEwAf8YAAHCAUoBMQH/Ad0BUwE3Af8B7AFY
-        ATsB/wH1AVsBPQH/AfkBXQE/Af8B+QFdAT8B/wH1AVsBPQH/AewBWAE7Af8B3QFTATcB/wG/AUgBMAH/
-        GAABwgFKATEB/wHdAVMBNwH/AewBWAE7Af8B9gFbAT0B/wH5AV0BPwH/AfkBXQE/Af8B9gFbAT0B/wHs
-        AVgBOwH/Ad0BUwE3Af8BvwFIATAB/xgAAcIBSgExAf8B3QFTATcB/wHsAVgBOwH/AfYBWwE9Af8B+QFd
-        AT8B/wH2AVsBPQH/AegBiwF/Af8B4QFvAVgB/wHdAVMBNwH/Ab8BSAEwAf8UAAG0AUUBLwH/Ad0BUwE3
-        Af8B9QFbAT0B/wHwAX4BaAX/AfcB3QHYAf8B+QFnAUsB/wH5AWcBSwH/AfkBXQE/Af8B9QFbAT0B/wHd
-        AVMBNwH/AbQBRQEvAf8QAAG0AUUBLwH/Ad0BUwE3Af8B9QFbAT0B/wH5AV0BPwH/Af4BZgFJAf8B/gFm
-        AUkC/wFqAU0B/wH+AWYBSQH/AfkBXQE/Af8B9QFbAT0B/wHdAVMBNwH/AbQBRQEvAf8QAAG0AUUBLwH/
-        Ad0BUwE3Af8B9gFbAT0B/wH5AV0BPwH/Af4BZgFJAf8B/gFmAUkB/wH+AWoBTQH/Af4BZgFJAf8B+QFd
-        AT8B/wH2AVsBPQH/Ad0BUwE3Af8BsAFGATEB/xAAAbQBRQEvAf8B3QFTATcB/wH2AVsBPQH/AfkBXQE/
-        Af8B/gFmAUkB/wH+AWYBSQH/Ae8BhAF1Af8D/gH/AfcB4gHeAf8B7AFYATsB/wHdAVMBNwH/AbABRgEx
-        Af8MAAGvAXoBbwH/AdQBUAE1Af8B7AFYATsB/wH5AV0BPwH/AfkBaQFNAf8B6wGjAZUB/wHlAYoBfQH/
-        AfkBbwFTAf8B+QFvAVMB/wH5AWkBTQH/AfkBXQE/Af8B7AFYATsB/wHUAVABNQH/AbQBgQF8Af8IAAGv
-        AXoBbwH/AdQBUAE1Af8B5AFgAUYB/wHvAbMBpwH/Ae4BiwF9Af8B/gFwAVMB/wH7AXEBVAH/AfcBbwFT
-        Af8B/gFwAVMC/wFqAU0B/wH5AV0BPwH/AewBWAE7Af8B1AFQATUB/wG0AYEBfAH/CAABrwF6AW8B/wHU
-        AVABNQH/AewBWAE7Af8B+QFdAT8B/wH+AXABUwH/Af4BcAFTAf8B8QF/AWcB/wH2AXQBWQH/Af4BcAFT
-        Af8B9gFnAUsB/wHwAWwBUgH/AeQBWQE+Af8B1AFQATUB/wG0AYEBfAH/CAABrwF6AW8B/wHUAVABNQH/
-        AewBWAE7Af8B+QFdAT8B/wH9AXABUwH/Af0BcAFTAf8B+gFwAVQB/wH1AdIBzAH/A/4B/wH4AeQB4AH/
-        Ae4BcgFaAf8B7AFYATsB/wHUAVABNQH/AbQBgQF8Af8IAAGoAUgBNQH/Ad0BUwE3Af8B+QFdAT8B/wH5
-        AWkBTQH/Af4BdQFaAf8B8AGYAYYB/wH9AfcB9gH/AfUB1AHOAf8B8AGDAXIB/wH+AXUBWgH/AfkBaQFN
-        Af8B+QFdAT8B/wHdAVMBNwH/AagBUAE/Af8IAAGoAUgBNQH/Ad0BUwE3Af8B6QGJAXwB/wP+Af8B9AHU
-        Ac4B/wHuAYsBfQH/AfEBxQG8Af8B6QGkAZYB/wHnAZABgQH/Af0BdQFZAv8BagFNAf8B9QFbAT0B/wHd
-        AVMBNwH/AagBUAE/Af8IAAGoAUgBNQH/Ad0BUwE3Af8B+QFdAT8B/wH+AWoBTQL/AXYBWgH/AfABgwFy
-        Af8B6wGnAZkB/wHsAX0BZgH/AfEBrQGgAf8B+QHmAeIF/wHrAaoBngH/Ad0BUwE3Af8BqAFQAT8B/wgA
-        AagBSAE1Af8B3QFTATcB/wH5AV0BPwH/Af4BagFNAf8B+gFwAVQB/wHmAY8BgQH/Ae8BhAF1Af8D/gH/
-        AfsB8gHxAf8B5gGMAX8B/wHvAYQBdQH/AfYBWwE9Af8B3QFTATcB/wGoAVABPwH/CAABtAFFAS8B/wHj
-        AVUBOQH/AfkBaQFNAv8BegFhAv8BgQFpAf8B8wGlAZUF/wH1AdQBzgH/Ae0BrQGhAf8B8gGIAXgC/wF6
-        AWEB/wH5AWcBSwH/AeMBVQE5Af8BrgFDAS0B/wgAAbQBRQEvAf8B4wFVATkB/wH1AWkBTgH/AfIBnQGN
-        Af8B6gGEAXQB/wH9AfgB9wH/A/4B/wH0AdAByQH/AfEBmAGGAf8B+QF/AWcC/wF6AWEC/wFqAU0B/wHj
-        AVUBOQH/Aa4BQwEtAf8IAAG0AUUBLwH/AeMBVQE5Af8B/gFqAU0B/wH6AXkBYAH/AfkBgAFnAf8B9gHW
-        AdEB/wH0AdAByRH/Ae0BnQGOAf8B4wFVATkB/wGuAUMBLQH/CAABtAFFAS8B/wHjAVUBOQH/Af4BagFN
-        Av8BewFiAf8B+wGBAWcB/wHqAaoBnQH/AfIBxAG7Af8D/gH/AfIBugGvAf8B8wGJAXkB/wH1AYABaQH/
-        Af4BZgFJAf8B4wFVATkB/wGuAUMBLQH/CAABtAFFAS8B/wHmAWEBRgL/AYEBaQL/AYQBcgL/AYsBeAH/
-        AfIBiAF4Bf8B/QH4AfcB/wHvAY8BgQH/AfIBiAF4Av8BhAFyAv8BgQFpAf8B5AFgAUYB/wGwAUYBMQH/
-        CAABtAFFAS8B/wHmAWEBRgH/AfkBfwFnAv8BhAFyAf8B/AGJAXgB/wHyAbcBqwH/AfwB9AHyAf8D/gH/
-        A/4B/wH4AeYB4gH/AfIBpgGYAf8B9wF+AWYB/wHkAWABRgH/AbABRgExAf8IAAG0AUUBLwH/AeYBYQFG
+        Aa4B1AH/AawBrgHUAf8BkgGTAcAB/wKGAbQB//8A/wCqAAGyAYEBdwH/AagBTQE7Af8BrgFAASsB/wGu
+        AUABKwH/AagBTwE+Af8BtAGBAXsB/ygAAbIBgQF3Af8BqAFNATsB/wGuAUABKwH/Aa4BQAErAf8BqAFP
+        AT4B/wG0AYEBewH/KAABsgGBAXcB/wGoAU0BOwH/Aa4BQAErAf8BrgFAASsB/wGoAU8BPgH/AbQBgQF7
+        Af8oAAGyAYEBdwH/AagBTQE7Af8BrgFAASsB/wGuAUABKwH/AagBTwE+Af8BtAGBAXsB/yQAAbQBRAEu
+        Af8B1AFPATQB/wHdAVIBNgH/AeMBVAE4Af8B4wFUATgB/wHdAVIBNgH/AdQBTwE0Af8BtAFEAS4B/yAA
+        AbQBRAEuAf8B1AFPATQB/wHdAVIBNgH/AeMBVAE4Af8B4wFUATgB/wHdAVIBNgH/AdQBTwE0Af8BtAFE
+        AS4B/yAAAbQBRAEuAf8B1AFPATQB/wHdAVIBNgH/AeMBVAE4Af8B4wFUATgB/wHdAVIBNgH/AdQBTwE0
+        Af8BtAFEAS4B/yAAAbQBRAEuAf8B1AFPATQB/wHdAVIBNgH/AeMBVAE4Af8B4wFUATgB/wHdAVIBNgH/
+        AdQBTwE0Af8BtAFEAS4B/xwAAcIBSQEwAf8B3QFSATYB/wHkAVkBPgH/AesBowGVAf8B6gF6AWQB/wH5
+        AVwBPgH/AfUBWgE8Af8B7AFXAToB/wHdAVIBNgH/Ab8BRwEvAf8YAAHCAUkBMAH/Ad0BUgE2Af8B7AFX
+        AToB/wH1AVoBPAH/AfkBXAE+Af8B+QFcAT4B/wH1AVoBPAH/AewBVwE6Af8B3QFSATYB/wG/AUcBLwH/
+        GAABwgFJATAB/wHdAVIBNgH/AewBVwE6Af8B9gFaATwB/wH5AVwBPgH/AfkBXAE+Af8B9gFaATwB/wHs
+        AVcBOgH/Ad0BUgE2Af8BvwFHAS8B/xgAAcIBSQEwAf8B3QFSATYB/wHsAVcBOgH/AfYBWgE8Af8B+QFc
+        AT4B/wH2AVoBPAH/AegBiwF+Af8B4QFuAVcB/wHdAVIBNgH/Ab8BRwEvAf8UAAG0AUQBLgH/Ad0BUgE2
+        Af8B9QFaATwB/wHwAX0BZwX/AfcB3QHYAf8B+QFmAUoB/wH5AWYBSgH/AfkBXAE+Af8B9QFaATwB/wHd
+        AVIBNgH/AbQBRAEuAf8QAAG0AUQBLgH/Ad0BUgE2Af8B9QFaATwB/wH5AVwBPgH/Af4BZQFIAf8B/gFl
+        AUgC/wFpAUwB/wH+AWUBSAH/AfkBXAE+Af8B9QFaATwB/wHdAVIBNgH/AbQBRAEuAf8QAAG0AUQBLgH/
+        Ad0BUgE2Af8B9gFaATwB/wH5AVwBPgH/Af4BZQFIAf8B/gFlAUgB/wH+AWkBTAH/Af4BZQFIAf8B+QFc
+        AT4B/wH2AVoBPAH/Ad0BUgE2Af8BsAFFATAB/xAAAbQBRAEuAf8B3QFSATYB/wH2AVoBPAH/AfkBXAE+
+        Af8B/gFlAUgB/wH+AWUBSAH/Ae8BhAF0Af8D/gH/AfcB4gHeAf8B7AFXAToB/wHdAVIBNgH/AbABRQEw
+        Af8MAAGvAXkBbgH/AdQBTwE0Af8B7AFXAToB/wH5AVwBPgH/AfkBaAFMAf8B6wGjAZUB/wHlAYoBfAH/
+        AfkBbgFSAf8B+QFuAVIB/wH5AWgBTAH/AfkBXAE+Af8B7AFXAToB/wHUAU8BNAH/AbQBgQF7Af8IAAGv
+        AXkBbgH/AdQBTwE0Af8B5AFfAUUB/wHvAbMBpwH/Ae4BiwF8Af8B/gFvAVIB/wH7AXABUwH/AfcBbgFS
+        Af8B/gFvAVIC/wFpAUwB/wH5AVwBPgH/AewBVwE6Af8B1AFPATQB/wG0AYEBewH/CAABrwF5AW4B/wHU
+        AU8BNAH/AewBVwE6Af8B+QFcAT4B/wH+AW8BUgH/Af4BbwFSAf8B8QF+AWYB/wH2AXMBWAH/Af4BbwFS
+        Af8B9gFmAUoB/wHwAWsBUQH/AeQBWAE9Af8B1AFPATQB/wG0AYEBewH/CAABrwF5AW4B/wHUAU8BNAH/
+        AewBVwE6Af8B+QFcAT4B/wH9AW8BUgH/Af0BbwFSAf8B+gFvAVMB/wH1AdIBzAH/A/4B/wH4AeQB4AH/
+        Ae4BcQFZAf8B7AFXAToB/wHUAU8BNAH/AbQBgQF7Af8IAAGoAUcBNAH/Ad0BUgE2Af8B+QFcAT4B/wH5
+        AWgBTAH/Af4BdAFZAf8B8AGYAYYB/wH9AfcB9gH/AfUB1AHOAf8B8AGDAXEB/wH+AXQBWQH/AfkBaAFM
+        Af8B+QFcAT4B/wHdAVIBNgH/AagBTwE+Af8IAAGoAUcBNAH/Ad0BUgE2Af8B6QGJAXsB/wP+Af8B9AHU
+        Ac4B/wHuAYsBfAH/AfEBxQG8Af8B6QGkAZYB/wHnAZABgQH/Af0BdAFYAv8BaQFMAf8B9QFaATwB/wHd
+        AVIBNgH/AagBTwE+Af8IAAGoAUcBNAH/Ad0BUgE2Af8B+QFcAT4B/wH+AWkBTAL/AXUBWQH/AfABgwFx
+        Af8B6wGnAZkB/wHsAXwBZQH/AfEBrQGgAf8B+QHmAeIF/wHrAaoBngH/Ad0BUgE2Af8BqAFPAT4B/wgA
+        AagBRwE0Af8B3QFSATYB/wH5AVwBPgH/Af4BaQFMAf8B+gFvAVMB/wHmAY8BgQH/Ae8BhAF0Af8D/gH/
+        AfsB8gHxAf8B5gGMAX4B/wHvAYQBdAH/AfYBWgE8Af8B3QFSATYB/wGoAU8BPgH/CAABtAFEAS4B/wHj
+        AVQBOAH/AfkBaAFMAv8BeQFgAv8BgQFoAf8B8wGlAZUF/wH1AdQBzgH/Ae0BrQGhAf8B8gGIAXcC/wF5
+        AWAB/wH5AWYBSgH/AeMBVAE4Af8BrgFCASwB/wgAAbQBRAEuAf8B4wFUATgB/wH1AWgBTQH/AfIBnQGN
+        Af8B6gGEAXMB/wH9AfgB9wH/A/4B/wH0AdAByQH/AfEBmAGGAf8B+QF+AWYC/wF5AWAC/wFpAUwB/wHj
+        AVQBOAH/Aa4BQgEsAf8IAAG0AUQBLgH/AeMBVAE4Af8B/gFpAUwB/wH6AXgBXwH/AfkBgAFmAf8B9gHW
+        AdEB/wH0AdAByRH/Ae0BnQGOAf8B4wFUATgB/wGuAUIBLAH/CAABtAFEAS4B/wHjAVQBOAH/Af4BaQFM
+        Av8BegFhAf8B+wGBAWYB/wHqAaoBnQH/AfIBxAG7Af8D/gH/AfIBugGvAf8B8wGJAXgB/wH1AYABaAH/
+        Af4BZQFIAf8B4wFUATgB/wGuAUIBLAH/CAABtAFEAS4B/wHmAWABRQL/AYEBaAL/AYQBcQL/AYsBdwH/
+        AfIBiAF3Bf8B/QH4AfcB/wHvAY8BgQH/AfIBiAF3Av8BhAFxAv8BgQFoAf8B5AFfAUUB/wGwAUUBMAH/
+        CAABtAFEAS4B/wHmAWABRQH/AfkBfgFmAv8BhAFxAf8B/AGJAXcB/wHyAbcBqwH/AfwB9AHyAf8D/gH/
+        A/4B/wH4AeYB4gH/AfIBpgGYAf8B9wF9AWUB/wHkAV8BRQH/AbABRQEwAf8IAAG0AUQBLgH/AeYBYAFF
         Af8B7wGRAYEB/wH4AeMB3wH/AeoBoQGSCf8B/QH4AfcB/wH2Ac4BxgH/AeoBoQGSAf8B9gHOAcYB/wHx
-        AX8BZwH/AeYBYQFGAf8BsAFGATEB/wgAAbQBRQEvAf8B5gFhAUYB/wH7AYEBZwL/AYQBcgH/Af4BigF4
-        Af8B8gHEAbsB/wP+Af8D/gH/AfQBkQGBAf8B/gGKAXgC/wGEAXIB/wH7AYEBZwH/AeYBYQFGAf8BsAFG
-        ATEB/wgAAagBUAE/Af8B6gF7AWUC/wGLAXgB/wH+AZIBgQH/Af4BmQGFAf8B/gGZAYUB/wH1AdQBzgX/
-        AfUBxAG7Af8B/gGZAYUB/wH+AZIBgQH/AfIBiAF4Af8B5AF3AWEB/wGrAVgBSAH/CAABqAFQAT8B/wHk
-        AXcBYQH/AfwBiQF4Av8BkgGBAf8B/gGZAYUB/wH+AZkBhQH/AfIBnQGNAf8B+AG/AbQB/wH7Ae8B7QH/
-        A/4B/wP+Af8B7wGzAacB/wHkAXcBYQH/AasBWAFIAf8IAAGoAVABPwH/AeQBdwFhAf8B8gG+AbQF/wHz
-        Ab4BswH/AfYBsgGmAf8B9AG2AaoB/wH1AZoBiAH/Af0BmgGGAf8B7wG1AaoB/wH1AZoBiAH/AfkBigF6
-        Af8B5AF3AWEB/wGrAVgBSAH/CAABqAFQAT8B/wHkAXcBYQH/Af4BigF4Af8B/gGSAYEB/wH+AZkBhQH/
-        AfIBpgGXAf8B+wHyAfEB/wHyAcQBuwH/Af4BmQGFAf8B/gGZAYUB/wH+AZIBgQH/AfMBiQF5Af8B5AF3
-        AWEB/wGrAVgBSAH/CAABsAF+AXMB/wHlAYoBfQH/AfQBmgGJAf8B/gGfAY0B/wH+AaUBlQH/AfIBvgG0
-        Af8B8gG+AbQF/wH7Ae8B7QH/Af4BpQGVAf8B/gGfAY0B/wH0AZoBiQH/AeMBigF+Af8BtQGCAX4B/wgA
-        AbABfgFzAf8B4wGKAX4B/wHyAZ0BjQH/Af4BnwGOAv8BpQGVAv8BqQGYAv8BqQGYAf8B9gGzAaYB/wHx
-        Ab0BswH/AfsB7wHtAf8B+AHmAeIB/wHpAaQBlgH/AeMBigF+Af8BtQGCAX4B/wgAAbABfgFzAf8B4wGK
-        AX4B/wH1AZoBiAH/AfYBsgGmAf8B+gGkAZQC/wGoAZgC/wGoAZgC/wGoAZgC/wGoAZgB/wH6AaQBlAH/
-        Af4BnwGNAf8B9QGaAYgB/wHjAYoBfgH/AbUBggF+Af8IAAGwAX4BcwH/AeYBjAF/Af8B9AGaAYkB/wH+
+        AX4BZgH/AeYBYAFFAf8BsAFFATAB/wgAAbQBRAEuAf8B5gFgAUUB/wH7AYEBZgL/AYQBcQH/Af4BigF3
+        Af8B8gHEAbsB/wP+Af8D/gH/AfQBkQGBAf8B/gGKAXcC/wGEAXEB/wH7AYEBZgH/AeYBYAFFAf8BsAFF
+        ATAB/wgAAagBTwE+Af8B6gF6AWQC/wGLAXcB/wH+AZIBgQH/Af4BmQGFAf8B/gGZAYUB/wH1AdQBzgX/
+        AfUBxAG7Af8B/gGZAYUB/wH+AZIBgQH/AfIBiAF3Af8B5AF2AWAB/wGrAVcBRwH/CAABqAFPAT4B/wHk
+        AXYBYAH/AfwBiQF3Av8BkgGBAf8B/gGZAYUB/wH+AZkBhQH/AfIBnQGNAf8B+AG/AbQB/wH7Ae8B7QH/
+        A/4B/wP+Af8B7wGzAacB/wHkAXYBYAH/AasBVwFHAf8IAAGoAU8BPgH/AeQBdgFgAf8B8gG+AbQF/wHz
+        Ab4BswH/AfYBsgGmAf8B9AG2AaoB/wH1AZoBiAH/Af0BmgGGAf8B7wG1AaoB/wH1AZoBiAH/AfkBigF5
+        Af8B5AF2AWAB/wGrAVcBRwH/CAABqAFPAT4B/wHkAXYBYAH/Af4BigF3Af8B/gGSAYEB/wH+AZkBhQH/
+        AfIBpgGXAf8B+wHyAfEB/wHyAcQBuwH/Af4BmQGFAf8B/gGZAYUB/wH+AZIBgQH/AfMBiQF4Af8B5AF2
+        AWAB/wGrAVcBRwH/CAABsAF9AXIB/wHlAYoBfAH/AfQBmgGJAf8B/gGfAY0B/wH+AaUBlQH/AfIBvgG0
+        Af8B8gG+AbQF/wH7Ae8B7QH/Af4BpQGVAf8B/gGfAY0B/wH0AZoBiQH/AeMBigF9Af8BtQGCAX0B/wgA
+        AbABfQFyAf8B4wGKAX0B/wHyAZ0BjQH/Af4BnwGOAv8BpQGVAv8BqQGYAv8BqQGYAf8B9gGzAaYB/wHx
+        Ab0BswH/AfsB7wHtAf8B+AHmAeIB/wHpAaQBlgH/AeMBigF9Af8BtQGCAX0B/wgAAbABfQFyAf8B4wGK
+        AX0B/wH1AZoBiAH/AfYBsgGmAf8B+gGkAZQC/wGoAZgC/wGoAZgC/wGoAZgC/wGoAZgB/wH6AaQBlAH/
+        Af4BnwGNAf8B9QGaAYgB/wHjAYoBfQH/AbUBggF9Af8IAAGwAX0BcgH/AeYBjAF+Af8B9AGaAYkB/wH+
         AZ8BjQH/AfYBtQGoAf8B+AHkAeAB/wHwAbEBpAH/Af0BqAGYAf8B/QGoAZgC/wGlAZQB/wH+AZ8BjQH/
-        AfQBmgGJAf8B5gGMAX8B/wG1AYIBfgH/DAABzAGIAYAB/wHvAasBngH/AfkBrgGgAf8B/gGxAaMB/wH4
-        AbkBrgH/AfcB3QHYCf8B+AG3AaoB/wH5Aa4BoAH/AfABqwGeAf8BxwGFAX0B/xAAAcwBiAGAAf8B8AGr
+        AfQBmgGJAf8B5gGMAX4B/wG1AYIBfQH/DAABzAGIAYAB/wHvAasBngH/AfkBrgGgAf8B/gGxAaMB/wH4
+        AbkBrgH/AfcB3QHYCf8B+AG3AaoB/wH5Aa4BoAH/AfABqwGeAf8BxwGFAXwB/xAAAcwBiAGAAf8B8AGr
         AZ4B/wH5Aa4BoAH/Af4BsQGjAf8B/gGxAaMC/wG2AagC/wG2AagB/wHxAb0BswH/Af4BsQGjAf8B9gGt
-        AZ8B/wHwAasBngH/AccBhQF9Af8QAAHMAYgBgAH/AfEBrQGgAf8B8QGtAaAB/wH+AbEBowH/Af4BsQGj
-        Av8BtQGoAv8BtQGoAf8B/gGxAaMB/wH+AbEBowH/AfkBrgGgAf8B6wGqAZ4B/wHHAYUBfQH/EAABzAGI
+        AZ8B/wHwAasBngH/AccBhQF8Af8QAAHMAYgBgAH/AfEBrQGgAf8B8QGtAaAB/wH+AbEBowH/Af4BsQGj
+        Av8BtQGoAv8BtQGoAf8B/gGxAaMB/wH+AbEBowH/AfkBrgGgAf8B6wGqAZ4B/wHHAYUBfAH/EAABzAGI
         AYAB/wHwAasBngH/AfkBrgGgAf8B9QHSAcwB/wP+Af8B+AHQAckC/wG1AagC/wG0AaYC/wG0AaYB/wH9
-        AagBmAH/Ae8BqwGeAf8BxwGFAX0B/xAAAbwBlAGNAf8B5gG6AbIB/wHyAb4BtAH/AfkBvwG0Af8B/AHA
+        AagBmAH/Ae8BqwGeAf8BxwGFAXwB/xAAAbwBlAGNAf8B5gG6AbIB/wHyAb4BtAH/AfkBvwG0Af8B/AHA
         AbUB/wH8AcABtQH/AfgB2gHVAf8B+AHiAd0B/wH1AcABtgH/AfIBvgG0Af8B4wG3Aa4B/xQAAbwBlAGN
         Af8B5gG6AbIB/wHxAb0BswH/AfwBwAG1Af8B/AHAAbUB/wH8AcABtQH/AfwBwAG1Af8B/AHAAbUB/wHx
         Ab0BswH/AfEBvQGzAf8B4wG3Aa4B/xQAAbwBlAGNAf8B5gG6AbIB/wHzAb4BswH/AfwBwAG1Af8B/AHA
@@ -249,75 +249,75 @@
         Af8B9gHWAdAB/wHTAasBpAH/JAABuAGOAYYB/wHDAZsBlAH/AdUBtAGtAf8B1QG0Aa0B/wHDAZsBlAH/
         AbgBjgGGAf8oAAG4AY4BhgH/AcMBmwGUAf8B1QG0Aa0B/wHVAbQBrQH/AcMBmwGUAf8BvAGUAY0B/ygA
         AbgBjgGGAf8BwwGbAZQB/wHVAbQBrQH/AdUBtAGtAf8BwwGbAZQB/wG4AY4BhgH/KAABuAGOAYYB/wHD
-        AZsBlAH/AdUBtAGtAf8B1QG0Aa0B/wHDAZsBlAH/AbgBjgGGAf//AP8AKgABsgGBAXgB/wGoAU4BPAH/
-        Aa4BQQEsAf8BrgFBASwB/wGoAVABPwH/AbQBgQF8Af8oAAGyAYEBeAH/AagBTgE8Af8BrgFBASwB/wGu
-        AUEBLAH/AagBUAE/Af8BtAGBAXwB/ygAAbIBgQF4Af8BqAFOATwB/wGuAUEBLAH/Aa4BQQEsAf8BqAFQ
-        AT8B/wG0AYEBfAH/KAABsgGBAXgB/wGoAU4BPAH/Aa4BQQEsAf8BrgFBASwB/wGoAVABPwH/AbQBgQF8
-        Af8kAAG0AUUBLwH/AdQBUAE1Af8B3QFTATcB/wHjAVUBOQH/AeMBVQE5Af8B3QFTATcB/wHUAVABNQH/
-        AbQBRQEvAf8gAAG0AUUBLwH/AdQBUAE1Af8B3QFTATcB/wHjAVUBOQH/AeMBVQE5Af8B3QFTATcB/wHU
-        AVABNQH/AbQBRQEvAf8gAAG0AUUBLwH/AdQBUAE1Af8B3QFTATcB/wHjAVUBOQH/AeMBVQE5Af8B3QFT
-        ATcB/wHUAVABNQH/AbQBRQEvAf8gAAG0AUUBLwH/AdQBUAE1Af8B3QFTATcB/wHjAVUBOQH/AeMBVQE5
-        Af8B3QFTATcB/wHUAVABNQH/AbQBRQEvAf8cAAHCAUoBMQH/Ad0BUwE3Af8B5AFZAT4B/wHrAasBnwH/
-        AewBlwGHAf8B7wFeAUIB/wH1AVsBPQH/AewBWAE7Af8B3QFTATcB/wG/AUgBMAH/GAABwgFKATEB/wHd
-        AVMBNwH/AewBWAE7Af8B9QFbAT0B/wH5AV0BPwH/AfkBXQE/Af8B9QFbAT0B/wHsAVgBOwH/Ad0BUwE3
-        Af8BvwFIATAB/xgAAcIBSgExAf8B3QFTATcB/wHsAVgBOwH/AfYBWwE9Af8B+QFdAT8B/wH5AV0BPwH/
-        AfYBWwE9Af8B7AFYATsB/wHdAVMBNwH/Ab8BSAEwAf8YAAHCAUoBMQH/Ad0BUwE3Af8B7AFYATsB/wH2
-        AVsBPQH/AfkBXQE/Af8B8wFdAUAB/wHpAY8BgQH/AeMBYgFIAf8B3QFTATcB/wG/AUgBMAH/FAABtAFF
-        AS8B/wHdAVMBNwH/AfUBWwE9Af8B8AFsAVMJ/wHvAboBsAH/AfEBcAFYAf8B/AFgAUIB/wHxAVkBPAH/
-        Ad0BUwE3Af8BtAFFAS8B/xAAAbQBRQEvAf8B3QFTATcB/wHsAVgBOwH/Ae4BcgFZAf8B8AGBAW0B/wHz
-        AXABVgH/Af4BaQFMAf8B/gFpAUwB/wH5AV0BPwH/AfUBWwE9Af8B3QFTATcB/wG0AUUBLwH/EAABtAFF
-        AS8B/wHdAVMBNwH/AfYBWwE9Af8B+QFdAT8B/wH+AWYBSQH/Af4BZgFJAv8BaQFMAf8B/gFmAUkB/wH5
-        AV0BPwH/AfYBWwE9Af8B3QFTATcB/wGwAUYBMQH/EAABtAFFAS8B/wHdAVMBNwH/AfYBWwE9Af8B+QFd
-        AT8B/wH+AWYBSQH/Af4BZgFJAf8B8AGPAYEB/wP+Af8B7gGzAagB/wHxAVkBPAH/Ad0BUwE3Af8BtAFF
-        AS8B/wwAAa8BegFvAf8B1AFQATUB/wHsAVgBOwH/AfwBYAFCAf8B9gFnAUwB/wH5AeUB4gX/AegBigF8
-        Af8B5wGUAYMB/wH9AWoBTQH/AfwBYAFCAf8B7AFYATsB/wHUAVABNQH/AbQBgQF8Af8IAAGvAXoBbwH/
-        AdQBUAE1Af8B4wFtAVUB/wH2Ad4B2gH/AfkB6AHlAf8B5QGIAXsB/wHxAYABaAL/AXABUwL/AXABUwL/
-        AWoBTQH/AfkBXQE/Af8B7AFYATsB/wHUAVABNQH/AbQBgQF8Af8IAAGvAXoBbwH/AdQBUAE1Af8B7AFY
-        ATsB/wH5AV0BPwL/AXABUwL/AXABUwL/AXIBVQL/AXIBVQL/AXABUwL/AWkBTAH/AfABfgFoAf8B5AFa
-        AT8B/wHUAVABNQH/AbQBgQF8Af8IAAGvAXoBbwH/AdQBUAE1Af8B7AFYATsB/wH5AV0BPwL/AXABUwL/
-        AXABUwH/AfsBcAFUAf8B5wF6AWMB/wHyAc0BxgH/Ae8BiAF5Af8B+QFdAT8B/wHsAVgBOwH/AdQBUAE1
-        Af8BtAGBAXwB/wgAAagBSAE1Af8B3QFTATcB/wH1AVsBPQH/Af0BagFNAf8B/QF2AVoB/wHxAa8BogX/
-        AfIBxAG7Af8B/QF2AVoB/wH9AXYBWgH/Af4BaQFMAf8B9QFbAT0B/wHdAVMBNwH/AagBUAE/Af8IAAGo
-        AUgBNQH/Ad0BUwE3Af8B6QGHAXkB/wP+Af8D/gH/AfwB8wHxAf8B8QG1AakB/wHxAYABaAH/Af4BdgFb
-        Af8B/gF2AVsC/wFqAU0B/wH1AVsBPQH/Ad0BUwE3Af8BqAFQAT8B/wgAAagBSAE1Af8B3QFTATcB/wH5
-        AV0BPwH/AfEBcwFbAf8B6QGWAYYB/wH8AXgBXAH/AfMBegFgAf8B8gGcAYsB/wHwAZgBhgH/AeoBogGV
-        Bf8B6gGiAZUB/wHdAVMBNwH/AagBUAE/Af8IAAGoAUgBNQH/Ad0BUwE3Af8B+QFdAT8B/wH+AWoBTQH/
-        Af4BdQFaAf8B/gF4AV0B/wHwAakBmwH/A/4B/wHpAY8BgQH/Af4BdQFaAf8B/gFqAU0B/wH2AVsBPQH/
-        Ad0BUwE3Af8BqAFQAT8B/wgAAbQBRQEvAf8B4wFVATkB/wH9AWoBTQL/AXoBYQH/AfUBgQFsAf8B7QGD
-        AXMF/wH9AfcB9gH/AfUBgQFsAf8B9QGBAWwC/wF6AWEB/wH+AWkBTAH/AeMBVQE5Af8BrgFDAS0B/wgA
-        AbQBRQEvAf8B4wFVATkC/wFqAU0B/wHxAZEBgQH/AfUB1gHQAf8D/gH/A/4B/wP+Af8B8gG7AbAB/wH6
-        AX8BZwL/AXoBYQL/AWoBTQH/AeMBVQE5Af8BrgFDAS0B/wgAAbQBRQEvAf8B4wFVATkB/wHxAWoBUAH/
-        AfEBwgG5Af8B6QGWAYYB/wHxAcIBuQn/Af0B9wH2Af8B6AGYAYgB/wH4AeIB3gH/AesBgQFxAf8B4wFV
-        ATkB/wGuAUMBLQH/CAABtAFFAS8B/wHjAVUBOQH/Af4BagFNAf8B/gF4AV0C/wGBAWkB/wH0AYEBbQH/
-        AfsB8wHxAf8D/gH/AfUBxQG8Av8BgQFpAf8B/gF4AV0B/wH+AWoBTQH/AeMBVQE5Af8BrgFDAS0B/wgA
-        Ab8BSAEwAf8B5AFgAUYB/wH1AYEBbAL/AYMBcgH/AfQBlQGCAf8B7gG0AakB/wH1AdYB0AX/AfQBrQGf
-        Av8BigF4Av8BgwFyAf8B9QGBAWwB/wHkAWABRgH/AbQBRQEvAf8IAAG0AUUBLwH/AeYBYQFGAf8B+gF/
-        AWcC/wGEAXIB/wH7AYkBdwH/AfEBmAGHAf8B9AHLAcMB/wH9AfgB9wH/Af0B+AH3Af8B7AGWAYUB/wHz
-        Aa8BowH/AfEBgAFoAf8B5gFhAUYB/wGwAUYBMQH/CAABtAFFAS8B/wHmAWEBRgH/AfABrAGfEf8B9gHW
-        AdAB/wH3AdwB1wH/AfoBiAF3Af8B+gGCAXAB/wH6AX8BZwH/AeQBYAFGAf8BtAFFAS8B/wgAAbQBRQEv
-        Af8B4wFiAUgC/wGBAWkB/wH3AYQBdAH/AfQBmgGJAf8B8wG3AasB/wP+Af8B9QHVAc8B/wHtAbMBpwH/
-        AfgBiAF2Av8BgwFyAf8B+gF/AWcB/wHjAWIBSAH/AbQBRQEvAf8IAAGoAVABPwH/AeQBdwFhAv8BigF4
+        AZsBlAH/AdUBtAGtAf8B1QG0Aa0B/wHDAZsBlAH/AbgBjgGGAf//AP8AKgABsgGBAXcB/wGoAU0BOwH/
+        Aa4BQAErAf8BrgFAASsB/wGoAU8BPgH/AbQBgQF7Af8oAAGyAYEBdwH/AagBTQE7Af8BrgFAASsB/wGu
+        AUABKwH/AagBTwE+Af8BtAGBAXsB/ygAAbIBgQF3Af8BqAFNATsB/wGuAUABKwH/Aa4BQAErAf8BqAFP
+        AT4B/wG0AYEBewH/KAABsgGBAXcB/wGoAU0BOwH/Aa4BQAErAf8BrgFAASsB/wGoAU8BPgH/AbQBgQF7
+        Af8kAAG0AUQBLgH/AdQBTwE0Af8B3QFSATYB/wHjAVQBOAH/AeMBVAE4Af8B3QFSATYB/wHUAU8BNAH/
+        AbQBRAEuAf8gAAG0AUQBLgH/AdQBTwE0Af8B3QFSATYB/wHjAVQBOAH/AeMBVAE4Af8B3QFSATYB/wHU
+        AU8BNAH/AbQBRAEuAf8gAAG0AUQBLgH/AdQBTwE0Af8B3QFSATYB/wHjAVQBOAH/AeMBVAE4Af8B3QFS
+        ATYB/wHUAU8BNAH/AbQBRAEuAf8gAAG0AUQBLgH/AdQBTwE0Af8B3QFSATYB/wHjAVQBOAH/AeMBVAE4
+        Af8B3QFSATYB/wHUAU8BNAH/AbQBRAEuAf8cAAHCAUkBMAH/Ad0BUgE2Af8B5AFYAT0B/wHrAasBnwH/
+        AewBlwGHAf8B7wFdAUEB/wH1AVoBPAH/AewBVwE6Af8B3QFSATYB/wG/AUcBLwH/GAABwgFJATAB/wHd
+        AVIBNgH/AewBVwE6Af8B9QFaATwB/wH5AVwBPgH/AfkBXAE+Af8B9QFaATwB/wHsAVcBOgH/Ad0BUgE2
+        Af8BvwFHAS8B/xgAAcIBSQEwAf8B3QFSATYB/wHsAVcBOgH/AfYBWgE8Af8B+QFcAT4B/wH5AVwBPgH/
+        AfYBWgE8Af8B7AFXAToB/wHdAVIBNgH/Ab8BRwEvAf8YAAHCAUkBMAH/Ad0BUgE2Af8B7AFXAToB/wH2
+        AVoBPAH/AfkBXAE+Af8B8wFcAT8B/wHpAY8BgQH/AeMBYQFHAf8B3QFSATYB/wG/AUcBLwH/FAABtAFE
+        AS4B/wHdAVIBNgH/AfUBWgE8Af8B8AFrAVIJ/wHvAboBsAH/AfEBbwFXAf8B/AFfAUEB/wHxAVgBOwH/
+        Ad0BUgE2Af8BtAFEAS4B/xAAAbQBRAEuAf8B3QFSATYB/wHsAVcBOgH/Ae4BcQFYAf8B8AGBAWwB/wHz
+        AW8BVQH/Af4BaAFLAf8B/gFoAUsB/wH5AVwBPgH/AfUBWgE8Af8B3QFSATYB/wG0AUQBLgH/EAABtAFE
+        AS4B/wHdAVIBNgH/AfYBWgE8Af8B+QFcAT4B/wH+AWUBSAH/Af4BZQFIAv8BaAFLAf8B/gFlAUgB/wH5
+        AVwBPgH/AfYBWgE8Af8B3QFSATYB/wGwAUUBMAH/EAABtAFEAS4B/wHdAVIBNgH/AfYBWgE8Af8B+QFc
+        AT4B/wH+AWUBSAH/Af4BZQFIAf8B8AGPAYEB/wP+Af8B7gGzAagB/wHxAVgBOwH/Ad0BUgE2Af8BtAFE
+        AS4B/wwAAa8BeQFuAf8B1AFPATQB/wHsAVcBOgH/AfwBXwFBAf8B9gFmAUsB/wH5AeUB4gX/AegBigF7
+        Af8B5wGUAYMB/wH9AWkBTAH/AfwBXwFBAf8B7AFXAToB/wHUAU8BNAH/AbQBgQF7Af8IAAGvAXkBbgH/
+        AdQBTwE0Af8B4wFsAVQB/wH2Ad4B2gH/AfkB6AHlAf8B5QGIAXoB/wHxAYABZwL/AW8BUgL/AW8BUgL/
+        AWkBTAH/AfkBXAE+Af8B7AFXAToB/wHUAU8BNAH/AbQBgQF7Af8IAAGvAXkBbgH/AdQBTwE0Af8B7AFX
+        AToB/wH5AVwBPgL/AW8BUgL/AW8BUgL/AXEBVAL/AXEBVAL/AW8BUgL/AWgBSwH/AfABfQFnAf8B5AFZ
+        AT4B/wHUAU8BNAH/AbQBgQF7Af8IAAGvAXkBbgH/AdQBTwE0Af8B7AFXAToB/wH5AVwBPgL/AW8BUgL/
+        AW8BUgH/AfsBbwFTAf8B5wF5AWIB/wHyAc0BxgH/Ae8BiAF4Af8B+QFcAT4B/wHsAVcBOgH/AdQBTwE0
+        Af8BtAGBAXsB/wgAAagBRwE0Af8B3QFSATYB/wH1AVoBPAH/Af0BaQFMAf8B/QF1AVkB/wHxAa8BogX/
+        AfIBxAG7Af8B/QF1AVkB/wH9AXUBWQH/Af4BaAFLAf8B9QFaATwB/wHdAVIBNgH/AagBTwE+Af8IAAGo
+        AUcBNAH/Ad0BUgE2Af8B6QGHAXgB/wP+Af8D/gH/AfwB8wHxAf8B8QG1AakB/wHxAYABZwH/Af4BdQFa
+        Af8B/gF1AVoC/wFpAUwB/wH1AVoBPAH/Ad0BUgE2Af8BqAFPAT4B/wgAAagBRwE0Af8B3QFSATYB/wH5
+        AVwBPgH/AfEBcgFaAf8B6QGWAYYB/wH8AXcBWwH/AfMBeQFfAf8B8gGcAYsB/wHwAZgBhgH/AeoBogGV
+        Bf8B6gGiAZUB/wHdAVIBNgH/AagBTwE+Af8IAAGoAUcBNAH/Ad0BUgE2Af8B+QFcAT4B/wH+AWkBTAH/
+        Af4BdAFZAf8B/gF3AVwB/wHwAakBmwH/A/4B/wHpAY8BgQH/Af4BdAFZAf8B/gFpAUwB/wH2AVoBPAH/
+        Ad0BUgE2Af8BqAFPAT4B/wgAAbQBRAEuAf8B4wFUATgB/wH9AWkBTAL/AXkBYAH/AfUBgQFrAf8B7QGD
+        AXIF/wH9AfcB9gH/AfUBgQFrAf8B9QGBAWsC/wF5AWAB/wH+AWgBSwH/AeMBVAE4Af8BrgFCASwB/wgA
+        AbQBRAEuAf8B4wFUATgC/wFpAUwB/wHxAZEBgQH/AfUB1gHQAf8D/gH/A/4B/wP+Af8B8gG7AbAB/wH6
+        AX4BZgL/AXkBYAL/AWkBTAH/AeMBVAE4Af8BrgFCASwB/wgAAbQBRAEuAf8B4wFUATgB/wHxAWkBTwH/
+        AfEBwgG5Af8B6QGWAYYB/wHxAcIBuQn/Af0B9wH2Af8B6AGYAYgB/wH4AeIB3gH/AesBgQFwAf8B4wFU
+        ATgB/wGuAUIBLAH/CAABtAFEAS4B/wHjAVQBOAH/Af4BaQFMAf8B/gF3AVwC/wGBAWgB/wH0AYEBbAH/
+        AfsB8wHxAf8D/gH/AfUBxQG8Av8BgQFoAf8B/gF3AVwB/wH+AWkBTAH/AeMBVAE4Af8BrgFCASwB/wgA
+        Ab8BRwEvAf8B5AFfAUUB/wH1AYEBawL/AYMBcQH/AfQBlQGCAf8B7gG0AakB/wH1AdYB0AX/AfQBrQGf
+        Av8BigF3Av8BgwFxAf8B9QGBAWsB/wHkAV8BRQH/AbQBRAEuAf8IAAG0AUQBLgH/AeYBYAFFAf8B+gF+
+        AWYC/wGEAXEB/wH7AYkBdgH/AfEBmAGHAf8B9AHLAcMB/wH9AfgB9wH/Af0B+AH3Af8B7AGWAYUB/wHz
+        Aa8BowH/AfEBgAFnAf8B5gFgAUUB/wGwAUUBMAH/CAABtAFEAS4B/wHmAWABRQH/AfABrAGfEf8B9gHW
+        AdAB/wH3AdwB1wH/AfoBiAF2Af8B+gGCAW8B/wH6AX4BZgH/AeQBXwFFAf8BtAFEAS4B/wgAAbQBRAEu
+        Af8B4wFhAUcC/wGBAWgB/wH3AYQBcwH/AfQBmgGJAf8B8wG3AasB/wP+Af8B9QHVAc8B/wHtAbMBpwH/
+        AfgBiAF1Av8BgwFxAf8B+gF+AWYB/wHjAWEBRwH/AbQBRAEuAf8IAAGoAU8BPgH/AeQBdgFgAv8BigF3
         Af8B/gGSAYEB/wH+AZgBhAH/AfQBpgGXAf8B+AHiAd0F/wH0AbYBqQH/Af4BmAGEAf8B/gGSAYEC/wGK
-        AXgB/wHkAXcBYQH/AasBWAFIAf8IAAGoAVABPwH/AeQBdwFhAf8B+wGJAXcC/wGSAYEB/wH+AZgBhAH/
-        Ae0BrQGgAf8B7wG8AbIB/wH0AcsBwwH/AfIBqAGZAf8B9gHeAdoB/wP+Af8B8AGyAaYB/wHkAXcBYQH/
-        AasBWAFIAf8IAAGoAVABPwH/AeQBdwFhAf8B8QHCAbkF/wH7Ae4B7AH/AfEBwgG5Af8B8gGcAYsB/wHy
-        Ab4BtAH/AfQBpgGXAv8BmAGEAf8B/gGSAYEB/wH6AYgBdwH/AeQBdwFhAf8BqwFYAUgB/wgAAagBUAE/
-        Af8B5wF6AWMB/wH5AYoBegH/AfQBmgGJAf8B7gGzAagB/wH7Ae8B7QH/A/4B/wH0Aa8BoQH/Ae4BrgGh
-        Af8B+wGXAYMB/wH+AZIBgQH/AfgBiAF2Af8B5wF6AWMB/wGrAVgBSAH/CAABsAF+AXMB/wHjAYoBfgH/
+        AXcB/wHkAXYBYAH/AasBVwFHAf8IAAGoAU8BPgH/AeQBdgFgAf8B+wGJAXYC/wGSAYEB/wH+AZgBhAH/
+        Ae0BrQGgAf8B7wG8AbIB/wH0AcsBwwH/AfIBqAGZAf8B9gHeAdoB/wP+Af8B8AGyAaYB/wHkAXYBYAH/
+        AasBVwFHAf8IAAGoAU8BPgH/AeQBdgFgAf8B8QHCAbkF/wH7Ae4B7AH/AfEBwgG5Af8B8gGcAYsB/wHy
+        Ab4BtAH/AfQBpgGXAv8BmAGEAf8B/gGSAYEB/wH6AYgBdgH/AeQBdgFgAf8BqwFXAUcB/wgAAagBTwE+
+        Af8B5wF5AWIB/wH5AYoBeQH/AfQBmgGJAf8B7gGzAagB/wH7Ae8B7QH/A/4B/wH0Aa8BoQH/Ae4BrgGh
+        Af8B+wGXAYMB/wH+AZIBgQH/AfgBiAF1Af8B5wF5AWIB/wGrAVcBRwH/CAABsAF9AXIB/wHjAYoBfQH/
         AfQBmgGJAf8B/gGfAY0C/wGlAZUC/wGpAZgC/wGlAZUB/wHwAbkBrgH/AfIBxAG7Av8BpQGVAf8B/gGf
-        AY0B/wH0AZoBiQH/AeMBigF+Af8BtQGCAX4B/wgAAbABfgFzAf8B4wGKAX4B/wH1AZsBiQH/Af4BnwGO
+        AY0B/wH0AZoBiQH/AeMBigF9Af8BtQGCAX0B/wgAAbABfQFyAf8B4wGKAX0B/wH1AZsBiQH/Af4BnwGO
         Av8BpQGVAf8B/QGoAZcB/wH9AagBmAH/Af0BqAGYAf8B/QGoAZgB/wHxAbUBqQH/AfQBywHDAf8B9QGb
-        AYkB/wHjAYoBfgH/AbUBggF+Af8IAAGwAX4BcwH/AeMBigF+Af8B8gGcAYsB/wH2AacBmAH/AfkBowGT
+        AYkB/wHjAYoBfQH/AbUBggF9Af8IAAGwAX0BcgH/AeMBigF9Af8B8gGcAYsB/wH2AacBmAH/AfkBowGT
         Af8B/gGoAZgB/wH+AagBmAH/AfYBsgGkAf8B/gGoAZgB/wH5AaMBkwH/Af4BnwGNAf8B8gGcAYsB/wHj
-        AYoBfgH/AbUBggF+Af8IAAGwAX4BcwH/AeMBigF+Af8B9AGaAYkB/wH2AaIBkgH/AfsB8AHuAf8D/gH/
-        AfsB7wHtAf8B+gGoAZcB/wH+AagBmAH/AfoBqAGXAf8B/gGfAY0B/wH0AZoBiQH/AeMBigF+Af8BtQGC
-        AX4B/wwAAcwBiAGAAf8B9AGtAZ8B/wHxAa8BogH/Af4BsQGjAf8B/gGxAaMB/wH+AbEBowH/AfsB7wHt
-        Bf8B+AG/AbQB/wHxAa8BogH/AfQBrQGfAf8BxwGFAX0B/xAAAcwBiAGAAf8B8gGoAZkB/wH5Aa4BoAH/
+        AYoBfQH/AbUBggF9Af8IAAGwAX0BcgH/AeMBigF9Af8B9AGaAYkB/wH2AaIBkgH/AfsB8AHuAf8D/gH/
+        AfsB7wHtAf8B+gGoAZcB/wH+AagBmAH/AfoBqAGXAf8B/gGfAY0B/wH0AZoBiQH/AeMBigF9Af8BtQGC
+        AX0B/wwAAcwBiAGAAf8B9AGtAZ8B/wHxAa8BogH/Af4BsQGjAf8B/gGxAaMB/wH+AbEBowH/AfsB7wHt
+        Bf8B+AG/AbQB/wHxAa8BogH/AfQBrQGfAf8BxwGFAXwB/xAAAcwBiAGAAf8B8gGoAZkB/wH5Aa4BoAH/
         Af4BsQGjAf8B/gGxAaMC/wG1AagC/wG1AagB/wH+AbEBowH/Af4BsQGjAf8B/gGxAaMB/wHtAa0BoAH/
-        AccBhQF9Af8QAAHMAYgBgAH/AfABqwGeAf8B+QGuAaAB/wH+AbEBowL/AbUBqAL/AbUBqAL/AbUBqAH/
-        Af4BsQGjAf8B/gGxAaMB/wH5Aa4BoAH/AfABqwGeAf8BxwGFAX0B/xAAAcwBiAGAAf8B8AGpAZsB/wH0
+        AccBhQF8Af8QAAHMAYgBgAH/AfABqwGeAf8B+QGuAaAB/wH+AbEBowL/AbUBqAL/AbUBqAL/AbUBqAH/
+        Af4BsQGjAf8B/gGxAaMB/wH5Aa4BoAH/AfABqwGeAf8BxwGFAXwB/xAAAcwBiAGAAf8B8AGpAZsB/wH0
         Aa8BoQH/AfoB6QHmAf8D/gH/AfIBzQHGAv8BtAGmAv8BtAGmAv8BtAGmAf8B/gGoAZgB/wHuAa4BoQH/
-        AccBhQF9Af8QAAG8AZQBjQH/AeYBugGyAf8B+AG/AbQB/wH4Ab8BtAH/AfwBwAG1Af8B/AHAAbUB/wH2
+        AccBhQF8Af8QAAG8AZQBjQH/AeYBugGyAf8B+AG/AbQB/wH4Ab8BtAH/AfwBwAG1Af8B/AHAAbUB/wH2
         Ac4BxgH/AfgB4gHdAf8B+AG/AbQB/wH4Ab8BtAH/AeMBtwGuAf8UAAG8AZQBjQH/AeYBugGyAf8B8wG+
         AbQB/wH4Ab8BtAH/AfgBvwG0Af8B+AG/AbQB/wH8AcABtQH/AfgBvwG0Af8B+AG/AbQB/wHzAb4BtAH/
         AeMBtwGuAf8UAAG8AZQBjQH/AeYBugGyAf8B8gG+AbQB/wH4Ab8BtAH/AfwBwAG1Af8B/AHAAbUB/wH8

Modified: trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs	2009-11-16 17:19:54 UTC (rev 4346)
@@ -129,9 +129,24 @@
 		/// <returns>The name of the selected file, or null if the user cancelled</returns>
 		string BrowseUnmanagedData(string startPath, System.Collections.Specialized.NameValueCollection filetypes);
 
+        /// <summary>
+        /// Performs a lengthy operation and displays a progress dialog for the user
+        /// </summary>
+        /// <param name="caller">The sender that is updated when the progress starts</param>
+        /// <param name="mi">The method to invoke when the operation progress starts</param>
+        /// <returns>DialogResult.OK if the operation succeeded, DialogResult.Cancel if the user cancelled</returns>
 		System.Windows.Forms.DialogResult LengthyOperation(object caller, System.Reflection.MethodInfo mi);
 
         /// <summary>
+        /// Performs a lengthy operation and displays a progress dialog for the user
+        /// </summary>
+        /// <param name="caller">The sender that is updated when the progress starts</param>
+        /// <param name="mi">The method to invoke when the operation progress starts</param>
+        /// <param name="waitForAccept">True if the user should be prompted before applying the changes</param>
+        /// <returns>DialogResult.OK if the operation succeeded, DialogResult.Cancel if the user cancelled</returns>
+        System.Windows.Forms.DialogResult LengthyOperation(object caller, System.Reflection.MethodInfo mi, bool waitForAccept);
+
+        /// <summary>
         /// Edits an SQL expression, ea. a filter or label expression
         /// </summary>
         /// <param name="current">The current text</param>

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/ConfigUpdater.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/ConfigUpdater.cs	2009-11-15 23:34:39 UTC (rev 4345)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditors/Gdal/ConfigUpdater.cs	2009-11-16 17:19:54 UTC (rev 4346)
@@ -70,7 +70,7 @@
 			m_remove = toremove;
 			m_add = newfiles;
 
-			return m_editor.LengthyOperation(this, this.GetType().GetMethod("Runner", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance));
+			return m_editor.LengthyOperation(this, this.GetType().GetMethod("Runner", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance), false);
 		}
 
 		private string[] SplitPath(string input)



More information about the mapguide-commits mailing list