Merge branch 'Dev'
This commit is contained in:
commit
baebbeb116
23
OWTrack/Form1.Designer.cs
generated
23
OWTrack/Form1.Designer.cs
generated
@ -39,6 +39,7 @@
|
|||||||
this.WinBut = new System.Windows.Forms.Button();
|
this.WinBut = new System.Windows.Forms.Button();
|
||||||
this.button2 = new System.Windows.Forms.Button();
|
this.button2 = new System.Windows.Forms.Button();
|
||||||
this.label2 = new System.Windows.Forms.Label();
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
|
this.label4 = new System.Windows.Forms.Label();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// label1
|
// label1
|
||||||
@ -80,7 +81,7 @@
|
|||||||
this.Wins.AutoSize = true;
|
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.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.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.Name = "Wins";
|
||||||
this.Wins.Size = new System.Drawing.Size(40, 42);
|
this.Wins.Size = new System.Drawing.Size(40, 42);
|
||||||
this.Wins.TabIndex = 3;
|
this.Wins.TabIndex = 3;
|
||||||
@ -91,7 +92,7 @@
|
|||||||
this.Losses.AutoSize = true;
|
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.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.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.Name = "Losses";
|
||||||
this.Losses.Size = new System.Drawing.Size(40, 42);
|
this.Losses.Size = new System.Drawing.Size(40, 42);
|
||||||
this.Losses.TabIndex = 4;
|
this.Losses.TabIndex = 4;
|
||||||
@ -131,19 +132,30 @@
|
|||||||
// label2
|
// label2
|
||||||
//
|
//
|
||||||
this.label2.AutoSize = true;
|
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.ForeColor = System.Drawing.Color.Black;
|
||||||
this.label2.Location = new System.Drawing.Point(103, 73);
|
this.label2.Location = new System.Drawing.Point(103, 73);
|
||||||
this.label2.Name = "label2";
|
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.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(12, 150);
|
||||||
|
this.label4.Name = "label4";
|
||||||
|
this.label4.Size = new System.Drawing.Size(35, 11);
|
||||||
|
this.label4.TabIndex = 7;
|
||||||
|
this.label4.Text = "label4";
|
||||||
//
|
//
|
||||||
// Form1
|
// Form1
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(263, 170);
|
this.ClientSize = new System.Drawing.Size(263, 170);
|
||||||
|
this.Controls.Add(this.label4);
|
||||||
this.Controls.Add(this.Wins);
|
this.Controls.Add(this.Wins);
|
||||||
this.Controls.Add(this.Losses);
|
this.Controls.Add(this.Losses);
|
||||||
this.Controls.Add(this.button2);
|
this.Controls.Add(this.button2);
|
||||||
@ -175,6 +187,7 @@
|
|||||||
private System.Windows.Forms.Button WinBut;
|
private System.Windows.Forms.Button WinBut;
|
||||||
private System.Windows.Forms.Button button2;
|
private System.Windows.Forms.Button button2;
|
||||||
private System.Windows.Forms.Label label2;
|
private System.Windows.Forms.Label label2;
|
||||||
|
private System.Windows.Forms.Label label4;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,13 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Data;
|
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Drawing;
|
|
||||||
|
|
||||||
namespace OWTrack
|
namespace OWTrack
|
||||||
{
|
{
|
||||||
@ -17,11 +10,12 @@ namespace OWTrack
|
|||||||
private const string IS_RUNNING = "Running";
|
private const string IS_RUNNING = "Running";
|
||||||
private const string NOT_RUNNING = " Not running";
|
private const string NOT_RUNNING = " Not running";
|
||||||
|
|
||||||
|
|
||||||
public Form1()
|
public Form1()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
checkStatus();
|
checkStatus();
|
||||||
|
label4.Text = Program.Version;
|
||||||
|
Text = "OWTrack " + Program.Version;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void timer1_Tick(object sender, EventArgs e)
|
private void timer1_Tick(object sender, EventArgs e)
|
||||||
@ -56,11 +50,13 @@ namespace OWTrack
|
|||||||
tr.addWin();
|
tr.addWin();
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void button2_Click(object sender, EventArgs e)
|
private void button2_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
tr.addLoss();
|
tr.addLoss();
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void update()
|
private void update()
|
||||||
{
|
{
|
||||||
Wins.Text = tr.GetWins().ToString();
|
Wins.Text = tr.GetWins().ToString();
|
||||||
|
@ -18,5 +18,6 @@ namespace OWTrack
|
|||||||
Application.SetCompatibleTextRenderingDefault(false);
|
Application.SetCompatibleTextRenderingDefault(false);
|
||||||
Application.Run(new Form1());
|
Application.Run(new Form1());
|
||||||
}
|
}
|
||||||
|
public static string Version = "1.2";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace OWTrack
|
namespace OWTrack
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user