Merge pull request #14 from Monbsoft/dev

[Meger] dev to master

Author: oliver254

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5772,15 +5772,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MachineMonitor"
-        "ProductCode" = "8:{34C0391C-F0AB-48EA-A866-DA434C86E217}"
-        "PackageCode" = "8:{5D8BAE24-EBBA-4B25-88B9-A4EE636BDEC5}"
+        "ProductCode" = "8:{18926866-857D-4E78-9011-7BDBECF88449}"
+        "PackageCode" = "8:{1E9DAF35-6DA2-4CA5-8D87-CFAB211E80C9}"
         "UpgradeCode" = "8:{1DB3CEEF-D801-4795-8E91-27ABFB4EFF46}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.1"
+        "ProductVersion" = "8:1.0.3"
         "Manufacturer" = "8:Monbsoft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -6308,7 +6308,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A5CBE260681E4F25B804423F0E685811"
             {
-            "SourcePath" = "8:..\\MachineMonitor\\obj\\Release\\MachineMonitor.exe"
+            "SourcePath" = "8:..\\MachineMonitor\\obj\\Debug\\MachineMonitor.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F9568AA8B4624F80A9DCDBFC3EFDE8AA"

.github/ISSUE_TEMPLATE/feature_request.md

@@ -28,6 +28,9 @@
       <setting name="Disk" serializeAs="String">
         <value>_Total</value>
       </setting>
+      <setting name="Topmost" serializeAs="String">
+        <value>True</value>
+      </setting>
     </Monbsoft.MachineMonitor.Properties.Settings>
     <Monbsoft.MachineMonitor.Settings>
       <setting name="Network" serializeAs="String">

src/MachineMonitor.Setup/MachineMonitor.Setup.vdproj

@@ -30,6 +30,20 @@ public string Network
             }
         }
 
+        public bool Topmost
+        {
+            get
+            {
+                return Settings.Default.Topmost;
+            }
+            set
+            {
+                Settings.Default.Topmost = value;
+                Save();
+            }
+        }
+
+
         public bool Transparent
         {
             get

src/MachineMonitor/App.config

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+
+namespace Monbsoft.MachineMonitor.Helpers
+{
+    public static class BitHelper
+    {
+        private static readonly Dictionary<int, string> byteUnits = new Dictionary<int, string>
+        {
+            { 0, "bits/s" },
+            { 1, "Kbits/s" },
+            { 2, "Mbits/s" },
+            { 3, "Gbits/s" },
+            { 4, "Tbits/s" }
+        };
+
+        public static string DisplayByte(double bytes)
+        {
+            int index = 0;
+            bool find = false;
+
+            double rate = bytes * 8;
+            double next;
+            while (!find && index < 4)
+            {
+                next = rate / 1000;
+                if (next >= 1.0d)
+                {
+                    index++;
+                    rate = next;
+                }
+                else
+                {
+                    find = true;
+                }
+            }
+            return $"{rate.ToString("F1")} {byteUnits[index]}";
+        }
+    }
+}

src/MachineMonitor/Configuration/ConfigurationStore.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Monbsoft.MachineMonitor.Helpers
+{
+    public static class OctetHelper
+    {
+        private static readonly Dictionary<int, string> octetUnits = new Dictionary<int, string>
+        {
+            {0, "Mo" },
+            {1, "Go" },
+            {2, "To" },
+            {3, "Po" }
+        };
+        public static string DisplayMega(double mega)
+        {
+            bool find = false;
+            double value = mega;
+            int index = 0;
+            while(!find && index <3)
+            {
+                double next = value / 1024;
+                if(next >= 1.0)
+                {
+                    value = next;
+                }
+                else
+                {
+                    index++;
+                    find = true;
+
+                }
+            }
+
+            return $"{value.ToString("F1")} {octetUnits[index]}";
+        }
+    }
+}

src/MachineMonitor/Helpers/BitHelper.cs

@@ -74,6 +74,8 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Configuration\ConfigurationStore.cs" />
+    <Compile Include="Helpers\BitHelper.cs" />
+    <Compile Include="Helpers\OctetHelper.cs" />
     <Compile Include="Messages\UpdatedConfigurationMessage.cs" />
     <Compile Include="Properties\Resource.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -145,5 +147,6 @@
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/MachineMonitor/Helpers/OctetHelper.cs

@@ -15,7 +15,8 @@ public enum ChangedType
         {
             Disk = 0,
             Network = 1,
-            Transparent = 2
+            Transparent = 2,
+            Topmost = 3
         }
 
         public ChangedType Changed { get; set; }

src/MachineMonitor/MachineMonitor.csproj

@@ -51,5 +51,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2")]
-[assembly: AssemblyFileVersion("1.0.2")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyFileVersion("1.0.3")]

src/MachineMonitor/Messages/UpdatedConfigurationMessage.cs

@@ -11,5 +11,8 @@
     <Setting Name="Disk" Type="System.String" Scope="User">
       <Value Profile="(Default)">_Total</Value>
     </Setting>
+    <Setting Name="Topmost" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

src/MachineMonitor/Properties/AssemblyInfo.cs

@@ -16,6 +16,7 @@ public class ConfigurationViewModel : ViewModelBase
         private string _disk;
         private string _network;
         private bool _transparent;
+        private bool _topmost;
         #endregion
 
         #region Constructeurs
@@ -88,6 +89,19 @@ public bool Transparent
                 Transparent_Changed();
             }
         }
+
+        public bool Topmost
+        {
+            get
+            {
+                return _topmost;
+            }
+            set
+            {
+                Set(ref _topmost, value);
+                Topmost_Changed();
+            }
+        }
         #endregion
 
         #region Méthodes
@@ -111,6 +125,12 @@ private void Transparent_Changed()
             _configuration.Transparent = _transparent;
             SendMessage(ChangedType.Transparent);
         }
+
+        private void Topmost_Changed()
+        {
+            _configuration.Topmost = _topmost;
+            SendMessage(ChangedType.Topmost);
+        }
         #endregion
     }
 }