Skip to content

GNOME 45 #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

GNOME 45 #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb80918
GNOME 45
sonnyp Jul 22, 2023
20302b7
library: add switch row (#448)
halfmexican Jul 30, 2023
a10f373
library: Add spin row to boxed list entry (#461)
halfmexican Aug 7, 2023
fe16f5d
Merge branch 'main' into 45
sonnyp Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('Workbench', ['vala', 'c'],
version: '44.2',
version: '45.0',
meson_version: '>= 0.59.0',
license: 'GPL-3.0-only'
)
Expand Down
5 changes: 2 additions & 3 deletions re.sonny.Workbench.Devel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -193,7 +193,7 @@
{
"type": "git",
"url": "https://github.com/JCWasmx86/GTKCssLanguageServer",
"commit": "638bf6e8836d9c2aed6d4c5d17dbf00311155145"
"commit": "6fa2252d55c4c11a866b6ea91c1a8ad52d7d3a01"
}
],
"modules": [
Expand Down Expand Up @@ -224,7 +224,6 @@
}
],
"post-install": [
"cp -a /usr/share/doc/. /app/share/doc/",
Copy link
Contributor Author

@sonnyp sonnyp Jul 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couldn't make this work so far

cp: cannot overwrite directory '/app/share/doc/./appstream' with non-directory

Copy link
Contributor

@andyholmes andyholmes Jul 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe --no-clobber will allow it to copy without hitting the error? It might just bail though, not sure.

Copy link
Contributor Author

@sonnyp sonnyp Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope,

I don't understand the problem. There is no appstream directory in /app/share/doc/ and the same command in an interactive shell works fine

"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/",
Expand Down
3 changes: 1 addition & 2 deletions re.sonny.Workbench.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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/",
Expand Down
19 changes: 18 additions & 1 deletion src/Library/demos/Boxed Lists/main.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,26 @@ Adw.StatusPage {
title: _("A row can be an entry");
}

Adw.SwitchRow {
title: _("Switch Row");
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: _("ComboRow can have a drop down list");
subtitle: _("List of options from a drop down");
model: StringList list {
strings ["this", "is", "a", "string", "list"]
};
Expand Down
2 changes: 1 addition & 1 deletion src/Previewer/previewer.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down