Merge branch 'master' into feature/saveAppPath

This commit is contained in:
HeshamTB 2018-08-03 04:06:29 +03:00
commit 58d28f2948
4 changed files with 63 additions and 6 deletions

View File

@ -39,6 +39,9 @@
this.WinBut = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.reduceLossBut = new System.Windows.Forms.Button();
this.reduceWinBut = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// label1
@ -80,7 +83,7 @@
this.Wins.AutoSize = true;
this.Wins.Font = new System.Drawing.Font("Miriam Mono CLM", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(177)));
this.Wins.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.Wins.Location = new System.Drawing.Point(75, 75);
this.Wins.Location = new System.Drawing.Point(68, 75);
this.Wins.Name = "Wins";
this.Wins.Size = new System.Drawing.Size(40, 42);
this.Wins.TabIndex = 3;
@ -91,7 +94,7 @@
this.Losses.AutoSize = true;
this.Losses.Font = new System.Drawing.Font("Miriam Mono CLM", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(177)));
this.Losses.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.Losses.Location = new System.Drawing.Point(130, 75);
this.Losses.Location = new System.Drawing.Point(137, 75);
this.Losses.Name = "Losses";
this.Losses.Size = new System.Drawing.Size(40, 42);
this.Losses.TabIndex = 4;
@ -131,19 +134,52 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Miriam Mono CLM", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(177)));
this.label2.Font = new System.Drawing.Font("Monospac821 BT", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.Black;
this.label2.Location = new System.Drawing.Point(103, 73);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(40, 42);
this.label2.Size = new System.Drawing.Size(42, 45);
this.label2.TabIndex = 5;
this.label2.Text = ":";
this.label2.Text = "-";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Monospac821 BT", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(7, 153);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(35, 11);
this.label4.TabIndex = 7;
this.label4.Text = "label4";
//
// reduceLossBut
//
this.reduceLossBut.Location = new System.Drawing.Point(183, 133);
this.reduceLossBut.Name = "reduceLossBut";
this.reduceLossBut.Size = new System.Drawing.Size(20, 24);
this.reduceLossBut.TabIndex = 8;
this.reduceLossBut.Text = "-";
this.reduceLossBut.UseVisualStyleBackColor = true;
this.reduceLossBut.Click += new System.EventHandler(this.reduceLossBut_Click);
//
// reduceWinBut
//
this.reduceWinBut.Location = new System.Drawing.Point(43, 133);
this.reduceWinBut.Name = "reduceWinBut";
this.reduceWinBut.Size = new System.Drawing.Size(20, 24);
this.reduceWinBut.TabIndex = 9;
this.reduceWinBut.Text = "+";
this.reduceWinBut.UseVisualStyleBackColor = true;
this.reduceWinBut.Click += new System.EventHandler(this.reduceWinBut_Click);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(263, 170);
this.Controls.Add(this.reduceWinBut);
this.Controls.Add(this.reduceLossBut);
this.Controls.Add(this.label4);
this.Controls.Add(this.Wins);
this.Controls.Add(this.Losses);
this.Controls.Add(this.button2);
@ -175,6 +211,9 @@
private System.Windows.Forms.Button WinBut;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button reduceLossBut;
private System.Windows.Forms.Button reduceWinBut;
}
}

View File

@ -14,6 +14,8 @@ namespace OWTrack
{
InitializeComponent();
checkStatus();
label4.Text = Program.Version;
Text = "OWTrack " + Program.Version;
}
private void timer1_Tick(object sender, EventArgs e)
@ -55,10 +57,23 @@ namespace OWTrack
update();
}
private void reduceWinBut_Click(object sender, EventArgs e)
{
tr.reduceWin();
update();
}
private void reduceLossBut_Click(object sender, EventArgs e)
{
tr.rediceLoss();
update();
}
private void update()
{
Wins.Text = tr.GetWins().ToString();
Losses.Text = tr.GetLosses().ToString();
}
}
}

View File

@ -18,5 +18,6 @@ namespace OWTrack
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1());
}
public static string Version = "1.2.1";
}
}

View File

@ -31,6 +31,8 @@ namespace OWTrack
public void addWin() { wins++; }
public void addLoss() { losses++; }
public void reduceWin() { wins--; }
public void rediceLoss() { losses--; }
public int GetWins() { return wins; }
public int GetLosses() { return losses; }
}