From eb18a06b35e7d4352c2ec0687d9eca9462e617a0 Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Sat, 25 Jan 2025 18:05:59 +0100
Subject: [PATCH] wip: Work on menus

---
 .../Editor/components/HeaderMenu.mjs          | 74 +++++--------------
 .../components/Editor/lib/core-settings.mjs   |  4 +-
 .../react/components/Editor/lib/editor.mjs    |  2 +-
 3 files changed, 20 insertions(+), 60 deletions(-)

diff --git a/packages/react/components/Editor/components/HeaderMenu.mjs b/packages/react/components/Editor/components/HeaderMenu.mjs
index 6e9c6db55d0..92ee63b8610 100644
--- a/packages/react/components/Editor/components/HeaderMenu.mjs
+++ b/packages/react/components/Editor/components/HeaderMenu.mjs
@@ -233,6 +233,23 @@ export const HeaderMenuDraftViewIcons = (props) => {
           />
         </Button>
       ) : null}
+      {ux >= levels.units ? (
+        <Button
+          updateHandler={() =>
+            update.settings(
+              'units',
+              props.state.settings.units === 'imperial' ? 'metric' : 'imperial'
+            )
+          }
+          tooltip="Switches Units between metric and imperial (see Core Settings)"
+        >
+          <UnitsIcon
+            className={`${size} ${
+              props.state.settings.units === 'imperial' ? 'tw-text-secondary' : muted
+            }`}
+          />
+        </Button>
+      ) : null}
       {ux >= levels.paperless ? (
         <Button
           updateHandler={() => update.settings('paperless', props.state.settings.paperless ? 0 : 1)}
@@ -263,64 +280,7 @@ export const HeaderMenuDraftViewIcons = (props) => {
           />
         </Button>
       ) : null}
-      {ux >= levels.units ? (
-        <Button
-          updateHandler={() =>
-            update.settings(
-              'units',
-              props.state.settings.units === 'imperial' ? 'metric' : 'imperial'
-            )
-          }
-          tooltip="Switches Units between metric and imperial (see Core Settings)"
-        >
-          <UnitsIcon
-            className={`${size} ${
-              props.state.settings.units === 'imperial' ? 'tw-text-secondary' : muted
-            }`}
-          />
-        </Button>
-      ) : null}
       <HeaderMenuIconSpacer />
-      {ux >= levels.ux ? (
-        <div className="tw-flex tw-flex-row tw-px-1">
-          <Tooltip tip="Changes your UX setting (see UI Preferences)">
-            {[0, 1, 2, 3, 4].map((i) => (
-              <button
-                key={i}
-                className="tw-daisy-btn tw-daisy-btn-ghost tw-daisy-btn-sm tw-px-0 tw--mx-0.5"
-                onClick={() => update.ui('ux', i + 1)}
-              >
-                <CircleIcon
-                  key={i}
-                  fill={i < props.state.ui.ux ? true : false}
-                  className={`${size} ${
-                    i < props.state.ui.ux
-                      ? 'tw-stroke-secondary tw-fill-secondary'
-                      : 'tw-stroke-current'
-                  }`}
-                  fillOpacity={0.3}
-                />
-              </button>
-            ))}
-          </Tooltip>
-        </div>
-      ) : null}
-      {ux >= levels.aside ? (
-        <Button
-          updateHandler={() => update.ui('aside', props.state.ui.aside ? 0 : 1)}
-          tooltip="Turn the Aside Menu on or off (see UI Preferences)"
-        >
-          <MenuIcon className={`${size} ${!props.state.ui.aside ? 'tw-text-secondary' : muted}`} />
-        </Button>
-      ) : null}
-      {ux >= levels.kiosk ? (
-        <Button
-          updateHandler={() => update.ui('kiosk', props.state.ui.kiosk ? 0 : 1)}
-          tooltip="Turns Kiosk Mode on or off (see UI Preferences)"
-        >
-          <KioskIcon className={`${size} ${props.state.ui.kiosk ? 'tw-text-secondary' : muted}`} />
-        </Button>
-      ) : null}
       {ux >= levels.rotate ? (
         <Button
           updateHandler={() => update.ui('rotate', props.state.ui.rotate ? 0 : 1)}
diff --git a/packages/react/components/Editor/lib/core-settings.mjs b/packages/react/components/Editor/lib/core-settings.mjs
index 0109ac03ff0..fd7d0816419 100644
--- a/packages/react/components/Editor/lib/core-settings.mjs
+++ b/packages/react/components/Editor/lib/core-settings.mjs
@@ -120,8 +120,8 @@ export function menuCoreSettingsStructure({ units = 'metric', sabool = false, pa
       list: ['metric', 'imperial'],
       dflt: 'metric',
       choiceTitles: {
-        metric: 'Metric',
-        imperial: 'Imperial',
+        metric: 'Metric Units (cm)',
+        imperial: 'Imperial Units (inch)',
       },
       valueTitles: {
         metric: 'Metric',
diff --git a/packages/react/components/Editor/lib/editor.mjs b/packages/react/components/Editor/lib/editor.mjs
index 60cca6f88d0..77cdceac62f 100644
--- a/packages/react/components/Editor/lib/editor.mjs
+++ b/packages/react/components/Editor/lib/editor.mjs
@@ -1,7 +1,7 @@
 // Dependencies
 import React from 'react'
 import { defaultConfig } from '../config/index.mjs'
-import { round } from '@freesewing/utils'
+import { round, formatMm } from '@freesewing/utils'
 import { formatDesignOptionValue, menuCoreSettingsStructure } from './index.mjs'
 import { menuUiPreferencesStructure } from './ui-preferences.mjs'
 // Components