Rayburn Davis
2014-08-28 25f44935484f40cfca2dc8f9b9a4babe601a3ce7
First commit of DC 3.1 Beta 4

- Caching files is way faster now thanks to using hash maps to keep track of files
- Started work on a WPF version for a possible move to WPF in the near future
3 files deleted
28 files modified
525 ■■■■ changed files
DupliDelete/DCWPF/bin/Debug/DCWPF.exe patch | view | raw | blame | history
DupliDelete/DCWPF/bin/Debug/DCWPF.pdb patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/App.g.cs 2 ●●● patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/App.g.i.cs 2 ●●● patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.FileListAbsolute.txt 1 ●●●● patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.GenerateResource.Cache patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.csprojResolveAssemblyReference.cache patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.exe patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.pdb patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/MainWindow.g.cs 2 ●●● patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/MainWindow.g.i.cs 2 ●●● patch | view | raw | blame | history
DupliDelete/DupliDelete.v12.suo patch | view | raw | blame | history
DupliDelete/DupliDelete/Duplicate Search Engine/DuplicateFinder.cs 53 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/About.Designer.cs 22 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/About.cs 3 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/About.resx 240 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.Designer.cs 124 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.cs 1 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.resx 65 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Properties/AssemblyInfo.cs 6 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.exe patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.pdb patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/System.Windows.Forms.Ribbon.pdb patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.About.resources patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Form1.resources patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.FileListAbsolute.txt 2 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.GenerateResource.Cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csprojResolveAssemblyReference.cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.exe patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.pdb patch | view | raw | blame | history
DupliDelete/DCWPF/bin/Debug/DCWPF.exe
Binary files differ
DupliDelete/DCWPF/bin/Debug/DCWPF.pdb
Binary files differ
DupliDelete/DCWPF/obj/Debug/App.g.cs
....@@ -2,7 +2,7 @@
22 //------------------------------------------------------------------------------
33 // <auto-generated>
44 // This code was generated by a tool.
5
-// Runtime Version:4.0.30319.34003
5
+// Runtime Version:4.0.30319.18444
66 //
77 // Changes to this file may cause incorrect behavior and will be lost if
88 // the code is regenerated.
DupliDelete/DCWPF/obj/Debug/App.g.i.cs
....@@ -2,7 +2,7 @@
22 //------------------------------------------------------------------------------
33 // <auto-generated>
44 // This code was generated by a tool.
5
-// Runtime Version:4.0.30319.34003
5
+// Runtime Version:4.0.30319.18444
66 //
77 // Changes to this file may cause incorrect behavior and will be lost if
88 // the code is regenerated.
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.FileListAbsolute.txt
....@@ -14,7 +14,6 @@
1414 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.pdb
1515 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\bin\Debug\DCWPF.exe
1616 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\bin\Debug\DCWPF.pdb
17
-C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.csprojResolveAssemblyReference.cache
1817 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\MainWindow.baml
1918 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\MainWindow.g.cs
2019 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\App.g.cs
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.GenerateResource.Cache
Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.csprojResolveAssemblyReference.cache
deleted file mode 100644Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.exe
Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.pdb
Binary files differ
DupliDelete/DCWPF/obj/Debug/MainWindow.g.cs
....@@ -2,7 +2,7 @@
22 //------------------------------------------------------------------------------
33 // <auto-generated>
44 // This code was generated by a tool.
5
-// Runtime Version:4.0.30319.34003
5
+// Runtime Version:4.0.30319.18444
66 //
77 // Changes to this file may cause incorrect behavior and will be lost if
88 // the code is regenerated.
DupliDelete/DCWPF/obj/Debug/MainWindow.g.i.cs
....@@ -2,7 +2,7 @@
22 //------------------------------------------------------------------------------
33 // <auto-generated>
44 // This code was generated by a tool.
5
-// Runtime Version:4.0.30319.34003
5
+// Runtime Version:4.0.30319.18444
66 //
77 // Changes to this file may cause incorrect behavior and will be lost if
88 // the code is regenerated.
DupliDelete/DupliDelete.v12.suo
Binary files differ
....@@ -35,7 +35,8 @@
3535 public long MinimumSize;
3636 public long MaximumSize;
3737
38
- SizeInfoCollection FileList;
38
+ // SizeInfoCollection FileList;
39
+ Dictionary<long, SizeInfo> FileList;
3940
4041 public SizeIndexTracker SizeIndexTracker = new SizeIndexTracker();
4142
....@@ -606,7 +607,7 @@
606607 public void Find()
607608 {
608609 int i,j,k,l;
609
- FileList = new SizeInfoCollection();
610
+ FileList = new Dictionary<long, SizeInfo>(); //new SizeInfoCollection();
610611 bool duplicateFirstLoop = true;
611612 DuplicateGroup duplicateGroup = null;
612613 DuplicateFile duplicateFile;
....@@ -726,17 +727,13 @@
726727 {
727728 if (objectInfo.Type == ObjectInfo.FileType.File)
728729 {
729
- long sizeIndex = FindSizeIndex(objectInfo.Size, FileList);
730
-
731
- if (sizeIndex == -1)
732
- {
733
- sizeIndex = AddSizeIndex(objectInfo.Size, FileList);
734
- }
730
+ if(!FindSizeIndex(objectInfo.Size, FileList))
731
+ AddSizeIndex(objectInfo.Size, FileList);
735732
736733 // TODO: Make the longs and ints uniform
737734
738735 // add the file to the list and process any settings the user may have specified (file type inclusions, etc.)
739
- FileList[(int)sizeIndex].FileList.Add(objectInfo, FileTypeInclusions, ExcludedFiletypes, FileSizeBracket, MinimumSize, MaximumSize, ExcludedFolders);
736
+ FileList[(int)objectInfo.Size].FileList.Add(objectInfo, FileTypeInclusions, ExcludedFiletypes, FileSizeBracket, MinimumSize, MaximumSize, ExcludedFolders);
740737
741738 FoundFiles++;
742739 }
....@@ -757,19 +754,23 @@
757754 progressStep = (double)100 / FileList.Count;
758755 progress = 0;
759756
760
- SizeIndexTrackerEnumerator enumerator = new SizeIndexTrackerEnumerator(SizeIndexTracker, FileList);
757
+ var enumerator = FileList.GetEnumerator();
758
+
759
+ // SizeIndexTrackerEnumerator enumerator = new SizeIndexTrackerEnumerator(SizeIndexTracker, FileList);
761760 SizeInfo sizeInfo;
761
+ KeyValuePair<long, SizeInfo> currentData;
762762
763763 // loop through the duplicates
764
- while(enumerator.Status == SizeIndexTrackerEnumerator.EnumerationStatus.Success)
764
+ while(enumerator.MoveNext())
765765 {
766766 if (Canceled == true)
767767 break;
768768
769
- sizeInfo = enumerator.Enumerate();
769
+ currentData = enumerator.Current;
770
+ sizeInfo = currentData.Value;
770771
771
- if (enumerator.Status == SizeIndexTrackerEnumerator.EnumerationStatus.Success)
772
- {
772
+ // if (enumerator.Status == SizeIndexTrackerEnumerator.EnumerationStatus.Success)
773
+ //{
773774
774775 if (Canceled == true)
775776 break;
....@@ -835,7 +836,8 @@
835836 if (hardLink == true)
836837 duplicateFile.Link = true;
837838
838
- duplicateGroup.Add(duplicateFile);
839
+ if(!duplicateGroup.Contains(duplicateFile))
840
+ duplicateGroup.Add(duplicateFile);
839841
840842 sizeInfo.FileList.RemoveAt(k);
841843 k--;
....@@ -886,7 +888,7 @@
886888
887889 progress += (double)progressStep;
888890 Progress = (int)progress;
889
- }
891
+ // }
890892
891893
892894 }
....@@ -1116,7 +1118,15 @@
11161118 return result;
11171119 }
11181120
1119
- public long FindSizeIndex(long size, SizeInfoCollection size_data)
1121
+ public bool FindSizeIndex(long size, Dictionary<long, SizeInfo> fileDict)
1122
+ {
1123
+ if (!fileDict.ContainsKey(size))
1124
+ return false;
1125
+
1126
+ return true;
1127
+ }
1128
+
1129
+ /* public long FindSizeIndex(long size, SizeInfoCollection size_data)
11201130 {
11211131 int i;
11221132 long percentage;
....@@ -1138,9 +1148,9 @@
11381148 }
11391149
11401150 return -1;
1141
- }
1151
+ }*/
11421152
1143
- private long AddSizeIndex(long size, SizeInfoCollection size_tracker)
1153
+ /* private long AddSizeIndex(long size, SizeInfoCollection size_tracker)
11441154 {
11451155 SizeInfo sd1 = new SizeInfo();
11461156 long percentage;
....@@ -1172,6 +1182,11 @@
11721182 indexes.Add(new_index);
11731183
11741184 return new_index;
1185
+ }*/
1186
+
1187
+ private void AddSizeIndex(long size, Dictionary<long, SizeInfo> fileDict)
1188
+ {
1189
+ fileDict.Add(size, new SizeInfo());
11751190 }
11761191
11771192 private int ReturnSortedSizeIndex(long size, SizeInfoCollection size_tracker)
DupliDelete/DupliDelete/Forms/About.Designer.cs
....@@ -35,7 +35,7 @@
3535 this.rayburnsoftLabel = new System.Windows.Forms.LinkLabel();
3636 this.pictureBox1 = new System.Windows.Forms.PictureBox();
3737 this.label2 = new System.Windows.Forms.Label();
38
- this.label1 = new System.Windows.Forms.Label();
38
+ this.versionLabel = new System.Windows.Forms.Label();
3939 this.button1 = new System.Windows.Forms.Button();
4040 this.imageList1 = new System.Windows.Forms.ImageList(this.components);
4141 this.label3 = new System.Windows.Forms.Label();
....@@ -49,7 +49,7 @@
4949 this.groupBox1.Controls.Add(this.rayburnsoftLabel);
5050 this.groupBox1.Controls.Add(this.pictureBox1);
5151 this.groupBox1.Controls.Add(this.label2);
52
- this.groupBox1.Controls.Add(this.label1);
52
+ this.groupBox1.Controls.Add(this.versionLabel);
5353 this.groupBox1.Location = new System.Drawing.Point(5, 4);
5454 this.groupBox1.Name = "groupBox1";
5555 this.groupBox1.Size = new System.Drawing.Size(384, 180);
....@@ -93,15 +93,15 @@
9393 this.label2.TabIndex = 1;
9494 this.label2.Text = "Easily take control of duplicate files.\r\n\r\n© 2010-2013 by Rayburn Davis";
9595 //
96
- // label1
96
+ // versionLabel
9797 //
98
- this.label1.AutoSize = true;
99
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
100
- this.label1.Location = new System.Drawing.Point(51, 26);
101
- this.label1.Name = "label1";
102
- this.label1.Size = new System.Drawing.Size(193, 13);
103
- this.label1.TabIndex = 0;
104
- this.label1.Text = "Duplicate Commander 3.1 Beta 3";
98
+ this.versionLabel.AutoSize = true;
99
+ this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
100
+ this.versionLabel.Location = new System.Drawing.Point(51, 26);
101
+ this.versionLabel.Name = "versionLabel";
102
+ this.versionLabel.Size = new System.Drawing.Size(193, 13);
103
+ this.versionLabel.TabIndex = 0;
104
+ this.versionLabel.Text = "Duplicate Commander 3.1 Beta 3";
105105 //
106106 // button1
107107 //
....@@ -157,7 +157,7 @@
157157
158158 private System.Windows.Forms.GroupBox groupBox1;
159159 private System.Windows.Forms.Label label2;
160
- private System.Windows.Forms.Label label1;
160
+ private System.Windows.Forms.Label versionLabel;
161161 private System.Windows.Forms.Button button1;
162162 private System.Windows.Forms.PictureBox pictureBox1;
163163 private System.Windows.Forms.ImageList imageList1;
DupliDelete/DupliDelete/Forms/About.cs
....@@ -7,6 +7,7 @@
77 using System.Diagnostics;
88 using System.Text;
99 using System.Windows.Forms;
10
+using System.Reflection;
1011
1112 namespace DupliDelete
1213 {
....@@ -30,6 +31,8 @@
3031 private void About_Load(object sender, EventArgs e)
3132 {
3233 pictureBox1.Image = imageList1.Images[0];
34
+ versionLabel.Text = "Duplicate Commander " + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
35
+
3336 }
3437
3538 private void rayburnsoftLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
DupliDelete/DupliDelete/Forms/About.resx
....@@ -112,146 +112,146 @@
112112 <value>2.0</value>
113113 </resheader>
114114 <resheader name="reader">
115
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116 </resheader>
117117 <resheader name="writer">
118
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120
- <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
120
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121 <value>17, 17</value>
122122 </metadata>
123123 <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
124124 <value>
125
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
125
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
126126 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
127127 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADU
128
- HQAAAk1TRnQBSQFMAwEBAAHUAQAB1AEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA
128
+ HQAAAk1TRnQBSQFMAwEBAAHcAQAB3AEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA
129129 ASADAAEBAQABIAYAAUASAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9
130
- AYEB/wH3AbUBZQH/AfcBtQFlAf8B9wGtAV0B/wHvAa0BXQH/Ae8BrQFVAf8B7wGlAUwB/wHvAaUBTAH/
131
- Ae8BnAFEAf8B5wGcATwB/wHnAZQBPAH/AecBlAE0Af8B5wGUATQB/wHnAYwBKwH/Ad4BjAEjAf8B3gGE
132
- ASMB/wHeAYQBGwH/Ad4BhAETAf8B3gGBARMB/wHWAYEBCgH/AdYBZQEKAf8B1gFlAQIB/wHWAWUBAAH/
133
- Ac4BXQEAAf8BzgFdAQAB/wHOAVUBAAH//wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/
134
- AfcBvQGEAf8B9wG9AYEB/wH3AbUBZQH/AfcBtQFlAf8B9wGtAV0B/wHvAa0BXQH/Ae8BrQFVAf8B7wGl
135
- AUwB/wHvAaUBTAH/Ae8BnAFEAf8B5wGcATwB/wHnAZQBPAH/AecBlAE0Af8B5wGUATQB/wHnAYwBKwH/
136
- Ad4BjAEjAf8B3gGEASMB/wHeAYQBGwH/Ad4BhAETAf8B3gGBARMB/wHWAYEBCgH/AdYBZQEKAf8B1gFl
137
- AQIB/wHWAWUBAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAVUBAAH//wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/
138
- AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZQH/AfcBtQFlAf8B9wGtAV0B/wHvAa0BXQH/
139
- Ae8BrQFVAf8B7wGlAUwB/wHvAaUBTAH/Ae8BnAFEAf8B5wGcATwB/wHnAZQBPAH/AecBlAE0Af8B5wGU
140
- ATQB/wHnAYwBKwH/Ad4BjAEjAf8B3gGEASMB/wHeAYQBGwH/Ad4BhAETAf8B3gGBARMB/wHWAYEBCgH/
141
- AdYBZQEKAf8B1gFlAQIB/wHWAWUBAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAVUBAAH//wCBAAH/Ac4BnAL/
142
- Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZQH/AfcBtQFlAf8B9wGt
143
- AV0B/wHvAa0BXQH/Ae8BrQFVAf8B7wGlAUwB/wHvAaUBTAH/Ae8BnAFEAf8B5wGcATwB/wHnAZQBPAH/
144
- AecBlAE0Af8B5wGUATQB/wHnAYwBKwH/Ad4BjAEjAf8B3gGEASMB/wHeAYQBGwH/Ad4BhAETAf8B3gGB
145
- ARMB/wHWAYEBCgH/AdYBZQEKAf8B1gFlAQIB/wHWAWUBAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAVUBAAH/
146
- /wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZQH/
147
- AfcBtQFlAf8B9wGtAV0B/wHvAa0BXQH/Ae8BrQFVAf8B7wGlAUwB/wHvAaUBTAH/Ae8BnAFEAf8B5wGc
148
- ATwB/wHnAZQBPAH/AecBlAE0Af8B5wGUATQB/wHnAYwBKwH/Ad4BjAEjAf8B3gGEASMB/wHeAYQBGwH/
149
- Ad4BhAETAf8B3gGBARMB/wHWAYEBCgH/AdYBZQEKAf8B1gFlAQIB/wHWAWUBAAH/Ac4BXQEAAf8BzgFd
150
- AQAB/wHOAVUBAAH//wCBAAHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
151
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/
152
- Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
153
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/
154
- Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf//AIEAAc4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/
155
- Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
156
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/
157
- Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
158
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB//8AgQABzgFV
159
- AQAB/wHOAV0BAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAV0BAAH/
160
- Ac4BXQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BXQEAAf8BvAFM
161
- AQgB/wIAAv8CAAL/AgAC/wIAAv8BMAESAbQB/wHOAV0BAAH/Ac4BXQEAAf8BzgFdAQAB/wHOAV0BAAH/
162
- Ac4BXQEAAf8BzgFdAQAB/wEwARIBtAH/AgAC/wIAAv8CAAL/AgAC//8AgQABzgFVAQAB/wHWAWUBCgH/
163
- AdYBZQEKAf8B1gFlAQoB/wHWAWUBCgH/AdYBZQEKAf8B1gFlAQoB/wHWAWUBCgH/AdYBZQEKAf8B1gFl
164
- AQoB/wHWAWUBCgH/AdYBZQEKAf8B1gFlAQoB/wHWAWUBCgH/AdYBZQEKAf8BzgFVAQAB/wGPATcBPwH/
165
- AgAC/wIAAv8CAAL/AgAC/wGeAUcBRQH/AdYBZQEKAf8B1gFlAQoB/wHWAWUBCgH/AdYBZQEKAf8BlQFC
166
- AU8B/wIAAv8CAAL/AgAC/wIAAv8BmAE7ATQB//8AgQABzgFVAQAB/wHWAYEBGwH/AdYBgQEbAf8B1gGB
167
- ARsB/wHWAYEBGwH/AdYBgQEbAf8B1gGBARsB/wHWAYEBGwH/AdYBgQEbAf8B1gGBARsB/wHWAYEBGwH/
168
- AdYBgQEbAf8B1gGBARsB/wHWAYEBGwH/AdYBgQEbAf8BzgFVAQAB/wHOAVUBAAH/AUkBJAGnAf8CAAL/
169
- AgAC/wIAAv8CAAL/AckBZQEnAf8B1gGBARsB/wHWAYEBGwH/AbwBXgE0Af8CAAL/AgAC/wIAAv8CAAL/
170
- AUkBJAGnAf8BzgFVAQAB//8AgQABzgFVAQAB/wHWAYQBIwH/AdYBhAEjAf8B1gGEASMB/wHWAYQBIwH/
171
- AdYBhAEjAf8B1gGEASMB/wHWAYQBIwH/AdYBhAEjAf8B1gGEASMB/wHWAYQBIwH/AdYBhAEjAf8B1gGE
172
- ASMB/wHWAYQBIwH/AdYBhAEjAf8BzgFVAQAB/wHOAVUBAAH/AbwBZgE7Af8CAAL/AgAC/wIAAv8CAAL/
173
- AYEBQQGCAf8B1gGEASMB/wHWAYQBIwH/AVoBMgGaAf8CAAL/AgAC/wIAAv8CAAL/AbwBZgE7Af8BzgFV
174
- AQAB//8AgQABzgFVAQAB/wHeAYwBNAH/Ad4BjAE0Af8B3gGMATQB/wHeAYwBNAH/Ad4BjAE0Af8B3gGM
175
- ATQB/wHeAYwBNAH/Ad4BjAE0Af8B3gGMATQB/wHeAYwBNAH/Ad4BjAE0Af8B3gGMATQB/wHeAYwBNAH/
176
- Ad4BjAE0Af8BzgFVAQAB/wHOAVUBAAH/Ad4BjAE0Af8BhgFGAYwB/wIAAv8CAAL/AgAC/wIAAv8BwwGB
177
- AUoB/wGtAV8BXQH/AgAC/wIAAv8CAAL/AgAC/wGRAU0BgwH/Ad4BjAE0Af8BzgFVAQAB//8AgQABzgFV
178
- AQAB/wHeAZQBRAH/Ad4BlAFEAf8B3gGUAUQB/wHeAZQBRAH/Ad4BlAFEAf8B3gGUAUQB/wHeAZQBRAH/
179
- Ad4BlAFEAf8B3gGUAUQB/wHeAZQBRAH/Ad4BlAFEAf8B3gGUAUQB/wHeAZQBRAH/Ad4BlAFEAf8BzgFV
180
- AQAB/wHOAVUBAAH/Ad4BlAFEAf8B3gGUAUQB/wE1AR4BygH/AgAC/wIAAv8CAAL/AUwBLgG4Af8BNQEe
181
- AcoB/wIAAv8CAAL/AgAC/wE1AR4BygH/Ad4BlAFEAf8B3gGUAUQB/wHOAVUBAAH//wCBAAHOAVUBAAH/
182
- Ad4BnAFMAf8B3gGcAUwB/wHeAZwBTAH/Ad4BnAFMAf8B3gGcAUwB/wHeAZwBTAH/Ad4BnAFMAf8B3gGc
183
- AUwB/wHeAZwBTAH/Ad4BnAFMAf8B3gGcAUwB/wHeAZwBTAH/Ad4BnAFMAf8B3gGcAUwB/wHOAVUBAAH/
184
- Ac4BVQEAAf8B3gGcAUwB/wHeAZwBTAH/AbUBgQGAAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wIAAv8CAAL/
185
- AgAC/wG8AYQBZAH/Ad4BnAFMAf8B3gGcAUwB/wHOAVUBAAH//wCBAAHOAVUBAAH/AecBpQFdAf8B5wGl
186
- AV0B/wHnAaUBXQH/AecBpQFdAf8B5wGlAV0B/wHnAaUBXQH/AecBpQFdAf8B5wGlAV0B/wHnAaUBXQH/
187
- AecBpQFdAf8B5wGlAV0B/wHnAaUBXQH/AecBpQFdAf8B5wGlAV0B/wHOAVUBAAH/Ac4BVQEAAf8B5wGl
188
- AV0B/wHnAaUBXQH/AecBpQFdAf8BgQFMAa0B/wIAAv8CAAL/AgAC/wIAAv8CAAL/AgAC/wGBAUwBrQH/
189
- AecBpQFdAf8B5wGlAV0B/wHnAaUBXQH/Ac4BVQEAAf//AIEAAc4BVQEAAf8B5wGtAYEB/wHnAa0BgQH/
130
+ AYEB/wH3AbUBZAH/AfcBtQFkAf8B9wGtAVwB/wHvAa0BXAH/Ae8BrQFUAf8B7wGlAUsB/wHvAaUBSwH/
131
+ Ae8BnAFDAf8B5wGcATsB/wHnAZQBOwH/AecBlAEzAf8B5wGUATMB/wHnAYwBKgH/Ad4BjAEiAf8B3gGE
132
+ ASIB/wHeAYQBGgH/Ad4BhAESAf8B3gGBARIB/wHWAYEBCQH/AdYBZAEJAf8B1gFkAQEB/wHWAWQBAAH/
133
+ Ac4BXAEAAf8BzgFcAQAB/wHOAVQBAAH//wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/
134
+ AfcBvQGEAf8B9wG9AYEB/wH3AbUBZAH/AfcBtQFkAf8B9wGtAVwB/wHvAa0BXAH/Ae8BrQFUAf8B7wGl
135
+ AUsB/wHvAaUBSwH/Ae8BnAFDAf8B5wGcATsB/wHnAZQBOwH/AecBlAEzAf8B5wGUATMB/wHnAYwBKgH/
136
+ Ad4BjAEiAf8B3gGEASIB/wHeAYQBGgH/Ad4BhAESAf8B3gGBARIB/wHWAYEBCQH/AdYBZAEJAf8B1gFk
137
+ AQEB/wHWAWQBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVQBAAH//wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/
138
+ AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZAH/AfcBtQFkAf8B9wGtAVwB/wHvAa0BXAH/
139
+ Ae8BrQFUAf8B7wGlAUsB/wHvAaUBSwH/Ae8BnAFDAf8B5wGcATsB/wHnAZQBOwH/AecBlAEzAf8B5wGU
140
+ ATMB/wHnAYwBKgH/Ad4BjAEiAf8B3gGEASIB/wHeAYQBGgH/Ad4BhAESAf8B3gGBARIB/wHWAYEBCQH/
141
+ AdYBZAEJAf8B1gFkAQEB/wHWAWQBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVQBAAH//wCBAAH/Ac4BnAL/
142
+ Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZAH/AfcBtQFkAf8B9wGt
143
+ AVwB/wHvAa0BXAH/Ae8BrQFUAf8B7wGlAUsB/wHvAaUBSwH/Ae8BnAFDAf8B5wGcATsB/wHnAZQBOwH/
144
+ AecBlAEzAf8B5wGUATMB/wHnAYwBKgH/Ad4BjAEiAf8B3gGEASIB/wHeAYQBGgH/Ad4BhAESAf8B3gGB
145
+ ARIB/wHWAYEBCQH/AdYBZAEJAf8B1gFkAQEB/wHWAWQBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVQBAAH/
146
+ /wCBAAH/Ac4BnAL/Ac4BlAL/AcYBjAL/AcYBjAL/Ab0BhAH/AfcBvQGEAf8B9wG9AYEB/wH3AbUBZAH/
147
+ AfcBtQFkAf8B9wGtAVwB/wHvAa0BXAH/Ae8BrQFUAf8B7wGlAUsB/wHvAaUBSwH/Ae8BnAFDAf8B5wGc
148
+ ATsB/wHnAZQBOwH/AecBlAEzAf8B5wGUATMB/wHnAYwBKgH/Ad4BjAEiAf8B3gGEASIB/wHeAYQBGgH/
149
+ Ad4BhAESAf8B3gGBARIB/wHWAYEBCQH/AdYBZAEJAf8B1gFkAQEB/wHWAWQBAAH/Ac4BXAEAAf8BzgFc
150
+ AQAB/wHOAVQBAAH//wCBAAHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
151
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/
152
+ Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
153
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/
154
+ Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf//AIEAAc4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/
155
+ Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
156
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/
157
+ Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
158
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB//8AgQABzgFU
159
+ AQAB/wHOAVwBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVwBAAH/
160
+ Ac4BXAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BXAEAAf8BvAFL
161
+ AQcB/wIAAv8CAAL/AgAC/wIAAv8BLwERAbQB/wHOAVwBAAH/Ac4BXAEAAf8BzgFcAQAB/wHOAVwBAAH/
162
+ Ac4BXAEAAf8BzgFcAQAB/wEvAREBtAH/AgAC/wIAAv8CAAL/AgAC//8AgQABzgFUAQAB/wHWAWQBCQH/
163
+ AdYBZAEJAf8B1gFkAQkB/wHWAWQBCQH/AdYBZAEJAf8B1gFkAQkB/wHWAWQBCQH/AdYBZAEJAf8B1gFk
164
+ AQkB/wHWAWQBCQH/AdYBZAEJAf8B1gFkAQkB/wHWAWQBCQH/AdYBZAEJAf8BzgFUAQAB/wGPATYBPgH/
165
+ AgAC/wIAAv8CAAL/AgAC/wGeAUYBRAH/AdYBZAEJAf8B1gFkAQkB/wHWAWQBCQH/AdYBZAEJAf8BlQFB
166
+ AU4B/wIAAv8CAAL/AgAC/wIAAv8BmAE6ATMB//8AgQABzgFUAQAB/wHWAYEBGgH/AdYBgQEaAf8B1gGB
167
+ ARoB/wHWAYEBGgH/AdYBgQEaAf8B1gGBARoB/wHWAYEBGgH/AdYBgQEaAf8B1gGBARoB/wHWAYEBGgH/
168
+ AdYBgQEaAf8B1gGBARoB/wHWAYEBGgH/AdYBgQEaAf8BzgFUAQAB/wHOAVQBAAH/AUgBIwGnAf8CAAL/
169
+ AgAC/wIAAv8CAAL/AckBZAEmAf8B1gGBARoB/wHWAYEBGgH/AbwBXQEzAf8CAAL/AgAC/wIAAv8CAAL/
170
+ AUgBIwGnAf8BzgFUAQAB//8AgQABzgFUAQAB/wHWAYQBIgH/AdYBhAEiAf8B1gGEASIB/wHWAYQBIgH/
171
+ AdYBhAEiAf8B1gGEASIB/wHWAYQBIgH/AdYBhAEiAf8B1gGEASIB/wHWAYQBIgH/AdYBhAEiAf8B1gGE
172
+ ASIB/wHWAYQBIgH/AdYBhAEiAf8BzgFUAQAB/wHOAVQBAAH/AbwBZQE6Af8CAAL/AgAC/wIAAv8CAAL/
173
+ AYEBQAGCAf8B1gGEASIB/wHWAYQBIgH/AVkBMQGaAf8CAAL/AgAC/wIAAv8CAAL/AbwBZQE6Af8BzgFU
174
+ AQAB//8AgQABzgFUAQAB/wHeAYwBMwH/Ad4BjAEzAf8B3gGMATMB/wHeAYwBMwH/Ad4BjAEzAf8B3gGM
175
+ ATMB/wHeAYwBMwH/Ad4BjAEzAf8B3gGMATMB/wHeAYwBMwH/Ad4BjAEzAf8B3gGMATMB/wHeAYwBMwH/
176
+ Ad4BjAEzAf8BzgFUAQAB/wHOAVQBAAH/Ad4BjAEzAf8BhgFFAYwB/wIAAv8CAAL/AgAC/wIAAv8BwwGB
177
+ AUkB/wGtAV4BXAH/AgAC/wIAAv8CAAL/AgAC/wGRAUwBgwH/Ad4BjAEzAf8BzgFUAQAB//8AgQABzgFU
178
+ AQAB/wHeAZQBQwH/Ad4BlAFDAf8B3gGUAUMB/wHeAZQBQwH/Ad4BlAFDAf8B3gGUAUMB/wHeAZQBQwH/
179
+ Ad4BlAFDAf8B3gGUAUMB/wHeAZQBQwH/Ad4BlAFDAf8B3gGUAUMB/wHeAZQBQwH/Ad4BlAFDAf8BzgFU
180
+ AQAB/wHOAVQBAAH/Ad4BlAFDAf8B3gGUAUMB/wE0AR0BygH/AgAC/wIAAv8CAAL/AUsBLQG4Af8BNAEd
181
+ AcoB/wIAAv8CAAL/AgAC/wE0AR0BygH/Ad4BlAFDAf8B3gGUAUMB/wHOAVQBAAH//wCBAAHOAVQBAAH/
182
+ Ad4BnAFLAf8B3gGcAUsB/wHeAZwBSwH/Ad4BnAFLAf8B3gGcAUsB/wHeAZwBSwH/Ad4BnAFLAf8B3gGc
183
+ AUsB/wHeAZwBSwH/Ad4BnAFLAf8B3gGcAUsB/wHeAZwBSwH/Ad4BnAFLAf8B3gGcAUsB/wHOAVQBAAH/
184
+ Ac4BVAEAAf8B3gGcAUsB/wHeAZwBSwH/AbUBgQGAAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wIAAv8CAAL/
185
+ AgAC/wG8AYQBYwH/Ad4BnAFLAf8B3gGcAUsB/wHOAVQBAAH//wCBAAHOAVQBAAH/AecBpQFcAf8B5wGl
186
+ AVwB/wHnAaUBXAH/AecBpQFcAf8B5wGlAVwB/wHnAaUBXAH/AecBpQFcAf8B5wGlAVwB/wHnAaUBXAH/
187
+ AecBpQFcAf8B5wGlAVwB/wHnAaUBXAH/AecBpQFcAf8B5wGlAVwB/wHOAVQBAAH/Ac4BVAEAAf8B5wGl
188
+ AVwB/wHnAaUBXAH/AecBpQFcAf8BgQFLAa0B/wIAAv8CAAL/AgAC/wIAAv8CAAL/AgAC/wGBAUsBrQH/
189
+ AecBpQFcAf8B5wGlAVwB/wHnAaUBXAH/Ac4BVAEAAf//AIEAAc4BVAEAAf8B5wGtAYEB/wHnAa0BgQH/
190190 AecBrQGBAf8B5wGtAYEB/wHnAa0BgQH/AecBrQGBAf8B5wGtAYEB/wHnAa0BgQH/AecBrQGBAf8B5wGt
191
- AYEB/wHnAa0BgQH/AecBrQGBAf8B5wGtAYEB/wHnAa0BgQH/Ac4BVQEAAf8BzgFVAQAB/wHnAa0BgQH/
192
- AecBrQGBAf8B5wGtAYEB/wHZAaIBggH/ATcBJgHXAf8CAAL/AgAC/wIAAv8CAAL/ATcBJgHXAf8B2QGi
193
- AYIB/wHnAa0BgQH/AecBrQGBAf8B5wGtAYEB/wHOAVUBAAH//wCBAAHOAVUBAAH/AecBtQGEAf8B5wG1
191
+ AYEB/wHnAa0BgQH/AecBrQGBAf8B5wGtAYEB/wHnAa0BgQH/Ac4BVAEAAf8BzgFUAQAB/wHnAa0BgQH/
192
+ AecBrQGBAf8B5wGtAYEB/wHZAaIBggH/ATYBJQHXAf8CAAL/AgAC/wIAAv8CAAL/ATYBJQHXAf8B2QGi
193
+ AYIB/wHnAa0BgQH/AecBrQGBAf8B5wGtAYEB/wHOAVQBAAH//wCBAAHOAVQBAAH/AecBtQGEAf8B5wG1
194194 AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/
195
- AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wHOAVUBAAH/Ac4BVQEAAf8B5wG1
196
- AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wFiAUoBwwH/AgAC/wIAAv8CAAL/AgAC/wGXAWgBrgH/
197
- AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/AecBtQGEAf8BzgFVAQAB//8AgQABzgFVAQAB/wHvAb0BlAH/
195
+ AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wHOAVQBAAH/Ac4BVAEAAf8B5wG1
196
+ AYQB/wHnAbUBhAH/AecBtQGEAf8B5wG1AYQB/wFhAUkBwwH/AgAC/wIAAv8CAAL/AgAC/wGXAWcBrgH/
197
+ AecBtQGEAf8B5wG1AYQB/wHnAbUBhAH/AecBtQGEAf8BzgFUAQAB//8AgQABzgFUAQAB/wHvAb0BlAH/
198198 Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8B7wG9
199
- AZQB/wHvAb0BlAH/Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8BzgFVAQAB/wHOAVUBAAH/
200
- Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/AcsBoAGjAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wE6ASsB3gH/
201
- AeABsQGaAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8BzgFVAQAB//8AgQABzgFVAQAB/wHvAcYBpQH/
199
+ AZQB/wHvAb0BlAH/Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8BzgFUAQAB/wHOAVQBAAH/
200
+ Ae8BvQGUAf8B7wG9AZQB/wHvAb0BlAH/AcsBoAGjAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wE5ASoB3gH/
201
+ AeABsQGaAf8B7wG9AZQB/wHvAb0BlAH/Ae8BvQGUAf8BzgFUAQAB//8AgQABzgFUAQAB/wHvAcYBpQH/
202202 Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/Ae8BxgGlAf8B7wHG
203
- AaUB/wHvAcYBpQH/Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/Ae8BxgGlAf8BzgFVAQAB/wHOAVUBAAH/
204
- Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/AVMBQgHaAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wIAAv8BkAFp
205
- AcgB/wHvAcYBpQH/Ae8BxgGlAf8B7wHGAaUB/wHOAVUBAAH//wCBAAHOAVUBAAH/Ae8BzgGtAf8B7wHO
203
+ AaUB/wHvAcYBpQH/Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/Ae8BxgGlAf8BzgFUAQAB/wHOAVQBAAH/
204
+ Ae8BxgGlAf8B7wHGAaUB/wHvAcYBpQH/AVIBQQHaAf8CAAL/AgAC/wIAAv8CAAL/AgAC/wIAAv8BkAFo
205
+ AcgB/wHvAcYBpQH/Ae8BxgGlAf8B7wHGAaUB/wHOAVQBAAH//wCBAAHOAVQBAAH/Ae8BzgGtAf8B7wHO
206206 Aa0B/wHvAc4BrQH/Ae8BzgGtAf8B7wHOAa0B/wHvAc4BrQH/Ae8BzgGtAf8B7wHOAa0B/wHvAc4BrQH/
207
- Ae8BzgGtAf8B7wHOAa0B/wHvAc4BrQH/Ae8BzgGtAf8B7wHOAa0B/wHOAVUBAAH/Ac4BVQEAAf8B7wHO
207
+ Ae8BzgGtAf8B7wHOAa0B/wHvAc4BrQH/Ae8BzgGtAf8B7wHOAa0B/wHOAVQBAAH/Ac4BVAEAAf8B7wHO
208208 Aa0B/wHvAc4BrQH/AboBoAG/Af8CAAL/AgAC/wIAAv8CAAL/AgAC/wIAAv8CAAL/AgAC/wHSAbUBtgH/
209
- Ae8BzgGtAf8B7wHOAa0B/wHOAVUBAAH//wCBAAHOAVUBAAH/AfcB1gG9Af8B9wHWAb0B/wH3AdYBvQH/
209
+ Ae8BzgGtAf8B7wHOAa0B/wHOAVQBAAH//wCBAAHOAVQBAAH/AfcB1gG9Af8B9wHWAb0B/wH3AdYBvQH/
210210 AfcB1gG9Af8B9wHWAb0B/wH3AdYBvQH/AfcB1gG9Af8B9wHWAb0B/wH3AdYBvQH/AfcB1gG9Af8B9wHW
211
- Ab0B/wH3AdYBvQH/AfcB1gG9Af8B9wHWAb0B/wHOAVUBAAH/Ac4BVQEAAf8B9wHWAb0B/wH3AdYBvQH/
212
- ATwBMgHrAf8CAAL/AgAC/wIAAv8BlQGBAdcB/wFWAUkB5AH/AgAC/wIAAv8CAAL/AVYBSQHkAf8B9wHW
213
- Ab0B/wH3AdYBvQH/Ac4BVQEAAf//AIEAAc4BVQEAAf8B9wHeAc4B/wH3Ad4BzgH/AfcB3gHOAf8B9wHe
211
+ Ab0B/wH3AdYBvQH/AfcB1gG9Af8B9wHWAb0B/wHOAVQBAAH/Ac4BVAEAAf8B9wHWAb0B/wH3AdYBvQH/
212
+ ATsBMQHrAf8CAAL/AgAC/wIAAv8BlQGBAdcB/wFVAUgB5AH/AgAC/wIAAv8CAAL/AVUBSAHkAf8B9wHW
213
+ Ab0B/wH3AdYBvQH/Ac4BVAEAAf//AIEAAc4BVAEAAf8B9wHeAc4B/wH3Ad4BzgH/AfcB3gHOAf8B9wHe
214214 Ac4B/wH3Ad4BzgH/AfcB3gHOAf8B9wHeAc4B/wH3Ad4BzgH/AfcB3gHOAf8B9wHeAc4B/wH3Ad4BzgH/
215
- AfcB3gHOAf8B9wHeAc4B/wH3Ad4BzgH/Ac4BVQEAAf8BzgFVAQAB/wH3Ad4BzgH/AbcBpAHaAf8CAAL/
215
+ AfcB3gHOAf8B9wHeAc4B/wH3Ad4BzgH/Ac4BVAEAAf8BzgFUAQAB/wH3Ad4BzgH/AbcBpAHaAf8CAAL/
216216 AgAC/wIAAv8CAAL/AdkBwwHTAf8ByQG1AdcB/wIAAv8CAAL/AgAC/wIAAv8BwAGtAdgB/wH3Ad4BzgH/
217
- Ac4BVQEAAf//AIEAAc4BVQEAAf8B9wHnAdYB/wH3AecB1gH/AfcB5wHWAf8B9wHnAdYB/wH3AecB1gH/
218
- AfcB5wHWAf8B9wHnAdYB/wH3AecB1gH/AfcB5wHWAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
219
- AQAB/wHOAVUBAAH/Ad4BhAETAf8BzgFVAQAB/wHoAdkB2AH/AgAC/wIAAv8CAAL/AgAC/wGHAYEB6AH/
220
- AfcB5wHWAf8B9wHnAdYB/wFWAVAB7gH/AgAC/wIAAv8CAAL/ATABDwGyAf8BzgFVAQAB/wHeAYQBEwH/
221
- /wCBAAHOAVUBAAL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/
222
- Ae8B5wH/Ac4BVQEAAv8B9wHnAv8B9wHnAf8BzgFVAQAB/wHeAYQBGwH/Ad4BhAETAf8BzgFVAQAB/wGn
217
+ Ac4BVAEAAf//AIEAAc4BVAEAAf8B9wHnAdYB/wH3AecB1gH/AfcB5wHWAf8B9wHnAdYB/wH3AecB1gH/
218
+ AfcB5wHWAf8B9wHnAdYB/wH3AecB1gH/AfcB5wHWAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
219
+ AQAB/wHOAVQBAAH/Ad4BhAESAf8BzgFUAQAB/wHoAdkB2AH/AgAC/wIAAv8CAAL/AgAC/wGHAYEB6AH/
220
+ AfcB5wHWAf8B9wHnAdYB/wFVAU8B7gH/AgAC/wIAAv8CAAL/AS8BDgGyAf8BzgFUAQAB/wHeAYQBEgH/
221
+ /wCBAAHOAVQBAAL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/Ae8B5wL/
222
+ Ae8B5wH/Ac4BVAEAAv8B9wHnAv8B9wHnAf8BzgFUAQAB/wHeAYQBGgH/Ad4BhAESAf8BzgFUAQAB/wGn
223223 AZwB7wH/AgAC/wIAAv8CAAL/AgAC/wHQAcIB6wL/Ae8B5wL/Ae8B5wH/AdABwgHrAf8CAAL/AgAC/wIA
224
- Av8CAAL/AZEBSAFkAf8B3gGEARMB//8AgQABzgFVAQAC/wL3Av8C9wL/AvcC/wL3Av8C9wL/AvcC/wL3
225
- Av8C9wL/AvcB/wHOAVUBAAL/AfcB5wH/Ac4BVQEAAf8B3gGEASMB/wHeAYQBGwH/Ad4BhAETAf8BtQFJ
226
- ARAB/wIAAv8CAAL/AgAC/wIAAv8BWgFWAfsC/wL3Av8C9wL/AvcC/wL3Af8BRgEaAZcB/wIAAv8CAAL/
227
- AgAC/wIAAv8BwwFmAS0B//8AgQABzgFVAQAl/wHOAVUBAAH/Ac4BVQEAAf8B3gGMASMB/wHeAYQBIwH/
228
- Ad4BhAEbAf8B3gGEARMB/wHOAVUBACX/Ac4BVQEAAf8BzgFVAQAB/wHeAYwBIwH/Ad4BhAEjAf8B3gGE
229
- ARsB/wHeAYQBEwH//wCBAAHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
230
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8B5wGMASsB/wHeAYwBIwH/
231
- Ad4BhAEjAf8B3gGEARsB/wHeAYQBEwH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFV
232
- AQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHOAVUBAAH/Ac4BVQEAAf8BzgFVAQAB/wHnAYwBKwH/
233
- Ad4BjAEjAf8B3gGEASMB/wHeAYQBGwH/Ad4BhAETAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGM
234
- Av8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFlAf8B9wG1AWUB/wH3Aa0BXQH/Ae8BrQFdAf8B7wGt
235
- AVUB/wHvAaUBTAH/Ae8BpQFMAf8B7wGcAUQB/wHnAZwBPAH/AecBlAE8Af8B5wGUATQB/wHnAZQBNAH/
236
- AecBjAErAf8B3gGMASMB/wHeAYQBIwH/Ad4BhAEbAf8B3gGEARMB/wHeAYEBEwH/AdYBgQEKAf8B1gFl
237
- AQoB/wHWAWUBAgH/AdYBZQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BVQEAAf//AIEAAf8BzgGcAv8BzgGU
238
- Av8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFlAf8B9wG1AWUB/wH3Aa0BXQH/
239
- Ae8BrQFdAf8B7wGtAVUB/wHvAaUBTAH/Ae8BpQFMAf8B7wGcAUQB/wHnAZwBPAH/AecBlAE8Af8B5wGU
240
- ATQB/wHnAZQBNAH/AecBjAErAf8B3gGMASMB/wHeAYQBIwH/Ad4BhAEbAf8B3gGEARMB/wHeAYEBEwH/
241
- AdYBgQEKAf8B1gFlAQoB/wHWAWUBAgH/AdYBZQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BVQEAAf//AIEA
242
- Af8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFlAf8B9wG1
243
- AWUB/wH3Aa0BXQH/Ae8BrQFdAf8B7wGtAVUB/wHvAaUBTAH/Ae8BpQFMAf8B7wGcAUQB/wHnAZwBPAH/
244
- AecBlAE8Af8B5wGUATQB/wHnAZQBNAH/AecBjAErAf8B3gGMASMB/wHeAYQBIwH/Ad4BhAEbAf8B3gGE
245
- ARMB/wHeAYEBEwH/AdYBgQEKAf8B1gFlAQoB/wHWAWUBAgH/AdYBZQEAAf8BzgFdAQAB/wHOAV0BAAH/
246
- Ac4BVQEAAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/
247
- AfcBtQFlAf8B9wG1AWUB/wH3Aa0BXQH/Ae8BrQFdAf8B7wGtAVUB/wHvAaUBTAH/Ae8BpQFMAf8B7wGc
248
- AUQB/wHnAZwBPAH/AecBlAE8Af8B5wGUATQB/wHnAZQBNAH/AecBjAErAf8B3gGMASMB/wHeAYQBIwH/
249
- Ad4BhAEbAf8B3gGEARMB/wHeAYEBEwH/AdYBgQEKAf8B1gFlAQoB/wHWAWUBAgH/AdYBZQEAAf8BzgFd
250
- AQAB/wHOAV0BAAH/Ac4BVQEAAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9
251
- AYQB/wH3Ab0BgQH/AfcBtQFlAf8B9wG1AWUB/wH3Aa0BXQH/Ae8BrQFdAf8B7wGtAVUB/wHvAaUBTAH/
252
- Ae8BpQFMAf8B7wGcAUQB/wHnAZwBPAH/AecBlAE8Af8B5wGUATQB/wHnAZQBNAH/AecBjAErAf8B3gGM
253
- ASMB/wHeAYQBIwH/Ad4BhAEbAf8B3gGEARMB/wHeAYEBEwH/AdYBgQEKAf8B1gFlAQoB/wHWAWUBAgH/
254
- AdYBZQEAAf8BzgFdAQAB/wHOAV0BAAH/Ac4BVQEAAf//AIEAAUIBTQE+BwABPgMAASgDAAGAAwABIAMA
224
+ Av8CAAL/AZEBRwFjAf8B3gGEARIB//8AgQABzgFUAQAC/wL3Av8C9wL/AvcC/wL3Av8C9wL/AvcC/wL3
225
+ Av8C9wL/AvcB/wHOAVQBAAL/AfcB5wH/Ac4BVAEAAf8B3gGEASIB/wHeAYQBGgH/Ad4BhAESAf8BtQFI
226
+ AQ8B/wIAAv8CAAL/AgAC/wIAAv8BWQFVAfsC/wL3Av8C9wL/AvcC/wL3Af8BRQEZAZcB/wIAAv8CAAL/
227
+ AgAC/wIAAv8BwwFlASwB//8AgQABzgFUAQAl/wHOAVQBAAH/Ac4BVAEAAf8B3gGMASIB/wHeAYQBIgH/
228
+ Ad4BhAEaAf8B3gGEARIB/wHOAVQBACX/Ac4BVAEAAf8BzgFUAQAB/wHeAYwBIgH/Ad4BhAEiAf8B3gGE
229
+ ARoB/wHeAYQBEgH//wCBAAHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
230
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8B5wGMASoB/wHeAYwBIgH/
231
+ Ad4BhAEiAf8B3gGEARoB/wHeAYQBEgH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFU
232
+ AQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHOAVQBAAH/Ac4BVAEAAf8BzgFUAQAB/wHnAYwBKgH/
233
+ Ad4BjAEiAf8B3gGEASIB/wHeAYQBGgH/Ad4BhAESAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGM
234
+ Av8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFkAf8B9wG1AWQB/wH3Aa0BXAH/Ae8BrQFcAf8B7wGt
235
+ AVQB/wHvAaUBSwH/Ae8BpQFLAf8B7wGcAUMB/wHnAZwBOwH/AecBlAE7Af8B5wGUATMB/wHnAZQBMwH/
236
+ AecBjAEqAf8B3gGMASIB/wHeAYQBIgH/Ad4BhAEaAf8B3gGEARIB/wHeAYEBEgH/AdYBgQEJAf8B1gFk
237
+ AQkB/wHWAWQBAQH/AdYBZAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BVAEAAf//AIEAAf8BzgGcAv8BzgGU
238
+ Av8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFkAf8B9wG1AWQB/wH3Aa0BXAH/
239
+ Ae8BrQFcAf8B7wGtAVQB/wHvAaUBSwH/Ae8BpQFLAf8B7wGcAUMB/wHnAZwBOwH/AecBlAE7Af8B5wGU
240
+ ATMB/wHnAZQBMwH/AecBjAEqAf8B3gGMASIB/wHeAYQBIgH/Ad4BhAEaAf8B3gGEARIB/wHeAYEBEgH/
241
+ AdYBgQEJAf8B1gFkAQkB/wHWAWQBAQH/AdYBZAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BVAEAAf//AIEA
242
+ Af8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/AfcBtQFkAf8B9wG1
243
+ AWQB/wH3Aa0BXAH/Ae8BrQFcAf8B7wGtAVQB/wHvAaUBSwH/Ae8BpQFLAf8B7wGcAUMB/wHnAZwBOwH/
244
+ AecBlAE7Af8B5wGUATMB/wHnAZQBMwH/AecBjAEqAf8B3gGMASIB/wHeAYQBIgH/Ad4BhAEaAf8B3gGE
245
+ ARIB/wHeAYEBEgH/AdYBgQEJAf8B1gFkAQkB/wHWAWQBAQH/AdYBZAEAAf8BzgFcAQAB/wHOAVwBAAH/
246
+ Ac4BVAEAAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9AYQB/wH3Ab0BgQH/
247
+ AfcBtQFkAf8B9wG1AWQB/wH3Aa0BXAH/Ae8BrQFcAf8B7wGtAVQB/wHvAaUBSwH/Ae8BpQFLAf8B7wGc
248
+ AUMB/wHnAZwBOwH/AecBlAE7Af8B5wGUATMB/wHnAZQBMwH/AecBjAEqAf8B3gGMASIB/wHeAYQBIgH/
249
+ Ad4BhAEaAf8B3gGEARIB/wHeAYEBEgH/AdYBgQEJAf8B1gFkAQkB/wHWAWQBAQH/AdYBZAEAAf8BzgFc
250
+ AQAB/wHOAVwBAAH/Ac4BVAEAAf//AIEAAf8BzgGcAv8BzgGUAv8BxgGMAv8BxgGMAv8BvQGEAf8B9wG9
251
+ AYQB/wH3Ab0BgQH/AfcBtQFkAf8B9wG1AWQB/wH3Aa0BXAH/Ae8BrQFcAf8B7wGtAVQB/wHvAaUBSwH/
252
+ Ae8BpQFLAf8B7wGcAUMB/wHnAZwBOwH/AecBlAE7Af8B5wGUATMB/wHnAZQBMwH/AecBjAEqAf8B3gGM
253
+ ASIB/wHeAYQBIgH/Ad4BhAEaAf8B3gGEARIB/wHeAYEBEgH/AdYBgQEJAf8B1gFkAQkB/wHWAWQBAQH/
254
+ AdYBZAEAAf8BzgFcAQAB/wHOAVwBAAH/Ac4BVAEAAf//AIEAAUIBTQE+BwABPgMAASgDAAGAAwABIAMA
255255 AQEBAAEBBgABAhYAA///AP8AAwAL
256256 </value>
257257 </data>
DupliDelete/DupliDelete/Forms/MainForm.Designer.cs
....@@ -60,7 +60,6 @@
6060 this.searchPaneTab = new System.Windows.Forms.TabControl();
6161 this.tabPage1 = new System.Windows.Forms.TabPage();
6262 this.splitContainer3 = new System.Windows.Forms.SplitContainer();
63
- this.fileSystemTreeview = new DupliDelete.IndeterminableTreeview();
6463 this.fileSystemList = new System.Windows.Forms.ImageList(this.components);
6564 this.toolStrip3 = new System.Windows.Forms.ToolStrip();
6665 this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
....@@ -69,13 +68,13 @@
6968 this.refreshButton = new System.Windows.Forms.ToolStripButton();
7069 this.scanOptionsButton = new System.Windows.Forms.ToolStripButton();
7170 this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
71
+ this.scanNetworkForServersButton = new System.Windows.Forms.ToolStripButton();
7272 this.panel1 = new System.Windows.Forms.Panel();
7373 this.includeSubfoldersCheckbox = new System.Windows.Forms.CheckBox();
7474 this.folderList = new System.Windows.Forms.ListBox();
7575 this.toolStrip1 = new System.Windows.Forms.ToolStrip();
7676 this.removeSelected = new System.Windows.Forms.ToolStripButton();
7777 this.startSearchButton = new System.Windows.Forms.Button();
78
- this.mainList = new DupliDelete.DuplicateListView.DuplicateListView();
7978 this.searchStrip = new System.Windows.Forms.ToolStrip();
8079 this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
8180 this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
....@@ -175,7 +174,8 @@
175174 this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
176175 this.toolbarSmallList = new System.Windows.Forms.ImageList(this.components);
177176 this.balloonTip = new System.Windows.Forms.ToolTip(this.components);
178
- this.scanNetworkForServersButton = new System.Windows.Forms.ToolStripButton();
177
+ this.fileSystemTreeview = new DupliDelete.IndeterminableTreeview();
178
+ this.mainList = new DupliDelete.DuplicateListView.DuplicateListView();
179179 ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel1)).BeginInit();
180180 ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel2)).BeginInit();
181181 ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel3)).BeginInit();
....@@ -183,13 +183,16 @@
183183 ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel5)).BeginInit();
184184 ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel6)).BeginInit();
185185 this.itemRightClickedContext.SuspendLayout();
186
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
186187 this.splitContainer1.Panel1.SuspendLayout();
187188 this.splitContainer1.SuspendLayout();
189
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
188190 this.splitContainer2.Panel1.SuspendLayout();
189191 this.splitContainer2.Panel2.SuspendLayout();
190192 this.splitContainer2.SuspendLayout();
191193 this.searchPaneTab.SuspendLayout();
192194 this.tabPage1.SuspendLayout();
195
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
193196 this.splitContainer3.Panel1.SuspendLayout();
194197 this.splitContainer3.Panel2.SuspendLayout();
195198 this.splitContainer3.SuspendLayout();
....@@ -418,12 +421,13 @@
418421 //
419422 this.splitContainer2.Panel1.BackColor = System.Drawing.SystemColors.Control;
420423 this.splitContainer2.Panel1.Controls.Add(this.searchPaneTab);
424
+ this.splitContainer2.Panel1Collapsed = true;
421425 //
422426 // splitContainer2.Panel2
423427 //
424428 this.splitContainer2.Panel2.Controls.Add(this.mainList);
425429 this.splitContainer2.Size = new System.Drawing.Size(1069, 456);
426
- this.splitContainer2.SplitterDistance = 300;
430
+ this.splitContainer2.SplitterDistance = 313;
427431 this.splitContainer2.TabIndex = 15;
428432 //
429433 // searchPaneTab
....@@ -433,7 +437,7 @@
433437 this.searchPaneTab.Location = new System.Drawing.Point(0, 0);
434438 this.searchPaneTab.Name = "searchPaneTab";
435439 this.searchPaneTab.SelectedIndex = 0;
436
- this.searchPaneTab.Size = new System.Drawing.Size(300, 456);
440
+ this.searchPaneTab.Size = new System.Drawing.Size(313, 456);
437441 this.searchPaneTab.TabIndex = 1;
438442 //
439443 // tabPage1
....@@ -442,7 +446,7 @@
442446 this.tabPage1.Location = new System.Drawing.Point(4, 22);
443447 this.tabPage1.Name = "tabPage1";
444448 this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
445
- this.tabPage1.Size = new System.Drawing.Size(292, 430);
449
+ this.tabPage1.Size = new System.Drawing.Size(305, 430);
446450 this.tabPage1.TabIndex = 0;
447451 this.tabPage1.Text = "Scan Criteria";
448452 this.tabPage1.UseVisualStyleBackColor = true;
....@@ -463,27 +467,9 @@
463467 //
464468 this.splitContainer3.Panel2.Controls.Add(this.panel1);
465469 this.splitContainer3.Panel2.Controls.Add(this.startSearchButton);
466
- this.splitContainer3.Size = new System.Drawing.Size(286, 424);
470
+ this.splitContainer3.Size = new System.Drawing.Size(299, 424);
467471 this.splitContainer3.SplitterDistance = 180;
468472 this.splitContainer3.TabIndex = 0;
469
- //
470
- // fileSystemTreeview
471
- //
472
- this.fileSystemTreeview.Dock = System.Windows.Forms.DockStyle.Fill;
473
- this.fileSystemTreeview.ImageIndex = 0;
474
- this.fileSystemTreeview.ImageList = this.fileSystemList;
475
- this.fileSystemTreeview.Location = new System.Drawing.Point(0, 25);
476
- this.fileSystemTreeview.Name = "fileSystemTreeview";
477
- this.fileSystemTreeview.SelectedImageIndex = 0;
478
- this.fileSystemTreeview.Size = new System.Drawing.Size(286, 155);
479
- this.fileSystemTreeview.TabIndex = 13;
480
- this.fileSystemTreeview.NodeAddClicked += new DupliDelete.IndeterminableTreeview.NodeAddClickedDelegate(this.fileSystemTreeview_NodeAddClicked);
481
- this.fileSystemTreeview.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeview_AfterCheck);
482
- this.fileSystemTreeview.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeCollapse);
483
- this.fileSystemTreeview.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeExpand);
484
- this.fileSystemTreeview.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeview_AfterSelect);
485
- this.fileSystemTreeview.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.fileSystemTreeview_NodeMouseClick);
486
- this.fileSystemTreeview.MouseMove += new System.Windows.Forms.MouseEventHandler(this.fileSystemTreeview_MouseMove);
487473 //
488474 // fileSystemList
489475 //
....@@ -509,7 +495,7 @@
509495 this.toolStrip3.Location = new System.Drawing.Point(0, 0);
510496 this.toolStrip3.Name = "toolStrip3";
511497 this.toolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
512
- this.toolStrip3.Size = new System.Drawing.Size(286, 25);
498
+ this.toolStrip3.Size = new System.Drawing.Size(299, 25);
513499 this.toolStrip3.TabIndex = 10;
514500 this.toolStrip3.Text = "toolStrip3";
515501 //
....@@ -554,10 +540,11 @@
554540 //
555541 // scanOptionsButton
556542 //
543
+ this.scanOptionsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
557544 this.scanOptionsButton.Image = ((System.Drawing.Image)(resources.GetObject("scanOptionsButton.Image")));
558545 this.scanOptionsButton.ImageTransparentColor = System.Drawing.Color.Magenta;
559546 this.scanOptionsButton.Name = "scanOptionsButton";
560
- this.scanOptionsButton.Size = new System.Drawing.Size(106, 20);
547
+ this.scanOptionsButton.Size = new System.Drawing.Size(23, 22);
561548 this.scanOptionsButton.Text = "Scan Options...";
562549 this.scanOptionsButton.Click += new System.EventHandler(this.scanOptionsButton_Click);
563550 //
....@@ -571,6 +558,15 @@
571558 this.toolStripButton2.Visible = false;
572559 this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
573560 //
561
+ // scanNetworkForServersButton
562
+ //
563
+ this.scanNetworkForServersButton.Image = ((System.Drawing.Image)(resources.GetObject("scanNetworkForServersButton.Image")));
564
+ this.scanNetworkForServersButton.ImageTransparentColor = System.Drawing.Color.Magenta;
565
+ this.scanNetworkForServersButton.Name = "scanNetworkForServersButton";
566
+ this.scanNetworkForServersButton.Size = new System.Drawing.Size(164, 20);
567
+ this.scanNetworkForServersButton.Text = "Scan network for servers...";
568
+ this.scanNetworkForServersButton.ToolTipText = "Scan for network clients...";
569
+ //
574570 // panel1
575571 //
576572 this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
....@@ -581,7 +577,7 @@
581577 this.panel1.Controls.Add(this.toolStrip1);
582578 this.panel1.Location = new System.Drawing.Point(3, 3);
583579 this.panel1.Name = "panel1";
584
- this.panel1.Size = new System.Drawing.Size(280, 206);
580
+ this.panel1.Size = new System.Drawing.Size(293, 206);
585581 this.panel1.TabIndex = 15;
586582 //
587583 // includeSubfoldersCheckbox
....@@ -608,7 +604,7 @@
608604 this.folderList.HorizontalScrollbar = true;
609605 this.folderList.Location = new System.Drawing.Point(0, 25);
610606 this.folderList.Name = "folderList";
611
- this.folderList.Size = new System.Drawing.Size(280, 199);
607
+ this.folderList.Size = new System.Drawing.Size(293, 147);
612608 this.folderList.TabIndex = 9;
613609 //
614610 // toolStrip1
....@@ -618,7 +614,7 @@
618614 this.removeSelected});
619615 this.toolStrip1.Location = new System.Drawing.Point(0, 0);
620616 this.toolStrip1.Name = "toolStrip1";
621
- this.toolStrip1.Size = new System.Drawing.Size(280, 25);
617
+ this.toolStrip1.Size = new System.Drawing.Size(293, 25);
622618 this.toolStrip1.TabIndex = 0;
623619 this.toolStrip1.Text = "toolStrip1";
624620 //
....@@ -638,30 +634,11 @@
638634 this.startSearchButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
639635 this.startSearchButton.Location = new System.Drawing.Point(3, 210);
640636 this.startSearchButton.Name = "startSearchButton";
641
- this.startSearchButton.Size = new System.Drawing.Size(282, 25);
637
+ this.startSearchButton.Size = new System.Drawing.Size(295, 25);
642638 this.startSearchButton.TabIndex = 14;
643639 this.startSearchButton.Text = "Search";
644640 this.startSearchButton.UseVisualStyleBackColor = true;
645641 this.startSearchButton.Click += new System.EventHandler(this.startSearch_Click);
646
- //
647
- // mainList
648
- //
649
- this.mainList.BackColor = System.Drawing.Color.White;
650
- this.mainList.Dock = System.Windows.Forms.DockStyle.Fill;
651
- this.mainList.Location = new System.Drawing.Point(0, 0);
652
- this.mainList.Margin = new System.Windows.Forms.Padding(4);
653
- this.mainList.Name = "mainList";
654
- this.mainList.Size = new System.Drawing.Size(765, 456);
655
- this.mainList.TabIndex = 16;
656
- this.mainList.Visible = false;
657
- this.mainList.ListChanged += new DupliDelete.DuplicateListView.DuplicateListView.ListChangedDelegate(this.mainList_ListChanged);
658
- this.mainList.DeleteButtonClicked += new DupliDelete.DuplicateListView.DuplicateListView.DeleteButtonClickedDelegate(this.mainList_DeleteButtonClicked);
659
- this.mainList.LinkButtonClicked += new DupliDelete.DuplicateListView.DuplicateListView.LinkButtonClickedDelegate(this.mainList_LinkButtonClicked);
660
- this.mainList.ItemDoubleClicked += new DupliDelete.DuplicateListView.DuplicateListView.ItemDoubleClickedDelegate(this.mainList_ItemDoubleClicked);
661
- this.mainList.ItemRightClicked += new DupliDelete.DuplicateListView.DuplicateListView.ItemRightClickedDelegate(this.mainList_ItemRightClicked);
662
- this.mainList.ItemChecked += new DupliDelete.DuplicateListView.DuplicateListView.ItemCheckedDelegate(this.mainList_ItemChecked);
663
- this.mainList.VisibleChanged += new System.EventHandler(this.mainList_VisibleChanged);
664
- this.mainList.MouseEnter += new System.EventHandler(this.mainList_MouseEnter);
665642 //
666643 // searchStrip
667644 //
....@@ -1644,14 +1621,42 @@
16441621 //
16451622 this.balloonTip.IsBalloon = true;
16461623 //
1647
- // scanNetworkForServersButton
1624
+ // fileSystemTreeview
16481625 //
1649
- this.scanNetworkForServersButton.Image = ((System.Drawing.Image)(resources.GetObject("scanNetworkForServersButton.Image")));
1650
- this.scanNetworkForServersButton.ImageTransparentColor = System.Drawing.Color.Magenta;
1651
- this.scanNetworkForServersButton.Name = "scanNetworkForServersButton";
1652
- this.scanNetworkForServersButton.Size = new System.Drawing.Size(164, 20);
1653
- this.scanNetworkForServersButton.Text = "Scan network for servers...";
1654
- this.scanNetworkForServersButton.ToolTipText = "Scan for network clients...";
1626
+ this.fileSystemTreeview.Dock = System.Windows.Forms.DockStyle.Fill;
1627
+ this.fileSystemTreeview.ImageIndex = 0;
1628
+ this.fileSystemTreeview.ImageList = this.fileSystemList;
1629
+ this.fileSystemTreeview.Location = new System.Drawing.Point(0, 25);
1630
+ this.fileSystemTreeview.Name = "fileSystemTreeview";
1631
+ this.fileSystemTreeview.SelectedImageIndex = 0;
1632
+ this.fileSystemTreeview.Size = new System.Drawing.Size(299, 155);
1633
+ this.fileSystemTreeview.TabIndex = 13;
1634
+ this.fileSystemTreeview.NodeAddClicked += new DupliDelete.IndeterminableTreeview.NodeAddClickedDelegate(this.fileSystemTreeview_NodeAddClicked);
1635
+ this.fileSystemTreeview.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeview_AfterCheck);
1636
+ this.fileSystemTreeview.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeCollapse);
1637
+ this.fileSystemTreeview.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeExpand);
1638
+ this.fileSystemTreeview.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeview_AfterSelect);
1639
+ this.fileSystemTreeview.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.fileSystemTreeview_NodeMouseClick);
1640
+ this.fileSystemTreeview.MouseMove += new System.Windows.Forms.MouseEventHandler(this.fileSystemTreeview_MouseMove);
1641
+ //
1642
+ // mainList
1643
+ //
1644
+ this.mainList.BackColor = System.Drawing.Color.White;
1645
+ this.mainList.Dock = System.Windows.Forms.DockStyle.Fill;
1646
+ this.mainList.Location = new System.Drawing.Point(0, 0);
1647
+ this.mainList.Margin = new System.Windows.Forms.Padding(4);
1648
+ this.mainList.Name = "mainList";
1649
+ this.mainList.Size = new System.Drawing.Size(1069, 456);
1650
+ this.mainList.TabIndex = 16;
1651
+ this.mainList.Visible = false;
1652
+ this.mainList.ListChanged += new DupliDelete.DuplicateListView.DuplicateListView.ListChangedDelegate(this.mainList_ListChanged);
1653
+ this.mainList.DeleteButtonClicked += new DupliDelete.DuplicateListView.DuplicateListView.DeleteButtonClickedDelegate(this.mainList_DeleteButtonClicked);
1654
+ this.mainList.LinkButtonClicked += new DupliDelete.DuplicateListView.DuplicateListView.LinkButtonClickedDelegate(this.mainList_LinkButtonClicked);
1655
+ this.mainList.ItemDoubleClicked += new DupliDelete.DuplicateListView.DuplicateListView.ItemDoubleClickedDelegate(this.mainList_ItemDoubleClicked);
1656
+ this.mainList.ItemRightClicked += new DupliDelete.DuplicateListView.DuplicateListView.ItemRightClickedDelegate(this.mainList_ItemRightClicked);
1657
+ this.mainList.ItemChecked += new DupliDelete.DuplicateListView.DuplicateListView.ItemCheckedDelegate(this.mainList_ItemChecked);
1658
+ this.mainList.VisibleChanged += new System.EventHandler(this.mainList_VisibleChanged);
1659
+ this.mainList.MouseEnter += new System.EventHandler(this.mainList_MouseEnter);
16551660 //
16561661 // Form1
16571662 //
....@@ -1669,7 +1674,7 @@
16691674 this.MinimumSize = new System.Drawing.Size(196, 191);
16701675 this.Name = "Form1";
16711676 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
1672
- this.Text = "Duplicate Commander 3.1 Beta 3";
1677
+ this.Text = "Duplicate Commander 3.1 Beta 4";
16731678 this.Activated += new System.EventHandler(this.Form1_Activated);
16741679 this.Deactivate += new System.EventHandler(this.Form1_Deactivate);
16751680 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
....@@ -1685,15 +1690,18 @@
16851690 this.itemRightClickedContext.ResumeLayout(false);
16861691 this.splitContainer1.Panel1.ResumeLayout(false);
16871692 this.splitContainer1.Panel1.PerformLayout();
1693
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
16881694 this.splitContainer1.ResumeLayout(false);
16891695 this.splitContainer2.Panel1.ResumeLayout(false);
16901696 this.splitContainer2.Panel2.ResumeLayout(false);
1697
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
16911698 this.splitContainer2.ResumeLayout(false);
16921699 this.searchPaneTab.ResumeLayout(false);
16931700 this.tabPage1.ResumeLayout(false);
16941701 this.splitContainer3.Panel1.ResumeLayout(false);
16951702 this.splitContainer3.Panel1.PerformLayout();
16961703 this.splitContainer3.Panel2.ResumeLayout(false);
1704
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
16971705 this.splitContainer3.ResumeLayout(false);
16981706 this.toolStrip3.ResumeLayout(false);
16991707 this.toolStrip3.PerformLayout();
DupliDelete/DupliDelete/Forms/MainForm.cs
....@@ -370,6 +370,7 @@
370370
371371 // get this version; it's stored in the title of the window
372372 version_string = GetVersionString();
373
+ Text = "Duplicate Commander " + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
373374
374375 // check for updates
375376 ThreadStart ts1 = new ThreadStart(CheckForUpdates);
DupliDelete/DupliDelete/Forms/MainForm.resx
....@@ -112,26 +112,32 @@
112112 <value>2.0</value>
113113 </resheader>
114114 <resheader name="reader">
115
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116 </resheader>
117117 <resheader name="writer">
118
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120
- <metadata name="itemRightClickedContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
120
+ <metadata name="itemRightClickedContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121 <value>125, 17</value>
122122 </metadata>
123
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
123
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124124 <value>433, 17</value>
125125 </metadata>
126
- <metadata name="fileSystemList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
126
+ <metadata name="searchStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127
+ <value>756, 17</value>
128
+ </metadata>
129
+ <metadata name="commandStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130
+ <value>868, 17</value>
131
+ </metadata>
132
+ <metadata name="fileSystemList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127133 <value>645, 56</value>
128134 </metadata>
129135 <data name="fileSystemList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
130136 <value>
131
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
137
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
132138 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
133139 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs
134
- DAAAAk1TRnQBSQFMAgEBBQEAARQBIgEUASIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
140
+ DAAAAk1TRnQBSQFMAgEBBQEAASwBIgEsASIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
135141 AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
136142 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
137143 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
....@@ -186,10 +192,13 @@
186192 Cw==
187193 </value>
188194 </data>
189
- <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
195
+ <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
190196 <value>424, 95</value>
191197 </metadata>
192
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
198
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
199
+ <value>757, 85</value>
200
+ </metadata>
201
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
193202 <data name="newToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
194203 <value>
195204 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
....@@ -306,7 +315,7 @@
306315 TgDQASA1MVpwzwAAAABJRU5ErkJggg==
307316 </value>
308317 </data>
309
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
318
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
310319 <value>757, 85</value>
311320 </metadata>
312321 <data name="removeSelected.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
....@@ -327,9 +336,6 @@
327336 AABJRU5ErkJggg==
328337 </value>
329338 </data>
330
- <metadata name="searchStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
331
- <value>756, 17</value>
332
- </metadata>
333339 <data name="checkFound.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
334340 <value>
335341 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
....@@ -425,9 +431,6 @@
425431 QiF8En7z2mDjw3Xy+Xz5bh0ORwPDNe0v0D65jMrNP/MAAAAASUVORK5CYII=
426432 </value>
427433 </data>
428
- <metadata name="commandStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
429
- <value>868, 17</value>
430
- </metadata>
431434 <data name="searchButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
432435 <value>
433436 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
....@@ -1264,30 +1267,30 @@
12641267 KBgLnpRn2jHmg0ZnLicn5+8Jgm/9LD0h2cQZXwAAAABJRU5ErkJggg==
12651268 </value>
12661269 </data>
1267
- <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1270
+ <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12681271 <value>17, 17</value>
12691272 </metadata>
1270
- <metadata name="pinnedList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1273
+ <metadata name="pinnedList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12711274 <value>520, 17</value>
12721275 </metadata>
1273
- <metadata name="recentFileList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1276
+ <metadata name="recentFileList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12741277 <value>311, 17</value>
12751278 </metadata>
1276
- <metadata name="updateFlasher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1279
+ <metadata name="updateFlasher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12771280 <value>628, 17</value>
12781281 </metadata>
1279
- <metadata name="pinnedRightClickMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1282
+ <metadata name="pinnedRightClickMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12801283 <value>288, 56</value>
12811284 </metadata>
1282
- <metadata name="pinnedProfilesImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1285
+ <metadata name="pinnedProfilesImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12831286 <value>463, 56</value>
12841287 </metadata>
12851288 <data name="pinnedProfilesImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
12861289 <value>
1287
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
1290
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
12881291 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
12891292 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
1290
- CAAAAk1TRnQBSQFMAwEBAAHQASEB0AEhARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
1293
+ CAAAAk1TRnQBSQFMAwEBAAHoASEB6AEhARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
12911294 AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
12921295 AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
12931296 AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
....@@ -1325,21 +1328,21 @@
13251328 Cw==
13261329 </value>
13271330 </data>
1328
- <metadata name="fullScreenTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1331
+ <metadata name="fullScreenTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
13291332 <value>770, 56</value>
13301333 </metadata>
1331
- <metadata name="pinnedContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1334
+ <metadata name="pinnedContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
13321335 <value>17, 95</value>
13331336 </metadata>
1334
- <metadata name="toolbarSmallList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1337
+ <metadata name="toolbarSmallList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
13351338 <value>180, 95</value>
13361339 </metadata>
13371340 <data name="toolbarSmallList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
13381341 <value>
1339
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
1342
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
13401343 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
13411344 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACa
1342
- HAEAAk1TRnQBSQFMAgEBIQEAARABEgEQARIBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg
1345
+ HAEAAk1TRnQBSQFMAgEBIQEAASgBEgEoARIBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg
13431346 AwAB2AMAAQEBAAEgBgABRAEBFQAD6gH/A7IB/wOWAf8D1wH//wBxAAPXAf8BAAGZAcwB/wOGAf8DhgH/
13441347 A9cB//8AcQABmQHMAv8BAAGZAcwB/wOGAf8DhgH/A8AB/wPjAf8D4wH/A+MB/wPxAf//AGEAAZkBzAL/
13451348 AQABmQHMAf8DhgH/BAADhgH/A4YB/wOGAf8DsgH/A+MB//8AXQABzAP/AZkCzAH/A5YB/wHMApkB/wHw
....@@ -2556,10 +2559,10 @@
25562559 AT8B/wEAAT8B/wEAAX8B/wGAAQEK/ws=
25572560 </value>
25582561 </data>
2559
- <metadata name="balloonTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
2562
+ <metadata name="balloonTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
25602563 <value>635, 81</value>
25612564 </metadata>
2562
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
2565
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
25632566 <value>73</value>
25642567 </metadata>
25652568 <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
DupliDelete/DupliDelete/Properties/AssemblyInfo.cs
....@@ -11,7 +11,7 @@
1111 [assembly: AssemblyConfiguration("")]
1212 [assembly: AssemblyCompany("RayburnSoft")]
1313 [assembly: AssemblyProduct("Duplicate Commander")]
14
-[assembly: AssemblyCopyright("© 2010-2012 by Rayburn Davis")]
14
+[assembly: AssemblyCopyright("© 2010-2014 by Rayburn Davis")]
1515 [assembly: AssemblyTrademark("RayburnSoft.net")]
1616 [assembly: AssemblyCulture("")]
1717
....@@ -30,6 +30,6 @@
3030 // Build Number
3131 // Revision
3232 //
33
-[assembly: AssemblyVersion("3.0.0.0")]
34
-[assembly: AssemblyFileVersion("3.0.0.0")]
33
+[assembly: AssemblyVersion("3.2.*")]
34
+[assembly: AssemblyFileVersion("3.2.*")]
3535 [assembly: NeutralResourcesLanguageAttribute("en")]
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.exe
Binary files differ
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.pdb
Binary files differ
DupliDelete/DupliDelete/bin/Debug/System.Windows.Forms.Ribbon.pdb
deleted file mode 100644Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.About.resources
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Form1.resources
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.FileListAbsolute.txt
....@@ -270,8 +270,6 @@
270270 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\Duplicate Commander.pdb
271271 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\bin\Debug\Duplicate Commander.exe
272272 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\bin\Debug\Duplicate Commander.pdb
273
-C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\bin\Debug\System.Windows.Forms.Ribbon.pdb
274
-C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.csprojResolveAssemblyReference.cache
275273 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.AddNetworkClient.resources
276274 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.AdvancedSearch.resources
277275 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.CheckboxListview.CheckboxListview.resources
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.GenerateResource.Cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csprojResolveAssemblyReference.cache
deleted file mode 100644Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.exe
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.pdb
Binary files differ