Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add macro editing UI

Browse Source
This commit is contained in:
Linnea Gräf
2025-06-04 18:45:39 +02:00
parent 9c32c6e824
commit 3695589a47
14 changed files with 379 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/resources/assets/firmament/gui/config/macros/combos.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig"
>
<Panel background="TRANSPARENT" insets="10">
<Column>
<Meta beforeClose="@beforeClose"/>
<ScrollPanel width="380" height="300">
<Align horizontal="CENTER">
<Array data="@actions">
<!-- evenBackground="#8B8B8B" oddBackground="#C6C6C6" -->
<Panel background="TRANSPARENT" insets="3">
<Panel background="VANILLA" insets="6">
<Column>
<Row>
<Text text="@command" width="280"/>
</Row>
<Row>
<Text text="@formattedCombo" width="250"/>
<Align horizontal="RIGHT">
<Row>
<firm:Button onClick="@edit">
<Text text="Edit"/>
</firm:Button>
<Spacer width="12"/>
<firm:Button onClick="@delete">
<Text text="Delete"/>
</firm:Button>
</Row>
</Align>
</Row>
</Column>
</Panel>
</Panel>
</Array>
</Align>
</ScrollPanel>
<Align horizontal="RIGHT">
<Row>
<firm:Button onClick="@discard">
<Text text="Discard Changes"/>
</firm:Button>
<firm:Button onClick="@saveAndClose">
<Text text="Save &amp; Close"/>
</firm:Button>
<firm:Button onClick="@save">
<Text text="Save"/>
</firm:Button>
<firm:Button onClick="@addCommand">
<Text text="Add Combo Command"/>
</firm:Button>
</Row>
</Align>
</Column>
</Panel>
</Root>

42
src/main/resources/assets/firmament/gui/config/macros/editor.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig"
>
<Center>
<Panel background="VANILLA" insets="10">
<Column>
<Row>
<firm:Button onClick="@back">
<Text text="←"/>
</firm:Button>
<Text text="Editing command macro"/>
</Row>
<Row>
<Text text="Command: /"/>
<Align horizontal="RIGHT">
<TextField value="@command" width="200"/>
</Align>
</Row>
<Row>
<Text text="Key Combo:"/>
<Align horizontal="RIGHT">
<firm:Button onClick="@addStep">
<Text text="+"/>
</firm:Button>
</Align>
</Row>
<Array data="@combo">
<Row>
<firm:Fixed width="160">
<Indirect value="@button"/>
</firm:Fixed>
<Align horizontal="RIGHT">
<firm:Button onClick="@delete">
<Text text="Delete"/>
</firm:Button>
</Align>
</Row>
</Array>
</Column>
</Panel>
</Center>
</Root>

16
src/main/resources/assets/firmament/gui/config/macros/index.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig"
xmlns:firm="http://firmament.nea.moe/moulconfig">
<Center>
<Tabs>
<Tab>
<Tab.Header>
<Text text="Combo Macros"/>
</Tab.Header>
<Tab.Body>
<Fragment value="firmament:gui/config/macros/combos.xml" bind="@combos"/>
</Tab.Body>
</Tab>
</Tabs>
</Center>
</Root>