Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
ximper-welcome
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
ximper-welcome
Commits
7f51836d
Commit
7f51836d
authored
Feb 11, 2023
by
Bilal Elmoussaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump gtk-rs crates
parent
93bb458d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
169 additions
and
128 deletions
+169
-128
Cargo.lock
Cargo.lock
+147
-104
Cargo.toml
Cargo.toml
+2
-2
application.rs
src/application.rs
+7
-9
image_page.rs
src/widgets/image_page.rs
+7
-7
paginator.rs
src/widgets/paginator.rs
+4
-4
window.rs
src/widgets/window.rs
+2
-2
No files found.
Cargo.lock
View file @
7f51836d
...
@@ -4,18 +4,18 @@ version = 3
...
@@ -4,18 +4,18 @@ version = 3
[[package]]
[[package]]
name = "aho-corasick"
name = "aho-corasick"
version = "0.7.
19
"
version = "0.7.
20
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
"
checksum = "
cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
"
dependencies = [
dependencies = [
"memchr",
"memchr",
]
]
[[package]]
[[package]]
name = "anyhow"
name = "anyhow"
version = "1.0.6
5
"
version = "1.0.6
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602
"
checksum = "
224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800
"
[[package]]
[[package]]
name = "atty"
name = "atty"
...
@@ -48,9 +48,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
...
@@ -48,9 +48,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
[[package]]
name = "cairo-rs"
name = "cairo-rs"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
bd6d010ad1f8103b579afac7713f061e3fc99d101f23928a432e2d42e9bdf249
"
checksum = "
a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"cairo-sys-rs",
"cairo-sys-rs",
...
@@ -62,9 +62,9 @@ dependencies = [
...
@@ -62,9 +62,9 @@ dependencies = [
[[package]]
[[package]]
name = "cairo-sys-rs"
name = "cairo-sys-rs"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d
"
checksum = "
f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e
"
dependencies = [
dependencies = [
"glib-sys",
"glib-sys",
"libc",
"libc",
...
@@ -73,9 +73,9 @@ dependencies = [
...
@@ -73,9 +73,9 @@ dependencies = [
[[package]]
[[package]]
name = "cc"
name = "cc"
version = "1.0.7
3
"
version = "1.0.7
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
"
checksum = "
50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f
"
[[package]]
[[package]]
name = "cfg-expr"
name = "cfg-expr"
...
@@ -117,24 +117,24 @@ dependencies = [
...
@@ -117,24 +117,24 @@ dependencies = [
[[package]]
[[package]]
name = "futures-channel"
name = "futures-channel"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050
"
checksum = "
2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5
"
dependencies = [
dependencies = [
"futures-core",
"futures-core",
]
]
[[package]]
[[package]]
name = "futures-core"
name = "futures-core"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf
"
checksum = "
ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608
"
[[package]]
[[package]]
name = "futures-executor"
name = "futures-executor"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab
"
checksum = "
e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e
"
dependencies = [
dependencies = [
"futures-core",
"futures-core",
"futures-task",
"futures-task",
...
@@ -143,15 +143,15 @@ dependencies = [
...
@@ -143,15 +143,15 @@ dependencies = [
[[package]]
[[package]]
name = "futures-io"
name = "futures-io"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b
bf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68
"
checksum = "b
fb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531
"
[[package]]
[[package]]
name = "futures-macro"
name = "futures-macro"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17
"
checksum = "
95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70
"
dependencies = [
dependencies = [
"proc-macro2",
"proc-macro2",
"quote",
"quote",
...
@@ -160,15 +160,15 @@ dependencies = [
...
@@ -160,15 +160,15 @@ dependencies = [
[[package]]
[[package]]
name = "futures-task"
name = "futures-task"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1
"
checksum = "
dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366
"
[[package]]
[[package]]
name = "futures-util"
name = "futures-util"
version = "0.3.2
4
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90
"
checksum = "
9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1
"
dependencies = [
dependencies = [
"futures-core",
"futures-core",
"futures-macro",
"futures-macro",
...
@@ -180,22 +180,23 @@ dependencies = [
...
@@ -180,22 +180,23 @@ dependencies = [
[[package]]
[[package]]
name = "gdk-pixbuf"
name = "gdk-pixbuf"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6
"
checksum = "
b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"gdk-pixbuf-sys",
"gdk-pixbuf-sys",
"gio",
"gio",
"glib",
"glib",
"libc",
"libc",
"once_cell",
]
]
[[package]]
[[package]]
name = "gdk-pixbuf-sys"
name = "gdk-pixbuf-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7
df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2
"
checksum = "7
b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b
"
dependencies = [
dependencies = [
"gio-sys",
"gio-sys",
"glib-sys",
"glib-sys",
...
@@ -206,9 +207,9 @@ dependencies = [
...
@@ -206,9 +207,9 @@ dependencies = [
[[package]]
[[package]]
name = "gdk4"
name = "gdk4"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6
6fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358
"
checksum = "6
e4887e17b6926db51f1e538d871a8b1f5ceb5dfa3bd0034dc42ec355b390d8f
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"cairo-rs",
"cairo-rs",
...
@@ -222,9 +223,9 @@ dependencies = [
...
@@ -222,9 +223,9 @@ dependencies = [
[[package]]
[[package]]
name = "gdk4-sys"
name = "gdk4-sys"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c
2"
checksum = "
f4993c019bf03d18137c00ddafb2b23e73f7cbb45ae244f52af2542a3f4a945
2"
dependencies = [
dependencies = [
"cairo-sys-rs",
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-pixbuf-sys",
...
@@ -259,9 +260,9 @@ dependencies = [
...
@@ -259,9 +260,9 @@ dependencies = [
[[package]]
[[package]]
name = "gio"
name = "gio"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
3025f17aab38ebbb40d785806cf36c292c4dd6755b05584fc52d34fb87533263
"
checksum = "
1981edf8679d2f2c8ec3120015867f45aa0a1c2d5e3e129ca2f7dda174d3d2a9
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"futures-channel",
"futures-channel",
...
@@ -279,9 +280,9 @@ dependencies = [
...
@@ -279,9 +280,9 @@ dependencies = [
[[package]]
[[package]]
name = "gio-sys"
name = "gio-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c
"
checksum = "
b5d3076ecb86c8c3a672c9843d6232b3a344fb81d304d0ba1ac64b23343efa46
"
dependencies = [
dependencies = [
"glib-sys",
"glib-sys",
"gobject-sys",
"gobject-sys",
...
@@ -292,9 +293,9 @@ dependencies = [
...
@@ -292,9 +293,9 @@ dependencies = [
[[package]]
[[package]]
name = "glib"
name = "glib"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
9d9d01334b55e33e9189fa956dde9885e5439dfa6c448f4d724e222addbf06f2
"
checksum = "
ac347af59233f0544ce00a37bad50f4ac401d006505b26d80ad6d9bbecf6493f
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"futures-channel",
"futures-channel",
...
@@ -307,6 +308,7 @@ dependencies = [
...
@@ -307,6 +308,7 @@ dependencies = [
"glib-sys",
"glib-sys",
"gobject-sys",
"gobject-sys",
"libc",
"libc",
"memchr",
"once_cell",
"once_cell",
"smallvec",
"smallvec",
"thiserror",
"thiserror",
...
@@ -314,9 +316,9 @@ dependencies = [
...
@@ -314,9 +316,9 @@ dependencies = [
[[package]]
[[package]]
name = "glib-macros"
name = "glib-macros"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572
"
checksum = "
5965ae1a44aa4bae4e1e6970f25b66c058fef873d2626c9932a41128dbeea03f
"
dependencies = [
dependencies = [
"anyhow",
"anyhow",
"heck",
"heck",
...
@@ -329,9 +331,9 @@ dependencies = [
...
@@ -329,9 +331,9 @@ dependencies = [
[[package]]
[[package]]
name = "glib-sys"
name = "glib-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f2702
1"
checksum = "
9ddcb73fa8236277bedadaaadb76aef49c85d66340f83bece244f46c2d4f0e0
1"
dependencies = [
dependencies = [
"libc",
"libc",
"system-deps",
"system-deps",
...
@@ -351,9 +353,9 @@ dependencies = [
...
@@ -351,9 +353,9 @@ dependencies = [
[[package]]
[[package]]
name = "gobject-sys"
name = "gobject-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3
"
checksum = "
9a0155d388840c77d61b033b66ef4f9bc7f4133d83df83572d6b4fb234a3be7d
"
dependencies = [
dependencies = [
"glib-sys",
"glib-sys",
"libc",
"libc",
...
@@ -362,9 +364,9 @@ dependencies = [
...
@@ -362,9 +364,9 @@ dependencies = [
[[package]]
[[package]]
name = "graphene-rs"
name = "graphene-rs"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8
"
checksum = "
372514f21c7e342e0206a916d6bd522b15337578cfa68855518a3b4960ba8254
"
dependencies = [
dependencies = [
"glib",
"glib",
"graphene-sys",
"graphene-sys",
...
@@ -373,9 +375,9 @@ dependencies = [
...
@@ -373,9 +375,9 @@ dependencies = [
[[package]]
[[package]]
name = "graphene-sys"
name = "graphene-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163
"
checksum = "
cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9
"
dependencies = [
dependencies = [
"glib-sys",
"glib-sys",
"libc",
"libc",
...
@@ -385,9 +387,9 @@ dependencies = [
...
@@ -385,9 +387,9 @@ dependencies = [
[[package]]
[[package]]
name = "gsk4"
name = "gsk4"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae5
5"
checksum = "
432f981e4ea9f0739a5731d8a649acb794a3a729d2254e559ce7d613b17caf9
5"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"cairo-rs",
"cairo-rs",
...
@@ -401,9 +403,9 @@ dependencies = [
...
@@ -401,9 +403,9 @@ dependencies = [
[[package]]
[[package]]
name = "gsk4-sys"
name = "gsk4-sys"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d
"
checksum = "
096cb59175b0915ebf69c05a45263c0c989bd8537b8f2169912d0de644ba6a76
"
dependencies = [
dependencies = [
"cairo-sys-rs",
"cairo-sys-rs",
"gdk4-sys",
"gdk4-sys",
...
@@ -417,9 +419,9 @@ dependencies = [
...
@@ -417,9 +419,9 @@ dependencies = [
[[package]]
[[package]]
name = "gtk4"
name = "gtk4"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
954e5a318221d69301c80f71cc2d2c15d0d4e259b1b253cad762e93f251bf6d6
"
checksum = "
f61aa16bbd4554552645227d4249b58fd730b27985a7e0283fd0a2d479e954a8
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"cairo-rs",
"cairo-rs",
...
@@ -440,9 +442,9 @@ dependencies = [
...
@@ -440,9 +442,9 @@ dependencies = [
[[package]]
[[package]]
name = "gtk4-macros"
name = "gtk4-macros"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b
"
checksum = "
db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61
"
dependencies = [
dependencies = [
"anyhow",
"anyhow",
"proc-macro-crate",
"proc-macro-crate",
...
@@ -454,9 +456,9 @@ dependencies = [
...
@@ -454,9 +456,9 @@ dependencies = [
[[package]]
[[package]]
name = "gtk4-sys"
name = "gtk4-sys"
version = "0.
5
.0"
version = "0.
6
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c
"
checksum = "
e13cf3bc9559f71963c957eb639060b643e1276ae47b892ef6091d5bc15c3e1b
"
dependencies = [
dependencies = [
"cairo-sys-rs",
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-pixbuf-sys",
...
@@ -472,10 +474,16 @@ dependencies = [
...
@@ -472,10 +474,16 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "heck"
name = "heck"
version = "0.4.
0
"
version = "0.4.
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
"
checksum = "
95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
"
[[package]]
[[package]]
name = "hermit-abi"
name = "hermit-abi"
...
@@ -496,6 +504,16 @@ dependencies = [
...
@@ -496,6 +504,16 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "indexmap"
version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
]
[[package]]
name = "lazy_static"
name = "lazy_static"
version = "1.4.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -503,9 +521,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
...
@@ -503,9 +521,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
[[package]]
name = "libadwaita"
name = "libadwaita"
version = "0.
2
.0"
version = "0.
3
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3
"
checksum = "
674cbf1bd796f3d4f0c24466c15d91180e33e497ae2e07eea3f3d545468dc839
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"futures-channel",
"futures-channel",
...
@@ -522,9 +540,9 @@ dependencies = [
...
@@ -522,9 +540,9 @@ dependencies = [
[[package]]
[[package]]
name = "libadwaita-sys"
name = "libadwaita-sys"
version = "0.
2
.0"
version = "0.
3
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952
"
checksum = "
0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac
"
dependencies = [
dependencies = [
"gdk4-sys",
"gdk4-sys",
"gio-sys",
"gio-sys",
...
@@ -538,9 +556,9 @@ dependencies = [
...
@@ -538,9 +556,9 @@ dependencies = [
[[package]]
[[package]]
name = "libc"
name = "libc"
version = "0.2.13
5
"
version = "0.2.13
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c
"
checksum = "
201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79
"
[[package]]
[[package]]
name = "locale_config"
name = "locale_config"
...
@@ -589,6 +607,15 @@ dependencies = [
...
@@ -589,6 +607,15 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]
[[package]]
name = "objc"
name = "objc"
version = "0.2.7"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -619,15 +646,15 @@ dependencies = [
...
@@ -619,15 +646,15 @@ dependencies = [
[[package]]
[[package]]
name = "once_cell"
name = "once_cell"
version = "1.1
5
.0"
version = "1.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1
"
checksum = "
6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66
"
[[package]]
[[package]]
name = "pango"
name = "pango"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798
"
checksum = "
243c048be90312220fb3bd578176eed8290568274a93c95040289d39349384bc
"
dependencies = [
dependencies = [
"bitflags",
"bitflags",
"gio",
"gio",
...
@@ -639,9 +666,9 @@ dependencies = [
...
@@ -639,9 +666,9 @@ dependencies = [
[[package]]
[[package]]
name = "pango-sys"
name = "pango-sys"
version = "0.1
6
.0"
version = "0.1
7
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d
"
checksum = "
4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8
"
dependencies = [
dependencies = [
"glib-sys",
"glib-sys",
"gobject-sys",
"gobject-sys",
...
@@ -651,9 +678,9 @@ dependencies = [
...
@@ -651,9 +678,9 @@ dependencies = [
[[package]]
[[package]]
name = "pest"
name = "pest"
version = "2.
4.0
"
version = "2.
5.5
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a
"
checksum = "
028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660
"
dependencies = [
dependencies = [
"thiserror",
"thiserror",
"ucd-trie",
"ucd-trie",
...
@@ -673,9 +700,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
...
@@ -673,9 +700,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
[[package]]
name = "pkg-config"
name = "pkg-config"
version = "0.3.2
5
"
version = "0.3.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae
"
checksum = "
6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
"
[[package]]
[[package]]
name = "pretty_env_logger"
name = "pretty_env_logger"
...
@@ -689,13 +716,12 @@ dependencies = [
...
@@ -689,13 +716,12 @@ dependencies = [
[[package]]
[[package]]
name = "proc-macro-crate"
name = "proc-macro-crate"
version = "1.
2.1
"
version = "1.
3.0
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9
"
checksum = "
66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34
"
dependencies = [
dependencies = [
"once_cell",
"once_cell",
"thiserror",
"toml_edit",
"toml",
]
]
[[package]]
[[package]]
...
@@ -724,9 +750,9 @@ dependencies = [
...
@@ -724,9 +750,9 @@ dependencies = [
[[package]]
[[package]]
name = "proc-macro2"
name = "proc-macro2"
version = "1.0.
47
"
version = "1.0.
51
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5
ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725
"
checksum = "5
d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6
"
dependencies = [
dependencies = [
"unicode-ident",
"unicode-ident",
]
]
...
@@ -739,18 +765,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
...
@@ -739,18 +765,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
[[package]]
name = "quote"
name = "quote"
version = "1.0.2
1
"
version = "1.0.2
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179
"
checksum = "
8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b
"
dependencies = [
dependencies = [
"proc-macro2",
"proc-macro2",
]
]
[[package]]
[[package]]
name = "regex"
name = "regex"
version = "1.
6.0
"
version = "1.
7.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4
c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b
"
checksum = "4
8aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733
"
dependencies = [
dependencies = [
"aho-corasick",
"aho-corasick",
"memchr",
"memchr",
...
@@ -759,9 +785,9 @@ dependencies = [
...
@@ -759,9 +785,9 @@ dependencies = [
[[package]]
[[package]]
name = "regex-syntax"
name = "regex-syntax"
version = "0.6.2
7
"
version = "0.6.2
8
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244
"
checksum = "
456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
"
[[package]]
[[package]]
name = "rustc_version"
name = "rustc_version"
...
@@ -792,9 +818,9 @@ dependencies = [
...
@@ -792,9 +818,9 @@ dependencies = [
[[package]]
[[package]]
name = "serde"
name = "serde"
version = "1.0.1
45
"
version = "1.0.1
52
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568
b"
checksum = "
bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5ef
b"
[[package]]
[[package]]
name = "slab"
name = "slab"
...
@@ -813,9 +839,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
...
@@ -813,9 +839,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
[[package]]
name = "syn"
name = "syn"
version = "1.0.10
2
"
version = "1.0.10
7
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1
"
checksum = "
1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5
"
dependencies = [
dependencies = [
"proc-macro2",
"proc-macro2",
"quote",
"quote",
...
@@ -843,27 +869,27 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
...
@@ -843,27 +869,27 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[package]]
[[package]]
name = "termcolor"
name = "termcolor"
version = "1.
1.3
"
version = "1.
2.0
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b
ab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
"
checksum = "b
e55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6
"
dependencies = [
dependencies = [
"winapi-util",
"winapi-util",
]
]
[[package]]
[[package]]
name = "thiserror"
name = "thiserror"
version = "1.0.3
7
"
version = "1.0.3
8
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e
"
checksum = "
6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0
"
dependencies = [
dependencies = [
"thiserror-impl",
"thiserror-impl",
]
]
[[package]]
[[package]]
name = "thiserror-impl"
name = "thiserror-impl"
version = "1.0.3
7
"
version = "1.0.3
8
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb
"
checksum = "
1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f
"
dependencies = [
dependencies = [
"proc-macro2",
"proc-macro2",
"quote",
"quote",
...
@@ -872,14 +898,31 @@ dependencies = [
...
@@ -872,14 +898,31 @@ dependencies = [
[[package]]
[[package]]
name = "toml"
name = "toml"
version = "0.5.
9
"
version = "0.5.
11
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7
"
checksum = "
f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
"
dependencies = [
dependencies = [
"serde",
"serde",
]
]
[[package]]
[[package]]
name = "toml_datetime"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
[[package]]
name = "toml_edit"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
dependencies = [
"indexmap",
"nom8",
"toml_datetime",
]
[[package]]
name = "ucd-trie"
name = "ucd-trie"
version = "0.1.5"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -887,15 +930,15 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
...
@@ -887,15 +930,15 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
[[package]]
[[package]]
name = "unicode-ident"
name = "unicode-ident"
version = "1.0.
5
"
version = "1.0.
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3
"
checksum = "
84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc
"
[[package]]
[[package]]
name = "version-compare"
name = "version-compare"
version = "0.1.
0
"
version = "0.1.
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73
"
checksum = "
579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29
"
[[package]]
[[package]]
name = "version_check"
name = "version_check"
...
...
Cargo.toml
View file @
7f51836d
...
@@ -6,9 +6,9 @@ edition = "2021"
...
@@ -6,9 +6,9 @@ edition = "2021"
[dependencies]
[dependencies]
gtk
=
{
package
=
"gtk4"
,
version
=
"0.
5"
,
features=
["v4_2
"]
}
gtk
=
{
package
=
"gtk4"
,
version
=
"0.
6"
,
features=
["gnome_44
"]
}
log
=
"0.4"
log
=
"0.4"
gettext-rs
=
{
version
=
"0.7"
,
features
=
["gettext-system"]
}
gettext-rs
=
{
version
=
"0.7"
,
features
=
["gettext-system"]
}
adw
=
{package
=
"libadwaita"
,
version
=
"0.
2
"
}
adw
=
{package
=
"libadwaita"
,
version
=
"0.
3
"
}
pretty_env_logger
=
"0.4"
pretty_env_logger
=
"0.4"
regex
=
"1.5"
regex
=
"1.5"
src/application.rs
View file @
7f51836d
...
@@ -24,7 +24,7 @@ mod imp {
...
@@ -24,7 +24,7 @@ mod imp {
impl
ApplicationImpl
for
Application
{
impl
ApplicationImpl
for
Application
{
fn
activate
(
&
self
)
{
fn
activate
(
&
self
)
{
self
.parent_activate
();
self
.parent_activate
();
let
application
=
self
.
instance
();
let
application
=
self
.
obj
();
let
window
=
Window
::
new
(
&
application
);
let
window
=
Window
::
new
(
&
application
);
application
.add_window
(
&
window
);
application
.add_window
(
&
window
);
...
@@ -34,7 +34,7 @@ mod imp {
...
@@ -34,7 +34,7 @@ mod imp {
fn
startup
(
&
self
)
{
fn
startup
(
&
self
)
{
self
.parent_startup
();
self
.parent_startup
();
let
application
=
self
.
instance
();
let
application
=
self
.
obj
();
// Quit
// Quit
let
quit
=
gio
::
ActionEntry
::
builder
(
"quit"
)
let
quit
=
gio
::
ActionEntry
::
builder
(
"quit"
)
.activate
(
move
|
app
:
&
Self
::
Type
,
_
,
_
|
app
.quit
())
.activate
(
move
|
app
:
&
Self
::
Type
,
_
,
_
|
app
.quit
())
...
@@ -65,9 +65,7 @@ mod imp {
...
@@ -65,9 +65,7 @@ mod imp {
}
}
})
})
.build
();
.build
();
application
application
.add_action_entries
([
quit
,
start_tour
,
skip_tour
,
next_page
,
previous_page
]);
.add_action_entries
([
quit
,
start_tour
,
skip_tour
,
next_page
,
previous_page
])
.unwrap
();
application
.set_accels_for_action
(
"app.quit"
,
&
[
"<Control>q"
]);
application
.set_accels_for_action
(
"app.quit"
,
&
[
"<Control>q"
]);
application
.set_accels_for_action
(
"app.skip-tour"
,
&
[
"Escape"
]);
application
.set_accels_for_action
(
"app.skip-tour"
,
&
[
"Escape"
]);
...
@@ -86,10 +84,10 @@ glib::wrapper! {
...
@@ -86,10 +84,10 @@ glib::wrapper! {
impl
Application
{
impl
Application
{
#[allow(clippy
::
new_without_default)]
#[allow(clippy
::
new_without_default)]
pub
fn
new
()
->
Self
{
pub
fn
new
()
->
Self
{
glib
::
Object
::
new
(
&
[
glib
::
Object
::
builder
()
(
"application-id"
,
&
config
::
APP_ID
),
.property
(
"application-id"
,
&
config
::
APP_ID
)
(
"resource-base-path"
,
&
Some
(
"/org/gnome/Tour"
)),
.property
(
"resource-base-path"
,
&
Some
(
"/org/gnome/Tour"
))
]
)
.build
(
)
}
}
fn
window
(
&
self
)
->
Window
{
fn
window
(
&
self
)
->
Window
{
...
...
src/widgets/image_page.rs
View file @
7f51836d
...
@@ -27,7 +27,7 @@ mod imp {
...
@@ -27,7 +27,7 @@ mod imp {
impl
ObjectImpl
for
ImagePageWidget
{
impl
ObjectImpl
for
ImagePageWidget
{
fn
constructed
(
&
self
)
{
fn
constructed
(
&
self
)
{
self
.parent_constructed
();
self
.parent_constructed
();
let
obj
=
self
.
instance
();
let
obj
=
self
.
obj
();
let
layout_manager
=
obj
let
layout_manager
=
obj
.layout_manager
()
.layout_manager
()
.map
(|
l
|
l
.downcast
::
<
gtk
::
BoxLayout
>
()
.unwrap
())
.map
(|
l
|
l
.downcast
::
<
gtk
::
BoxLayout
>
()
.unwrap
())
...
@@ -55,7 +55,7 @@ mod imp {
...
@@ -55,7 +55,7 @@ mod imp {
clamp
.set_child
(
Some
(
&
container
));
clamp
.set_child
(
Some
(
&
container
));
self
.picture
.set_can_shrink
(
false
);
self
.picture
.set_can_shrink
(
false
);
self
.picture
.set_
keep_aspect_ratio
(
true
);
self
.picture
.set_
content_fit
(
gtk
::
ContentFit
::
Contain
);
container
.append
(
&
self
.picture
);
container
.append
(
&
self
.picture
);
let
head_label
=
gtk
::
Label
::
builder
()
let
head_label
=
gtk
::
Label
::
builder
()
...
@@ -138,11 +138,11 @@ glib::wrapper! {
...
@@ -138,11 +138,11 @@ glib::wrapper! {
impl
ImagePageWidget
{
impl
ImagePageWidget
{
pub
fn
new
(
resource_uri
:
&
str
,
head
:
String
,
body
:
String
)
->
Self
{
pub
fn
new
(
resource_uri
:
&
str
,
head
:
String
,
body
:
String
)
->
Self
{
glib
::
Object
::
new
::
<
Self
>
(
&
[
glib
::
Object
::
builder
()
(
"resource-uri"
,
&
resource_uri
),
.property
(
"resource-uri"
,
&
resource_uri
)
(
"head"
,
&
head
),
.property
(
"head"
,
&
head
)
(
"body"
,
&
body
),
.property
(
"body"
,
&
body
)
]
)
.build
(
)
}
}
pub
fn
set_body
(
&
self
,
body
:
&
str
)
{
pub
fn
set_body
(
&
self
,
body
:
&
str
)
{
...
...
src/widgets/paginator.rs
View file @
7f51836d
...
@@ -44,7 +44,7 @@ mod imp {
...
@@ -44,7 +44,7 @@ mod imp {
impl
ObjectImpl
for
PaginatorWidget
{
impl
ObjectImpl
for
PaginatorWidget
{
fn
constructed
(
&
self
)
{
fn
constructed
(
&
self
)
{
self
.parent_constructed
();
self
.parent_constructed
();
let
obj
=
self
.
instance
();
let
obj
=
self
.
obj
();
let
layout_manager
=
obj
let
layout_manager
=
obj
.layout_manager
()
.layout_manager
()
.map
(|
l
|
l
.downcast
::
<
gtk
::
BoxLayout
>
()
.unwrap
())
.map
(|
l
|
l
.downcast
::
<
gtk
::
BoxLayout
>
()
.unwrap
())
...
@@ -67,7 +67,7 @@ mod imp {
...
@@ -67,7 +67,7 @@ mod imp {
gtk
::
Inhibit
(
false
)
gtk
::
Inhibit
(
false
)
}));
}));
obj
.add_controller
(
&
controller
);
obj
.add_controller
(
controller
);
}
}
}
}
impl
WidgetImpl
for
PaginatorWidget
{}
impl
WidgetImpl
for
PaginatorWidget
{}
...
@@ -77,7 +77,7 @@ mod imp {
...
@@ -77,7 +77,7 @@ mod imp {
if
!
self
.carousel
.is_bound
()
{
if
!
self
.carousel
.is_bound
()
{
self
.parent_add_child
(
builder
,
child
,
type_
);
self
.parent_add_child
(
builder
,
child
,
type_
);
}
else
{
}
else
{
self
.
instance
()
self
.
obj
()
.add_page
(
child
.clone
()
.downcast
::
<
gtk
::
Widget
>
()
.unwrap
());
.add_page
(
child
.clone
()
.downcast
::
<
gtk
::
Widget
>
()
.unwrap
());
}
}
}
}
...
@@ -92,7 +92,7 @@ glib::wrapper! {
...
@@ -92,7 +92,7 @@ glib::wrapper! {
impl
PaginatorWidget
{
impl
PaginatorWidget
{
pub
fn
new
()
->
Self
{
pub
fn
new
()
->
Self
{
glib
::
Object
::
new
(
&
[]
)
glib
::
Object
::
new
()
}
}
pub
fn
try_next
(
&
self
)
->
Option
<
()
>
{
pub
fn
try_next
(
&
self
)
->
Option
<
()
>
{
...
...
src/widgets/window.rs
View file @
7f51836d
...
@@ -39,7 +39,7 @@ mod imp {
...
@@ -39,7 +39,7 @@ mod imp {
impl
ObjectImpl
for
Window
{
impl
ObjectImpl
for
Window
{
fn
constructed
(
&
self
)
{
fn
constructed
(
&
self
)
{
self
.parent_constructed
();
self
.parent_constructed
();
let
widget
=
self
.
instance
();
let
widget
=
self
.
obj
();
widget
.set_icon_name
(
Some
(
config
::
APP_ID
));
widget
.set_icon_name
(
Some
(
config
::
APP_ID
));
// Devel Profile
// Devel Profile
...
@@ -71,7 +71,7 @@ glib::wrapper! {
...
@@ -71,7 +71,7 @@ glib::wrapper! {
impl
Window
{
impl
Window
{
pub
fn
new
(
app
:
&
Application
)
->
Self
{
pub
fn
new
(
app
:
&
Application
)
->
Self
{
glib
::
Object
::
new
(
&
[(
"application"
,
app
)]
)
glib
::
Object
::
builder
()
.property
(
"application"
,
app
)
.build
(
)
}
}
pub
fn
paginator
(
&
self
)
->
PaginatorWidget
{
pub
fn
paginator
(
&
self
)
->
PaginatorWidget
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment