Skip to content

Commit 61bf278

Browse files
committed
Version 2.1.7740
Beta Release #### Fix : - Fixed a string length error for the German language (this problem should also exist with other languages but only if the strings were long enough) - related to issue #74 ### Changed - Redesign of the connection functions to the Nut server - Creation of a DLL containing functions not essential to the GUI in order to prepare for the upcoming arrival of service mode - Modification of the instantaneous power calculation method in the case of inverters not supporting the variables previously used - in conjunction with issue #68
1 parent bb6e6c6 commit 61bf278

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2878
-908
lines changed

WinNUT_V2/AGauge_mod/Properties/AssemblyInfo.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("AGauge")]
9-
[assembly: AssemblyDescription("AGauge Compoent by A.J.Bauer")]
9+
[assembly: AssemblyDescription("AGauge Component by A.J.Bauer - Modified for WinNUT")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Code Art Engineering")]
12-
[assembly: AssemblyProduct("AGauge")]
13-
[assembly: AssemblyCopyright("Copyright © CodeArtEng 2012")]
14-
[assembly: AssemblyTrademark("")]
1511
[assembly: AssemblyCulture("")]
16-
12+
[assembly: AssemblyCompany("Gawindx")]
13+
[assembly: AssemblyProduct("WinNUT-Client")]
14+
[assembly: AssemblyCopyright("Copyright Gawinx (Decaux Nicolas) © 2019-2021")]
15+
[assembly: AssemblyTrademark("https://github.com/gawindx/WinNUT-Client")]
16+
1717
// Setting ComVisible to false makes the types in this assembly not visible
1818
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
20-
[assembly: ComVisible(false)]
20+
[assembly: ComVisible(false)]
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("cddfb4ae-46c7-4151-98dd-cbd9e7c1d04d")]
@@ -32,5 +32,4 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.0.2.0")]
36-
[assembly: AssemblyFileVersion("2.0.2.0")]
35+
[assembly: AssemblyVersion("2.1.*")]

WinNUT_V2/Setup/Setup.vdproj

Lines changed: 68 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@
321321
}
322322
"Entry"
323323
{
324+
"MsmKey" = "8:_5FE446066F12393E77A2B0F5915CB43A"
325+
"OwnerKey" = "8:_7DBECEAB3A758928543F2F67B0BCFD5E"
326+
"MsmSig" = "8:_UNDEFINED"
327+
}
328+
"Entry"
329+
{
324330
"MsmKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
325331
"OwnerKey" = "8:_5FE446066F12393E77A2B0F5915CB43A"
326332
"MsmSig" = "8:_UNDEFINED"
@@ -429,6 +435,12 @@
429435
}
430436
"Entry"
431437
{
438+
"MsmKey" = "8:_7DBECEAB3A758928543F2F67B0BCFD5E"
439+
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
440+
"MsmSig" = "8:_UNDEFINED"
441+
}
442+
"Entry"
443+
{
432444
"MsmKey" = "8:_7E781465BFAC4DC08591FE1EDE1E2D1F"
433445
"OwnerKey" = "8:_UNDEFINED"
434446
"MsmSig" = "8:_UNDEFINED"
@@ -688,6 +700,12 @@
688700
"Entry"
689701
{
690702
"MsmKey" = "8:_BED24066F49F1B908C4DB31C0CBA928C"
703+
"OwnerKey" = "8:_7DBECEAB3A758928543F2F67B0BCFD5E"
704+
"MsmSig" = "8:_UNDEFINED"
705+
}
706+
"Entry"
707+
{
708+
"MsmKey" = "8:_BED24066F49F1B908C4DB31C0CBA928C"
691709
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
692710
"MsmSig" = "8:_UNDEFINED"
693711
}
@@ -898,6 +916,18 @@
898916
"Entry"
899917
{
900918
"MsmKey" = "8:_UNDEFINED"
919+
"OwnerKey" = "8:_7DBECEAB3A758928543F2F67B0BCFD5E"
920+
"MsmSig" = "8:_UNDEFINED"
921+
}
922+
"Entry"
923+
{
924+
"MsmKey" = "8:_UNDEFINED"
925+
"OwnerKey" = "8:_99295A60B760C5A7B2A217EF6A2482C4"
926+
"MsmSig" = "8:_UNDEFINED"
927+
}
928+
"Entry"
929+
{
930+
"MsmKey" = "8:_UNDEFINED"
901931
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
902932
"MsmSig" = "8:_UNDEFINED"
903933
}
@@ -958,12 +988,6 @@
958988
"Entry"
959989
{
960990
"MsmKey" = "8:_UNDEFINED"
961-
"OwnerKey" = "8:_99295A60B760C5A7B2A217EF6A2482C4"
962-
"MsmSig" = "8:_UNDEFINED"
963-
}
964-
"Entry"
965-
{
966-
"MsmKey" = "8:_UNDEFINED"
967991
"OwnerKey" = "8:_C3ABC9BEC29BBE1E3114959C26FD79C1"
968992
"MsmSig" = "8:_UNDEFINED"
969993
}
@@ -3563,6 +3587,37 @@
35633587
"IsDependency" = "11:TRUE"
35643588
"IsolateTo" = "8:"
35653589
}
3590+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7DBECEAB3A758928543F2F67B0BCFD5E"
3591+
{
3592+
"AssemblyRegister" = "3:1"
3593+
"AssemblyIsInGAC" = "11:FALSE"
3594+
"AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.1.7740.35836, Culture=neutral, processorArchitecture=MSIL"
3595+
"ScatterAssemblies"
3596+
{
3597+
"_7DBECEAB3A758928543F2F67B0BCFD5E"
3598+
{
3599+
"Name" = "8:WinNUT-Client_Common.dll"
3600+
"Attributes" = "3:512"
3601+
}
3602+
}
3603+
"SourcePath" = "8:WinNUT-Client_Common.dll"
3604+
"TargetName" = "8:"
3605+
"Tag" = "8:"
3606+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
3607+
"Condition" = "8:"
3608+
"Transitive" = "11:FALSE"
3609+
"Vital" = "11:TRUE"
3610+
"ReadOnly" = "11:FALSE"
3611+
"Hidden" = "11:FALSE"
3612+
"System" = "11:FALSE"
3613+
"Permanent" = "11:FALSE"
3614+
"SharedLegacy" = "11:FALSE"
3615+
"PackageAs" = "3:1"
3616+
"Register" = "3:1"
3617+
"Exclude" = "11:FALSE"
3618+
"IsDependency" = "11:TRUE"
3619+
"IsolateTo" = "8:"
3620+
}
35663621
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7E781465BFAC4DC08591FE1EDE1E2D1F"
35673622
{
35683623
"SourcePath" = "8:..\\..\\README.md"
@@ -4114,7 +4169,7 @@
41144169
{
41154170
"AssemblyRegister" = "3:1"
41164171
"AssemblyIsInGAC" = "11:FALSE"
4117-
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"
4172+
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.7740.35836, Culture=neutral, processorArchitecture=MSIL"
41184173
"ScatterAssemblies"
41194174
{
41204175
"_99295A60B760C5A7B2A217EF6A2482C4"
@@ -5592,22 +5647,22 @@
55925647
{
55935648
"Name" = "8:Microsoft Visual Studio"
55945649
"ProductName" = "8:WinNUT"
5595-
"ProductCode" = "8:{27BA937E-88CF-46BD-9BDA-2426BDE4BA49}"
5596-
"PackageCode" = "8:{8553B0E9-8C88-4369-9388-88953E889692}"
5650+
"ProductCode" = "8:{27453A08-363D-4020-BC5E-81D55CAD026D}"
5651+
"PackageCode" = "8:{1B08EE15-0DA7-4B7A-9331-8DAAB7671FF3}"
55975652
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
55985653
"AspNetVersion" = "8:2.0.50727.0"
55995654
"RestartWWWService" = "11:FALSE"
56005655
"RemovePreviousVersions" = "11:TRUE"
56015656
"DetectNewerInstalledVersion" = "11:FALSE"
56025657
"InstallAllUsers" = "11:FALSE"
5603-
"ProductVersion" = "8:2.0.7722"
5658+
"ProductVersion" = "8:2.1.7740"
56045659
"Manufacturer" = "8:Gawindx"
56055660
"ARPHELPTELEPHONE" = "8:"
56065661
"ARPHELPLINK" = "8:https://github.com/gawindx/WinNUT-Client/issues"
56075662
"Title" = "8:WinNUT-Setup"
5608-
"Subject" = "8:WinNUT-Client v2.0.7722"
5663+
"Subject" = "8:WinNUT-Client v2.1.77.40"
56095664
"ARPCONTACT" = "8:Gawindx"
5610-
"Keywords" = "8:WinNUT v2.0.7722.30975"
5665+
"Keywords" = "8:WinNUT v2.1.7740.35837"
56115666
"ARPCOMMENTS" = "8:Windows NUT Client"
56125667
"ARPURLINFOABOUT" = "8:"
56135668
"ARPPRODUCTICON" = "8:_33BCB1EF059B4E9B87FA7435A8F2499C"
@@ -6194,7 +6249,7 @@
61946249
}
61956250
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_70DBA11C2BF449198BA594449914C1BC"
61966251
{
6197-
"SourcePath" = "8:..\\WInNUT_GUI\\obj\\Release\\WinNUT-client.exe"
6252+
"SourcePath" = "8:..\\WInNUT_GUI\\obj\\Release\\WinNUT-Client.exe"
61986253
"TargetName" = "8:"
61996254
"Tag" = "8:"
62006255
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"

WinNUT_V2/SharedAssemblyInfo.vb

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
' WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.
2+
' Copyright (C) 2019-2021 Gawindx (Decaux Nicolas)
3+
'
4+
' This program is free software: you can redistribute it and/or modify it under the terms of the
5+
' GNU General Public License as published by the Free Software Foundation, either version 3 of the
6+
' License, or any later version.
7+
'
8+
' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY
9+
10+
Imports System.Resources
11+
Imports System
12+
Imports System.Reflection
13+
Imports System.Runtime.InteropServices
14+
15+
' Les informations générales relatives à un assembly dépendent de
16+
' l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
17+
' associées à un assembly.
18+
19+
' Vérifiez les valeurs des attributs de l'assembly
20+
21+
<Assembly: AssemblyCompany("Gawindx")>
22+
<Assembly: AssemblyProduct("WinNUT-Client")>
23+
<Assembly: AssemblyCopyright("Copyright Gawinx (Decaux Nicolas) © 2019-2021")>
24+
<Assembly: AssemblyTrademark("https://github.com/gawindx/WinNUT-Client")>
25+
26+
' Les informations de version pour un assembly se composent des quatre valeurs suivantes :
27+
'
28+
' Version principale
29+
' Version secondaire
30+
' Numéro de build
31+
' Révision
32+
'
33+
' Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
34+
' en utilisant '*', comme indiqué ci-dessous :
35+
' <Assembly: AssemblyVersion("1.0.*")>
36+
37+
<Assembly: AssemblyVersion("2.1.*")>
38+
<Assembly: NeutralResourcesLanguage("en-US")>
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
# Pour en savoir plus sur .editorconfig, consultez https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
root = true
6+
# All files
7+
[*]
8+
indent_style = space
9+
file_header_template = WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n
10+
# Code files
11+
[*.{cs,csx,vb,vbx}]
12+
indent_size = 4
13+
insert_final_newline = true
14+
charset = utf-8-bom
15+
###############################
16+
# .NET Coding Conventions #
17+
###############################
18+
[*.{cs,vb}]
19+
# Organize usings
20+
dotnet_sort_system_directives_first = true
21+
# this. preferences
22+
dotnet_style_qualification_for_field = false:silent
23+
dotnet_style_qualification_for_property = false:silent
24+
dotnet_style_qualification_for_method = false:silent
25+
dotnet_style_qualification_for_event = false:silent
26+
# Language keywords vs BCL types preferences
27+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
28+
dotnet_style_predefined_type_for_member_access = true:silent
29+
# Parentheses preferences
30+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
31+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
32+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
33+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
34+
# Modifier preferences
35+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
36+
dotnet_style_readonly_field = true:suggestion
37+
# Expression-level preferences
38+
dotnet_style_object_initializer = true:suggestion
39+
dotnet_style_collection_initializer = true:suggestion
40+
dotnet_style_explicit_tuple_names = true:suggestion
41+
dotnet_style_null_propagation = true:suggestion
42+
dotnet_style_coalesce_expression = true:suggestion
43+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
44+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
45+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
46+
dotnet_style_prefer_auto_properties = true:silent
47+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
48+
dotnet_style_prefer_conditional_expression_over_return = true:silent
49+
###############################
50+
# Naming Conventions #
51+
###############################
52+
# Style Definitions
53+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
54+
# Use PascalCase for constant fields
55+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
56+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
57+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
58+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
59+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
60+
dotnet_naming_symbols.constant_fields.required_modifiers = const
61+
###############################
62+
# C# Coding Conventions #
63+
###############################
64+
[*.cs]
65+
# var preferences
66+
csharp_style_var_for_built_in_types = true:silent
67+
csharp_style_var_when_type_is_apparent = true:silent
68+
csharp_style_var_elsewhere = true:silent
69+
# Expression-bodied members
70+
csharp_style_expression_bodied_methods = false:silent
71+
csharp_style_expression_bodied_constructors = false:silent
72+
csharp_style_expression_bodied_operators = false:silent
73+
csharp_style_expression_bodied_properties = true:silent
74+
csharp_style_expression_bodied_indexers = true:silent
75+
csharp_style_expression_bodied_accessors = true:silent
76+
# Pattern matching preferences
77+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
78+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
79+
# Null-checking preferences
80+
csharp_style_throw_expression = true:suggestion
81+
csharp_style_conditional_delegate_call = true:suggestion
82+
# Modifier preferences
83+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
84+
# Expression-level preferences
85+
csharp_prefer_braces = true:silent
86+
csharp_style_deconstructed_variable_declaration = true:suggestion
87+
csharp_prefer_simple_default_expression = true:suggestion
88+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
89+
csharp_style_inlined_variable_declaration = true:suggestion
90+
###############################
91+
# C# Formatting Rules #
92+
###############################
93+
# New line preferences
94+
csharp_new_line_before_open_brace = all
95+
csharp_new_line_before_else = true
96+
csharp_new_line_before_catch = true
97+
csharp_new_line_before_finally = true
98+
csharp_new_line_before_members_in_object_initializers = true
99+
csharp_new_line_before_members_in_anonymous_types = true
100+
csharp_new_line_between_query_expression_clauses = true
101+
# Indentation preferences
102+
csharp_indent_case_contents = true
103+
csharp_indent_switch_labels = true
104+
csharp_indent_labels = flush_left
105+
# Space preferences
106+
csharp_space_after_cast = false
107+
csharp_space_after_keywords_in_control_flow_statements = true
108+
csharp_space_between_method_call_parameter_list_parentheses = false
109+
csharp_space_between_method_declaration_parameter_list_parentheses = false
110+
csharp_space_between_parentheses = false
111+
csharp_space_before_colon_in_inheritance_clause = true
112+
csharp_space_after_colon_in_inheritance_clause = true
113+
csharp_space_around_binary_operators = before_and_after
114+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
115+
csharp_space_between_method_call_name_and_opening_parenthesis = false
116+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
117+
# Wrapping preferences
118+
csharp_preserve_single_line_statements = true
119+
csharp_preserve_single_line_blocks = true
120+
###############################
121+
# VB Coding Conventions #
122+
###############################
123+
[*.vb]
124+
# Modifier preferences
125+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

0 commit comments

Comments
 (0)