From fb80918bd2c1c8d845bf0eacfe5f4aa180ae3180 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Sat, 22 Jul 2023 10:19:12 +0200 Subject: [PATCH 1/3] GNOME 45 --- meson.build | 2 +- re.sonny.Workbench.Devel.json | 5 ++--- re.sonny.Workbench.json | 3 +-- src/Previewer/previewer.vala | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 7c0930cec..89af49974 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('Workbench', ['vala', 'c'], - version: '44.2', + version: '45.0', meson_version: '>= 0.59.0', license: 'GPL-3.0-only' ) diff --git a/re.sonny.Workbench.Devel.json b/re.sonny.Workbench.Devel.json index e95842741..c59353280 100644 --- a/re.sonny.Workbench.Devel.json +++ b/re.sonny.Workbench.Devel.json @@ -1,7 +1,7 @@ { "id": "re.sonny.Workbench.Devel", "runtime": "org.gnome.Sdk", - "runtime-version": "44", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", @@ -193,7 +193,7 @@ { "type": "git", "url": "https://github.com/JCWasmx86/GTKCssLanguageServer", - "commit": "638bf6e8836d9c2aed6d4c5d17dbf00311155145" + "commit": "6fa2252d55c4c11a866b6ea91c1a8ad52d7d3a01" } ], "modules": [ @@ -224,7 +224,6 @@ } ], "post-install": [ - "cp -a /usr/share/doc/. /app/share/doc/", "cp -a /usr/share/gtk-doc/html/. /app/share/doc", "cp -a /usr/lib/sdk/vala/bin/. /app/bin/", "cp -a /usr/lib/sdk/vala/lib/. /app/lib/", diff --git a/re.sonny.Workbench.json b/re.sonny.Workbench.json index a14cd2b1d..f321e0079 100644 --- a/re.sonny.Workbench.json +++ b/re.sonny.Workbench.json @@ -1,7 +1,7 @@ { "id": "re.sonny.Workbench", "runtime": "org.gnome.Sdk", - "runtime-version": "44", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", @@ -224,7 +224,6 @@ } ], "post-install": [ - "cp -a /usr/share/doc/. /app/share/doc/", "cp -a /usr/share/gtk-doc/html/. /app/share/doc", "cp -a /usr/lib/sdk/vala/bin/. /app/bin/", "cp -a /usr/lib/sdk/vala/lib/. /app/lib/", diff --git a/src/Previewer/previewer.vala b/src/Previewer/previewer.vala index 9fcc414fd..e1efda8d9 100644 --- a/src/Previewer/previewer.vala +++ b/src/Previewer/previewer.vala @@ -118,7 +118,7 @@ namespace Workbench { var end = section.get_end_location(); this.css_parser_error(error.message, (int)start.lines, (int)start.line_chars, (int)end.lines, (int)end.line_chars); }); - this.css.load_from_data (content.data); + this.css.load_from_data (content); Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), this.css , Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); } From 20302b7a756bb41b192592ea12634640d4e05e32 Mon Sep 17 00:00:00 2001 From: halfmexican <103920890+halfmexican@users.noreply.github.com> Date: Sun, 30 Jul 2023 08:37:37 -0500 Subject: [PATCH 2/3] library: add switch row (#448) --- src/Library/demos/Boxed Lists/main.blp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Library/demos/Boxed Lists/main.blp b/src/Library/demos/Boxed Lists/main.blp index 474bb44e7..1066f543d 100644 --- a/src/Library/demos/Boxed Lists/main.blp +++ b/src/Library/demos/Boxed Lists/main.blp @@ -38,9 +38,14 @@ Adw.StatusPage { title: _("A row can be an entry"); } + Adw.SwitchRow { + title: _("Switch Row"); + subtitle: _("Simple on/off control"); + } + Adw.ComboRow { title: _("Choose an item"); - subtitle: _("ComboRow can have a drop down list"); + subtitle: _("List of options from a drop down"); model: StringList list { strings ["this", "is", "a", "string", "list"] }; From a10f373ba0cfc4d8fcb46d175a4b24b6c2776ee7 Mon Sep 17 00:00:00 2001 From: halfmexican <103920890+halfmexican@users.noreply.github.com> Date: Mon, 7 Aug 2023 06:52:37 -0500 Subject: [PATCH 3/3] library: Add spin row to boxed list entry (#461) --- src/Library/demos/Boxed Lists/main.blp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Library/demos/Boxed Lists/main.blp b/src/Library/demos/Boxed Lists/main.blp index 1066f543d..febddf01e 100644 --- a/src/Library/demos/Boxed Lists/main.blp +++ b/src/Library/demos/Boxed Lists/main.blp @@ -43,6 +43,18 @@ Adw.StatusPage { subtitle: _("Simple on/off control"); } + Adw.SpinRow { + title: _("Spin Row"); + subtitle: _("Increment or decrement a value"); + climb-rate: 0.2; + adjustment: Adjustment { + lower: 0; + upper: 100; + step-increment: 1; + value: 50; + }; + } + Adw.ComboRow { title: _("Choose an item"); subtitle: _("List of options from a drop down");