Skip to content

Commit 53d0cac

Browse files
jonaskohljonaskohl
committed
Version 3.16.1.0
1 parent b88a9f4 commit 53d0cac

21 files changed

Lines changed: 1343 additions & 393 deletions

‎CapsLockIndicatorV3/CapsLockIndicatorV3.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Prefer32Bit>false</Prefer32Bit>
3636
<PlatformTarget>AnyCPU</PlatformTarget>
3737
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
38-
<DefineConstants>TRACE;DEBUG;TEST_EOL</DefineConstants>
38+
<DefineConstants>TRACE;DEBUG;TEST_EOL_</DefineConstants>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
4141
<Prefer32Bit>false</Prefer32Bit>

‎CapsLockIndicatorV3/MainForm.Designer.cs‎

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

‎CapsLockIndicatorV3/MainForm.cs‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -431,21 +431,31 @@ private void CheckSupport()
431431
var ub = new UriBuilder(URLs.ClientSupported);
432432
var qb = new QueryBuilder();
433433
#if DEBUG
434-
qb.Append("v", "dev");
434+
qb.Append("e", "debug");
435435
#else
436-
qb.Append("v", version);
436+
qb.Append("e", "release");
437437
#endif
438-
qb.Append("w", GetOSVersion());
438+
qb.Append("c", version);
439+
qb.Append("o", GetOSBuildVersion());
439440
ub.Query = qb.ToString();
440441

441442
var wc = new WebClient();
442443
wc.DownloadStringCompleted += Wc_DownloadStringCompleted;
443444
wc.DownloadStringAsync(ub.Uri);
444445
}
445446

447+
private string GetOSBuildVersion()
448+
{
449+
return string.Join(".", new[]
450+
{
451+
Environment.OSVersion.Version.Major.ToString(),
452+
Environment.OSVersion.Version.Minor.ToString(),
453+
Environment.OSVersion.Version.Build.ToString()
454+
});
455+
}
456+
446457
private void Wc_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
447458
{
448-
(sender as WebClient)?.Dispose();
449459

450460
try
451461
{
@@ -468,7 +478,9 @@ private void Wc_DownloadStringCompleted(object sender, DownloadStringCompletedEv
468478
tableLayoutPanel3.Visible = true;
469479
}
470480
}
471-
catch { }
481+
catch(Exception ex) { MessageBox.Show(ex.ToString()); }
482+
483+
(sender as WebClient)?.Dispose();
472484
}
473485

474486
private void ApplyEOLStrings()
@@ -1099,6 +1111,7 @@ void handleVersion(string xmlData)
10991111
void doVersionCheck(bool isManualCheck)
11001112
{
11011113
VersionCheck.IsLatestVersion(handleVersion, isManualCheck);
1114+
CheckSupport();
11021115
}
11031116

11041117
void MainFormLoad(object sender, EventArgs e)

‎CapsLockIndicatorV3/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
//
2525
// You can specify all the values or you can use the default the Revision and
2626
// Build Numbers by using the '*' as shown below:
27-
[assembly: AssemblyVersion("3.16.0.0")]
28-
[assembly: AssemblyFileVersion("3.16.0.0")]
27+
[assembly: AssemblyVersion("3.16.1.0")]
28+
[assembly: AssemblyFileVersion("3.16.1.0")]
2929
[assembly: Guid ("6f54c357-0542-4d7d-9225-338bc3cd7834")]

‎CapsLockIndicatorV3/URLs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static class URLs
1515
public const string IconGalleryMeta = ServiceEndpointBase + "icongallery/getmeta.php";
1616
public const string IconGalleryDownload = ServiceEndpointBase + "icongallery/";
1717
public const string IconGallery = ServiceEndpointBase + "icongallery/embedded.php";
18-
public const string ClientSupported = ServiceEndpointBase + "clientsupported";
18+
public const string ClientSupported = ServiceEndpointBase + "eolcheck";
1919
public const string VersionCheck = ServiceEndpointBase + "!/version?details&xml&newClient3=true";
2020
}
2121
}

‎CapsLockIndicatorV3/strings.ar.resx‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,48 @@
169169
<value>كاب لوك</value>
170170
<comment>The name of the caps lock key</comment>
171171
</data>
172+
173+
<!--
174+
<data name="cbPersistentCapsOff" xml:space="preserve">
175+
<value>Off</value>
176+
<comment>Label for caps lock off checkbox in persistent overlay section</comment>
177+
</data>
178+
-->
179+
180+
<!--
181+
<data name="cbPersistentCapsOn" xml:space="preserve">
182+
<value>On</value>
183+
<comment>Label for caps lock on checkbox in persistent overlay section</comment>
184+
</data>
185+
-->
186+
187+
<!--
188+
<data name="cbPersistentNumOff" xml:space="preserve">
189+
<value>Off</value>
190+
<comment>Label for num lock off checkbox in persistent overlay section</comment>
191+
</data>
192+
-->
193+
194+
<!--
195+
<data name="cbPersistentNumOn" xml:space="preserve">
196+
<value>On</value>
197+
<comment>Label for num lock on checkbox in persistent overlay section</comment>
198+
</data>
199+
-->
200+
201+
<!--
202+
<data name="cbPersistentScrollOff" xml:space="preserve">
203+
<value>Off</value>
204+
<comment>Label for scroll lock off checkbox in persistent overlay section</comment>
205+
</data>
206+
-->
207+
208+
<!--
209+
<data name="cbPersistentScrollOn" xml:space="preserve">
210+
<value>On</value>
211+
<comment>Label for scroll lock on checkbox in persistent overlay section</comment>
212+
</data>
213+
-->
172214
<data name="checkForUpdates" xml:space="preserve">
173215
<value>التحقق من وجود تحديثات</value>
174216
<comment>The caption for the button that manually checks for updates. The character after the "&amp;" is the hotkey that is used with the ALT key.</comment>
@@ -377,10 +419,53 @@
377419
<value>بشكل دائم</value>
378420
<comment>Text to display instead of the time if indicator overlay display is set to permanently.</comment>
379421
</data>
422+
423+
<!--
424+
<data name="persistentCapsLabel" xml:space="preserve">
425+
<value>...Caps lock is</value>
426+
<comment>Label for caps lock row in persistent overlay section</comment>
427+
</data>
428+
-->
429+
430+
<!--
431+
<data name="persistentHeadingLabel" xml:space="preserve">
432+
<value>Show persistent overlay when...</value>
433+
<comment>Heading for persistent overlay section</comment>
434+
</data>
435+
-->
436+
437+
<!--
438+
<data name="persistentNumLabel" xml:space="preserve">
439+
<value>...Num lock is</value>
440+
<comment>Label for num lock row in persistent overlay section</comment>
441+
</data>
442+
-->
443+
444+
<!--
445+
<data name="persistentScrollLabel" xml:space="preserve">
446+
<value>...Scroll lock is</value>
447+
<comment>Label for scroll lock row in persistent overlay section</comment>
448+
</data>
449+
-->
380450
<data name="reloadedIconsInfo" xml:space="preserve">
381451
<value>إعادة تحميل الرموز</value>
382452
<comment>Shown in a notification when hot-reloading icons.</comment>
383453
</data>
454+
455+
<!--
456+
<data name="resetSettings" xml:space="preserve">
457+
<value>Reset settings</value>
458+
<comment>Used for the "Reset settings" button</comment>
459+
</data>
460+
-->
461+
462+
<!--
463+
<data name="resetSettingsConfirmationText" xml:space="preserve">
464+
<value>This will reset all settings to their default values and restart CapsLock Indicator. All customisation will be lost! This cannot be undone!
465+
Do you want to reset all settings now?</value>
466+
<comment>Used for the confirmation prompt after clicking "Reset settings"</comment>
467+
</data>
468+
-->
384469
<data name="restart" xml:space="preserve">
385470
<value>إعادة تشغيل</value>
386471
<comment>Generic label for Restart button</comment>

0 commit comments

Comments
 (0)