diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d84c5e15..ac9a4f517 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,5 +30,7 @@ "builddir" ], "vala.languageServerPath": "${workspaceFolder}/.flatpak/vala-language-server.sh", - "mesonbuild.configureOnOpen": false + "mesonbuild.configureOnOpen": false, + "mesonbuild.buildFolder": "_build", + "mesonbuild.mesonPath": "${workspaceFolder}/.flatpak/meson.sh" } diff --git a/Makefile b/Makefile index d949809cf..5bf44f29b 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,8 @@ lint: # CSS ./build-aux/fun workbench-cli check css src/**/*.css # Flatpak manifests - flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions build-aux/re.sonny.Workbench.json - flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions build-aux/re.sonny.Workbench.Devel.json + flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions --user-exceptions ./build-aux/exceptions.json build-aux/re.sonny.Workbench.json + flatpak run --user --command=flatpak-builder-lint org.flatpak.Builder manifest --exceptions --user-exceptions ./build-aux/exceptions.json build-aux/re.sonny.Workbench.Devel.json unit: ./build-aux/fun gjs -m ./troll/tst/bin.js test/*.test.js diff --git a/build-aux/exceptions.json b/build-aux/exceptions.json new file mode 100644 index 000000000..6661ce152 --- /dev/null +++ b/build-aux/exceptions.json @@ -0,0 +1,4 @@ +{ + "re.sonny.Workbench": ["external-gitmodule-url-found"], + "re.sonny.Workbench.Devel": ["external-gitmodule-url-found"] +} diff --git a/demos b/demos index 6f3c2a2e9..a55029275 160000 --- a/demos +++ b/demos @@ -1 +1 @@ -Subproject commit 6f3c2a2e9faca443116afc6539a32ba4d11baf8f +Subproject commit a55029275671c56546391a7c8b7288d27bad00ae diff --git a/src/Extensions/Extension.blp b/src/Extensions/Extension.blp index 891c7509f..4cf069c20 100644 --- a/src/Extensions/Extension.blp +++ b/src/Extensions/Extension.blp @@ -21,7 +21,7 @@ template $Extension: ListBoxRow { icon-name: "re.sonny.Workbench-test-pass-symbolic"; styles [ - "success" + "success", ] } } @@ -39,7 +39,7 @@ template $Extension: ListBoxRow { label: _("Run the following command"); styles [ - "dim-label" + "dim-label", ] } @@ -52,7 +52,7 @@ template $Extension: ListBoxRow { xalign: 0; styles [ - "command_snippet" + "command_snippet", ] } } diff --git a/src/Extensions/Extensions.blp b/src/Extensions/Extensions.blp index d3ef359f8..68e156521 100644 --- a/src/Extensions/Extensions.blp +++ b/src/Extensions/Extensions.blp @@ -38,7 +38,7 @@ Adw.Dialog dialog { selection-mode: none; styles [ - "boxed-list" + "boxed-list", ] $Extension { @@ -72,7 +72,7 @@ Adw.Dialog dialog { wrap: true; styles [ - "dim-label" + "dim-label", ] } @@ -83,7 +83,7 @@ Adw.Dialog dialog { wrap: true; styles [ - "dim-label" + "dim-label", ] } } diff --git a/src/Library/EntryRow.blp b/src/Library/EntryRow.blp index 35c9488ce..b5eddb208 100644 --- a/src/Library/EntryRow.blp +++ b/src/Library/EntryRow.blp @@ -28,7 +28,7 @@ template $EntryRow: Adw.ActionRow { Label description_label { styles [ "dim-label", - "caption" + "caption", ] xalign: 0; diff --git a/src/Library/Library.blp b/src/Library/Library.blp index 7d23823af..0fba3c33b 100644 --- a/src/Library/Library.blp +++ b/src/Library/Library.blp @@ -46,7 +46,7 @@ Adw.Window window { label: _("Learn, Test, Remix"); styles [ - "title-1" + "title-1", ] } @@ -79,7 +79,7 @@ Adw.Window window { selection-mode: none; styles [ - "boxed-list" + "boxed-list", ] } @@ -100,7 +100,7 @@ Adw.Window window { label: _("No results"); styles [ - "title-3" + "title-3", ] } @@ -109,7 +109,7 @@ Adw.Window window { halign: center; styles [ - "pill" + "pill", ] } } @@ -119,7 +119,7 @@ Adw.Window window { use-markup: true; styles [ - "caption" + "caption", ] } } diff --git a/src/Permissions/Permissions.blp b/src/Permissions/Permissions.blp index f84efeee1..7ce97b23b 100644 --- a/src/Permissions/Permissions.blp +++ b/src/Permissions/Permissions.blp @@ -37,7 +37,7 @@ Adw.Dialog dialog { label: _("Permissions Needed"); styles [ - "title-1" + "title-1", ] } @@ -55,7 +55,7 @@ Adw.Dialog dialog { xalign: 0; styles [ - "command_snippet" + "command_snippet", ] } @@ -71,7 +71,7 @@ Adw.Dialog dialog { hexpand: true; styles [ - "heading" + "heading", ] } @@ -79,7 +79,7 @@ Adw.Dialog dialog { icon-name: "re.sonny.Workbench-external-link-symbolic"; styles [ - "flat" + "flat", ] } } @@ -88,7 +88,7 @@ Adw.Dialog dialog { selection-mode: none; styles [ - "boxed-list" + "boxed-list", ] Adw.ActionRow { @@ -101,7 +101,7 @@ Adw.Dialog dialog { subtitle: _("Grant for your account only"); styles [ - "property" + "property", ] } @@ -115,7 +115,7 @@ Adw.Dialog dialog { subtitle: _("Network access"); styles [ - "property" + "property", ] } @@ -129,7 +129,7 @@ Adw.Dialog dialog { subtitle: _("Record and play audio"); styles [ - "property" + "property", ] } @@ -143,7 +143,7 @@ Adw.Dialog dialog { subtitle: _("Access to input device such as gamepads"); styles [ - "property" + "property", ] } } diff --git a/src/widgets/CodeFind.blp b/src/widgets/CodeFind.blp index 73c5aecfe..a10d4dfeb 100644 --- a/src/widgets/CodeFind.blp +++ b/src/widgets/CodeFind.blp @@ -11,7 +11,7 @@ template $CodeFind: Revealer { Box { styles [ - "toolbar" + "toolbar", ] halign: center; @@ -63,7 +63,7 @@ template $CodeFind: Revealer { styles [ "circular", - "small" + "small", ] clicked => $onClose(); diff --git a/src/window.blp b/src/window.blp index d279140d2..80a85c65d 100644 --- a/src/window.blp +++ b/src/window.blp @@ -45,7 +45,7 @@ Adw.ApplicationWindow window { styles [ "flat", - "view-toggler" + "view-toggler", ] } @@ -65,7 +65,7 @@ Adw.ApplicationWindow window { styles [ "flat", - "view-toggler" + "view-toggler", ] } @@ -85,7 +85,7 @@ Adw.ApplicationWindow window { styles [ "flat", - "view-toggler" + "view-toggler", ] } @@ -105,7 +105,7 @@ Adw.ApplicationWindow window { styles [ "flat", - "view-toggler" + "view-toggler", ] } } @@ -130,7 +130,7 @@ Adw.ApplicationWindow window { tooltip-text: _("Run (Ctrl+⏎)"); styles [ - "suggested-action" + "suggested-action", ] } } @@ -157,7 +157,7 @@ Adw.ApplicationWindow window { CenterBox { styles [ "toolbar", - "panel_header" + "panel_header", ] height-request: 46; @@ -169,13 +169,13 @@ Adw.ApplicationWindow window { use-markup: true; styles [ - "dim-label" + "dim-label", ] } Separator { styles [ - "spacer" + "spacer", ] } @@ -241,7 +241,7 @@ Adw.ApplicationWindow window { CenterBox { styles [ "toolbar", - "panel_header" + "panel_header", ] height-request: 46; @@ -252,7 +252,7 @@ Adw.ApplicationWindow window { use-markup: true; styles [ - "dim-label" + "dim-label", ] } } @@ -271,7 +271,7 @@ Adw.ApplicationWindow window { CenterBox { styles [ "toolbar", - "panel_header" + "panel_header", ] height-request: 46; @@ -283,13 +283,13 @@ Adw.ApplicationWindow window { use-markup: true; styles [ - "dim-label" + "dim-label", ] } Separator { styles [ - "spacer" + "spacer", ] } @@ -341,7 +341,7 @@ Adw.ApplicationWindow window { CenterBox { styles [ "toolbar", - "panel_header" + "panel_header", ] height-request: 46; @@ -353,7 +353,7 @@ Adw.ApplicationWindow window { label: _("Preview"); styles [ - "flat" + "flat", ] menu-model: preview_menu; @@ -400,7 +400,7 @@ Adw.ApplicationWindow window { valign: fill; styles [ - "background" + "background", ] }; } @@ -425,7 +425,7 @@ Adw.ApplicationWindow window { styles [ "pill", - "suggested-action" + "suggested-action", ] } } @@ -447,7 +447,7 @@ Adw.ApplicationWindow window { label: _("Close Preview Window"); styles [ - "pill" + "pill", ] } } @@ -479,7 +479,7 @@ Adw.ApplicationWindow window { styles [ "toolbar", - "panel_header" + "panel_header", ] [start] @@ -572,7 +572,7 @@ Adw.Dialog dialog_blueprint_experimental { styles [ "suggested-action", - "pill" + "pill", ] } }; @@ -752,7 +752,7 @@ Adw.AlertDialog alert_dialog_save_project { selection-mode: none; styles [ - "boxed-list" + "boxed-list", ] Adw.EntryRow row_project_name { @@ -767,7 +767,7 @@ Adw.AlertDialog alert_dialog_save_project { selection-mode: none; styles [ - "boxed-list" + "boxed-list", ] Adw.ActionRow row_project_location { @@ -785,7 +785,7 @@ Adw.AlertDialog alert_dialog_save_project { styles [ "dim-label", - "caption" + "caption", ] justify: left; @@ -799,7 +799,7 @@ Button button_location { valign: center; styles [ - "flat" + "flat", ] }