Skip to content

Resuming from Sleep and other connection fixes #163

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

Merged
merged 7 commits into from
Jul 18, 2024
Merged

Resuming from Sleep and other connection fixes #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82891d5
VS automatic changes to .resx files
gbakeman Jul 1, 2024
f741891
Support Suspend power mode change
gbakeman Jul 1, 2024
47b803e
Removing Form-wide manual update variable
gbakeman Jul 2, 2024
ef93c30
Small socket, power mode changes
gbakeman Jul 2, 2024
031bee4
Login, socket improvements
gbakeman Jul 2, 2024
ef6ce51
More smaller networking bugfixes
gbakeman Jul 3, 2024
4d58c43
Smaller socket updates
gbakeman Jul 15, 2024
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
14 changes: 0 additions & 14 deletions WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Label_License.Text" xml:space="preserve">
<value>This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
by the Free Software Foundation, either version 3 of the License, or
any later version.

This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see https://www.gnu.org/licenses/.</value>
</data>
</root>
22 changes: 16 additions & 6 deletions WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,53 +121,63 @@ Ini 文件重命名为 {0}.old</value>
<data name="XP_Information" xml:space="preserve" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="regedit_exe_14_100_0" xml:space="preserve" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="GitHub_URL" xml:space="preserve">
<value>https://github.com/nutdotnet/WinNUT-Client</value>
</data>
<data name="DetectedPreviousPrefsData" xml:space="preserve">
<value>在注册表中检测到以前的设置数据。</value>
<comment>Notify the user that preferences data from the old system was detected in the Registry hive.</comment>
</data>
<data name="UpgradePrefsDialog_ImportProcedureCompleted" xml:space="preserve">
<value>旧设置已经被导入。</value>
<comment>Notify the user that the import procedure has completed.</comment>
</data>
<data name="UpgradePrefsDialog_UnmatchedPairs" xml:space="preserve">
<value>有 {0} 个未知的设置。请查看日志获取更多详细信息。</value>
<comment>Alert the user to how many unmatched preferences there were {0}.</comment>
</data>
<data name="UpgradePrefsDialog_DeleteProcedureComplete" xml:space="preserve">
<value>旧设置已经从您的注册表中删除。</value>
<comment>Notify the user that the old preferences have been removed from their Registry.</comment>
</data>
<data name="UpgradePrefsDialog_Cancelled" xml:space="preserve">
<value>升级过程已取消：使用默认设置。</value>
<comment>Notify the user that the upgrade dialog was cancelled, and that default settings will be used instead.</comment>
</data>
<data name="UpgradePrefsDialog_BackupLocationTitle" xml:space="preserve">
<value>保存 WinNUT 注册表</value>
<comment>Title of the SaveFileDialog that prompts the user to select the file and location they would like to save their WinNUT Registry preferences to.</comment>
</data>
<data name="UpgradePrefsDialog_BackupProcedureCompleted" xml:space="preserve">
<value>旧设置已备份到 {0}</value>
<comment>Notify the user that the old preferences have been exported to a file, and give the full path with {0}.</comment>
</data>
<data name="UpgradePrefsDialog_ErrorEncountered" xml:space="preserve">
<value>升级过程中发生错误：

{0}

请修复错误，或取消升级对话框以继续使用默认设置。</value>
<comment>Alert the user that an error occurred during the upgrade procedure, attempt to give a brief summary of the error, and prompt them to take the next step.</comment>
</data>
<data name="regedit_exe_14_100_0" xml:space="preserve" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpgradePrefsDialog_NoPrefsExistCaption" xml:space="preserve">
<value>没有检测到设置</value>
<comment>A brief caption for the error message.</comment>
</data>
<data name="UpgradePrefsDialog_NoPrefsExistError" xml:space="preserve">
<value>您的系统中未检测到设置。无法继续操作。</value>
<comment>Alert the user that the dialog is unable to continue, since no preferences are detected in the Registry.</comment>
</data>
<data name="ManageOldPrefsToolstripMenuItem_Disabled_TooltipText" xml:space="preserve">
<value>您的系统中未检测到旧设置。</value>
<comment>Similar to _Enabled tooltip, except that the preferences were not detected.</comment>
</data>
<data name="ManageOldPrefsToolstripMenuItem_Enabled_TooltipText" xml:space="preserve">
<value>检测到旧设置。点击运行导入向导。</value>
<comment>Tooltip of the "manage old prefs" menu item, explaining that the old preferences were detected and that clicking will open the wizard dialog.</comment>
</data>
<data name="VariableUnavailable" xml:space="preserve">
<value>参数无效</value>
<comment>Indicate that a variable is unavailable</comment>
</data>
</root>
20 changes: 7 additions & 13 deletions WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
<data name="Lbl_Login_Nut.Text" xml:space="preserve">
<value>登录</value>
</data>
<data name="Tb_Delay_Com.ToolTip" xml:space="preserve">
<value>从NUT服务器更新数据时间间隔（单位：毫秒）。
最小值: 100, 最大值: 60 000。</value>
</data>
<data name="Tb_UPS_Name.ToolTip" xml:space="preserve">
<value>监控的 UPS 名称。
允许值：在 UPS 的 Nut 服务端所配置的名称。</value>
Expand Down Expand Up @@ -161,6 +165,9 @@
<data name="CB_Use_Logfile.Text" xml:space="preserve">
<value>创建日志文件</value>
</data>
<data name="CB_Use_Logfile.ToolTip" xml:space="preserve">
<value>将日志事件写入文件。</value>
</data>
<data name="CB_Start_W_Win.Text" xml:space="preserve">
<value>随 Windows 启动当前应用</value>
</data>
Expand Down Expand Up @@ -316,17 +323,4 @@
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
</data>
<data name="Cbx_Freq_Input.Items" xml:space="preserve">
<value>50</value>
</data>
<data name="Cbx_Freq_Input.Items1" xml:space="preserve">
<value>60</value>
</data>
<data name="Tb_Delay_Com.ToolTip" xml:space="preserve">
<value>从NUT服务器更新数据时间间隔（单位：毫秒）。
最小值: 100, 最大值: 60 000。</value>
</data>
<data name="CB_Use_Logfile.ToolTip" xml:space="preserve">
<value>将日志事件写入文件。</value>
</data>
</root>
68 changes: 33 additions & 35 deletions WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
<data name="IntroMessage.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="IntroMessage.Text" xml:space="preserve">
<value>WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。</value>
</data>
<data name="OK_Button.Anchor" xml:space="preserve" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Right</value>
</data>
Expand All @@ -57,6 +60,9 @@
<data name="OK_Button.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="OK_Button.Text" xml:space="preserve">
<value>确认</value>
</data>
<data name="Cancel_Button.Anchor" xml:space="preserve" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Right</value>
</data>
Expand All @@ -72,6 +78,9 @@
<data name="Cancel_Button.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="Cancel_Button.Text" xml:space="preserve">
<value>取消</value>
</data>
<data name="ImportSettingsCheckBox.AutoSize" xml:space="preserve" type="System.Boolean, mscorlib">
<value>True</value>
</data>
Expand All @@ -87,6 +96,12 @@
<data name="ImportSettingsCheckBox.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="ImportSettingsCheckBox.Text" xml:space="preserve">
<value>导入</value>
</data>
<data name="ImportSettingsCheckBox.ToolTip" xml:space="preserve">
<value>旧设置将从注册表导入到新的设置系统中。</value>
</data>
<data name="DeleteSettingsCheckBox.AutoSize" xml:space="preserve" type="System.Boolean, mscorlib">
<value>True</value>
</data>
Expand All @@ -102,6 +117,12 @@
<data name="DeleteSettingsCheckBox.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="DeleteSettingsCheckBox.Text" xml:space="preserve">
<value>删除</value>
</data>
<data name="DeleteSettingsCheckBox.ToolTip" xml:space="preserve">
<value>在注册表中检测到旧设置数据。</value>
</data>
<data name="PrevSettngsGroupBox.Anchor" xml:space="preserve" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
Expand All @@ -120,6 +141,12 @@
<data name="BackupSettingsCheckbox.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="BackupSettingsCheckbox.Text" xml:space="preserve">
<value>备份</value>
</data>
<data name="BackupSettingsCheckbox.ToolTip" xml:space="preserve">
<value>旧设置将被导出到文件中。</value>
</data>
<data name="PrevSettngsGroupBox.Location" xml:space="preserve" type="System.Drawing.Point, System.Drawing">
<value>6, 122</value>
</data>
Expand All @@ -132,6 +159,9 @@
<data name="PrevSettngsGroupBox.TabIndex" xml:space="preserve" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="PrevSettngsGroupBox.Text" xml:space="preserve">
<value>以前的设置</value>
</data>
<data name="buttonPanel.Dock" xml:space="preserve" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value>
</data>
Expand Down Expand Up @@ -180,6 +210,9 @@
<data name="$this.StartPosition" xml:space="preserve" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>迁移到新设置格式</value>
</data>
<metadata name="UpgradePrefsDialogModelBindingSource.TrayLocation" xml:space="preserve" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>488, 17</value>
</metadata>
Expand All @@ -195,39 +228,4 @@
<metadata name="$this.TrayHeight" xml:space="preserve" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>44</value>
</metadata>
<data name="IntroMessage.Text" xml:space="preserve">
<value>WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。

</value>
</data>
<data name="OK_Button.Text" xml:space="preserve">
<value>确认</value>
</data>
<data name="Cancel_Button.Text" xml:space="preserve">
<value>取消</value>
</data>
<data name="ImportSettingsCheckBox.Text" xml:space="preserve">
<value>导入</value>
</data>
<data name="ImportSettingsCheckBox.ToolTip" xml:space="preserve">
<value>旧设置将从注册表导入到新的设置系统中。</value>
</data>
<data name="DeleteSettingsCheckBox.Text" xml:space="preserve">
<value>删除</value>
</data>
<data name="DeleteSettingsCheckBox.ToolTip" xml:space="preserve">
<value>在注册表中检测到旧设置数据。</value>
</data>
<data name="BackupSettingsCheckbox.Text" xml:space="preserve">
<value>备份</value>
</data>
<data name="BackupSettingsCheckbox.ToolTip" xml:space="preserve">
<value>旧设置将被导出到文件中。</value>
</data>
<data name="PrevSettngsGroupBox.Text" xml:space="preserve">
<value>以前的设置</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>迁移到新设置格式</value>
</data>
</root>
43 changes: 20 additions & 23 deletions WinNUT_V2/WinNUT-Client/WinNUT.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,6 @@ Imports WinNUT_Client_Common
Public Class WinNUT
#Region "Properties"

Public Property UpdateMethod() As String
Get
If mUpdate Then
mUpdate = False
Return True
Else
Return False
End If
End Get
Set(Value As String)
mUpdate = Value
End Set
End Property

Public WriteOnly Property HasCrashed() As Boolean
Set(Value As Boolean)
WinNUT_Crashed = Value
Expand Down Expand Up @@ -78,7 +64,6 @@ Public Class WinNUT
Public UPS_InputA As Double

Private HasFocus As Boolean = True
Private mUpdate As Boolean = False
Private FormText As String
Private WinNUT_Crashed As Boolean = False

Expand Down Expand Up @@ -345,9 +330,17 @@ Public Class WinNUT
Private Sub SystemEvents_PowerModeChanged(sender As Object, e As Microsoft.Win32.PowerModeChangedEventArgs)
LogFile.LogTracing("PowerModeChangedEvent: " & [Enum].GetName(GetType(Microsoft.Win32.PowerModes), e.Mode), LogLvl.LOG_NOTICE, Me)
Select Case e.Mode
' Note: Windows does not wait for applications to handle a Suspend event.
Case Microsoft.Win32.PowerModes.Suspend
LogFile.LogTracing("Suspending WinNUT operations...", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_GOTOSLEEP))
UPSDisconnect()
Case Microsoft.Win32.PowerModes.Resume
LogFile.LogTracing("Restarting WinNUT after waking up from Windows", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_EXITSLEEP))
If UPS_Device IsNot Nothing AndAlso UPS_Device.IsConnected Then
LogFile.LogTracing("Trying to disconnect connected UPS after system resume...", LogLvl.LOG_NOTICE, Me)
UPSDisconnect()
End If
If My.Settings.NUT_AutoReconnect Then
LogFile.LogTracing("Reconnecting after system resume.", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_EXITSLEEP))
UPS_Connect(True)
End If
End Select
Expand Down Expand Up @@ -395,7 +388,7 @@ Public Class WinNUT
''' <summary>
''' Prepare the form to begin receiving data from a connected UPS.
''' </summary>
Private Sub UPSReady(nutUps As UPS_Device) Handles UPS_Device.Connected, UPS_Device.ReConnected
Private Sub UPSReady(nutUps As UPS_Device) Handles UPS_Device.Connected
Dim upsConf = nutUps.Nut_Config
LogFile.LogTracing(upsConf.UPSName & " has indicated it's ready to start sending data.", LogLvl.LOG_DEBUG, Me)

Expand All @@ -413,11 +406,15 @@ Public Class WinNUT
LogFile.LogTracing("Connection to Nut Host Established", LogLvl.LOG_NOTICE, Me,
String.Format(StrLog.Item(AppResxStr.STR_LOG_CONNECTED),
upsConf.Host, upsConf.Port))

If Not String.IsNullOrEmpty(upsConf.Login) Then
UPS_Device.Login()
End If
End Sub

Private Sub ConnectionError(sender As UPS_Device, ex As Exception) Handles UPS_Device.ConnectionError
LogFile.LogTracing(String.Format("Something went wrong connecting to UPS {0}. IsConnected: {1}, IsAuthenticated: {2}",
sender.Name, sender.IsConnected, sender.IsAuthenticated), LogLvl.LOG_ERROR, Me,
LogFile.LogTracing(String.Format("Something went wrong connecting to UPS {0}. IsConnected: {1}, IsLoggedIn: {2}",
sender.Name, sender.IsConnected, sender.IsLoggedIn), LogLvl.LOG_ERROR, Me,
String.Format(StrLog.Item(AppResxStr.STR_LOG_CON_FAILED), sender.Nut_Config.Host, sender.Nut_Config.Port,
ex.Message))
End Sub
Expand Down Expand Up @@ -599,7 +596,8 @@ Public Class WinNUT
Event_Unknown_UPS()
End If

LogFile.LogTracing("NUT protocol error encoutnered:" + vbNewLine + ex.ToString(), LogLvl.LOG_NOTICE, sender)
LogFile.LogTracing("NUT protocol error encoutnered:", LogLvl.LOG_NOTICE, sender)
LogFile.LogException(ex, Me)
End Sub

Public Sub Event_Unknown_UPS() ' Handles UPS_Device.Unknown_UPS
Expand All @@ -626,7 +624,7 @@ Public Class WinNUT
End Sub

Public Shared Sub Event_ChangeStatus() Handles Me.On_Battery, Me.On_Line,
UPS_Device.Lost_Connect, UPS_Device.Connected, UPS_Device.Disconnected, UPS_Device.New_Retry, UPS_Device.ReConnected
UPS_Device.Lost_Connect, UPS_Device.Connected, UPS_Device.Disconnected, UPS_Device.New_Retry
', UPS_Device.Unknown_UPS
', UPS_Device.InvalidLogin

Expand Down Expand Up @@ -1045,12 +1043,11 @@ Public Class WinNUT
End Sub

Private Sub Menu_Update_Click(sender As Object, e As EventArgs) Handles Menu_Update.Click
mUpdate = True
'Dim th As System.Threading.Thread = New Threading.Thread(New System.Threading.ParameterizedThreadStart(AddressOf Run_Update))
'th.SetApartmentState(System.Threading.ApartmentState.STA)
'th.Start(Me.UpdateMethod)
LogFile.LogTracing("Open About Gui From Menu", LogLvl.LOG_DEBUG, Me)
Dim Update_Frm = New Update_Gui(mUpdate)
Dim Update_Frm = New Update_Gui(True)
Update_Frm.Activate()
Update_Frm.Visible = True
HasFocus = False
Expand Down
9 changes: 0 additions & 9 deletions WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,6 @@
<data name="ManageOldPrefsToolStripMenuItem.Enabled" xml:space="preserve" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="NotifyIcon.Text" xml:space="preserve">
<value>NotifyIcon1</value>
</data>
<data name="Main_Menu.Text" xml:space="preserve">
<value>MenuStrip1</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>WinNUT Client</value>
</data>
<data name="ManageOldPrefsToolStripMenuItem.Text" xml:space="preserve">
<value>管理旧设置...</value>
</data>
Expand Down
Loading
Loading