diff --git a/COM350/Project1/Project1/MainForm.vb b/COM350/Project1/Project1/MainForm.vb
index 195c5c9..1eb1e9f 100644
--- a/COM350/Project1/Project1/MainForm.vb
+++ b/COM350/Project1/Project1/MainForm.vb
@@ -51,6 +51,16 @@
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
Button1.Enabled = False
Button2.Enabled = False
+
+ For index As Integer = ListBox1.Items.Count() - 1 To 0 Step -1
+ Dim file As FileData = ListBox1.Items(index)
+ If (file.FileTime + Options.PlaylistTime < Options.PlaylistLength) Then
+ ListBox1.Items.RemoveAt(index)
+ RemoveFileFromTotal(file)
+ ListBox2.Items.Add(file)
+ AddFileToPlaylist(file)
+ End If
+ Next
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
diff --git a/COM380/Project2/Project2.sln b/COM380/Project2/Project2.sln
index f191f8e..469f804 100644
--- a/COM380/Project2/Project2.sln
+++ b/COM380/Project2/Project2.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project2", "Project2\Project2.vcxproj", "{CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project2", "Project2\Project2.vcxproj", "{1638CD6A-5249-49A4-A09B-707AF437AC66}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +9,10 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}.Debug|Win32.ActiveCfg = Debug|Win32
- {CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}.Debug|Win32.Build.0 = Debug|Win32
- {CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}.Release|Win32.ActiveCfg = Release|Win32
- {CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}.Release|Win32.Build.0 = Release|Win32
+ {1638CD6A-5249-49A4-A09B-707AF437AC66}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1638CD6A-5249-49A4-A09B-707AF437AC66}.Debug|Win32.Build.0 = Debug|Win32
+ {1638CD6A-5249-49A4-A09B-707AF437AC66}.Release|Win32.ActiveCfg = Release|Win32
+ {1638CD6A-5249-49A4-A09B-707AF437AC66}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/COM380/Project2/Project2/AssemblyInfo.cpp b/COM380/Project2/Project2/AssemblyInfo.cpp
new file mode 100644
index 0000000..997e36a
--- /dev/null
+++ b/COM380/Project2/Project2/AssemblyInfo.cpp
@@ -0,0 +1,40 @@
+#include "stdafx.h"
+
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("Project2")];
+[assembly:AssemblyDescriptionAttribute("Project2 - Amrit Panesar - 77260")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("")];
+[assembly:AssemblyProductAttribute("Project2")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c) Amrit Panesar 2015 ALL RIGHTS RESERVED")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];
+
+//
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute("1.0.*")];
+
+[assembly:ComVisible(false)];
+
+[assembly:CLSCompliantAttribute(true)];
+
+[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
diff --git a/COM380/Project2/Project2/Form1.h b/COM380/Project2/Project2/Form1.h
new file mode 100644
index 0000000..ef1cd42
--- /dev/null
+++ b/COM380/Project2/Project2/Form1.h
@@ -0,0 +1,605 @@
+#pragma once
+
+namespace Project2 {
+
+ using namespace System;
+ using namespace System::ComponentModel;
+ using namespace System::Collections;
+ using namespace System::Windows::Forms;
+ using namespace System::Data;
+ using namespace System::Drawing;
+
+ ///
+ /// Summary for Form1
+ ///
+ public ref class Form1 : public System::Windows::Forms::Form
+ {
+ public:
+ Form1(void)
+ {
+ InitializeComponent();
+ //
+ //TODO: Add the constructor code here
+ //
+ }
+
+ protected:
+ ///
+ /// Clean up any resources being used.
+ ///
+ ~Form1()
+ {
+ if (components)
+ {
+ delete components;
+ }
+ }
+ private: System::Windows::Forms::GroupBox^ groupBox1;
+ protected:
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox2;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox1;
+ private: System::Windows::Forms::Label^ label9;
+ private: System::Windows::Forms::Label^ label8;
+ private: System::Windows::Forms::TextBox^ textBox4;
+ private: System::Windows::Forms::Label^ label7;
+ private: System::Windows::Forms::Label^ label6;
+ private: System::Windows::Forms::TextBox^ textBox3;
+ private: System::Windows::Forms::TextBox^ textBox2;
+ private: System::Windows::Forms::Label^ label1;
+ private: System::Windows::Forms::MenuStrip^ menuStrip1;
+ private: System::Windows::Forms::ToolStripMenuItem^ fileToolStripMenuItem;
+ private: System::Windows::Forms::ToolStripMenuItem^ exitToolStripMenuItem;
+ private: System::Windows::Forms::GroupBox^ groupBox2;
+ private: System::Windows::Forms::Label^ label5;
+ private: System::Windows::Forms::Label^ label4;
+ private: System::Windows::Forms::Label^ label3;
+ private: System::Windows::Forms::Label^ label2;
+ private: System::Windows::Forms::DateTimePicker^ dateTimePicker2;
+ private: System::Windows::Forms::DateTimePicker^ dateTimePicker1;
+ private: System::Windows::Forms::GroupBox^ groupBox3;
+ private: System::Windows::Forms::Label^ label18;
+ private: System::Windows::Forms::Label^ label17;
+ private: System::Windows::Forms::Label^ label16;
+ private: System::Windows::Forms::Label^ label15;
+ private: System::Windows::Forms::Label^ label14;
+ private: System::Windows::Forms::Label^ label13;
+ private: System::Windows::Forms::Label^ label12;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox16;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox15;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox14;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox13;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox12;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox11;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox10;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox9;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox8;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox7;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox6;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox5;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox4;
+ private: System::Windows::Forms::MaskedTextBox^ maskedTextBox3;
+ private: System::Windows::Forms::Label^ label11;
+ private: System::Windows::Forms::Label^ label10;
+ private: System::Windows::Forms::GroupBox^ groupBox4;
+
+ private:
+ ///
+ /// Required designer variable.
+ ///
+ System::ComponentModel::Container ^components;
+
+#pragma region Windows Form Designer generated code
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ void InitializeComponent(void)
+ {
+ this->groupBox1 = (gcnew System::Windows::Forms::GroupBox());
+ this->maskedTextBox2 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox1 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->label9 = (gcnew System::Windows::Forms::Label());
+ this->label8 = (gcnew System::Windows::Forms::Label());
+ this->textBox4 = (gcnew System::Windows::Forms::TextBox());
+ this->label7 = (gcnew System::Windows::Forms::Label());
+ this->label6 = (gcnew System::Windows::Forms::Label());
+ this->textBox3 = (gcnew System::Windows::Forms::TextBox());
+ this->textBox2 = (gcnew System::Windows::Forms::TextBox());
+ this->label1 = (gcnew System::Windows::Forms::Label());
+ this->menuStrip1 = (gcnew System::Windows::Forms::MenuStrip());
+ this->fileToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+ this->exitToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+ this->groupBox2 = (gcnew System::Windows::Forms::GroupBox());
+ this->label5 = (gcnew System::Windows::Forms::Label());
+ this->label4 = (gcnew System::Windows::Forms::Label());
+ this->label3 = (gcnew System::Windows::Forms::Label());
+ this->label2 = (gcnew System::Windows::Forms::Label());
+ this->dateTimePicker2 = (gcnew System::Windows::Forms::DateTimePicker());
+ this->dateTimePicker1 = (gcnew System::Windows::Forms::DateTimePicker());
+ this->groupBox3 = (gcnew System::Windows::Forms::GroupBox());
+ this->label18 = (gcnew System::Windows::Forms::Label());
+ this->label17 = (gcnew System::Windows::Forms::Label());
+ this->label16 = (gcnew System::Windows::Forms::Label());
+ this->label15 = (gcnew System::Windows::Forms::Label());
+ this->label14 = (gcnew System::Windows::Forms::Label());
+ this->label13 = (gcnew System::Windows::Forms::Label());
+ this->label12 = (gcnew System::Windows::Forms::Label());
+ this->maskedTextBox16 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox15 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox14 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox13 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox12 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox11 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox10 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox9 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox8 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox7 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox6 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox5 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox4 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->maskedTextBox3 = (gcnew System::Windows::Forms::MaskedTextBox());
+ this->label11 = (gcnew System::Windows::Forms::Label());
+ this->label10 = (gcnew System::Windows::Forms::Label());
+ this->groupBox4 = (gcnew System::Windows::Forms::GroupBox());
+ this->groupBox1->SuspendLayout();
+ this->menuStrip1->SuspendLayout();
+ this->groupBox2->SuspendLayout();
+ this->groupBox3->SuspendLayout();
+ this->SuspendLayout();
+ //
+ // groupBox1
+ //
+ this->groupBox1->Controls->Add(this->maskedTextBox2);
+ this->groupBox1->Controls->Add(this->maskedTextBox1);
+ this->groupBox1->Controls->Add(this->label9);
+ this->groupBox1->Controls->Add(this->label8);
+ this->groupBox1->Controls->Add(this->textBox4);
+ this->groupBox1->Controls->Add(this->label7);
+ this->groupBox1->Controls->Add(this->label6);
+ this->groupBox1->Controls->Add(this->textBox3);
+ this->groupBox1->Controls->Add(this->textBox2);
+ this->groupBox1->Controls->Add(this->label1);
+ this->groupBox1->Location = System::Drawing::Point(12, 27);
+ this->groupBox1->Name = L"groupBox1";
+ this->groupBox1->Size = System::Drawing::Size(270, 176);
+ this->groupBox1->TabIndex = 0;
+ this->groupBox1->TabStop = false;
+ this->groupBox1->Text = L"Employee Information";
+ //
+ // maskedTextBox2
+ //
+ this->maskedTextBox2->Location = System::Drawing::Point(99, 19);
+ this->maskedTextBox2->Mask = L"#############";
+ this->maskedTextBox2->Name = L"maskedTextBox2";
+ this->maskedTextBox2->Size = System::Drawing::Size(158, 20);
+ this->maskedTextBox2->TabIndex = 10;
+ //
+ // maskedTextBox1
+ //
+ this->maskedTextBox1->Location = System::Drawing::Point(99, 44);
+ this->maskedTextBox1->Mask = L"$#####.##";
+ this->maskedTextBox1->Name = L"maskedTextBox1";
+ this->maskedTextBox1->Size = System::Drawing::Size(158, 20);
+ this->maskedTextBox1->TabIndex = 9;
+ //
+ // label9
+ //
+ this->label9->AutoSize = true;
+ this->label9->Location = System::Drawing::Point(9, 47);
+ this->label9->Name = L"label9";
+ this->label9->Size = System::Drawing::Size(75, 13);
+ this->label9->TabIndex = 8;
+ this->label9->Text = L"Hourly Wage: ";
+ //
+ // label8
+ //
+ this->label8->AutoSize = true;
+ this->label8->Location = System::Drawing::Point(23, 143);
+ this->label8->Name = L"label8";
+ this->label8->Size = System::Drawing::Size(61, 13);
+ this->label8->TabIndex = 7;
+ this->label8->Text = L"Last Name:";
+ //
+ // textBox4
+ //
+ this->textBox4->Location = System::Drawing::Point(99, 111);
+ this->textBox4->MaxLength = 1;
+ this->textBox4->Name = L"textBox4";
+ this->textBox4->Size = System::Drawing::Size(32, 20);
+ this->textBox4->TabIndex = 6;
+ //
+ // label7
+ //
+ this->label7->AutoSize = true;
+ this->label7->Location = System::Drawing::Point(14, 114);
+ this->label7->Name = L"label7";
+ this->label7->Size = System::Drawing::Size(71, 13);
+ this->label7->TabIndex = 5;
+ this->label7->Text = L"Middle Initial: ";
+ //
+ // label6
+ //
+ this->label6->AutoSize = true;
+ this->label6->Location = System::Drawing::Point(21, 88);
+ this->label6->Name = L"label6";
+ this->label6->Size = System::Drawing::Size(63, 13);
+ this->label6->TabIndex = 4;
+ this->label6->Text = L"First Name: ";
+ //
+ // textBox3
+ //
+ this->textBox3->Location = System::Drawing::Point(99, 85);
+ this->textBox3->Name = L"textBox3";
+ this->textBox3->Size = System::Drawing::Size(158, 20);
+ this->textBox3->TabIndex = 3;
+ //
+ // textBox2
+ //
+ this->textBox2->Location = System::Drawing::Point(99, 140);
+ this->textBox2->Name = L"textBox2";
+ this->textBox2->Size = System::Drawing::Size(158, 20);
+ this->textBox2->TabIndex = 2;
+ //
+ // label1
+ //
+ this->label1->AutoSize = true;
+ this->label1->Location = System::Drawing::Point(14, 19);
+ this->label1->Name = L"label1";
+ this->label1->Size = System::Drawing::Size(70, 13);
+ this->label1->TabIndex = 0;
+ this->label1->Text = L"Employee ID:";
+ //
+ // menuStrip1
+ //
+ this->menuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(1) {this->fileToolStripMenuItem});
+ this->menuStrip1->Location = System::Drawing::Point(0, 0);
+ this->menuStrip1->Name = L"menuStrip1";
+ this->menuStrip1->Size = System::Drawing::Size(703, 24);
+ this->menuStrip1->TabIndex = 1;
+ this->menuStrip1->Text = L"menuStrip1";
+ //
+ // fileToolStripMenuItem
+ //
+ this->fileToolStripMenuItem->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(1) {this->exitToolStripMenuItem});
+ this->fileToolStripMenuItem->Name = L"fileToolStripMenuItem";
+ this->fileToolStripMenuItem->Size = System::Drawing::Size(37, 20);
+ this->fileToolStripMenuItem->Text = L"&File";
+ //
+ // exitToolStripMenuItem
+ //
+ this->exitToolStripMenuItem->Name = L"exitToolStripMenuItem";
+ this->exitToolStripMenuItem->Size = System::Drawing::Size(152, 22);
+ this->exitToolStripMenuItem->Text = L"E&xit";
+ //
+ // groupBox2
+ //
+ this->groupBox2->Controls->Add(this->label5);
+ this->groupBox2->Controls->Add(this->label4);
+ this->groupBox2->Controls->Add(this->label3);
+ this->groupBox2->Controls->Add(this->label2);
+ this->groupBox2->Controls->Add(this->dateTimePicker2);
+ this->groupBox2->Controls->Add(this->dateTimePicker1);
+ this->groupBox2->Location = System::Drawing::Point(293, 37);
+ this->groupBox2->Name = L"groupBox2";
+ this->groupBox2->Size = System::Drawing::Size(398, 166);
+ this->groupBox2->TabIndex = 2;
+ this->groupBox2->TabStop = false;
+ this->groupBox2->Text = L"Pay Period";
+ //
+ // label5
+ //
+ this->label5->AutoSize = true;
+ this->label5->Location = System::Drawing::Point(276, 116);
+ this->label5->Name = L"label5";
+ this->label5->Size = System::Drawing::Size(44, 13);
+ this->label5->TabIndex = 5;
+ this->label5->Text = L"15 days";
+ //
+ // label4
+ //
+ this->label4->AutoSize = true;
+ this->label4->Location = System::Drawing::Point(206, 116);
+ this->label4->Name = L"label4";
+ this->label4->Size = System::Drawing::Size(64, 13);
+ this->label4->TabIndex = 4;
+ this->label4->Text = L"Total Days: ";
+ //
+ // label3
+ //
+ this->label3->AutoSize = true;
+ this->label3->Location = System::Drawing::Point(64, 82);
+ this->label3->Name = L"label3";
+ this->label3->Size = System::Drawing::Size(72, 13);
+ this->label3->TabIndex = 3;
+ this->label3->Text = L"Ending Date: ";
+ //
+ // label2
+ //
+ this->label2->AutoSize = true;
+ this->label2->Location = System::Drawing::Point(50, 56);
+ this->label2->Name = L"label2";
+ this->label2->Size = System::Drawing::Size(86, 13);
+ this->label2->TabIndex = 2;
+ this->label2->Text = L"Beginning Date: ";
+ //
+ // dateTimePicker2
+ //
+ this->dateTimePicker2->Location = System::Drawing::Point(142, 76);
+ this->dateTimePicker2->Name = L"dateTimePicker2";
+ this->dateTimePicker2->Size = System::Drawing::Size(200, 20);
+ this->dateTimePicker2->TabIndex = 1;
+ //
+ // dateTimePicker1
+ //
+ this->dateTimePicker1->Location = System::Drawing::Point(142, 50);
+ this->dateTimePicker1->Name = L"dateTimePicker1";
+ this->dateTimePicker1->Size = System::Drawing::Size(200, 20);
+ this->dateTimePicker1->TabIndex = 0;
+ //
+ // groupBox3
+ //
+ this->groupBox3->Controls->Add(this->label18);
+ this->groupBox3->Controls->Add(this->label17);
+ this->groupBox3->Controls->Add(this->label16);
+ this->groupBox3->Controls->Add(this->label15);
+ this->groupBox3->Controls->Add(this->label14);
+ this->groupBox3->Controls->Add(this->label13);
+ this->groupBox3->Controls->Add(this->label12);
+ this->groupBox3->Controls->Add(this->maskedTextBox16);
+ this->groupBox3->Controls->Add(this->maskedTextBox15);
+ this->groupBox3->Controls->Add(this->maskedTextBox14);
+ this->groupBox3->Controls->Add(this->maskedTextBox13);
+ this->groupBox3->Controls->Add(this->maskedTextBox12);
+ this->groupBox3->Controls->Add(this->maskedTextBox11);
+ this->groupBox3->Controls->Add(this->maskedTextBox10);
+ this->groupBox3->Controls->Add(this->maskedTextBox9);
+ this->groupBox3->Controls->Add(this->maskedTextBox8);
+ this->groupBox3->Controls->Add(this->maskedTextBox7);
+ this->groupBox3->Controls->Add(this->maskedTextBox6);
+ this->groupBox3->Controls->Add(this->maskedTextBox5);
+ this->groupBox3->Controls->Add(this->maskedTextBox4);
+ this->groupBox3->Controls->Add(this->maskedTextBox3);
+ this->groupBox3->Controls->Add(this->label11);
+ this->groupBox3->Controls->Add(this->label10);
+ this->groupBox3->Location = System::Drawing::Point(12, 209);
+ this->groupBox3->Name = L"groupBox3";
+ this->groupBox3->Size = System::Drawing::Size(679, 159);
+ this->groupBox3->TabIndex = 3;
+ this->groupBox3->TabStop = false;
+ this->groupBox3->Text = L"Time Card";
+ //
+ // label18
+ //
+ this->label18->AutoSize = true;
+ this->label18->Location = System::Drawing::Point(565, 15);
+ this->label18->Name = L"label18";
+ this->label18->Size = System::Drawing::Size(43, 13);
+ this->label18->TabIndex = 19;
+ this->label18->Text = L"Sunday";
+ //
+ // label17
+ //
+ this->label17->AutoSize = true;
+ this->label17->Location = System::Drawing::Point(484, 15);
+ this->label17->Name = L"label17";
+ this->label17->Size = System::Drawing::Size(49, 13);
+ this->label17->TabIndex = 18;
+ this->label17->Text = L"Saturday";
+ //
+ // label16
+ //
+ this->label16->AutoSize = true;
+ this->label16->Location = System::Drawing::Point(416, 15);
+ this->label16->Name = L"label16";
+ this->label16->Size = System::Drawing::Size(35, 13);
+ this->label16->TabIndex = 18;
+ this->label16->Text = L"Friday";
+ //
+ // label15
+ //
+ this->label15->AutoSize = true;
+ this->label15->Location = System::Drawing::Point(331, 15);
+ this->label15->Name = L"label15";
+ this->label15->Size = System::Drawing::Size(51, 13);
+ this->label15->TabIndex = 18;
+ this->label15->Text = L"Thursday";
+ //
+ // label14
+ //
+ this->label14->AutoSize = true;
+ this->label14->Location = System::Drawing::Point(253, 15);
+ this->label14->Name = L"label14";
+ this->label14->Size = System::Drawing::Size(64, 13);
+ this->label14->TabIndex = 18;
+ this->label14->Text = L"Wednesday";
+ //
+ // label13
+ //
+ this->label13->AutoSize = true;
+ this->label13->Location = System::Drawing::Point(182, 15);
+ this->label13->Name = L"label13";
+ this->label13->Size = System::Drawing::Size(48, 13);
+ this->label13->TabIndex = 17;
+ this->label13->Text = L"Tuesday";
+ //
+ // label12
+ //
+ this->label12->AutoSize = true;
+ this->label12->Location = System::Drawing::Point(109, 15);
+ this->label12->Name = L"label12";
+ this->label12->Size = System::Drawing::Size(45, 13);
+ this->label12->TabIndex = 16;
+ this->label12->Text = L"Monday";
+ //
+ // maskedTextBox16
+ //
+ this->maskedTextBox16->Location = System::Drawing::Point(553, 121);
+ this->maskedTextBox16->Mask = L"##.##";
+ this->maskedTextBox16->Name = L"maskedTextBox16";
+ this->maskedTextBox16->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox16->TabIndex = 15;
+ //
+ // maskedTextBox15
+ //
+ this->maskedTextBox15->Location = System::Drawing::Point(477, 121);
+ this->maskedTextBox15->Mask = L"##.##";
+ this->maskedTextBox15->Name = L"maskedTextBox15";
+ this->maskedTextBox15->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox15->TabIndex = 14;
+ //
+ // maskedTextBox14
+ //
+ this->maskedTextBox14->Location = System::Drawing::Point(401, 121);
+ this->maskedTextBox14->Mask = L"##.##";
+ this->maskedTextBox14->Name = L"maskedTextBox14";
+ this->maskedTextBox14->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox14->TabIndex = 13;
+ //
+ // maskedTextBox13
+ //
+ this->maskedTextBox13->Location = System::Drawing::Point(325, 121);
+ this->maskedTextBox13->Mask = L"##.##";
+ this->maskedTextBox13->Name = L"maskedTextBox13";
+ this->maskedTextBox13->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox13->TabIndex = 12;
+ //
+ // maskedTextBox12
+ //
+ this->maskedTextBox12->Location = System::Drawing::Point(249, 121);
+ this->maskedTextBox12->Mask = L"##.##";
+ this->maskedTextBox12->Name = L"maskedTextBox12";
+ this->maskedTextBox12->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox12->TabIndex = 11;
+ //
+ // maskedTextBox11
+ //
+ this->maskedTextBox11->Location = System::Drawing::Point(173, 121);
+ this->maskedTextBox11->Mask = L"##.##";
+ this->maskedTextBox11->Name = L"maskedTextBox11";
+ this->maskedTextBox11->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox11->TabIndex = 10;
+ //
+ // maskedTextBox10
+ //
+ this->maskedTextBox10->Location = System::Drawing::Point(97, 121);
+ this->maskedTextBox10->Mask = L"##.##";
+ this->maskedTextBox10->Name = L"maskedTextBox10";
+ this->maskedTextBox10->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox10->TabIndex = 9;
+ //
+ // maskedTextBox9
+ //
+ this->maskedTextBox9->Location = System::Drawing::Point(553, 66);
+ this->maskedTextBox9->Mask = L"##.##";
+ this->maskedTextBox9->Name = L"maskedTextBox9";
+ this->maskedTextBox9->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox9->TabIndex = 8;
+ //
+ // maskedTextBox8
+ //
+ this->maskedTextBox8->Location = System::Drawing::Point(477, 66);
+ this->maskedTextBox8->Mask = L"##.##";
+ this->maskedTextBox8->Name = L"maskedTextBox8";
+ this->maskedTextBox8->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox8->TabIndex = 7;
+ //
+ // maskedTextBox7
+ //
+ this->maskedTextBox7->Location = System::Drawing::Point(401, 66);
+ this->maskedTextBox7->Mask = L"##.##";
+ this->maskedTextBox7->Name = L"maskedTextBox7";
+ this->maskedTextBox7->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox7->TabIndex = 6;
+ //
+ // maskedTextBox6
+ //
+ this->maskedTextBox6->Location = System::Drawing::Point(325, 66);
+ this->maskedTextBox6->Mask = L"##.##";
+ this->maskedTextBox6->Name = L"maskedTextBox6";
+ this->maskedTextBox6->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox6->TabIndex = 5;
+ //
+ // maskedTextBox5
+ //
+ this->maskedTextBox5->Location = System::Drawing::Point(249, 66);
+ this->maskedTextBox5->Mask = L"##.##";
+ this->maskedTextBox5->Name = L"maskedTextBox5";
+ this->maskedTextBox5->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox5->TabIndex = 4;
+ //
+ // maskedTextBox4
+ //
+ this->maskedTextBox4->Location = System::Drawing::Point(173, 66);
+ this->maskedTextBox4->Mask = L"##.##";
+ this->maskedTextBox4->Name = L"maskedTextBox4";
+ this->maskedTextBox4->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox4->TabIndex = 3;
+ //
+ // maskedTextBox3
+ //
+ this->maskedTextBox3->Location = System::Drawing::Point(97, 66);
+ this->maskedTextBox3->Mask = L"##.##";
+ this->maskedTextBox3->Name = L"maskedTextBox3";
+ this->maskedTextBox3->Size = System::Drawing::Size(70, 20);
+ this->maskedTextBox3->TabIndex = 2;
+ //
+ // label11
+ //
+ this->label11->AutoSize = true;
+ this->label11->Location = System::Drawing::Point(9, 124);
+ this->label11->Name = L"label11";
+ this->label11->Size = System::Drawing::Size(82, 13);
+ this->label11->TabIndex = 1;
+ this->label11->Text = L"Second Week: ";
+ //
+ // label10
+ //
+ this->label10->AutoSize = true;
+ this->label10->Location = System::Drawing::Point(27, 69);
+ this->label10->Name = L"label10";
+ this->label10->Size = System::Drawing::Size(64, 13);
+ this->label10->TabIndex = 0;
+ this->label10->Text = L"First Week: ";
+ //
+ // groupBox4
+ //
+ this->groupBox4->Location = System::Drawing::Point(12, 374);
+ this->groupBox4->Name = L"groupBox4";
+ this->groupBox4->Size = System::Drawing::Size(679, 120);
+ this->groupBox4->TabIndex = 4;
+ this->groupBox4->TabStop = false;
+ this->groupBox4->Text = L"Payroll Processing";
+ //
+ // Form1
+ //
+ this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
+ this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
+ this->ClientSize = System::Drawing::Size(703, 506);
+ this->Controls->Add(this->groupBox4);
+ this->Controls->Add(this->groupBox3);
+ this->Controls->Add(this->groupBox2);
+ this->Controls->Add(this->groupBox1);
+ this->Controls->Add(this->menuStrip1);
+ this->MainMenuStrip = this->menuStrip1;
+ this->Name = L"Form1";
+ this->Text = L"Form1";
+ this->Load += gcnew System::EventHandler(this, &Form1::Form1_Load);
+ this->groupBox1->ResumeLayout(false);
+ this->groupBox1->PerformLayout();
+ this->menuStrip1->ResumeLayout(false);
+ this->menuStrip1->PerformLayout();
+ this->groupBox2->ResumeLayout(false);
+ this->groupBox2->PerformLayout();
+ this->groupBox3->ResumeLayout(false);
+ this->groupBox3->PerformLayout();
+ this->ResumeLayout(false);
+ this->PerformLayout();
+
+ }
+#pragma endregion
+ private: System::Void Form1_Load(System::Object^ sender, System::EventArgs^ e)
+ {
+ }
+};
+}
+
diff --git a/COM380/Project2/Project2/Form1.resX b/COM380/Project2/Project2/Form1.resX
new file mode 100644
index 0000000..d5494e3
--- /dev/null
+++ b/COM380/Project2/Project2/Form1.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
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/COM380/Project2/Project2/Project2.cpp b/COM380/Project2/Project2/Project2.cpp
index 430edfc..b541fd1 100644
--- a/COM380/Project2/Project2/Project2.cpp
+++ b/COM380/Project2/Project2/Project2.cpp
@@ -1,102 +1,18 @@
-
-// Project2.cpp : Defines the class behaviors for the application.
-//
+// Project2.cpp : main project file.
#include "stdafx.h"
-#include "Project2.h"
-#include "Project2Dlg.h"
+#include "Form1.h"
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
+using namespace Project2;
-
-// CProject2App
-
-BEGIN_MESSAGE_MAP(CProject2App, CWinApp)
- ON_COMMAND(ID_HELP, &CWinApp::OnHelp)
-END_MESSAGE_MAP()
-
-
-// CProject2App construction
-
-CProject2App::CProject2App()
+[STAThreadAttribute]
+int main(array ^args)
{
- // support Restart Manager
- m_dwRestartManagerSupportFlags = AFX_RESTART_MANAGER_SUPPORT_RESTART;
+ // Enabling Windows XP visual effects before any controls are created
+ Application::EnableVisualStyles();
+ Application::SetCompatibleTextRenderingDefault(false);
- // TODO: add construction code here,
- // Place all significant initialization in InitInstance
+ // Create the main window and run it
+ Application::Run(gcnew Form1());
+ return 0;
}
-
-
-// The one and only CProject2App object
-
-CProject2App theApp;
-
-
-// CProject2App initialization
-
-BOOL CProject2App::InitInstance()
-{
- // InitCommonControlsEx() is required on Windows XP if an application
- // manifest specifies use of ComCtl32.dll version 6 or later to enable
- // visual styles. Otherwise, any window creation will fail.
- INITCOMMONCONTROLSEX InitCtrls;
- InitCtrls.dwSize = sizeof(InitCtrls);
- // Set this to include all the common control classes you want to use
- // in your application.
- InitCtrls.dwICC = ICC_WIN95_CLASSES;
- InitCommonControlsEx(&InitCtrls);
-
- CWinApp::InitInstance();
-
-
- AfxEnableControlContainer();
-
- // Create the shell manager, in case the dialog contains
- // any shell tree view or shell list view controls.
- CShellManager *pShellManager = new CShellManager;
-
- // Activate "Windows Native" visual manager for enabling themes in MFC controls
- CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));
-
- // Standard initialization
- // If you are not using these features and wish to reduce the size
- // of your final executable, you should remove from the following
- // the specific initialization routines you do not need
- // Change the registry key under which our settings are stored
- // TODO: You should modify this string to be something appropriate
- // such as the name of your company or organization
- SetRegistryKey(_T("Local AppWizard-Generated Applications"));
-
- CProject2Dlg dlg;
- m_pMainWnd = &dlg;
- INT_PTR nResponse = dlg.DoModal();
- if (nResponse == IDOK)
- {
- // TODO: Place code here to handle when the dialog is
- // dismissed with OK
- }
- else if (nResponse == IDCANCEL)
- {
- // TODO: Place code here to handle when the dialog is
- // dismissed with Cancel
- }
- else if (nResponse == -1)
- {
- TRACE(traceAppMsg, 0, "Warning: dialog creation failed, so application is terminating unexpectedly.\n");
- TRACE(traceAppMsg, 0, "Warning: if you are using MFC controls on the dialog, you cannot #define _AFX_NO_MFC_CONTROLS_IN_DIALOGS.\n");
- }
-
- // Delete the shell manager created above.
- if (pShellManager != NULL)
- {
- delete pShellManager;
- }
-
- // Since the dialog has been closed, return FALSE so that we exit the
- // application, rather than start the application's message pump.
- return FALSE;
-}
-
diff --git a/COM380/Project2/Project2/Project2.h b/COM380/Project2/Project2/Project2.h
deleted file mode 100644
index b483633..0000000
--- a/COM380/Project2/Project2/Project2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// Project2.h : main header file for the PROJECT_NAME application
-//
-
-#pragma once
-
-#ifndef __AFXWIN_H__
- #error "include 'stdafx.h' before including this file for PCH"
-#endif
-
-#include "resource.h" // main symbols
-
-
-// CProject2App:
-// See Project2.cpp for the implementation of this class
-//
-
-class CProject2App : public CWinApp
-{
-public:
- CProject2App();
-
-// Overrides
-public:
- virtual BOOL InitInstance();
-
-// Implementation
-
- DECLARE_MESSAGE_MAP()
-};
-
-extern CProject2App theApp;
\ No newline at end of file
diff --git a/COM380/Project2/Project2/Project2.rc b/COM380/Project2/Project2/Project2.rc
deleted file mode 100644
index 97be10e..0000000
Binary files a/COM380/Project2/Project2/Project2.rc and /dev/null differ
diff --git a/COM380/Project2/Project2/Project2.vcxproj b/COM380/Project2/Project2/Project2.vcxproj
index 08bc64f..92ce454 100644
--- a/COM380/Project2/Project2/Project2.vcxproj
+++ b/COM380/Project2/Project2/Project2.vcxproj
@@ -11,25 +11,25 @@
- {CD85BFB0-ACC9-4C27-A2D3-D4B451736BCC}
+ {1638CD6A-5249-49A4-A09B-707AF437AC66}
+ v4.5
+ ManagedCProj
Project2
- MFCProj
Application
true
v110
+ Pure
Unicode
- Static
Application
false
v110
- true
+ Pure
Unicode
- Static
@@ -49,78 +49,67 @@
- Use
Level3
Disabled
- WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;%(PreprocessorDefinitions)
+ Use
- Windows
true
+
+ Windows
+ main
-
- false
- true
- _DEBUG;%(PreprocessorDefinitions)
-
-
- 0x0409
- _DEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
Level3
+ WIN32;NDEBUG;%(PreprocessorDefinitions)
Use
- MaxSpeed
- true
- true
- WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
- Windows
true
- true
- true
+
+ Windows
+ main
-
- false
- true
- NDEBUG;%(PreprocessorDefinitions)
-
-
- 0x0409
- NDEBUG;%(PreprocessorDefinitions)
- $(IntDir);%(AdditionalIncludeDirectories)
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
Create
Create
-
+
+ CppForm
+
+
+
-
+
-
+
+
+
+
+ Form1.h
+ Designer
+
diff --git a/COM380/Project2/Project2/Project2.vcxproj.filters b/COM380/Project2/Project2/Project2.vcxproj.filters
index 5b5aaf3..15ecf26 100644
--- a/COM380/Project2/Project2/Project2.vcxproj.filters
+++ b/COM380/Project2/Project2/Project2.vcxproj.filters
@@ -17,28 +17,11 @@
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
Source Files
-
+
Source Files
@@ -46,17 +29,23 @@
-
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
Resource Files
-
- Resource Files
-
-
-
-
+
Resource Files
diff --git a/COM380/Project2/Project2/Project2Dlg.cpp b/COM380/Project2/Project2/Project2Dlg.cpp
deleted file mode 100644
index 03fc80c..0000000
--- a/COM380/Project2/Project2/Project2Dlg.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// Project2Dlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Project2.h"
-#include "Project2Dlg.h"
-#include "afxdialogex.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-
-// CProject2Dlg dialog
-
-
-
-CProject2Dlg::CProject2Dlg(CWnd* pParent /*=NULL*/)
- : CDialogEx(CProject2Dlg::IDD, pParent)
-{
- m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-}
-
-void CProject2Dlg::DoDataExchange(CDataExchange* pDX)
-{
- CDialogEx::DoDataExchange(pDX);
-}
-
-BEGIN_MESSAGE_MAP(CProject2Dlg, CDialogEx)
- ON_WM_PAINT()
- ON_WM_QUERYDRAGICON()
-END_MESSAGE_MAP()
-
-
-// CProject2Dlg message handlers
-
-BOOL CProject2Dlg::OnInitDialog()
-{
- CDialogEx::OnInitDialog();
-
- // Set the icon for this dialog. The framework does this automatically
- // when the application's main window is not a dialog
- SetIcon(m_hIcon, TRUE); // Set big icon
- SetIcon(m_hIcon, FALSE); // Set small icon
-
- // TODO: Add extra initialization here
-
- return TRUE; // return TRUE unless you set the focus to a control
-}
-
-// If you add a minimize button to your dialog, you will need the code below
-// to draw the icon. For MFC applications using the document/view model,
-// this is automatically done for you by the framework.
-
-void CProject2Dlg::OnPaint()
-{
- if (IsIconic())
- {
- CPaintDC dc(this); // device context for painting
-
- SendMessage(WM_ICONERASEBKGND, reinterpret_cast(dc.GetSafeHdc()), 0);
-
- // Center icon in client rectangle
- int cxIcon = GetSystemMetrics(SM_CXICON);
- int cyIcon = GetSystemMetrics(SM_CYICON);
- CRect rect;
- GetClientRect(&rect);
- int x = (rect.Width() - cxIcon + 1) / 2;
- int y = (rect.Height() - cyIcon + 1) / 2;
-
- // Draw the icon
- dc.DrawIcon(x, y, m_hIcon);
- }
- else
- {
- CDialogEx::OnPaint();
- }
-}
-
-// The system calls this function to obtain the cursor to display while the user drags
-// the minimized window.
-HCURSOR CProject2Dlg::OnQueryDragIcon()
-{
- return static_cast(m_hIcon);
-}
-
diff --git a/COM380/Project2/Project2/Project2Dlg.h b/COM380/Project2/Project2/Project2Dlg.h
deleted file mode 100644
index a864ac8..0000000
--- a/COM380/Project2/Project2/Project2Dlg.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// Project2Dlg.h : header file
-//
-
-#pragma once
-
-
-// CProject2Dlg dialog
-class CProject2Dlg : public CDialogEx
-{
-// Construction
-public:
- CProject2Dlg(CWnd* pParent = NULL); // standard constructor
-
-// Dialog Data
- enum { IDD = IDD_PROJECT2_DIALOG };
-
- protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
-
-
-// Implementation
-protected:
- HICON m_hIcon;
-
- // Generated message map functions
- virtual BOOL OnInitDialog();
- afx_msg void OnPaint();
- afx_msg HCURSOR OnQueryDragIcon();
- DECLARE_MESSAGE_MAP()
-};
diff --git a/COM380/Project2/Project2/ReadMe.txt b/COM380/Project2/Project2/ReadMe.txt
index 7cd98a1..15cccb6 100644
--- a/COM380/Project2/Project2/ReadMe.txt
+++ b/COM380/Project2/Project2/ReadMe.txt
@@ -1,19 +1,17 @@
-================================================================================
- MICROSOFT FOUNDATION CLASS LIBRARY : Project2 Project Overview
-===============================================================================
+========================================================================
+ APPLICATION : Project2 Project Overview
+========================================================================
-The application wizard has created this Project2 application for
-you. This application not only demonstrates the basics of using the Microsoft
-Foundation Classes but is also a starting point for writing your application.
+AppWizard has created this Project2 Application for you.
This file contains a summary of what you will find in each of the files that
make up your Project2 application.
Project2.vcxproj
- This is the main project file for VC++ projects generated using an application wizard.
- It contains information about the version of Visual C++ that generated the file, and
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
information about the platforms, configurations, and project features selected with the
- application wizard.
+ Application Wizard.
Project2.vcxproj.filters
This is the filters file for VC++ projects generated using an Application Wizard.
@@ -22,78 +20,21 @@ Project2.vcxproj.filters
similar extensions under a specific node (for e.g. ".cpp" files are associated with the
"Source Files" filter).
-Project2.h
- This is the main header file for the application. It includes other
- project specific headers (including Resource.h) and declares the
- CProject2App application class.
-
Project2.cpp
- This is the main application source file that contains the application
- class CProject2App.
+ This is the main application source file.
+ Contains the code to display the form.
-Project2.rc
- This is a listing of all of the Microsoft Windows resources that the
- program uses. It includes the icons, bitmaps, and cursors that are stored
- in the RES subdirectory. This file can be directly edited in Microsoft
- Visual C++. Your project resources are in 1033.
-
-res\Project2.ico
- This is an icon file, which is used as the application's icon. This
- icon is included by the main resource file Project2.rc.
-
-res\Project2.rc2
- This file contains resources that are not edited by Microsoft
- Visual C++. You should place all resources not editable by
- the resource editor in this file.
+Form1.h
+ Contains the implementation of your form class and InitializeComponent() function.
+AssemblyInfo.cpp
+ Contains custom attributes for modifying assembly metadata.
/////////////////////////////////////////////////////////////////////////////
-
-The application wizard creates one dialog class:
-
-Project2Dlg.h, Project2Dlg.cpp - the dialog
- These files contain your CProject2Dlg class. This class defines
- the behavior of your application's main dialog. The dialog's template is
- in Project2.rc, which can be edited in Microsoft Visual C++.
-
-/////////////////////////////////////////////////////////////////////////////
-
-Other Features:
-
-ActiveX Controls
- The application includes support to use ActiveX controls.
-
-/////////////////////////////////////////////////////////////////////////////
-
Other standard files:
StdAfx.h, StdAfx.cpp
These files are used to build a precompiled header (PCH) file
named Project2.pch and a precompiled types file named StdAfx.obj.
-Resource.h
- This is the standard header file, which defines new resource IDs.
- Microsoft Visual C++ reads and updates this file.
-
-Project2.manifest
- Application manifest files are used by Windows XP to describe an applications
- dependency on specific versions of Side-by-Side assemblies. The loader uses this
- information to load the appropriate assembly from the assembly cache or private
- from the application. The Application manifest maybe included for redistribution
- as an external .manifest file that is installed in the same folder as the application
- executable or it may be included in the executable in the form of a resource.
-/////////////////////////////////////////////////////////////////////////////
-
-Other notes:
-
-The application wizard uses "TODO:" to indicate parts of the source code you
-should add to or customize.
-
-If your application uses MFC in a shared DLL, you will need
-to redistribute the MFC DLLs. If your application is in a language
-other than the operating system's locale, you will also have to
-redistribute the corresponding localized resources mfc110XXX.DLL.
-For more information on both of these topics, please see the section on
-redistributing Visual C++ applications in MSDN documentation.
-
/////////////////////////////////////////////////////////////////////////////
diff --git a/COM380/Project2/Project2/Resource.h b/COM380/Project2/Project2/Resource.h
index 3aad5d2..d5ac7c4 100644
--- a/COM380/Project2/Project2/Resource.h
+++ b/COM380/Project2/Project2/Resource.h
@@ -1,18 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by Project2.rc
-//
-#define IDR_MAINFRAME 128
-#define IDD_PROJECT2_DIALOG 102
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-
-#define _APS_NEXT_RESOURCE_VALUE 129
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 32771
-#endif
-#endif
+// Used by app.rc
diff --git a/COM380/Project2/Project2/app.ico b/COM380/Project2/Project2/app.ico
new file mode 100644
index 0000000..301942f
Binary files /dev/null and b/COM380/Project2/Project2/app.ico differ
diff --git a/COM380/Project2/Project2/app.rc b/COM380/Project2/Project2/app.rc
new file mode 100644
index 0000000..eab4306
Binary files /dev/null and b/COM380/Project2/Project2/app.rc differ
diff --git a/COM380/Project2/Project2/res/Project2.ico b/COM380/Project2/Project2/res/Project2.ico
deleted file mode 100644
index d56fbcd..0000000
Binary files a/COM380/Project2/Project2/res/Project2.ico and /dev/null differ
diff --git a/COM380/Project2/Project2/res/Project2.rc2 b/COM380/Project2/Project2/res/Project2.rc2
deleted file mode 100644
index c1b8203..0000000
Binary files a/COM380/Project2/Project2/res/Project2.rc2 and /dev/null differ
diff --git a/COM380/Project2/Project2/stdafx.cpp b/COM380/Project2/Project2/stdafx.cpp
index 5a9d227..0190a05 100644
--- a/COM380/Project2/Project2/stdafx.cpp
+++ b/COM380/Project2/Project2/stdafx.cpp
@@ -1,4 +1,3 @@
-
// stdafx.cpp : source file that includes just the standard includes
// Project2.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/COM380/Project2/Project2/stdafx.h b/COM380/Project2/Project2/stdafx.h
index 3ace893..46bef73 100644
--- a/COM380/Project2/Project2/stdafx.h
+++ b/COM380/Project2/Project2/stdafx.h
@@ -1,54 +1,6 @@
-
// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
+// or project specific include files that are used frequently, but
+// are changed infrequently
#pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include "targetver.h"
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include // MFC core and standard components
-#include // MFC extensions
-
-
-#include // MFC Automation classes
-
-
-
-#ifndef _AFX_NO_OLE_SUPPORT
-#include // MFC support for Internet Explorer 4 Common Controls
-#endif
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include // MFC support for ribbons and control bars
-
-
-
-
-
-
-
-
-
-#ifdef _UNICODE
-#if defined _M_IX86
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#elif defined _M_X64
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#else
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#endif
-#endif
-
-
+// TODO: reference additional headers your program requires here
diff --git a/COM380/Project2/Project2/targetver.h b/COM380/Project2/Project2/targetver.h
deleted file mode 100644
index 87c0086..0000000
--- a/COM380/Project2/Project2/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include