diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index 2f25f08..7d7b76a 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -145,11 +145,6 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_828A202FDE1369BBD937275D862A0BF2" - { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" @@ -245,18 +240,18 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:The Filenal Countdown" - "ProductCode" = "8:{BFCEDAB4-0BB9-41CB-B89D-23845B1EE3B3}" - "PackageCode" = "8:{3E18E962-0152-433B-97D4-AA2D27212FD5}" + "ProductCode" = "8:{8F27E1BC-CC59-40C7-8F91-FACD3928BD22}" + "PackageCode" = "8:{4B6B183D-9905-4361-9B3B-A4AE3974C9C2}" "UpgradeCode" = "8:{ED684911-0A83-423C-A842-ACE79BAD9039}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.3" + "ProductVersion" = "8:2.0" "Manufacturer" = "8:rahjicom" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:" + "ARPHELPLINK" = "8:https://git.io/JJPOS" "Title" = "8:The Filenal Countdown Setup" "Subject" = "8:" "ARPCONTACT" = "8:Rob Duarte" diff --git a/TheFilenalCountdown/Form1.Designer.cs b/TheFilenalCountdown/Form1.Designer.cs index 15b5829..ad2775e 100644 --- a/TheFilenalCountdown/Form1.Designer.cs +++ b/TheFilenalCountdown/Form1.Designer.cs @@ -64,23 +64,26 @@ private void InitializeComponent() this.grp_time.Controls.Add(this.label4); this.grp_time.Controls.Add(this.label3); this.grp_time.Controls.Add(this.label2); - this.grp_time.Location = new System.Drawing.Point(12, 58); + this.grp_time.Location = new System.Drawing.Point(38, 165); + this.grp_time.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.grp_time.Name = "grp_time"; - this.grp_time.Size = new System.Drawing.Size(160, 144); + this.grp_time.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9); + this.grp_time.Size = new System.Drawing.Size(507, 410); this.grp_time.TabIndex = 0; this.grp_time.TabStop = false; this.grp_time.Text = "Time Until Zero"; // // num_seconds // - this.num_seconds.Location = new System.Drawing.Point(73, 103); + this.num_seconds.Location = new System.Drawing.Point(231, 293); + this.num_seconds.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.num_seconds.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.num_seconds.Name = "num_seconds"; - this.num_seconds.Size = new System.Drawing.Size(76, 20); + this.num_seconds.Size = new System.Drawing.Size(241, 44); this.num_seconds.TabIndex = 4; this.num_seconds.Value = new decimal(new int[] { 10, @@ -90,60 +93,66 @@ private void InitializeComponent() // // num_minutes // - this.num_minutes.Location = new System.Drawing.Point(73, 67); + this.num_minutes.Location = new System.Drawing.Point(231, 191); + this.num_minutes.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.num_minutes.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.num_minutes.Name = "num_minutes"; - this.num_minutes.Size = new System.Drawing.Size(76, 20); + this.num_minutes.Size = new System.Drawing.Size(241, 44); this.num_minutes.TabIndex = 3; // // num_hours // - this.num_hours.Location = new System.Drawing.Point(73, 34); + this.num_hours.Location = new System.Drawing.Point(231, 97); + this.num_hours.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.num_hours.Maximum = new decimal(new int[] { 24, 0, 0, 0}); this.num_hours.Name = "num_hours"; - this.num_hours.Size = new System.Drawing.Size(76, 20); + this.num_hours.Size = new System.Drawing.Size(241, 44); this.num_hours.TabIndex = 2; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(15, 106); + this.label4.Location = new System.Drawing.Point(48, 302); + this.label4.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 13); + this.label4.Size = new System.Drawing.Size(141, 37); this.label4.TabIndex = 10; this.label4.Text = "Seconds"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(15, 71); + this.label3.Location = new System.Drawing.Point(48, 202); + this.label3.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(44, 13); + this.label3.Size = new System.Drawing.Size(128, 37); this.label3.TabIndex = 8; this.label3.Text = "Minutes"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(15, 36); + this.label2.Location = new System.Drawing.Point(48, 102); + this.label2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.Size = new System.Drawing.Size(103, 37); this.label2.TabIndex = 6; this.label2.Text = "Hours"; // // btn_start // - this.btn_start.Location = new System.Drawing.Point(124, 213); + this.btn_start.Location = new System.Drawing.Point(393, 606); + this.btn_start.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.btn_start.Name = "btn_start"; - this.btn_start.Size = new System.Drawing.Size(75, 23); + this.btn_start.Size = new System.Drawing.Size(238, 65); this.btn_start.TabIndex = 9; this.btn_start.Text = "Start"; this.btn_start.UseVisualStyleBackColor = true; @@ -151,9 +160,10 @@ private void InitializeComponent() // // btn_chooseFile // - this.btn_chooseFile.Location = new System.Drawing.Point(12, 19); + this.btn_chooseFile.Location = new System.Drawing.Point(38, 54); + this.btn_chooseFile.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.btn_chooseFile.Name = "btn_chooseFile"; - this.btn_chooseFile.Size = new System.Drawing.Size(75, 23); + this.btn_chooseFile.Size = new System.Drawing.Size(238, 65); this.btn_chooseFile.TabIndex = 1; this.btn_chooseFile.Text = "Output File"; this.btn_chooseFile.UseVisualStyleBackColor = true; @@ -162,9 +172,10 @@ private void InitializeComponent() // lbl_filename // this.lbl_filename.AutoSize = true; - this.lbl_filename.Location = new System.Drawing.Point(94, 24); + this.lbl_filename.Location = new System.Drawing.Point(298, 68); + this.lbl_filename.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.lbl_filename.Name = "lbl_filename"; - this.lbl_filename.Size = new System.Drawing.Size(33, 13); + this.lbl_filename.Size = new System.Drawing.Size(94, 37); this.lbl_filename.TabIndex = 8; this.lbl_filename.Text = "None"; // @@ -175,9 +186,11 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.cbx_capitalization); this.groupBox1.Controls.Add(this.cbx_format); - this.groupBox1.Location = new System.Drawing.Point(178, 58); + this.groupBox1.Location = new System.Drawing.Point(564, 165); + this.groupBox1.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(223, 144); + this.groupBox1.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9); + this.groupBox1.Size = new System.Drawing.Size(706, 410); this.groupBox1.TabIndex = 11; this.groupBox1.TabStop = false; this.groupBox1.Text = "Format"; @@ -185,9 +198,10 @@ private void InitializeComponent() // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(16, 106); + this.label5.Location = new System.Drawing.Point(51, 302); + this.label5.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(118, 13); + this.label5.Size = new System.Drawing.Size(353, 37); this.label5.TabIndex = 13; this.label5.Text = "Replace Commas With "; // @@ -200,17 +214,19 @@ private void InitializeComponent() " /", " :", " &"}); - this.cbx_replaceCommasWith.Location = new System.Drawing.Point(140, 103); + this.cbx_replaceCommasWith.Location = new System.Drawing.Point(443, 293); + this.cbx_replaceCommasWith.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.cbx_replaceCommasWith.Name = "cbx_replaceCommasWith"; - this.cbx_replaceCommasWith.Size = new System.Drawing.Size(64, 21); + this.cbx_replaceCommasWith.Size = new System.Drawing.Size(194, 45); this.cbx_replaceCommasWith.TabIndex = 7; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 71); + this.label1.Location = new System.Drawing.Point(51, 202); + this.label1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 13); + this.label1.Size = new System.Drawing.Size(210, 37); this.label1.TabIndex = 11; this.label1.Text = "Capitalization"; // @@ -222,9 +238,10 @@ private void InitializeComponent() "all lowercase", "ALL CAPS", "Inital Caps"}); - this.cbx_capitalization.Location = new System.Drawing.Point(91, 68); + this.cbx_capitalization.Location = new System.Drawing.Point(288, 194); + this.cbx_capitalization.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.cbx_capitalization.Name = "cbx_capitalization"; - this.cbx_capitalization.Size = new System.Drawing.Size(113, 21); + this.cbx_capitalization.Size = new System.Drawing.Size(349, 45); this.cbx_capitalization.TabIndex = 6; // // cbx_format @@ -238,18 +255,18 @@ private void InitializeComponent() "mm:ss", "mm minutes, ss seconds", "mm mins, ss secs"}); - this.cbx_format.Location = new System.Drawing.Point(19, 34); + this.cbx_format.Location = new System.Drawing.Point(60, 97); + this.cbx_format.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.cbx_format.Name = "cbx_format"; - this.cbx_format.Size = new System.Drawing.Size(185, 21); + this.cbx_format.Size = new System.Drawing.Size(577, 45); this.cbx_format.TabIndex = 5; // // chk_countUp // this.chk_countUp.AutoSize = true; - this.chk_countUp.Location = new System.Drawing.Point(12, 217); - this.chk_countUp.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); + this.chk_countUp.Location = new System.Drawing.Point(38, 618); this.chk_countUp.Name = "chk_countUp"; - this.chk_countUp.Size = new System.Drawing.Size(109, 17); + this.chk_countUp.Size = new System.Drawing.Size(312, 41); this.chk_countUp.TabIndex = 8; this.chk_countUp.Text = "Count Up Instead"; this.chk_countUp.UseVisualStyleBackColor = true; @@ -257,18 +274,18 @@ private void InitializeComponent() // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(289, 217); - this.label6.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); + this.label6.Location = new System.Drawing.Point(915, 618); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(90, 13); + this.label6.Size = new System.Drawing.Size(260, 37); this.label6.TabIndex = 12; - this.label6.Text = "git.io/JJPOS v1.3"; + this.label6.Text = "git.io/JJPOS v1.5"; // // btn_stop // - this.btn_stop.Location = new System.Drawing.Point(205, 213); + this.btn_stop.Location = new System.Drawing.Point(649, 606); + this.btn_stop.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.btn_stop.Name = "btn_stop"; - this.btn_stop.Size = new System.Drawing.Size(75, 23); + this.btn_stop.Size = new System.Drawing.Size(238, 65); this.btn_stop.TabIndex = 13; this.btn_stop.Text = "Stop"; this.btn_stop.UseVisualStyleBackColor = true; @@ -276,9 +293,9 @@ private void InitializeComponent() // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(19F, 37F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(425, 251); + this.ClientSize = new System.Drawing.Size(1346, 714); this.Controls.Add(this.btn_stop); this.Controls.Add(this.label6); this.Controls.Add(this.chk_countUp); @@ -289,6 +306,7 @@ private void InitializeComponent() this.Controls.Add(this.grp_time); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(10, 9, 10, 9); this.Name = "Form1"; this.Text = "The Filenal Countdown"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing_1);