Rename types

Analogy-LogViewer · Aug 5, 2023 · 1649310 · 1649310
1 parent 8f0b2e3
commit 1649310
Show file tree

Hide file tree

Showing 16 changed files with 908 additions and 908 deletions.
diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj
@@ -485,9 +485,9 @@
 		<Compile Update="UserControls\CombineFilesUC.Designer.cs">
 			<DependentUpon>CombineFilesUC.cs</DependentUpon>
 		</Compile>
-		<Compile Update="UserControls\FileSystemUC.cs" />
-		<Compile Update="UserControls\FileSystemUC.Designer.cs">
-			<DependentUpon>FileSystemUC.cs</DependentUpon>
+		<Compile Update="UserControls\FolderAndFileSystemUC.cs" />
+		<Compile Update="UserControls\FolderAndFileSystemUC.Designer.cs">
+			<DependentUpon>FolderAndFileSystemUC.cs</DependentUpon>
 		</Compile>
 		<Compile Update="UserControls\FolderTreeViewUC.cs" />
 		<Compile Update="UserControls\FolderTreeViewUC.Designer.cs">
@@ -567,9 +567,9 @@
 		<Compile Update="UserControls\XtraUCDirectoryListing.Designer.cs">
 			<DependentUpon>XtraUCDirectoryListing.cs</DependentUpon>
 		</Compile>
-		<Compile Update="UserControls\XtraUCFileSystem.cs" />
-		<Compile Update="UserControls\XtraUCFileSystem.Designer.cs">
-			<DependentUpon>XtraUCFileSystem.cs</DependentUpon>
+		<Compile Update="UserControls\FileSystemUC.cs" />
+		<Compile Update="UserControls\FileSystemUC.Designer.cs">
+			<DependentUpon>FileSystemUC.cs</DependentUpon>
 		</Compile>
 		<None Include="..\icon.png">
 			<Pack>True</Pack>
@@ -664,8 +664,8 @@
 		<EmbeddedResource Update="UserControls\CombineFilesUC.resx">
 			<DependentUpon>CombineFilesUC.cs</DependentUpon>
 		</EmbeddedResource>
-		<EmbeddedResource Update="UserControls\FileSystemUC.resx">
-			<DependentUpon>FileSystemUC.cs</DependentUpon>
+		<EmbeddedResource Update="UserControls\FolderAndFileSystemUC.resx">
+			<DependentUpon>FolderAndFileSystemUC.cs</DependentUpon>
 		</EmbeddedResource>
 		<EmbeddedResource Update="UserControls\FolderTreeViewUC.resx">
 			<DependentUpon>FolderTreeViewUC.cs</DependentUpon>
@@ -717,8 +717,8 @@
 			<DependentUpon>XtraUCDirectoryListing.cs</DependentUpon>
 			<SubType>Designer</SubType>
 		</EmbeddedResource>
-		<EmbeddedResource Update="UserControls\XtraUCFileSystem.resx">
-			<DependentUpon>XtraUCFileSystem.cs</DependentUpon>
+		<EmbeddedResource Update="UserControls\FileSystemUC.resx">
+			<DependentUpon>FileSystemUC.cs</DependentUpon>
 			<SubType>Designer</SubType>
 		</EmbeddedResource>
 		<None Include="Resources\Info_16x16.png" />

diff --git a/Analogy/UserControls/CombineFilesUC.Designer.cs b/Analogy/UserControls/CombineFilesUC.Designer.cs
diff --git a/Analogy/UserControls/CombineFilesUC.cs b/Analogy/UserControls/CombineFilesUC.cs
@@ -16,7 +16,7 @@ public CombineFilesUC()
 
         private async void sBtnCombined_Click(object sender, EventArgs e)
         {
-            var files = fileSystemUC1.GetSelectedFileNames();
+            var files = _folderAndFileSystemUc1.GetSelectedFileNames();
             processFilesUC1.SetFilesToProcess(files);
             await processFilesUC1.ProcessFilesAndCombine(offlineAnalogy);
             sBtnSave.Visible = true;
@@ -41,7 +41,7 @@ private async void sBtnSave_Click(object sender, EventArgs e)
         public void SetDataSource(IAnalogyOfflineDataProvider analogyOfflineDataProvider)
         {
             offlineAnalogy = analogyOfflineDataProvider;
-            this.fileSystemUC1.DataProvider = offlineAnalogy;
+            this._folderAndFileSystemUc1.DataProvider = offlineAnalogy;
         }