Modify chart & metadata difficulties separately

Author: Lasercar

exclude/data/ui/chart-editor/toolboxes/difficulty.xml

@@ -5,10 +5,7 @@
             <tree-view id="difficultyToolboxTree" width="260" height="200" />
         </frame>
         <hbox>
-            <button allowFocus="false" id="difficultyToolboxAddVariation" text="Add Variation" />
             <button allowFocus="false" id="difficultyToolboxAddDifficulty" text="Add Difficulty" />
-        </hbox>
-        <hbox>
             <button allowFocus="false" id="difficultyToolboxRemoveDifficulty" text="Remove Difficulty" />
         </hbox>
         <rule />

exclude/data/ui/chart-editor/toolboxes/metadata.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <collapsible-dialog id="toolboxMetadata" title="Song Metadata" width="600" height="500">
     <hbox width="100%" height="100%">
-        <vbox width="50%" height="100%">
+        <vbox width="47.5%" height="100%">
             <frame text="Variation: Default" width="100%" height="70%" id="frameVariation">
                 <grid columns="2" height="100%">
                     <label text="Song ID:" verticalAlign="center" horizontalAlign="right" />
-                    <textfield id="inputSongId" value="bopeebo" tooltip="The unique identifier for the song. This is used to refer to the song in code/assets and should only contain filename-safe characters." />
+                    <textfield id="inputSongId" value="bopeebo" tooltip="The unique identifier for the song.\nThis is used to refer to the song in code/assets and should only contain filename-safe characters." />
                     <label text="Song Name:" verticalAlign="center" horizontalAlign="right" />
                     <textfield id="inputSongName" value="Bopeebo" tooltip="The readable name of the song." />
                     <label text="Song Artist:" verticalAlign="center" horizontalAlign="right" />
@@ -59,7 +59,7 @@
                 </grid>
             </frame>
         </vbox>
-        <vbox width="50%" height="100%">
+        <vbox width="52.5%" height="100%">
             <dropdown id="inputTimeChange" value="Time Change" width="100%" horizontalAlign="right" dropdownSize="10" dropdownWidth="300" tooltip="The currently selected time change.">
                 <data>
                     <item text="0 : BPM: 100 in 4/4" />
@@ -124,6 +124,14 @@
             <button allowFocus="false" id="addTimeChange" text="Add Time Change" tooltip="Add a time change after the currently selected time change." />
             <spacer />
             <button allowFocus="false" id="removeTimeChange" text="Remove Current Time Change" tooltip="Remove the currently selected time change." />
+            <frame text="Variations & Song Menu Difficulties" width="100%">
+                <tree-view id="metadataToolboxTree" width="100%" height="140" />
+            </frame>
+            <grid columns="3">
+                <button allowFocus="false" id="buttonAddVariation" text="Add Variation" />
+                <button allowFocus="false" id="buttonAddDifficulty" text="Add Difficulty" />
+                <button allowFocus="false" id="buttonRemove" text="Remove" />
+            </grid>
         </vbox>
     </hbox>
 </collapsible-dialog>

preload/data/ui/chart-editor/dialogs/add-difficulty.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dialog id="addDifficultyDialog" width="300" height="200" title="Add Variation">
+<dialog id="addDifficultyDialog" width="275" height="265" title="Add Difficulty">
 	<vbox width="100%" height="100%">
 		<form id="difficultyForm" width="100%" height="100%">
 			<vbox width="100%" height="100%">
@@ -17,9 +17,13 @@
 					</dropdown>
 					<label id="labelScrollSpeed" text="Scroll Speed: 1.0x" />
 					<spacer />
-					<slider id="inputScrollSpeed" pos="1.0" step="0.1" precision="1" min="0.5" max="5.0" />
+					<slider id="inputScrollSpeed" pos="1.0" step="0.1" precision="1" min="0.5" max="5.0" tooltip="Adjust the relative speed at which the notes move." />
 					<spacer />
+					<label id="labelDifficultyRating" text="Difficulty Rank:" verticalAlign="center" />
+          <number-stepper id="inputDifficultyRating" pos="0" step="1" min="0" max="15" tooltip="Set the rating for this difficulty as shown in the Freeplay menu." />
 				</grid>
+					<checkbox id="inputAddToMetadata" selected="true" text="Add to Metadata" tooltip="Whether to add this difficulty to the Metadata or not.\nDisable this if you intend to hide resulting chart from song menus or\nuse it for something else, like the animations of a background asset." />
+					<checkbox id="inputAddToChart" selected="false" text="Add to Chartdata" tooltip="Whether to add this difficulty to the Chartdata for this variation.\nWARNING: Will destructively override the difficulty if it already exists." />
 			</vbox>
 		</form>
 		<hbox width="100%">