From 33aa9fb16909d0bb859c200a1e47187cc7e2e018 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 18 Jul 2024 15:23:47 -0400 Subject: [PATCH] Display polling int. in seconds, other prefs changes - Replaced the polling interval field in the Prefs dialog with a NumericUpDown control, with precision to the tenths place and limited from 0.1 to 100. - Updated references to the polling interval field by converting stored miliseconds to seconds and back - Removed isModified parameter from the SavedPreferences event, the assumption being that preferences will be saved if anything was changed. - Removed old code from WinNUT --- .../WinNUT-Client.zh-TW.xlf | 66 +- .../WinNUT-client.de-DE.xlf | 66 +- .../WinNUT-client.fr-FR.xlf | 66 +- .../WinNUT-client.ru-RU.xlf | 66 +- .../WinNUT-client.zh-CN.xlf | 66 +- WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb | 32 +- WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx | 27 + WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx | 27 + WinNUT_V2/WinNUT-Client/Pref_Gui.resx | 1044 +++++++++++++---- WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx | 27 + WinNUT_V2/WinNUT-Client/Pref_Gui.vb | 27 +- WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx | 31 +- WinNUT_V2/WinNUT-Client/Pref_Gui.zh-TW.resx | 27 + WinNUT_V2/WinNUT-Client/WinNUT.vb | 9 - 14 files changed, 1214 insertions(+), 367 deletions(-) diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf index 9d5421a..5532804 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf @@ -778,9 +778,9 @@ Cancel to Save Msi and Install Later ..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Previous preferences data detected in the Registry. @@ -1488,10 +1488,6 @@ Accepted value: Numeric value from 0 to 100. Calibration 校正 - - 12 - 12 - UPS Load UPS 負載 @@ -1756,12 +1752,6 @@ Accepted value: Numeric value from 0 to 100. Debug 除錯 - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - NoControl NoControl @@ -1880,10 +1870,6 @@ Accepted value: Numeric value from 0 to 3600. 92, 13 92, 13 - - 154, 101 - 154, 101 - 4, 22 4, 22 @@ -2020,10 +2006,6 @@ Accepted value: Numeric value from 0 to 3600. 154, 11 154, 11 - - 162, 20 - 162, 20 - Close to Systray 關閉至系統匣 @@ -2454,6 +2436,50 @@ Accepted value: Numeric value from 0 to 100. Microsoft Sans Serif, 8.25pt, style=Italic Microsoft Sans Serif, 8.25pt, style=Italic + + Right + Right + + + True + True + + + 251, 102 + 251, 102 + + + 49, 13 + 49, 13 + + + 20 + 20 + + + Seconds + Seconds + + + 154, 100 + 154, 100 + + + 91, 20 + 91, 20 + + + 19 + 19 + + + How often WinNUT refreshes data from the NUT server. + How often WinNUT refreshes data from the NUT server. + + + False + False + diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf index d3f43bc..d952c46 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf @@ -6,18 +6,6 @@ - - 154, 101 - 154, 101 - - - 162, 20 - 162, 20 - - - 12 - 12 - 154, 71 154, 71 @@ -1234,12 +1222,6 @@ 17, 17 17, 17 - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - UPS name to monitor. Accepted Value: Name of the UPS configured in the Nut server. @@ -1557,6 +1539,50 @@ Accepted value: Numeric value from 0 to 100. Microsoft Sans Serif, 8.25pt, style=Italic Microsoft Sans Serif, 8.25pt, style=Italic + + Right + Right + + + True + True + + + 251, 102 + 251, 102 + + + 49, 13 + 49, 13 + + + 20 + 20 + + + Seconds + Seconds + + + 154, 100 + 154, 100 + + + 91, 20 + 91, 20 + + + 19 + 19 + + + How often WinNUT refreshes data from the NUT server. + How often WinNUT refreshes data from the NUT server. + + + False + False + @@ -1846,9 +1872,9 @@ Ini File Moved to {0}.old Windows standby. WinNUT will disconnect. Windows Standby. WinNUT wird getrennt. - + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Previous preferences data detected in the Registry. diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf index 9b38c04..8425598 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf @@ -6,18 +6,6 @@ - - 154, 101 - 154, 101 - - - 162, 20 - 162, 20 - - - 12 - 12 - 154, 71 154, 71 @@ -1237,12 +1225,6 @@ inférieur à 17, 17 17, 17 - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - UPS name to monitor. Accepted Value: Name of the UPS configured in the Nut server. @@ -1577,6 +1559,50 @@ Valeur acceptée: valeur numérique de 0 à 100. Microsoft Sans Serif, 8.25pt, style=Italic Microsoft Sans Serif, 8.25pt, style=Italic + + Right + Right + + + True + True + + + 251, 102 + 251, 102 + + + 49, 13 + 49, 13 + + + 20 + 20 + + + Seconds + Seconds + + + 154, 100 + 154, 100 + + + 91, 20 + 91, 20 + + + 19 + 19 + + + How often WinNUT refreshes data from the NUT server. + How often WinNUT refreshes data from the NUT server. + + + False + False + @@ -1870,9 +1896,9 @@ Fichier Ini déplacé vers {0}.old Windows standby. WinNUT will disconnect. Mise en veille de Windows. WinNUT va se déconnecter. - + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Previous preferences data detected in the Registry. diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf index 595f9e5..3b0b095 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf @@ -783,9 +783,9 @@ Cancel to Save Msi and Install Later ..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Previous preferences data detected in the Registry. @@ -1276,24 +1276,6 @@ along with this program. If not, see https://www.gnu.org/licenses/. Login Логин - - 154, 101 - 154, 101 - - - 162, 20 - 162, 20 - - - 12 - 12 - - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - 154, 71 154, 71 @@ -2476,6 +2458,50 @@ Accepted value: Numeric value from 0 to 100. Microsoft Sans Serif, 8.25pt, style=Italic Microsoft Sans Serif, 8.25pt, style=Italic + + Right + Right + + + True + True + + + 251, 102 + 251, 102 + + + 49, 13 + 49, 13 + + + 20 + 20 + + + Seconds + Seconds + + + 154, 100 + 154, 100 + + + 91, 20 + 91, 20 + + + 19 + 19 + + + How often WinNUT refreshes data from the NUT server. + How often WinNUT refreshes data from the NUT server. + + + False + False + diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf index 985823b..d9410c0 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf @@ -783,9 +783,9 @@ Cancel to Save Msi and Install Later Windows standby. WinNUT will disconnect. Windows 待机。WinNUT 将断开连接。 - + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Previous preferences data detected in the Registry. @@ -1440,24 +1440,6 @@ Accepted value: Numeric value from 0 to 999. Login 登录 - - 154, 101 - 154, 101 - - - 162, 20 - 162, 20 - - - 12 - 12 - - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - 从NUT服务器更新数据时间间隔（单位：毫秒）。 -最小值: 100, 最大值: 60 000。 - 154, 71 154, 71 @@ -2475,6 +2457,50 @@ Accepted value: Numeric value from 0 to 100. Microsoft Sans Serif, 8.25pt, style=Italic Microsoft Sans Serif, 8.25pt, style=Italic + + Right + Right + + + True + True + + + 251, 102 + 251, 102 + + + 49, 13 + 49, 13 + + + 20 + 20 + + + Seconds + Seconds + + + 154, 100 + 154, 100 + + + 91, 20 + 91, 20 + + + 19 + 19 + + + How often WinNUT refreshes data from the NUT server. + How often WinNUT refreshes data from the NUT server. + + + False + False + diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb index 2abee65..18a237e 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb @@ -26,12 +26,13 @@ Partial Class Pref_Gui Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Pref_Gui)) Me.TabControl_Options = New System.Windows.Forms.TabControl() Me.Tab_Connexion = New System.Windows.Forms.TabPage() + Me.pollingIntervalUnitLabel = New System.Windows.Forms.Label() + Me.pollingIntervalValue = New System.Windows.Forms.NumericUpDown() Me.Tb_Pwd_Nut = New System.Windows.Forms.TextBox() Me.Tb_Login_Nut = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Lbl_Pwd_Nut = New System.Windows.Forms.Label() Me.Lbl_Login_Nut = New System.Windows.Forms.Label() - Me.Tb_Delay_Com = New System.Windows.Forms.TextBox() Me.Tb_UPS_Name = New System.Windows.Forms.TextBox() Me.Tb_Port = New System.Windows.Forms.TextBox() Me.Tb_Server_IP = New System.Windows.Forms.TextBox() @@ -96,6 +97,7 @@ Partial Class Pref_Gui Me.Pref_TlTip = New System.Windows.Forms.ToolTip(Me.components) Me.TabControl_Options.SuspendLayout() Me.Tab_Connexion.SuspendLayout() + CType(Me.pollingIntervalValue, System.ComponentModel.ISupportInitialize).BeginInit() Me.Tab_Calibrage.SuspendLayout() Me.Tab_Miscellanous.SuspendLayout() Me.Tab_Shutdown.SuspendLayout() @@ -115,12 +117,13 @@ Partial Class Pref_Gui ' 'Tab_Connexion ' + Me.Tab_Connexion.Controls.Add(Me.pollingIntervalUnitLabel) + Me.Tab_Connexion.Controls.Add(Me.pollingIntervalValue) Me.Tab_Connexion.Controls.Add(Me.Tb_Pwd_Nut) Me.Tab_Connexion.Controls.Add(Me.Tb_Login_Nut) Me.Tab_Connexion.Controls.Add(Me.Label3) Me.Tab_Connexion.Controls.Add(Me.Lbl_Pwd_Nut) Me.Tab_Connexion.Controls.Add(Me.Lbl_Login_Nut) - Me.Tab_Connexion.Controls.Add(Me.Tb_Delay_Com) Me.Tab_Connexion.Controls.Add(Me.Tb_UPS_Name) Me.Tab_Connexion.Controls.Add(Me.Tb_Port) Me.Tab_Connexion.Controls.Add(Me.Tb_Server_IP) @@ -133,6 +136,21 @@ Partial Class Pref_Gui Me.Tab_Connexion.Name = "Tab_Connexion" Me.Tab_Connexion.UseVisualStyleBackColor = True ' + 'pollingIntervalUnitLabel + ' + resources.ApplyResources(Me.pollingIntervalUnitLabel, "pollingIntervalUnitLabel") + Me.pollingIntervalUnitLabel.Name = "pollingIntervalUnitLabel" + ' + 'pollingIntervalValue + ' + Me.pollingIntervalValue.DecimalPlaces = 1 + Me.pollingIntervalValue.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + resources.ApplyResources(Me.pollingIntervalValue, "pollingIntervalValue") + Me.pollingIntervalValue.Minimum = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.pollingIntervalValue.Name = "pollingIntervalValue" + Me.Pref_TlTip.SetToolTip(Me.pollingIntervalValue, resources.GetString("pollingIntervalValue.ToolTip")) + Me.pollingIntervalValue.Value = New Decimal(New Integer() {1, 0, 0, 65536}) + ' 'Tb_Pwd_Nut ' resources.ApplyResources(Me.Tb_Pwd_Nut, "Tb_Pwd_Nut") @@ -161,12 +179,6 @@ Partial Class Pref_Gui resources.ApplyResources(Me.Lbl_Login_Nut, "Lbl_Login_Nut") Me.Lbl_Login_Nut.Name = "Lbl_Login_Nut" ' - 'Tb_Delay_Com - ' - resources.ApplyResources(Me.Tb_Delay_Com, "Tb_Delay_Com") - Me.Tb_Delay_Com.Name = "Tb_Delay_Com" - Me.Pref_TlTip.SetToolTip(Me.Tb_Delay_Com, resources.GetString("Tb_Delay_Com.ToolTip")) - ' 'Tb_UPS_Name ' resources.ApplyResources(Me.Tb_UPS_Name, "Tb_UPS_Name") @@ -602,6 +614,7 @@ Partial Class Pref_Gui Me.TabControl_Options.ResumeLayout(False) Me.Tab_Connexion.ResumeLayout(False) Me.Tab_Connexion.PerformLayout() + CType(Me.pollingIntervalValue, System.ComponentModel.ISupportInitialize).EndInit() Me.Tab_Calibrage.ResumeLayout(False) Me.Tab_Calibrage.PerformLayout() Me.Tab_Miscellanous.ResumeLayout(False) @@ -630,7 +643,6 @@ Partial Class Pref_Gui Friend WithEvents Btn_Cancel As Button Friend WithEvents Tb_Server_IP As TextBox Friend WithEvents Tb_Port As TextBox - Friend WithEvents Tb_Delay_Com As TextBox Friend WithEvents Tb_UPS_Name As TextBox Friend WithEvents Lbl_InputV As Label Friend WithEvents Lbl_BattV As Label @@ -684,4 +696,6 @@ Partial Class Pref_Gui Friend WithEvents Lbl_Pwd_Nut As Label Friend WithEvents Lbl_Login_Nut As Label Friend WithEvents CB_Follow_FSD As CheckBox + Friend WithEvents pollingIntervalUnitLabel As Label + Private WithEvents pollingIntervalValue As NumericUpDown End Class diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx index 81e0624..d8d141b 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx @@ -297,4 +297,31 @@ Microsoft Sans Serif, 8.25pt, style=Italic + + Right + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + 154, 100 + + + 91, 20 + + + 19 + + + False + \ No newline at end of file diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx index d627b9b..1ad13ea 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx @@ -317,4 +317,31 @@ Valeur acceptée: valeur numérique de 0 à 100. Microsoft Sans Serif, 8.25pt, style=Italic + + Right + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + 154, 100 + + + 91, 20 + + + 19 + + + False + \ No newline at end of file diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.resx index 5f1c57b..2a95068 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.resx @@ -117,11 +117,69 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Right + + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + Seconds + + + pollingIntervalUnitLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Connexion + + + 0 + + + 154, 100 + + + 91, 20 + + + 19 + + + 17, 17 + + + How often WinNUT refreshes data from the NUT server. + + + pollingIntervalValue + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Connexion + + + 1 + 154, 191 - * @@ -131,9 +189,6 @@ 17 - - 17, 17 - NUT server login password @@ -147,7 +202,7 @@ Tab_Connexion - 0 + 2 154, 161 @@ -171,12 +226,11 @@ Tab_Connexion - 1 + 3 True - NoControl @@ -202,7 +256,7 @@ Tab_Connexion - 2 + 4 True @@ -232,7 +286,7 @@ Tab_Connexion - 3 + 5 True @@ -262,32 +316,7 @@ Tab_Connexion - 4 - - - 154, 101 - - - 162, 20 - - - 12 - - - Milliseconds between data updates from NUT server. -Min: 100, Max: 60 000. - - - Tb_Delay_Com - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Tab_Connexion - - - 5 + 6 154, 71 @@ -312,7 +341,7 @@ Accepted Value: Name of the UPS configured in the Nut server. Tab_Connexion - 6 + 7 154, 41 @@ -340,7 +369,7 @@ Accepted value: Numeric value from 1 to 65535. Tab_Connexion - 7 + 8 154, 11 @@ -365,7 +394,7 @@ Accepted value: IPV4 / IPV6 / FQDN address. Tab_Connexion - 8 + 9 True @@ -401,7 +430,7 @@ Accepted value: IPV4 / IPV6 / FQDN address. Tab_Connexion - 9 + 10 True @@ -428,7 +457,7 @@ Accepted value: IPV4 / IPV6 / FQDN address. Tab_Connexion - 10 + 11 True @@ -439,107 +468,782 @@ Accepted value: IPV4 / IPV6 / FQDN address. 60, 13 - - 9 + + 9 + + + UPS Name + + + Lbl_Name_UPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Connexion + + + 12 + + + True + + + 6, 42 + + + 52, 13 + + + 7 + + + NUT Port + + + Lbl_Port + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Connexion + + + 13 + + + True + + + 6, 12 + + + 53, 13 + + + 5 + + + NUT host + + + MiddleCenter + + + Lbl_Server_IP + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Connexion + + + 14 + + + 4, 22 + + + 3, 3, 3, 3 + + + 322, 234 + + + 0 + + + Connection + + + Tab_Connexion + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl_Options + + + 0 + + + Cbx_Freq_Input + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 0 + + + Tb_BattV_Max + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 1 + + + Tb_OutV_Max + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 2 + + + Tb_InF_Max + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 3 + + + Tb_BattV_Min + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 4 + + + Tb_OutV_Min + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 5 + + + Tb_InF_Min + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 6 + + + Tb_InV_Max + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 7 + + + Tb_InV_Min + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 8 + + + Lbl_Maxi + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 9 + + + Lbl_Mini + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 10 + + + Lbl_BattV + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 11 + + + Lbl_LoadUPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 12 + + + Lbl_OutputV + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 13 + + + Lbl_InputF + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 14 + + + Lbl_PowerF + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 15 + + + Lbl_InputV + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Calibrage + + + 16 + + + 4, 22 + + + 3, 3, 3, 3 + + + 322, 234 + + + 1 + + + Calibration + + + Tab_Calibrage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl_Options + + + 1 + + + Cbx_LogLevel + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 0 + + + Btn_DeleteLog + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 1 + + + Btn_ViewLog + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 2 + + + Lbl_LevelLog + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 3 + + + CB_Use_Logfile + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 4 + + + CB_Start_W_Win + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 5 + + + CB_Close_Tray + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 6 + + + CB_Start_Mini + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 7 + + + CB_Systray + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Miscellanous + + + 8 + + + 4, 22 + + + 322, 234 + + + 3 + + + Miscellanous + + + Tab_Miscellanous + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl_Options + + + 2 + + + CB_Follow_FSD + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 0 + + + Lbl_Percent + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 1 + + + Tb_GraceTime + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 2 + + + Cb_ExtendTime + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 3 + + + Tb_Delay_Stop + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 4 + + + Cbx_TypeStop + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 5 + + + Cb_ImmediateStop + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 6 + + + Tb_BattLimit_Time + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 7 + + + Tb_BattLimit_Load + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 8 + + + Lbl_GraceTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 9 + + + Lbl_Delay_Stop + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 10 + + + Lbl_StopType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 11 + + + Lbl_BattLimit_Time + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 12 + + + Lbl_BattLimit_Load + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Shutdown + + + 13 + + + 4, 22 + + + 0, 0, 0, 0 + + + 322, 234 + + + 2 + + + Shutdown Options + + + Tab_Shutdown + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl_Options + + + 3 + + + Cbx_Branch_Update + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Update + + + 0 + + + Cbx_Delay_Verif + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tab_Update - - UPS Name + + 1 - - Lbl_Name_UPS + + Lbl_Branch_Update - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Tab_Connexion - - - 11 + + Tab_Update - - True + + 2 - - 6, 42 + + Lbl_Delay_Verif - - 52, 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + Tab_Update - - NUT Port + + 3 - - Lbl_Port + + Cb_Update_At_Start - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Tab_Connexion + + Tab_Update - - 12 + + 4 - - True + + Cb_Verify_Update - - 6, 12 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 53, 13 + + Tab_Update - + 5 - - NUT host + + 4, 22 - - MiddleCenter + + 322, 234 - - Lbl_Server_IP + + 4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Update - - Tab_Connexion + + Tab_Update - - 13 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 22 + + TabControl_Options - - 3, 3, 3, 3 + + 4 - - 322, 234 + + 12, 12 - - 0 + + 330, 260 - - Connection + + 4 - - Tab_Connexion + + TabControl_Options - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl_Options + + $this - - 0 + + 3 50 @@ -1002,33 +1706,6 @@ Accepted value: Numeric value from 0 to 999. 16 - - 4, 22 - - - 3, 3, 3, 3 - - - 322, 234 - - - 1 - - - Calibration - - - Tab_Calibrage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl_Options - - - 1 - Notice @@ -1338,30 +2015,6 @@ Accepted value: Numeric value from 0 to 999. 8 - - 4, 22 - - - 322, 234 - - - 3 - - - Miscellanous - - - Tab_Miscellanous - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl_Options - - - 2 - True @@ -1770,33 +2423,6 @@ Accepted value: Numeric value from 0 to 100. 13 - - 4, 22 - - - 0, 0, 0, 0 - - - 322, 234 - - - 2 - - - Shutdown Options - - - Tab_Shutdown - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl_Options - - - 3 - Stable @@ -1986,51 +2612,6 @@ Accepted value: Numeric value from 0 to 100. 5 - - 4, 22 - - - 322, 234 - - - 4 - - - Update - - - Tab_Update - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl_Options - - - 4 - - - 12, 12 - - - 330, 260 - - - 4 - - - TabControl_Options - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 105, 278 @@ -2055,6 +2636,9 @@ Accepted value: Numeric value from 0 to 100. 2 + + False + 186, 278 diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx index 663329c..64d20c1 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx @@ -314,4 +314,31 @@ IPV4 / IPV6 / доменное имя. Microsoft Sans Serif, 8.25pt, style=Italic + + Right + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + 154, 100 + + + 91, 20 + + + 19 + + + False + \ No newline at end of file diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.vb b/WinNUT_V2/WinNUT-Client/Pref_Gui.vb index 42afa2f..118b2b0 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.vb +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.vb @@ -8,15 +8,13 @@ ' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY Imports LogLvl = WinNUT_Client_Common.LogLvl -Imports System.IO Imports WinNUT_Client_Common Public Class Pref_Gui Private IsShowed As Boolean = False Private PrefsModified As Boolean = False - ' Indicate that parameters have been saved (and if one or more were changed) - Public Event SavedPreferences(isModified As Boolean) + Public Event SavedPreferences() Private Sub Btn_Cancel_Click(sender As Object, e As EventArgs) Handles Btn_Cancel.Click LogFile.LogTracing("Close Pref Gui from Button Cancel", LogLvl.LOG_DEBUG, Me) @@ -25,12 +23,11 @@ Public Class Pref_Gui Private Sub Save_Params() Try - ' PrefsModified = False LogFile.LogTracing("Save Parameters.", LogLvl.LOG_DEBUG, Me) My.Settings.NUT_ServerAddress = Tb_Server_IP.Text My.Settings.NUT_ServerPort = CInt(Tb_Port.Text) My.Settings.NUT_UPSName = Tb_UPS_Name.Text - My.Settings.NUT_PollIntervalMsec = CInt(Tb_Delay_Com.Text) + My.Settings.NUT_PollIntervalMsec = CInt(pollingIntervalValue.Value * 1000D) My.Settings.NUT_Username = Tb_Login_Nut.Text My.Settings.NUT_Password = Tb_Pwd_Nut.Text My.Settings.NUT_AutoReconnect = Cb_Reconnect.Checked @@ -75,20 +72,22 @@ Public Class Pref_Gui End If End If - RaiseEvent SavedPreferences(PrefsModified) + RaiseEvent SavedPreferences() SetLogControlsStatus() LogFile.LogTracing("Preferences Saved", LogLvl.LOG_NOTICE, Me) - ' PrefsModified = True + PrefsModified = False Catch e As Exception - ' PrefsModified = False + LogFile.LogTracing("Error when trying to save preferences.", LogLvl.LOG_ERROR, Me) + LogFile.LogException(e, Me) + MessageBox.Show(e.ToString(), "Error while saving") End Try End Sub Private Sub Btn_Apply_Click(sender As Object, e As EventArgs) Handles Btn_Apply.Click Save_Params() - If PrefsModified Then + If Not PrefsModified Then Btn_Apply.Enabled = False End If End Sub @@ -106,7 +105,7 @@ Public Class Pref_Gui Tb_Server_IP.Text = My.Settings.NUT_ServerAddress Tb_Port.Text = My.Settings.NUT_ServerPort Tb_UPS_Name.Text = My.Settings.NUT_UPSName - Tb_Delay_Com.Text = My.Settings.NUT_PollIntervalMsec + pollingIntervalValue.Value = My.Settings.NUT_PollIntervalMsec / 1000D Tb_Login_Nut.Text = My.Settings.NUT_Username Tb_Pwd_Nut.Text = My.Settings.NUT_Password Cb_Reconnect.Checked = My.Settings.NUT_AutoReconnect @@ -178,7 +177,8 @@ Public Class Pref_Gui AddHandler CmbBox.SelectedIndexChanged, AddressOf Event_Ctrl_Value_Changed Next Next - Btn_Apply.Enabled = False + AddHandler pollingIntervalValue.ValueChanged, AddressOf Event_Ctrl_Value_Changed + SetLogControlsStatus() IsShowed = True LogFile.LogTracing("Pref Gui Opened.", LogLvl.LOG_DEBUG, Me) @@ -229,7 +229,7 @@ Public Class Pref_Gui End If End Sub - Private Sub Number_Validating(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles Tb_Port.Validating, Tb_OutV_Min.Validating, Tb_OutV_Max.Validating, Tb_InV_Min.Validating, Tb_InV_Max.Validating, Tb_InF_Min.Validating, Tb_InF_Max.Validating, Tb_GraceTime.Validating, Tb_Delay_Stop.Validating, Tb_Delay_Com.Validating, Tb_BattV_Min.Validating, Tb_BattV_Max.Validating, Tb_BattLimit_Time.Validating, Tb_BattLimit_Load.Validating + Private Sub Number_Validating(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles Tb_Port.Validating, Tb_OutV_Min.Validating, Tb_OutV_Max.Validating, Tb_InV_Min.Validating, Tb_InV_Max.Validating, Tb_InF_Min.Validating, Tb_InF_Max.Validating, Tb_GraceTime.Validating, Tb_Delay_Stop.Validating, Tb_BattV_Min.Validating, Tb_BattV_Max.Validating, Tb_BattLimit_Time.Validating, Tb_BattLimit_Load.Validating If IsShowed Then Dim StrTest As String = sender.Text Dim Result As Object = 0 @@ -237,9 +237,6 @@ Public Class Pref_Gui LogFile.LogTracing(String.Format("Check that the value of {0} for {1} is correct.", sender.Text, sender.Name), LogLvl.LOG_DEBUG, Me) Select Case sender.Name - Case "Tb_Delay_Com" - MinValue = 100 - MaxValue = 60000 Case "Tb_Port" MinValue = 1 MaxValue = 65536 diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx index 3cdf9a3..0f0a667 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx @@ -101,10 +101,6 @@ 登录 - - 从NUT服务器更新数据时间间隔（单位：毫秒）。 -最小值: 100, 最大值: 60 000。 - 监控的 UPS 名称。 允许值：在 UPS 的 Nut 服务端所配置的名称。 @@ -323,4 +319,31 @@ Microsoft Sans Serif, 8.25pt, style=Italic + + Right + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + 154, 100 + + + 91, 20 + + + 19 + + + False + \ No newline at end of file diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-TW.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-TW.resx index f48b1c8..6b14f76 100644 --- a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-TW.resx +++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-TW.resx @@ -291,4 +291,31 @@ Microsoft Sans Serif, 8.25pt, style=Italic + + Right + + + True + + + 251, 102 + + + 49, 13 + + + 20 + + + 154, 100 + + + 91, 20 + + + 19 + + + False + \ No newline at end of file diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.vb b/WinNUT_V2/WinNUT-Client/WinNUT.vb index 783747c..1cab472 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.vb +++ b/WinNUT_V2/WinNUT-Client/WinNUT.vb @@ -637,15 +637,6 @@ Public Class WinNUT End If End Sub - 'TODO: FIX - 'Public Shared Sub Event_ReConnected() Handles UPS_Device.ReConnected - ' With WinNUT - ' .Update_Data.Start() - ' .Device_Data = .UPS_Device.Retrieve_UPS_Datas() - ' .Update_UPS_Data() - ' End With - 'End Sub - Private Sub Update_UPS_Data() Handles UPS_Device.DataUpdated LogFile.LogTracing("Updating UPS data for Form.", LogLvl.LOG_DEBUG, Me)