diff --git a/App1.config b/App1.config deleted file mode 100644 index 9c3d200..0000000 --- a/App1.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/OnGuard.sln b/On-Guard.sln similarity index 89% rename from OnGuard.sln rename to On-Guard.sln index db67fac..1847a6b 100644 --- a/OnGuard.sln +++ b/On-Guard.sln @@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30011.22 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIDisplay", "AIDisplay.csproj", "{CD227D1A-D84D-4442-8B99-DD1788EFF241}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIDisplay", "src\AIDisplay\AIDisplay.csproj", "{CD227D1A-D84D-4442-8B99-DD1788EFF241}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34C959FD-189B-46E0-A7BD-ED5724DD8C2A}" ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig + src\.editorconfig = src\.editorconfig EndProjectSection EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer.vdproj", "{F9C871D2-65C2-4AD4-A9EC-42E5032762FD}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "src\Installer\Installer.vdproj", "{F9C871D2-65C2-4AD4-A9EC-42E5032762FD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/arrow-down.png b/arrow-down.png deleted file mode 100644 index cd57480..0000000 Binary files a/arrow-down.png and /dev/null differ diff --git a/arrow-left.png b/arrow-left.png deleted file mode 100644 index 4c31b20..0000000 Binary files a/arrow-left.png and /dev/null differ diff --git a/arrow-right.png b/arrow-right.png deleted file mode 100644 index 3749439..0000000 Binary files a/arrow-right.png and /dev/null differ diff --git a/arrow-up.png b/arrow-up.png deleted file mode 100644 index 9b61c38..0000000 Binary files a/arrow-up.png and /dev/null differ diff --git a/OnGuard-ReadMe.docx b/docs/OnGuard-ReadMe.docx similarity index 100% rename from OnGuard-ReadMe.docx rename to docs/OnGuard-ReadMe.docx diff --git a/.editorconfig b/src/.editorconfig similarity index 100% rename from .editorconfig rename to src/.editorconfig diff --git a/AIAnalyzer.cs b/src/AIDisplay/AIAnalyzer.cs similarity index 100% rename from AIAnalyzer.cs rename to src/AIDisplay/AIAnalyzer.cs diff --git a/AIDisplay.csproj b/src/AIDisplay/AIDisplay.csproj similarity index 61% rename from AIDisplay.csproj rename to src/AIDisplay/AIDisplay.csproj index 43d3135..cd5e941 100644 --- a/AIDisplay.csproj +++ b/src/AIDisplay/AIDisplay.csproj @@ -104,10 +104,7 @@ - .\MQTTnet.dll - - - packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + .\redist\MQTTnet.dll @@ -124,212 +121,222 @@ - + + Component + + + ZoneBox.cs + + Form - - AboutDlg.cs + + AboutDialog.cs - + Form - + AddCameraDialog.cs - + Form - - AddEmailDlg.cs + + AddEmailDialog.cs - + Form - - AddUrlDlialog.cs + + AddUrlDialog.cs - + Form - + CameraConfigurationDialog.cs - + Form - + + CameraContactDialog.cs + + + Form + + CleanupDialog.cs - + Form - + MMS-Helper.cs - + Form - + MQTTSettings.cs - - - Component + + True + True + Resources.resx + - + Form - + CreateAOI.cs - + Form - + CreateEmailAddressDialog.cs - + Form - + EditAreasOfInterest.cs - + Form - + EmailAddressesDialog.cs - + Form - + MainWindow.cs - + Form - + InterestingItemsDialog.cs - + Form - + NotificationOptionsDialog.cs - + Form - + OutgoingEmailDialog.cs - - + + Form - + SettingsDialog.cs - + Form - + Test Email Address.cs - - AboutDlg.cs + + AboutDialog.cs - + AddCameraDialog.cs - - AddEmailDlg.cs + + AddEmailDialog.cs - - AddUrlDlialog.cs + + AddUrlDialog.cs - + CameraConfigurationDialog.cs - + + CameraContactDialog.cs + + CleanupDialog.cs - + CreateAOI.cs - + CreateEmailAddressDialog.cs - + EditAreasOfInterest.cs - + EmailAddressesDialog.cs - + MainWindow.cs - + InterestingItemsDialog.cs - + MMS-Helper.cs - + MQTTSettings.cs - + NotificationOptionsDialog.cs - + OutgoingEmailDialog.cs ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - - + SettingsDialog.cs - + Test Email Address.cs - - ZoneBox.cs - - - + + .editorconfig + @@ -346,16 +353,17 @@ - - - - - - - - - - + + + + + + + + + + + Always @@ -363,15 +371,17 @@ DBMotionFrames.mdf Always - - - - - - - - - + + + + + + + + + + + @@ -391,25 +401,25 @@ - - - - - - - - - + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + + + + + \ No newline at end of file diff --git a/AISettings.cs b/src/AIDisplay/AISettings.cs similarity index 100% rename from AISettings.cs rename to src/AIDisplay/AISettings.cs diff --git a/App.config b/src/AIDisplay/App.config similarity index 100% rename from App.config rename to src/AIDisplay/App.config diff --git a/AreaNotificationOption.cs b/src/AIDisplay/AreaNotificationOption.cs similarity index 100% rename from AreaNotificationOption.cs rename to src/AIDisplay/AreaNotificationOption.cs diff --git a/AreaOfInterest.cs b/src/AIDisplay/AreaOfInterest.cs similarity index 100% rename from AreaOfInterest.cs rename to src/AIDisplay/AreaOfInterest.cs diff --git a/AreasOfInterestCollection.cs b/src/AIDisplay/AreasOfInterestCollection.cs similarity index 100% rename from AreasOfInterestCollection.cs rename to src/AIDisplay/AreasOfInterestCollection.cs diff --git a/BitmapResolution.cs b/src/AIDisplay/BitmapResolution.cs similarity index 100% rename from BitmapResolution.cs rename to src/AIDisplay/BitmapResolution.cs diff --git a/CameraCollection.cs b/src/AIDisplay/CameraCollection.cs similarity index 100% rename from CameraCollection.cs rename to src/AIDisplay/CameraCollection.cs diff --git a/CameraContactData.cs b/src/AIDisplay/CameraContactData.cs similarity index 100% rename from CameraContactData.cs rename to src/AIDisplay/CameraContactData.cs diff --git a/CameraData.cs b/src/AIDisplay/CameraData.cs similarity index 100% rename from CameraData.cs rename to src/AIDisplay/CameraData.cs diff --git a/Resizer.cs b/src/AIDisplay/Controls/Resizer.cs similarity index 100% rename from Resizer.cs rename to src/AIDisplay/Controls/Resizer.cs diff --git a/ScaledPictureBox.cs b/src/AIDisplay/Controls/ScaledPictureBox.cs similarity index 100% rename from ScaledPictureBox.cs rename to src/AIDisplay/Controls/ScaledPictureBox.cs diff --git a/ZoneBox.cs b/src/AIDisplay/Controls/ZoneBox.cs similarity index 100% rename from ZoneBox.cs rename to src/AIDisplay/Controls/ZoneBox.cs diff --git a/ZoneBox.resx b/src/AIDisplay/Controls/ZoneBox.resx similarity index 100% rename from ZoneBox.resx rename to src/AIDisplay/Controls/ZoneBox.resx diff --git a/Cooldowns.cs b/src/AIDisplay/Cooldowns.cs similarity index 100% rename from Cooldowns.cs rename to src/AIDisplay/Cooldowns.cs diff --git a/DataBackup/CameraData.bin b/src/AIDisplay/DataBackup/CameraData.bin similarity index 100% rename from DataBackup/CameraData.bin rename to src/AIDisplay/DataBackup/CameraData.bin diff --git a/DataBackup/EmailAddresses.bin b/src/AIDisplay/DataBackup/EmailAddresses.bin similarity index 100% rename from DataBackup/EmailAddresses.bin rename to src/AIDisplay/DataBackup/EmailAddresses.bin diff --git a/DataBackup/aiBack-AreasOfInterest.bin b/src/AIDisplay/DataBackup/aiBack-AreasOfInterest.bin similarity index 100% rename from DataBackup/aiBack-AreasOfInterest.bin rename to src/AIDisplay/DataBackup/aiBack-AreasOfInterest.bin diff --git a/DataBackup/aiFront-AreasOfInterest.bin b/src/AIDisplay/DataBackup/aiFront-AreasOfInterest.bin similarity index 100% rename from DataBackup/aiFront-AreasOfInterest.bin rename to src/AIDisplay/DataBackup/aiFront-AreasOfInterest.bin diff --git a/Dbg.cs b/src/AIDisplay/Dbg.cs similarity index 100% rename from Dbg.cs rename to src/AIDisplay/Dbg.cs diff --git a/DirectoryMonitor.cs b/src/AIDisplay/DirectoryMonitor.cs similarity index 100% rename from DirectoryMonitor.cs rename to src/AIDisplay/DirectoryMonitor.cs diff --git a/EmailAccumulator.cs b/src/AIDisplay/EmailAccumulator.cs similarity index 100% rename from EmailAccumulator.cs rename to src/AIDisplay/EmailAccumulator.cs diff --git a/EmailAddresses.cs b/src/AIDisplay/EmailAddresses.cs similarity index 100% rename from EmailAddresses.cs rename to src/AIDisplay/EmailAddresses.cs diff --git a/AboutDlg.Designer.cs b/src/AIDisplay/Forms/AboutDialog.Designer.cs similarity index 95% rename from AboutDlg.Designer.cs rename to src/AIDisplay/Forms/AboutDialog.Designer.cs index 3ea296f..9d82614 100644 --- a/AboutDlg.Designer.cs +++ b/src/AIDisplay/Forms/AboutDialog.Designer.cs @@ -1,6 +1,6 @@ namespace SAAI { - partial class AboutDlg + partial class AboutDialog { /// /// Required designer variable. @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDlg)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDialog)); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); @@ -106,7 +106,7 @@ private void InitializeComponent() this.label5.TabIndex = 7; this.label5.Text = "1.5.1"; // - // AboutDlg + // AboutDialog // this.AcceptButton = this.OKButton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -119,7 +119,7 @@ private void InitializeComponent() this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox1); - this.Name = "AboutDlg"; + this.Name = "AboutDialog"; this.Text = "About On Guard"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); diff --git a/AboutDlg.cs b/src/AIDisplay/Forms/AboutDialog.cs similarity index 93% rename from AboutDlg.cs rename to src/AIDisplay/Forms/AboutDialog.cs index bfe7ccb..702bacc 100644 --- a/AboutDlg.cs +++ b/src/AIDisplay/Forms/AboutDialog.cs @@ -13,9 +13,9 @@ namespace SAAI { - public partial class AboutDlg : Form + public partial class AboutDialog : Form { - public AboutDlg() + public AboutDialog() { InitializeComponent(); //assemblyLabel.Text = String.Format("Version {0}", AssemblyVersion); diff --git a/AboutDlg.resx b/src/AIDisplay/Forms/AboutDialog.resx similarity index 100% rename from AboutDlg.resx rename to src/AIDisplay/Forms/AboutDialog.resx diff --git a/AddCameraDialog.Designer.cs b/src/AIDisplay/Forms/AddCameraDialog.Designer.cs similarity index 100% rename from AddCameraDialog.Designer.cs rename to src/AIDisplay/Forms/AddCameraDialog.Designer.cs diff --git a/AddCameraDialog.cs b/src/AIDisplay/Forms/AddCameraDialog.cs similarity index 100% rename from AddCameraDialog.cs rename to src/AIDisplay/Forms/AddCameraDialog.cs diff --git a/AddCameraDialog.resx b/src/AIDisplay/Forms/AddCameraDialog.resx similarity index 100% rename from AddCameraDialog.resx rename to src/AIDisplay/Forms/AddCameraDialog.resx diff --git a/AddEmailDlg.Designer.cs b/src/AIDisplay/Forms/AddEmailDialog.Designer.cs similarity index 95% rename from AddEmailDlg.Designer.cs rename to src/AIDisplay/Forms/AddEmailDialog.Designer.cs index 23f0069..4a84c1c 100644 --- a/AddEmailDlg.Designer.cs +++ b/src/AIDisplay/Forms/AddEmailDialog.Designer.cs @@ -1,6 +1,6 @@ namespace SAAI { - partial class AddEmailDlg + partial class AddEmailDialog { /// /// Required designer variable. @@ -83,7 +83,7 @@ private void InitializeComponent() this.emailAddressList.TabIndex = 33; this.emailAddressList.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.emailAddressList_MouseDoubleClick); // - // AddEmailDlg + // AddEmailDialog // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; @@ -93,7 +93,7 @@ private void InitializeComponent() this.Controls.Add(this.zdsf); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); - this.Name = "AddEmailDlg"; + this.Name = "AddEmailDialog"; this.Text = "Add Email Address to Notify"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/AddEmailDlg.cs b/src/AIDisplay/Forms/AddEmailDialog.cs similarity index 89% rename from AddEmailDlg.cs rename to src/AIDisplay/Forms/AddEmailDialog.cs index 40ed999..503ca10 100644 --- a/AddEmailDlg.cs +++ b/src/AIDisplay/Forms/AddEmailDialog.cs @@ -7,10 +7,10 @@ namespace SAAI /// /// A simple dialog to add email addresses to the AOI notifications dialog /// - public partial class AddEmailDlg : Form + public partial class AddEmailDialog : Form { public string EmailAddress { get; set; } - public AddEmailDlg() + public AddEmailDialog() { InitializeComponent(); foreach (var options in EmailAddresses.EmailAddressList) diff --git a/AddEmailDlg.resx b/src/AIDisplay/Forms/AddEmailDialog.resx similarity index 100% rename from AddEmailDlg.resx rename to src/AIDisplay/Forms/AddEmailDialog.resx diff --git a/AddUrlDlialog.Designer.cs b/src/AIDisplay/Forms/AddUrlDialog.Designer.cs similarity index 100% rename from AddUrlDlialog.Designer.cs rename to src/AIDisplay/Forms/AddUrlDialog.Designer.cs diff --git a/AddUrlDlialog.cs b/src/AIDisplay/Forms/AddUrlDialog.cs similarity index 100% rename from AddUrlDlialog.cs rename to src/AIDisplay/Forms/AddUrlDialog.cs diff --git a/AddUrlDlialog.resx b/src/AIDisplay/Forms/AddUrlDialog.resx similarity index 100% rename from AddUrlDlialog.resx rename to src/AIDisplay/Forms/AddUrlDialog.resx diff --git a/CameraConfigurationDialog.Designer.cs b/src/AIDisplay/Forms/CameraConfigurationDialog.Designer.cs similarity index 100% rename from CameraConfigurationDialog.Designer.cs rename to src/AIDisplay/Forms/CameraConfigurationDialog.Designer.cs diff --git a/CameraConfigurationDialog.cs b/src/AIDisplay/Forms/CameraConfigurationDialog.cs similarity index 100% rename from CameraConfigurationDialog.cs rename to src/AIDisplay/Forms/CameraConfigurationDialog.cs diff --git a/CameraConfigurationDialog.resx b/src/AIDisplay/Forms/CameraConfigurationDialog.resx similarity index 100% rename from CameraConfigurationDialog.resx rename to src/AIDisplay/Forms/CameraConfigurationDialog.resx diff --git a/CameraContactDialog.Designer.cs b/src/AIDisplay/Forms/CameraContactDialog.Designer.cs similarity index 100% rename from CameraContactDialog.Designer.cs rename to src/AIDisplay/Forms/CameraContactDialog.Designer.cs diff --git a/CameraContactDialog.cs b/src/AIDisplay/Forms/CameraContactDialog.cs similarity index 95% rename from CameraContactDialog.cs rename to src/AIDisplay/Forms/CameraContactDialog.cs index bbb4721..2226a86 100644 --- a/CameraContactDialog.cs +++ b/src/AIDisplay/Forms/CameraContactDialog.cs @@ -7,6 +7,8 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using SAAI; + namespace DeepStackDisplay { diff --git a/CameraContactDialog.resx b/src/AIDisplay/Forms/CameraContactDialog.resx similarity index 100% rename from CameraContactDialog.resx rename to src/AIDisplay/Forms/CameraContactDialog.resx diff --git a/CleanupDialog.Designer.cs b/src/AIDisplay/Forms/CleanupDialog.Designer.cs similarity index 100% rename from CleanupDialog.Designer.cs rename to src/AIDisplay/Forms/CleanupDialog.Designer.cs diff --git a/CleanupDialog.cs b/src/AIDisplay/Forms/CleanupDialog.cs similarity index 100% rename from CleanupDialog.cs rename to src/AIDisplay/Forms/CleanupDialog.cs diff --git a/CleanupDialog.resx b/src/AIDisplay/Forms/CleanupDialog.resx similarity index 100% rename from CleanupDialog.resx rename to src/AIDisplay/Forms/CleanupDialog.resx diff --git a/CreateAOI.Designer.cs b/src/AIDisplay/Forms/CreateAOI.Designer.cs similarity index 100% rename from CreateAOI.Designer.cs rename to src/AIDisplay/Forms/CreateAOI.Designer.cs diff --git a/CreateAOI.cs b/src/AIDisplay/Forms/CreateAOI.cs similarity index 100% rename from CreateAOI.cs rename to src/AIDisplay/Forms/CreateAOI.cs diff --git a/CreateAOI.resx b/src/AIDisplay/Forms/CreateAOI.resx similarity index 100% rename from CreateAOI.resx rename to src/AIDisplay/Forms/CreateAOI.resx diff --git a/CreateEmailAddressDialog.Designer.cs b/src/AIDisplay/Forms/CreateEmailAddressDialog.Designer.cs similarity index 100% rename from CreateEmailAddressDialog.Designer.cs rename to src/AIDisplay/Forms/CreateEmailAddressDialog.Designer.cs diff --git a/CreateEmailAddressDialog.cs b/src/AIDisplay/Forms/CreateEmailAddressDialog.cs similarity index 100% rename from CreateEmailAddressDialog.cs rename to src/AIDisplay/Forms/CreateEmailAddressDialog.cs diff --git a/CreateEmailAddressDialog.resx b/src/AIDisplay/Forms/CreateEmailAddressDialog.resx similarity index 100% rename from CreateEmailAddressDialog.resx rename to src/AIDisplay/Forms/CreateEmailAddressDialog.resx diff --git a/EditAreasOfInterest.Designer.cs b/src/AIDisplay/Forms/EditAreasOfInterest.Designer.cs similarity index 100% rename from EditAreasOfInterest.Designer.cs rename to src/AIDisplay/Forms/EditAreasOfInterest.Designer.cs diff --git a/EditAreasOfInterest.cs b/src/AIDisplay/Forms/EditAreasOfInterest.cs similarity index 100% rename from EditAreasOfInterest.cs rename to src/AIDisplay/Forms/EditAreasOfInterest.cs diff --git a/EditAreasOfInterest.resx b/src/AIDisplay/Forms/EditAreasOfInterest.resx similarity index 100% rename from EditAreasOfInterest.resx rename to src/AIDisplay/Forms/EditAreasOfInterest.resx diff --git a/EmailAddressesDialog.Designer.cs b/src/AIDisplay/Forms/EmailAddressesDialog.Designer.cs similarity index 100% rename from EmailAddressesDialog.Designer.cs rename to src/AIDisplay/Forms/EmailAddressesDialog.Designer.cs diff --git a/EmailAddressesDialog.cs b/src/AIDisplay/Forms/EmailAddressesDialog.cs similarity index 100% rename from EmailAddressesDialog.cs rename to src/AIDisplay/Forms/EmailAddressesDialog.cs diff --git a/EmailAddressesDialog.resx b/src/AIDisplay/Forms/EmailAddressesDialog.resx similarity index 100% rename from EmailAddressesDialog.resx rename to src/AIDisplay/Forms/EmailAddressesDialog.resx diff --git a/InterestingItemsDialog.Designer.cs b/src/AIDisplay/Forms/InterestingItemsDialog.Designer.cs similarity index 100% rename from InterestingItemsDialog.Designer.cs rename to src/AIDisplay/Forms/InterestingItemsDialog.Designer.cs diff --git a/InterestingItemsDialog.cs b/src/AIDisplay/Forms/InterestingItemsDialog.cs similarity index 100% rename from InterestingItemsDialog.cs rename to src/AIDisplay/Forms/InterestingItemsDialog.cs diff --git a/InterestingItemsDialog.resx b/src/AIDisplay/Forms/InterestingItemsDialog.resx similarity index 100% rename from InterestingItemsDialog.resx rename to src/AIDisplay/Forms/InterestingItemsDialog.resx diff --git a/MMS-Helper.Designer.cs b/src/AIDisplay/Forms/MMS-Helper.Designer.cs similarity index 100% rename from MMS-Helper.Designer.cs rename to src/AIDisplay/Forms/MMS-Helper.Designer.cs diff --git a/MMS-Helper.cs b/src/AIDisplay/Forms/MMS-Helper.cs similarity index 100% rename from MMS-Helper.cs rename to src/AIDisplay/Forms/MMS-Helper.cs diff --git a/MMS-Helper.resx b/src/AIDisplay/Forms/MMS-Helper.resx similarity index 100% rename from MMS-Helper.resx rename to src/AIDisplay/Forms/MMS-Helper.resx diff --git a/MQTTSettings.Designer.cs b/src/AIDisplay/Forms/MQTTSettings.Designer.cs similarity index 100% rename from MQTTSettings.Designer.cs rename to src/AIDisplay/Forms/MQTTSettings.Designer.cs diff --git a/MQTTSettings.cs b/src/AIDisplay/Forms/MQTTSettings.cs similarity index 100% rename from MQTTSettings.cs rename to src/AIDisplay/Forms/MQTTSettings.cs diff --git a/MQTTSettings.resx b/src/AIDisplay/Forms/MQTTSettings.resx similarity index 100% rename from MQTTSettings.resx rename to src/AIDisplay/Forms/MQTTSettings.resx diff --git a/MainWindow.Designer.cs b/src/AIDisplay/Forms/MainWindow.Designer.cs similarity index 100% rename from MainWindow.Designer.cs rename to src/AIDisplay/Forms/MainWindow.Designer.cs diff --git a/MainWindow.cs b/src/AIDisplay/Forms/MainWindow.cs similarity index 97% rename from MainWindow.cs rename to src/AIDisplay/Forms/MainWindow.cs index 7d12054..4ccb1ef 100644 --- a/MainWindow.cs +++ b/src/AIDisplay/Forms/MainWindow.cs @@ -1621,7 +1621,7 @@ private void Refresh_Click(object sender, EventArgs e) private void AboutToolStripMenuItem_Click(object sender, EventArgs e) { - using (AboutDlg dlg = new AboutDlg()) + using (AboutDialog dlg = new AboutDialog()) { dlg.ShowDialog(); } diff --git a/MainWindow.resx b/src/AIDisplay/Forms/MainWindow.resx similarity index 100% rename from MainWindow.resx rename to src/AIDisplay/Forms/MainWindow.resx diff --git a/MonitorCameraDialog.Designer.cs b/src/AIDisplay/Forms/MonitorCameraDialog.Designer.cs similarity index 100% rename from MonitorCameraDialog.Designer.cs rename to src/AIDisplay/Forms/MonitorCameraDialog.Designer.cs diff --git a/MonitorCameraDialog.cs b/src/AIDisplay/Forms/MonitorCameraDialog.cs similarity index 100% rename from MonitorCameraDialog.cs rename to src/AIDisplay/Forms/MonitorCameraDialog.cs diff --git a/MonitorCameraDialog.resx b/src/AIDisplay/Forms/MonitorCameraDialog.resx similarity index 100% rename from MonitorCameraDialog.resx rename to src/AIDisplay/Forms/MonitorCameraDialog.resx diff --git a/NotificationOptionsDialog.Designer.cs b/src/AIDisplay/Forms/NotificationOptionsDialog.Designer.cs similarity index 100% rename from NotificationOptionsDialog.Designer.cs rename to src/AIDisplay/Forms/NotificationOptionsDialog.Designer.cs diff --git a/NotificationOptionsDialog.cs b/src/AIDisplay/Forms/NotificationOptionsDialog.cs similarity index 95% rename from NotificationOptionsDialog.cs rename to src/AIDisplay/Forms/NotificationOptionsDialog.cs index 3c5f059..037ac00 100644 --- a/NotificationOptionsDialog.cs +++ b/src/AIDisplay/Forms/NotificationOptionsDialog.cs @@ -166,7 +166,7 @@ private void RemoveUrlButton_Click(object sender, EventArgs e) private void AddEmailButton_Click(object sender, EventArgs e) { - using (AddEmailDlg dlg = new AddEmailDlg()) + using (AddEmailDialog dlg = new AddEmailDialog()) { if (dlg.ShowDialog() == DialogResult.OK) { diff --git a/NotificationOptionsDialog.resx b/src/AIDisplay/Forms/NotificationOptionsDialog.resx similarity index 100% rename from NotificationOptionsDialog.resx rename to src/AIDisplay/Forms/NotificationOptionsDialog.resx diff --git a/OutgoingEmailDialog.Designer.cs b/src/AIDisplay/Forms/OutgoingEmailDialog.Designer.cs similarity index 100% rename from OutgoingEmailDialog.Designer.cs rename to src/AIDisplay/Forms/OutgoingEmailDialog.Designer.cs diff --git a/OutgoingEmailDialog.cs b/src/AIDisplay/Forms/OutgoingEmailDialog.cs similarity index 100% rename from OutgoingEmailDialog.cs rename to src/AIDisplay/Forms/OutgoingEmailDialog.cs diff --git a/OutgoingEmailDialog.resx b/src/AIDisplay/Forms/OutgoingEmailDialog.resx similarity index 100% rename from OutgoingEmailDialog.resx rename to src/AIDisplay/Forms/OutgoingEmailDialog.resx diff --git a/PerAreaNotificationOptionsDialog.Designer.cs b/src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.Designer.cs similarity index 100% rename from PerAreaNotificationOptionsDialog.Designer.cs rename to src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.Designer.cs diff --git a/PerAreaNotificationOptionsDialog.cs b/src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.cs similarity index 95% rename from PerAreaNotificationOptionsDialog.cs rename to src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.cs index 871e111..cdab862 100644 --- a/PerAreaNotificationOptionsDialog.cs +++ b/src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using SAAI; namespace DeepStackDisplay { @@ -128,7 +129,7 @@ private void RemoveUrlButton_Click(object sender, EventArgs e) private void AddEmailButton_Click(object sender, EventArgs e) { - using (AddEmailDlg dlg = new AddEmailDlg()) + using (AddEmailDialog dlg = new AddEmailDialog()) { if (dlg.ShowDialog() == DialogResult.OK) { diff --git a/PerAreaNotificationOptionsDialog.resx b/src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.resx similarity index 100% rename from PerAreaNotificationOptionsDialog.resx rename to src/AIDisplay/Forms/PerAreaNotificationOptionsDialog.resx diff --git a/SettingsDialog.Designer.cs b/src/AIDisplay/Forms/SettingsDialog.Designer.cs similarity index 100% rename from SettingsDialog.Designer.cs rename to src/AIDisplay/Forms/SettingsDialog.Designer.cs diff --git a/SettingsDialog.cs b/src/AIDisplay/Forms/SettingsDialog.cs similarity index 100% rename from SettingsDialog.cs rename to src/AIDisplay/Forms/SettingsDialog.cs diff --git a/SettingsDialog.resx b/src/AIDisplay/Forms/SettingsDialog.resx similarity index 100% rename from SettingsDialog.resx rename to src/AIDisplay/Forms/SettingsDialog.resx diff --git a/Test Email Address.Designer.cs b/src/AIDisplay/Forms/Test Email Address.Designer.cs similarity index 100% rename from Test Email Address.Designer.cs rename to src/AIDisplay/Forms/Test Email Address.Designer.cs diff --git a/Test Email Address.cs b/src/AIDisplay/Forms/Test Email Address.cs similarity index 100% rename from Test Email Address.cs rename to src/AIDisplay/Forms/Test Email Address.cs diff --git a/Test Email Address.resx b/src/AIDisplay/Forms/Test Email Address.resx similarity index 100% rename from Test Email Address.resx rename to src/AIDisplay/Forms/Test Email Address.resx diff --git a/FrameAccumulator.cs b/src/AIDisplay/FrameAccumulator.cs similarity index 100% rename from FrameAccumulator.cs rename to src/AIDisplay/FrameAccumulator.cs diff --git a/FrameAnalyzer.cs b/src/AIDisplay/FrameAnalyzer.cs similarity index 100% rename from FrameAnalyzer.cs rename to src/AIDisplay/FrameAnalyzer.cs diff --git a/GlobalSuppressions.cs b/src/AIDisplay/GlobalSuppressions.cs similarity index 100% rename from GlobalSuppressions.cs rename to src/AIDisplay/GlobalSuppressions.cs diff --git a/HIstory.cs b/src/AIDisplay/History.cs similarity index 100% rename from HIstory.cs rename to src/AIDisplay/History.cs diff --git a/MQTTPublish.cs b/src/AIDisplay/MQTTPublish.cs similarity index 100% rename from MQTTPublish.cs rename to src/AIDisplay/MQTTPublish.cs diff --git a/MostRecentCollection.cs b/src/AIDisplay/MostRecentCollection.cs similarity index 100% rename from MostRecentCollection.cs rename to src/AIDisplay/MostRecentCollection.cs diff --git a/ObjectCharacteristics.cs b/src/AIDisplay/ObjectCharacteristics.cs similarity index 100% rename from ObjectCharacteristics.cs rename to src/AIDisplay/ObjectCharacteristics.cs diff --git a/PendingItem.cs b/src/AIDisplay/PendingItem.cs similarity index 100% rename from PendingItem.cs rename to src/AIDisplay/PendingItem.cs diff --git a/Program.cs b/src/AIDisplay/Program.cs similarity index 100% rename from Program.cs rename to src/AIDisplay/Program.cs diff --git a/Properties/AssemblyInfo.cs b/src/AIDisplay/Properties/AssemblyInfo.cs similarity index 100% rename from Properties/AssemblyInfo.cs rename to src/AIDisplay/Properties/AssemblyInfo.cs diff --git a/Properties/Resources.Designer.cs b/src/AIDisplay/Properties/Resources.Designer.cs similarity index 100% rename from Properties/Resources.Designer.cs rename to src/AIDisplay/Properties/Resources.Designer.cs diff --git a/Properties/Resources.resx b/src/AIDisplay/Properties/Resources.resx similarity index 74% rename from Properties/Resources.resx rename to src/AIDisplay/Properties/Resources.resx index d08ba78..0c57b8b 100644 --- a/Properties/Resources.resx +++ b/src/AIDisplay/Properties/Resources.resx @@ -119,48 +119,48 @@ - ..\ButtonImages\Selected\arrow-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\arrow-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\ButtonImages\Selected\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\ButtonImages\Selected\zoom-in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\zoom-in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\ButtonImages\Selected\arrow-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\arrow-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\ButtonImages\Selected\arrow-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\arrow-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\ButtonImages\Selected\zoom-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icons\zoom-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\OnGuard.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Images\OnGuard.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\street1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street2.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street2.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street4.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street4.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street5.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street5.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street6.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street6.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Street7.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Samples\Street7.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\OnGuardNoPIctures.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Images\OnGuardNoPictures.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/src/AIDisplay/Properties/Settings.Designer.cs similarity index 100% rename from Properties/Settings.Designer.cs rename to src/AIDisplay/Properties/Settings.Designer.cs diff --git a/Properties/Settings.settings b/src/AIDisplay/Properties/Settings.settings similarity index 100% rename from Properties/Settings.settings rename to src/AIDisplay/Properties/Settings.settings diff --git a/Properties/app.manifest b/src/AIDisplay/Properties/app.manifest similarity index 100% rename from Properties/app.manifest rename to src/AIDisplay/Properties/app.manifest diff --git a/Guardian.ico b/src/AIDisplay/Resources/Icons/Guardian.ico similarity index 100% rename from Guardian.ico rename to src/AIDisplay/Resources/Icons/Guardian.ico diff --git a/ButtonImages/Selected/arrow-down.png b/src/AIDisplay/Resources/Icons/arrow-down.png similarity index 100% rename from ButtonImages/Selected/arrow-down.png rename to src/AIDisplay/Resources/Icons/arrow-down.png diff --git a/ButtonImages/Selected/arrow-left.png b/src/AIDisplay/Resources/Icons/arrow-left.png similarity index 100% rename from ButtonImages/Selected/arrow-left.png rename to src/AIDisplay/Resources/Icons/arrow-left.png diff --git a/ButtonImages/Selected/arrow-right.png b/src/AIDisplay/Resources/Icons/arrow-right.png similarity index 100% rename from ButtonImages/Selected/arrow-right.png rename to src/AIDisplay/Resources/Icons/arrow-right.png diff --git a/ButtonImages/Selected/arrow-up.png b/src/AIDisplay/Resources/Icons/arrow-up.png similarity index 100% rename from ButtonImages/Selected/arrow-up.png rename to src/AIDisplay/Resources/Icons/arrow-up.png diff --git a/ButtonImages/Selected/zoom-in.png b/src/AIDisplay/Resources/Icons/zoom-in.png similarity index 100% rename from ButtonImages/Selected/zoom-in.png rename to src/AIDisplay/Resources/Icons/zoom-in.png diff --git a/ButtonImages/Selected/zoom-out.png b/src/AIDisplay/Resources/Icons/zoom-out.png similarity index 100% rename from ButtonImages/Selected/zoom-out.png rename to src/AIDisplay/Resources/Icons/zoom-out.png diff --git a/OnGuard.jpg b/src/AIDisplay/Resources/Images/OnGuard.jpg similarity index 100% rename from OnGuard.jpg rename to src/AIDisplay/Resources/Images/OnGuard.jpg diff --git a/OnGuardNoPIctures.jpg b/src/AIDisplay/Resources/Images/OnGuardNoPictures.jpg similarity index 100% rename from OnGuardNoPIctures.jpg rename to src/AIDisplay/Resources/Images/OnGuardNoPictures.jpg diff --git a/street1.jpg b/src/AIDisplay/Resources/Samples/Street1.jpg similarity index 100% rename from street1.jpg rename to src/AIDisplay/Resources/Samples/Street1.jpg diff --git a/Street2.jpg b/src/AIDisplay/Resources/Samples/Street2.jpg similarity index 100% rename from Street2.jpg rename to src/AIDisplay/Resources/Samples/Street2.jpg diff --git a/Street3.jpg b/src/AIDisplay/Resources/Samples/Street3.jpg similarity index 100% rename from Street3.jpg rename to src/AIDisplay/Resources/Samples/Street3.jpg diff --git a/Street4.jpg b/src/AIDisplay/Resources/Samples/Street4.jpg similarity index 100% rename from Street4.jpg rename to src/AIDisplay/Resources/Samples/Street4.jpg diff --git a/Street5.jpg b/src/AIDisplay/Resources/Samples/Street5.jpg similarity index 100% rename from Street5.jpg rename to src/AIDisplay/Resources/Samples/Street5.jpg diff --git a/Street6.jpg b/src/AIDisplay/Resources/Samples/Street6.jpg similarity index 100% rename from Street6.jpg rename to src/AIDisplay/Resources/Samples/Street6.jpg diff --git a/Street7.jpg b/src/AIDisplay/Resources/Samples/Street7.jpg similarity index 100% rename from Street7.jpg rename to src/AIDisplay/Resources/Samples/Street7.jpg diff --git a/Storage.cs b/src/AIDisplay/Storage.cs similarity index 100% rename from Storage.cs rename to src/AIDisplay/Storage.cs diff --git a/TimerPlus.cs b/src/AIDisplay/TimerPlus.cs similarity index 100% rename from TimerPlus.cs rename to src/AIDisplay/TimerPlus.cs diff --git a/WaitCursor.cs b/src/AIDisplay/WaitCursor.cs similarity index 100% rename from WaitCursor.cs rename to src/AIDisplay/WaitCursor.cs diff --git a/packages.config b/src/AIDisplay/packages.config similarity index 97% rename from packages.config rename to src/AIDisplay/packages.config index 1d3c253..04a3cc6 100644 --- a/packages.config +++ b/src/AIDisplay/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/MQTTnet.dll b/src/AIDisplay/redist/MQTTnet.dll similarity index 100% rename from MQTTnet.dll rename to src/AIDisplay/redist/MQTTnet.dll diff --git a/Installer.vdproj b/src/Installer/Installer.vdproj similarity index 97% rename from Installer.vdproj rename to src/Installer/Installer.vdproj index 7e34ae5..eab9a65 100644 --- a/Installer.vdproj +++ b/src/Installer/Installer.vdproj @@ -287,7 +287,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55B0BE71F8494529B2660899785424E2" { - "SourcePath" = "8:bin\\Release\\DBMotionFrames_log.ldf" + "SourcePath" = "8:..\\AIDisplay\\bin\\Release\\DBMotionFrames_log.ldf" "TargetName" = "8:DBMotionFrames_log.ldf" "Tag" = "8:" "Folder" = "8:_C6F4FA510D784BD39DD9EC2DCB479E32" @@ -307,7 +307,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_62C36CBD57C048CF9B079FFBF2784D51" { - "SourcePath" = "8:bin\\Release\\DBMotionFrames.mdf" + "SourcePath" = "8:..\\AIDisplay\\bin\\Release\\DBMotionFrames.mdf" "TargetName" = "8:DBMotionFrames.mdf" "Tag" = "8:" "Folder" = "8:_C6F4FA510D784BD39DD9EC2DCB479E32" diff --git a/Setup/Installer.msi b/src/Installer/Setup/Installer.msi similarity index 100% rename from Setup/Installer.msi rename to src/Installer/Setup/Installer.msi diff --git a/Setup/setup.exe b/src/Installer/Setup/setup.exe similarity index 100% rename from Setup/setup.exe rename to src/Installer/Setup/setup.exe diff --git a/Test Version 1/Installer.msi b/src/Installer/Test Version 1/Installer.msi similarity index 100% rename from Test Version 1/Installer.msi rename to src/Installer/Test Version 1/Installer.msi diff --git a/Test Version 1/setup.exe b/src/Installer/Test Version 1/setup.exe similarity index 100% rename from Test Version 1/setup.exe rename to src/Installer/Test Version 1/setup.exe diff --git a/zoom-in.png b/zoom-in.png deleted file mode 100644 index 1577e03..0000000 Binary files a/zoom-in.png and /dev/null differ diff --git a/zoom-out.png b/zoom-out.png deleted file mode 100644 index b8926aa..0000000 Binary files a/zoom-out.png and /dev/null differ