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

Merge for 1.2.4 #8

Merged
Hesham merged 11 commits from Dev into master 2018-09-01 13:26:28 +02:00
Conversation 0 Commits 11 Files Changed 7 +14 -11
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d6c9b23f19 - Show all commits

12
OWTrack/Form1.cs
View File

@ -18,17 +18,18 @@ namespace OWTrack
InitializeComponent(); InitializeComponent();
loadSave(); loadSave();
checkStatus(); checkStatus();
label4.Text = Program.version.ToString(); update();
Text = "OWTrack " + Program.version.ToString(); label4.Text = Program.Version.ToString();
Text = "OWTrack " + Program.Version.ToString();
} }
private void checkStatus() private void checkStatus()
{
try
{ {
Time.Text = DateTime.Now.ToString("h:mm tt"); Time.Text = DateTime.Now.ToString("h:mm tt");
status.Text = NOT_RUNNING; status.Text = NOT_RUNNING;
status.ForeColor = Color.Red; status.ForeColor = Color.Red;
try
{
if (tr.owRunning()) if (tr.owRunning())
{ {
status.Text = IS_RUNNING; status.Text = IS_RUNNING;
@ -75,7 +76,7 @@ namespace OWTrack
} }
} }
void getGamePath() private void getGamePath()
{ {
openFileDialog1.Title = "Select Overwatch.exe"; openFileDialog1.Title = "Select Overwatch.exe";
openFileDialog1.DefaultExt = "exe"; openFileDialog1.DefaultExt = "exe";
@ -86,7 +87,6 @@ namespace OWTrack
if (openFileDialog1.ShowDialog() == DialogResult.OK) if (openFileDialog1.ShowDialog() == DialogResult.OK)
{ {
tr.gamePath = openFileDialog1.FileName; tr.gamePath = openFileDialog1.FileName;
MessageBox.Show(openFileDialog1.FileName);
} }
} }

2
OWTrack/OWTrack.csproj
View File

@ -22,7 +22,7 @@
<UpdatePeriodically>false</UpdatePeriodically> <UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>12</ApplicationRevision> <ApplicationRevision>13</ApplicationRevision>
<ApplicationVersion>1.2.3.%2a</ApplicationVersion> <ApplicationVersion>1.2.3.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

7
OWTrack/Program.cs
View File

@ -11,7 +11,6 @@ namespace OWTrack
{ {
static class Program static class Program
{ {
//public static string Version = Application.ProductVersion;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>
@ -22,6 +21,10 @@ namespace OWTrack
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1()); Application.Run(new Form1());
} }
public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
public static string Version = "1.2.3";
//public static string Version = Application.ProductVersion;
//public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
} }
} }