diff --git a/.vs/QueueSys/v16/Server/sqlite3/storage.ide b/.vs/QueueSys/v16/Server/sqlite3/storage.ide index df58f35..ec3a920 100644 Binary files a/.vs/QueueSys/v16/Server/sqlite3/storage.ide and b/.vs/QueueSys/v16/Server/sqlite3/storage.ide differ diff --git a/QueueSys/Properties/Settings.Designer.cs b/QueueSys/Properties/Settings.Designer.cs index 24aef7f..bdf9e37 100644 --- a/QueueSys/Properties/Settings.Designer.cs +++ b/QueueSys/Properties/Settings.Designer.cs @@ -8,23 +8,31 @@ // //------------------------------------------------------------------------------ -namespace QueueSys.Properties -{ - - +namespace QueueSys.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool ConfirmDelete { + get { + return ((bool)(this["ConfirmDelete"])); + } + set { + this["ConfirmDelete"] = value; + } + } } } diff --git a/QueueSys/Properties/Settings.settings b/QueueSys/Properties/Settings.settings index 3964565..df3de76 100644 --- a/QueueSys/Properties/Settings.settings +++ b/QueueSys/Properties/Settings.settings @@ -1,7 +1,9 @@  - - - - - - + + + + + True + + + \ No newline at end of file diff --git a/QueueSys/QueueSys.csproj b/QueueSys/QueueSys.csproj index 521d4c7..a4cc23d 100644 --- a/QueueSys/QueueSys.csproj +++ b/QueueSys/QueueSys.csproj @@ -58,6 +58,12 @@ frmEmployeeView.cs + + Form + + + frmOptions.cs + @@ -66,6 +72,9 @@ frmEmployeeView.cs + + frmOptions.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/QueueSys/bin/Debug/QueueSys.exe.config b/QueueSys/bin/Debug/QueueSys.exe.config index 56efbc7..e941b03 100644 --- a/QueueSys/bin/Debug/QueueSys.exe.config +++ b/QueueSys/bin/Debug/QueueSys.exe.config @@ -1,6 +1,18 @@  + + +
+ + + + + + True + + + \ No newline at end of file diff --git a/QueueSys/frmEmployeeView.Designer.cs b/QueueSys/frmEmployeeView.Designer.cs index 7f271c1..6e16f2c 100644 --- a/QueueSys/frmEmployeeView.Designer.cs +++ b/QueueSys/frmEmployeeView.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); this.lblCustomerName = new System.Windows.Forms.Label(); this.lblNumBags = new System.Windows.Forms.Label(); this.lblEmployeeName = new System.Windows.Forms.Label(); @@ -36,42 +35,50 @@ this.cbNumBags = new System.Windows.Forms.ComboBox(); this.cbEmployeeName = new System.Windows.Forms.ComboBox(); this.btnAdd = new System.Windows.Forms.Button(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exitAltF4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // lblCustomerName // this.lblCustomerName.AutoSize = true; - this.lblCustomerName.Location = new System.Drawing.Point(12, 50); + this.lblCustomerName.Location = new System.Drawing.Point(18, 77); + this.lblCustomerName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblCustomerName.Name = "lblCustomerName"; - this.lblCustomerName.Size = new System.Drawing.Size(82, 13); + this.lblCustomerName.Size = new System.Drawing.Size(124, 20); this.lblCustomerName.TabIndex = 0; this.lblCustomerName.Text = "Customer Name"; // // lblNumBags // this.lblNumBags.AutoSize = true; - this.lblNumBags.Location = new System.Drawing.Point(217, 50); + this.lblNumBags.Location = new System.Drawing.Point(326, 77); + this.lblNumBags.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblNumBags.Name = "lblNumBags"; - this.lblNumBags.Size = new System.Drawing.Size(53, 13); + this.lblNumBags.Size = new System.Drawing.Size(77, 20); this.lblNumBags.TabIndex = 1; this.lblNumBags.Text = "# of Bags"; // // lblEmployeeName // this.lblEmployeeName.AutoSize = true; - this.lblEmployeeName.Location = new System.Drawing.Point(358, 50); + this.lblEmployeeName.Location = new System.Drawing.Point(537, 77); + this.lblEmployeeName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblEmployeeName.Name = "lblEmployeeName"; - this.lblEmployeeName.Size = new System.Drawing.Size(84, 13); + this.lblEmployeeName.Size = new System.Drawing.Size(125, 20); this.lblEmployeeName.TabIndex = 2; this.lblEmployeeName.Text = "Employee Name"; // // tbCustomerName // - this.tbCustomerName.Location = new System.Drawing.Point(15, 76); + this.tbCustomerName.Location = new System.Drawing.Point(22, 117); + this.tbCustomerName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tbCustomerName.MaxLength = 255; this.tbCustomerName.Name = "tbCustomerName"; - this.tbCustomerName.Size = new System.Drawing.Size(153, 20); + this.tbCustomerName.Size = new System.Drawing.Size(228, 26); this.tbCustomerName.TabIndex = 1; // // cbNumBags @@ -83,39 +90,72 @@ "3", "4", "5"}); - this.cbNumBags.Location = new System.Drawing.Point(190, 75); + this.cbNumBags.Location = new System.Drawing.Point(285, 115); + this.cbNumBags.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbNumBags.MaxDropDownItems = 5; this.cbNumBags.Name = "cbNumBags"; - this.cbNumBags.Size = new System.Drawing.Size(121, 21); + this.cbNumBags.Size = new System.Drawing.Size(180, 28); this.cbNumBags.TabIndex = 2; // // cbEmployeeName // this.cbEmployeeName.FormattingEnabled = true; - this.cbEmployeeName.Location = new System.Drawing.Point(344, 75); + this.cbEmployeeName.Location = new System.Drawing.Point(516, 115); + this.cbEmployeeName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbEmployeeName.Name = "cbEmployeeName"; - this.cbEmployeeName.Size = new System.Drawing.Size(121, 21); + this.cbEmployeeName.Size = new System.Drawing.Size(180, 28); this.cbEmployeeName.TabIndex = 3; // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(502, 73); + this.btnAdd.Location = new System.Drawing.Point(753, 112); + this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(75, 23); + this.btnAdd.Size = new System.Drawing.Size(112, 35); this.btnAdd.TabIndex = 4; this.btnAdd.Text = "Add"; this.btnAdd.UseVisualStyleBackColor = true; // - // contextMenuStrip1 + // menuStrip1 // - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(882, 33); + this.menuStrip1.TabIndex = 5; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem, + this.exitAltF4ToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(54, 29); + this.fileToolStripMenuItem.Text = "&File"; + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.optionsToolStripMenuItem.Text = "Options"; + this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); + // + // exitAltF4ToolStripMenuItem + // + this.exitAltF4ToolStripMenuItem.Name = "exitAltF4ToolStripMenuItem"; + this.exitAltF4ToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.exitAltF4ToolStripMenuItem.Text = "E&xit (Alt-F4)"; + this.exitAltF4ToolStripMenuItem.Click += new System.EventHandler(this.exitAltF4ToolStripMenuItem_Click); // // frmEmployeeView // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(588, 450); + this.ClientSize = new System.Drawing.Size(882, 692); this.Controls.Add(this.btnAdd); this.Controls.Add(this.cbEmployeeName); this.Controls.Add(this.cbNumBags); @@ -123,9 +163,13 @@ this.Controls.Add(this.lblEmployeeName); this.Controls.Add(this.lblNumBags); this.Controls.Add(this.lblCustomerName); + this.Controls.Add(this.menuStrip1); + this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "frmEmployeeView"; this.Text = "Queue System"; - this.Load += new System.EventHandler(this.frmEmployeeView_Load); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -140,7 +184,10 @@ private System.Windows.Forms.ComboBox cbNumBags; private System.Windows.Forms.ComboBox cbEmployeeName; private System.Windows.Forms.Button btnAdd; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem exitAltF4ToolStripMenuItem; } } diff --git a/QueueSys/frmEmployeeView.cs b/QueueSys/frmEmployeeView.cs index be616f7..a22a4e7 100644 --- a/QueueSys/frmEmployeeView.cs +++ b/QueueSys/frmEmployeeView.cs @@ -17,10 +17,23 @@ namespace QueueSys InitializeComponent(); } + /* Execute when program / main form loads. + * Pop up the customer view screen to drag onto second monitor */ private void frmEmployeeView_Load(object sender, EventArgs e) { Form frm = new frmCustomerView(); frm.Show(); } + + /* Enable options menu. */ + private void optionsToolStripMenuItem_Click(object sender, EventArgs e) + { + Form frm = new frmOptions(); + frm.Show(); + frm.Activate(); + } + + // Exits the application. + private void exitAltF4ToolStripMenuItem_Click(object sender, EventArgs e) => Application.Exit(); } } diff --git a/QueueSys/frmEmployeeView.resx b/QueueSys/frmEmployeeView.resx index ad53752..d5494e3 100644 --- a/QueueSys/frmEmployeeView.resx +++ b/QueueSys/frmEmployeeView.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file diff --git a/QueueSys/frmOptions.Designer.cs b/QueueSys/frmOptions.Designer.cs new file mode 100644 index 0000000..9de1b72 --- /dev/null +++ b/QueueSys/frmOptions.Designer.cs @@ -0,0 +1,93 @@ +namespace QueueSys +{ + partial class frmOptions + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.cbConfirmDelete = new System.Windows.Forms.CheckBox(); + this.btnSaveClose = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // cbConfirmDelete + // + this.cbConfirmDelete.AutoSize = true; + + // Toggle the checkbox based on the confirmdelete option. + switch(Properties.Settings.Default.ConfirmDelete) + { + case true: + { + this.cbConfirmDelete.Checked = true; + this.cbConfirmDelete.CheckState = System.Windows.Forms.CheckState.Checked; + break; + } + case false: + { + this.cbConfirmDelete.Checked = false; + this.cbConfirmDelete.CheckState = System.Windows.Forms.CheckState.Unchecked; + break; + } + } + + this.cbConfirmDelete.Location = new System.Drawing.Point(13, 31); + this.cbConfirmDelete.Name = "cbConfirmDelete"; + this.cbConfirmDelete.Size = new System.Drawing.Size(355, 24); + this.cbConfirmDelete.TabIndex = 0; + this.cbConfirmDelete.Text = "Confirm deleting customer from active bag list"; + this.cbConfirmDelete.UseVisualStyleBackColor = true; + this.cbConfirmDelete.CheckedChanged += new System.EventHandler(this.cbConfirmDelete_CheckedChanged); + // + // btnSaveClose + // + this.btnSaveClose.Location = new System.Drawing.Point(12, 72); + this.btnSaveClose.Name = "btnSaveClose"; + this.btnSaveClose.Size = new System.Drawing.Size(169, 38); + this.btnSaveClose.TabIndex = 1; + this.btnSaveClose.Text = "Save and close"; + this.btnSaveClose.UseVisualStyleBackColor = true; + this.btnSaveClose.Click += new System.EventHandler(this.btnSaveClose_Click); + // + // frmOptions + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(382, 122); + this.Controls.Add(this.btnSaveClose); + this.Controls.Add(this.cbConfirmDelete); + this.Name = "frmOptions"; + this.Text = "Options"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.CheckBox cbConfirmDelete; + private System.Windows.Forms.Button btnSaveClose; + } +} \ No newline at end of file diff --git a/QueueSys/frmOptions.cs b/QueueSys/frmOptions.cs new file mode 100644 index 0000000..ebf9150 --- /dev/null +++ b/QueueSys/frmOptions.cs @@ -0,0 +1,33 @@ +using System; +using System.Windows.Forms; + +namespace QueueSys +{ + public partial class frmOptions : Form + { + public frmOptions() + { + InitializeComponent(); + } + + private void btnSaveClose_Click(object sender, EventArgs e) + { + Properties.Settings.Default.Save(); + this.Close(); + } + + private void cbConfirmDelete_CheckedChanged(object sender, EventArgs e) + { + switch(cbConfirmDelete.Checked) + { + case true: + Properties.Settings.Default.ConfirmDelete = true; + break; + case false: + Properties.Settings.Default.ConfirmDelete = false; + break; + } + Properties.Settings.Default.Save(); + } + } +} diff --git a/QueueSys/frmOptions.resx b/QueueSys/frmOptions.resx new file mode 100644 index 0000000..61bc649 --- /dev/null +++ b/QueueSys/frmOptions.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/QueueSys/obj/Debug/QueueSys.csproj.FileListAbsolute.txt b/QueueSys/obj/Debug/QueueSys.csproj.FileListAbsolute.txt index 8528488..c99e34e 100644 --- a/QueueSys/obj/Debug/QueueSys.csproj.FileListAbsolute.txt +++ b/QueueSys/obj/Debug/QueueSys.csproj.FileListAbsolute.txt @@ -8,3 +8,14 @@ C:\Users\Kougyoku\source\repos\QueueSys\QueueSys\obj\Debug\QueueSys.csproj.Gener C:\Users\Kougyoku\source\repos\QueueSys\QueueSys\obj\Debug\QueueSys.exe C:\Users\Kougyoku\source\repos\QueueSys\QueueSys\obj\Debug\QueueSys.pdb C:\Users\Kougyoku\source\repos\QueueSys\QueueSys\obj\Debug\QueueSys.frmCustomerView.resources +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\bin\Debug\QueueSys.exe.config +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\bin\Debug\QueueSys.exe +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\bin\Debug\QueueSys.pdb +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.csprojAssemblyReference.cache +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.frmCustomerView.resources +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.frmEmployeeView.resources +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.frmOptions.resources +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.Properties.Resources.resources +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.csproj.GenerateResource.cache +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.exe +C:\Users\kougyoku\Google Drive\TINFO 220_ HCI Group Project\QueueSys\QueueSys\obj\Debug\QueueSys.pdb