Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct UPS Load display #112

Merged
merged 4 commits into from
Oct 20, 2023
Merged

Correct UPS Load display #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58d6be
UPS_Device and WinNUT data polling cleanup
gbakeman Oct 18, 2023
06204d8
Disable configuration of Load dial
gbakeman Oct 18, 2023
5faf752
Fix ListVarGui unable to display certain nodes
gbakeman Oct 19, 2023
c9aec9e
New power calculation methods
gbakeman Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/List_Var_Gui.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Public Class List_Var_Gui
Private Sub TView_UPSVar_NodeChanged(sender As Object, e As TreeViewEventArgs) Handles TView_UPSVar.AfterSelect
Dim index As Integer = 0
Dim UPSName = Arr_Reg_Key.Item("UPSName")
Dim SelectedChild = Replace(e.Node.FullPath, UPSName & ".", "")
Dim SelectedChild = Replace(e.Node.FullPath, UPSName & ".", "", 1, 1)
Dim FindChild As Predicate(Of UPS_List_Datas) = Function(ByVal x As UPS_List_Datas)
If x.VarKey = SelectedChild Then
Return True
Expand Down
14,844 changes: 500 additions & 14,344 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf
View file
Open in desktop

Large diffs are not rendered by default.

14,872 changes: 514 additions & 14,358 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf
View file
Open in desktop

Large diffs are not rendered by default.

14,872 changes: 513 additions & 14,359 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf
View file
Open in desktop

Large diffs are not rendered by default.

14,926 changes: 540 additions & 14,386 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf
View file
Open in desktop

Large diffs are not rendered by default.

14,884 changes: 519 additions & 14,365 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 16 additions & 65 deletions WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,6 @@
<data name="Tb_BattV_Max.ToolTip" xml:space="preserve">
<value>Maximale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100.</value>
</data>
<data name="Tb_Load_Max.ToolTip" xml:space="preserve">
<value>Maximaler Last der USV. Wertebereich: Numerischer Wert von 0 bis 100.</value>
</data>
<data name="Tb_OutV_Max.ToolTip" xml:space="preserve">
<value>Maximale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999.</value>
</data>
Expand All @@ -198,9 +195,6 @@
<data name="Tb_BattV_Min.ToolTip" xml:space="preserve">
<value>Minimale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100.</value>
</data>
<data name="Tb_Load_Min.ToolTip" xml:space="preserve">
<value>Mindestladezustand der USV. Wertebereich: Numerischer Wert von 0 bis 100.</value>
</data>
<data name="Tb_OutV_Min.ToolTip" xml:space="preserve">
<value>Minimale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999.</value>
</data>
Expand Down Expand Up @@ -294,4 +288,19 @@
<data name="CB_Follow_FSD.ToolTip" xml:space="preserve">
<value>Gibt an ob ein Herunterfahren durchgeführt werden soll wenn der NUT-Server ein erzwungenes Herunterfahren signalisiert (FSD = Force ShutDown).</value>
</data>
<data name="Cbx_Freq_Input.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_BattV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_OutV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_InF_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
</data>
</root>
23 changes: 15 additions & 8 deletions WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ Valeur acceptée: adresse IPV4 / IPV6 / FQDN.</value>
</data>
<data name="Tb_BattV_Max.ToolTip" xml:space="preserve">
<value>Tension maximale de la batterie.
Valeur acceptée: valeur numérique de 0 à 100.</value>
</data>
<data name="Tb_Load_Max.ToolTip" xml:space="preserve">
<value>Niveau de charge maximum de l'onduleur.
Valeur acceptée: valeur numérique de 0 à 100.</value>
</data>
<data name="Tb_OutV_Max.ToolTip" xml:space="preserve">
Expand All @@ -208,10 +204,6 @@ Valeur acceptée: valeur numérique de 0 à 100.</value>
</data>
<data name="Tb_BattV_Min.ToolTip" xml:space="preserve">
<value>Tension minimale de la batterie.
Valeur acceptée: valeur numérique de 0 à 100.</value>
</data>
<data name="Tb_Load_Min.ToolTip" xml:space="preserve">
<value>Niveau de charge minimum de l'onduleur.
Valeur acceptée: valeur numérique de 0 à 100.</value>
</data>
<data name="Tb_OutV_Min.ToolTip" xml:space="preserve">
Expand Down Expand Up @@ -317,4 +309,19 @@ Valeur acceptée: valeur numérique de 0 à 100.</value>
<data name="CB_Follow_FSD.ToolTip" xml:space="preserve">
<value>Indique si une extinction doit être executé lorsque le serveur NUT signal une extinction forcée (FSD=Force ShutDown)</value>
</data>
<data name="Cbx_Freq_Input.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_BattV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_OutV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Tb_InF_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 3</value>
</data>
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
</data>
</root>
Loading
Loading