Big Update (combines #519 #509 #499)

.gitignore

@@ -0,0 +1,2 @@
+.vs/slnx.sqlite
+.vs/VSWorkspaceState.json

.gitmodules

@@ -1,43 +1,48 @@
 [submodule "src/3rdparty/unicode-emoji"]
 	path = src/3rdparty/unicode-emoji
-	url = ../unicode-emoji.git
+	url = ../../samhocevar/unicode-emoji.git
 	branch = master
 	update = merge
 
 [submodule "src/3rdparty/unicode-translation"]
 	path = src/3rdparty/unicode-translation
-	url = ../unicode-translation.git
+	url = ../../samhocevar/unicode-translation.git
 	branch = master
 	update = merge
 
 [submodule "src/3rdparty/xcompose"]
 	path = src/3rdparty/xcompose
-	url = ../../samhocevar-forks/xcompose.git
+	url = ../../kragen/xcompose.git
 
 [submodule "wpf-notifyicon"]
 	path = src/3rdparty/wpf-notifyicon
-	url = ../../samhocevar-forks/wpf-notifyicon.git
-	branch = feature/net30
+	url = ../../hardcodet/wpf-notifyicon.git
+	branch = release/2.0.1
 	update = merge
 
 [submodule "src/3rdparty/libx11"]
 	path = src/3rdparty/libx11
-	url = ../../freedesktop/xorg-libX11.git
+	url = https://gitlab.freedesktop.org/xorg/lib/libx11
 	branch = master
 	update = merge
 
 [submodule "src/3rdparty/xorgproto"]
 	path = src/3rdparty/xorgproto
-	url = ../../freedesktop/xorg-xorgproto.git
+	url = https://gitlab.freedesktop.org/xorg/proto/xorgproto
 	branch = master
 	update = merge
 
-[submodule "src/3rdparty/inserticons"]
-	path = src/3rdparty/inserticons
-	url = ../../samhocevar-forks/inserticons.git
-
 [submodule "src/3rdparty/innosetup"]
 	path = src/3rdparty/innosetup
 	url = ../../jrsoftware/issrc.git
 	branch = main
 	update = merge
+
+[submodule "src/3rdparty/unicodetools"]
+	path = src/3rdparty/unicodetools
+	url = https://github.com/unicode-org/unicodetools
+	branch = main
+	update = merge
+[submodule "src/3rdparty/inserticons"]
+	path = src/3rdparty/inserticons
+	url = https://github.com/dIeGoLi/InsertIcons

README.md

@@ -1,4 +1,6 @@
-WinCompose
+Possibly maintained
+
+ WinCompose
 ==========
 
 A compose key for Windows, free and open-source, created by Sam Hocevar.
@@ -11,16 +13,16 @@ very intuitive key combinations. For instance, **ö** is obtained using
 
 WinCompose also supports Emoji input for 😁 👻 👍 💩 🎁 🌹 🐊.
 
-Download latest: [WinCompose 0.9.11](https://github.com/samhocevar/wincompose/releases/download/v0.9.11/WinCompose-Setup-0.9.11.exe) (September 3, 2021) or [browse releases](https://github.com/samhocevar/wincompose/releases)
+Download latest: [WinCompose 0.9.14](https://github.com/ell1010/wincompose/releases/download/v0.9.14/WinCompose-Setup-0.9.14.exe) (February 2nd, 2025) or [browse releases](https://github.com/ell1010/wincompose/releases/)
 ----------------
 
- * Installable version: [WinCompose 0.9.11 (installer)](https://github.com/samhocevar/wincompose/releases/download/v0.9.11/WinCompose-Setup-0.9.11.exe).
+ * Installable version: [WinCompose 0.9.14 (installer)](https://github.com/ell1010/wincompose/releases/download/v0.9.14/WinCompose-Setup-0.9.14.exe).
 
- * Portable version: [WinCompose 0.9.11 (portable)](https://github.com/samhocevar/wincompose/releases/download/v0.9.11/WinCompose-NoInstall-0.9.11.zip).
+ * Portable version: [WinCompose 0.9.14 (portable)](https://github.com/ell1010/wincompose/releases/download/v0.9.14/WinCompose-NoInstall-0.9.14.zip).
 
  * Older versions are available [in the releases section](https://github.com/samhocevar/wincompose/releases/).
 
-**Note: this software is not digitally signed.** You can help with this by [donating to the project](http://wincompose.info/donate/).
+**Note: this software is not digitally signed.** ~~You can help with this by [donating to the project](http://wincompose.info/donate/).~~
 
 Quick start
 -----------
@@ -92,8 +94,9 @@ with sequences.
 WinCompose supports rules of more than 2 characters such as <kbd>⎄ Compose</kbd>
 <kbd>(</kbd> <kbd>3</kbd> <kbd>)</kbd> for **③**.
 
-WinCompose supports early exits. For instance, <kbd>⎄ Compose</kbd> <kbd>q</kbd> will
-immediately type **q** because there is currently no rule starting with <kbd>q</kbd>.
+WinCompose supports early exits. For instance, <kbd>⎄ Compose</kbd> <kbd>Q</kbd> will
+immediately type **Q** because there is currently no rule starting with the capital
+letter <kbd>Q</kbd>.
 
 As of now, WinCompose is almost fully translated to Afrikaans, Belarusian, Catalan, Chinese,
 Czech, Dutch, Estonian, French, German, Greek, Italian, Japanese, Lithuanian, Norwegian, Polish,
@@ -113,5 +116,5 @@ in Visual Studio in order to build WinCompose. You will also need to install
 Bugs and Improvements
 ---------------------
 
-Please report bugs or suggest improvements to Sam Hocevar <sam@hocevar.net>
+~~Please report bugs or suggest improvements to Sam Hocevar <sam@hocevar.net>~~
 or preferably to the [GitHub issue tracker](https://github.com/samhocevar/wincompose/issues).

src/Makefile

@@ -1,4 +1,3 @@
-
 # Requirements:
 #  - Inno Setup 6 (download and install)
 #  - GitVersion (choco install gitversion)
@@ -8,11 +7,11 @@
 #  - gettext (mingw-get install msys-gettext)
 
 VERSION = $(shell gitversion -showvariable MajorMinorPatch)
-FRAMEWORK = net40
+FRAMEWORK = net481
 CONFIG = Release
 
 SRCDIR = wincompose
-BINDIR = wincompose/bin/$(CONFIG)/$(FRAMEWORK)
+BINDIR = wincompose\bin\$(CONFIG)\$(FRAMEWORK)
 
 SLN = wincompose.sln
 ISS = installer/installer.iss
@@ -36,7 +35,7 @@ LANG = $(sort $(subst ., , $(suffix $(basename $(wildcard language/i18n/*.*.resx
 PORTABLE = WinCompose-NoInstall-$(VERSION).zip
 
 VSWHERE = "${ProgramFiles(x86)}/Microsoft Visual Studio/Installer/vswhere.exe"
-MSBUILD = TMP= TEMP= "$(shell $(VSWHERE) -latest -requires Microsoft.Component.MSBuild -find 'MSBuild/**/Bin/MSBuild.exe')"
+MSBUILD = "$(shell $(VSWHERE) -latest -requires Microsoft.Component.MSBuild -find 'MSBuild/**/Bin/MSBuild.exe')"
 MSGMERGE = msgmerge
 
 all: check installer portable
@@ -50,7 +49,7 @@ all: check installer portable
 	@echo PortableMD5: $(shell md5sum $(PORTABLE))
 
 check:
-	./check-data.sh
+	bash ./check-data.sh
 
 clean:
 	$(MSBUILD) $(SLN) -p:Configuration=$(CONFIG) -t:Clean
@@ -60,21 +59,21 @@ clean:
 	rm -rf wincompose/obj wincompose/bin || true
 
 build:
-	nuget restore $(SLN)
+	dotnet restore $(SLN)
 	$(MSBUILD) $(SLN) -p:Configuration=$(CONFIG) -t:Build
 
 installer: build $(EXE) $(ISS) $(PAS)
 
 portable: build $(EXE)
 	rm -f $(PORTABLE)
 	rm -rf $(PORTABLE:.zip=)
-	mkdir -p $(PORTABLE:.zip=)/rules
-	mkdir -p $(addprefix $(PORTABLE:.zip=)/, $(LANG))
-	for L in $(LANG); do cp $(BINDIR)/$${L}/language.resources.dll $(PORTABLE:.zip=)/$${L}/; done
+	mkdir $(PORTABLE:.zip=)\rules
+	mkdir $(addprefix $(PORTABLE:.zip=)\, $(LANG))
+	for %%L in ($(LANG)) do cp $(BINDIR)\%%L\language.resources.dll $(PORTABLE:.zip=)\%%L\ 
 	cp $(EXE) $(DLL) $(PORTABLE:.zip=)
 	cp $(EXE).config $(PORTABLE:.zip=)
-	cp $(TXT) $(PORTABLE:.zip=)/rules
-	echo 'CreateObject("WScript.Shell").Run CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\wincompose.exe -settings",0' > $(PORTABLE:.zip=)/wincompose-settings.vbs
-	echo 'CreateObject("WScript.Shell").Run CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\wincompose.exe -sequences",0' > $(PORTABLE:.zip=)/wincompose-sequences.vbs
-	zip -r $(PORTABLE) $(PORTABLE:.zip=)
-	rm -rf $(PORTABLE:.zip=)
+	cp $(TXT) $(PORTABLE:.zip=)\rules
+	echo 'CreateObject("WScript.Shell").Run CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\wincompose.exe -settings",0' > $(PORTABLE:.zip=)\wincompose-settings.vbs
+	echo 'CreateObject("WScript.Shell").Run CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\wincompose.exe -sequences",0' > $(PORTABLE:.zip=)\wincompose-sequences.vbs
+	tar -a -c -f $(PORTABLE) $(PORTABLE:.zip=)
+	rm -rf $(PORTABLE:.zip=)

src/installer/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

src/installer/installer-helper.vcxproj

@@ -14,7 +14,7 @@
     <ProjectGuid>{91D61EB7-36A9-449F-B8AE-D151928026DA}</ProjectGuid>
     <Keyword>installer-helper</Keyword>
     <RootNamespace>installer-helper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
@@ -24,13 +24,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/installer/installer.csproj

@@ -5,17 +5,20 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{55AF5191-E02C-4445-A578-D209A40C0AC7}</ProjectGuid>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="installer.iss" />
   </ItemGroup>
   <Target Name="Build">
     <Exec Command="&quot;%ProgramFiles(x86)%\Inno Setup 6\iscc&quot; /V4 /DCONFIG=$(Configuration) &quot;installer.iss&quot;" />
   </Target>
   <Target Name="Clean">
-    <Exec Command="for /F &quot;tokens=*&quot; %%g in ('gitversion -showvariable MajorMinorPatch') do (del ..\WinCompose-Setup-%%g.exe)" />
+    <Exec Command="for /F &quot;tokens=*&quot; %%g in ('dotnet-gitversion -showvariable MajorMinorPatch') do (del ..\WinCompose-Setup-%%g.exe)" />
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-</Project>
+</Project>

src/installer/installer.iss

@@ -16,7 +16,7 @@
 #ifndef CONFIG
 #   define CONFIG GetEnv('CONFIG')
 #endif
-#define FRAMEWORK "net40"
+#define FRAMEWORK "net481"
 
 #define SRCDIR "../wincompose"
 #define BINDIR "../wincompose/bin/" + CONFIG + "/" + FRAMEWORK
@@ -58,6 +58,7 @@ Source: "{#BINDIR}\{#EXE}.config"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\language.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\Emoji.Wpf.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\Hardcodet.NotifyIcon.Wpf.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BINDIR}\Wpf.Ui.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\NLog.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\System.ValueTuple.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BINDIR}\stfu.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -134,7 +135,7 @@ Name: "fr"; MessagesFile: "compiler:Languages/French.isl"
 ; [???] ga (Gaelic)
 Name: "hi"; MessagesFile: "{#INNODIR}/Languages/Unofficial/Hindi.islu"
 Name: "hr"; MessagesFile: "{#INNODIR}/Languages/Unofficial/Croatian.isl"
-Name: "hu"; MessagesFile: "{#INNODIR}/Languages/Unofficial/Hungarian.isl"
+Name: "hu"; MessagesFile: "{#INNODIR}/Languages/Hungarian.isl"
 ; [ERR] Name: "id"; MessagesFile: "{#INNODIR}/Languages/Unofficial/Indonesian.isl"
 Name: "it"; MessagesFile: "compiler:Languages/Italian.isl"
 Name: "ja"; MessagesFile: "compiler:Languages/Japanese.isl"
@@ -151,7 +152,7 @@ Name: "sk"; MessagesFile: "compiler:Languages/Slovak.isl"
 Name: "sl"; MessagesFile: "compiler:Languages/Slovenian.isl"
 ; [ERR] sq / Albanian.isl
 Name: "sr"; MessagesFile: "{#INNODIR}/Languages/Unofficial/SerbianCyrillic.isl"
-Name: "sv"; MessagesFile: "{#INNODIR}/Languages/Unofficial/Swedish.isl"
+Name: "sv"; MessagesFile: "{#INNODIR}/Languages/Swedish.isl"
 Name: "uk"; MessagesFile: "compiler:Languages/Ukrainian.isl"
 Name: "zh"; MessagesFile: "{#INNODIR}/Languages/Unofficial/ChineseSimplified.isl"
 ; [ERR] Name: "zh_Hant"; MessagesFile: "{#INNODIR}/Languages/Unofficial/ChineseTraditional.isl"

src/installer/installer.pas

@@ -99,13 +99,13 @@ procedure visit_homepage(sender: tobject);
 end;
 
 {
-{ Download .NET Framework 3.5 SP1
+{ Download .NET Framework 4.8.1
 }
 procedure download_dotnet(sender: tobject);
 var
     ret: integer;
 begin
-    shellexec('open', 'https://dotnet.microsoft.com/download/dotnet-framework/net40',
+    shellexec('open', 'https://dotnet.microsoft.com/en-us/download/dotnet-framework/net481',
               '', '', sw_show, ewnowait, ret);
 end;
 
@@ -176,12 +176,12 @@ procedure InitializeWizard;
                                     _('Software required by WinCompose'));
 
     warning := tnewstatictext.create(dotnet_page);
-    warning.caption := _('WinCompose needs the .NET Framework, version 4.0 or later, which does not\n'
+    warning.caption := _('WinCompose needs the .NET Framework, version 4.8.1 or later, which does not\n'
                        + 'seem to be currently installed. The following action may help solve the problem:');
     warning.parent := dotnet_page.surface;
 
     action := tnewstatictext.create(dotnet_page);
-    action.caption := _('Download and install .NET Framework 4.0 Runtime');
+    action.caption := _('Download and install .NET Framework 4.8.1 Runtime');
     action.parent := dotnet_page.surface;
     action.cursor := crhand;
     action.onclick := @download_dotnet;
@@ -220,7 +220,7 @@ procedure refresh_dotnet_page(sender: tobject; var key: word; shift: tshiftstate
 begin
     if wizardform.curpageid = dotnet_page.id then
     begin
-        if (get_dotnet_state() < 0) then begin
+        if not IsDotNetInstalled(net462, 0) then begin
             wizardform.nextbutton.enabled := false;
             action.visible := true;
             hint.visible := true;
@@ -264,7 +264,7 @@ function ShouldSkipPage(page_id: integer): boolean;
     { If this is the .NET page, only show it on run 1 and if the
     { prerequisites are not yet installed. }
     if page_id = dotnet_page.id then begin
-        result := (state <> s_run_1) or (get_dotnet_state() = 0);
+        result := (state <> s_run_1) or (IsDotNetInstalled(net462, 0));
         exit;
     end;