Skip to content

Commit 0159856

Browse files
sonnypsonnyp
committed
Update Blueprint
1 parent fa40deb commit 0159856

File tree

20 files changed

+62
-112
lines changed

20 files changed

+62
-112
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
},
2323
"mesonbuild.configureOnOpen": false,
2424
"mesonbuild.buildFolder": "_build",
25-
"mesonbuild.mesonPath": "/home/sonny/Projects/Workbench/.flatpak/meson.sh",
26-
"vala.languageServerPath": "/home/sonny/Projects/Workbench/.flatpak/vala-language-server.sh"
25+
"mesonbuild.mesonPath": "${workspaceFolder}/.flatpak/meson.sh",
26+
"vala.languageServerPath": "${workspaceFolder}/.flatpak/vala-language-server.sh"
2727
}

‎Workbench.doap‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<homepage rdf:resource="https://workbench.sonny.re" />
1313
<bug-database rdf:resource="https://workbench.sonny.re/feedback" />
1414
<programming-language>JavaScript</programming-language>
15+
<programming-language>Vala</programming-language>
16+
17+
<platform>GTK 4</platform>
18+
<platform>Libadwaita</platform>
1519

1620
<maintainer>
1721
<foaf:Person>

‎blueprint-compiler‎

Submodule blueprint-compiler updated from bc605c5 to c951951

‎data/app.metainfo.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<url type="bugtracker">https://workbench.sonny.re/feedback</url>
2828
<url type="donation">https://workbench.sonny.re/donate</url>
2929
<url type="translate">https://workbench.sonny.re/translate</url>
30+
<url type="vcs-browser">https://workbench.sonny.re/source</url>
3031
<screenshots>
3132
<screenshot type="default">
3233
<image>

‎re.sonny.Workbench.Devel.json‎

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,36 @@
33
"runtime": "org.gnome.Sdk",
44
"runtime-version": "44",
55
"sdk": "org.gnome.Sdk",
6-
"sdk-extensions": [
7-
"org.freedesktop.Sdk.Extension.vala"
8-
],
6+
"sdk-extensions": ["org.freedesktop.Sdk.Extension.vala"],
97
"build-options": {
108
"append-path": "/usr/lib/sdk/vala/bin",
119
"append-ld-library-path": "/usr/lib/sdk/vala/lib"
1210
},
1311
"command": "workbench",
1412
"finish-args": [
15-
"--share=ipc",
16-
"--socket=fallback-x11",
17-
"--socket=wayland",
18-
"--device=dri",
13+
"--share=ipc", "--socket=fallback-x11", "--socket=wayland", "--device=dri",
1914
"--share=network"
2015
],
2116
"modules": [
2217
{
2318
"name": "vte",
2419
"buildsystem": "meson",
2520
"config-opts": [
26-
"-Ddocs=false",
27-
"-Dgtk3=false",
28-
"-Dgtk4=true",
29-
"-Dvapi=false",
21+
"-Ddocs=false", "-Dgtk3=false", "-Dgtk4=true", "-Dvapi=false",
3022
"-Dglade=false"
3123
],
3224
"sources": [
3325
{
3426
"type": "archive",
35-
"url": "https://download.gnome.org/sources/vte/0.72/vte-0.72.0.tar.xz",
36-
"sha256": "40fe914d6c70db34176c922725b6c6ea15d5f3cb2a9b44c57e200a5f950a6736"
27+
"url": "https://download.gnome.org/sources/vte/0.72/vte-0.72.1.tar.xz",
28+
"sha256": "0554f9f88d56ce2d78398fcc7f69bc00e53bbbc5f694e0ae1dcaf5286f89d7e4"
3729
}
3830
]
3931
},
4032
{
4133
"name": "libportal",
4234
"buildsystem": "meson",
43-
"config-opts": [
44-
"-Ddocs=false",
45-
"-Dvapi=false",
46-
"-Dbackends=gtk4"
47-
],
35+
"config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
4836
"sources": [
4937
{
5038
"type": "archive",
@@ -85,12 +73,7 @@
8573
"sha256": "69406a0250d0cc5175408cae7eca80c0c6bfaefc4ae1830b354c0433bcd5ce06"
8674
}
8775
],
88-
"cleanup": [
89-
"/include",
90-
"*.pc",
91-
"*.gir",
92-
"*.typelib"
93-
]
76+
"cleanup": ["/include", "*.pc", "*.gir", "*.typelib"]
9477
},
9578
{
9679
"name": "gee",
@@ -106,9 +89,7 @@
10689
{
10790
"name": "uncrustify",
10891
"buildsystem": "cmake-ninja",
109-
"config-opts": [
110-
"-DCMAKE_BUILD_TYPE=Release"
111-
],
92+
"config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
11293
"builddir": true,
11394
"sources": [
11495
{
@@ -123,24 +104,17 @@
123104
{
124105
"name": "rome",
125106
"buildsystem": "simple",
126-
"build-commands": [
127-
"chmod +x rome",
128-
"cp rome /app/bin/rome"
129-
],
107+
"build-commands": ["chmod +x rome", "cp rome /app/bin/rome"],
130108
"sources": [
131109
{
132110
"type": "archive",
133-
"only-arches": [
134-
"aarch64"
135-
],
111+
"only-arches": ["aarch64"],
136112
"url": "https://registry.npmjs.org/@rometools/cli-linux-arm64/-/cli-linux-arm64-12.0.0.tgz",
137113
"sha512": "9f62c983a78064435470917df708c37aa402affe3422a1942436d7ecdc2253546f0b2f9105936685c99201a28e73aac2a0b51c33d5b9abe1f88df9f86d67c904"
138114
},
139115
{
140116
"type": "archive",
141-
"only-arches": [
142-
"x86_64"
143-
],
117+
"only-arches": ["x86_64"],
144118
"url": "https://registry.npmjs.org/@rometools/cli-linux-x64/-/cli-linux-x64-12.0.0.tgz",
145119
"sha512": "56e40ee1e3ab2a67eb2eb73c2b331a672a73de2d6b0fd157471c0e164ea16b5e8334757ed7b7514189bb8d1675a7e1eb5dd8c02584d273147f134df218b4e195"
146120
}
@@ -150,9 +124,7 @@
150124
"name": "Workbench",
151125
"buildsystem": "meson",
152126
"builddir": true,
153-
"config-opts": [
154-
"-Dprofile=development"
155-
],
127+
"config-opts": ["-Dprofile=development"],
156128
"sources": [
157129
{
158130
"type": "dir",
@@ -161,4 +133,4 @@
161133
]
162134
}
163135
]
164-
}
136+
}

‎re.sonny.Workbench.json‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,22 @@
33
"runtime": "org.gnome.Sdk",
44
"runtime-version": "44",
55
"sdk": "org.gnome.Sdk",
6-
"sdk-extensions": [
7-
"org.freedesktop.Sdk.Extension.vala"
8-
],
6+
"sdk-extensions": ["org.freedesktop.Sdk.Extension.vala"],
97
"build-options": {
108
"append-path": "/usr/lib/sdk/vala/bin",
119
"append-ld-library-path": "/usr/lib/sdk/vala/lib"
1210
},
1311
"command": "workbench",
1412
"finish-args": [
15-
"--share=ipc",
16-
"--socket=fallback-x11",
17-
"--socket=wayland",
18-
"--device=dri",
13+
"--share=ipc", "--socket=fallback-x11", "--socket=wayland", "--device=dri",
1914
"--share=network"
2015
],
2116
"modules": [
2217
{
2318
"name": "vte",
2419
"buildsystem": "meson",
2520
"config-opts": [
26-
"-Ddocs=false",
27-
"-Dgtk3=false",
28-
"-Dgtk4=true",
29-
"-Dvapi=false",
21+
"-Ddocs=false", "-Dgtk3=false", "-Dgtk4=true", "-Dvapi=false",
3022
"-Dglade=false"
3123
],
3224
"sources": [
@@ -40,11 +32,7 @@
4032
{
4133
"name": "libportal",
4234
"buildsystem": "meson",
43-
"config-opts": [
44-
"-Ddocs=false",
45-
"-Dvapi=false",
46-
"-Dbackends=gtk4"
47-
],
35+
"config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
4836
"sources": [
4937
{
5038
"type": "archive",
@@ -61,7 +49,7 @@
6149
{
6250
"type": "git",
6351
"url": "https://gitlab.gnome.org/jwestman/blueprint-compiler.git",
64-
"commit": "bc605c5df86a33ff415f627ab1aa8cca53780c81"
52+
"commit": "c95195197d5b9ca603e8335bd0dfdf730bebec4b"
6553
}
6654
]
6755
},
@@ -86,12 +74,7 @@
8674
"sha256": "69406a0250d0cc5175408cae7eca80c0c6bfaefc4ae1830b354c0433bcd5ce06"
8775
}
8876
],
89-
"cleanup": [
90-
"/include",
91-
"*.pc",
92-
"*.gir",
93-
"*.typelib"
94-
]
77+
"cleanup": ["/include", "*.pc", "*.gir", "*.typelib"]
9578
},
9679
{
9780
"name": "gee",
@@ -107,9 +90,7 @@
10790
{
10891
"name": "uncrustify",
10992
"buildsystem": "cmake-ninja",
110-
"config-opts": [
111-
"-DCMAKE_BUILD_TYPE=Release"
112-
],
93+
"config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
11394
"builddir": true,
11495
"sources": [
11596
{
@@ -124,24 +105,17 @@
124105
{
125106
"name": "rome",
126107
"buildsystem": "simple",
127-
"build-commands": [
128-
"chmod +x rome",
129-
"cp rome /app/bin/rome"
130-
],
108+
"build-commands": ["chmod +x rome", "cp rome /app/bin/rome"],
131109
"sources": [
132110
{
133111
"type": "archive",
134-
"only-arches": [
135-
"aarch64"
136-
],
112+
"only-arches": ["aarch64"],
137113
"url": "https://registry.npmjs.org/@rometools/cli-linux-arm64/-/cli-linux-arm64-12.0.0.tgz",
138114
"sha512": "9f62c983a78064435470917df708c37aa402affe3422a1942436d7ecdc2253546f0b2f9105936685c99201a28e73aac2a0b51c33d5b9abe1f88df9f86d67c904"
139115
},
140116
{
141117
"type": "archive",
142-
"only-arches": [
143-
"x86_64"
144-
],
118+
"only-arches": ["x86_64"],
145119
"url": "https://registry.npmjs.org/@rometools/cli-linux-x64/-/cli-linux-x64-12.0.0.tgz",
146120
"sha512": "56e40ee1e3ab2a67eb2eb73c2b331a672a73de2d6b0fd157471c0e164ea16b5e8334757ed7b7514189bb8d1675a7e1eb5dd8c02584d273147f134df218b4e195"
147121
}
@@ -151,9 +125,7 @@
151125
"name": "Workbench",
152126
"buildsystem": "meson",
153127
"builddir": true,
154-
"config-opts": [
155-
"-Dprofile=default"
156-
],
128+
"config-opts": ["-Dprofile=default"],
157129
"sources": [
158130
{
159131
"type": "dir",
@@ -162,4 +134,4 @@
162134
]
163135
}
164136
]
165-
}
137+
}

‎src/IconLibrary/IconWidget.blp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using Gtk 4.0;
22

3-
template IconWidget : FlowBoxChild {
3+
template $IconWidget : FlowBoxChild {
44
focusable: false;
55
halign: start;
66
Button button {
7-
clicked => onClicked();
7+
clicked => $onClicked();
88
width-request: 48;
99
height-request: 48;
1010
Image image {

‎src/IconLibrary/IconWidget.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Gtk from "gi://Gtk";
22
import GObject from "gi://GObject";
33

44
import Template from "./IconWidget.blp" assert { type: "uri" };
5+
import { registerClass } from "../overrides.js";
56

67
class IconWidget extends Gtk.FlowBoxChild {
78
constructor(params = {}) {
@@ -24,7 +25,7 @@ class IconWidget extends Gtk.FlowBoxChild {
2425
}
2526
}
2627

27-
export default GObject.registerClass(
28+
export default registerClass(
2829
{
2930
GTypeName: "IconWidget",
3031
Template,

‎src/Library/demos/Custom Widget/main.blp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Gtk 4.0;
22

3-
template AwesomeButton: Button {
4-
clicked => onclicked();
3+
template $AwesomeButton : Button {
4+
clicked => $onclicked();
55
Image {
66
halign: center;
77
icon-name: "penguin-alt-symbolic";

‎src/Previewer/Previewer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { encode, settings, unstack } from "../util.js";
1010

1111
import Internal from "./Internal.js";
1212
import External from "./External.js";
13-
import { getClassNameType } from "../overrides.js";
13+
import { getClassNameType, registerClass } from "../overrides.js";
1414

1515
import { assertBuildable, detectCrash, isPreviewable } from "./utils.js";
1616

@@ -124,7 +124,7 @@ export default function Previewer({
124124

125125
// Using this custom scope we make sure that previewing UI definitions
126126
// with signals doesn't fail - in addition, checkout registerSignals
127-
const BuilderScope = GObject.registerClass(
127+
const BuilderScope = registerClass(
128128
{
129129
Implements: [Gtk.BuilderScope],
130130
},

0 commit comments

Comments
 (0)