From 3ac439e29c5152d3100733302911fceb1a55ba08 Mon Sep 17 00:00:00 2001
From: Lasercar <B_l_u_t_a_c_k@hotmail.com.au>
Date: Sat, 22 Feb 2025 18:22:38 +1000
Subject: [PATCH 1/2] Improved context menus

---
 .../data/ui/chart-editor/context-menus/event.xml   | 11 +++++++++++
 .../ui/chart-editor/context-menus/hold-note.xml    | 14 +++++++++++++-
 .../data/ui/chart-editor/context-menus/note.xml    | 11 +++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/exclude/data/ui/chart-editor/context-menus/event.xml b/exclude/data/ui/chart-editor/context-menus/event.xml
index 77a9b9a2d..376be47b0 100644
--- a/exclude/data/ui/chart-editor/context-menus/event.xml
+++ b/exclude/data/ui/chart-editor/context-menus/event.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu>
+	<label id="contextmenuEventKindLabel" styleName="menuLabel" style="padding: 2px;" text="Event Kind: " />
+	<label id="contextmenuEventKind" styleName="menuLabel" style="padding: 2px;" text="Event Kind" />
+	<property-grid>
+		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
+	</property-grid>
+		<dropdown id="contextmenuUnit" text="Milliseconds" value="MILLISECONDS" selectedIndex="0" >
+     <data>
+        <item id="MILLISECONDS" text="Milliseconds" />
+        <item id="STEPS" text="Steps" />
+    </data>
+	</dropdown>
 	<menu-item id="contextmenuEdit" text="Edit Event" />
 	<menu-item id="contextmenuDelete" text="Delete Event" />
 </menu>
diff --git a/exclude/data/ui/chart-editor/context-menus/hold-note.xml b/exclude/data/ui/chart-editor/context-menus/hold-note.xml
index 8425ffc0c..0e9cedc32 100644
--- a/exclude/data/ui/chart-editor/context-menus/hold-note.xml
+++ b/exclude/data/ui/chart-editor/context-menus/hold-note.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu>
+<menu width="220px">
+	<label id="contextmenuNoteKindLabel" styleName="menuLabel" style="padding: 2px;" text="Hold Note Kind: " />
+	<label id="contextmenuNoteKind" styleName="menuLabel" style="padding: 2px;" text="Note Kind" />
+	<property-grid>
+		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
+		<property id="contextmenuLength" label="Length (MS)" type="float" value="0" />
+	</property-grid>
+	<dropdown id="contextmenuUnit" text="Milliseconds" value="MILLISECONDS" selectedIndex="0" >
+     <data>
+        <item id="MILLISECONDS" text="Milliseconds" />
+        <item id="STEPS" text="Steps" />
+    </data>
+  </dropdown>
 	<menu-item id="contextmenuFlip" text="Flip Note" />
 	<menu-item id="contextmenuRemoveHold" text="Remove Hold" />
 	<menu-item id="contextmenuDelete" text="Delete Note" />
diff --git a/exclude/data/ui/chart-editor/context-menus/note.xml b/exclude/data/ui/chart-editor/context-menus/note.xml
index 775588a94..bea93c42c 100644
--- a/exclude/data/ui/chart-editor/context-menus/note.xml
+++ b/exclude/data/ui/chart-editor/context-menus/note.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu>
+	<label id="contextmenuNoteKindLabel" styleName="menuLabel" style="padding: 2px;" text="Note Kind: " />
+	<label id="contextmenuNoteKind" styleName="menuLabel" style="padding: 2px;" text="Note Kind" />
+	<property-grid>
+		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
+	</property-grid>
+	<dropdown id="contextmenuUnit" text="Milliseconds" value="MILLISECONDS" selectedIndex="0" >
+     <data>
+        <item id="MILLISECONDS" text="Milliseconds" />
+        <item id="STEPS" text="Steps" />
+    </data>
+	</dropdown>
 	<menu-item id="contextmenuFlip" text="Flip Note" />
 	<menu-item id="contextmenuAddHold" text="Add Hold" />
 	<menu-item id="contextmenuDelete" text="Delete Note" />

From 9fc6ec18dbb66124bdec3ce67bbc2a39a367b6d1 Mon Sep 17 00:00:00 2001
From: Lasercar <64717068+Lasercar@users.noreply.github.com>
Date: Wed, 26 Feb 2025 21:47:51 +1000
Subject: [PATCH 2/2] Selection offset

---
 .../data/ui/chart-editor/context-menus/event.xml    |  4 +++-
 .../ui/chart-editor/context-menus/hold-note.xml     |  4 +++-
 exclude/data/ui/chart-editor/context-menus/note.xml |  4 +++-
 .../ui/chart-editor/context-menus/selection.xml     | 13 ++++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/exclude/data/ui/chart-editor/context-menus/event.xml b/exclude/data/ui/chart-editor/context-menus/event.xml
index 376be47b0..2e3eaacd6 100644
--- a/exclude/data/ui/chart-editor/context-menus/event.xml
+++ b/exclude/data/ui/chart-editor/context-menus/event.xml
@@ -2,6 +2,7 @@
 <menu>
 	<label id="contextmenuEventKindLabel" styleName="menuLabel" style="padding: 2px;" text="Event Kind: " />
 	<label id="contextmenuEventKind" styleName="menuLabel" style="padding: 2px;" text="Event Kind" />
+	<menu-separator />
 	<property-grid>
 		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
 	</property-grid>
@@ -11,6 +12,7 @@
         <item id="STEPS" text="Steps" />
     </data>
 	</dropdown>
+	<menu-separator />
 	<menu-item id="contextmenuEdit" text="Edit Event" />
-	<menu-item id="contextmenuDelete" text="Delete Event" />
+	<menu-item id="contextmenuDelete" text="Delete Event" shortcutText="Delete" />
 </menu>
diff --git a/exclude/data/ui/chart-editor/context-menus/hold-note.xml b/exclude/data/ui/chart-editor/context-menus/hold-note.xml
index 0e9cedc32..2900a45c7 100644
--- a/exclude/data/ui/chart-editor/context-menus/hold-note.xml
+++ b/exclude/data/ui/chart-editor/context-menus/hold-note.xml
@@ -2,6 +2,7 @@
 <menu width="220px">
 	<label id="contextmenuNoteKindLabel" styleName="menuLabel" style="padding: 2px;" text="Hold Note Kind: " />
 	<label id="contextmenuNoteKind" styleName="menuLabel" style="padding: 2px;" text="Note Kind" />
+	<menu-separator />
 	<property-grid>
 		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
 		<property id="contextmenuLength" label="Length (MS)" type="float" value="0" />
@@ -12,7 +13,8 @@
         <item id="STEPS" text="Steps" />
     </data>
   </dropdown>
+	<menu-separator />
 	<menu-item id="contextmenuFlip" text="Flip Note" />
 	<menu-item id="contextmenuRemoveHold" text="Remove Hold" />
-	<menu-item id="contextmenuDelete" text="Delete Note" />
+	<menu-item id="contextmenuDelete" text="Delete Note" shortcutText="Delete" />
 </menu>
diff --git a/exclude/data/ui/chart-editor/context-menus/note.xml b/exclude/data/ui/chart-editor/context-menus/note.xml
index bea93c42c..653299351 100644
--- a/exclude/data/ui/chart-editor/context-menus/note.xml
+++ b/exclude/data/ui/chart-editor/context-menus/note.xml
@@ -2,6 +2,7 @@
 <menu>
 	<label id="contextmenuNoteKindLabel" styleName="menuLabel" style="padding: 2px;" text="Note Kind: " />
 	<label id="contextmenuNoteKind" styleName="menuLabel" style="padding: 2px;" text="Note Kind" />
+	<menu-separator />
 	<property-grid>
 		<property id="contextmenuPosition" label="Time (MS)" type="float" value="0" />
 	</property-grid>
@@ -11,7 +12,8 @@
         <item id="STEPS" text="Steps" />
     </data>
 	</dropdown>
+	<menu-separator />
 	<menu-item id="contextmenuFlip" text="Flip Note" />
 	<menu-item id="contextmenuAddHold" text="Add Hold" />
-	<menu-item id="contextmenuDelete" text="Delete Note" />
+	<menu-item id="contextmenuDelete" text="Delete Note" shortcutText="Delete" />
 </menu>
diff --git a/exclude/data/ui/chart-editor/context-menus/selection.xml b/exclude/data/ui/chart-editor/context-menus/selection.xml
index 179747398..9ea2f7a5f 100644
--- a/exclude/data/ui/chart-editor/context-menus/selection.xml
+++ b/exclude/data/ui/chart-editor/context-menus/selection.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu>
+<menu width="220px">
+	<property-grid>
+		<property id="contextmenuOffset" label="Offset (MS)" type="float" value="0" />
+	</property-grid>
+	<dropdown id="contextmenuUnit" text="Milliseconds" value="MILLISECONDS" selectedIndex="0" >
+     <data>
+        <item id="MILLISECONDS" text="Milliseconds" />
+        <item id="STEPS" text="Steps" />
+    </data>
+	</dropdown>
+		<menu-item id="contextmenuOffsetMove" text="Offset Selection" />
+	<menu-separator />
 	<menu-item id="contextmenuCut" text="Cut Selection" shortcutText="Ctrl+X" />
 	<menu-item id="contextmenuCopy" text="Copy Selection" shortcutText="Ctrl+C" />
 	<menu-item id="contextmenuDelete" text="Delete Selection" shortcutText="Delete" />