Commit MetaInfo

Revision329cb3b698a5f5c55f2641863d50b9b7ec736889 (tree)
Time2009-10-06 05:33:49
AuthorFace
CommiterFace

Log Message

Added upload form.

Change Summary

Incremental Difference

diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/AddForm.Designer.cs
--- a/src/COIClient/AddForm.Designer.cs Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/AddForm.Designer.cs Mon Oct 05 22:33:49 2009 +0200
@@ -49,7 +49,7 @@
4949 //
5050 this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
5151 this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
52- this.buttonCancel.Location = new System.Drawing.Point(403, 130);
52+ this.buttonCancel.Location = new System.Drawing.Point(408, 130);
5353 this.buttonCancel.Margin = new System.Windows.Forms.Padding(0);
5454 this.buttonCancel.Name = "buttonCancel";
5555 this.buttonCancel.Size = new System.Drawing.Size(75, 23);
@@ -61,7 +61,7 @@
6161 // buttonOK
6262 //
6363 this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
64- this.buttonOK.Location = new System.Drawing.Point(322, 130);
64+ this.buttonOK.Location = new System.Drawing.Point(327, 130);
6565 this.buttonOK.Margin = new System.Windows.Forms.Padding(0);
6666 this.buttonOK.Name = "buttonOK";
6767 this.buttonOK.Size = new System.Drawing.Size(75, 23);
@@ -168,7 +168,7 @@
168168 // buttonCommit
169169 //
170170 this.buttonCommit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
171- this.buttonCommit.Location = new System.Drawing.Point(9, 130);
171+ this.buttonCommit.Location = new System.Drawing.Point(14, 130);
172172 this.buttonCommit.Margin = new System.Windows.Forms.Padding(0);
173173 this.buttonCommit.Name = "buttonCommit";
174174 this.buttonCommit.Size = new System.Drawing.Size(75, 23);
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/AddForm.cs
--- a/src/COIClient/AddForm.cs Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/AddForm.cs Mon Oct 05 22:33:49 2009 +0200
@@ -12,6 +12,7 @@
1212 Move,
1313 Replace,
1414 Delete,
15+ Upload
1516 }
1617
1718 public partial class AddForm : Form
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/COIClient.csproj
--- a/src/COIClient/COIClient.csproj Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/COIClient.csproj Mon Oct 05 22:33:49 2009 +0200
@@ -82,6 +82,12 @@
8282 <Compile Include="AddForm.Designer.cs">
8383 <DependentUpon>AddForm.cs</DependentUpon>
8484 </Compile>
85+ <Compile Include="UploadForm.cs">
86+ <SubType>Form</SubType>
87+ </Compile>
88+ <Compile Include="UploadForm.Designer.cs">
89+ <DependentUpon>UploadForm.cs</DependentUpon>
90+ </Compile>
8591 <Compile Include="DependenciesAddonTreeModel.cs" />
8692 <Compile Include="DerivedAddonTreeModel.cs" />
8793 <Compile Include="RemoveForm.cs">
@@ -114,6 +120,10 @@
114120 <DependentUpon>AddForm.cs</DependentUpon>
115121 <SubType>Designer</SubType>
116122 </EmbeddedResource>
123+ <EmbeddedResource Include="UploadForm.resx">
124+ <DependentUpon>UploadForm.cs</DependentUpon>
125+ <SubType>Designer</SubType>
126+ </EmbeddedResource>
117127 <EmbeddedResource Include="RemoveForm.resx">
118128 <DependentUpon>RemoveForm.cs</DependentUpon>
119129 <SubType>Designer</SubType>
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/ClientForm.Designer.cs
--- a/src/COIClient/ClientForm.Designer.cs Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/ClientForm.Designer.cs Mon Oct 05 22:33:49 2009 +0200
@@ -333,14 +333,14 @@
333333 this.middleToolStrip.Location = new System.Drawing.Point(0, 7);
334334 this.middleToolStrip.Name = "middleToolStrip";
335335 this.middleToolStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
336- this.middleToolStrip.Size = new System.Drawing.Size(30, 190);
336+ this.middleToolStrip.Size = new System.Drawing.Size(32, 190);
337337 this.middleToolStrip.TabIndex = 0;
338338 this.middleToolStrip.Text = "toolStrip3";
339339 //
340340 // toolStripSeparator5
341341 //
342342 this.toolStripSeparator5.Name = "toolStripSeparator5";
343- this.toolStripSeparator5.Size = new System.Drawing.Size(28, 6);
343+ this.toolStripSeparator5.Size = new System.Drawing.Size(30, 6);
344344 //
345345 // processButton
346346 //
@@ -358,7 +358,7 @@
358358 // toolStripSeparator1
359359 //
360360 this.toolStripSeparator1.Name = "toolStripSeparator1";
361- this.toolStripSeparator1.Size = new System.Drawing.Size(28, 6);
361+ this.toolStripSeparator1.Size = new System.Drawing.Size(30, 6);
362362 //
363363 // uploadButton
364364 //
@@ -371,11 +371,12 @@
371371 this.uploadButton.Size = new System.Drawing.Size(28, 28);
372372 this.uploadButton.Text = "toolStripButton3";
373373 this.uploadButton.ToolTipText = "Upload addons";
374+ this.uploadButton.Click += new System.EventHandler(this.uploadButton_Click);
374375 //
375376 // toolStripSeparator2
376377 //
377378 this.toolStripSeparator2.Name = "toolStripSeparator2";
378- this.toolStripSeparator2.Size = new System.Drawing.Size(28, 6);
379+ this.toolStripSeparator2.Size = new System.Drawing.Size(30, 6);
379380 //
380381 // downloadButton
381382 //
@@ -393,7 +394,7 @@
393394 // toolStripSeparator4
394395 //
395396 this.toolStripSeparator4.Name = "toolStripSeparator4";
396- this.toolStripSeparator4.Size = new System.Drawing.Size(28, 6);
397+ this.toolStripSeparator4.Size = new System.Drawing.Size(30, 6);
397398 //
398399 // addButton
399400 //
@@ -411,7 +412,7 @@
411412 // toolStripSeparator3
412413 //
413414 this.toolStripSeparator3.Name = "toolStripSeparator3";
414- this.toolStripSeparator3.Size = new System.Drawing.Size(28, 6);
415+ this.toolStripSeparator3.Size = new System.Drawing.Size(30, 6);
415416 //
416417 // removeButton
417418 //
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/ClientForm.cs
--- a/src/COIClient/ClientForm.cs Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/ClientForm.cs Mon Oct 05 22:33:49 2009 +0200
@@ -937,8 +937,12 @@
937937 if (tools.Shelve == null) tools.Shelve = new ToolType { Command = "hgtk", Arguments = "shelve --nofork" };
938938 if (tools.Log == null) tools.Log = new ToolType { Command = "hgtk", Arguments = "log --nofork" };
939939
940- if (!settings.Expanded || !settings.ExpandedSpecified) expandButton_Click(this, null);
941- else refreshClient_Click(this, null);
940+ if (!settings.Expanded || !settings.ExpandedSpecified)
941+ {
942+ urlComboBox.SelectedIndex = -1;
943+ expandButton_Click(this, null);
944+ }
945+ refreshClient_Click(this, null);
942946 }
943947
944948 private void downloadButton_Click(object sender, EventArgs e)
@@ -1413,5 +1417,54 @@
14131417 }
14141418 remoteToolStrip_SizeChanged(this, null);
14151419 }
1420+
1421+ private void uploadButton_Click(object sender, EventArgs e)
1422+ {
1423+ contentTable.Enabled = false;
1424+ menuStrip.Enabled = false;
1425+ progress1.Style = ProgressBarStyle.Continuous;
1426+ progress1.Value = 0;
1427+ progress1.Visible = true;
1428+ statusLabel.Text = "";
1429+ statusLabel.Visible = true;
1430+
1431+ new MethodInvoker(Upload).BeginInvoke(ClickReady, Caller.ExamineRemote);
1432+ }
1433+
1434+ private void Upload()
1435+ {
1436+ var upload = new UploadForm(branchButton);
1437+ var result = DialogResult.None;
1438+ upload.StartPosition = FormStartPosition.CenterParent;
1439+ Invoke(new MethodInvoker(delegate { result = upload.ShowDialog(); }));
1440+ upload.StartPosition = FormStartPosition.Manual;
1441+ while (true)
1442+ {
1443+ if (result == DialogResult.Cancel) break;
1444+ string message = null;
1445+ switch (upload.Result)
1446+ {
1447+ case FormResult.Upload:
1448+
1449+ break;
1450+ }
1451+ //if (result == DialogResult.OK) UpdateDatabaseRepository(message);
1452+ remoteModel.Clear();
1453+ Invoke(new MethodInvoker(delegate
1454+ {
1455+ progress1.Style = ProgressBarStyle.Marquee;
1456+ statusLabel.Text = "Loading remote database";
1457+ }));
1458+ GetRemoteList();
1459+ if (result == DialogResult.OK) break;
1460+ Invoke(new MethodInvoker(delegate
1461+ {
1462+ progress1.Style = ProgressBarStyle.Continuous;
1463+ progress1.Value = 0;
1464+ statusLabel.Text = "";
1465+ result = upload.ShowDialog();
1466+ }));
1467+ }
1468+ }
14161469 }
14171470 }
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/ClientForm.resx
--- a/src/COIClient/ClientForm.resx Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/ClientForm.resx Mon Oct 05 22:33:49 2009 +0200
@@ -123,18 +123,6 @@
123123 <metadata name="remoteToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124124 <value>17, 17</value>
125125 </metadata>
126- <metadata name="localToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127- <value>116, 17</value>
128- </metadata>
129- <metadata name="middleToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130- <value>215, 17</value>
131- </metadata>
132- <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
133- <value>575, 17</value>
134- </metadata>
135- <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
136- <value>465, 17</value>
137- </metadata>
138126 <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
139127 <data name="refreshServer.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
140128 <value>
@@ -180,6 +168,9 @@
180168 s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
181169 </value>
182170 </data>
171+ <metadata name="localToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
172+ <value>116, 17</value>
173+ </metadata>
183174 <data name="refreshClient.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
184175 <value>
185176 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -286,6 +277,9 @@
286277 8xPx283L36FetwAAAABJRU5ErkJggg==
287278 </value>
288279 </data>
280+ <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
281+ <value>575, 17</value>
282+ </metadata>
289283 <data name="processMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
290284 <value>
291285 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -445,6 +439,9 @@
445439 gg==
446440 </value>
447441 </data>
442+ <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
443+ <value>465, 17</value>
444+ </metadata>
448445 <metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
449446 <value>677, 17</value>
450447 </metadata>
@@ -454,110 +451,110 @@
454451 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
455452 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
456453 GQAAAk1TRnQBSQFMAgEBBgEAAQkBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
457- AwABIAMAAQEBAAEgBgABIP8A/wAYAAEkASsBMQH/ASUBOQFDAf8BIwE4AUIB/wEkATgBQwH/ASQBPAFH
458- Af8BMAFKAVcB/wE/AV0BagH/AVEBbwF+Af8BZwKBAf8BgQGGAZMB/wGBAYcBkgH/IAABgQGHAZIB/wGB
459- AYYBkwH/AWcCgQH/AVEBbwF+Af8BPwFdAWoB/wEwAUoBVwH/ASQBPAFHAf8BJAE4AUMB/wEjATgBQgH/
460- ASUBOQFDAf8BJAErATEB/4gAAS8BQwFMAf8BMwGBAZ8B/wE8AYEBngH/AUgBiAGqAf8BVQGXAbkB/wFk
461- AagBxwH/AXEBtwHWAf8BfQHEAeIB/wGBAc0B6gH/AZ8B7gL/AYEBiwGWAf8gAAGBAYsBlgH/AZ8B7gL/
462- AYEBzQHqAf8BfQHEAeIB/wFxAbcB1gH/AWQBqAHHAf8BVQGXAbkB/wFIAYgBqgH/ATwBgQGeAf8BMwGB
463- AZ8B/wEvAUMBTAH/iAABOgFPAVoB/wEyAYEBqwH/AUQBqwHxAf8BUwG0AfAB/wFlAb8B9AH/AXgBywH4
454+ AwABIAMAAQEBAAEgBgABIP8A/wAYAAElASwBMgH/ASYBOgFEAf8BJAE5AUMB/wElATkBRAH/ASUBPQFI
455+ Af8BMQFLAVgB/wFAAV4BawH/AVIBcAF/Af8BaAKBAf8BgQGGAZMB/wGBAYcBkgH/IAABgQGHAZIB/wGB
456+ AYYBkwH/AWgCgQH/AVIBcAF/Af8BQAFeAWsB/wExAUsBWAH/ASUBPQFIAf8BJQE5AUQB/wEkATkBQwH/
457+ ASYBOgFEAf8BJQEsATIB/4gAATABRAFNAf8BNAGBAZ8B/wE9AYEBngH/AUkBiAGqAf8BVgGXAbkB/wFl
458+ AagBxwH/AXIBtwHWAf8BfgHEAeIB/wGBAc0B6gH/AZ8B7gL/AYEBiwGWAf8gAAGBAYsBlgH/AZ8B7gL/
459+ AYEBzQHqAf8BfgHEAeIB/wFyAbcB1gH/AWUBqAHHAf8BVgGXAbkB/wFJAYgBqgH/AT0BgQGeAf8BNAGB
460+ AZ8B/wEwAUQBTQH/iAABOwFQAVsB/wEzAYEBqwH/AUUBqwHxAf8BVAG0AfAB/wFmAb8B9AH/AXkBywH4
464461 Af8BgQHWAfsB/wGEAd8B/QH/AZYB5wH+Af8BrQHyAv8BgQGQAZsB/yAAAYEBkAGbAf8BrQHyAv8BlgHn
465- Af4B/wGEAd8B/QH/AYEB1gH7Af8BeAHLAfgB/wFlAb8B9AH/AVMBtAHwAf8BRAGrAfEB/wEyAYEBqwH/
466- AToBTwFaAf+IAAFHAWABbgH/ATABigG6Af8BUQGzAfAB/wFhAbwB8AH/AXIBxwH1Af8BgQHSAfkB/wGB
462+ Af4B/wGEAd8B/QH/AYEB1gH7Af8BeQHLAfgB/wFmAb8B9AH/AVQBtAHwAf8BRQGrAfEB/wEzAYEBqwH/
463+ ATsBUAFbAf+IAAFIAWEBbwH/ATEBigG6Af8BUgGzAfAB/wFiAbwB8AH/AXMBxwH1Af8BgQHSAfkB/wGB
467464 AdsB+wH/AY8B4wH8Af8BnwHpAfsB/wG2AfQC/wGEAZYBnwH/IAABhAGWAZ8B/wG2AfQC/wGfAekB+wH/
468- AY8B4wH8Af8BgQHbAfsB/wGBAdIB+QH/AXIBxwH1Af8BYQG8AfAB/wFRAbMB8AH/ATABigG6Af8BRwFg
469- AW4B/4gAAVMBcgGBAf8BLwGTAcYB/wFiAb0B8wH/AXABxgH0Af8BfwHRAfgB/wGBAdoB+wH/AYsB4gH8
470- Af8BnAHoAfsB/wGpAe4B+gH/AbwB9wL/AYgBmwGkAf8DuQH/A30B/wPZAf8DewH/A3sB/wPZAf8DfQH/
471- A7kB/wGIAZsBpAH/AbwB9wL/AakB7gH6Af8BnAHoAfsB/wGLAeIB/AH/AYEB2gH7Af8BfwHRAfgB/wFw
472- AcYB9AH/AWIBvQHzAf8BLwGTAcYB/wFTAXIBgQH/iAABYQKBAf8BLgGZAc8B/wFxAcgB9wH/AX4B0AH5
465+ AY8B4wH8Af8BgQHbAfsB/wGBAdIB+QH/AXMBxwH1Af8BYgG8AfAB/wFSAbMB8AH/ATEBigG6Af8BSAFh
466+ AW8B/4gAAVQBcwGBAf8BMAGTAcYB/wFjAb0B8wH/AXEBxgH0Af8BgAHRAfgB/wGBAdoB+wH/AYsB4gH8
467+ Af8BnAHoAfsB/wGpAe4B+gH/AbwB9wL/AYgBmwGkAf8DuQH/A34B/wPZAf8DfAH/A3wB/wPZAf8DfgH/
468+ A7kB/wGIAZsBpAH/AbwB9wL/AakB7gH6Af8BnAHoAfsB/wGLAeIB/AH/AYEB2gH7Af8BgAHRAfgB/wFx
469+ AcYB9AH/AWMBvQHzAf8BMAGTAcYB/wFUAXMBgQH/iAABYgKBAf8BLwGZAc8B/wFyAcgB9wH/AX8B0AH5
473470 Af8BgQHaAfsB/wGIAeEB/AH/AZgB6AH7Af8BqAHuAfgB/wG0Ae4B+AH/AcAB9gL/AYwBnwGoAf8D4wH/
474471 A+oF/wPfAf8D3wX/A+oB/wPjAf8BjAGfAagB/wHAAfYC/wG0Ae4B+AH/AagB7gH4Af8BmAHoAfsB/wGI
475- AeEB/AH/AYEB2gH7Af8BfgHQAfkB/wFxAcgB9wH/AS4BmQHPAf8BYQKBAf+IAAFyAYEBjQH/AWwBxwH6
472+ AeEB/AH/AYEB2gH7Af8BfwHQAfkB/wFyAcgB9wH/AS8BmQHPAf8BYgKBAf+IAAFzAYEBjQH/AW0BxwH6
476473 Af8BgQHXAf0B/wGEAd4B/gH/AZIB5gH+Af8BogHrAf0B/wGvAfIB+wH/AbsB8gH6Af8BvQHxAfoB/wHC
477- AfcC/wGOAaIBqwH/A/kJ/wN7Af8Dewn/A/kB/wGOAaIBqwH/AcIB9wL/Ab0B8QH6Af8BuwHyAfoB/wGv
478- AfIB+wH/AaIB6wH9Af8BkgHmAf4B/wGEAd4B/gH/AYEB1wH9Af8BbAHHAfoB/wFyAYEBjQH/iAABgQGH
474+ AfcC/wGOAaIBqwH/A/kJ/wN8Af8DfAn/A/kB/wGOAaIBqwH/AcIB9wL/Ab0B8QH6Af8BuwHyAfoB/wGv
475+ AfIB+wH/AaIB6wH9Af8BkgHmAf4B/wGEAd4B/gH/AYEB1wH9Af8BbQHHAfoB/wFzAYEBjQH/iAABgQGH
479476 AZIB/wGEAZYBoQH/AYUBlwGiAf8BhgGYAaMB/wGHAZoBpAH/AY0BoAGqAf8BiwGeAagB/wGLAZ8BqAH/
480477 AYwBoAGpAf8BjQGhAaoB/wGOAaIBqwH/A/0J/wPkAf8D5An/A/0B/wGOAaIBqwH/AY0BoQGqAf8BjAGg
481478 AakB/wGLAZ8BqAH/AYsBngGoAf8BjQGgAaoB/wGHAZoBpAH/AYYBmAGjAf8BhQGXAaIB/wGEAZYBoQH/
482- AYEBhwGSAf+YAAN8Af8BpQGuAbEB/wGOAaIBqwH/AZIB4QHzAf8BtgHuAfgB/wGyAeQB7AH/AY4BogGr
483- Df8DewH/A3sN/wGOAaIBqwH/AbIB5AHsAf8BtgHuAfgB/wGSAeEB8wH/AY4BogGrAf8BpQGuAbEB/wN8
479+ AYEBhwGSAf+YAAN9Af8BpQGuAbEB/wGOAaIBqwH/AZIB4QHzAf8BtgHuAfgB/wGyAeQB7AH/AY4BogGr
480+ Df8DfAH/A3wN/wGOAaIBqwH/AbIB5AHsAf8BtgHuAfgB/wGSAeEB8wH/AY4BogGrAf8BpQGuAbEB/wN9
484481 Af+oAAPHAf8DuQH/A+cB/wGOAaIBqwH/AY4BogGrAf8BjgGiAasR/wPpAf8D6RH/AY4BogGrAf8BjgGi
485- AasB/wGOAaIBqwH/A+cB/wO5Af8DxwH/qAADewH/A+YB/wP0Af8D+hn/A3sB/wN7Gf8D+gH/A/QB/wPm
486- Af8DewH/rAADewH/A+UB/wN7Af8D5gH/A3sB/wPoAf8DewH/A+kB/wN7Af8D6gH/A+oB/wN7Af8D6QH/
487- A3sB/wPoAf8DewH/A+YB/wN7Af8D5QH/A3sB/8QAA3sB/wP8Cf8DewH/A3sJ/wP8Af8DewH/3AADewH/
488- A+oB/wN7Af8IAAN7Af8D6gH/A3sB//8A/wD/AEMAAX0BYwFPAf8BeAFeAUoB/wF4AV4BSgH/AXgBXgFK
489- Af8BeAFeAUoB/wF4AV4BSgH/AXgBXgFKAf8BeAFeAUoB/wF4AV4BSgH/AXgBXgFKAf8BdQFbAUcB/wG3
490- AaIBkwH/AbcBogGTAf8BdQFbAUcB/wF4AV4BSgH/AXgBXgFKAf8BeAFeAUoB/wF4AV4BSgH/AXgBXgFK
491- Af8BeAFeAUoB/wF4AV4BSgH/AXgBXgFKAf8BeAFeAUoB/wF9AWMBTwH/IAABgQGSAYEB/wFAAUsBQQH/
492- EAABgQGSAYEB/wFAAUsBQQH/IAABQAFLAUEB/wFAAUsBQQH/DAABQAFLAUEB/wFAAUsBQQH/JAABfQFj
493- AU8B/wHHAaoBmAH/AeIBwgGsAf8B4wHFAbEB/wHjAcoBuAH/AeQBzwHBAf8B5QHWAcsB/wHmAdwB1AH/
482+ AasB/wGOAaIBqwH/A+cB/wO5Af8DxwH/qAADfAH/A+YB/wP0Af8D+hn/A3wB/wN8Gf8D+gH/A/QB/wPm
483+ Af8DfAH/rAADfAH/A+UB/wN8Af8D5gH/A3wB/wPoAf8DfAH/A+kB/wN8Af8D6gH/A+oB/wN8Af8D6QH/
484+ A3wB/wPoAf8DfAH/A+YB/wN8Af8D5QH/A3wB/8QAA3wB/wP8Cf8DfAH/A3wJ/wP8Af8DfAH/3AADfAH/
485+ A+oB/wN8Af8IAAN8Af8D6gH/A3wB//8A/wD/AEMAAX4BZAFQAf8BeQFfAUsB/wF5AV8BSwH/AXkBXwFL
486+ Af8BeQFfAUsB/wF5AV8BSwH/AXkBXwFLAf8BeQFfAUsB/wF5AV8BSwH/AXkBXwFLAf8BdgFcAUgB/wG3
487+ AaIBkwH/AbcBogGTAf8BdgFcAUgB/wF5AV8BSwH/AXkBXwFLAf8BeQFfAUsB/wF5AV8BSwH/AXkBXwFL
488+ Af8BeQFfAUsB/wF5AV8BSwH/AXkBXwFLAf8BeQFfAUsB/wF+AWQBUAH/IAABgQGSAYEB/wFBAUwBQgH/
489+ EAABgQGSAYEB/wFBAUwBQgH/IAABQQFMAUIB/wFBAUwBQgH/DAABQQFMAUIB/wFBAUwBQgH/JAABfgFk
490+ AVAB/wHHAaoBmAH/AeIBwgGsAf8B4wHFAbEB/wHjAcoBuAH/AeQBzwHBAf8B5QHWAcsB/wHmAdwB1AH/
494491 AecB4gHcAf8B5wHmAeQB/wH8Af4B/AH/Ab0BqAGZAf8BvQGoAZkB/wH8Af4B/AH/AecB5gHkAf8B5wHi
495492 AdwB/wHmAdwB1AH/AeUB1gHLAf8B5AHPAcEB/wHjAcoBuAH/AeMBxQGxAf8B4gHCAawB/wHHAaoBmAH/
496- AX0BYwFPAf8gAAGBAZIBgQH/ATABNwExAf8BOQFCAToB/wwAAYEBkgGBAf8BMAE3ATEB/wE5AUIBOgH/
497- GAABQAFLAUEB/wFIAVUBSgH/AUYBUgFHAf8IAAFAAUsBQQH/AUgBVQFKAf8BRgFSAUcB/yQAAX0BYwFP
493+ AX4BZAFQAf8gAAGBAZIBgQH/ATEBOAEyAf8BOgFDATsB/wwAAYEBkgGBAf8BMQE4ATIB/wE6AUMBOwH/
494+ GAABQQFMAUIB/wFJAVYBSwH/AUcBUwFIAf8IAAFBAUwBQgH/AUkBVgFLAf8BRwFTAUgB/yQAAX4BZAFQ
498495 Af8BxwGqAZgB/wH2AdsByAH/AcwBrwGfAf8BzAGvAZ8B/wHPAbMBpQH/AfoB7wHmAf8B0wG8Aa8B/wHW
499496 AcABtQH/AdgBxAG5Af8B/AH+AfwB/wHGAbABoQH/AcYBsAGhAf8B/AH+AfwB/wHYAcQBuQH/AdYBwAG1
500- Af8B0wG8Aa8B/wH6Ae8B5gH/Ac8BswGlAf8BzAGvAZ8B/wHMAa8BnwH/AfYB2wHIAf8BxwGqAZgB/wF9
501- AWMBTwH/IAABgQGSAYEB/wFYAYEBYwH/ATABNwExAf8BSgFXAUsB/wgAAYEBkgGBAf8BWAGBAWMB/wEw
502- ATcBMQH/AUoBVwFLAf8QAAFcAW8BXgH/AXQBgQF5Af8BZAGBAXEB/wFIAVUBSgH/BAABXAFvAV4B/wF0
503- AYEBeQH/AWQBgQFxAf8BSAFVAUoB/yQAAX0BYwFPAf8BywGyAaEB/wHSAcIBtQH/BAABbAFpAWYB/wOB
497+ Af8B0wG8Aa8B/wH6Ae8B5gH/Ac8BswGlAf8BzAGvAZ8B/wHMAa8BnwH/AfYB2wHIAf8BxwGqAZgB/wF+
498+ AWQBUAH/IAABgQGSAYEB/wFZAYEBZAH/ATEBOAEyAf8BSwFYAUwB/wgAAYEBkgGBAf8BWQGBAWQB/wEx
499+ ATgBMgH/AUsBWAFMAf8QAAFdAXABXwH/AXUBgQF6Af8BZQGBAXIB/wFJAVYBSwH/BAABXQFwAV8B/wF1
500+ AYEBegH/AWUBgQFyAf8BSQFWAUsB/yQAAX4BZAFQAf8BywGyAaEB/wHSAcIBtQH/BAABbQFqAWcB/wOB
504501 Af8B+wH1Ae8B/wH7AfoB9wH/AfwB/gH8Af8B/AH+AfwB/wH8Af4B/AH/AcwBtgGnAf8BzAG2AacB/wH8
505- Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wH7AfoB9wH/AfsB9QHvAf8DgQH/AWwBaQFmAf8EAAHSAcIBtQH/
506- AcsBsgGhAf8BfQFjAU8B/xAAAYEBmAGEAf8BNwFAATgB/wFAAUsBQQH/AUgBVQFKAf8BTwFeAVEB/wFm
507- AY0BdQH/AVgBgQFjAf8BMAE3ATEB/wFDAU8BRAH/AUgBVQFKAf8BTwFeAVEB/wFmAY0BdQH/AVgBgQFj
508- Af8BMAE3ATEB/wFKAVcBSwH/CAABXAFvAV4B/wFiAXYBZQH/AXoBmgGBAf8BfQGrAYEB/wFPAV4BUQH/
509- AU4BXQFQAf8BYgF2AWUB/wF6AZoBgQH/AX0BqwGBAf8BTwFeAVEB/wFIAVUBSgH/AUABSwFBAf8BNwFA
510- ATgB/wEwATcBMQH/FAABgQF1AWIB/wG4AbEBqAH/ASMBJwErAf8BZgGTAakB/wH9Av4B/wGjAZ0BmAH/
502+ Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wH7AfoB9wH/AfsB9QHvAf8DgQH/AW0BagFnAf8EAAHSAcIBtQH/
503+ AcsBsgGhAf8BfgFkAVAB/xAAAYEBmAGEAf8BOAFBATkB/wFBAUwBQgH/AUkBVgFLAf8BUAFfAVIB/wFn
504+ AY0BdgH/AVkBgQFkAf8BMQE4ATIB/wFEAVABRQH/AUkBVgFLAf8BUAFfAVIB/wFnAY0BdgH/AVkBgQFk
505+ Af8BMQE4ATIB/wFLAVgBTAH/CAABXQFwAV8B/wFjAXcBZgH/AXsBmgGBAf8BfgGrAYEB/wFQAV8BUgH/
506+ AU8BXgFRAf8BYwF3AWYB/wF7AZoBgQH/AX4BqwGBAf8BUAFfAVIB/wFJAVYBSwH/AUEBTAFCAf8BOAFB
507+ ATkB/wExATgBMgH/FAABgQF2AWMB/wG4AbEBqAH/ASQBKAEsAf8BZwGTAakB/wH9Av4B/wGjAZ0BmAH/
511508 AfsB+gH3Af8B2AHEAbkB/wHaAcgBvQH/AdsBygHAAf8B/AH+AfwB/wHMAbYBpwH/AcwBtgGnAf8B/AH+
512- AfwB/wHbAcoBwAH/AdoByAG9Af8B2AHEAbkB/wH7AfoB9wH/AaMBnQGYAf8B/QL+Af8BZgGTAakB/wEj
513- AScBKwH/AbgBsQGoAf8BgQF1AWIB/xAAAYIBoQGMAf8BqQHpAb4B/wGBAbMBhgH/AX8BqgGBAf8BdwGg
514- AYEB/wFvAZcBfwH/AXcBqgGBAf8BWAGBAWMB/wEwATcBMQH/AW4BiAF7Af8BdwGgAYEB/wFvAZcBfwH/
515- AXcBqgGBAf8BWAGBAWMB/wEwATcBMQH/AUkBVgFKAf8BWQFqAVoB/wFnAX0BawH/AYEBpgGBAf8BiwHa
516- AaUB/wGBAb0BjQH/AYEBsgGEAf8BVwFoAVoB/wGBAaYBgQH/AYsB2gGlAf8BgQG0AYYB/wF7AagBgQH/
517- AW8BmwGAAf8BYwGOAXIB/wFYAYEBZQH/AUABSwFBAf8QAAHlAdYBywH/AoEBewH/ASMBJwErAf8BXgGa
509+ AfwB/wHbAcoBwAH/AdoByAG9Af8B2AHEAbkB/wH7AfoB9wH/AaMBnQGYAf8B/QL+Af8BZwGTAakB/wEk
510+ ASgBLAH/AbgBsQGoAf8BgQF2AWMB/xAAAYIBoQGMAf8BqQHpAb4B/wGBAbMBhgH/AYABqgGBAf8BeAGg
511+ AYEB/wFwAZcBgAH/AXgBqgGBAf8BWQGBAWQB/wExATgBMgH/AW8BiAF8Af8BeAGgAYEB/wFwAZcBgAH/
512+ AXgBqgGBAf8BWQGBAWQB/wExATgBMgH/AUoBVwFLAf8BWgFrAVsB/wFoAX4BbAH/AYEBpgGBAf8BiwHa
513+ AaUB/wGBAb0BjQH/AYEBsgGEAf8BWAFpAVsB/wGBAaYBgQH/AYsB2gGlAf8BgQG0AYYB/wF8AagBgQH/
514+ AXABmwGBAf8BZAGOAXMB/wFZAYEBZgH/AUEBTAFCAf8QAAHlAdYBywH/AoEBfAH/ASQBKAEsAf8BXwGa
518515 AbIB/wGBAc4B4gH/AYgBtwHHAf8BowGdAZgB/wH8Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wH8Af4B/AH/
519516 AfwB/gH8Af8BzAG2AacB/wHMAbYBpwH/AfwB/gH8Af8B/AH+AfwB/wH8Af4B/AH/AfwB/gH8Af8B/AH+
520- AfwB/wGjAZ0BmAH/AYgBtwHHAf8BgQHOAeIB/wFeAZoBsgH/ASMBJwErAf8CgQF7Af8B5QHWAcsB/wwA
521- AYkBqgGTAf8BsQHvAcYB/wGTAeIBrQH/AYsB2AGjAf8BgQHNAZgB/wGBAcEBjAH/AYEBtQGBAf8BdwGq
522- AYEB/wFrAZIBeQH/AXUBgQF8Af8BgQHNAZgB/wGBAcEBjAH/AYEBtQGBAf8BdwGqAYEB/wFrAZIBeQH/
523- AXUBgQF8Af8BkgG4AZ8B/wHGAfEB1QH/Aa8B7gHFAf8BkgHhAa0B/wGJAdgBowH/AXcBhgGBAf8BjwHB
524- AZ8B/wGuAe0BxAH/AZIB4QGtAf8BiQHYAaMB/wGBAcoBlQH/AYEBuwGGAf8BeAGsAYEB/wFgAYsBcAH/
525- AUgBVQFKAf8QAAFCAXcBgQH/ASMBJwErAf8BXgGaAbIB/wF3Ab8B1wH/AYwB4AHuAf8BYgGcAbMB/wHB
517+ AfwB/wGjAZ0BmAH/AYgBtwHHAf8BgQHOAeIB/wFfAZoBsgH/ASQBKAEsAf8CgQF8Af8B5QHWAcsB/wwA
518+ AYkBqgGTAf8BsQHvAcYB/wGTAeIBrQH/AYsB2AGjAf8BgQHNAZgB/wGBAcEBjAH/AYEBtQGBAf8BeAGq
519+ AYEB/wFsAZIBegH/AXYBgQF9Af8BgQHNAZgB/wGBAcEBjAH/AYEBtQGBAf8BeAGqAYEB/wFsAZIBegH/
520+ AXYBgQF9Af8BkgG4AZ8B/wHGAfEB1QH/Aa8B7gHFAf8BkgHhAa0B/wGJAdgBowH/AXgBhgGBAf8BjwHB
521+ AZ8B/wGuAe0BxAH/AZIB4QGtAf8BiQHYAaMB/wGBAcoBlQH/AYEBuwGGAf8BeQGsAYEB/wFhAYsBcQH/
522+ AUkBVgFLAf8QAAFDAXgBgQH/ASQBKAEsAf8BXwGaAbIB/wF4Ab8B1wH/AYwB4AHuAf8BYwGcAbMB/wHB
526523 AbkBtAH/AfwB/gH8Af8B2wHKAcAB/wHbAcoBwAH/AdsBygHAAf8B/AH+AfwB/wHMAbYBpwH/AcwBtgGn
527- Af8B/AH+AfwB/wHbAcoBwAH/AdsBygHAAf8B2wHKAcAB/wH8Af4B/AH/AcEBuQG0Af8BYgGcAbMB/wGM
528- AeAB7gH/AXcBvwHXAf8BXgGaAbIB/wEjAScBKwH/AUIBdwGBAf8MAAGQAbQBnAH/AbQB8QHJAf8BrgHu
524+ Af8B/AH+AfwB/wHbAcoBwAH/AdsBygHAAf8B2wHKAcAB/wH8Af4B/AH/AcEBuQG0Af8BYwGcAbMB/wGM
525+ AeAB7gH/AXgBvwHXAf8BXwGaAbIB/wEkASgBLAH/AUMBeAGBAf8MAAGQAbQBnAH/AbQB8QHJAf8BrgHu
529526 AcQB/wGqAeoBvwH/AaQB5AG5Af8BowHgAbYB/wGBAcEBjAH/AYEBsgGBAf8BgQGXAYQB/wGfAdQBsAH/
530527 AaQB5AG5Af8BowHgAbYB/wGBAcEBjAH/AYEBsgGBAf8BgQGXAYQB/wGNAbEBmQH/AZgBwAGmAf8BpgHO
531- AbQB/wHHAfQB1wH/AagB6wG/Af8BkQHgAasB/wGUAckBpgH/AWoBgQF1Af8BsAHfAcAB/wGoAesBvwH/
532- AZEB4AGrAf8BpgHgAbkB/wGdAdUBrgH/AZMBygGiAf8BiQHAAZcB/wFPAV4BUQH/DAABQgF3AYEB/wEj
533- AScBKwH/AV4BmgGyAf8BdwG/AdcB/wGMAeAB7gH/AWwBoAG1Af8B1QHOAcgB/wH7AfgB8wH/AfwB/gH8
528+ AbQB/wHHAfQB1wH/AagB6wG/Af8BkQHgAasB/wGUAckBpgH/AWsBgQF2Af8BsAHfAcAB/wGoAesBvwH/
529+ AZEB4AGrAf8BpgHgAbkB/wGdAdUBrgH/AZMBygGiAf8BiQHAAZcB/wFQAV8BUgH/DAABQwF4AYEB/wEk
530+ ASgBLAH/AV8BmgGyAf8BeAG/AdcB/wGMAeAB7gH/AW0BoAG1Af8B1QHOAcgB/wH7AfgB8wH/AfwB/gH8
534531 Af8B/AH+AfwB/wH8Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wHMAbYBpwH/AcwBtgGnAf8B/AH+AfwB/wH8
535- Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wH8Af4B/AH/AfsB+AHzAf8B1QHOAcgB/wFsAaABtQH/AYwB4AHu
536- Af8BdwG/AdcB/wFeAZoBsgH/ASMBJwErAf8BQgF3AYEB/wgAAZUBvAGiAf8BkAG0AZwB/wGJAaoBkwH/
532+ Af4B/AH/AfwB/gH8Af8B/AH+AfwB/wH8Af4B/AH/AfsB+AHzAf8B1QHOAcgB/wFtAaABtQH/AYwB4AHu
533+ Af8BeAG/AdcB/wFfAZoBsgH/ASQBKAEsAf8BQwF4AYEB/wgAAZUBvAGiAf8BkAG0AZwB/wGJAaoBkwH/
537534 AYIBoQGMAf8BgQGYAYQB/wGoAeUBuwH/AYEBxwGWAf8BgQGXAYQB/wGKAawBlQH/AYIBoQGMAf8BgQGY
538535 AYQB/wGoAeUBuwH/AYEBxwGWAf8BgQGXAYQB/wGNAbABmQH/CAABmAHAAaYB/wGgAcgBrgH/AccB9AHX
539- Af8BqAHrAb8B/wFaAWwBXAH/AYMBqwGQAf8BgQGWAYEB/wHHAfQB1wH/AagB6wG/Af8BWgFsAVwB/wGI
540- AakBkwH/AYMBogGNAf8BgQGcAYkB/wGBAZcBhAH/CAABPQFqAXsB/wEjAScBKwH/AV4BmgGyAf8BdwG/
541- AdcB/wGMAeAB7gH/AXoBpgG3Af8BzQGpAZUB/wHmAZIBegH/AeUBhwFtAf8B5gGPAXgB/wHoAZkBgQH/
536+ Af8BqAHrAb8B/wFbAW0BXQH/AYMBqwGQAf8BgQGWAYEB/wHHAfQB1wH/AagB6wG/Af8BWwFtAV0B/wGI
537+ AakBkwH/AYMBogGNAf8BgQGcAYkB/wGBAZcBhAH/CAABPgFrAXwB/wEkASgBLAH/AV8BmgGyAf8BeAG/
538+ AdcB/wGMAeAB7gH/AXsBpgG3Af8BzQGpAZUB/wHmAZIBewH/AeUBhwFuAf8B5gGPAXkB/wHoAZkBgQH/
542539 AekBogGBAf8B6gGpAYkB/wHqAaoBjAH/AesBrAGNAf8B6wGsAY0B/wHqAaoBjAH/AeoBqQGJAf8B6QGi
543- AYEB/wHoAZkBgQH/AeYBjwF4Af8B5QGHAW0B/wHmAZIBegH/Ac0BqQGVAf8BegGmAbcB/wGMAeAB7gH/
544- AXcBvwHXAf8BXgGaAbIB/wEjAScBKwH/AT0BagF7Af8UAAGCAaEBjAH/AaUB4QG4Af8BgQGXAYQB/wGN
540+ AYEB/wHoAZkBgQH/AeYBjwF5Af8B5QGHAW4B/wHmAZIBewH/Ac0BqQGVAf8BewGmAbcB/wGMAeAB7gH/
541+ AXgBvwHXAf8BXwGaAbIB/wEkASgBLAH/AT4BawF8Af8UAAGCAaEBjAH/AaUB4QG4Af8BgQGXAYQB/wGN
545542 AbABmQH/CAABggGhAYwB/wGlAeEBuAH/AYEBlwGEAf8BjQGwAZkB/xAAAZgBwAGmAf8BoAHIAa4B/wG+
546- AfAB0AH/AV0BcAFgAf8EAAGYAcABpgH/AaAByAGuAf8BvgHwAdAB/wFdAXABYAH/FAABRAFOAYMB/wJK
543+ AfAB0AH/AV4BcQFhAf8EAAGYAcABpgH/AaAByAGuAf8BvgHwAdAB/wFeAXEBYQH/FAABRQFPAYMB/wJL
547544 AZAB/wGBAoYB/wGBAcQB2QH/AYwB4AHuAf8BgQGsAbkB/wHSAbABngH/AfMBpgGBAf8B+AGmAYEB/wH4
548545 AasBhAH/AfoBsAGLAf8B+wG2AZIB/wH8AbsBmAH/Af4BvwGdAv8BwwGiAf8B6wGsAY0B/wHrAawBjQL/
549546 AcMBogH/Af4BvwGdAf8B/AG7AZgB/wH7AbYBkgH/AfoBsAGLAf8B+AGrAYQB/wH4AaYBgQH/AfMBpgGB
550- Af8B0gGwAZ4B/wGBAawBuQH/AYwB4AHuAf8BgQHEAdkB/wGBAoYB/wJKAZAB/wFEAU4BgwH/EAABiQGq
547+ Af8B0gGwAZ4B/wGBAawBuQH/AYwB4AHuAf8BgQHEAdkB/wGBAoYB/wJLAZAB/wFFAU8BgwH/EAABiQGq
551548 AZMB/wGBAZcBhAH/AY0BsAGZAf8MAAGJAaoBkwH/AYEBlwGEAf8BjQGwAZkB/xgAAZgBwAGmAf8BmAHA
552- AaYB/wFrAYEBbwH/CAABmAHAAaYB/wGYAcABpgH/AWsBgQFvAf8UAAJKAZAB/wFzAYEBrQH/AYEBhQHR
553- Af8BygG4AawB/wGBAbABuwH/AcoBmQGBAf8B5gGNAXQB/wHlAYYBagH/AeYBjAF1Af8B5wGUAYAB/wHo
549+ AaYB/wFsAYEBcAH/CAABmAHAAaYB/wGYAcABpgH/AWwBgQFwAf8UAAJLAZAB/wF0AYEBrQH/AYEBhQHR
550+ Af8BygG4AawB/wGBAbABuwH/AcoBmQGBAf8B5gGNAXUB/wHlAYYBawH/AeYBjAF2Af8B5wGUAYEB/wHo
554551 AZwBgQH/AekBogGBAf8B6gGoAYkB/wHqAaoBiwH/AeoBqgGLAf8B6wGsAY0B/wHrAawBjQH/AeoBqgGL
555- Af8B6gGqAYsB/wHqAagBiQH/AekBogGBAf8B6AGcAYEB/wHnAZQBgAH/AeYBjAF1Af8B5QGGAWoB/wHm
556- AY0BdAH/AcoBmQGBAf8BgQGwAbsB/wHKAbgBrAH/AYEBhQHRAf8BcwGBAa0B/wJKAZAB/xAAAZABtAGc
552+ Af8B6gGqAYsB/wHqAagBiQH/AekBogGBAf8B6AGcAYEB/wHnAZQBgQH/AeYBjAF2Af8B5QGGAWsB/wHm
553+ AY0BdQH/AcoBmQGBAf8BgQGwAbsB/wHKAbgBrAH/AYEBhQHRAf8BdAGBAa0B/wJLAZAB/xAAAZABtAGc
557554 Af8BmAHAAaYB/xAAAZABtAGcAf8BmAHAAaYB/yAAAZgBwAGmAf8BmQHBAacB/wwAAZgBwAGmAf8BmQHB
558- AacB/xQAAXMBgQGtAf8BcwGBAdAB/wGBAY8B3wH/AXMBgQGtAf8BgQGfAa0B/wHrAawBjQH/UAAB6wGs
559- AY0B/wGBAZ8BrQH/AXMBgQGtAf8BgQGPAd8B/wFzAYEB0AH/AXMBgQGtAf+AAAF6AYEBvAH/AXMBgQGt
560- Af8BcwGBAa0B/wF9AYEBwgH/YAABfQGBAcIB/wFzAYEBrQH/AXMBgQGtAf8BegGBAbwB//8AAQABQgFN
555+ AacB/xQAAXQBgQGtAf8BdAGBAdAB/wGBAY8B3wH/AXQBgQGtAf8BgQGfAa0B/wHrAawBjQH/UAAB6wGs
556+ AY0B/wGBAZ8BrQH/AXQBgQGtAf8BgQGPAd8B/wF0AYEB0AH/AXQBgQGtAf+AAAF7AYEBvAH/AXQBgQGt
557+ Af8BdAGBAa0B/wF+AYEBwgH/YAABfgGBAcIB/wF0AYEBrQH/AXQBgQGtAf8BewGBAbwB//8AAQABQgFN
561558 AT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wEABP8EAAT/BAABgAEPAfABAQQAAYABDwHw
562559 AQEEAAGAAQ8B8AEBBAABgAEPAfABAQQAAYACAAEBBAABgAIAAQEEAAGAAgABAQQAAYACAAEBBAAB+AIA
563560 AR8EAAH4AgABHwQAAfgCAAEfBAAB/AIAAT8EAAH/AeABBwH/BAAB/wHxAY8B/wQAFP8B8AIAAQ8B8wHP
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/RemoveForm.Designer.cs
--- a/src/COIClient/RemoveForm.Designer.cs Fri Oct 02 19:06:49 2009 +0200
+++ b/src/COIClient/RemoveForm.Designer.cs Mon Oct 05 22:33:49 2009 +0200
@@ -64,7 +64,7 @@
6464 this.buttonOK.Size = new System.Drawing.Size(75, 23);
6565 this.buttonOK.TabIndex = 0;
6666 this.buttonOK.Text = "Remove";
67- this.toolTipProvider.SetToolTip(this.buttonOK, "Add addon to COI");
67+ this.toolTipProvider.SetToolTip(this.buttonOK, "Remove addon from COI");
6868 this.buttonOK.UseVisualStyleBackColor = true;
6969 this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
7070 //
@@ -114,6 +114,7 @@
114114 this.RemoveDerivedCheckBox.Size = new System.Drawing.Size(141, 17);
115115 this.RemoveDerivedCheckBox.TabIndex = 13;
116116 this.RemoveDerivedCheckBox.Text = "Remove derived objects";
117+ this.toolTipProvider.SetToolTip(this.RemoveDerivedCheckBox, "Remove all derived objects, too");
117118 this.RemoveDerivedCheckBox.UseVisualStyleBackColor = true;
118119 //
119120 // StripCheckBox
@@ -125,6 +126,7 @@
125126 this.StripCheckBox.Size = new System.Drawing.Size(126, 17);
126127 this.StripCheckBox.TabIndex = 14;
127128 this.StripCheckBox.Text = "Delete commits (strip)";
129+ this.toolTipProvider.SetToolTip(this.StripCheckBox, "Delete commits permanently from COI repository (equals hg strip)");
128130 this.StripCheckBox.UseVisualStyleBackColor = true;
129131 this.StripCheckBox.CheckedChanged += new System.EventHandler(this.StripCheckBox_CheckedChanged);
130132 //
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/UploadForm.Designer.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/COIClient/UploadForm.Designer.cs Mon Oct 05 22:33:49 2009 +0200
@@ -0,0 +1,138 @@
1+namespace COIClient
2+{
3+ partial class UploadForm
4+ {
5+ /// <summary>
6+ /// Required designer variable.
7+ /// </summary>
8+ private System.ComponentModel.IContainer components = null;
9+
10+ /// <summary>
11+ /// Clean up any resources being used.
12+ /// </summary>
13+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
14+ protected override void Dispose(bool disposing)
15+ {
16+ if (disposing && (components != null))
17+ {
18+ components.Dispose();
19+ }
20+ base.Dispose(disposing);
21+ }
22+
23+ #region Windows Form Designer generated code
24+
25+ /// <summary>
26+ /// Required method for Designer support - do not modify
27+ /// the contents of this method with the code editor.
28+ /// </summary>
29+ private void InitializeComponent()
30+ {
31+ this.components = new System.ComponentModel.Container();
32+ this.buttonCancel = new System.Windows.Forms.Button();
33+ this.buttonOK = new System.Windows.Forms.Button();
34+ this.label4 = new System.Windows.Forms.Label();
35+ this.branchComboBox = new System.Windows.Forms.ComboBox();
36+ this.toolTipProvider = new System.Windows.Forms.ToolTip(this.components);
37+ this.PublishCheckBox = new System.Windows.Forms.CheckBox();
38+ this.SuspendLayout();
39+ //
40+ // buttonCancel
41+ //
42+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
43+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
44+ this.buttonCancel.Location = new System.Drawing.Point(168, 50);
45+ this.buttonCancel.Margin = new System.Windows.Forms.Padding(0);
46+ this.buttonCancel.Name = "buttonCancel";
47+ this.buttonCancel.Size = new System.Drawing.Size(75, 23);
48+ this.buttonCancel.TabIndex = 1;
49+ this.buttonCancel.Text = "Cancel";
50+ this.toolTipProvider.SetToolTip(this.buttonCancel, "Close window");
51+ this.buttonCancel.UseVisualStyleBackColor = true;
52+ //
53+ // buttonOK
54+ //
55+ this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
56+ this.buttonOK.Location = new System.Drawing.Point(84, 50);
57+ this.buttonOK.Margin = new System.Windows.Forms.Padding(0);
58+ this.buttonOK.Name = "buttonOK";
59+ this.buttonOK.Size = new System.Drawing.Size(75, 23);
60+ this.buttonOK.TabIndex = 0;
61+ this.buttonOK.Text = "Upload";
62+ this.toolTipProvider.SetToolTip(this.buttonOK, "Upload addon(s) to COI");
63+ this.buttonOK.UseVisualStyleBackColor = true;
64+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
65+ //
66+ // label4
67+ //
68+ this.label4.AutoSize = true;
69+ this.label4.Location = new System.Drawing.Point(28, 15);
70+ this.label4.Name = "label4";
71+ this.label4.Size = new System.Drawing.Size(44, 13);
72+ this.label4.TabIndex = 9;
73+ this.label4.Text = "Branch:";
74+ this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
75+ //
76+ // branchComboBox
77+ //
78+ this.branchComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
79+ | System.Windows.Forms.AnchorStyles.Right)));
80+ this.branchComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
81+ this.branchComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
82+ this.branchComboBox.FormattingEnabled = true;
83+ this.branchComboBox.Location = new System.Drawing.Point(84, 12);
84+ this.branchComboBox.Name = "branchComboBox";
85+ this.branchComboBox.RightToLeft = System.Windows.Forms.RightToLeft.No;
86+ this.branchComboBox.Size = new System.Drawing.Size(160, 21);
87+ this.branchComboBox.TabIndex = 3;
88+ this.toolTipProvider.SetToolTip(this.branchComboBox, "Branch name on remote repository");
89+ //
90+ // PublishCheckBox
91+ //
92+ this.PublishCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
93+ this.PublishCheckBox.AutoSize = true;
94+ this.PublishCheckBox.Location = new System.Drawing.Point(12, 54);
95+ this.PublishCheckBox.Name = "PublishCheckBox";
96+ this.PublishCheckBox.Size = new System.Drawing.Size(60, 17);
97+ this.PublishCheckBox.TabIndex = 14;
98+ this.PublishCheckBox.Text = "Publish";
99+ this.toolTipProvider.SetToolTip(this.PublishCheckBox, "Publish addon(s) on COI (tip only)");
100+ this.PublishCheckBox.UseVisualStyleBackColor = true;
101+ //
102+ // UploadForm
103+ //
104+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
105+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
106+ this.AutoScroll = true;
107+ this.CancelButton = this.buttonCancel;
108+ this.ClientSize = new System.Drawing.Size(252, 82);
109+ this.ControlBox = false;
110+ this.Controls.Add(this.PublishCheckBox);
111+ this.Controls.Add(this.branchComboBox);
112+ this.Controls.Add(this.label4);
113+ this.Controls.Add(this.buttonOK);
114+ this.Controls.Add(this.buttonCancel);
115+ this.MaximizeBox = false;
116+ this.MinimizeBox = false;
117+ this.MinimumSize = new System.Drawing.Size(260, 116);
118+ this.Name = "UploadForm";
119+ this.ShowIcon = false;
120+ this.ShowInTaskbar = false;
121+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
122+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
123+ this.Text = "Upload object";
124+ this.ResumeLayout(false);
125+ this.PerformLayout();
126+
127+ }
128+
129+ #endregion
130+
131+ private System.Windows.Forms.Button buttonCancel;
132+ private System.Windows.Forms.Button buttonOK;
133+ private System.Windows.Forms.Label label4;
134+ private System.Windows.Forms.ComboBox branchComboBox;
135+ private System.Windows.Forms.ToolTip toolTipProvider;
136+ private System.Windows.Forms.CheckBox PublishCheckBox;
137+ }
138+}
\ No newline at end of file
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/UploadForm.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/COIClient/UploadForm.cs Mon Oct 05 22:33:49 2009 +0200
@@ -0,0 +1,37 @@
1+using System;
2+using System.Windows.Forms;
3+using Aga.Controls.Tree;
4+using Aga.Controls.Tree.NodeControls;
5+
6+namespace COIClient
7+{
8+ public partial class UploadForm : Form
9+ {
10+ public UploadForm(ToolStripDropDownButton branchButton)
11+ {
12+ InitializeComponent();
13+ for(int i=0;i<branchButton.DropDownItems.Count-1;i++)
14+ {
15+ var branch = branchButton.DropDownItems[i].Text;
16+ branchComboBox.Items.Add(branch);
17+ if (branch==branchButton.Text) branchComboBox.SelectedIndex = i;
18+ }
19+ }
20+
21+ private void buttonOK_Click(object sender, EventArgs e)
22+ {
23+ DialogResult = DialogResult.OK;
24+ Result = FormResult.Upload;
25+ Close();
26+ }
27+
28+ public FormResult Result { get; private set; }
29+
30+ private void UploadForm_Load(object sender, EventArgs e)
31+ {
32+
33+ }
34+
35+ public bool Publish { get { return PublishCheckBox.Checked; } }
36+ }
37+}
diff -r a320e4f776bd -r 329cb3b698a5 src/COIClient/UploadForm.resx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/COIClient/UploadForm.resx Mon Oct 05 22:33:49 2009 +0200
@@ -0,0 +1,132 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<root>
3+ <!--
4+ Microsoft ResX Schema
5+
6+ Version 2.0
7+
8+ The primary goals of this format is to allow a simple XML format
9+ that is mostly human readable. The generation and parsing of the
10+ various data types are done through the TypeConverter classes
11+ associated with the data types.
12+
13+ Example:
14+
15+ ... ado.net/XML headers & schema ...
16+ <resheader name="resmimetype">text/microsoft-resx</resheader>
17+ <resheader name="version">2.0</resheader>
18+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+ <value>[base64 mime encoded serialized .NET Framework object]</value>
24+ </data>
25+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+ <comment>This is a comment</comment>
28+ </data>
29+
30+ There are any number of "resheader" rows that contain simple
31+ name/value pairs.
32+
33+ Each data row contains a name, and value. The row also contains a
34+ type or mimetype. Type corresponds to a .NET class that support
35+ text/value conversion through the TypeConverter architecture.
36+ Classes that don't support this are serialized and stored with the
37+ mimetype set.
38+
39+ The mimetype is used for serialized objects, and tells the
40+ ResXResourceReader how to depersist the object. This is currently not
41+ extensible. For a given mimetype the value must be set accordingly:
42+
43+ Note - application/x-microsoft.net.object.binary.base64 is the format
44+ that the ResXResourceWriter will generate, however the reader can
45+ read any of the formats listed below.
46+
47+ mimetype: application/x-microsoft.net.object.binary.base64
48+ value : The object must be serialized with
49+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+ : and then encoded with base64 encoding.
51+
52+ mimetype: application/x-microsoft.net.object.soap.base64
53+ value : The object must be serialized with
54+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+ : and then encoded with base64 encoding.
56+
57+ mimetype: application/x-microsoft.net.object.bytearray.base64
58+ value : The object must be serialized into a byte array
59+ : using a System.ComponentModel.TypeConverter
60+ : and then encoded with base64 encoding.
61+ -->
62+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+ <xsd:element name="root" msdata:IsDataSet="true">
65+ <xsd:complexType>
66+ <xsd:choice maxOccurs="unbounded">
67+ <xsd:element name="metadata">
68+ <xsd:complexType>
69+ <xsd:sequence>
70+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
71+ </xsd:sequence>
72+ <xsd:attribute name="name" use="required" type="xsd:string" />
73+ <xsd:attribute name="type" type="xsd:string" />
74+ <xsd:attribute name="mimetype" type="xsd:string" />
75+ <xsd:attribute ref="xml:space" />
76+ </xsd:complexType>
77+ </xsd:element>
78+ <xsd:element name="assembly">
79+ <xsd:complexType>
80+ <xsd:attribute name="alias" type="xsd:string" />
81+ <xsd:attribute name="name" type="xsd:string" />
82+ </xsd:complexType>
83+ </xsd:element>
84+ <xsd:element name="data">
85+ <xsd:complexType>
86+ <xsd:sequence>
87+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+ </xsd:sequence>
90+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+ <xsd:attribute ref="xml:space" />
94+ </xsd:complexType>
95+ </xsd:element>
96+ <xsd:element name="resheader">
97+ <xsd:complexType>
98+ <xsd:sequence>
99+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+ </xsd:sequence>
101+ <xsd:attribute name="name" type="xsd:string" use="required" />
102+ </xsd:complexType>
103+ </xsd:element>
104+ </xsd:choice>
105+ </xsd:complexType>
106+ </xsd:element>
107+ </xsd:schema>
108+ <resheader name="resmimetype">
109+ <value>text/microsoft-resx</value>
110+ </resheader>
111+ <resheader name="version">
112+ <value>2.0</value>
113+ </resheader>
114+ <resheader name="reader">
115+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+ </resheader>
117+ <resheader name="writer">
118+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+ </resheader>
120+ <metadata name="toolTipProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121+ <value>14, 11</value>
122+ </metadata>
123+ <metadata name="toolTipProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124+ <value>14, 11</value>
125+ </metadata>
126+ <metadata name="toolTipProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+ <value>14, 11</value>
128+ </metadata>
129+ <metadata name="toolTipProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130+ <value>14, 11</value>
131+ </metadata>
132+</root>
\ No newline at end of file
Show on old repository browser