mirror of
https://github.com/DaKerboul/perun.git
synced 2026-08-09 15:55:39 +02:00
- Prepared for 0.10.1 build
- Added autostart parameter
This commit is contained in:
@@ -77,6 +77,7 @@
|
||||
this.con_img_dcs = new System.Windows.Forms.PictureBox();
|
||||
this.con_img_db = new System.Windows.Forms.PictureBox();
|
||||
this.con_Button_Add_Marker = new System.Windows.Forms.Button();
|
||||
this.TIM_Autostart = new System.Windows.Forms.Timer(this.components);
|
||||
this.con_GroupBox_1.SuspendLayout();
|
||||
this.con_GroupBox_2.SuspendLayout();
|
||||
this.con_GroupBox_3.SuspendLayout();
|
||||
@@ -524,6 +525,10 @@
|
||||
this.con_Button_Add_Marker.UseVisualStyleBackColor = true;
|
||||
this.con_Button_Add_Marker.Click += new System.EventHandler(this.con_Button_Add_Marker_Click);
|
||||
//
|
||||
// TIM_Autostart
|
||||
//
|
||||
this.TIM_Autostart.Interval = 5000;
|
||||
//
|
||||
// form_Main
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@@ -573,7 +578,10 @@
|
||||
((System.ComponentModel.ISupportInitialize)(this.con_img_db)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
// TIM_Autostart
|
||||
//
|
||||
this.TIM_Autostart.Tick += new System.EventHandler(this.TIM_Autostart_Tick);
|
||||
//
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -625,6 +633,7 @@
|
||||
private System.Windows.Forms.Label label13;
|
||||
private System.Windows.Forms.Label label14;
|
||||
private System.Windows.Forms.Button con_Button_Add_Marker;
|
||||
private System.Windows.Forms.Timer TIM_Autostart;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,18 @@ namespace Perun_v1
|
||||
}
|
||||
}
|
||||
|
||||
if (args.Length > 5)
|
||||
{
|
||||
// Get argument lotATC file path
|
||||
if (args[5] != null)
|
||||
{
|
||||
if (args[5] == "1")
|
||||
{
|
||||
TIM_Autostart.Enabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize controls
|
||||
con_img_db.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected");
|
||||
con_img_dcs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected");
|
||||
@@ -183,7 +195,7 @@ namespace Perun_v1
|
||||
DatabaseConnection.DatabaseConnectionString = "server=" + con_txt_mysql_server.Text + ";user=" + con_txt_mysql_username.Text + ";database=" + con_txt_mysql_database.Text + ";port=" + con_txt_mysql_port.Text + ";password=" + con_txt_mysql_password.Text;
|
||||
|
||||
// Start listening
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Opening connections",0,1);
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Opening connections", 0, 1);
|
||||
TCPServer.Create(Int32.Parse(con_txt_dcs_server_port.Text), ref Globals.AppLogHistory, ref DatabaseSendBuffer);
|
||||
TCPServer.thrTCPListener = new Thread(TCPServer.StartListen);
|
||||
TCPServer.thrTCPListener.Start();
|
||||
@@ -203,7 +215,7 @@ namespace Perun_v1
|
||||
{
|
||||
// Stop listening
|
||||
// Prepare GUI
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Closing connections",0,1);
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Closing connections", 0, 1);
|
||||
con_Button_Listen_OFF.Enabled = false;
|
||||
Tim_GUI_Tick(null, null);
|
||||
this.Refresh();
|
||||
@@ -239,7 +251,7 @@ namespace Perun_v1
|
||||
con_img_srs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected");
|
||||
|
||||
// Display information about closed connections
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Connections closed",0,1);
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Connections closed", 0, 1);
|
||||
Tim_GUI_Tick(null, null);
|
||||
|
||||
// Set title bar
|
||||
@@ -483,9 +495,9 @@ namespace Perun_v1
|
||||
// Send ping to check for possible connection issues
|
||||
DatabaseConnection.SendToMySql("", true);
|
||||
|
||||
if (PerunHelper.CheckVersions()==0)
|
||||
if (PerunHelper.CheckVersions() == 0)
|
||||
{
|
||||
MessageBox.Show("Version mismatch detected - please check log files and update.\n\nPerun will now terminate.", "Perun ERROR!",MessageBoxButtons.OK,MessageBoxIcon.Error);
|
||||
MessageBox.Show("Version mismatch detected - please check log files and update.\n\nPerun will now terminate.", "Perun ERROR!", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
con_Button_Listen_OFF_Click(null, null);
|
||||
}
|
||||
|
||||
@@ -609,7 +621,7 @@ namespace Perun_v1
|
||||
Globals.AppForceIconReload = true;
|
||||
|
||||
// Add information
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Resetted error counter",0,1);
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "Resetted error counter", 0, 1);
|
||||
}
|
||||
else if (dialogResult == DialogResult.No)
|
||||
{
|
||||
@@ -621,7 +633,14 @@ namespace Perun_v1
|
||||
private void con_Button_Add_Marker_Click(object sender, EventArgs e)
|
||||
{
|
||||
// Added user marker
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "User Marker",0,1);
|
||||
PerunHelper.AddLog(ref Globals.AppLogHistory, "User Marker", 0, 1);
|
||||
}
|
||||
|
||||
private void TIM_Autostart_Tick(object sender, EventArgs e)
|
||||
{
|
||||
// Handle autostart parameter from command line
|
||||
TIM_Autostart.Enabled = false; // Disable timer
|
||||
con_Button_Listen_ON_Click(sender,e); // Simulate button click
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -419,6 +419,9 @@
|
||||
<metadata name="tim_MySQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>687, 19</value>
|
||||
</metadata>
|
||||
<metadata name="TIM_Autostart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>800, 4</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>26</value>
|
||||
</metadata>
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
<PublisherName>szporwolik</PublisherName>
|
||||
<SuiteName>Perun</SuiteName>
|
||||
<WebPage>Perun.htm</WebPage>
|
||||
<ApplicationRevision>1</ApplicationRevision>
|
||||
<ApplicationVersion>0.10.0.%2a</ApplicationVersion>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>0.10.1.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||
|
||||
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
|
||||
// Możesz określić wszystkie wartości lub użyć domyślnych numerów kompilacji i poprawki
|
||||
// przy użyciu symbolu „*”, tak jak pokazano poniżej:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("0.10.0.0")]
|
||||
[assembly: AssemblyFileVersion("0.10.0.0")]
|
||||
[assembly: AssemblyVersion("0.10.1.0")]
|
||||
[assembly: AssemblyFileVersion("0.10.1.0")]
|
||||
[assembly: NeutralResourcesLanguage("en")]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user