1.4.0a2 Merge #23

Merged
Hesham merged 16 commits from release/1.4 into master 2018-09-20 10:35:46 +02:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit 5e30eebda7 - Show all commits

View File

@ -1,6 +1,6 @@
namespace OWTrack namespace OWTrack
{ {
partial class Form1 partial class MainForm
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.status = new System.Windows.Forms.Label(); this.status = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);

View File

@ -7,14 +7,14 @@ using System.IO;
namespace OWTrack namespace OWTrack
{ {
public partial class Form1 : Form public partial class MainForm : Form
{ {
Tracker tr = new Tracker(); Tracker tr = new Tracker();
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";
private bool SRonce = false; private bool SRonce = false;
public Form1() public MainForm()
{ {
InitializeComponent(); InitializeComponent();
loadSave(); loadSave();