diff --git a/windows/src/desktop/kmshell/.gitignore b/windows/src/desktop/kmshell/.gitignore index bc510d6024..5196e42ea8 100644 --- a/windows/src/desktop/kmshell/.gitignore +++ b/windows/src/desktop/kmshell/.gitignore @@ -1 +1,2 @@ -xml/localedef.dtd \ No newline at end of file +xml/localedef.dtd +xml/sentry.init.js diff --git a/windows/src/desktop/kmshell/Makefile b/windows/src/desktop/kmshell/Makefile index c2983d3b3f..49094edcfe 100644 --- a/windows/src/desktop/kmshell/Makefile +++ b/windows/src/desktop/kmshell/Makefile @@ -15,7 +15,7 @@ build: version.res manifest.res icons xml icons: rc icons.rc -xml: +xml: sentry-init.js cd $(ROOT)\src\desktop\kmshell\xml -del /q $(ROOT)\bin\desktop\xml\* copy * $(ROOT)\bin\desktop\xml\ # @@ -24,6 +24,10 @@ xml: mkdir $(ROOT)\bin\desktop\locale xcopy /S /I $(ROOT)\src\desktop\kmshell\locale $(ROOT)\bin\desktop\locale\ +sentry-init.js: + cd $(ROOT)\src\desktop\kmshell\xml + $(MKVER_U) init.js.in init.js + clean: def-clean if exist MessageIdentifiers.pas del MessageIdentifiers.pas if exist icons\icons.res del icons\icons.res diff --git a/windows/src/desktop/kmshell/xml/basekeyboard.xsl b/windows/src/desktop/kmshell/xml/basekeyboard.xsl index ab25c7a53e..c9b08bfbaa 100644 --- a/windows/src/desktop/kmshell/xml/basekeyboard.xsl +++ b/windows/src/desktop/kmshell/xml/basekeyboard.xsl @@ -1,16 +1,17 @@ - + - + - + + <xsl:value-of select="$locale/String[@Id='S_BaseKeyboard_Title']"/> config.css @@ -73,7 +74,7 @@ - +
@@ -129,7 +130,7 @@ - +
@@ -137,7 +138,7 @@
- + @@ -160,7 +161,7 @@ - + @@ -168,27 +169,27 @@ - + - + - + - + - + @@ -207,7 +208,7 @@ - + \ No newline at end of file diff --git a/windows/src/desktop/kmshell/xml/keyman.xsl b/windows/src/desktop/kmshell/xml/keyman.xsl index eea960d338..6337c43683 100644 --- a/windows/src/desktop/kmshell/xml/keyman.xsl +++ b/windows/src/desktop/kmshell/xml/keyman.xsl @@ -19,9 +19,10 @@ - - + + + <xsl:value-of select="$locale/String[@Id='S_ConfigurationTitle']"/> config.css menu.css diff --git a/windows/src/desktop/kmshell/xml/onlineupdate.xsl b/windows/src/desktop/kmshell/xml/onlineupdate.xsl index b987787284..946280845f 100644 --- a/windows/src/desktop/kmshell/xml/onlineupdate.xsl +++ b/windows/src/desktop/kmshell/xml/onlineupdate.xsl @@ -11,6 +11,8 @@ + + <xsl:value-of select="$locale/String[@Id='S_Update_Title']"/> menu.css @@ -27,12 +28,12 @@
- +
- +
@@ -41,12 +42,12 @@
- +
No keyboards loaded - Open Configuration
- +
@@ -54,9 +55,9 @@
- +
- + diff --git a/windows/src/desktop/kmshell/xml/usage_keyboard.xsl b/windows/src/desktop/kmshell/xml/usage_keyboard.xsl index 89702d4781..5abf00c423 100644 --- a/windows/src/desktop/kmshell/xml/usage_keyboard.xsl +++ b/windows/src/desktop/kmshell/xml/usage_keyboard.xsl @@ -10,7 +10,8 @@ - + + <xsl:value-of select="$locale/String[@Id='Usage_Title']" /> diff --git a/windows/src/desktop/kmshell/xml/usage_off.xsl b/windows/src/desktop/kmshell/xml/usage_off.xsl index 8f202bc04f..96d0a0e257 100644 --- a/windows/src/desktop/kmshell/xml/usage_off.xsl +++ b/windows/src/desktop/kmshell/xml/usage_off.xsl @@ -11,18 +11,18 @@ - - + + <xsl:value-of select="$locale/String[@Id='SK_Usage_Title']" /> diff --git a/windows/src/desktop/kmshell/xml/vkhints.xsl b/windows/src/desktop/kmshell/xml/vkhints.xsl index eb23e2ea5f..4e6ec2f97f 100644 --- a/windows/src/desktop/kmshell/xml/vkhints.xsl +++ b/windows/src/desktop/kmshell/xml/vkhints.xsl @@ -8,8 +8,8 @@ - - + + hintbar