diff --git a/SamaPager_Server/AboutForm.Designer.cs b/SamaPager_Server/AboutForm.Designer.cs
index 91ee1aa..10bf818 100644
--- a/SamaPager_Server/AboutForm.Designer.cs
+++ b/SamaPager_Server/AboutForm.Designer.cs
@@ -30,13 +30,13 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel();
+ this.gitLnk = new Krypton.Toolkit.KryptonLinkLabel();
+ this.versionLbl = new Krypton.Toolkit.KryptonLabel();
this.kryptonLabel3 = new Krypton.Toolkit.KryptonLabel();
this.storkUrl = new Krypton.Toolkit.KryptonLinkLabel();
this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel();
this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel();
this.kryptonPictureBox1 = new Krypton.Toolkit.KryptonPictureBox();
- this.kryptonLabel4 = new Krypton.Toolkit.KryptonLabel();
- this.gitLnk = new Krypton.Toolkit.KryptonLinkLabel();
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit();
this.kryptonPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).BeginInit();
@@ -45,7 +45,7 @@
// kryptonPanel1
//
this.kryptonPanel1.Controls.Add(this.gitLnk);
- this.kryptonPanel1.Controls.Add(this.kryptonLabel4);
+ this.kryptonPanel1.Controls.Add(this.versionLbl);
this.kryptonPanel1.Controls.Add(this.kryptonLabel3);
this.kryptonPanel1.Controls.Add(this.storkUrl);
this.kryptonPanel1.Controls.Add(this.kryptonLabel2);
@@ -54,9 +54,27 @@
this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.kryptonPanel1.Location = new System.Drawing.Point(0, 0);
this.kryptonPanel1.Name = "kryptonPanel1";
- this.kryptonPanel1.Size = new System.Drawing.Size(499, 526);
+ this.kryptonPanel1.Size = new System.Drawing.Size(496, 520);
this.kryptonPanel1.TabIndex = 0;
//
+ // gitLnk
+ //
+ this.gitLnk.Location = new System.Drawing.Point(411, 494);
+ this.gitLnk.Name = "gitLnk";
+ this.gitLnk.Size = new System.Drawing.Size(73, 20);
+ this.gitLnk.TabIndex = 6;
+ this.gitLnk.Values.Text = "View on Git";
+ this.gitLnk.LinkClicked += new System.EventHandler(this.gitLnk_LinkClicked);
+ //
+ // versionLbl
+ //
+ this.versionLbl.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel;
+ this.versionLbl.Location = new System.Drawing.Point(12, 345);
+ this.versionLbl.Name = "versionLbl";
+ this.versionLbl.Size = new System.Drawing.Size(62, 20);
+ this.versionLbl.TabIndex = 5;
+ this.versionLbl.Values.Text = "[version]";
+ //
// kryptonLabel3
//
this.kryptonLabel3.Location = new System.Drawing.Point(12, 436);
@@ -102,29 +120,11 @@
this.kryptonPictureBox1.TabIndex = 0;
this.kryptonPictureBox1.TabStop = false;
//
- // kryptonLabel4
- //
- this.kryptonLabel4.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel;
- this.kryptonLabel4.Location = new System.Drawing.Point(12, 345);
- this.kryptonLabel4.Name = "kryptonLabel4";
- this.kryptonLabel4.Size = new System.Drawing.Size(114, 20);
- this.kryptonLabel4.TabIndex = 5;
- this.kryptonLabel4.Values.Text = "v1.1 (Castagnetti)";
- //
- // gitLnk
- //
- this.gitLnk.Location = new System.Drawing.Point(411, 494);
- this.gitLnk.Name = "gitLnk";
- this.gitLnk.Size = new System.Drawing.Size(73, 20);
- this.gitLnk.TabIndex = 6;
- this.gitLnk.Values.Text = "View on Git";
- this.gitLnk.LinkClicked += new System.EventHandler(this.gitLnk_LinkClicked);
- //
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(499, 526);
+ this.ClientSize = new System.Drawing.Size(496, 520);
this.Controls.Add(this.kryptonPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
@@ -132,6 +132,7 @@
this.Name = "AboutForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "About SamaPager Server";
+ this.Load += new System.EventHandler(this.AboutForm_Load);
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit();
this.kryptonPanel1.ResumeLayout(false);
this.kryptonPanel1.PerformLayout();
@@ -149,6 +150,6 @@
private Krypton.Toolkit.KryptonLabel kryptonLabel3;
private Krypton.Toolkit.KryptonLinkLabel storkUrl;
private Krypton.Toolkit.KryptonLinkLabel gitLnk;
- private Krypton.Toolkit.KryptonLabel kryptonLabel4;
+ private Krypton.Toolkit.KryptonLabel versionLbl;
}
}
\ No newline at end of file
diff --git a/SamaPager_Server/AboutForm.cs b/SamaPager_Server/AboutForm.cs
index 6523475..4a5186a 100644
--- a/SamaPager_Server/AboutForm.cs
+++ b/SamaPager_Server/AboutForm.cs
@@ -1,4 +1,5 @@
-using System;
+using SamaPager_Server.Properties;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -27,5 +28,10 @@ namespace SamaPager_Server
{
Process.Start("https://git.fiorencis.eu/AndreStork/SamaPager");
}
+
+ private void AboutForm_Load(object sender, EventArgs e)
+ {
+ versionLbl.Text = $"v.{Resources.currentVersion} ({Resources.versionCodename})";
+ }
}
}
diff --git a/SamaPager_Server/MainForm.Designer.cs b/SamaPager_Server/MainForm.Designer.cs
index 634c586..1ca34b1 100644
--- a/SamaPager_Server/MainForm.Designer.cs
+++ b/SamaPager_Server/MainForm.Designer.cs
@@ -72,7 +72,7 @@
this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.kryptonPanel1.Location = new System.Drawing.Point(0, 0);
this.kryptonPanel1.Name = "kryptonPanel1";
- this.kryptonPanel1.Size = new System.Drawing.Size(426, 383);
+ this.kryptonPanel1.Size = new System.Drawing.Size(430, 384);
this.kryptonPanel1.TabIndex = 0;
//
// logList
@@ -89,11 +89,11 @@
this.kryptonStatusStrip1.Font = new System.Drawing.Font("Segoe UI", 9F);
this.kryptonStatusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.statusLabel});
- this.kryptonStatusStrip1.Location = new System.Drawing.Point(0, 361);
+ this.kryptonStatusStrip1.Location = new System.Drawing.Point(0, 362);
this.kryptonStatusStrip1.Name = "kryptonStatusStrip1";
this.kryptonStatusStrip1.ProgressBars = null;
this.kryptonStatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode;
- this.kryptonStatusStrip1.Size = new System.Drawing.Size(426, 22);
+ this.kryptonStatusStrip1.Size = new System.Drawing.Size(430, 22);
this.kryptonStatusStrip1.TabIndex = 3;
this.kryptonStatusStrip1.Text = "kryptonStatusStrip1";
//
@@ -111,7 +111,7 @@
this.helpToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(426, 24);
+ this.menuStrip1.Size = new System.Drawing.Size(430, 24);
this.menuStrip1.TabIndex = 0;
this.menuStrip1.Text = "menuStrip1";
//
@@ -192,7 +192,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(426, 383);
+ this.ClientSize = new System.Drawing.Size(430, 384);
this.Controls.Add(this.kryptonPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
diff --git a/SamaPager_Server/Properties/Resources.Designer.cs b/SamaPager_Server/Properties/Resources.Designer.cs
index 7426f47..f642b93 100644
--- a/SamaPager_Server/Properties/Resources.Designer.cs
+++ b/SamaPager_Server/Properties/Resources.Designer.cs
@@ -70,6 +70,15 @@ namespace SamaPager_Server.Properties {
}
}
+ ///
+ /// Cerca una stringa localizzata simile a 1.1.
+ ///
+ internal static string currentVersion {
+ get {
+ return ResourceManager.GetString("currentVersion", resourceCulture);
+ }
+ }
+
///
/// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap.
///
@@ -79,5 +88,14 @@ namespace SamaPager_Server.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ ///
+ /// Cerca una stringa localizzata simile a Castagnetti.
+ ///
+ internal static string versionCodename {
+ get {
+ return ResourceManager.GetString("versionCodename", resourceCulture);
+ }
+ }
}
}
diff --git a/SamaPager_Server/Properties/Resources.resx b/SamaPager_Server/Properties/Resources.resx
index 42d1043..fd091b6 100644
--- a/SamaPager_Server/Properties/Resources.resx
+++ b/SamaPager_Server/Properties/Resources.resx
@@ -124,4 +124,10 @@
..\Resources\5pagers1shalom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ 1.1
+
+
+ Castagnetti
+
\ No newline at end of file