From 126848c6464884f4518c768f4fd4975b7385f2a8 Mon Sep 17 00:00:00 2001 From: dexy Date: Tue, 25 Feb 2020 22:26:34 +1100 Subject: [PATCH] Updating forms namespaces to match folders to fix resources bug --- CodeWalker/ExploreForm.cs | 1 + CodeWalker/MenuForm.cs | 1 + CodeWalker/Project/ProjectForm.cs | 1 + CodeWalker/Tools/AboutForm.Designer.cs | 2 +- CodeWalker/Tools/AboutForm.cs | 2 +- CodeWalker/Tools/BinarySearchForm.Designer.cs | 2 +- CodeWalker/Tools/BinarySearchForm.cs | 2 +- CodeWalker/Tools/BrowseForm.Designer.cs | 2 +- CodeWalker/Tools/BrowseForm.cs | 2 +- CodeWalker/Tools/ExtractKeysForm.Designer.cs | 2 +- CodeWalker/Tools/ExtractKeysForm.cs | 2 +- CodeWalker/Tools/ExtractRawForm.Designer.cs | 2 +- CodeWalker/Tools/ExtractRawForm.cs | 2 +- CodeWalker/Tools/ExtractScriptsForm.Designer.cs | 2 +- CodeWalker/Tools/ExtractScriptsForm.cs | 2 +- CodeWalker/Tools/ExtractShadersForm.Designer.cs | 2 +- CodeWalker/Tools/ExtractShadersForm.cs | 2 +- CodeWalker/Tools/ExtractTexForm.Designer.cs | 2 +- CodeWalker/Tools/ExtractTexForm.cs | 2 +- CodeWalker/Tools/ImportFbxForm.Designer.cs | 2 +- CodeWalker/Tools/ImportFbxForm.cs | 2 +- CodeWalker/Tools/JenkGenForm.Designer.cs | 2 +- CodeWalker/Tools/JenkGenForm.cs | 2 +- CodeWalker/Tools/JenkIndForm.Designer.cs | 2 +- CodeWalker/Tools/JenkIndForm.cs | 2 +- CodeWalker/Utils/GTAFolder.cs | 1 + CodeWalker/Utils/KeyBindForm.Designer.cs | 2 +- CodeWalker/Utils/KeyBindForm.cs | 2 +- CodeWalker/Utils/SelectFolderForm.Designer.cs | 2 +- CodeWalker/Utils/SelectFolderForm.cs | 2 +- CodeWalker/Utils/TextInputForm.Designer.cs | 2 +- CodeWalker/Utils/TextInputForm.cs | 2 +- CodeWalker/World/SettingsForm.Designer.cs | 2 +- CodeWalker/World/SettingsForm.cs | 3 ++- CodeWalker/World/StatisticsForm.Designer.cs | 2 +- CodeWalker/World/StatisticsForm.cs | 2 +- CodeWalker/World/WorldInfoForm.Designer.cs | 2 +- CodeWalker/World/WorldInfoForm.cs | 2 +- CodeWalker/World/WorldSearchForm.Designer.cs | 2 +- CodeWalker/World/WorldSearchForm.cs | 2 +- CodeWalker/WorldForm.cs | 1 + 41 files changed, 42 insertions(+), 36 deletions(-) diff --git a/CodeWalker/ExploreForm.cs b/CodeWalker/ExploreForm.cs index e5a2bac..28276ef 100644 --- a/CodeWalker/ExploreForm.cs +++ b/CodeWalker/ExploreForm.cs @@ -1,6 +1,7 @@ using CodeWalker.Forms; using CodeWalker.GameFiles; using CodeWalker.Properties; +using CodeWalker.Tools; using CodeWalker.World; using System; using System.Collections.Generic; diff --git a/CodeWalker/MenuForm.cs b/CodeWalker/MenuForm.cs index 2dc9edf..80eab13 100644 --- a/CodeWalker/MenuForm.cs +++ b/CodeWalker/MenuForm.cs @@ -1,4 +1,5 @@ using CodeWalker.Properties; +using CodeWalker.Tools; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/CodeWalker/Project/ProjectForm.cs b/CodeWalker/Project/ProjectForm.cs index 76f1234..ba0062a 100644 --- a/CodeWalker/Project/ProjectForm.cs +++ b/CodeWalker/Project/ProjectForm.cs @@ -1,6 +1,7 @@ using CodeWalker.GameFiles; using CodeWalker.Project.Panels; using CodeWalker.Properties; +using CodeWalker.Utils; using CodeWalker.World; using SharpDX; using System; diff --git a/CodeWalker/Tools/AboutForm.Designer.cs b/CodeWalker/Tools/AboutForm.Designer.cs index 689e67c..3d49e85 100644 --- a/CodeWalker/Tools/AboutForm.Designer.cs +++ b/CodeWalker/Tools/AboutForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class AboutForm { diff --git a/CodeWalker/Tools/AboutForm.cs b/CodeWalker/Tools/AboutForm.cs index 4e7c34d..c9f32d6 100644 --- a/CodeWalker/Tools/AboutForm.cs +++ b/CodeWalker/Tools/AboutForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class AboutForm : Form { diff --git a/CodeWalker/Tools/BinarySearchForm.Designer.cs b/CodeWalker/Tools/BinarySearchForm.Designer.cs index fb9ecd6..c1c1189 100644 --- a/CodeWalker/Tools/BinarySearchForm.Designer.cs +++ b/CodeWalker/Tools/BinarySearchForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class BinarySearchForm { diff --git a/CodeWalker/Tools/BinarySearchForm.cs b/CodeWalker/Tools/BinarySearchForm.cs index 5533f53..8c052ba 100644 --- a/CodeWalker/Tools/BinarySearchForm.cs +++ b/CodeWalker/Tools/BinarySearchForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class BinarySearchForm : Form { diff --git a/CodeWalker/Tools/BrowseForm.Designer.cs b/CodeWalker/Tools/BrowseForm.Designer.cs index 9c9c3f7..1f4c84b 100644 --- a/CodeWalker/Tools/BrowseForm.Designer.cs +++ b/CodeWalker/Tools/BrowseForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class BrowseForm { diff --git a/CodeWalker/Tools/BrowseForm.cs b/CodeWalker/Tools/BrowseForm.cs index 6bc80de..9da635c 100644 --- a/CodeWalker/Tools/BrowseForm.cs +++ b/CodeWalker/Tools/BrowseForm.cs @@ -14,7 +14,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class BrowseForm : Form { diff --git a/CodeWalker/Tools/ExtractKeysForm.Designer.cs b/CodeWalker/Tools/ExtractKeysForm.Designer.cs index 6daed46..d265bc5 100644 --- a/CodeWalker/Tools/ExtractKeysForm.Designer.cs +++ b/CodeWalker/Tools/ExtractKeysForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ExtractKeysForm { diff --git a/CodeWalker/Tools/ExtractKeysForm.cs b/CodeWalker/Tools/ExtractKeysForm.cs index 55a0b81..15c942c 100644 --- a/CodeWalker/Tools/ExtractKeysForm.cs +++ b/CodeWalker/Tools/ExtractKeysForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ExtractKeysForm : Form { diff --git a/CodeWalker/Tools/ExtractRawForm.Designer.cs b/CodeWalker/Tools/ExtractRawForm.Designer.cs index cffa243..a5f974f 100644 --- a/CodeWalker/Tools/ExtractRawForm.Designer.cs +++ b/CodeWalker/Tools/ExtractRawForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ExtractRawForm { diff --git a/CodeWalker/Tools/ExtractRawForm.cs b/CodeWalker/Tools/ExtractRawForm.cs index c97cf14..003ad9f 100644 --- a/CodeWalker/Tools/ExtractRawForm.cs +++ b/CodeWalker/Tools/ExtractRawForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ExtractRawForm : Form { diff --git a/CodeWalker/Tools/ExtractScriptsForm.Designer.cs b/CodeWalker/Tools/ExtractScriptsForm.Designer.cs index 62ce428..a09d493 100644 --- a/CodeWalker/Tools/ExtractScriptsForm.Designer.cs +++ b/CodeWalker/Tools/ExtractScriptsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ExtractScriptsForm { diff --git a/CodeWalker/Tools/ExtractScriptsForm.cs b/CodeWalker/Tools/ExtractScriptsForm.cs index a7adee3..6a54a3b 100644 --- a/CodeWalker/Tools/ExtractScriptsForm.cs +++ b/CodeWalker/Tools/ExtractScriptsForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ExtractScriptsForm : Form { diff --git a/CodeWalker/Tools/ExtractShadersForm.Designer.cs b/CodeWalker/Tools/ExtractShadersForm.Designer.cs index 0cd2d4a..1e9f863 100644 --- a/CodeWalker/Tools/ExtractShadersForm.Designer.cs +++ b/CodeWalker/Tools/ExtractShadersForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ExtractShadersForm { diff --git a/CodeWalker/Tools/ExtractShadersForm.cs b/CodeWalker/Tools/ExtractShadersForm.cs index 233410e..6caffc8 100644 --- a/CodeWalker/Tools/ExtractShadersForm.cs +++ b/CodeWalker/Tools/ExtractShadersForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ExtractShadersForm : Form { diff --git a/CodeWalker/Tools/ExtractTexForm.Designer.cs b/CodeWalker/Tools/ExtractTexForm.Designer.cs index b79ae82..0b7f278 100644 --- a/CodeWalker/Tools/ExtractTexForm.Designer.cs +++ b/CodeWalker/Tools/ExtractTexForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ExtractTexForm { diff --git a/CodeWalker/Tools/ExtractTexForm.cs b/CodeWalker/Tools/ExtractTexForm.cs index 4442eb8..c679783 100644 --- a/CodeWalker/Tools/ExtractTexForm.cs +++ b/CodeWalker/Tools/ExtractTexForm.cs @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ExtractTexForm : Form { diff --git a/CodeWalker/Tools/ImportFbxForm.Designer.cs b/CodeWalker/Tools/ImportFbxForm.Designer.cs index 4ce3d52..ed245fa 100644 --- a/CodeWalker/Tools/ImportFbxForm.Designer.cs +++ b/CodeWalker/Tools/ImportFbxForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class ImportFbxForm { diff --git a/CodeWalker/Tools/ImportFbxForm.cs b/CodeWalker/Tools/ImportFbxForm.cs index f277c65..aa0bb07 100644 --- a/CodeWalker/Tools/ImportFbxForm.cs +++ b/CodeWalker/Tools/ImportFbxForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class ImportFbxForm : Form { diff --git a/CodeWalker/Tools/JenkGenForm.Designer.cs b/CodeWalker/Tools/JenkGenForm.Designer.cs index c4fd48c..6c90f1b 100644 --- a/CodeWalker/Tools/JenkGenForm.Designer.cs +++ b/CodeWalker/Tools/JenkGenForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class JenkGenForm { diff --git a/CodeWalker/Tools/JenkGenForm.cs b/CodeWalker/Tools/JenkGenForm.cs index f7291d9..1180b15 100644 --- a/CodeWalker/Tools/JenkGenForm.cs +++ b/CodeWalker/Tools/JenkGenForm.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class JenkGenForm : Form { diff --git a/CodeWalker/Tools/JenkIndForm.Designer.cs b/CodeWalker/Tools/JenkIndForm.Designer.cs index ed40902..3076579 100644 --- a/CodeWalker/Tools/JenkIndForm.Designer.cs +++ b/CodeWalker/Tools/JenkIndForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Tools { partial class JenkIndForm { diff --git a/CodeWalker/Tools/JenkIndForm.cs b/CodeWalker/Tools/JenkIndForm.cs index 850d7a9..98c8456 100644 --- a/CodeWalker/Tools/JenkIndForm.cs +++ b/CodeWalker/Tools/JenkIndForm.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Tools { public partial class JenkIndForm : Form { diff --git a/CodeWalker/Utils/GTAFolder.cs b/CodeWalker/Utils/GTAFolder.cs index 6d33205..198d2b5 100644 --- a/CodeWalker/Utils/GTAFolder.cs +++ b/CodeWalker/Utils/GTAFolder.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using CodeWalker.Properties; using Microsoft.Win32; using CodeWalker.GameFiles; +using CodeWalker.Utils; namespace CodeWalker { diff --git a/CodeWalker/Utils/KeyBindForm.Designer.cs b/CodeWalker/Utils/KeyBindForm.Designer.cs index ec5ca77..b96b62d 100644 --- a/CodeWalker/Utils/KeyBindForm.Designer.cs +++ b/CodeWalker/Utils/KeyBindForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Utils { partial class KeyBindForm { diff --git a/CodeWalker/Utils/KeyBindForm.cs b/CodeWalker/Utils/KeyBindForm.cs index dc33160..3765b3b 100644 --- a/CodeWalker/Utils/KeyBindForm.cs +++ b/CodeWalker/Utils/KeyBindForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Utils { public partial class KeyBindForm : Form { diff --git a/CodeWalker/Utils/SelectFolderForm.Designer.cs b/CodeWalker/Utils/SelectFolderForm.Designer.cs index af38e99..865e03b 100644 --- a/CodeWalker/Utils/SelectFolderForm.Designer.cs +++ b/CodeWalker/Utils/SelectFolderForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Utils { partial class SelectFolderForm { diff --git a/CodeWalker/Utils/SelectFolderForm.cs b/CodeWalker/Utils/SelectFolderForm.cs index 9e9bf0e..541ddff 100644 --- a/CodeWalker/Utils/SelectFolderForm.cs +++ b/CodeWalker/Utils/SelectFolderForm.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Utils { public partial class SelectFolderForm : Form { diff --git a/CodeWalker/Utils/TextInputForm.Designer.cs b/CodeWalker/Utils/TextInputForm.Designer.cs index 301ed2a..6b50976 100644 --- a/CodeWalker/Utils/TextInputForm.Designer.cs +++ b/CodeWalker/Utils/TextInputForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.Utils { partial class TextInputForm { diff --git a/CodeWalker/Utils/TextInputForm.cs b/CodeWalker/Utils/TextInputForm.cs index cff6f56..0f20f80 100644 --- a/CodeWalker/Utils/TextInputForm.cs +++ b/CodeWalker/Utils/TextInputForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.Utils { public partial class TextInputForm : Form { diff --git a/CodeWalker/World/SettingsForm.Designer.cs b/CodeWalker/World/SettingsForm.Designer.cs index e8526bc..4996208 100644 --- a/CodeWalker/World/SettingsForm.Designer.cs +++ b/CodeWalker/World/SettingsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.World { partial class SettingsForm { diff --git a/CodeWalker/World/SettingsForm.cs b/CodeWalker/World/SettingsForm.cs index d9cc47c..43cb821 100644 --- a/CodeWalker/World/SettingsForm.cs +++ b/CodeWalker/World/SettingsForm.cs @@ -1,4 +1,5 @@ using CodeWalker.Properties; +using CodeWalker.Utils; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.World { public partial class SettingsForm : Form { diff --git a/CodeWalker/World/StatisticsForm.Designer.cs b/CodeWalker/World/StatisticsForm.Designer.cs index a92e8a6..5ac7245 100644 --- a/CodeWalker/World/StatisticsForm.Designer.cs +++ b/CodeWalker/World/StatisticsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.World { partial class StatisticsForm { diff --git a/CodeWalker/World/StatisticsForm.cs b/CodeWalker/World/StatisticsForm.cs index 7fd9be1..7c696be 100644 --- a/CodeWalker/World/StatisticsForm.cs +++ b/CodeWalker/World/StatisticsForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.World { public partial class StatisticsForm : Form { diff --git a/CodeWalker/World/WorldInfoForm.Designer.cs b/CodeWalker/World/WorldInfoForm.Designer.cs index db9a24c..569691d 100644 --- a/CodeWalker/World/WorldInfoForm.Designer.cs +++ b/CodeWalker/World/WorldInfoForm.Designer.cs @@ -1,6 +1,6 @@ using CodeWalker.WinForms; -namespace CodeWalker +namespace CodeWalker.World { partial class WorldInfoForm { diff --git a/CodeWalker/World/WorldInfoForm.cs b/CodeWalker/World/WorldInfoForm.cs index 9447f3a..ce28412 100644 --- a/CodeWalker/World/WorldInfoForm.cs +++ b/CodeWalker/World/WorldInfoForm.cs @@ -16,7 +16,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.World { public partial class WorldInfoForm : Form { diff --git a/CodeWalker/World/WorldSearchForm.Designer.cs b/CodeWalker/World/WorldSearchForm.Designer.cs index 92cb078..b851db4 100644 --- a/CodeWalker/World/WorldSearchForm.Designer.cs +++ b/CodeWalker/World/WorldSearchForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CodeWalker +namespace CodeWalker.World { partial class WorldSearchForm { diff --git a/CodeWalker/World/WorldSearchForm.cs b/CodeWalker/World/WorldSearchForm.cs index 3ee7ec1..5d845dc 100644 --- a/CodeWalker/World/WorldSearchForm.cs +++ b/CodeWalker/World/WorldSearchForm.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace CodeWalker +namespace CodeWalker.World { public partial class WorldSearchForm : Form { diff --git a/CodeWalker/WorldForm.cs b/CodeWalker/WorldForm.cs index 6596f7c..51453e0 100644 --- a/CodeWalker/WorldForm.cs +++ b/CodeWalker/WorldForm.cs @@ -14,6 +14,7 @@ using CodeWalker.Project; using CodeWalker.Rendering; using CodeWalker.GameFiles; using CodeWalker.Properties; +using CodeWalker.Tools; namespace CodeWalker {