From 7277ddb1bdb14fc672107039fb3530e38c98e4d7 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 20 Dec 2022 10:14:26 +0100
Subject: [PATCH] firmware/dfuWindows: Split properties step.

There may be one of three situations, so split to a bullet list.

Also update a few other strings.
---
 .../bootloaderInstructions/translations/en.json       |  2 +-
 .../DfuWindowsDriverInstallDialog.tsx                 |  9 +++++++++
 .../dfuWindowsDriverInstallDialog.scss                |  2 +-
 .../translations/en.json                              | 11 +++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/firmware/bootloaderInstructions/translations/en.json b/src/firmware/bootloaderInstructions/translations/en.json
index 49dbf54a..86823ae7 100644
--- a/src/firmware/bootloaderInstructions/translations/en.json
+++ b/src/firmware/bootloaderInstructions/translations/en.json
@@ -5,7 +5,7 @@
             "learnMore": "Learn more."
         },
         "windows": {
-            "message": "If you have never used Pybricks with USB on Windows, you may need to manually install a USB driver before you can connect to the device. {instructions}",
+            "message": "Are you using Pybricks on this computer for the first time? You may need to manually install the USB driver for this hub type. {instructions}",
             "instructions": "Click for instructions."
         }
     },
diff --git a/src/firmware/dfuWindowsDriverInstallDialog/DfuWindowsDriverInstallDialog.tsx b/src/firmware/dfuWindowsDriverInstallDialog/DfuWindowsDriverInstallDialog.tsx
index 5a3d104a..9552f737 100644
--- a/src/firmware/dfuWindowsDriverInstallDialog/DfuWindowsDriverInstallDialog.tsx
+++ b/src/firmware/dfuWindowsDriverInstallDialog/DfuWindowsDriverInstallDialog.tsx
@@ -150,6 +150,15 @@ const Step2: React.VoidFunctionComponent<HubTypeProps> = ({ hub }) => {
                         properties: <em>{i18n.translate('step.2.properties')}</em>,
                     })}
                 </p>
+                <ul>
+                    <li>
+                        {i18n.translate('step.2.listedWithWarning', {
+                            properties: <em>{i18n.translate('step.2.properties')}</em>,
+                        })}
+                    </li>
+                    <li>{i18n.translate('step.2.listedWithoutWarning')}</li>
+                    <li>{i18n.translate('step.2.notListed')}</li>
+                </ul>
             </div>
         </div>
     );
diff --git a/src/firmware/dfuWindowsDriverInstallDialog/dfuWindowsDriverInstallDialog.scss b/src/firmware/dfuWindowsDriverInstallDialog/dfuWindowsDriverInstallDialog.scss
index 5c839666..92acc946 100644
--- a/src/firmware/dfuWindowsDriverInstallDialog/dfuWindowsDriverInstallDialog.scss
+++ b/src/firmware/dfuWindowsDriverInstallDialog/dfuWindowsDriverInstallDialog.scss
@@ -5,7 +5,7 @@
 
 .pb-dfu-windows-driver-install-dialog {
     & .#{bp.$ns}-multistep-dialog-panels {
-        min-height: bp.$pt-grid-size * 75;
+        min-height: bp.$pt-grid-size * 77;
 
         & .#{bp.$ns}-multistep-dialog-left-panel {
             display: none;
diff --git a/src/firmware/dfuWindowsDriverInstallDialog/translations/en.json b/src/firmware/dfuWindowsDriverInstallDialog/translations/en.json
index 54b692f7..5e358435 100644
--- a/src/firmware/dfuWindowsDriverInstallDialog/translations/en.json
+++ b/src/firmware/dfuWindowsDriverInstallDialog/translations/en.json
@@ -8,14 +8,17 @@
     },
     "step": {
         "1": {
-            "message": "Right-click the Windows {startMenu} to open the context menu, then click {deviceManager} to open the Windows Device Manager.",
+            "message": "Right-click the Windows {startMenu}, then click {deviceManager}.",
             "startMenu": "Start Menu",
             "deviceManager": "Device Manager"
         },
         "2": {
-            "message": "In the Device Manager window, look for {dfuUsbHubName} under {otherDevices}. If it is there, right-click it and select {properties}. If it is not there, then the driver is already installed and you do not need to continue.",
+            "message": "Look for {dfuUsbHubName} under {otherDevices}.",
             "otherDevices": "Other Devices",
-            "properties": "Properties"
+            "properties": "Properties",
+            "listedWithWarning": "If it is listed with a warning sign, right-click it and select {properties}.",
+            "listedWithoutWarning": "If it is listed somewhere else without a warning sign, then the driver is already installed. You may close this window.",
+            "notListed": "If you don't see it at all, make sure the hub is in DFU update mode (see video on the previous page) and try again."
         },
         "3": {
             "message": "In the {properties} dialog, click the {updateDriver} button.",
@@ -44,7 +47,7 @@
             "next": "Next"
         },
         "8": {
-            "message": "A warning dialog will open stating that the driver is not recommended. Click the {yes} button to use the driver anyway. The the driver is compatible.",
+            "message": "A warning dialog says that the driver is not recommended. Click {yes} to proceed anyway. The driver is compatible.",
             "yes": "Yes"
         },
         "9": {