From a2d87bbcc8868a766883e3a5de66ce5f3025636f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Jul 2020 14:47:59 +1000
Subject: [PATCH 1/2] chore(windows): remove usage pages

The Usage page is no longer available; remove strings and xsl
relating to them.
---
 oem/firstvoices/windows/src/xml/locale.xml    |  13 ---
 .../windows/src/xml/usage_keyboard.xsl        |  89 ----------------
 windows/src/desktop/kmshell/xml/locale.xml    |  13 ---
 .../desktop/kmshell/xml/usage_keyboard.xsl    |  91 ----------------
 windows/src/desktop/kmshell/xml/usage_off.xsl | 100 ------------------
 5 files changed, 306 deletions(-)
 delete mode 100644 oem/firstvoices/windows/src/xml/usage_keyboard.xsl
 delete mode 100644 windows/src/desktop/kmshell/xml/usage_keyboard.xsl
 delete mode 100644 windows/src/desktop/kmshell/xml/usage_off.xsl

diff --git a/oem/firstvoices/windows/src/xml/locale.xml b/oem/firstvoices/windows/src/xml/locale.xml
index 9efa63c531..a82c18e818 100644
--- a/oem/firstvoices/windows/src/xml/locale.xml
+++ b/oem/firstvoices/windows/src/xml/locale.xml
@@ -450,19 +450,6 @@ keyboard layout for your language.</String>
 <String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_ShowToolbar" Version="7.0.230.0" Description="OSK right-click menu - show/hide OSK toolbar">Show Toolbar</String>
 <String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_SaveAsWebPage" Version="7.0.230.0" Description="OSK right-click menu - save diagram of active keyboard layout as a web page">Save as Web Page...</String>
 <String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_Print" Version="7.0.230.0" Description="OSK right-click menu - print diagram of active keyboard layout">Print...</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Usage Page                        -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Welcome" Version="7.0.244.0" Description="Usage page - keyboard help button">Keyboard Help</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_OSK" Version="7.0.244.0" Description="Usage page - On Screen Keyboard button">On Screen Keyboard</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Help" Version="7.0.244.0" Description="Usage page - Product Help button">&Name; Help</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Config" Version="7.0.244.0" Description="Usage page - Product Configuration button">&Name; Configuration</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeyboardNoDocumentation" Version="7.1.261.0" Description="Usage page - Text shown when keyboard has no documentation">This keyboard layout has no Getting Started or Usage documentation. Please check the Start Menu or contact the keyboard developer for more information on how to use this keyboard layout.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeyboardDocumentation" Version="7.1.261.0" Description="Usage page - Text shown when keyboard has documentation">Click the buttons below to view additional documentation and/or On Screen Keyboard.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeymanOff" Version="7.1.261.0" Description="Usage page - Text shown when no Keyman keyboard is active">No keyboard layout is currently selected in &Name;.  Click on any of the keyboard icons in the toolbar above to choose a keyboard layout.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_NoKeyboardsInstalled" Version="7.1.261.0" Description="Usage page - Text shown when no Keyman keyboards are installed">No keyboard layouts are currently installed or loaded.  Use &Name; Configuration to install a keyboard layout.</String>
   
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- Formatted messages, assorted                                              -->
diff --git a/oem/firstvoices/windows/src/xml/usage_keyboard.xsl b/oem/firstvoices/windows/src/xml/usage_keyboard.xsl
deleted file mode 100644
index 227b79d704..0000000000
--- a/oem/firstvoices/windows/src/xml/usage_keyboard.xsl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:variable name="locale_hint" select="$locale/Dialog[@Id='Usage'][1]" />
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-				<title>
-					<xsl:value-of select="$locale/String[@Id='Usage_Title']" />
-				</title>
-				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/String[@Id='SK_UIFontName'])[1]" />; font-size: 13.3px; }
-
-					body { padding: 6px; margin: 0px; overflow: auto;
-					background: #A0C1DC; border: none; }
-					html { padding: 0px; margin: 0px; overflow: auto; }
-
-					#container {
-					}
-
-					#buttons {
-					text-align: center;
-					padding: 10px;
-					}
-
-					#buttons input {
-					x-margin: 4px 4px; font-size: 12px
-					}
-				</style>
-			</head>
-
-			<body>
-				<div id="container">
-					<p><b><xsl:value-of select="/Keyman/KeyboardName" /></b></p>
-
-					<xsl:choose>
-  					<xsl:when test="not(/Keyman/HasWelcome) and not(/Keyman/HasOSK)">
-	  				  <p>
-                <xsl:copy-of select="($locale/String[@Id='S_Usage_KeyboardNoDocumentation'])[1]" />
-					  	</p>
-					  </xsl:when>
-					  <xsl:otherwise>
-					    <p>
-                <xsl:copy-of select="($locale/String[@Id='S_Usage_KeyboardDocumentation'])[1]" />
-					    </p>
-					  </xsl:otherwise>
-					</xsl:choose>
-					<div id="buttons">
-					
-					  <xsl:if test="not(/Keyman/HasWelcome) and not(/Keyman/HasOSK)">
-							<input type="button" onclick="javascript:location.href='keyman:help'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-								</xsl:attribute>
-							</input>
-						</xsl:if>
-					
-						<xsl:if test="/Keyman/HasWelcome">
-							<input type="button" onclick="javascript:location.href='keyman:welcome'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_Welcome']"/>
-								</xsl:attribute>
-							</input> 
-						</xsl:if>
-					  
-					  <xsl:if test="/Keyman/HasWelcome and /Keyman/HasOSK">
-						  &#160; &#160; &#160;
-						</xsl:if>
-						
-						<xsl:if test="/Keyman/HasOSK">
-							<input type="button" onclick="javascript:location.href='keyman:osk'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_OSK']"/>
-								</xsl:attribute>
-							</input>
-						</xsl:if>
-					</div>
-					
-				</div>
-			</body>
-		</html>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/windows/src/desktop/kmshell/xml/locale.xml b/windows/src/desktop/kmshell/xml/locale.xml
index c4feb92617..104e1935d8 100644
--- a/windows/src/desktop/kmshell/xml/locale.xml
+++ b/windows/src/desktop/kmshell/xml/locale.xml
@@ -330,19 +330,6 @@ keyboard that you use in Windows.  Keyman keyboards will adapt automatically to
 <String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_SaveAsWebPage" Version="7.0.230.0" Description="OSK right-click menu - save diagram of active keyboard layout as a web page">Save as Web Page...</String>
 <String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_Print" Version="7.0.230.0" Description="OSK right-click menu - print diagram of active keyboard layout">Print...</String>
 
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Usage Page                        -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Welcome" Version="7.0.244.0" Description="Usage page - keyboard help button">Keyboard Help</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_OSK" Version="7.0.244.0" Description="Usage page - On Screen Keyboard button">On Screen Keyboard</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Help" Version="7.0.244.0" Description="Usage page - Product Help button">&Name; Help</String>
-<String Group="Usage Page" Type="PlainText" Id="S_Usage_Config" Version="7.0.244.0" Description="Usage page - Product Configuration button">&Name; Configuration</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeyboardNoDocumentation" Version="7.1.261.0" Description="Usage page - Text shown when keyboard has no documentation">This keyboard layout has no Getting Started or Usage documentation. Please check the Start Menu or contact the keyboard developer for more information on how to use this keyboard layout.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeyboardDocumentation" Version="7.1.261.0" Description="Usage page - Text shown when keyboard has documentation">Click the buttons below to view additional documentation and/or On Screen Keyboard.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_KeymanOff" Version="7.1.261.0" Description="Usage page - Text shown when no Keyman keyboard is active">No keyboard layout is currently selected in &Name;.  Click on any of the keyboard icons in the toolbar above to choose a keyboard layout.</String>
-<String Group="Usage Page" Type="HTML" Id="S_Usage_NoKeyboardsInstalled" Version="7.1.261.0" Description="Usage page - Text shown when no Keyman keyboards are installed">No keyboard layouts are currently installed or loaded.  Use &Name; Configuration to install a keyboard layout.</String>
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- Formatted messages, assorted                                              -->
 <!-- These messages cannot contain HTML tags and are plain text                -->
diff --git a/windows/src/desktop/kmshell/xml/usage_keyboard.xsl b/windows/src/desktop/kmshell/xml/usage_keyboard.xsl
deleted file mode 100644
index 2d6fee82bc..0000000000
--- a/windows/src/desktop/kmshell/xml/usage_keyboard.xsl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:variable name="locale_hint" select="$locale/Dialog[@Id='Usage'][1]" />
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-        <script src="/app/sentry.bundle.min.js"></script>
-        <script src="/app/sentry.init.js"></script>
-				<title>
-					<xsl:value-of select="$locale/String[@Id='Usage_Title']" />
-				</title>
-				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/String[@Id='SK_UIFontName'])[1]" />, "Segoe UI"; font-size: 13.3px; }
-
-					body { padding: 6px; margin: 0px; overflow: auto;
-					background: #A0C1DC; border: none; }
-					html { padding: 0px; margin: 0px; overflow: auto; }
-
-					#container {
-					}
-
-					#buttons {
-					text-align: center;
-					padding: 10px;
-					}
-
-					#buttons input {
-					x-margin: 4px 4px; font-size: 12px
-					}
-				</style>
-			</head>
-
-			<body>
-				<div id="container">
-					<p><b><xsl:value-of select="/Keyman/KeyboardName" /></b></p>
-
-					<xsl:choose>
-  					<xsl:when test="not(/Keyman/HasWelcome) and not(/Keyman/HasOSK)">
-	  				  <p>
-                <xsl:copy-of select="($locale/String[@Id='S_Usage_KeyboardNoDocumentation'])[1]" />
-					  	</p>
-					  </xsl:when>
-					  <xsl:otherwise>
-					    <p>
-                <xsl:copy-of select="($locale/String[@Id='S_Usage_KeyboardDocumentation'])[1]" />
-					    </p>
-					  </xsl:otherwise>
-					</xsl:choose>
-					<div id="buttons">
-
-					  <xsl:if test="not(/Keyman/HasWelcome) and not(/Keyman/HasOSK)">
-							<input type="button" onclick="javascript:location.href='keyman:help'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-								</xsl:attribute>
-							</input>
-						</xsl:if>
-
-						<xsl:if test="/Keyman/HasWelcome">
-							<input type="button" onclick="javascript:location.href='keyman:welcome'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_Welcome']"/>
-								</xsl:attribute>
-							</input>
-						</xsl:if>
-
-					  <xsl:if test="/Keyman/HasWelcome and /Keyman/HasOSK">
-						  &#160; &#160; &#160;
-						</xsl:if>
-
-						<xsl:if test="/Keyman/HasOSK">
-							<input type="button" onclick="javascript:location.href='keyman:osk'">
-								<xsl:attribute name='Value'>
-									<xsl:value-of select="$locale/String[@Id='S_Usage_OSK']"/>
-								</xsl:attribute>
-							</input>
-						</xsl:if>
-					</div>
-
-				</div>
-			</body>
-		</html>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/windows/src/desktop/kmshell/xml/usage_off.xsl b/windows/src/desktop/kmshell/xml/usage_off.xsl
deleted file mode 100644
index a35e16190b..0000000000
--- a/windows/src/desktop/kmshell/xml/usage_off.xsl
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:variable name="locale_hint" select="$locale/Dialog[@Id='Usage'][1]" />
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <script src="/app/sentry.bundle.min.js"></script>
-        <script src="/app/sentry.init.js"></script>
-				<title>
-					<xsl:value-of select="$locale/String[@Id='SK_Usage_Title']" />
-				</title>
-				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/String[@Id='SK_UIFontName'])[1]" />, "Segoe UI"; font-size: 13.3px; }
-
-					body { padding: 6px; margin: 0px;
-					background: #A0C1DC; border: none; }
-					html { padding: 0px; margin: 0px;  }
-
-					#toolbar {
-						border-left: solid 1px black;
-						border-right: solid 1px black;
-						border-bottom: solid 1px black;
-						position: absolute;
-						left: <xsl:value-of select="/Keyman/Toolbar/@Left" />px;
-						width: <xsl:value-of select="/Keyman/Toolbar/@Width" />px;
-						top: 0px;
-						height: 12px;
-						}
-
-					#buttons {
-					text-align: center;
-					padding: 10px;
-					}
-
-					#buttons input {
-					x-margin: 4px 4px; font-size: 12px
-					}
-
-					#outer { position: relative; }
-					#middle { position: absolute; top: 50%; }
-					#inner { position: relative; top: -30%; width: 100%; font-size: 13.3px; text-align: center; }
-
-					#nokeyboards { width: 84%; padding: 8px 3%; margin-left: 5%; background: #F5F6BE; border: solid 1px gray; text-align: left }
-					#nokeyboards img { float: left; padding: 0 16px 0 0 }
-
-				</style>
-			</head>
-
-			<body>
-				<div id="outer">
-					<div id="middle">
-						<div id="inner">
-							<xsl:choose>
-								<xsl:when test="/Keyman/Keyboards/Keyboard">
-									<p>
-                    <xsl:copy-of select="($locale/String[@Id='S_Usage_KeymanOff'])[1]" />
-                  </p>
-									<div id="buttons">
-										<input type="button" onclick="javascript:location.href='keyman:help'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-											</xsl:attribute>
-										</input>
-									</div>
-								</xsl:when>
-								<xsl:otherwise>
-									<div id="nokeyboards">
-										<img src="/app/info.png" />
-                    <xsl:copy-of select="($locale/String[@Id='S_Usage_NoKeyboardsInstalled'])[1]" />
-									</div>
-									<p></p>
-									<div id="buttons">
-										<input type="button" onclick="javascript:location.href='keyman:config'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Config']"/>
-											</xsl:attribute>
-										</input>
-										<input type="button" onclick="javascript:location.href='keyman:help'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-											</xsl:attribute>
-										</input>
-									</div>
-								</xsl:otherwise>
-							</xsl:choose>
-						</div>
-					</div>
-				</div>
-			</body>
-		</html>
-	</xsl:template>
-
-</xsl:stylesheet>

From a220616ab5be6b21ccd84bced4204ea3dc9e858b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 29 Jul 2020 14:48:42 +1000
Subject: [PATCH 2/2] chore(windows): one more file

---
 oem/firstvoices/windows/src/xml/usage_off.xsl | 102 ------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 oem/firstvoices/windows/src/xml/usage_off.xsl

diff --git a/oem/firstvoices/windows/src/xml/usage_off.xsl b/oem/firstvoices/windows/src/xml/usage_off.xsl
deleted file mode 100644
index b558578dc1..0000000000
--- a/oem/firstvoices/windows/src/xml/usage_off.xsl
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:variable name="locale_hint" select="$locale/Dialog[@Id='Usage'][1]" />
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
-
-				<title>
-					<xsl:value-of select="$locale/String[@Id='SK_Usage_Title']" />
-				</title>
-				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/String[@Id='SK_UIFontName'])[1]" />; font-size: 13.3px; }
-
-					body { padding: 6px; margin: 0px; 
-					background: #A0C1DC; border: none; }
-					html { padding: 0px; margin: 0px;  }
-					
-					#toolbar {
-						border-left: solid 1px black;
-						border-right: solid 1px black;
-						border-bottom: solid 1px black;
-						position: absolute;
-						left: <xsl:value-of select="/Keyman/Toolbar/@Left" />px;
-						width: <xsl:value-of select="/Keyman/Toolbar/@Width" />px;
-						top: 0px;
-						height: 12px;
-						}
-
-					#buttons {
-					text-align: center;
-					padding: 10px;
-					}
-
-					#buttons input {
-					x-margin: 4px 4px; font-size: 12px
-					}
-					
-					#outer { position: relative; }
-					#middle { position: absolute; top: 50%; }
-					#inner { position: relative; top: -30%; width: 100%; font-size: 13.3px; text-align: center; }
-					
-					#nokeyboards { width: 84%; padding: 8px 3%; margin-left: 5%; background: #F5F6BE; border: solid 1px gray; text-align: left }
-					#nokeyboards img { float: left; padding: 0 16px 0 0 }
-					
-				</style>
-			</head>
-
-			<body>
-				<div id="outer">
-					<div id="middle">
-						<div id="inner">
-							<xsl:choose>
-								<xsl:when test="/Keyman/Keyboards/Keyboard">
-									<p>
-                    <xsl:copy-of select="($locale/String[@Id='S_Usage_KeymanOff'])[1]" />
-                  </p>
-									<div id="buttons">
-										<input type="button" onclick="javascript:location.href='keyman:help'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-											</xsl:attribute>
-										</input>
-									</div>
-								</xsl:when>
-								<xsl:otherwise>
-									<div id="nokeyboards">
-										<img>
-											<xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>info.png</xsl:attribute>
-										</img>
-                    <xsl:copy-of select="($locale/String[@Id='S_Usage_NoKeyboardsInstalled'])[1]" />
-									</div>
-									<p></p>
-									<div id="buttons">
-										<input type="button" onclick="javascript:location.href='keyman:config'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Config']"/>
-											</xsl:attribute>
-										</input>
-										<input type="button" onclick="javascript:location.href='keyman:help'">
-											<xsl:attribute name='Value'>
-												<xsl:value-of select="$locale/String[@Id='S_Usage_Help']"/>
-											</xsl:attribute>
-										</input>
-									</div>
-								</xsl:otherwise>
-							</xsl:choose>
-						</div>
-					</div>
-				</div>
-			</body>
-		</html>
-	</xsl:template>
-
-</xsl:stylesheet>