Skip to content

Commit e70c718

Browse files
committed
UPS var calculation logic fix, pref upgrade fixes
- Fixed some inverted logic for battery charge calculations - Restructured how old pref checking is handled in WinNUT.vb. Menu item now disables correctly once the prefs have been removed.
1 parent 4dfc291 commit e70c718

File tree

5 files changed

+262
-590
lines changed

5 files changed

+262
-590
lines changed

WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb

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

WinNUT_V2/WinNUT-Client/My Project/Resources.resx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,14 @@ Cancel to Save Msi and Install Later</value>
321321
<data name="Log_Str_12" xml:space="preserve">
322322
<value>Stop condition imposed by the NUT server</value>
323323
</data>
324+
<data name="ManageOldPrefsToolstripMenuItem_Disabled_TooltipText" xml:space="preserve">
325+
<value>Old preferences were not detected in your system.</value>
326+
<comment>Similar to _Enabled tooltip, except that the preferences were not detected.</comment>
327+
</data>
328+
<data name="ManageOldPrefsToolstripMenuItem_Enabled_TooltipText" xml:space="preserve">
329+
<value>Old preferences detected. Click to run the import wizard.</value>
330+
<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>
331+
</data>
324332
<data name="regedit_exe_14_100_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
325333
<value>..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
326334
</data>

0 commit comments

Comments
 (0)