From e025a9939daa7ed8b4447e11d6fd44cbe7dde9ab Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 19 Sep 2024 17:32:22 +0200
Subject: [PATCH] Fix dettagli finestre...

---
 EgwControlCenter/App.config                   | 66 -------------------
 EgwControlCenter/ControlCenter.Designer.cs    |  1 +
 EgwControlCenter/ControlCenter.cs             | 50 +++++---------
 .../ClickOnceProfile.pubxml.user              |  2 +-
 4 files changed, 17 insertions(+), 102 deletions(-)

diff --git a/EgwControlCenter/App.config b/EgwControlCenter/App.config
index d8710dc..b9ef052 100644
--- a/EgwControlCenter/App.config
+++ b/EgwControlCenter/App.config
@@ -2,71 +2,5 @@
 <configuration>
     <appSettings>
         <add key="appName" value="EgalWare ACC" />
-        <!--<add key="appVers" value="develop" />-->
-        <add key="pingMsTimeout" value="1500" />
-        <!-- ciclo corto x invio a server: ms -->
-        <add key="timerCheckMs" value="30000" />
-        <add key="vetoMinutes" value="1" />
-        <!-- watchdog, ping, check disconnesso -->
-        <add key="nMaxSend" value="10" />
-        <add key="pingTestSec" value="5" />
-        <add key="watchdogMaxSec" value="90" />
-        <add key="disconMaxSec" value="30" />
-        <add key="defIOB" value="2999" />
-        <add key="pauseSendMSec" value="2000" />
-        <add key="sendStartFLog" value="false" />
-        <!--gestione coda-->
-        <add key="maxQueueFLog" value="16384" />
-        <add key="maxQueueRawTransf" value="1024" />
-        <!--gestione max num errori-->
-        <add key="maxAliveErrors" value="1000" />
-        <add key="maxErroriCheck" value="300" />
-        <add key="maxSendErrors" value="100" />
-        <add key="maxReadErrors" value="20" />
-        <!--gestione REDIS-->
-        <add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
-        <add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false" />
-        <add key="redisDb" value="10" />
-        <!--gestione invio dati in blocchi Json-->
-        <add key="minJsonData" value="2" />
-        <add key="maxJsonData" value="100" />
-        <add key="maxJsonDataEv" value="25" />
-        <!--gestione multithread-->
-        <add key="sendDataByThread" value="false" />
-        <!--Definizione avvio Adapter-->
-        <add key="autoLoadConf" value="true" />
-        <add key="autoStartOnLoad" value="true" />
-        <add key="startMinimized" value="true" />
-        <add key="windowCanMax" value="true" />
-        <add key="trayClose" value="true" />
-        <add key="autoSaveSec" value="60" />
-        <add key="waitRecMSec" value="60000" />
-        <add key="testCharSep" value="|" />
-        <add key="delayShowLogMs" value="500" />
-        <add key="vetoSeconds" value="5" />
-        <!--conf file-->
-        <add key="dataPath" value="DATA" />
-        <add key="dataConfPath" value="Conf" />
-        <add key="dataDatPath" value="DATA\DAT" />
-        <add key="resxPath" value="Resources" />
-        <add key="mainConfFile" value="MAIN.ini" />
-        <add key="defaultPersLayerFile" value="PersistData.dat" />
-        <add key="simDataFile" value="SimData.dat" />
-        <add key="memDumpFile" value="MemoryDump.dat" />
-        <add key="numSim" value="1" />
-        <add key="MMapR" value="MMapR.map" />
-        <add key="MMapW" value="MMapW.map" />
-        <add key="AUpdAsAdm" value="true" />
-        <add key="ConfToCloud" value="true" />
-        <add key="CacheConfToCloudDuratHour" value="24" />
-        <!--logging-->
-        <add key="recTime" value="true" />
-        <add key="verbose" value="false" />
-        <add key="logEvery" value="100" />
-        <add key="zipLogOldDay" value="1" />
-        <add key="maxLogDirSize" value="300" />
-        <add key="maxLogDays" value="400" />
-        <add key="numRowConsole" value="50" />
-        <add key="verboseLogTOut" value="60" />
     </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/EgwControlCenter/ControlCenter.Designer.cs b/EgwControlCenter/ControlCenter.Designer.cs
index 1f8a24a..dd89805 100644
--- a/EgwControlCenter/ControlCenter.Designer.cs
+++ b/EgwControlCenter/ControlCenter.Designer.cs
@@ -148,6 +148,7 @@
             Controls.Add(btnSetup);
             Controls.Add(label1);
             Icon = (Icon)resources.GetObject("$this.Icon");
+            MaximizeBox = false;
             Name = "ControlCenter";
             Text = "Egalware AppControlCenter";
             FormClosing += ControlCenter_FormClosing;
diff --git a/EgwControlCenter/ControlCenter.cs b/EgwControlCenter/ControlCenter.cs
index f892bca..3cc4614 100644
--- a/EgwControlCenter/ControlCenter.cs
+++ b/EgwControlCenter/ControlCenter.cs
@@ -44,11 +44,6 @@ namespace EgwControlCenter
 
         #region Protected Fields
 
-        /// <summary>
-        /// Modalità di avvio
-        /// </summary>
-        protected AccEnum.StartMode ModoAvvio = AccEnum.StartMode.STD;
-
         #endregion Protected Fields
 
         #region Private Fields
@@ -92,24 +87,11 @@ namespace EgwControlCenter
         /// </summary>
         private void CheckFormVisibility()
         {
-            // se non può massimizzare imposto COMUNQUE a minimized...
-            if (!AccUtils.CRB("windowCanMax"))
+            // controllo cosa devo mostrare...
+            if (WindowState == FormWindowState.Minimized)
             {
-                WindowState = FormWindowState.Minimized;
-            }
-            // SOLO SE se sono in modo STD
-            if (ModoAvvio == AccEnum.StartMode.STD)
-            {
-                // controllo cosa devo mostrare...
-                if (WindowState == FormWindowState.Minimized)
-                {
-                    notifyIcon1.Visible = false;
-                    sendToTray();
-                }
-                else
-                {
-                    notifyIcon1.Visible = false;
-                }
+                notifyIcon1.Visible = false;
+                sendToTray();
             }
             else
             {
@@ -129,6 +111,11 @@ namespace EgwControlCenter
         }
 
         private void ControlCenter_Load(object sender, EventArgs e)
+        {
+            SetPosition();
+        }
+
+        private void SetPosition()
         {
             // posiziono in basso a sx...
             Rectangle workArea = Screen.GetWorkingArea(this);
@@ -152,16 +139,8 @@ namespace EgwControlCenter
         /// <param name="e"></param>
         private void ControlCenter_Shown(object sender, EventArgs e)
         {
-            // SOLO SE se sono in modo STD
-            if (ModoAvvio == StartMode.STD)
-            {
-                // avvio minimizzato se richiesto
-                if (AccUtils.CRB("startMinimized"))
-                {
-                    // controllo e mando a tray...
-                    sendToTray();
-                }
-            }
+            // avvio minimizzato
+            sendToTray();
         }
 
         /// <summary>
@@ -210,7 +189,6 @@ namespace EgwControlCenter
             DataDir = Environment.GetEnvironmentVariable("ClickOnce_DataDirectory") ?? AccUtils.dataDir;
             CurrCheck = new ReleaseChecker(ConfDir, DataDir, "ConfPatrol.json");
             Log.Trace($"Folder Setup | {ConfDir} | {DataDir}");
-            //timerCheck.Interval = AccUtils.CRI("timerCheckMs");
             timerCheck.Interval = (CurrCheck.CurrPatrolCont.RefreshIntSec * 1000);
             // sistemo grafica TRAY ICON
             SetupTrayIcon();
@@ -240,6 +218,8 @@ namespace EgwControlCenter
             WindowState = FormWindowState.Normal;
         }
 
+        private string AppName = "EgalWare ACC"; //= AccUtils.CRS("appName");
+
         /// <summary>
         /// Gestisce "andata nel tray" della form
         /// </summary>
@@ -247,8 +227,8 @@ namespace EgwControlCenter
         {
             if (!notifyIcon1.Visible)
             {
-                notifyIcon1.BalloonTipTitle = AccUtils.CRS("appName");
-                notifyIcon1.BalloonTipText = $"{AccUtils.CRS("appName")} running on tray";
+                notifyIcon1.BalloonTipTitle = AppName;
+                notifyIcon1.BalloonTipText = $"{AppName} running on tray";
                 notifyIcon1.BalloonTipIcon = ToolTipIcon.Info;
                 notifyIcon1.BalloonTipClicked += NotifyIcon1_BalloonTipClicked;
                 notifyIcon1.Visible = true;
diff --git a/EgwControlCenter/Properties/PublishProfiles/ClickOnceProfile.pubxml.user b/EgwControlCenter/Properties/PublishProfiles/ClickOnceProfile.pubxml.user
index 632fcc7..1d72641 100644
--- a/EgwControlCenter/Properties/PublishProfiles/ClickOnceProfile.pubxml.user
+++ b/EgwControlCenter/Properties/PublishProfiles/ClickOnceProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-09-19T15:08:51.1944045Z||;True|2024-09-19T17:06:47.5482142+02:00||;True|2024-09-19T16:16:06.4269267+02:00||;True|2024-09-19T15:43:14.5803096+02:00||;</History>
+    <History>True|2024-09-19T15:19:00.2993133Z||;True|2024-09-19T17:08:51.1944045+02:00||;True|2024-09-19T17:06:47.5482142+02:00||;True|2024-09-19T16:16:06.4269267+02:00||;True|2024-09-19T15:43:14.5803096+02:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file