Skip to content

Commit c2263f4

Browse files
committed
UI works with user path window.
1 parent 12b4531 commit c2263f4

File tree

4 files changed

+42
-21
lines changed

4 files changed

+42
-21
lines changed

res/main/schema/legacy-dark.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@
367367

368368
<style class="AudioSample" parents="root">
369369

370+
<main.font.name value="noto-sans-display"/>
371+
<label.font.name value="noto-sans-display"/>
370372
<stereo_groups value="true"/>
371373
<border.color value="bg_name"/>
372374
<border.size value="2"/>
@@ -1976,10 +1978,10 @@
19761978

19771979
<!-- UserPathsDialog widgets -->
19781980
<style class="UserPathsDialog" parents="Window">
1979-
<padding value="16"/>
1981+
<padding value="8"/>
19801982
<border.style value="dialog"/>
19811983
<layout.hscale value="1.0"/>
19821984
<layout.vscale value="1.0"/>
19831985
</style>
1984-
1986+
19851987
</schema>

res/main/schema/legacy.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,8 @@
370370

371371
<style class="AudioSample" parents="root">
372372

373+
<main.font.name value="noto-sans-display"/>
374+
<label.font.name value="noto-sans-display"/>
373375
<stereo_groups value="true"/>
374376
<border.color value="#ffffff"/>
375377
<border.size value="2"/>
@@ -1103,7 +1105,7 @@
11031105
<button.border.radius value="2"/>
11041106
<button.radius value="3"/>
11051107
<button.width value="12"/>
1106-
<button.color value="fader"/>
1108+
<button.color value="fader"/>
11071109
<button.aspect value="0.125" />
11081110
</style>
11091111

@@ -1988,10 +1990,10 @@
19881990

19891991
<!-- UserPathsDialog widgets -->
19901992
<style class="UserPathsDialog" parents="Window">
1991-
<padding value="16"/>
1993+
<padding value="8"/>
19921994
<border.style value="dialog"/>
19931995
<layout.hscale value="1.0"/>
19941996
<layout.vscale value="1.0"/>
19951997
</style>
1996-
1998+
19971999
</schema>

res/main/schema/modern.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,8 @@
353353

354354
<style class="AudioSample" parents="root">
355355

356+
<main.font.name value="noto-sans-display"/>
357+
<label.font.name value="noto-sans-display"/>
356358
<stereo_groups value="true"/>
357359
<border.color value="bg_name"/>
358360
<border.size value="0"/>
@@ -1980,10 +1982,10 @@
19801982
<style class="PluginWindow::StatusBar::Label::FAIL" parents="PluginWindow::StatusBar::Label">
19811983
<text.color value="red"/>
19821984
</style>
1983-
1985+
19841986
<!-- UserPathsDialog widgets -->
19851987
<style class="UserPathsDialog" parents="Window">
1986-
<padding value="16"/>
1988+
<padding value="8"/>
19871989
<border.style value="dialog"/>
19881990
<layout.hscale value="1.0"/>
19891991
<layout.vscale value="1.0"/>

res/main/ui/user_paths.xml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,33 @@
11
<?xml version="1.0"?>
22

33
<window ui:inject="UserPathsDialog">
4-
<vbox spacing="4">
5-
<label text="labels.paths.user_hydrogen_kits" />
6-
<edit ui:id="user_hydrogen_kit_path" />
7-
<label text="labels.paths.user_hydrogen_kits_override" />
8-
<edit ui:id="override_hydrogen_kit_path" />
9-
<hbox>
10-
<check ui:id="override_hydrogen_kits_check" />
11-
<label text="actions.ui_behavior.override_hydrogen_kits" />
12-
</hbox>
13-
<hbox>
14-
<button ui:id="submit" text="actions.apply" />
15-
<button ui:id="cancel" text="actions.cancel" />
16-
</hbox>
17-
</vbox>
4+
5+
<grid rows="3" cols="1" spacing="8" expand="true" fill="true">
6+
<cell vfill="false" vexpand="false">
7+
<vbox >
8+
<label text="labels.paths.user_hydrogen_kits" pad.b="4"/>
9+
<edit ui:inject="FileDialog::Path" ui:id="user_hydrogen_kit_path" width.min="420"/>
10+
</vbox>
11+
</cell>
12+
<cell expand="true">
13+
<vbox vfill="false" vexpand="false">
14+
<label text="labels.paths.user_hydrogen_kits_override" pad.b="4"/>
15+
<edit ui:inject="FileDialog::Search" ui:id="override_hydrogen_kit_path" width.min="420"/>
16+
</vbox>
17+
</cell>
18+
<cell vfill="false" vexpand="false">
19+
<hbox vfill="false" vexpand="false">
20+
<hbox hexpand="false">
21+
<check ui:id="override_hydrogen_kits_check" pad.r="4"/>
22+
<label text="actions.ui_behavior.override_hydrogen_kits" hexpand="false"/>
23+
</hbox>
24+
<void hexpand="true"/>
25+
<hbox hexpand="false">
26+
<button ui:id="submit" text="actions.apply" width="96" pad.r="4"/>
27+
<button ui:id="cancel" text="actions.cancel" width="96"/>
28+
</hbox>
29+
</hbox>
30+
</cell>
31+
</grid>
32+
1833
</window>

0 commit comments

Comments
 (0)