From edb4efd3d3fbcbaa9c41a443daebff8d32e3c6f3 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Tue, 10 Aug 2021 21:13:37 -0500
Subject: [PATCH] Redesign cursor and addon settings

---
 src/locales/en.json                 | 46 ++++++++++++++++-------------
 src/packager/PackagerOptions.svelte | 46 +++++++++++++++++++----------
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 72dc822..2572e5f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -188,15 +188,34 @@
     "foregroundColor": {
       "string": "Foreground color (progress bar, some icons, some text)"
     },
-    "addons": {
-      "string": "Addons",
-      "context": "Addons section header"
+    "interaction": {
+      "string": "Input",
+      "context": "Input settings header"
     },
-    "gamepadSupport": {
-      "string": "Gamepad support addon (no settings button or modal for now)"
+    "normalCursor": {
+      "string": "Normal cursor"
+    },
+    "noCursor": {
+      "string": "No cursor"
+    },
+    "customCursor": {
+      "string": "Custom cursor"
+    },
+    "cursorHelp": {
+      "string": "32x32 images work best. Larger images may not work reliably."
     },
     "pointerlock": {
-      "string": "Pointerlock"
+      "string": "Lock mouse cursor",
+      "context": "Option to enable pointerlock"
+    },
+    "pointerlockHelp": {
+      "string": "Based on a TurboWarp Experiment."
+    },
+    "gamepad": {
+      "string": "Support USB or Bluetooth gamepads/controllers"
+    },
+    "gamepadHelp": {
+      "string": "Based on the \"Gamepad support\" addon."
     },
     "cloudVariables": {
       "string": "Cloud Variables",
@@ -305,21 +324,6 @@
     },
     "downloadsWillAppearHere": {
       "string": "Downloads will appear here"
-    },
-    "cursor": {
-      "string": "Cursor"
-    },
-    "normalCursor": {
-      "string": "Normal cursor"
-    },
-    "noCursor": {
-      "string": "Hide cursor"
-    },
-    "customCursor": {
-      "string": "Custom cursor"
-    },
-    "cursorHelp": {
-      "string": "32x32 pixel images work best."
     }
   },
   "fileInput": {
diff --git a/src/packager/PackagerOptions.svelte b/src/packager/PackagerOptions.svelte
index e2113ed..ad59683 100644
--- a/src/packager/PackagerOptions.svelte
+++ b/src/packager/PackagerOptions.svelte
@@ -153,7 +153,7 @@
     min-width: 100%;
     height: 200px;
   }
-  .environment-section {
+  .option-group {
     margin-bottom: 12px;
   }
   .downloads {
@@ -276,8 +276,8 @@
     {$_('options.accentColor')}
   </label>
 
-  <h3>{$_('options.cursor')}</h3>
-  <div>
+  <h3>{$_('options.interaction')}</h3>
+  <div class="option-group">
     <label>
       <input type="radio" bind:group={$options.cursor.type} value="auto">
       {$_('options.normalCursor')}
@@ -298,15 +298,29 @@
     </div>
   {/if}
 
-  <h3>{$_('options.addons')}</h3>
-  <label>
-    <input type="checkbox" bind:checked={$options.chunks.gamepad}>
-    {$_('options.gamepadSupport')}
-  </label>
-  <label>
-    <input type="checkbox" bind:checked={$options.chunks.pointerlock}>
-    {$_('options.pointerlock')}
-  </label>
+  <div class="option-group">
+    <label>
+      <input type="checkbox" bind:checked={$options.chunks.pointerlock}>
+      {$_('options.pointerlock')}
+    </label>
+    <div>
+      <a href="https://experiments.turbowarp.org/pointerlock/" target="_blank" rel="noopener">
+        {$_('options.pointerlockHelp')}
+      </a>
+    </div>
+  </div>
+
+  <div class="option-group">
+    <label>
+      <input type="checkbox" bind:checked={$options.chunks.gamepad}>
+      {$_('options.gamepad')}
+    </label>
+    <div>
+      <a href="https://turbowarp.org/addons#gamepad" target="_blank" rel="noopener">
+        {$_('options.gamepadHelp')}
+      </a>
+    </div>
+  </div>
 </Section>
 
 {#if cloudVariables.length > 0}
@@ -375,13 +389,13 @@
 
 <Section accent="#0FBD8C">
   <h2>{$_('options.environment')}</h2>
-  <div class="environment-section">
+  <div class="option-group">
     <label>
       <input type="radio" bind:group={$options.target} value="html">
       {$_('options.html')}
     </label>
   </div>
-  <div class="environment-section">
+  <div class="option-group">
     <label>
       <input type="radio" bind:group={$options.target} value="zip">
       {$_('options.zip')}
@@ -391,7 +405,7 @@
       {$_('options.zip-one-asset')}
     </label>
   </div>
-  <div class="environment-section">
+  <div class="option-group">
     <label>
       <input type="radio" bind:group={$options.target} value="nwjs-win32">
       {$_('options.nwjs-win32')}
@@ -412,7 +426,7 @@
   <details>
     <summary>Experimental platforms</summary>
     <p>Electron will eventually replace NW.js due to improved performance, file size, and security.</p>
-    <div class="environment-section">
+    <div class="option-group">
       <label>
         <input type="radio" bind:group={$options.target} value="electron-win32">
         <!-- TODO: translate -->