Skip to content

Commit 31db284

Browse files
BornToBeRootBornToBeRoot
committed
Merge branch 'main' into fix/network_connection_view
2 parents 18eb0f7 + 016e90a commit 31db284

38 files changed

+765
-292
lines changed

‎Source/NETworkManager.Localization/Resources/StaticStrings.Designer.cs‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/StaticStrings.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<data name="ExamplePortScanRange" xml:space="preserve">
228228
<value>22; 80; 443; 500 - 999; 8080</value>
229229
</data>
230-
<data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
230+
<data name="ExampleProfileName" xml:space="preserve">
231231
<value>Webserver</value>
232232
</data>
233233
<data name="ExampleSerialLine" xml:space="preserve">

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/Strings.it-IT.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3945,4 +3945,10 @@ Clic con il tasto destro per ulteriori opzioni.</value>
39453945
<data name="SetDefault" xml:space="preserve">
39463946
<value>Imposta predefinito</value>
39473947
</data>
3948+
<data name="ExampleProfileDescription" xml:space="preserve">
3949+
<value>Server Ubuntu che esegue Docker con Nextcloud e Traefik...</value>
3950+
</data>
3951+
<data name="ExampleGroupDescription" xml:space="preserve">
3952+
<value>Server Linux in esecuzione in AWS...</value>
3953+
</data>
39483954
</root>

‎Source/NETworkManager.Localization/Resources/Strings.pt-BR.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3850,4 +3850,10 @@ Clique direito para mais opções.</value>
38503850
<data name="SetDefault" xml:space="preserve">
38513851
<value>Definir padrão</value>
38523852
</data>
3853+
<data name="ExampleProfileDescription" xml:space="preserve">
3854+
<value>Ubuntu Server rodando Docker com Nextcloud e Traefik...</value>
3855+
</data>
3856+
<data name="ExampleGroupDescription" xml:space="preserve">
3857+
<value>Servidores Linux rodando em AWS...</value>
3858+
</data>
38533859
</root>

‎Source/NETworkManager.Localization/Resources/Strings.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3851,4 +3851,10 @@ Right-click for more options.</value>
38513851
<data name="SetDefault" xml:space="preserve">
38523852
<value>Set default</value>
38533853
</data>
3854+
<data name="ExampleProfileDescription" xml:space="preserve">
3855+
<value>Ubuntu Server running Docker with Nextcloud and Traefik...</value>
3856+
</data>
3857+
<data name="ExampleGroupDescription" xml:space="preserve">
3858+
<value>Linux servers running in AWS...</value>
3859+
</data>
38543860
</root>

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
<EmbeddedResource Include="Resources\PSDiscoveryProtocol.psm1"/>
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="AWSSDK.Core" Version="3.7.400.33"/>
29+
<PackageReference Include="AWSSDK.Core" Version="3.7.400.45"/>
3030
<PackageReference Include="DnsClient" Version="1.8.0"/>
3131
<PackageReference Include="IPNetwork2" Version="3.0.667"/>
3232
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
3333
<PackageReference Include="log4net" Version="3.0.2"/>
3434
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
3535
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
36-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
36+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0"/>
3737
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
3838
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
3939
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>

‎Source/NETworkManager.Models/Network/Ping.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace NETworkManager.Models.Network;
1010

1111
public sealed class Ping
1212
{
13-
#region Varaibles
13+
#region Variables
1414

1515
public int WaitTime = 1000;
1616
public int Timeout = 4000;

‎Source/NETworkManager.Profiles/GroupInfo.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class GroupInfo
1919
/// </summary>
2020
public GroupInfo()
2121
{
22-
Profiles = new List<ProfileInfo>();
22+
Profiles = [];
2323
}
2424

2525
/// <summary>
@@ -35,6 +35,10 @@ public GroupInfo(string name) : this()
3535
/// </summary>
3636
public GroupInfo(GroupInfo group) : this(group.Name)
3737
{
38+
// General
39+
Description = group.Description;
40+
41+
// Profiles
3842
Profiles = group.Profiles;
3943

4044
// Remote Desktop
@@ -164,6 +168,11 @@ public GroupInfo(GroupInfo group) : this(group.Name)
164168
/// Name of the group.
165169
/// </summary>
166170
public string Name { get; set; }
171+
172+
/// <summary>
173+
/// Description of the group.
174+
/// </summary>
175+
public string Description { get; set; }
167176

168177
[XmlIgnore] public bool IsDynamic { get; set; }
169178

‎Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
2020
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
21-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
21+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0"/>
2222
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
2323
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
2424
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>

0 commit comments

Comments
 (0)