1.4.0a2 Merge #23

Merged
Hesham merged 16 commits from release/1.4 into master 2018-09-20 10:35:46 +02:00
2 changed files with 17 additions and 18 deletions
Showing only changes of commit 424983da5f - Show all commits

View File

@ -126,7 +126,7 @@
this.WinBut.TabIndex = 6; this.WinBut.TabIndex = 6;
this.WinBut.Text = "win"; this.WinBut.Text = "win";
this.WinBut.UseVisualStyleBackColor = true; this.WinBut.UseVisualStyleBackColor = true;
this.WinBut.Click += new System.EventHandler(this.button1_Click); this.WinBut.Click += new System.EventHandler(this.WinBtn_Click);
// //
// button2 // button2
// //
@ -136,7 +136,7 @@
this.button2.TabIndex = 6; this.button2.TabIndex = 6;
this.button2.Text = "loss"; this.button2.Text = "loss";
this.button2.UseVisualStyleBackColor = true; this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click); this.button2.Click += new System.EventHandler(this.LossBtn_Click);
// //
// label2 // label2
// //

View File

@ -87,7 +87,7 @@ namespace OWTrack
{ {
if (!tr.LoacteOW()) if (!tr.LoacteOW())
{ {
getGamePath(); tr.gamePath = getGamePath();
} }
return false; return false;
} }
@ -99,26 +99,28 @@ namespace OWTrack
} }
} }
private void getGamePath() private string getGamePath()
{ {
openFileDialog1.Title = "Select Overwatch.exe"; openFileDialog1.Title = "Select Overwatch.exe";
openFileDialog1.DefaultExt = "exe"; openFileDialog1.DefaultExt = "exe";
openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*"; openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*";
openFileDialog1.CheckFileExists = true; //openFileDialog1.CheckFileExists = true;
openFileDialog1.CheckPathExists = true; //openFileDialog1.CheckPathExists = true;
DialogResult result = openFileDialog1.ShowDialog(); DialogResult result = openFileDialog1.ShowDialog();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
tr.gamePath = openFileDialog1.FileName; //tr.gamePath = openFileDialog1.FileName;
return openFileDialog1.FileName;
} }
else if (result == DialogResult.Cancel) else
{ {
Close(); return null;
//Close();
} }
FindForm(); //Show();
update(); //update();
} }
private Tracker savedTracker() private Tracker savedTracker()
@ -134,18 +136,15 @@ namespace OWTrack
} }
} }
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e) => checkStatus();
{
checkStatus();
}
private void button1_Click(object sender, EventArgs e) private void WinBtn_Click(object sender, EventArgs e)
{ {
tr.addWin(); tr.addWin();
update(); update();
} }
private void button2_Click(object sender, EventArgs e) private void LossBtn_Click(object sender, EventArgs e)
{ {
tr.addLoss(); tr.addLoss();
update(); update();