From f01c86deeec00d01768a569ca1825f8de9a668ac Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Tue, 30 Apr 2019 14:29:50 -0500 Subject: [PATCH] Move Forms to seperate namespace --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 2 +- DS4Windows/DS4Forms/DS4Form.cs | 2 +- DS4Windows/DS4Forms/DS4Keyboard.Designer.cs | 2 +- DS4Windows/DS4Forms/DS4Keyboard.cs | 2 +- DS4Windows/DS4Forms/DupBox.Designer.cs | 2 +- DS4Windows/DS4Forms/DupBox.cs | 2 +- DS4Windows/DS4Forms/Hotkeys.Designer.cs | 2 +- DS4Windows/DS4Forms/Hotkeys.cs | 2 +- DS4Windows/DS4Forms/KBM360.Designer.cs | 2 +- DS4Windows/DS4Forms/KBM360.cs | 2 +- DS4Windows/DS4Forms/Options.Designer.cs | 2 +- DS4Windows/DS4Forms/Options.cs | 2 +- DS4Windows/DS4Forms/RecordBox.Designer.cs | 2 +- DS4Windows/DS4Forms/RecordBox.cs | 2 +- DS4Windows/DS4Forms/SaveWhere.Designer.cs | 2 +- DS4Windows/DS4Forms/SaveWhere.cs | 2 +- DS4Windows/DS4Forms/SpecActions.Designer.cs | 2 +- DS4Windows/DS4Forms/SpecActions.cs | 2 +- DS4Windows/DS4Forms/WelcomeDialog.Designer.cs | 2 +- DS4Windows/DS4Forms/WelcomeDialog.cs | 2 +- DS4Windows/DS4Forms/WinProgs.Designer.cs | 2 +- DS4Windows/DS4Forms/WinProgs.cs | 2 +- DS4Windows/Program.cs | 8 ++++---- TODO.md | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index 1c7eab2..8b91836 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class DS4Form { diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index 3c50c5b..f4c3ff3 100644 --- a/DS4Windows/DS4Forms/DS4Form.cs +++ b/DS4Windows/DS4Forms/DS4Form.cs @@ -19,7 +19,7 @@ using static DS4Windows.Global; using System.Security; using System.Management; -namespace DS4Windows +namespace DS4Windows.Forms { [SuppressUnmanagedCodeSecurity] public partial class DS4Form : Form diff --git a/DS4Windows/DS4Forms/DS4Keyboard.Designer.cs b/DS4Windows/DS4Forms/DS4Keyboard.Designer.cs index 46b1252..9eb9fe9 100644 --- a/DS4Windows/DS4Forms/DS4Keyboard.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Keyboard.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class DS4Keyboard { diff --git a/DS4Windows/DS4Forms/DS4Keyboard.cs b/DS4Windows/DS4Forms/DS4Keyboard.cs index 93c5d4d..7eaeb38 100644 --- a/DS4Windows/DS4Forms/DS4Keyboard.cs +++ b/DS4Windows/DS4Forms/DS4Keyboard.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class DS4Keyboard : Form { diff --git a/DS4Windows/DS4Forms/DupBox.Designer.cs b/DS4Windows/DS4Forms/DupBox.Designer.cs index b236bdf..719cf2a 100644 --- a/DS4Windows/DS4Forms/DupBox.Designer.cs +++ b/DS4Windows/DS4Forms/DupBox.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class DupBox { diff --git a/DS4Windows/DS4Forms/DupBox.cs b/DS4Windows/DS4Forms/DupBox.cs index cec6075..070d852 100644 --- a/DS4Windows/DS4Forms/DupBox.cs +++ b/DS4Windows/DS4Forms/DupBox.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class DupBox : Form { diff --git a/DS4Windows/DS4Forms/Hotkeys.Designer.cs b/DS4Windows/DS4Forms/Hotkeys.Designer.cs index d61f166..714f149 100644 --- a/DS4Windows/DS4Forms/Hotkeys.Designer.cs +++ b/DS4Windows/DS4Forms/Hotkeys.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class Hotkeys { diff --git a/DS4Windows/DS4Forms/Hotkeys.cs b/DS4Windows/DS4Forms/Hotkeys.cs index 699ed41..5bc3171 100644 --- a/DS4Windows/DS4Forms/Hotkeys.cs +++ b/DS4Windows/DS4Forms/Hotkeys.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Diagnostics; using System.Drawing; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class Hotkeys : Form { diff --git a/DS4Windows/DS4Forms/KBM360.Designer.cs b/DS4Windows/DS4Forms/KBM360.Designer.cs index b4df541..885de32 100644 --- a/DS4Windows/DS4Forms/KBM360.Designer.cs +++ b/DS4Windows/DS4Forms/KBM360.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class KBM360 { diff --git a/DS4Windows/DS4Forms/KBM360.cs b/DS4Windows/DS4Forms/KBM360.cs index 0ea91f2..e336b04 100644 --- a/DS4Windows/DS4Forms/KBM360.cs +++ b/DS4Windows/DS4Forms/KBM360.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class KBM360 : Form { diff --git a/DS4Windows/DS4Forms/Options.Designer.cs b/DS4Windows/DS4Forms/Options.Designer.cs index dc66fc0..83af0c1 100644 --- a/DS4Windows/DS4Forms/Options.Designer.cs +++ b/DS4Windows/DS4Forms/Options.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class Options { diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs index 6cba9e9..00c5e77 100644 --- a/DS4Windows/DS4Forms/Options.cs +++ b/DS4Windows/DS4Forms/Options.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using static DS4Windows.Global; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class Options : Form { diff --git a/DS4Windows/DS4Forms/RecordBox.Designer.cs b/DS4Windows/DS4Forms/RecordBox.Designer.cs index b21eef7..1756388 100644 --- a/DS4Windows/DS4Forms/RecordBox.Designer.cs +++ b/DS4Windows/DS4Forms/RecordBox.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class RecordBox { diff --git a/DS4Windows/DS4Forms/RecordBox.cs b/DS4Windows/DS4Forms/RecordBox.cs index 479f078..18b7ff6 100644 --- a/DS4Windows/DS4Forms/RecordBox.cs +++ b/DS4Windows/DS4Forms/RecordBox.cs @@ -9,7 +9,7 @@ using NonFormTimer = System.Timers.Timer; using System.IO; using System.Reflection; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class RecordBox : Form { diff --git a/DS4Windows/DS4Forms/SaveWhere.Designer.cs b/DS4Windows/DS4Forms/SaveWhere.Designer.cs index 68b03ba..85626e4 100644 --- a/DS4Windows/DS4Forms/SaveWhere.Designer.cs +++ b/DS4Windows/DS4Forms/SaveWhere.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class SaveWhere { diff --git a/DS4Windows/DS4Forms/SaveWhere.cs b/DS4Windows/DS4Forms/SaveWhere.cs index 83f7294..70e3f34 100644 --- a/DS4Windows/DS4Forms/SaveWhere.cs +++ b/DS4Windows/DS4Forms/SaveWhere.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Xml; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class SaveWhere : Form { diff --git a/DS4Windows/DS4Forms/SpecActions.Designer.cs b/DS4Windows/DS4Forms/SpecActions.Designer.cs index 16d0036..5e7c6cb 100644 --- a/DS4Windows/DS4Forms/SpecActions.Designer.cs +++ b/DS4Windows/DS4Forms/SpecActions.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class SpecActions { diff --git a/DS4Windows/DS4Forms/SpecActions.cs b/DS4Windows/DS4Forms/SpecActions.cs index 69c4b57..7bcd4b2 100644 --- a/DS4Windows/DS4Forms/SpecActions.cs +++ b/DS4Windows/DS4Forms/SpecActions.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using System.IO; using System.Xml; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class SpecActions : Form { diff --git a/DS4Windows/DS4Forms/WelcomeDialog.Designer.cs b/DS4Windows/DS4Forms/WelcomeDialog.Designer.cs index 5ca3b49..4641e47 100644 --- a/DS4Windows/DS4Forms/WelcomeDialog.Designer.cs +++ b/DS4Windows/DS4Forms/WelcomeDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class WelcomeDialog { diff --git a/DS4Windows/DS4Forms/WelcomeDialog.cs b/DS4Windows/DS4Forms/WelcomeDialog.cs index a497236..5a46e8c 100644 --- a/DS4Windows/DS4Forms/WelcomeDialog.cs +++ b/DS4Windows/DS4Forms/WelcomeDialog.cs @@ -11,7 +11,7 @@ using NonFormTimer = System.Timers.Timer; using System.Threading.Tasks; using static DS4Windows.Global; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class WelcomeDialog : Form { diff --git a/DS4Windows/DS4Forms/WinProgs.Designer.cs b/DS4Windows/DS4Forms/WinProgs.Designer.cs index 97cfee4..64b826c 100644 --- a/DS4Windows/DS4Forms/WinProgs.Designer.cs +++ b/DS4Windows/DS4Forms/WinProgs.Designer.cs @@ -1,4 +1,4 @@ -namespace DS4Windows +namespace DS4Windows.Forms { partial class WinProgs { diff --git a/DS4Windows/DS4Forms/WinProgs.cs b/DS4Windows/DS4Forms/WinProgs.cs index 611aa35..c911e0f 100644 --- a/DS4Windows/DS4Forms/WinProgs.cs +++ b/DS4Windows/DS4Forms/WinProgs.cs @@ -12,7 +12,7 @@ using System.Diagnostics; using System.Threading.Tasks; using static DS4Windows.Global; -namespace DS4Windows +namespace DS4Windows.Forms { public partial class WinProgs : Form { diff --git a/DS4Windows/Program.cs b/DS4Windows/Program.cs index 1adf387..81dc8e7 100644 --- a/DS4Windows/Program.cs +++ b/DS4Windows/Program.cs @@ -35,7 +35,7 @@ namespace DS4Windows if (s == "driverinstall" || s == "-driverinstall") { Application.EnableVisualStyles(); - Application.Run(new WelcomeDialog(true)); + Application.Run(new Forms.WelcomeDialog(true)); return; } else if (s == "re-enabledevice" || s == "-re-enabledevice") @@ -109,7 +109,7 @@ namespace DS4Windows createControlService(); //rootHub = new ControlService(); Application.EnableVisualStyles(); - ds4form = new DS4Form(args); + ds4form = new Forms.DS4Form(args); Application.Run(); //mutex.ReleaseMutex(); //} @@ -166,10 +166,10 @@ namespace DS4Windows private delegate void SetFormVisableDelegate(Form frm); private static void ThreadFormVisable(Form frm) { - if (frm is DS4Form) + if (frm is Forms.DS4Form) { // display the form and bring to foreground. - DS4Form temp = (DS4Form)frm; + Forms.DS4Form temp = (Forms.DS4Form)frm; temp.Show(); temp.WindowState = FormWindowState.Normal; } diff --git a/TODO.md b/TODO.md index 5423734..2dc5cab 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,7 @@ # TODO * Re-evaluate HidGuardian -* Move forms to new namespace +* ~~Move forms to new namespace~~ * ~~Finalize DS4 Emulation~~ * ~~Raise Sixaxis default dead zones~~ * ~~Evaluate latest ViGEmBus driver and update download URL~~