From a13e406e99933408572f2953460fc215a11b699d Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Sat, 1 Mar 2025 11:18:15 +0100 Subject: [PATCH] editor: Add missing margins --- data/ui/editor/album.blp | 103 ++++++++++++++++++---------------- data/ui/editor/ensemble.blp | 53 +++++++++-------- data/ui/editor/instrument.blp | 53 +++++++++-------- data/ui/editor/person.blp | 53 +++++++++-------- data/ui/editor/role.blp | 53 +++++++++-------- 5 files changed, 170 insertions(+), 145 deletions(-) diff --git a/data/ui/editor/album.blp b/data/ui/editor/album.blp index 63fb518..15ca53a 100644 --- a/data/ui/editor/album.blp +++ b/data/ui/editor/album.blp @@ -8,68 +8,73 @@ template $MusicusAlbumEditor: Adw.NavigationPage { [top] Adw.HeaderBar header_bar {} - Adw.Clamp { - Gtk.Box { - orientation: vertical; + Gtk.ScrolledWindow { + Adw.Clamp { + Gtk.Box { + orientation: vertical; + margin-bottom: 24; + margin-start: 12; + margin-end: 12; - Gtk.Label { - label: _("Name"); - xalign: 0; - margin-top: 24; + Gtk.Label { + label: _("Name"); + xalign: 0; + margin-top: 24; - styles [ - "heading", - ] - } + styles [ + "heading", + ] + } - $MusicusTranslationEditor name_editor { - margin-top: 12; - } - - Gtk.Label { - label: _("Recordings"); - xalign: 0; - margin-top: 24; - - styles [ - "heading", - ] - } - - Gtk.Box recordings_box { - Gtk.ListBox recordings_list { - selection-mode: none; + $MusicusTranslationEditor name_editor { margin-top: 12; - margin-bottom: 24; - hexpand: true; + } + + Gtk.Label { + label: _("Recordings"); + xalign: 0; + margin-top: 24; + + styles [ + "heading", + ] + } + + Gtk.Box recordings_box { + Gtk.ListBox recordings_list { + selection-mode: none; + margin-top: 12; + margin-bottom: 24; + hexpand: true; + + styles [ + "boxed-list", + ] + + Adw.ButtonRow { + title: _("Add _recording"); + start-icon-name: "list-add-symbolic"; + use-underline: true; + activated => $select_recording() swapped; + } + } + } + + Gtk.ListBox { + selection-mode: none; + margin-top: 24; styles [ "boxed-list", ] - Adw.ButtonRow { - title: _("Add _recording"); - start-icon-name: "list-add-symbolic"; + Adw.ButtonRow save_row { + title: _("_Create album"); use-underline: true; - activated => $select_recording() swapped; + activated => $save() swapped; } } } - - Gtk.ListBox { - selection-mode: none; - margin-top: 24; - - styles [ - "boxed-list", - ] - - Adw.ButtonRow save_row { - title: _("_Create album"); - use-underline: true; - activated => $save() swapped; - } - } } } } diff --git a/data/ui/editor/ensemble.blp b/data/ui/editor/ensemble.blp index ff2b22d..5739963 100644 --- a/data/ui/editor/ensemble.blp +++ b/data/ui/editor/ensemble.blp @@ -8,36 +8,41 @@ template $MusicusEnsembleEditor: Adw.NavigationPage { [top] Adw.HeaderBar header_bar {} - Adw.Clamp { - Gtk.Box { - orientation: vertical; + Gtk.ScrolledWindow { + Adw.Clamp { + Gtk.Box { + orientation: vertical; + margin-bottom: 24; + margin-start: 12; + margin-end: 12; - Gtk.Label { - label: _("Name"); - xalign: 0; - margin-top: 24; + Gtk.Label { + label: _("Name"); + xalign: 0; + margin-top: 24; - styles [ - "heading" - ] - } + styles [ + "heading", + ] + } - $MusicusTranslationEditor name_editor { - margin-top: 12; - } + $MusicusTranslationEditor name_editor { + margin-top: 12; + } - Gtk.ListBox { - selection-mode: none; - margin-top: 24; + Gtk.ListBox { + selection-mode: none; + margin-top: 24; - styles [ - "boxed-list" - ] + styles [ + "boxed-list", + ] - Adw.ButtonRow save_row { - title: _("_Create ensemble"); - use-underline: true; - activated => $save() swapped; + Adw.ButtonRow save_row { + title: _("_Create ensemble"); + use-underline: true; + activated => $save() swapped; + } } } } diff --git a/data/ui/editor/instrument.blp b/data/ui/editor/instrument.blp index dda2ed3..b420219 100644 --- a/data/ui/editor/instrument.blp +++ b/data/ui/editor/instrument.blp @@ -8,36 +8,41 @@ template $MusicusInstrumentEditor: Adw.NavigationPage { [top] Adw.HeaderBar header_bar {} - Adw.Clamp { - Gtk.Box { - orientation: vertical; + Gtk.ScrolledWindow { + Adw.Clamp { + Gtk.Box { + orientation: vertical; + margin-bottom: 24; + margin-start: 12; + margin-end: 12; - Gtk.Label { - label: _("Name"); - xalign: 0; - margin-top: 24; + Gtk.Label { + label: _("Name"); + xalign: 0; + margin-top: 24; - styles [ - "heading" - ] - } + styles [ + "heading", + ] + } - $MusicusTranslationEditor name_editor { - margin-top: 12; - } + $MusicusTranslationEditor name_editor { + margin-top: 12; + } - Gtk.ListBox { - selection-mode: none; - margin-top: 24; + Gtk.ListBox { + selection-mode: none; + margin-top: 24; - styles [ - "boxed-list" - ] + styles [ + "boxed-list", + ] - Adw.ButtonRow save_row { - title: _("_Create instrument"); - use-underline: true; - activated => $save() swapped; + Adw.ButtonRow save_row { + title: _("_Create instrument"); + use-underline: true; + activated => $save() swapped; + } } } } diff --git a/data/ui/editor/person.blp b/data/ui/editor/person.blp index 0087d2f..ec4e874 100644 --- a/data/ui/editor/person.blp +++ b/data/ui/editor/person.blp @@ -8,36 +8,41 @@ template $MusicusPersonEditor: Adw.NavigationPage { [top] Adw.HeaderBar header_bar {} - Adw.Clamp { - Gtk.Box { - orientation: vertical; + Gtk.ScrolledWindow { + Adw.Clamp { + Gtk.Box { + orientation: vertical; + margin-bottom: 24; + margin-start: 12; + margin-end: 12; - Gtk.Label { - label: _("Name"); - xalign: 0; - margin-top: 24; + Gtk.Label { + label: _("Name"); + xalign: 0; + margin-top: 24; - styles [ - "heading" - ] - } + styles [ + "heading", + ] + } - $MusicusTranslationEditor name_editor { - margin-top: 12; - } + $MusicusTranslationEditor name_editor { + margin-top: 12; + } - Gtk.ListBox { - selection-mode: none; - margin-top: 24; + Gtk.ListBox { + selection-mode: none; + margin-top: 24; - styles [ - "boxed-list" - ] + styles [ + "boxed-list", + ] - Adw.ButtonRow save_row { - title: _("_Create person"); - use-underline: true; - activated => $save() swapped; + Adw.ButtonRow save_row { + title: _("_Create person"); + use-underline: true; + activated => $save() swapped; + } } } } diff --git a/data/ui/editor/role.blp b/data/ui/editor/role.blp index 9a05a51..0690f1b 100644 --- a/data/ui/editor/role.blp +++ b/data/ui/editor/role.blp @@ -8,36 +8,41 @@ template $MusicusRoleEditor: Adw.NavigationPage { [top] Adw.HeaderBar header_bar {} - Adw.Clamp { - Gtk.Box { - orientation: vertical; + Gtk.ScrolledWindow { + Adw.Clamp { + Gtk.Box { + orientation: vertical; + margin-bottom: 24; + margin-start: 12; + margin-end: 12; - Gtk.Label { - label: _("Name"); - xalign: 0; - margin-top: 24; + Gtk.Label { + label: _("Name"); + xalign: 0; + margin-top: 24; - styles [ - "heading" - ] - } + styles [ + "heading", + ] + } - $MusicusTranslationEditor name_editor { - margin-top: 12; - } + $MusicusTranslationEditor name_editor { + margin-top: 12; + } - Gtk.ListBox { - selection-mode: none; - margin-top: 24; + Gtk.ListBox { + selection-mode: none; + margin-top: 24; - styles [ - "boxed-list" - ] + styles [ + "boxed-list", + ] - Adw.ButtonRow save_row { - title: _("_Create role"); - use-underline: true; - activated => $save() swapped; + Adw.ButtonRow save_row { + title: _("_Create role"); + use-underline: true; + activated => $save() swapped; + } } } }