Skip to content

Commit bdc52e9

Browse files
yuraizbilelmoussaoui
authored andcommitted
Update gtk4-macros docs and CHANGELOG.md
1 parent 8868d4c commit bdc52e9

File tree

2 files changed

+85
-51
lines changed

2 files changed

+85
-51
lines changed

CHANGELOG.md

Lines changed: 84 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,92 @@
55
<<<<<<< HEAD
66
=======
77
Bilal Elmoussaoui:
8-
- gtk: Implement convenience traits for StringObject
9-
- gtk: Move `gtk::StyleContext::add_provider_for_display` & `gtk::StyleContext::remove_provider_for_display` functions
10-
outside of `gtk::StyleContext` type as it was deprecated in GTK 4.10 causing a wrong deprecation warning.
11-
Switch to `gtk::style_context_add_provider_for_display` & `gtk::style_context_remove_provider_for_display` instead.
8+
9+
- gtk: Implement convenience traits for StringObject
10+
- gtk: Move `gtk::StyleContext::add_provider_for_display` & `gtk::StyleContext::remove_provider_for_display` functions
11+
outside of `gtk::StyleContext` type as it was deprecated in GTK 4.10 causing a wrong deprecation warning.
12+
Switch to `gtk::style_context_add_provider_for_display` & `gtk::style_context_remove_provider_for_display` instead.
13+
14+
Yuri Izmer:
15+
16+
- gtk4-macros: [Extend blueprint support to files](https://github.com/gtk-rs/gtk4-rs/pull/1348)
17+
18+
```rust
19+
#[derive(Debug, Default, gtk::CompositeTemplate)]
20+
#[template(file = "src/my_widget.blp")] // relative to the project directory
21+
pub struct MyWidget {
22+
#[template_child]
23+
pub label: TemplateChild<gtk::Label>,
24+
#[template_child(id = "my_label2")]
25+
pub label2: gtk::TemplateChild<gtk::Label>,
26+
}
27+
```
1228

1329
>>>>>>> 0b4dd7717 (gtk: Implement convenience traits for StringObject)
1430
## [0.6.5]
1531

1632
Fabio Valentini:
17-
- gtk4-macros: enable default features of syn
33+
34+
- gtk4-macros: enable default features of syn
1835

1936
## [0.6.4]
2037

2138
Bilal Elmoussaoui:
22-
- gtk: Add missing guard to AccesibleRoleToggleButton
39+
40+
- gtk: Add missing guard to AccesibleRoleToggleButton
2341

2442
## [0.6.3]
2543

2644
Bilal Elmoussaoui:
27-
- gtk/subclass: Adapt per Accessible transfer type changes
28-
- Bump GTK requirement for `v4_10` feature
29-
- Fix nightly clippy warnings
30-
- Fix docs generation
45+
46+
- gtk/subclass: Adapt per Accessible transfer type changes
47+
- Bump GTK requirement for `v4_10` feature
48+
- Fix nightly clippy warnings
49+
- Fix docs generation
3150

3251
Maximiliano Sandoval R:
33-
- rgba: Add TRANSPARENT const
52+
53+
- rgba: Add TRANSPARENT const
3454

3555
## [0.6.2]
3656

3757
Bilal Elmoussaoui:
38-
- gtk: Add Accessible interface implementation support
58+
59+
- gtk: Add Accessible interface implementation support
3960

4061
Sebastian Dröge:
41-
- Add various new GTK 4.10 APIs
62+
63+
- Add various new GTK 4.10 APIs
4264

4365
## [0.6.1]
4466

4567
Julian Hofer:
46-
- Update book to 0.6
47-
- book: Fix clippy warnings
68+
69+
- Update book to 0.6
70+
- book: Fix clippy warnings
4871

4972
Mițca Dumitru:
50-
- book: Adapt to glib-build-tools breaking change
73+
74+
- book: Adapt to glib-build-tools breaking change
5175

5276
Sebastian Dröge:
53-
- gtk4: Use correct length for the `StrV` when passing to C in
54-
`ConstraintLayout::add_constraint_from_description()`
77+
78+
- gtk4: Use correct length for the `StrV` when passing to C in
79+
`ConstraintLayout::add_constraint_from_description()`
5580

5681
## [0.6.0]
5782

5883
Bilal Elmoussaoui:
59-
- Add support for the to be released `gtk::UriLauncher`
60-
- [Improve the API of `gtk::WidgetExt::dispose_template`](https://github.com/gtk-rs/gtk4-rs/pull/1212)
61-
- [Mention the failed to retrieve template child name](https://github.com/gtk-rs/gtk4-rs/pull/1290)
62-
- [Add a macos job](https://github.com/gtk-rs/gtk4-rs/pull/1237)
84+
85+
- Add support for the to be released `gtk::UriLauncher`
86+
- [Improve the API of `gtk::WidgetExt::dispose_template`](https://github.com/gtk-rs/gtk4-rs/pull/1212)
87+
- [Mention the failed to retrieve template child name](https://github.com/gtk-rs/gtk4-rs/pull/1290)
88+
- [Add a macos job](https://github.com/gtk-rs/gtk4-rs/pull/1237)
6389

6490
yuraiz:
65-
- [Add blueprint support](https://github.com/gtk-rs/gtk4-rs/pull/1238)
91+
92+
- [Add blueprint support](https://github.com/gtk-rs/gtk4-rs/pull/1238)
93+
6694
```rust
6795
#[derive(Debug, Default, gtk::CompositeTemplate)]
6896
#[template(string = "
@@ -83,67 +111,72 @@ pub struct MyWidget {
83111
}
84112
```
85113

86-
87114
## 0.5.5
88115

89116
Bilal Elmoussaoui:
90117

91-
- [gtk: Generate FileLauncher API](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/98253e3f4ea7787b4ab7c705f379af5ac768e606)
92-
- [gtk4-wayland: Bump wayland dependencies](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/619825d1985b420cb82a03ba3f58f2cb9c6bd0ad)
93-
- [gtk4-macros: Bump quick-xml](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/ee63f8745603e6cd70cd34758c2901fe9f5ed25d)
94-
- [gtk: Mark show_uri_full as deprecated](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/6a1e8b92410bf4a1b4da94b5354bdf811abfc982)
95-
- [Regenerate with latest gir-files](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/cb917d096dafa08d2710376b1e4f3f2bad8f191b)
118+
- [gtk: Generate FileLauncher API](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/98253e3f4ea7787b4ab7c705f379af5ac768e606)
119+
- [gtk4-wayland: Bump wayland dependencies](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/619825d1985b420cb82a03ba3f58f2cb9c6bd0ad)
120+
- [gtk4-macros: Bump quick-xml](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/ee63f8745603e6cd70cd34758c2901fe9f5ed25d)
121+
- [gtk: Mark show_uri_full as deprecated](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/6a1e8b92410bf4a1b4da94b5354bdf811abfc982)
122+
- [Regenerate with latest gir-files](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/cb917d096dafa08d2710376b1e4f3f2bad8f191b)
96123

97-
Maximilano:
124+
Maximilano:
98125

99-
- [Mark new dialog api as not nullable](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/6b7ade231c90c676fc86351e86b52f99c2d5f104)
126+
- [Mark new dialog api as not nullable](https://github.com/gtk-rs/gtk4-rs/pull/1233/commits/6b7ade231c90c676fc86351e86b52f99c2d5f104)
100127

101128
## 0.5.4
102129

103130
Bilal Elmoussaoui:
104131

105-
- [gtk: Subclass BuilderCScope for the BuilderRustScope](https://github.com/gtk-rs/gtk4-rs/pull/1217/commits/0c00d06c3f0f05362bb3bc8c7c4d78433970a78d)
106-
- [Generate AlertDialog::choose](https://github.com/gtk-rs/gtk4-rs/pull/1217/commits/71f2266d5f0f78245cc54817bbba3ed916838b48)
107-
108-
132+
- [gtk: Subclass BuilderCScope for the BuilderRustScope](https://github.com/gtk-rs/gtk4-rs/pull/1217/commits/0c00d06c3f0f05362bb3bc8c7c4d78433970a78d)
133+
- [Generate AlertDialog::choose](https://github.com/gtk-rs/gtk4-rs/pull/1217/commits/71f2266d5f0f78245cc54817bbba3ed916838b48)
109134

110135
## 0.5.3
111136

112137
Aaron Erhardt:
113138

114-
- [macros: Allow using re-exports of gtk](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/0d5b2c365a5736a00b2ae1b221e32446a91d3929)
139+
- [macros: Allow using re-exports of gtk](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/0d5b2c365a5736a00b2ae1b221e32446a91d3929)
115140

116141
Bilal Elmoussaoui:
117142

118-
- [gsk: Export builders module](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/5e6856b75337ae6f267f79b1c8938aaab189c102)
119-
- [gtk: Properly mark deprecated manual items](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/7421e4714d9c5c1411a1190bf00dfe1d46e7df10)
120-
- [gtk: Generate new 4.10 APIs](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/eabfc82d518f8b9d29452051f39c3209906355a2)
121-
- [gtk: Fix new FontDialog APIs](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/2d4c19b6779d95df6256002e1dbc7798c6d9589b)
122-
- [gtk: Generate AlertDialog](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/4f28a04e59ef8814ab3a858e42fe9d377c85fc5f)
123-
- [gtk: Add IMContextImpl::activate_osk](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/0ba13215ba5f8c7aaed73a9e76f2a46ae45302d2)
143+
- [gsk: Export builders module](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/5e6856b75337ae6f267f79b1c8938aaab189c102)
144+
- [gtk: Properly mark deprecated manual items](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/7421e4714d9c5c1411a1190bf00dfe1d46e7df10)
145+
- [gtk: Generate new 4.10 APIs](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/eabfc82d518f8b9d29452051f39c3209906355a2)
146+
- [gtk: Fix new FontDialog APIs](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/2d4c19b6779d95df6256002e1dbc7798c6d9589b)
147+
- [gtk: Generate AlertDialog](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/4f28a04e59ef8814ab3a858e42fe9d377c85fc5f)
148+
- [gtk: Add IMContextImpl::activate_osk](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/0ba13215ba5f8c7aaed73a9e76f2a46ae45302d2)
124149

125150
Jason Francis:
126-
- [gtk4: use impl_offset() for calculating template child offset](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/a3613c7b9b39fd6a93931e3d4fcbc2291e53272c)
151+
152+
- [gtk4: use impl_offset() for calculating template child offset](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/a3613c7b9b39fd6a93931e3d4fcbc2291e53272c)
127153

128154
Sebastian Dröge:
129-
- [gtk4-macros: Update to quick-xml 0.26](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/064f8114cfa74a8d9d8ce644cd59cdc897d9ff35)
155+
156+
- [gtk4-macros: Update to quick-xml 0.26](https://github.com/gtk-rs/gtk4-rs/pull/1193/commits/064f8114cfa74a8d9d8ce644cd59cdc897d9ff35)
130157

131158
## 0.5.2
132159

133160
Marc-Andre Lureau:
134-
- [gdk-win32: implement Win32Display.add_filter()](https://github.com/gtk-rs/gtk4-rs/pull/1174)
161+
162+
- [gdk-win32: implement Win32Display.add_filter()](https://github.com/gtk-rs/gtk4-rs/pull/1174)
135163

136164
nardoor:
137-
- [Skip init assertion for gdk::set_allowed_backends](https://github.com/gtk-rs/gtk4-rs/pull/1183)
165+
166+
- [Skip init assertion for gdk::set_allowed_backends](https://github.com/gtk-rs/gtk4-rs/pull/1183)
138167

139168
## 0.5.1
169+
140170
Aaron Erhardt:
141-
- [gtk: Add gnome_43 feature](https://github.com/gtk-rs/gtk4-rs/commit/ddbc370ff50b61e04157bee4cbc5d9e446db498d)
142-
- [gtk: Add gnome_42 feature](https://github.com/gtk-rs/gtk4-rs/commit/05f692d5876a26ba23afc67057b87ed6cd7825e2)
171+
172+
- [gtk: Add gnome_43 feature](https://github.com/gtk-rs/gtk4-rs/commit/ddbc370ff50b61e04157bee4cbc5d9e446db498d)
173+
- [gtk: Add gnome_42 feature](https://github.com/gtk-rs/gtk4-rs/commit/05f692d5876a26ba23afc67057b87ed6cd7825e2)
143174

144175
Bilal Elmoussaoui:
145-
- [gtk: Implement various traits for ResponseType](https://github.com/gtk-rs/gtk4-rs/commit/a270385868be03e50c4e8eb7286846c0de06095e)
146-
- [gtk: Generate new v4.10 APIs](https://github.com/gtk-rs/gtk4-rs/commit/e70c71658479c022606389c26f33b0065d4a2148)
176+
177+
- [gtk: Implement various traits for ResponseType](https://github.com/gtk-rs/gtk4-rs/commit/a270385868be03e50c4e8eb7286846c0de06095e)
178+
- [gtk: Generate new v4.10 APIs](https://github.com/gtk-rs/gtk4-rs/commit/e70c71658479c022606389c26f33b0065d4a2148)
147179

148180
Marc-Andre Lureau:
149-
- [Add gdk4-win32](https://github.com/gtk-rs/gtk4-rs/commit/159db780b3b2d6709c41cbdbe20f4b6088fd574a)
181+
182+
- [Add gdk4-win32](https://github.com/gtk-rs/gtk4-rs/commit/159db780b3b2d6709c41cbdbe20f4b6088fd574a)

gtk4-macros/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ pub fn include_blueprint(input: TokenStream) -> TokenStream {
132132
///
133133
/// The [`CompositeTemplate`] macro can also be used with [Blueprint](https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/)
134134
/// if the feature `blueprint` is enabled.
135+
/// you can use `string` or `file` relative to the project directory but not `resource`
135136
///
136137
/// ```ignore
137138
/// # fn main() {}

0 commit comments

Comments
 (0)