Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

1.4.0 merge #26

Merged
Hesham merged 17 commits from release/1.4 into master 2018-09-27 10:31:11 +02:00
Conversation 0 Commits 17 Files Changed 7 +12 -19
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7be0e816f1 - Show all commits

30
OWTrack/MainForm.cs
View File

@ -107,14 +107,16 @@ namespace OWTrack
{ {
MessageBox.Show(e.Message); MessageBox.Show(e.Message);
} }
update();
} }
else if (!tr.LoacteOW()) else if (!tr.LoacteOW())
{ {
tr.gamePath = getGamePath(); tr.gamePath = getGamePath();
} }
} ExeTrackCheckBx.Checked = tr.TrackOW;
SRCheckBx.Checked = tr.TrackSR;
update();
}
private string getGamePath() private string getGamePath()
{ {
openFileDialog1.Title = "Select Overwatch.exe"; openFileDialog1.Title = "Select Overwatch.exe";
@ -129,28 +131,15 @@ namespace OWTrack
} }
else else
{ {
update();
return null; return null;
} }
} }
private Tracker savedTracker()
{
try
{
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.SAVES));
}
catch (Exception e)
{
MessageBox.Show(e.Message);
return null;
}
}
private void SRSystem(bool state) private void SRSystem(bool state)
{ {
srBut.Enabled = state; srBut.Enabled = state;
srTextBox.Enabled = state; srTextBox.Enabled = state;
tr.TrackSR = state;
} }
private void OWTrackFunc(bool state) private void OWTrackFunc(bool state)
@ -242,17 +231,20 @@ namespace OWTrack
private void SRCheckBx_CheckedChanged(object sender, EventArgs e) private void SRCheckBx_CheckedChanged(object sender, EventArgs e)
{ {
SRSystem(SRCheckBx.Checked); SRSystem(SRCheckBx.Checked);
update();
} }
private void ExeTrackCheckBx_CheckedChanged(object sender, EventArgs e) private void ExeTrackCheckBx_CheckedChanged(object sender, EventArgs e)
{ {
OWTrackFunc(ExeTrackCheckBx.Checked); OWTrackFunc(ExeTrackCheckBx.Checked);
update();
} }
private void ChngOWPathBtn_Click(object sender, EventArgs e) private void ChngOWPathBtn_Click(object sender, EventArgs e)
{ {
tr.gamePath = getGamePath(); tr.gamePath = getGamePath();
update();
} }
#endregion #endregion

1
OWTrack/Tracker.cs
View File

@ -44,6 +44,7 @@ namespace OWTrack
public void setNewSR(int SR) { newSR = SR; } public void setNewSR(int SR) { newSR = SR; }
public int srDiff() { return newSR - startSR; } public int srDiff() { return newSR - startSR; }
public bool TrackOW = true; public bool TrackOW = true;
public bool TrackSR = true;
public bool owRunning() public bool owRunning()
{ {