Skip to content

Commit f00861f

Browse files
gawindxgawindx
committed
Battery State in GUI
Addition of a small signage icon indicating if the battery is in Charge / Discharge / Charged state. When the status is unknown (Connection not established or lost), no status is displayed.
1 parent db7674b commit f00861f

16 files changed

+209
-31
lines changed

‎WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.de-DE.xlf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15563,6 +15563,18 @@ Ini-Datei nach {0}.old verschoben</target>
1556315563
<source>Stop condition imposed by the NUT server</source>
1556415564
<target state="final">Vom NUT-Server auferlegte Stoppbedingung</target>
1556515565
</trans-unit>
15566+
<trans-unit id="Battery_Charged" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15567+
<source>..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15568+
<target state="final">..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15569+
</trans-unit>
15570+
<trans-unit id="Battery_Charging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15571+
<source>..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15572+
<target state="final">..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15573+
</trans-unit>
15574+
<trans-unit id="Battery_Discharging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15575+
<source>..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15576+
<target state="final">..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15577+
</trans-unit>
1556615578
</group>
1556715579
</body>
1556815580
</file>
@@ -44216,6 +44228,18 @@ Ini-Datei nach {0}.old verschoben</target>
4421644228
<source>Import Ini File (v1.x)</source>
4421744229
<target state="final">Ini-Datei importieren (v1.x)</target>
4421844230
</trans-unit>
44231+
<trans-unit id="PBox_Battery_State.Location" translate="no" xml:space="preserve" extype="System.Drawing.Point, System.Drawing">
44232+
<source>132, 10</source>
44233+
<target state="final">132, 10</target>
44234+
</trans-unit>
44235+
<trans-unit id="PBox_Battery_State.Size" translate="no" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
44236+
<source>24, 24</source>
44237+
<target state="final">24, 24</target>
44238+
</trans-unit>
44239+
<trans-unit id="PBox_Battery_State.TabIndex" translate="no" xml:space="preserve" extype="System.Int32, mscorlib">
44240+
<source>2</source>
44241+
<target state="final">2</target>
44242+
</trans-unit>
4421944243
</group>
4422044244
</body>
4422144245
</file>

‎WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.fr-FR.xlf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15564,6 +15564,18 @@ Fichier Ini déplacé vers {0}.old</target>
1556415564
<source>Stop condition imposed by the NUT server</source>
1556515565
<target state="final">Condition d'arrêt forcée signalée par le serveur NUT</target>
1556615566
</trans-unit>
15567+
<trans-unit id="Battery_Charged" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15568+
<source>..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15569+
<target state="final">..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15570+
</trans-unit>
15571+
<trans-unit id="Battery_Charging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15572+
<source>..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15573+
<target state="final">..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15574+
</trans-unit>
15575+
<trans-unit id="Battery_Discharging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
15576+
<source>..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
15577+
<target state="final">..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
15578+
</trans-unit>
1556715579
</group>
1556815580
</body>
1556915581
</file>
@@ -44217,6 +44229,18 @@ Fichier Ini déplacé vers {0}.old</target>
4421744229
<source>Import Ini File (v1.x)</source>
4421844230
<target state="final">Import Fichier Ini (v1.x)</target>
4421944231
</trans-unit>
44232+
<trans-unit id="PBox_Battery_State.Location" translate="no" xml:space="preserve" extype="System.Drawing.Point, System.Drawing">
44233+
<source>132, 10</source>
44234+
<target state="final">132, 10</target>
44235+
</trans-unit>
44236+
<trans-unit id="PBox_Battery_State.Size" translate="no" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
44237+
<source>24, 24</source>
44238+
<target state="final">24, 24</target>
44239+
</trans-unit>
44240+
<trans-unit id="PBox_Battery_State.TabIndex" translate="no" xml:space="preserve" extype="System.Int32, mscorlib">
44241+
<source>2</source>
44242+
<target state="final">2</target>
44243+
</trans-unit>
4422044244
</group>
4422144245
</body>
4422244246
</file>

‎WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.zh-CN.xlf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,18 @@ Cancel to Save Msi and Install Later</source>
763763
<source>Stop condition imposed by the NUT server</source>
764764
<target state="final">NUT服务器施加的停止条件</target>
765765
</trans-unit>
766+
<trans-unit id="Battery_Charged" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
767+
<source>..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
768+
<target state="final">..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
769+
</trans-unit>
770+
<trans-unit id="Battery_Charging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
771+
<source>..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
772+
<target state="final">..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
773+
</trans-unit>
774+
<trans-unit id="Battery_Discharging" translate="no" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
775+
<source>..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
776+
<target state="final">..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
777+
</trans-unit>
766778
</group>
767779
</body>
768780
</file>
@@ -58435,6 +58447,18 @@ Accepted value: Numeric value from 0 to 100.</source>
5843558447
<source>58</source>
5843658448
<target state="final">58</target>
5843758449
</trans-unit>
58450+
<trans-unit id="PBox_Battery_State.Location" translate="no" xml:space="preserve" extype="System.Drawing.Point, System.Drawing">
58451+
<source>132, 10</source>
58452+
<target state="final">132, 10</target>
58453+
</trans-unit>
58454+
<trans-unit id="PBox_Battery_State.Size" translate="no" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
58455+
<source>24, 24</source>
58456+
<target state="final">24, 24</target>
58457+
</trans-unit>
58458+
<trans-unit id="PBox_Battery_State.TabIndex" translate="no" xml:space="preserve" extype="System.Int32, mscorlib">
58459+
<source>2</source>
58460+
<target state="final">2</target>
58461+
</trans-unit>
5843858462
</group>
5843958463
</body>
5844058464
</file>

‎WinNUT_V2/WinNUT_GUI/My Project/Resources.Designer.vb‎

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

‎WinNUT_V2/WinNUT_GUI/My Project/Resources.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,15 @@
199199
<data name="App_Event_Str_01" xml:space="preserve">
200200
<value>Application shut down at</value>
201201
</data>
202+
<data name="Battery_Charged" type="System.Resources.ResXFileRef, System.Windows.Forms">
203+
<value>..\Resources\Battery_Charged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
204+
</data>
205+
<data name="Battery_Charging" type="System.Resources.ResXFileRef, System.Windows.Forms">
206+
<value>..\Resources\Battery_Charging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
207+
</data>
208+
<data name="Battery_Discharging" type="System.Resources.ResXFileRef, System.Windows.Forms">
209+
<value>..\Resources\Battery_Discharging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
210+
</data>
202211
<data name="Delete_LogFile_24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
203212
<value>..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
204213
</data>

‎WinNUT_V2/WinNUT_GUI/Resources/Battery_Charged.png‎

892 Bytes
Loading

‎WinNUT_V2/WinNUT_GUI/Resources/Battery_Charging.png‎

930 Bytes
Loading

‎WinNUT_V2/WinNUT_GUI/Resources/Battery_Discharging.png‎

880 Bytes
Loading

‎WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@
137137
</Compile>
138138
<Compile Include="ApplicationEvents.vb" />
139139
<Compile Include="CryptData.vb" />
140+
<Compile Include="My Project\Resources.Designer.vb">
141+
<AutoGen>True</AutoGen>
142+
<DesignTime>True</DesignTime>
143+
<DependentUpon>Resources.resx</DependentUpon>
144+
</Compile>
140145
<Compile Include="ToastPopup.vb" />
141146
<Compile Include="CProgressBar.vb">
142147
<SubType>Component</SubType>
@@ -183,11 +188,6 @@
183188
<DependentUpon>Application.myapp</DependentUpon>
184189
<DesignTime>True</DesignTime>
185190
</Compile>
186-
<Compile Include="My Project\Resources.Designer.vb">
187-
<AutoGen>True</AutoGen>
188-
<DesignTime>True</DesignTime>
189-
<DependentUpon>Resources.resx</DependentUpon>
190-
</Compile>
191191
<Compile Include="My Project\Settings.Designer.vb">
192192
<AutoGen>True</AutoGen>
193193
<DependentUpon>Settings.settings</DependentUpon>
@@ -270,9 +270,9 @@
270270
</EmbeddedResource>
271271
<EmbeddedResource Include="My Project\Resources.resx">
272272
<Generator>PublicVbMyResourcesResXFileCodeGenerator</Generator>
273-
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
274273
<CustomToolNamespace>My.Resources</CustomToolNamespace>
275274
<SubType>Designer</SubType>
275+
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
276276
</EmbeddedResource>
277277
<EmbeddedResource Include="WinNUT.zh-CN.resx">
278278
<DependentUpon>WinNUT.vb</DependentUpon>
@@ -332,6 +332,9 @@
332332
<None Include="Resources\ups.png" />
333333
<None Include="Resources\ups_104x104.png" />
334334
<None Include="Resources\ups_104x104.bmp" />
335+
<None Include="Resources\Battery_Charged.png" />
336+
<None Include="Resources\Battery_Charging.png" />
337+
<None Include="Resources\Battery_Discharging.png" />
335338
<Content Include="WinNut.ico" />
336339
</ItemGroup>
337340
<ItemGroup>

‎WinNUT_V2/WinNUT_GUI/WinNUT.Designer.vb‎

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

0 commit comments

Comments
 (0)