diff --git a/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs
index 2a38845..674d69e 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs
@@ -35,22 +35,19 @@
this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.edServerUrl = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnTest = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
- this.lblPreRelease = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// edUserName
//
this.edUserName.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.edUserName.Location = new System.Drawing.Point(100, 309);
+ this.edUserName.Location = new System.Drawing.Point(100, 186);
this.edUserName.Name = "edUserName";
this.edUserName.Size = new System.Drawing.Size(484, 26);
this.edUserName.TabIndex = 1;
@@ -58,7 +55,7 @@
// edPassword
//
this.edPassword.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.edPassword.Location = new System.Drawing.Point(100, 369);
+ this.edPassword.Location = new System.Drawing.Point(100, 246);
this.edPassword.Name = "edPassword";
this.edPassword.Size = new System.Drawing.Size(484, 26);
this.edPassword.TabIndex = 2;
@@ -66,7 +63,7 @@
// pictureBox2
//
this.pictureBox2.Image = global::AyaNova.PlugIn.V8.Resource1.LoginPassword32;
- this.pictureBox2.Location = new System.Drawing.Point(26, 369);
+ this.pictureBox2.Location = new System.Drawing.Point(26, 246);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(68, 35);
this.pictureBox2.TabIndex = 31;
@@ -75,7 +72,7 @@
// pictureBox3
//
this.pictureBox3.Image = global::AyaNova.PlugIn.V8.Resource1.Login32;
- this.pictureBox3.Location = new System.Drawing.Point(26, 309);
+ this.pictureBox3.Location = new System.Drawing.Point(26, 186);
this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(68, 39);
this.pictureBox3.TabIndex = 30;
@@ -83,10 +80,11 @@
//
// btnCancel
//
+ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.btnCancel.Image = global::AyaNova.PlugIn.V8.Resource1.Cancel24;
- this.btnCancel.Location = new System.Drawing.Point(26, 482);
+ this.btnCancel.Location = new System.Drawing.Point(26, 339);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(68, 41);
this.btnCancel.TabIndex = 26;
@@ -94,30 +92,22 @@
//
// btnOk
//
+ this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.btnOk.Image = global::AyaNova.PlugIn.V8.Resource1.OK24;
- this.btnOk.Location = new System.Drawing.Point(516, 482);
+ this.btnOk.Location = new System.Drawing.Point(516, 339);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(68, 41);
this.btnOk.TabIndex = 3;
this.btnOk.UseVisualStyleBackColor = true;
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
//
- // pictureBox1
- //
- this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(239, 9);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(136, 126);
- this.pictureBox1.TabIndex = 0;
- this.pictureBox1.TabStop = false;
- //
// edServerUrl
//
this.edServerUrl.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.edServerUrl.Location = new System.Drawing.Point(26, 225);
+ this.edServerUrl.Location = new System.Drawing.Point(26, 50);
this.edServerUrl.Name = "edServerUrl";
- this.edServerUrl.Size = new System.Drawing.Size(436, 26);
+ this.edServerUrl.Size = new System.Drawing.Size(558, 26);
this.edServerUrl.TabIndex = 32;
this.edServerUrl.Text = "http://localhost:7575";
//
@@ -125,7 +115,7 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(28, 201);
+ this.label1.Location = new System.Drawing.Point(28, 26);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(172, 16);
this.label1.TabIndex = 33;
@@ -133,7 +123,7 @@
//
// btnTest
//
- this.btnTest.Location = new System.Drawing.Point(468, 225);
+ this.btnTest.Location = new System.Drawing.Point(26, 82);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(116, 23);
this.btnTest.TabIndex = 35;
@@ -143,49 +133,36 @@
//
// label2
//
+ this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.Red;
- this.label2.Location = new System.Drawing.Point(100, 489);
+ this.label2.Location = new System.Drawing.Point(100, 346);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(410, 34);
this.label2.TabIndex = 36;
- this.label2.Text = "Export will erase *all* data on AyaNova 8 Server";
+ this.label2.Text = "Migration will erase *all* data on AyaNova 8 Server";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // lblPreRelease
- //
- this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblPreRelease.ForeColor = System.Drawing.Color.Blue;
- this.lblPreRelease.Location = new System.Drawing.Point(94, 138);
- this.lblPreRelease.Name = "lblPreRelease";
- this.lblPreRelease.Size = new System.Drawing.Size(426, 37);
- this.lblPreRelease.TabIndex = 37;
- this.lblPreRelease.Text = "Pre-release 7.6-Alpha";
- this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(28, 278);
+ this.label3.Location = new System.Drawing.Point(28, 155);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(181, 16);
+ this.label3.Size = new System.Drawing.Size(188, 16);
this.label3.TabIndex = 38;
- this.label3.Text = "AyaNova 8 SuperUser login:";
+ this.label3.Text = "AyaNova 8 \"SuperUser\" login:";
//
// Auth
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
- this.ClientSize = new System.Drawing.Size(614, 545);
+ this.ClientSize = new System.Drawing.Size(614, 409);
this.ControlBox = false;
this.Controls.Add(this.label3);
- this.Controls.Add(this.lblPreRelease);
this.Controls.Add(this.label2);
this.Controls.Add(this.btnTest);
this.Controls.Add(this.label1);
@@ -196,15 +173,13 @@
this.Controls.Add(this.btnOk);
this.Controls.Add(this.edPassword);
this.Controls.Add(this.edUserName);
- this.Controls.Add(this.pictureBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "Auth";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Export to AyaNova V8";
+ this.Text = "Migrate V7 data to AyaNova V8 server";
this.Load += new System.EventHandler(this.Auth_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -212,7 +187,6 @@
#endregion
- private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.TextBox edUserName;
private System.Windows.Forms.TextBox edPassword;
private System.Windows.Forms.Button btnOk;
@@ -223,7 +197,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnTest;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label lblPreRelease;
private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
diff --git a/source/Plugins/AyaNova.Plugin.V8/Auth.cs b/source/Plugins/AyaNova.Plugin.V8/Auth.cs
index 33d1013..c8f5480 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Auth.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Auth.cs
@@ -70,7 +70,7 @@ namespace AyaNova.PlugIn.V8
//case 3875
System.Net.ServicePointManager.SecurityProtocol = (System.Net.SecurityProtocolType)3072;
- lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING;
+ this.Text = this.Text + " (v" +util.RELEASE_VERSION_STRING+")";
#if (DEBUG)
edServerUrl.Text = "http://192.168.1.56:7575";
edUserName.Text = "superuser";
diff --git a/source/Plugins/AyaNova.Plugin.V8/Auth.resx b/source/Plugins/AyaNova.Plugin.V8/Auth.resx
index 35e3af9..5b9800e 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Auth.resx
+++ b/source/Plugins/AyaNova.Plugin.V8/Auth.resx
@@ -118,269 +118,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAGYktHRAAAAAAAAPlDu38AAAAJdnBBZwAAAIAAAACAADDhMZoAADwFSURBVHhe7Z0HdFTlFoUn
- lVR67733DoJSVURAxYqKooBKka6ASFVQFFBRUIoINpQa0mmhSU9CCR0SQgohIT2BBNDzvnNnJg55iIDB
- mn+tvWYyLcns79/nnHuHYMpf+St/5a/8lb/yV/7KX/krf+Wv/JW/8lf+yl/5K3/lr7u67FAp1A71RQNt
- 1A/1Qh1QDVQMOaP89S9YrqgVmoR2o2SUja7Z6ArKQHpfNNqLlqAx6AFUDrmg/PVPWM7OziY3NzcHR0fH
- 1nz5FYpHvyC5Telz0tAJ9C16AVVGTih//R1XwYIFTUWKFHF1d3cf4uTkpLv5RsbeqbLQSfQxaoEcUf76
- u6wSJUqYSpUq5VG0aNFpHh4eaQBwIxPzQpoMUWiivb19WS5NDg4OepG//qpVvnx5E8abSpYs+QKXlwBA
- KAE3Mi/PZGdnd41yE8j3asTXpsKFC+tF/vorVtmyZU3lypXzLF26tB8ACCXgOgAKFCggxYsXlwoVKkjV
- qlVzVLlyZSlTpowUKlRIMFPYydeZfDMBgPG6lJ3gYsWKNff09DTx/bkrf/3pywJAa0pAAj2AuLq6CvFs
- GEoqSPPmzaVjx47SuXNn6dq1a466dOkinTp1kvvuu0/atGkjDRs2NKDQ1/i9EqIAuLi4GPDwPTbxM5QH
- Ju7KX3/qqlSpkka/loExAPALUWwAwCQgtWvXNoy3mn0z2UKhQCg0mhLscAMmvtX/AaDfR2Fh5/9Musyo
- Xr26EwBxd/7605YCUKVKlYoYsAsAjB2pZaBZs2b/Z/LtyApD+/btpU6dOsbrqul8yxsBIPwcsdWqVWsD
- NMbPlb/+hMWOM9WqVcuVN302APzMJGAYVbdu3Vva9bciazK0a9dOKlasmNNbKACaMgqb9hFaOmrUqDGn
- cePGDiSP+QfMX3dniXihMIcli4cVrVu3zpsAkEEJEAVADWnZsmWeAWCVvp72C1pWtGFUALTZ1O9H/RdS
- SIDxKPBVIjEsP2n+ypN1LfEdNM3+ysXpha4mflD3WvInzydHfTjnrTce316vXt0MrdU0gUI3bkRyy5at
- 8hwAqxQC4t5oMBUA/Z5WAIAjrX79+g/Vq1fP8pPnrztel8+0NmWGmOyyYvpVzTo/sk92/MQPAGAzAMT+
- kvpJVuDaUXTuzdh1tY03X00owm4sUqSQNGvakI6/o9EA3sjEP6K2bdtKo0aNDND0eIOOlwof9V97hasN
- GjQYgCy/Rf66o5W9BwBi+5suh3dtmB0zZE/2hbeyr8RPlisJM+RK4odyLXmuHAt5V1568SEjkitUqGjU
- 4U4d6ss7Ex+WJfOflbGje5IEzY00yCsQtCGkxkvTpk0N6HRC0LJjA8AVRsl++QD8wXXpSGnTpUMOpbMi
- evhlx46W7LgJcuXCFLkSDwAXPwSCj4FgnoTsnCbvTXtOxozoJZPGPSI+K16TAz+NltCfhsv2wFfk+T73
- 0pjVFGLZGO1uZOqtSp+v5uvu1wmDei86cupxBj3AREMqRH8G9/cCAstvkr9ue6WHmkypu0xOGYeLzsiK
- fObn7Ngxkn1+nFyJmwQA75ICM4FgtmScnyNH978roTunyIGdkzD+LQnZ/qYEbxuJXuf6YFnwSW/Mry3l
- MUgNu9Mk6NChgzRp0sQAyQqA7vjcANStWy+pbt2G7evVy0+AO1oZBwEg2FDnjLCKcVnnBkp2zCjJjh0L
- BG8DwVQgmC6Zse/JmYPTMHoiehuNR2/K/q2jZP+W4WiIBG99TTate0G6dmpMf1DOiGqi+YYG30za9Gnk
- 62ipAGgKKABaAhQAPfag4yEjIOWm0aVli3oPEZnmfCVluOW3yl+3vNL2Gyqcvt/km3m0vmSdGyRZ0cOB
- gBSIHQcEE+Vy7BQ5HToBg8dZNBZh/pbREsLuP7hjGBrM1wNl76aXZMCLbaV06bLGuKYNmzZxtzoh6KFj
- a9zrwSAFSAHQNNCewwqATgVaajp3aiaRxwak/Jw2bOrV1AlFrqaOtfxm+et3V+ZuMwDpe03Pp+8zXc48
- 2lKyIgHg3FDJihoh2dFmCC5HT5Cow+PkyO43MfwNCcb40G2jJTx0tCSeHiUZ50ZISsQQOblvoIRueUkm
- vdHJPCHQteuxezVLjb2R4bbSna9G685WADQBrABoEujrXX8QqKb06tFa4sIHydWUEdlXkod9cyXl9cpX
- UoeYriS/bvkt89dvrnQAQMXS95i2pu+xl8yjbSXr7EAgeM0MAcZmKQQxb6JxkhE5ThJOjJXzR8dIwskx
- gDFarsSO5L7X0SBJj+gvx3e9KJ+89yCmlzN2q569U7Vo0eKmKaCAqPl6fEFru04aCoCeLNLbFSIdAW0P
- AtWoWUue69NeLp4bDgBj5EryqF/QZkBoeiWumulKyluW3zR//d9K+wnttjOl7TL1Sd9ldzl9NwCEtZas
- 8JfQAEAAgsghQDAMjSQRRltgUDElxGC8lorooYjUiAKcqH4Sf/R5+WZ+d6lerbxxiFjN59sZTdtvpYDu
- fG30dFersQqAmlu7tvYADbTRM15LAbA9CKSPGfxKF0mNfQMAaFqTVW+iN0KzkwZ3vnrBZHclsbv5F85f
- 1y8DgJ9MHmk77byQpO0CgEMt5fLpvpJ1ph8Q9JesiFcAAXPPkgaRrwOCrRSOwdz+KgKYSJ4T+bxkhj8j
- 63/sIbVqVmBmN5/z59sZx/D12H5u83VK0JhXQCpWrGQY26J5XXnu6TYy5JWOGEwyNK4mTk7O4unped1B
- ID0gNXZ0d8m88JZcTaZhNcT4aoAwOuJq0qDHr8VVt7968THzL52/fl1p2+1M6dtNHdJ22CUiSfvJTjIO
- NJJLJ/ug5+TyqRcBwZIG4YAQjtGaCob0usKhSfGyXD77InpeLkc8AzRPyP6AHlK/bgXxwDDrOX69zH2+
- QM3XiNdzCjo11KtbTV7u21q+WfCI/BTYV/ZufhkNlPlzekjN6iVJAE8mi+LG4xWAmjVry7uTH5PsRCaV
- ZNUUNBkpCG/JlaRRcdkXX3gx+3RZh+zz95t/8fyF+VvRRpNd2ja7DwFBDO0wSUZwbbl0/Am5dOIp1AcI
- MPXUC6QCu1thOPOyWUaZ6CeXwzE+nMeEP4uelstnnuD2R+XIloekdfNK4u7ukQOAntHT0c4KgM75Gvu6
- 6ytVKi+PPNxAFn3cTXYH9pGQLS8yUbyEBjBmvmocX5g3+1GpUb0sCVAi5xhArdp1ZO6sPvJz6gzMno7e
- xfh3zCAkTURAkDgq/srFV1/MOtfUIfvCE+Y34L++0regraYyaVvtgpEAAjJJ+t5KculIT7l07DELCE+j
- Z4xEuGTAYCtS4rRC8hSXT6LePOYRLh+W0zsekA73VCb23XM+8qWXargCYD3IU716DWnXppZMG99Otnj1
- lpDNfSR48/OyfxMAsPv3Bw0EgteAYIgEbxsm097uLpUqliUBco4CytIFL8kvqR/K1aQPMHwmUhgAIckW
- gpHx2QkD+oiI6UriaPOb8F9eqUF2yNQjLcguPW0L5qu2AsDOEnLp0ANyKQwIjjwil44qCI+bYTiuqQAQ
- J1VcP4npJ55Aj8nlk49yH8850Z3rD0rM3s7ycNeqjIBuOZ/s0Uut9Rr7zZo1l2ZN68uAvi3Ea2k32b/x
- cfSU7N/QB/P7on5IAXgFAAahoQAwXHZuHC79X+iQcxCoceOGsvq7QQDwEQDMQbMtILyHSIJEykEiPUHi
- WMm+OOpsdsLwnhJXzu5KQn/zG/FfXGmbTKbLASa71M12HyIxFAQAQSZKgYdkHrhPLh1+EAi6o4cBoZcF
- Bkw+ZituO859x3tK5jEasWPdeMz9cvlYZ4nff5881q0KE4D5c4J8W+Ncfo2aNaVN6zbSo2szmTu9g+zw
- 7iH7Ax+TfYGPy771TwPAsxIMAMEAELypPynwquwL0gNMQ9EISsEY8Vs5WLp0amakR8sWTWSj92gA+Azj
- 56KPLRCQBImUBO0NEukHLo4DAKaXhNfDs+MHdL4a97gpK2GE+Q35r63UjYaKpW6024kkdZNFCsIWZ0nf
- 34xmsItkHryfqQAQDmPsYWBQKRRHzMo01A09iHjskc6og1w+cq8kh94j/Z6owgTgct1n+6qWKy+P16oh
- S95oLvv8u2N+Tzmw8VE5tr23ROx9SqIPPCuxh16Q2MMvo1fk3MHBcnLfUDmwYxgAjKQUjJHQ7eNk/kcv
- UE7qGaem9wRNoAf4gilgPsZ/ikiDRD15pSexpqFJaDzmKwAjJDt+aAiXDbNie5t+ztphvCf/qZW6gdl/
- vak1lxeRGMoBwUHSd9WSjJB7JSO0A+oEDBh7UIHoaoFCxXXVYW4/zP2HOnJ5L5ftUBtJCW0pA/tUEken
- AsbOd8D8SoDwhIurTG9cSnYt70if0E1ig7tLytGeknGKMhL+FBPFs4ySL0r2uQGSHfWacYzhctRISQ4f
- LeEHMF+PQm4bK7s3j5NBA7tJ+3Yt5MjeafJzygKM/5zY/wzjAUDPXl4EgAQASACABPqAhDcxfyR6XeVH
- KpS7kvAf6wcuB5pMKWYNTQ20+zl1PaarckDQMlBWMva1kYz99zAVtEPAEHKfBYgOkqk6oLoPIDD9AKYf
- vIdLnnOgJY9pztdN5Y2BlcTe0VncAKAzE8AIZ2d5262ArB9bS1IOd6JkdKV/6EbP0JPGEQDO0EzqNBHB
- +BnZX7LOMW5G6UEmTIt9Qy7HjJfYY+PlwPaxpMAECfIZJaOHPSKxJ2fKtaR57Ho1fy6ag/n0Afo5hoR3
- MPstyb4wXLLjXkX9Jfs8gJ3v+0t23EtfXEuY7HH1wn/oBFJqAD1AgMkpJcBuSWoAhqsCLTJgAIDNhSRj
- d2PJ2NsCEFqh1hYg2gKDWZkhqjaoNeIxIRgfQukIaYIayuUD9WXCoHLi4eAsvRkDp7i4yBTKwZwqBSXa
- tzl9Qgd6iC70D5QXmsfLJwHgNACcUQBeIAkAQA8w6cGmKMvhaOPE1NsSe3SCHNwxXhJOvysXTr4rl+PU
- 8E/Qx+gjTJ+FZmL62zyXhvVME8k8WVoyj3siepwT6GRBuXS6bOal06VeubTPZHdJ//Xhf2Gl+BoqmeJn
- F5ribyeGrCBYYVjvzEhYi1LQGGHonqYIc/c2N6BIV+3juqFmXG+CAGZfQ1Qf1ZGskFoyY1gZeci5gLyH
- +ap3KQerepWRNAWIXiHzCOXjKD3G8R4kwaNAwEShY+WZviTBy+YDTZGDgWAYRo4mCejkYyfI5ehJcu7w
- 25J+7l25Gs9Oj8fwHBH98TMlK2YwU0pdyQhzRiazjtjoqIkEMnQaNUf/jZXqw/jnY9c8xdcuAYkhP4uA
- QSFI9raXhNWlJf2nuqgeo2EDQGhoUSNJ323RHm43xGP28GbvqYNqcl91ydxXVdaMLyXvuLnKHMyfhWZ7
- uMr+qTXkchjl4jDlI0ybRkbOYw8DwCMA8DgAPAMAz6N+khUxEA0CAj3sTBmIegMIaOZi3qYcTJas88R7
- 3AzEyHfhfYve4/Ev8NolJOMgRh9Ch21kCwIQWPQ9Koj+/StlnaG+Kd522Sk+mG6VDQxJa+0k6nN3GsJq
- kr4NQ7eTBjtqozoAwaUhru/kcif37eQxO6tL2s5qqAqqBAjlZf/4YjIP0z91dZW5NH+LyntK9OqGcukQ
- CXCI3iGMBpOmMm13N57Tg8vHJG3vk/QRpMCJvpKlKRBBGYjQ8w3DgYAUiKKRi6amA0F27GQ0lbIACOff
- BYTpPGYgRhenD8HYAxYpCDeH4TJ6OfEgPdK/OQkkyGQ68oWDKXWd3YyUdZit8rbIBoRkLzuJmOlACpRi
- LMRQ1daqCIO3KRRoe9UcpW2vjCqiCqi8uYncWUr2DSskCzF+AQB8XsBV1rQtJsnbmhrNYubB9pKypZNE
- L3xWIj57WyKWzZXIVV9K5JqlErVunsT5TJCUHa/KpaMDAEDPPQxF9AKR9ALngCCKfiB6AiBMtIAwhTIx
- BlP5mYJNkh6CFILfAsEWBnOJ2I8qoX/vmjvEZOrd3lTg1DK7b1IwWY3OAcEWBhQxkxSY50YKlJHUzeVQ
- ebOCKhhK26LC7C3lAENFbd9aGpVExVAR2fGMhywp4CZL3NxksbOrBD1BWaGfyAxtJSkb20nkvBFyfu8+
- iY+OkQsX4iUu4aKc5zI6KkbOHTsmkVsDJMZrjiRuGkGpsJyRNCAgCSLfAAR6gihKQhSJgC4d7yzp++0R
- 5isEVhCQAUIODHYA4IgKAIAL5ruqfs4Ic3knI8zOMSPsX/rHSIoVNC4KLxxptzlpDQAQ9YasMFiAoEeQ
- cx/ZyanJDpLsW5imsCQjoopE2FgaKFRcR2mbMHxzCVQcFUU8PqiQJPl7SFAXN/nWBQHA1yTAvtfKM0HQ
- UAa3kNiF3SRu505JSUmRizExErt3r0Tv2AEIFyQuLg4QLkgsl9HhZ+Xc7h2Ujo8kaeMw+gSFgHJwduR1
- IOhp64zg4jSoGL4PKQRW5cBgRypg/AGMP4jpB92BoCAQFAaAoqjI2YzD7o0zwjyNN+rfusp0bmw6eWwR
- Rqv5q5HCYAXCAkHM53ZydLSdxH/vTGNYCBVhQlAVBQhVEUlRbSiMuH9DQS49uaR32OgmCatcJLCeq6wA
- gB8B4Ed3Nwl7syKjpI6XTSV63iOSfDpCLh46JOGzZ8upqVMlZsMGSUxKkoSEBIkNC5OY0FA5HxtrBuHU
- GYn0XSNxK8djGKNhBI1hhIJAIpwdJZeOdKT5ZPfvxuQ9FikIOTBoMjgAAgr5VRkHFAgmBQXikCdy//TS
- IZNz5qF/758kqufoYIp79WGTRH8LBGq8QpALhAvL7OTICHuJ+hQgfArQG7jTIHpYxHV/lRsjpMoVuZgV
- qAAUlLivC0pgBXfxcnUTLwDw8nCTY+MrYD6j4t4mErf0AUncu1su7t4tcQEBcmbGDIn88kuJP3JEEsLD
- DRjC582T6K1bJS4qSs4DQUxMrJwjNWKWT8GoQYyKgHDmdSaHVzCXcrQTo3dhvEpBUCD2YPQ+J1QA812Q
- K8ZbxW0h3BfiSDLkwHA+86Bjm4wD/14AGqP4Ak4mee1hOzmhSYD5KQrAql9BuLicBBhlTxlgKlhlL8nr
- HOkNnH6Vj1Xc7sulnwLgSSoUlrSNRSVmfhHZWMZD/N3cxc8debrLSQVgN2Pj7saS5N1SLqz+QrKzr0jG
- +fPAsFfC33tPzsycKRFz50q0r69Efv21nF20SC5EREg8qaDlQUvDuaAgift+OJPCK5g/iEbxEcx3kbSf
- TFzaIXtJ2+UoaXswfK8H5hcieYpgfjHMpkyoQrkeWhQVQjwmhMcqCCFAE2r/OQ2ks/5biX/jKoICkZAE
- ck9dk3z7hp2cXQoEAJCO+ekkQOpKOzk5wV6OjLSXC9x3437BHgCcjVQwl4jiRr+QRo8QO7+4bAWATQCw
- EQA2AsDp8VWNA0rpO5swRjaR81/2kNTgPXLtF5GstDSJXbHCSIOor76S6JUrJeq77+Tc8uUSHRgo5w8e
- lAskQVx0tMSephwsnsXufkkunxpAc9eCyQPjjU81Yf7OAoyUngCAwftKkg5lML+cZIQAYCgjqiHKUSg9
- yYEyXPIYA4aCFhAcojOC7Zog4w37N66OKBwZZ+g8XU3Srp5JRve2k9kD7WTOK3byCdr0mr2EDbWXyA8x
- XdPBKBE0hmudgMBFkn2o+37FMJ8GMZBpYT3TgopG8fy8EvJTGU/Z6u4hWwAgyNVdTr1ejfi/h4hGu9sy
- YraSuCXPU9MPyLWr1yQ7M1Oyr1yRzORkyUhMlDiMP7d0qYTPmiXhc+ZI5LJlErFwocTs2StRa76TlM19
- 5fLxZ3ktRtBteg7DAQDceP3C3Iape8thfiXMZ2wNqYnRtVEdTFfVZhzltgPVua2yGYbQUkCgSeH+S/p+
- 51FJwe6mrP3/zr9Epmg/iPYg/QueOadrHez1gxsm8ShgkrkPUQZet5cT4+0l4WvMN3oFNb8g5peQZL8y
- xH456n5FQ6mBjIkGCGUk/qtSsrOCGYCtHkDg4i4nBlShBCgA7THoPnZwB0ndeh/9wPOSsitIfs7Klp9/
- +UWuXgOG7Gy5lJ4u6TSFKZGREr9rl8T6+0sEfcF5BeD7z9nxfeRS2KMYz27fws7fjvk72cm72fF7MH4f
- 5gZjdkgDzKX5PMAEcrCZRYyjBxujhqgu99VACkJZYKE8BHtuTN/vUih9vxtvy79zKQT615X07/b6oxiU
- ivRPuF5zdTJd++Qhu1+ODrOXo5SBc7PY+SudSQA3EoCd712M+C9J/S9NCpRFwOCvQHCdFEhcVU72Ny0s
- W9wsAJAAYU/qTm2LSQCw816M6oBRndm1nSV++aOSsHaeXIoIl2tZV4yycPXaz5JFIlzOypLMy5clPSND
- kmPPS9ze/RK7bCg7+EkM62h8hiF1qytAYNzOspQZQNvHbt+P8SGYHtoSk/Xoo56qbi+Zhy0yjki2Qs0M
- EIxkCKVMhVAugotfzAgu0hbxdvy7l4Kgg6/+fRX9G736p1kHlnQ3DfXuY3/gCAlwdJSjnHrbVeIWupMA
- NHprC9EDFKUHKAEICgHGGxCUB4AKiEQIqCTH+5WSbQU9DQgUgNCOPG5Da+p/OwQAu3R064RhXQylbLhf
- Lnz/nMSv+lCSdwRK+vEwyYyOkcz4i5JxIUFSz5IE29ZL7LdvSsrWRzGxNwA1kdTNjpK6jeZzR1mavyrc
- hpF6cioY40P1VHUHTNbPLdxPYugnnR6UzLAHkN6mn2NoRyK0QpoSpEEIEAQD0v4SEyW8oil5V3Hekv/Q
- OjrE3nR8qL374cH2a8Ned5CjY1zk5FvuEj69oMQvZe5fg/lexQGgFABgqg9lwBfj/SpJqn9leoIqlIKq
- pEBNOTOmsoTcU1J+qlBIgtuUkmTfVpK+AwB2AMBPJMDOToDQGRAUgq4GCKlBXSTRp7vE//g44+QLaAh6
- Hb0siV6P8NiHMPZhEqAnr1FdUjfp2Uvq90+Vea3a1H41vzW7WT+roB9ceUguHe5plItLR3pbpNd7ifGp
- pjD9YMt9AMBzDjTheVo2qkjavjI7Nywqon+EUBsBlW6Wf29naF2HB9mr3A8NsvcKG+Ykx95wk5Nve8qZ
- aUUk6qPikvgj9X8tZnphvjd137uCpPpgvC/G+1UFgGoIYzbUxZxGkuzdmB6ikVxY0pjd2oZabQFgBwD8
- RAooBDuBYBcQqAwYumAkt1EizPd3pIHsJJn7MWs/u3d/N+NSD0OnbvIAgAq8Vg3gaMTj2M3BGHpAP7nU
- w0iKS0eeZlx8Fj0nl489j/S63qb39TQnwqEOFggAKKQWAFRMOeVXqhtvSQGkfwFdL1V6kMAWin/Xug6A
- 4c5ybCwd/MTCEv5uMTn7QSmJ+7I0vUAZACDy19H8qfk+GO+H6X41SIGaqBYpUI+JANM3NaNJa4lZrVFb
- 1A4I6AO20wjuAIAdGEwfYECA2Rkkgip9l6YD2o359AuG9igInSVzH/G9lyZyY1Fen85dT0z9VI/H6GcU
- 2mMg5pMQmYefYOc/J5eO9WNiGGA+dmCI68cZI4Hh0tEneQyP1Y+6GZ9w0g+31KeJrEbJKfc+b4l2giqF
- wCr9U/YKg/4fB/oHrBUGe/TPB8IA4DU790ODAWCEixwbV1BOTS5KCSgpZz8sIzHzyknSKsz3otavq0IK
- VKMM1KAM1KQM1EJ1AAAF1mciAIANzTCJWX0zAAQBwBYA2NoekQLbSYHtHQECAUOaJoJV7Pr0nVomAEWb
- Rm0edYLYxe5mgkgOaCzx37mQKox822vyHHbunjYkA4CEaIl4nOhnxx/tj9mDMF3PJYxAIxHXTww2oLik
- EBwBlMOkhX728UBbAOC19vO77KoQ/N37HvpXKG8GgRUETQaF4Z8Nwq8AOHiFjXST4+MLy6kpxSViRmmJ
- nFVeoj+tJInLKwEA5nthvjfm+/Bm+dbB/LqInR+A+QENgMACwMaWQAAAmwEgCACCAGDLvUCAudswWQUM
- aYbuAwa+3qEJoaUC03cwPu5ggtjRBqPv4TGtJeaL4nJ2JtOJf0lKgH5WoRklg+5+H3Ee+ohcOqhj4svs
- cow+gemnxkrW6QmSdeYtuXx6HF+P4vYhANDfKA+Zhx8DABpE/axjsCZJXdKncnq4b5FHeVvUbHd0MwhU
- CoFV/8xUsAXgyEgPOf5WUTk1taREvF9WImdXkOjPKsvF76oyDWC+F+Z7Y743xvtgvC+m+zUkAVBAI0SX
- HggAGwBgIwBsBIDNNgBYZYCA8du4niMesw2zUfo2jN9GA7mtJaC0lIsrK8vZd53kzCQHufB1UR5TDwCI
- bi0T++gPQtn9h/rK5SOvsstHSNap8Rg/RbLDpxvKCp8KDICgaXD8NRLgRaNcZB4iOfST0MH6WUjGyN1V
- JX5ziU8qlDQmJQXgRhDYApAbApW1RPwzQLACcFgBGOUpJyYUl9PTSkvEzPISOacSAFSXhG8wfi3yqk0Z
- IO692fE+mO6L6X7sej+MD2hqUXMgAABGwNSNNIGbMHUT5m5GCoJVW2ylZYLH0TOkbm2DWnFbC0nf0oxJ
- ooZEf+QqEdMcAcBRIj90l5T1mgCMmNov7MPEkKcA4EWMJfqPjwGASRj/nmSfnSPZkR9JdsT7ADEZAN7g
- flLg6EsA8BQJQC8QSg+yn9fa25DXqy7J20qFrf7AWf9fIzX7RhDkTgFrOfhngmAGwGROgDEF5cTEUnL6
- nbIS8UFFOfdxVYmeV0Piv6nFJMDO98L8dZjvjfk+GO+L4X7seH9MVwW0MEsBWA8AGzB04z0IgxUCKwg5
- 0nRQaakAliDtG3huEK8VhPn+teX8554SOcOJBHCU8ClAMNlJLnxbkWSgg6dpzNxLLQ95GjP7AcAQDH4T
- AKaw6z/E/M/MipgFAFMBYCz3v87jXgYYnkPjmBEMAPsoN3sa0W/Q1G4vk3l6jdszvDXWMnArSfBbEKj+
- 3iD8CoAjABSWk5NKy5l3y9MAVpZzn1SXmM9rS/zX1PvVxP7aBiRAQ0pAY0oA5vtith+GqfxbYT6mG7Jc
- D2Q3rweCDe0MpRkgmJVqJIMK8zdpUrDrNzE9bML8TU3Z+bXlwqJCEj3LUaJmOhkQ/JoCBXm9ZpKhU8Qe
- EiCYBDhAAhwmAY6SACcnYTgJEEECRHwEDCTAqcmSdYIEOEoChJEAB0mAUBKAJjJjr6ZJQ5rS6vQbZSQ+
- 0HNhm7qmQrw9tgD8EQis+vuBYADwqsn98BAnr6NvFpOTk8vKmekVAaCqnJtbk+arLnN9fQDA/LWNSIGm
- QNAcADDfF6P9MNoPA/1RAGYa0utmpaoCSYH1ZgjM4msjHXiM0SvwOto3bMD89U0keXUViV/oKec/cZKY
- 2U4S9YGTnHs/dwpUowzouEgPsI8eILQvu5oe4Aid/zF6gJOkwGnqv+oUu//EWzSAI9n9r1H76QEO0AME
- A88+INpNv7GzAc2ofhaSsXeTx0m/Wfb6t2jVcA9kC4EtAHcCgSbC3weC6wAYV0JOTikvZ2bQdM2uLlGf
- 1gaA+vQA7PrVmL8W871aAACGeWO8D+b6YqYfpqr8ifUAq9jdNjCYQVBhvKbCeq5rmVjPa63X0oHxXjUl
- 6bsSkrDQRS7Mc5a4uc4S+5ETKQAE16WAAylQyHyoeecDpMAj7GSmgFCNdqaAIzR7xzTuJyCav+NMAUf1
- k0Ts/sP9Mf9Zov8xav+DPJcxc1dzYGIK2KYfii0pSRs8snYtdHiJt0cNVgBuBsGt9gS59fdIA1sAjo0r
- CQAV5cx7VeXsnJoS9VldiV3YUBK+bSIpqzB/DUZ5Ydg6zPPGeJ/2AHAv5t+HOgAAClDxdQCdvSEi3wJC
- qj+G+2u54HW0Z/DTNKkjST9WkMRlReXiYle5uLCAXFxQQOI/d5YLnzmbU2COJQXeIwWmkwJTrSlQg1GR
- CN/5MEY+jqnPEesYfHAQRjP7h5EGYcAQNpyvBzMqDuD+5+kZnsD8HjynCwDxs+1ozGRRC/Mr0pcUl6QA
- V/lhqr3+d3h6duhGAKjupDHMLetxhL9uGQC8ogA4ex0bX5oRsLKEv19dIj+qDQD1AaAxAFCTVxH7azB/
- Lbt3HeZ7Y7wPRvt2xMhOqDOmogAVXwdwuwGDQmBJBMqEuWfAfN/Gksx4d/FLD7PpC50tl2YlLACA+b+R
- Au9YU6AwEwEpsON+IKCh26PGAkFIP4zG7AOvAMMr9AcDSAfqfgjmBz9Jze9F7JMcu/TYA6PmNhrbLdXo
- PcpShgpJ2npnmTXU/ije6EkzKwA3giAvksAKwV+TBjkADAWAt8rIqXeqSPjMmhL5cV2JmtdQYhc1lYvf
- EfurWwJAG8pAO8oA5ntjrg9G+3aWNL+uv8r/frMCutjAoOmgSaHlghTw5bXW1pfEJZ7XmX6drksBZyMF
- okmBSE0B7QWsKfBNdUnX4wrbMfQndvXu3hj8NJ39s5QFYNiP6cYlt+3lvt2AsovH6lFHJom0rez+Lez+
- TRUpRSUoUR6S4O0or/RyysRDnQbUaD0ucDeTQPXXlARbAI5PKAcA1ST8g9oS+Ul9if68scQubi4Xv29F
- CWgNAPdgXHsAwNB1mOuDyb6Y7fsA5j+I8RYFWGTA0NWcDFoerBD4tpak5RVvbLyNEr6wpMCnNilAM3hd
- CnxQUFL8m0n6Fj241JUd/RAgqMmPmmEwpNd7MeZ1p9brY/SxJMeWJkR+HZrQKphfRlL0E9F+znJuhYN0
- aekmzi4e+t/hqsH6IfvfgsAWgH8eBArAIQAIe93F6/jbFeT09BoS8WEdJoCGEv1FMzn/ZUsAwPxVbQEA
- 89dipBeGemOszwOY2Q09hLndDaVZFfAQ6pYDQqofsPhpuaBseLeSxKXFMPn62L+R/i8FPrT0ArYp8HVl
- Y5LQ4wrpW9jZW6nt2x5ghz+I2Squ78B4PQexjZ5kC48NasIUUofIJ/oDy/GzF5MUXzdJ93WQoI+cpXL5
- QuJZsPAM3iIrAH8WBH/ulGAAMBAAhrl7HZ9YSU7PqCURs+rJuU8bA0BzOf9Va0lcjvmriP7VmL8W870w
- 3xvzvTHeB+P9HkY9eBN7YLatHkaAoKngRxooBPQMKWtIlcXW2n9z5fQC1hTQsTBXL3BuXpmYlIBGl1PX
- NzWDsKmtpCsMQfQfxuFnepAgepAghaQZj2mI8XUkJbAq6VFOUvyKS7K3Bw2po1xc6yDDn3SXosWK6V8p
- ncZbpAZbAfj3QWAAMMAMwIlJVQCgtkTMbiDnPmsi0QtaAkAbAMD8Vezc1dTztZjv9aDFfAz27Yl6YfIj
- vypApbdxHxAYyaAlAghSfbvQ/DWUi4ssHf8tKOEmKRBBChybUdwryafO6VQ/TPU3n5RKCwSGDZhtSK9z
- 23q9ry49iZ7GrozxZTG+GOOnh/Hh17R19uIzw1VqVi4qJUuWyi5UqJB+hE6N1oNC/04IfgXAAwCqyun3
- 60rEnIYA0ExiFraWuKXtJPGHewGAnbu6C7uXne+F+esw30fNx2y/R9FjmN0b463Sr7ndv5eRDKl+JIUv
- 4NAzJP1Y94ZG/5b+LwVsJoKzpMC+ca6fbphVbcWFlZX4mfR0dU3ivLb5VLWh2qgmqs73rwy8+tkG/ZBL
- EYx353fCfC8H2TXXRTo2LywlS5XWv04a6eHh0ZK3SA3X/7P2r4Lg7o6JOQAMB4DJ1eXM+/Xl7EeNmQBa
- SMzithK3rL0k/dABADoDwAO8WWbzU70x1geDfTHb73GMfsKsAFtxnz8g+PFYLREGBN1oAGth7O/Xf1sZ
- DWHuFNCjg9MdZf9Yxw9qVSv11tg+JX858HlpfsZykq4fXllXyZB+kCVlnZpelga2FH1MUR5TkERzkbTV
- jnJhuaOsnuQqnZoXkhIlzf83Qfny5efz9pRAar5VuSGwAnA7ENwOAKq72xheB8CUGnJmZkM5+3FTiZrf
- CgDaSdw3HST5h06SsrIrADzIG4eJ63oCwKMA0BtDMdrvKYx+2qwAq7jNgEDhMEOQphD4dpek72tj6m0C
- QArEW1LgvDUFdCwkBYLHO3xgsnPv4enpkdKsdiEZ/0wRWTWxmByYX1wilhaXmG+LoaIS/W0hif7GQ6K+
- dpEzi51kz0cOsniEk/S9302qViiC+aUN86tUqbK/VKlSzXh71HQ9GPRXQ3D3UsAAoD8AjCzkdXJaLTnz
- QSMAaC5Rn7eRmC/bM2d3lOQfif6V7P7VmL8W870w35vd7fMkCYDZfs9gch/MftZG+rUFBH8g0BKhEPj2
- AIA6mHp7AKiuSwGaQWsK7B/vOItNUtvB0XGbg6OTODsXkGKFXaVqWVdpV99VerR2lYdbFZDuLZ3koRaO
- 0q25g7So6SiVSrtI8SKeUrhIMSlduoz+ifpMAAgqXry4fmJajS9q0d8BgruTBArAwZdN7kdGF/U6+U4d
- OfNhYzn7SQuJ+qKtxCy5Ty5825kEYPevZNxbzQ5e+wgAYL435vuo+Rjt/xx6HrNtxW0GCAqHBQJfIKBn
- SL5TAGxSIPbjX3uBveMcZ/Or6Cd6O9nZ2S2zt7ePtrd3uGpn7yAmu19lZ+8oDo7O4lzAVdw9ML4wu75E
- iazSpUufJ/JXVahQ4Xl3d/eavI6aXsxy+XeB4O70A78CUAwA6kr4rKYS+WkriVpwj8R+1VHiv6Nr/4Hd
- v7I7CdCL+vkYJYBo98Z8H8z3w2z/vhj9AnqR7tsq/VpvVzjMEKRqvwAEyd/Xw9DbB0CVkwJzzb2AloEd
- bzpO5Vcph8oDQFUHB4cuTk5Oo5ydnecjfxcXlxA3N7dQmrrQggULhhYuXHgfI54v+rRIkSKveXp6tuNx
- FXi+1Xj9xwGq24XA2hjaApAbgj/aFOZtChgAvAQAY4p7nXq3HgA0A4A2jID3SuzSTpLwHbv/x26SsqIH
- ADwKAI8DAGZ698FQzPfDaP9+kh7wkqQHvmzRSwCgAgQrBJSJVL8nec7jNJWNb2jurej6FHDWFLi2ZYzj
- OH4VBaAiUiP1ehlgKEca1ACG+gUKFKgPCPVcXV3rcVnH0dFR/wfqUkhN1mavpI306zuF4EYpkBsC1Z1C
- kLcpcB0A0xtI+OwWEvkZACy8T2KXdZaL37P7f2T3r2D3r6bpW4uJ6zDTG/N9MdgPo/0xPaA/xg+wkX7N
- fQH9zBD4KQRPG01j8g/NMdPl/8y9VVlTIM48EVzb+mYOAJWQFQJVeaS3l7WRlgpbKQRW2UJgBeBWILAF
- wHY8zA1CXiSB9gJ5t34FoITXqRkNJXxOS4mcd49EL+og55d1pWGj8/+B3b+Sxm81u38tJnphpg+m+mKw
- X38MHsBufwW9KunrrRpohiDgZTME2iP4UjJ8npLkFffIxUVuNzT3VpSrF7i2dazjeH4VNVsBsMoKgS0I
- VikI+m8lrboVCFQ3g+BWewLbFFDdLgR5WwasABx9oxQANJbwj1pL5Pz2Er24o8QBQPJ3xP8PdP4rqP2r
- if61mOiFmT6Y6ou5fgMx+FXMH4Tpgy3S668hQAgEBIXAn7TwVXCekZRVnW75UPBvyWYiuLZ1nAGAGm0L
- gG0S3AgCWwBsIbAFIDcEd1oO8hKCvG0GFYADL5rcj40r53XqvSYGAOfm38sI2FkSvn4AAIj/5XT+K9j9
- q9n9azHRCzN9MNUXc/0xOgDTA4dg+FD0uuWSrwMHG6mQRnlI8yctfEkNn2cldU13SVxcCCPvrBFU5aTA
- XOdr28Y7WQHQf9RxqxDkTgHbcmALgG0/8HsQ/FZTmBuA3BDcbjnIuzKQA8D4Cl6nZjaTiI/byrnPqf9L
- OkvS1w8CAPG/nOZvxZP0ADR+azHRi93vQ+z7Yb6/mq+GD0PDzdrA9Q1WEAaZE8IfCPw0BZ7nNR6VxCXF
- MfLOAVAZKTDP+dr2CTkAVLHoViHInQS/BYHqViFQ3W0INAXyZhkAvAAAb1XwOj2zuUR8cg8AdJC4JYx/
- XxP/3/UEgMcA4CkA0N37Ak0gu9+Hmu/HDg/A6EA1fgSmj0SjLJd8bUABBIGvAQClwk+fx/O9npTEpfp5
- gD8IwIICeo7g2rYJTvofBqrRVgB+LwlsAcgrCGwB+DMgyJs+4FcAKnqd/qAFALSTc190lIQl90vysock
- 5Vu6/+WPMwkQ/6t097L717H7fdXUoQCg5qvpoyV94xj0huWSr60QaHnwJwW0YfR5EYCelaRv7uxgUG7F
- f0EP8LbTBH4VNdoKwN2C4GblIHcKqKwlQQH4LQhudqDoZhDkTR9wPQAtJWJue4n6giZtCfV/GfX/W+J/
- +RMkAPG/it27ll28DjN9hwCAmstuX4/hG97E9LEW6XVAUCg0GQJJCX9KgTaMPvQC3n0l+fsWNzT0dkUv
- cG3bREdNADW5GrpTCPKqJ7AFQM1Xw38vCe4EgrwGoFIOANELOlOjqf/LekgyACR/T/f/I/G/ihq+lt2/
- jt3vS7T7q7mYv14NHyfpm8ajt8yXBghAoOmgJcIfYPwAx4cUWPeiJP/YkVHQ/Yam3o4oA9e2TzJKgBUA
- PcBzMwhsAbibEKjJapzWazX+j0KQG4C86QMMAJ43uR+fVMPr9KzWAMAEsKCLJH0JAEt7SvI3vQ0AUn58
- DgD6kQDUfm9qvy+731/N1Z2O+RsnSMamtyVjs1kGCArFBoVgJGnxurlseCtA/SRlZU9GwT82CVh0bftk
- owSo0QrAXw2Bxr4aaN2hWqvVTCsAeZUEeXM8QAEIBYATk2t5nZnVVs5+2kFiF3SVpMXdLABQ/79ndv+h
- r6SufNkAINWb2u/D7vdn9weqyWr+RIyfZKOJZgi0NKwfDQDDAQBwvHn+upeMYwqJS8pg4F0B4K+AQM1X
- c9Wc3Mbo2KZm246JeZEEf7wMGAA8BwBTanudmQ0An3WQ8wvuB4CHJPmrXgBA/f+uDwBQ/1f1ZwpgF6/T
- 3Uzt91dzdadj/qbJmD5FMoKmIi438/VGkmAD5WA9KeBPCmjf4P2qMUWkrnlOkpbVxMA8BaA6uhkEtgDk
- huBOjxYqBNoAqlk3M0SNvNXjBLcKQZ4B4AEA687MvscGgIcleQkN4DIF4FkAoHtfSXyvYRevG4aZNHgB
- 7P5ATN6o5qvx0yRjyzuISwVhE0lAaUhfTz9AudCykeZNM7hOQaIP+LbljQy9XV3bNskAQM1WAP4sCFRq
- vpp4Kwdm9DH62NwQWAG4Ewj+eAk4NMjOFPKsyY0eYKU5AToCwAMAQAP4FfP/Mur/t88BAPV/JV38Gnbx
- OuLfl/gP0N2NyZvUfDV+OpphvtSvSQRNh/T1gKLlwk8BACCvAQDQT5KX308j+AcPCS8okBUwzkn/KzA1
- 2wrA3YTAWg5016spt7oL1Sw10nY8/CMQ5FUTaDJt8DDZHZ9Uc67RA8zrJLELH6QJVABoAL95mh6A+f8H
- 6vZKGkADAOLfl/gP0BrP7t+kOx7Tt76PZpovFYLN0wBgEinB4wLeIAFGAADP9xpID0Aj+ONjNIK39u8D
- fkvxCwpkrh3l9Cq/ihqtH+a4VQhse4LfO1poC4HWezXqTg7Hqmlq+B+FIG92v64TQ9C0+qbjE6uPOTOr
- jRmARQoADeDS3pJiBeBH6vYqxrg1NIDr6P59ifUA4n899X7Tuxiu5n8gmds+NC4ztrxnToGNpEAgZSDg
- TaNvSFunANAIrgaoH5+RxK+qYmSeAqDSv/CR1xDozlfj9M2/02WbAjeCwNoT2AJgC0Hemm9dJybXNB17
- q8IjAJBxdl5niVnUzQIAE8B1ANAArqUB9Kb++2r9p/nbwO7fpLGv5s+2aJY5CTQVNk4FEkDxHwsA9AHe
- rzNJ0AiuellSVvSVpK/1swE3NvdWpACsGeX0Gr+Gmm0F4GZJYAuAygrAzSDQyFdj/njTZU4ONVPNtjU/
- NwS2ICgAan7ejH6514mJ1U3HxparcfqDFucUgGgASFzCBGAAwAj4PSNgDgBaxwHATwHQJo9dHvS+ZG7F
- +O0fW/QRAJAEQaTARsrAevoA/3GMjoyDTBA6SehImfJjXxrBrn+oD1AAVo80ANBdXwvdCgQ36wkUAisI
- Gv26U/Om3l6/FCZ9XZ3t1Vw12Wq2VXq73q/Q5L3x1nXsjeKmsMGOHqffb+KjAEQt7iYJS6wJYAWAzn01
- HTwApPvQ0PlT1wO1/hP/QTPZ9XMkc8dcyfzpM/Pl1jkGGAqIgpLuP94MgNcwXscCwA99mTC0DyiJmXdW
- BnIBoP+cOzcEt1oOckOgHb4akBe7/laWGnwj3f0VRgW9sGGc6dQ7dcac/bTDL1GLH5ILS3MnACOgAuA1
- HAB0rgeA9QqAdv7Ev+58zL+0c74Zgm2kQBC9gN4PKGYAxlgAGCSpK6wAPCWJX9758QAFYNVIJ1rZHABy
- Q/BbANwIAu0JrLv+j9T6f946Ma266fjbZRuFf9w2WgE4v6yXJC0zA5D6/QsYpgDoCKcAWBLAaAC1/n8I
- AJ9IJuZf2rWAy3kGEHq7AQCPMx6vAJAgqasUgP6SshwAvu0jSV+1wsxb/7eCtlIAVo5wGsyvoGZbAbgT
- CHTXa4evu/7P2Xl/p7VtiKdpzWOmAsdmNFh8btEDEvt1L0n8+nYAIAEUgN0LjUsF4lcANAEUAEZBnq9J
- oiUlhdfV109a+gBm6nmBG5t8MykAK4YbCaCG10G2EFgByA2BLQgKgDZ62pH/WXH/91w/L2pg2j66bIeI
- z+49H/tNL0n47lZLQO4EUABsE+C3ACABeP3kpY9K4qIKGHr7ZeDCFwVS5r3k2IcfXw2vi2whuFk/oNLI
- 113/34r731rznnA1PVfTVGDvtAbTo5d2v3Lhh8cl+bubNIFWAKj12vkbtV/N10udBKw9QA4AlhLwfwA8
- IYmLG9zQ4N9T9KfOJ55ta38fP74arwD8HgQqNV9rvY5j/+1dn3udmt3A1KeVZ7W9s9qtiPuh98+JP9xo
- DNTDuuNp7nQMtEwBdP2Z2+n+d1imAKYCvd24X5tAHq/PM/cATAG8ni0ASYvbY+jtfz4gdKrTssIupkb8
- 6FbzbwSBymq+dvl66lbHq/z1G8vl6XtKtTn0eTe/hFXP/JKsp4JtDwStsx4IAoANesxfjwPMwnQ9BkAp
- 0H6ArzM2v2fcb4yBPF6PH+jz/x8AkubLBzG0KLr1MhDzifO5d3rZ9+bnVcPrI/3jjr8FgO56PZr332zy
- bnPpG1TqiXZlOx9e/MjapFV9r5gBeNUCwCjzgaCAt81HAtVo7QP0YJAeD+DSqP8GAFN53EQeP9Z43vUA
- PG+cazAAWNwdU2+9D7jwWYH09cMcp7k4mBrws6r5VuWGQEuANnp6vv5Ojt//Z5eecarUoXHp9rs+7fV5
- 4g/9UtNyzgVYTwZZzwVoH6AngIDAIiP+jfqvIyCP87UAwPNTV75qnFxK+c4KQG8A6CmJC2/teMCFz1wy
- to4sMLtqYTv9N/wKwI0gUPM18nXX6++Sv+vvYGlc1qhQ0r3FN2/ePzR86UtBKasHX07zGiFp1klAjwbq
- 4WAdBykFhvEKg36tt+c0gG8CAM9bM8Q4q2gG4DlJ/vop47SzGYD6NzQ8RwtcJPYjtwuBQ9ymVytq35yf
- TY1vaJEtBGq+HsrNq+P3/+mlx6c1RhveU79Cuw3vPzn1/A9Dw1K9x2Rn+I8HAD0hNNXc7Knpm4h9w3y+
- zol/HqcNoDECDpbUFQMldfmLxgdNkpdZAehxUwDi57tmnZjuseWzJzz6uzna6f+JrKZr82cFwAqBjnr5
- cZ+HS6NTz1DpQZNGjg72TZ7uWK9r4AfPTTq7fPiWJN+3EkmBnzO1F9Adr8brpX6tuz9ggjn+jQaQCUJH
- wBUDfgXg6ycB4FFJWtQdAHKfGnaR+M89rkTMKnzQZ2iRKW2rOLfnZ1CjFQA131Ya+3r2ToHN3/V3YWk5
- 0MOlhgH29naNmtYq1/bDoT2f/Wn+q7PCfxyzPsHn7fDUwCnp6eunXtXan6Hp4Ef80y9c1wCu6A8ALxiH
- gZOXAcCSngDQCAA8kKskLHD/OW5ekaSTM0tu9RlWevITTQt2cbCzU5PV+CY20q911+uhXD1+n7/r7/LS
- I2Z6AEXrrL75xk60x5xaFUu0fqZzo64L3ujdf8NHAycHLx76xclvR3hFfj9sa8wPQw/F/jA4LPb7V8Ji
- vnk5LGZZ37CYJc+ExSx6PCxmQY8TMfMbnD3zseeuox8W9AueXuqbDW9WeO/9J8s+17iCZ1s7OzsFTs23
- Nd4q3fV6GDd/pv8Tl8arxqymgRUEqyFqlFGP7exMjUoXK9iiaY3S99zfrHKHbi2qduzWvDKq1LFbswqo
- fMduTcp17NG8VKfHWzl3aV3Dvl2l4q6tCjg66+tYTc+941V6m96vuz4/7v/CZQVBd6DuRDWnqeXS1qzb
- le3zc0uh0Jn+bn1II3/dwdK6q02izttqjsKgRikMuYG4HVmfr1DoQR09caOHcHWmz19/06W7UlNBxzDt
- FTSm9TCsQqGxfSOjbaXgaFOnc7z1NK2arh+Pym/w/mFLx0c1TacHPdeuH7FSQ/VkjO5mq/Rr2w9f6uft
- 1fC78wHI/PWXLu0bbiQ12qr8lb/yV/7KX/krf+Wv/JW/8lf+yl/5K3/lr/z1u8tk+h/lk3wDkeb9eAAA
- AABJRU5ErkJggg==
-
-
AAABAAYAAAAAAAEAIADnXwAAZgAAAICAAAABACAAKAgBAE1gAABAQAAAAQAgAChCAAB1aAEAMDAAAAEA
diff --git a/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs
index 696599e..589165d 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs
@@ -32,7 +32,6 @@
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
this.ckExportAssignedDocs = new System.Windows.Forms.CheckBox();
- this.lblPreRelease = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.edTags = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
@@ -47,10 +46,11 @@
//
// btnCancel
//
+ this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.btnCancel.Image = global::AyaNova.PlugIn.V8.Resource1.Cancel24;
- this.btnCancel.Location = new System.Drawing.Point(20, 386);
+ this.btnCancel.Location = new System.Drawing.Point(20, 356);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(68, 41);
this.btnCancel.TabIndex = 26;
@@ -58,11 +58,10 @@
//
// btnOk
//
- this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.btnOk.Image = global::AyaNova.PlugIn.V8.Resource1.OK24;
- this.btnOk.Location = new System.Drawing.Point(650, 386);
+ this.btnOk.Location = new System.Drawing.Point(650, 356);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(68, 41);
this.btnOk.TabIndex = 3;
@@ -75,34 +74,21 @@
this.ckExportAssignedDocs.Checked = true;
this.ckExportAssignedDocs.CheckState = System.Windows.Forms.CheckState.Checked;
this.ckExportAssignedDocs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ckExportAssignedDocs.Location = new System.Drawing.Point(23, 167);
+ this.ckExportAssignedDocs.Location = new System.Drawing.Point(23, 132);
this.ckExportAssignedDocs.Name = "ckExportAssignedDocs";
- this.ckExportAssignedDocs.Size = new System.Drawing.Size(401, 21);
+ this.ckExportAssignedDocs.Size = new System.Drawing.Size(408, 21);
this.ckExportAssignedDocs.TabIndex = 27;
- this.ckExportAssignedDocs.Text = "Export Assigned documents as Attachments where possible";
+ this.ckExportAssignedDocs.Text = "Migrate Assigned documents as Attachments where possible";
this.ckExportAssignedDocs.UseVisualStyleBackColor = true;
//
- // lblPreRelease
- //
- this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lblPreRelease.Dock = System.Windows.Forms.DockStyle.Top;
- this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblPreRelease.ForeColor = System.Drawing.Color.Blue;
- this.lblPreRelease.Location = new System.Drawing.Point(0, 0);
- this.lblPreRelease.Name = "lblPreRelease";
- this.lblPreRelease.Size = new System.Drawing.Size(730, 37);
- this.lblPreRelease.TabIndex = 38;
- this.lblPreRelease.Text = "Pre-release 7.6-Alpha";
- this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
// label2
//
+ this.label2.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.Red;
- this.label2.Location = new System.Drawing.Point(104, 393);
+ this.label2.Location = new System.Drawing.Point(104, 363);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(528, 34);
this.label2.TabIndex = 39;
@@ -111,7 +97,7 @@
//
// edTags
//
- this.edTags.Location = new System.Drawing.Point(20, 230);
+ this.edTags.Location = new System.Drawing.Point(20, 195);
this.edTags.Name = "edTags";
this.edTags.Size = new System.Drawing.Size(141, 20);
this.edTags.TabIndex = 40;
@@ -120,16 +106,16 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(20, 211);
+ this.label1.Location = new System.Drawing.Point(20, 176);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(120, 13);
+ this.label1.Size = new System.Drawing.Size(119, 13);
this.label1.TabIndex = 41;
- this.label1.Text = "Tag all exported objects";
+ this.label1.Text = "Tag all migrated objects";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(20, 287);
+ this.label3.Location = new System.Drawing.Point(20, 252);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(165, 13);
this.label3.TabIndex = 43;
@@ -142,7 +128,7 @@
0,
0,
0});
- this.nTimeOut.Location = new System.Drawing.Point(20, 303);
+ this.nTimeOut.Location = new System.Drawing.Point(20, 268);
this.nTimeOut.Maximum = new decimal(new int[] {
3600,
0,
@@ -190,7 +176,7 @@
//
this.gPartFormat.Controls.Add(this.rdPartCombined);
this.gPartFormat.Controls.Add(this.rdPartSplit);
- this.gPartFormat.Location = new System.Drawing.Point(20, 53);
+ this.gPartFormat.Location = new System.Drawing.Point(20, 18);
this.gPartFormat.Name = "gPartFormat";
this.gPartFormat.Size = new System.Drawing.Size(698, 94);
this.gPartFormat.TabIndex = 47;
@@ -202,7 +188,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
- this.ClientSize = new System.Drawing.Size(730, 443);
+ this.ClientSize = new System.Drawing.Size(730, 413);
this.ControlBox = false;
this.Controls.Add(this.gPartFormat);
this.Controls.Add(this.nTimeOut);
@@ -210,7 +196,6 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.edTags);
this.Controls.Add(this.label2);
- this.Controls.Add(this.lblPreRelease);
this.Controls.Add(this.ckExportAssignedDocs);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOk);
@@ -232,7 +217,6 @@
private System.Windows.Forms.Button btnOk;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.CheckBox ckExportAssignedDocs;
- private System.Windows.Forms.Label lblPreRelease;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox edTags;
private System.Windows.Forms.Label label1;
diff --git a/source/Plugins/AyaNova.Plugin.V8/Opt.cs b/source/Plugins/AyaNova.Plugin.V8/Opt.cs
index 2c937ac..50ad180 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Opt.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Opt.cs
@@ -38,7 +38,7 @@ namespace AyaNova.PlugIn.V8
private void Opt_Load(object sender, EventArgs e)
{
- lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING;
+
}
diff --git a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs
index 59a0635..69fdbef 100644
--- a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs
@@ -34,7 +34,6 @@
this.edCurrent = new System.Windows.Forms.TextBox();
this.edSubOp = new System.Windows.Forms.TextBox();
this.btnCancel = new System.Windows.Forms.Button();
- this.lblPreRelease = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// edOut
@@ -111,19 +110,6 @@
this.btnCancel.Visible = false;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
- // lblPreRelease
- //
- this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblPreRelease.ForeColor = System.Drawing.Color.Blue;
- this.lblPreRelease.Location = new System.Drawing.Point(205, 598);
- this.lblPreRelease.Name = "lblPreRelease";
- this.lblPreRelease.Size = new System.Drawing.Size(426, 37);
- this.lblPreRelease.TabIndex = 39;
- this.lblPreRelease.Text = "Pre-release 7.6-Alpha";
- this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
// ProgressForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -131,7 +117,6 @@
this.CancelButton = this.btnClose;
this.ClientSize = new System.Drawing.Size(870, 646);
this.ControlBox = false;
- this.Controls.Add(this.lblPreRelease);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.edSubOp);
this.Controls.Add(this.edCurrent);
@@ -142,7 +127,7 @@
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "ProgressForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Exporting...";
+ this.Text = "Migrating...";
this.Load += new System.EventHandler(this.ProgressForm_Load);
this.ResumeLayout(false);
this.PerformLayout();
@@ -157,6 +142,5 @@
private System.Windows.Forms.TextBox edCurrent;
private System.Windows.Forms.TextBox edSubOp;
private System.Windows.Forms.Button btnCancel;
- private System.Windows.Forms.Label lblPreRelease;
}
}
\ No newline at end of file
diff --git a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs
index 5a6aa8f..c366274 100644
--- a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs
@@ -79,7 +79,7 @@ namespace AyaNova.PlugIn.V8
private void ProgressForm_Load(object sender, EventArgs e)
{
- lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING;
+
}
//eoc
diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 86a2c48..b024769 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8
public string PluginVersion
{
- get { return "7.6.1-alpha.139"; }
+ get { return "7.6.1-alpha.141"; }
}
public string About
@@ -77,7 +77,7 @@ namespace AyaNova.PlugIn.V8
if (AyaNovaVersion.Minor < 6)
{
- MessageBox.Show("The V8 migrate plugin requires AyaNova version 7.6 or newer");
+ MessageBox.Show("The V8 migrate plugin requires AyaNova version 7.6 or newer");
return false;
}
@@ -107,7 +107,7 @@ namespace AyaNova.PlugIn.V8
{
if (!ObjectsWeCanDealWith.Contains(objectType)) return null;
List list = new List();
- list.Add(new AyaNovaPluginMenuItem("V8 Migrate", "Export to AyaNova 8 server", null, null));
+ list.Add(new AyaNovaPluginMenuItem("V8 Migrate", "Migrate to AyaNova 8 server", null, null));
return list;
}
@@ -123,7 +123,7 @@ namespace AyaNova.PlugIn.V8
public void CommandSelectedForSingleObject(string commandKey, RootObjectTypes objectType, object ayaNovaObject)
{
- util.PRE_RELEASE_VERSION_STRING = "Pre-release test " + this.PluginVersion;
+ util.RELEASE_VERSION_STRING = this.PluginVersion;
if (!User.CurrentUserIsAnAdministrator)
{
@@ -408,7 +408,7 @@ namespace AyaNova.PlugIn.V8
progress.Show();
progress.StartedImport();
progress.Append("Exporting data to AyaNova server @ " + util.ApiBaseUrl);
- progress.Append(util.PRE_RELEASE_VERSION_STRING);
+ progress.Append(util.RELEASE_VERSION_STRING);
progress.Append("Option HTTP Timeout: " + util.HTTPCLIENT_TIMEOUT_SECONDS);
progress.Append("Option Migrate assigned docs: " + ExportAssignedDocs.ToString() + "");
progress.Append("Option Migrate tag: \"" + ImportTag + "\"");
diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs
index abe1c5e..c8d3821 100644
--- a/source/Plugins/AyaNova.Plugin.V8/util.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/util.cs
@@ -16,7 +16,7 @@ namespace AyaNova.PlugIn.V8
{
class util
{
- public static string PRE_RELEASE_VERSION_STRING { get; set; }
+ public static string RELEASE_VERSION_STRING { get; set; }
public static GZTW.AyaNova.BLL.LocalizedTextTable LocaleText = null;
public const string TEST_ROUTE = "notify/hello";