Fixed log of getCurrentUser command on server

Added server version handling from project resources
Added final commands
2025-10-02 09:27:53 +02:00 · 2025-10-02 09:21:14 +02:00 · 2025-10-02 09:14:55 +02:00 · 2025-10-02 09:08:06 +02:00
8 changed files with 118 additions and 55 deletions
--- a/SamaPager_Client/Form1.Designer.cs
+++ b/SamaPager_Client/Form1.Designer.cs
@@ -43,6 +43,7 @@
            this.restartUDPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.messageTxt = new Krypton.Toolkit.KryptonTextBox();
            this.kryptonManager2 = new Krypton.Toolkit.KryptonManager(this.components);
+            this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
            ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit();
            this.kryptonPanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.cmdLst)).BeginInit();
@@ -99,7 +100,8 @@
            // 
            resources.ApplyResources(this.kryptonStatusStrip1, "kryptonStatusStrip1");
            this.kryptonStatusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.statusTxt});
+            this.statusTxt,
+            this.toolStripStatusLabel1});
            this.kryptonStatusStrip1.Name = "kryptonStatusStrip1";
            this.kryptonStatusStrip1.ProgressBars = null;
            this.kryptonStatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode;
@@ -145,6 +147,12 @@
            // 
            this.kryptonManager2.GlobalPaletteMode = Krypton.Toolkit.PaletteMode.Office2010Silver;
            // 
+            // toolStripStatusLabel1
+            // 
+            this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+            resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
+            this.toolStripStatusLabel1.Spring = true;
+            // 
            // Form1
            // 
            resources.ApplyResources(this, "$this");
@@ -183,6 +191,7 @@
        private System.Windows.Forms.ToolStripMenuItem restartUDPClientToolStripMenuItem;
        private Krypton.Toolkit.KryptonListBox logLst;
        private Krypton.Toolkit.KryptonComboBox cmdLst;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
    }
 }

--- a/SamaPager_Client/Form1.resx
+++ b/SamaPager_Client/Form1.resx
@@ -240,11 +240,20 @@
  <data name="statusTxt.Text" xml:space="preserve">
    <value>STATUS: Off</value>
  </data>
+  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 17</value>
+  </data>
+  <data name="toolStripStatusLabel1.Text" xml:space="preserve">
+    <value>v1.1</value>
+  </data>
+  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
  <data name="kryptonStatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 555</value>
+    <value>0, 556</value>
  </data>
  <data name="kryptonStatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>345, 22</value>
+    <value>344, 22</value>
  </data>
  <data name="kryptonStatusStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -270,29 +279,11 @@
  <data name="menuStrip1.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt</value>
  </data>
-  <data name="changeDestinationAddressToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="changeDestinationAddressToolStripMenuItem.Text" xml:space="preserve">
-    <value>Change destination address</value>
-  </data>
-  <data name="restartUDPClientToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="restartUDPClientToolStripMenuItem.Text" xml:space="preserve">
-    <value>Restart UDP Client</value>
-  </data>
-  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 20</value>
-  </data>
-  <data name="fileToolStripMenuItem.Text" xml:space="preserve">
-    <value>Network</value>
-  </data>
  <data name="menuStrip1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
  <data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>345, 24</value>
+    <value>344, 24</value>
  </data>
  <data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -343,7 +334,7 @@
    <value>0, 0</value>
  </data>
  <data name="kryptonPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>345, 577</value>
+    <value>344, 578</value>
  </data>
  <data name="kryptonPanel1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -360,6 +351,24 @@
  <data name="&gt;&gt;kryptonPanel1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
+  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 20</value>
+  </data>
+  <data name="fileToolStripMenuItem.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="changeDestinationAddressToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
+  </data>
+  <data name="changeDestinationAddressToolStripMenuItem.Text" xml:space="preserve">
+    <value>Change destination address</value>
+  </data>
+  <data name="restartUDPClientToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
+  </data>
+  <data name="restartUDPClientToolStripMenuItem.Text" xml:space="preserve">
+    <value>Restart UDP Client</value>
+  </data>
  <metadata name="kryptonManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
@@ -370,7 +379,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>345, 577</value>
+    <value>344, 578</value>
  </data>
  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
    <value>CenterScreen</value>
@@ -408,6 +417,12 @@
  <data name="&gt;&gt;kryptonManager2.Type" xml:space="preserve">
    <value>Krypton.Toolkit.KryptonManager, Krypton.Toolkit, Version=95.25.8.235, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e</value>
  </data>
+  <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
+    <value>toolStripStatusLabel1</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>Form1</value>
  </data>
--- 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;
    }
 }
--- 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})";
+        }
    }
 }
--- 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")));
--- a/SamaPager_Server/Properties/Resources.Designer.cs
+++ b/SamaPager_Server/Properties/Resources.Designer.cs
@@ -70,6 +70,15 @@ namespace SamaPager_Server.Properties {
            }
        }
        
+        /// <summary>
+        ///   Cerca una stringa localizzata simile a 1.1.
+        /// </summary>
+        internal static string currentVersion {
+            get {
+                return ResourceManager.GetString("currentVersion", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Cerca una risorsa localizzata di tipo System.Drawing.Bitmap.
        /// </summary>
@@ -79,5 +88,14 @@ namespace SamaPager_Server.Properties {
                return ((System.Drawing.Bitmap)(obj));
            }
        }
+        
+        /// <summary>
+        ///   Cerca una stringa localizzata simile a Castagnetti.
+        /// </summary>
+        internal static string versionCodename {
+            get {
+                return ResourceManager.GetString("versionCodename", resourceCulture);
+            }
+        }
    }
 }
--- a/SamaPager_Server/Properties/Resources.resx
+++ b/SamaPager_Server/Properties/Resources.resx
@@ -124,4 +124,10 @@
  <data name="5pagers1shalom" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\5pagers1shalom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="currentVersion" xml:space="preserve">
+    <value>1.1</value>
+  </data>
+  <data name="versionCodename" xml:space="preserve">
+    <value>Castagnetti</value>
+  </data>
 </root>
--- a/SamaPager_Server/Server.cs
+++ b/SamaPager_Server/Server.cs
@@ -46,7 +46,15 @@ namespace SamaPager_Server
                case "!getDateTime":
                    bytesToSend = Encoding.UTF8.GetBytes($"Hi, it's {DateTime.Now}");
                    this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
-                    return $"Time command received by {receiveEndPoint}, sent local server time";
+                    return $"Command \"!getDateTime\" received by {receiveEndPoint}, sent local server time";
+                case "!getCurrentDir":
+                    bytesToSend = Encoding.UTF8.GetBytes($"I'm working in {Environment.CurrentDirectory}");
+                    this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
+                    return $"Command \"!getCurrentDir\" received by {receiveEndPoint}, sent server working directory";
+                case "!getCurrentUser":
+                    bytesToSend = Encoding.UTF8.GetBytes($"Hi, I'm running as {Environment.UserName}");
+                    this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
+                    return $"Command \"!getCurrentUser\" received by {receiveEndPoint}, sent the username the server is running on";
                default:
                    return $"[{DateTime.Now}] {receiveEndPoint}: {receivedMessage}";
            }
Author	SHA1	Message	Date
AndreStork	7153d0fd09	Fixed log of getCurrentUser command on server	2025-10-02 09:27:53 +02:00
AndreStork	de0e87ffd8	Added server version handling from project resources	2025-10-02 09:21:14 +02:00
AndreStork	70b818353d	Added final commands	2025-10-02 09:14:55 +02:00
AndreStork	32c28b76c0	Added client version to form toolstrip	2025-10-02 09:08:06 +02:00