Skip to content

Commit 09965f9

Browse files
gbakemangbakeman
committed
WinNUT UI tweaks w.r.t connections
- Add IsUPSConnected property to main WinNUT form for easier connection state checking - Removed unused AutoReconnect boolean - Added SettingsPropertyChanged method to activate when a setting is changed, allowing the UI to update any relevant states. - Added UpdateMainMenuState which allows the main menu's state to be updated conveniently and consistently from anywhere in the WinNUT UI code (replaces the UpdateManageOldPrefsMenuItemStatus subroutine.) - Reorganized the Connection menu, renaming the (Re)connect command, and adding a Persist toggle that controls the auto reconnection feature. Adding some graphics, and better control over the menu item's enabled state. - Visual Studio designer deciding to move designer code around for no apparent reason
1 parent 218f45a commit 09965f9

27 files changed

+2023
-986
lines changed

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf‎

Lines changed: 76 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
859859
<target state="new">Unavailable</target>
860860
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
861861
</trans-unit>
862+
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
863+
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
864+
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
865+
</trans-unit>
866+
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
867+
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
868+
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
869+
</trans-unit>
870+
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
871+
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
872+
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
873+
</trans-unit>
862874
</group>
863875
</body>
864876
</file>
@@ -2562,8 +2574,8 @@ Accepted value: Numeric value from 0 to 100.</source>
25622574
<target state="translated">UPS 變數</target>
25632575
</trans-unit>
25642576
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2565-
<source>180, 22</source>
2566-
<target state="final">180, 22</target>
2577+
<source>177, 22</source>
2578+
<target state="final">177, 22</target>
25672579
</trans-unit>
25682580
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
25692581
<source>Exit</source>
@@ -2577,17 +2589,9 @@ Accepted value: Numeric value from 0 to 100.</source>
25772589
<source>File</source>
25782590
<target state="translated">檔案</target>
25792591
</trans-unit>
2580-
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2581-
<source>133, 22</source>
2582-
<target state="final">133, 22</target>
2583-
</trans-unit>
2584-
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
2585-
<source>Reconnect</source>
2586-
<target state="translated">重新連線</target>
2587-
</trans-unit>
25882592
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2589-
<source>133, 22</source>
2590-
<target state="final">133, 22</target>
2593+
<source>180, 22</source>
2594+
<target state="final">180, 22</target>
25912595
</trans-unit>
25922596
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
25932597
<source>Disconnect</source>
@@ -2646,8 +2650,8 @@ Accepted value: Numeric value from 0 to 100.</source>
26462650
<target state="final">0, 24</target>
26472651
</trans-unit>
26482652
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2649-
<source>351, 24</source>
2650-
<target state="final">351, 24</target>
2653+
<source>231, 24</source>
2654+
<target state="final">231, 24</target>
26512655
</trans-unit>
26522656
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
26532657
<source>0</source>
@@ -3758,8 +3762,8 @@ Accepted value: Numeric value from 0 to 100.</source>
37583762
<target state="needs-review-translation">False</target>
37593763
</trans-unit>
37603764
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
3761-
<source>180, 22</source>
3762-
<target state="new">180, 22</target>
3765+
<source>177, 22</source>
3766+
<target state="needs-review-translation">177, 22</target>
37633767
</trans-unit>
37643768
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
37653769
<source>Manage Old Prefs...</source>
@@ -3769,6 +3773,62 @@ Accepted value: Numeric value from 0 to 100.</source>
37693773
<source></source>
37703774
<target state="new"></target>
37713775
</trans-unit>
3776+
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3777+
<source>180, 22</source>
3778+
<target state="needs-review-translation">180, 22</target>
3779+
</trans-unit>
3780+
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
3781+
<source>Connect</source>
3782+
<target state="new">Connect</target>
3783+
</trans-unit>
3784+
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3785+
<source></source>
3786+
<target state="needs-review-translation"></target>
3787+
</trans-unit>
3788+
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3789+
<source></source>
3790+
<target state="needs-review-translation"></target>
3791+
</trans-unit>
3792+
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3793+
<source></source>
3794+
<target state="needs-review-translation"></target>
3795+
</trans-unit>
3796+
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3797+
<source></source>
3798+
<target state="needs-review-translation"></target>
3799+
</trans-unit>
3800+
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3801+
<source></source>
3802+
<target state="needs-review-translation"></target>
3803+
</trans-unit>
3804+
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3805+
<source></source>
3806+
<target state="needs-review-translation"></target>
3807+
</trans-unit>
3808+
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3809+
<source>177, 6</source>
3810+
<target state="needs-review-translation">177, 6</target>
3811+
</trans-unit>
3812+
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3813+
<source>180, 22</source>
3814+
<target state="needs-review-translation">180, 22</target>
3815+
</trans-unit>
3816+
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
3817+
<source>Persist</source>
3818+
<target state="new">Persist</target>
3819+
</trans-unit>
3820+
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3821+
<source>False</source>
3822+
<target state="needs-review-translation">False</target>
3823+
</trans-unit>
3824+
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
3825+
<source>NoControl</source>
3826+
<target state="needs-review-translation">NoControl</target>
3827+
</trans-unit>
3828+
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3829+
<source>False</source>
3830+
<target state="needs-review-translation">False</target>
3831+
</trans-unit>
37723832
</group>
37733833
</body>
37743834
</file>

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

Lines changed: 76 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19531953
<target state="new">Unavailable</target>
19541954
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
19551955
</trans-unit>
1956+
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1957+
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1958+
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1959+
</trans-unit>
1960+
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1961+
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1962+
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1963+
</trans-unit>
1964+
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1965+
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1966+
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1967+
</trans-unit>
19561968
</group>
19571969
</body>
19581970
</file>
@@ -1975,8 +1987,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19751987
<target state="translated">USV-Variablen</target>
19761988
</trans-unit>
19771989
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1978-
<source>180, 22</source>
1979-
<target state="final">180, 22</target>
1990+
<source>177, 22</source>
1991+
<target state="final">177, 22</target>
19801992
</trans-unit>
19811993
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
19821994
<source>Exit</source>
@@ -1990,17 +2002,9 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19902002
<source>File</source>
19912003
<target state="final">Datei</target>
19922004
</trans-unit>
1993-
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1994-
<source>133, 22</source>
1995-
<target state="final">133, 22</target>
1996-
</trans-unit>
1997-
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
1998-
<source>Reconnect</source>
1999-
<target state="final">Erneut verbinden</target>
2000-
</trans-unit>
20012005
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2002-
<source>133, 22</source>
2003-
<target state="final">133, 22</target>
2006+
<source>180, 22</source>
2007+
<target state="final">180, 22</target>
20042008
</trans-unit>
20052009
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
20062010
<source>Disconnect</source>
@@ -2055,8 +2059,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
20552059
<target state="final">0, 0</target>
20562060
</trans-unit>
20572061
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2058-
<source>351, 24</source>
2059-
<target state="final">351, 24</target>
2062+
<source>231, 24</source>
2063+
<target state="final">231, 24</target>
20602064
</trans-unit>
20612065
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
20622066
<source>0</source>
@@ -3231,8 +3235,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
32313235
<target state="needs-review-translation">False</target>
32323236
</trans-unit>
32333237
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
3234-
<source>180, 22</source>
3235-
<target state="new">180, 22</target>
3238+
<source>177, 22</source>
3239+
<target state="needs-review-translation">177, 22</target>
32363240
</trans-unit>
32373241
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
32383242
<source>Manage Old Prefs...</source>
@@ -3242,6 +3246,62 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
32423246
<source></source>
32433247
<target state="new"></target>
32443248
</trans-unit>
3249+
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3250+
<source>180, 22</source>
3251+
<target state="needs-review-translation">180, 22</target>
3252+
</trans-unit>
3253+
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
3254+
<source>Connect</source>
3255+
<target state="new">Connect</target>
3256+
</trans-unit>
3257+
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3258+
<source></source>
3259+
<target state="needs-review-translation"></target>
3260+
</trans-unit>
3261+
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3262+
<source></source>
3263+
<target state="needs-review-translation"></target>
3264+
</trans-unit>
3265+
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3266+
<source></source>
3267+
<target state="needs-review-translation"></target>
3268+
</trans-unit>
3269+
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3270+
<source></source>
3271+
<target state="needs-review-translation"></target>
3272+
</trans-unit>
3273+
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3274+
<source></source>
3275+
<target state="needs-review-translation"></target>
3276+
</trans-unit>
3277+
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3278+
<source></source>
3279+
<target state="needs-review-translation"></target>
3280+
</trans-unit>
3281+
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3282+
<source>177, 6</source>
3283+
<target state="needs-review-translation">177, 6</target>
3284+
</trans-unit>
3285+
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3286+
<source>180, 22</source>
3287+
<target state="needs-review-translation">180, 22</target>
3288+
</trans-unit>
3289+
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
3290+
<source>Persist</source>
3291+
<target state="new">Persist</target>
3292+
</trans-unit>
3293+
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3294+
<source>False</source>
3295+
<target state="needs-review-translation">False</target>
3296+
</trans-unit>
3297+
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
3298+
<source>NoControl</source>
3299+
<target state="needs-review-translation">NoControl</target>
3300+
</trans-unit>
3301+
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3302+
<source>False</source>
3303+
<target state="needs-review-translation">False</target>
3304+
</trans-unit>
32453305
</group>
32463306
</body>
32473307
</file>

0 commit comments

Comments
 (0)