Skip to content

X
ximper-welcome
Commit 2f78574f authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui
Browse files
Options

Merge branch 'bilelmoussaoui/headerbar' into 'master'

Always show a headerbar Closes #30 See merge request GNOME/gnome-tour!35
parents 441a3b91 1ddab3b5
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 113 deletions
.gitlab-ci.yml
View file @ 2f78574f
include:
- project: 'gnome/citemplates'
file: 'flatpak/flatpak-ci-initiative-sdk-extensions.yml'
- project: "gnome/citemplates"
file: "flatpak/flatpak-ci-initiative-sdk-extensions.yml"
flatpak:
image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.36'
image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master"
variables:
BUNDLE: "org.gnome.TourDevel.flatpak"
MANIFEST_PATH: "build-aux/org.gnome.TourDevel.json"
FLATPAK_MODULE: "gnome-tour"
APP_ID: "org.gnome.TourDevel"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
extends: '.flatpak'
extends: ".flatpak"
nightly:
extends: '.publish_nightly'
dependencies: ['flatpak']
needs: ['flatpak']
extends: ".publish_nightly"
dependencies: ["flatpak"]
needs: ["flatpak"]
# Configure and run rustfmt
# Exits and builds fails if on bad format
......
build-aux/org.gnome.TourDevel.json
View file @ 2f78574f
{
"app-id" : "org.gnome.TourDevel",
"runtime" : "org.gnome.Platform",
"runtime-version" : "3.36",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
"sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable"
......@@ -29,29 +29,6 @@
},
"modules" : [
{
"name" : "libhandy",
"buildsystem" : "meson",
"config-opts" : [
"-Dintrospection=disabled",
"-Dgtk_doc=false",
"-Dtests=false",
"-Dexamples=false",
"-Dvapi=false",
"-Dglade_catalog=disabled"
],
"cleanup" : [
"/include",
"/lib/pkgconfig"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libhandy.git",
"commit" : "94313c206258860b2428712e7ece1d02c5177857"
}
]
},
{
"name" : "gnome-tour",
"buildsystem" : "meson",
"config-opts" : [
......
data/resources.gresource.xml
View file @ 2f78574f
......@@ -3,10 +3,7 @@
<gresource prefix="/org/gnome/Tour/">
<file compressed="true" alias="style.css">resources/style.css</file>
<file compressed="true" alias="blank.svg">resources/assets/blank.svg</file>
<file compressed="true" alias="start-fg.svg">resources/assets/start-fg.svg</file>
<file compressed="true" alias="start-bg.svg">resources/assets/start-bg.svg</file>
<file compressed="true" alias="start-bg-bg.svg">resources/assets/start-bg-bg.svg</file>
<file compressed="true" alias="start-bg-bg-bg.svg">resources/assets/start-bg-bg-bg.svg</file>
<file compressed="true" alias="welcome.svg">resources/assets/welcome.svg</file>
<file compressed="true" alias="overview.svg">resources/assets/overview.svg</file>
<file compressed="true" alias="workspaces.svg">resources/assets/workspaces.svg</file>
<file compressed="true" alias="makeyourown.svg">resources/assets/makeyourown.svg</file>
......
data/resources/assets/start-bg-bg-bg.svg deleted 100644 → 0
View file @ 441a3b91
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="400" width="600"><defs><linearGradient xlink:href="#a" id="b" x1="-1180" y1="1314.52" x2="-940" y2="1314.52" gradientUnits="userSpaceOnUse" gradientTransform="translate(1059.535 -574.008) scale(1.14415)"/><linearGradient id="a"><stop offset="0" stop-color="#3580e4"/><stop offset="1" stop-color="#8abfdd"/></linearGradient></defs><circle cx="-153.265" cy="930" r="137.298" transform="matrix(0 -1 1 0 -620 9.437)" fill="url(#b)"/></svg>
\ No newline at end of file
data/resources/assets/start-bg-bg.svg deleted 100644 → 0
View file @ 441a3b91
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="400" width="600"><defs><linearGradient id="a"><stop offset="0" stop-color="#b2d0f4"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#b2cdf1"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient xlink:href="#a" id="c" x1="85" y1="195" x2="85" y2="165" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="d" x1="245" y1="195" x2="245" y2="170" gradientUnits="userSpaceOnUse" gradientTransform="translate(670 20.563)"/></defs><path d="M97.5 140a27.5 27.5 0 00-26.938 21.969A17.5 17.5 0 0062.5 160 17.5 17.5 0 0045 177.5 17.5 17.5 0 0062.5 195a17.5 17.5 0 00.05 0H155a10 10 0 0010-10 10 10 0 00-10-10 10 10 0 00-7.871 3.83 20 20 0 00.371-3.83 20 20 0 00-20-20 20 20 0 00-5.17.68A27.5 27.5 0 0097.5 140z" fill="url(#c)" opacity=".5"/><path d="M905 175.563a20 20 0 00-20 20 20 20 0 0020 20h27.5a12.5 12.5 0 0012.5-12.5 12.5 12.5 0 00-12.5-12.5 12.5 12.5 0 00-7.643 2.611A20 20 0 00905 175.563z" opacity=".5" fill="url(#d)" transform="translate(-620 9.437)"/></svg>
\ No newline at end of file
data/resources/assets/start-bg.svg deleted 100644 → 0
View file @ 441a3b91
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="400" width="1400"><defs><linearGradient id="b"><stop offset="0" stop-color="#c5dcf7"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient xlink:href="#a" id="c" x1="85" y1="107.162" x2="85" y2="86" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-3.35406 0 0 3.35406 1487.997 -204.114)"/><linearGradient id="a"><stop offset="0" stop-color="#eef4fc"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient xlink:href="#b" id="d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-2.7272 0 0 2.7272 1434.713 -153.978)" x1="85" y1="107.162" x2="85" y2="86"/><linearGradient xlink:href="#b" id="e" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-2.57314 0 0 2.57314 1337.412 -173.264)" x1="85" y1="110.304" x2="85" y2="86.986"/><linearGradient xlink:href="#b" id="f" gradientUnits="userSpaceOnUse" gradientTransform="translate(1495.83 -136.448) scale(1.54638)" x1="85" y1="107.162" x2="85" y2="82.135"/></defs><g transform="translate(-620 199.437)" fill="url(#c)"><path d="M1172.903 20.563c21.305.03 40.644 12.452 49.52 31.82a40.917 40.917 0 0118.66-4.55c21.519.032 39.339 16.716 40.77 38.187h.139c15.062 0 27.271 12.21 27.271 27.272 0 15.061-12.21 27.271-27.272 27.271h-152.722a32.727 32.727 0 01-32.727-32.726 32.727 32.727 0 0121.914-30.851 57.352 57.352 0 01-.097-1.874c0-30.124 24.42-54.544 54.544-54.544z" fill="url(#d)"/><path style="font-variation-settings:normal" d="M840.695.562a45.133 45.133 0 00-44.932 42.712c-16.205 2.541-28.526 16.495-28.526 33.436 0 18.754 15.098 33.853 33.853 33.853h87.959a26.127 26.127 0 0026.185-26.184 26.129 26.129 0 00-26.185-26.186h-4.848a45.133 45.133 0 001.764-12.497A45.133 45.133 0 00840.832.563a45.133 45.133 0 00-.136 0z" fill="url(#e)"/><path d="M1644.283-37.48a30.932 30.932 0 00-28.08 18.043 23.2 23.2 0 00-10.58-2.58c-12.201.018-22.305 9.478-23.117 21.653h-.079c-8.54 0-15.463 6.923-15.463 15.464 0 8.54 6.923 15.463 15.464 15.463h86.596a18.557 18.557 0 0018.557-18.556 18.557 18.557 0 00-12.426-17.494 32.52 32.52 0 00.055-1.062c0-17.081-13.846-30.928-30.927-30.928z" fill="url(#f)"/></g></svg>
\ No newline at end of file
data/resources/assets/start-fg.svg deleted 100644 → 0
View file @ 441a3b91
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="300"><defs><radialGradient r="33.5" fy="48.406" fx="79.091" cy="48.406" cx="79.091" gradientTransform="matrix(.00476 1.62228 -1.43419 .00422 141.702 -82.047)" gradientUnits="userSpaceOnUse" id="e" xlink:href="#a"/><radialGradient r="12" fy="54.102" fx="71.474" cy="54.102" cx="71.474" gradientTransform="matrix(4.50607 0 0 4.76661 -259.306 -59.706)" gradientUnits="userSpaceOnUse" id="f" xlink:href="#b"/><radialGradient r="14.583" fy="49.777" fx="40.152" cy="49.777" cx="40.152" gradientTransform="matrix(.87016 4.27869 -2.56693 .52204 148.394 -163.306)" gradientUnits="userSpaceOnUse" id="g" xlink:href="#c"/><radialGradient r="14.583" fy="49.777" fx="40.152" cy="49.777" cx="40.152" gradientTransform="matrix(.87016 4.27869 -2.56693 .52204 148.394 -163.306)" gradientUnits="userSpaceOnUse" id="h" xlink:href="#c"/><linearGradient id="a"><stop offset="0" stop-color="#fff"/><stop offset=".519" stop-color="#fff"/><stop offset=".734" stop-color="#cfcfcf"/><stop offset="1" stop-color="#dcdcdc"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#ed686f"/><stop offset=".865" stop-color="#a51d2d"/><stop offset="1" stop-color="#e01b24"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#ed686f"/><stop offset=".911" stop-color="#a51d2d"/><stop offset="1" stop-color="#e01b24"/></linearGradient><clipPath id="d" clipPathUnits="userSpaceOnUse"><path d="M65 177c-18.502 0-33.5 14.998-33.5 33.5.008 7.371 4.131 15.807 11.388 23.526l12.617 13.171H75.02l12.137-13.245c6.636-7.059 11.33-16.117 11.344-23.452 0-18.502-14.998-33.5-33.5-33.5z" style="marker:none" fill="#fff" stroke-width="2"/></clipPath></defs><g transform="matrix(2.34097 0 0 2.2008 137.836 -339.542)" clip-path="url(#d)"><path transform="translate(-8 156)" d="M73 21c-18.502 0-33.5 14.998-33.5 33.5.008 7.371 3.5 14.422 6.94 20.379L58 98h30l11.605-23.21c3.395-5.88 6.88-12.955 6.895-20.29C106.5 35.998 91.502 21 73 21z" style="marker:none" fill="url(#e)"/><path d="M64 177s-18.332 12.132-18.332 30.989C45.668 222.56 61.842 254 61.842 254H67s1.333-31.44 1.333-46.011C68.333 189.132 64 177 64 177z" fill="url(#f)"/><path transform="translate(-8 156)" d="M71.983 21.106c-8.207.147-16.328 3.285-22.5 8.695-6.174 5.409-10.35 13.047-11.574 21.163-1.24 8.225.567 16.874 4.995 23.915L61.902 98h6.432L55.002 81.27c-4.3-5.395-8.472-11.07-10.596-17.634-2.123-6.564-2.166-13.8.003-20.348A32.824 32.824 0 0154.925 28.13a32.824 32.824 0 0117.058-7.025z" fill="url(#g)"/><path transform="matrix(-1 0 0 1 137.16 155.823)" d="M73.003 21.303c-7.709-1.547-15.97-.154-22.746 3.835-6.776 3.989-12.002 10.537-14.39 18.029a32.484 32.484 0 00-.757 16.805 32.484 32.484 0 007.794 14.907L54.11 98h13.383L54.16 74.356c-2.868-5.087-5.557-10.406-6.427-16.181-.87-5.775.036-11.771 2.374-17.123 4.173-9.55 12.836-17.022 22.895-19.748z" fill="url(#h)"/></g><path style="marker:none" d="M272.834 227.583v14.548a7.277 7.277 0 007.293 7.294h19.744c4.041 0 6.446-3.343 7.294-7.294v-14.548z" fill="#e5a50a"/><path style="marker:none" d="M272.834 224.462v14.548a7.277 7.277 0 007.293 7.293h19.744c4.041 0 6.446-3.341 7.294-7.293v-14.548z" fill="#e5a50a"/><path style="marker:none" d="M294.681 224.462v21.84h5.19c4.041 0 6.446-3.34 7.294-7.292v-14.548z" fill="#f3af0b"/></svg>
\ No newline at end of file
data/resources/assets/welcome.svg 0 → 100644
View file @ 2f78574f
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="300" width="600"><defs><linearGradient id="m"><stop offset="0" stop-color="#3f8ae6"/><stop offset="1" stop-color="#1a5fb4"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#a3a3a3"/><stop offset=".472" stop-color="#e8e7e6"/><stop offset="1" stop-color="#aeaeae"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#c0bfbc"/><stop offset=".407" stop-color="#d1d0ce"/><stop offset="1" stop-color="#c0bfbc"/></linearGradient><linearGradient id="j"><stop offset="0" stop-color="#77767b"/><stop offset=".317" stop-color="#a2a2a6"/><stop offset="1" stop-color="#77767b"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#f66151"/><stop offset="1" stop-color="#f8e45c"/></linearGradient><linearGradient id="h"><stop offset="0" stop-color="#1b744c"/><stop offset=".042" stop-color="#26a269"/><stop offset=".084" stop-color="#1b744c"/><stop offset=".888" stop-color="#1a6e48"/><stop offset=".977" stop-color="#26a269"/><stop offset="1" stop-color="#1b744c"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#26a269"/><stop offset="1" stop-color="#208758"/></linearGradient><linearGradient xlink:href="#a" id="s" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.27273 0 0 .27273 16.112 15.667)" x1="175.59" y1="822.553" x2="175.59" y2="881.22"/><linearGradient id="a" x1="147.31" x2="185.85" y1="830.88" y2="869.42" gradientTransform="translate(351.45 336.28)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset="1" stop-color="gray" stop-opacity=".8"/></linearGradient><linearGradient xlink:href="#b" id="t" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.15612 -.1104 .15612 .1104 46.966 104.47)" x1="128.817" y1="-97.698" x2="158.518" y2="-127.399"/><linearGradient id="b"><stop offset="0" stop-color="#d0bb8e"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient xlink:href="#c" id="u" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.58 0 0 1 -97.106 -104)" x1="115" y1="183" x2="115" y2="174"/><linearGradient id="c"><stop offset="0" stop-color="#5e5c64"/><stop offset="1" stop-color="#9a9996"/></linearGradient><linearGradient xlink:href="#d" id="v" gradientUnits="userSpaceOnUse" gradientTransform="translate(-29.333 -104)" x1="110" y1="182" x2="110" y2="174"/><linearGradient id="d"><stop offset="0" stop-color="#9a9996"/><stop offset=".533" stop-color="#deddda"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient xlink:href="#e" id="q" x1="58" y1="189" x2="70" y2="189" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.90637 0 0 .90637 6.715 16.34)"/><linearGradient id="e"><stop offset="0" stop-color="#77767b"/><stop offset=".075" stop-color="#9a9996"/><stop offset=".445" stop-color="#deddda"/><stop offset=".834" stop-color="#b9b8b8"/><stop offset="1" stop-color="#77767b"/></linearGradient><linearGradient xlink:href="#f" id="p" x1="60" y1="199.856" x2="68" y2="199.856" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.89344 0 0 .89344 7.505 20.47)"/><linearGradient id="f"><stop offset="0" stop-color="#9a9996"/><stop offset=".119" stop-color="#c0bfbc"/><stop offset=".351" stop-color="#deddda"/><stop offset=".602" stop-color="#d2d1ce"/><stop offset=".853" stop-color="#bbbab7"/><stop offset="1" stop-color="#9a9996"/></linearGradient><linearGradient xlink:href="#g" id="y" x1="-1257.475" y1="960.833" x2="-949.943" y2="960.833" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#h" id="x" x1="-1297.668" y1="953.346" x2="-892.289" y2="953.346" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#i" id="n" x1="1760" y1="760" x2="400" y2="760" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.3 0 0 .3 4.6 -20.628)"/><linearGradient xlink:href="#j" id="E" x1="1589.498" y1="211.155" x2="1690.939" y2="211.155" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#j" id="F" gradientUnits="userSpaceOnUse" x1="1574.435" y1="213.236" x2="1648.121" y2="213.236" gradientTransform="translate(24.42)"/><linearGradient xlink:href="#k" id="H" x1="1575.074" y1="300.139" x2="1663.814" y2="300.139" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.42)"/><linearGradient xlink:href="#l" id="J" x1="1592.402" y1="350.835" x2="1637.724" y2="350.835" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#j" id="B" gradientUnits="userSpaceOnUse" x1="1574.435" y1="213.236" x2="1648.121" y2="213.236"/><linearGradient xlink:href="#j" id="C" gradientUnits="userSpaceOnUse" x1="1574.435" y1="213.236" x2="1648.121" y2="213.236"/><linearGradient xlink:href="#j" id="D" gradientUnits="userSpaceOnUse" x1="1574.435" y1="213.236" x2="1648.121" y2="213.236"/><linearGradient xlink:href="#k" id="G" gradientUnits="userSpaceOnUse" x1="1575.074" y1="300.139" x2="1663.814" y2="300.139" gradientTransform="translate(24.42)"/><clipPath id="o" clipPathUnits="userSpaceOnUse"><path style="marker:none" d="M-416-180l-64 64h-136c-17.728 0-32 14.272-32 32v256c0 17.728 14.272 32 32 32h136l64-64 64 64h249c17.729 0 32-14.272 32-32V-84c0-17.728-14.271-32-32-32h-249z" fill="#ebedea" stroke-width=".045"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="A"><rect width="440" height="180" x="-1320" y="500" rx="41.022" ry="41.022" fill="#e01b24" stroke-width="1.897" stroke-opacity=".957"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="z"><rect width="400" height="400" x="-1300" y="540" rx="48.664" ry="48.664" fill="#c01c28" stroke-width="2" stroke-opacity=".957"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="w"><rect width="400" height="230" x="-1299.199" y="742.831" rx="58.746" ry="58.746" fill="#e01b24" stroke-width="2" stroke-opacity=".957"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="I"><ellipse cx="1615.072" cy="332.343" rx="34.171" ry="24.497" fill="#9141ac" stroke-width="2" stroke-opacity=".957"/></clipPath><radialGradient xlink:href="#m" id="K" cx="1614.563" cy="343.175" fx="1614.563" fy="343.175" r="34.171" gradientTransform="matrix(1 0 0 .7169 0 92.203)" gradientUnits="userSpaceOnUse"/><filter id="r" x="-.06" y="-.06" width="1.12" height="1.12" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="1.2"/></filter></defs><path d="M136.6 51.732v.56a35.08 35.08 45 0035.08 35.08h17.948a8 8 45 018 8v3.28a8 8 135 01-8 8H105.68a35.08 35.08 135 00-35.08 35.08v.56a35.08 35.08 45 0035.08 35.08H128a8 8 45 018 8v2a8 8 135 01-8 8h-4.32a35.08 35.08 135 00-35.08 35.08v.56a35.08 35.08 45 0035.08 35.08h397.84a35.08 35.08 135 0035.08-35.08v-.56a35.08 35.08 45 00-35.08-35.08H296a8 8 45 01-8-8v-2a8 8 135 018-8h59.52a35.08 35.08 135 0035.08-35.08v-.56a35.08 35.08 45 00-35.08-35.08h-21.303a9.617 9.617 45 01-9.617-9.617v-.046a9.617 9.617 135 019.617-9.617h7.303a35.08 35.08 135 0035.08-35.08v-.56a35.08 35.08 45 00-35.08-35.08H171.68a35.08 35.08 135 00-35.08 35.08z" fill="url(#n)"/><path fill="#c0bfbc" d="M-534.371 87.372h271.029v22.72h-271.029z"/><path fill="#c0bfbc" d="M-619.4 106.652h420v70.72h-420zM-553.4 16.652h420v70.72h-420z"/><path fill="#c0bfbc" d="M-571.4 172.652h300v22.72h-300zM-601.4 195.372h360v70.72h-360z"/><g><g transform="matrix(.3564 0 0 .3564 540.836 137.544)" clip-path="url(#o)" stroke-width="3.333"><path style="marker:none" d="M-416.566-179.89l-64 64h-136c-17.728 0-32 14.271-32 32v256c0 17.727 14.272 32 32 32h136l64-64 64 64h251.27c17.727 0 32-14.273 32-32v-256c0-17.729-14.273-32-32-32h-251.27z" fill="#d6d9dc" enable-background="new"/><path d="M-594.566-133.89v146l67 67v45H-658v-260z" fill="#61a1d2" enable-background="new"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M-608.566-123.89a8 8 0 00-8 8v136a8 8 0 002.343 5.655l61.657 61.659v12.681l-95.996-.047a8 8 0 00-8.004 8v32.102a8 8 0 008 8h167.25a8 8 0 005.423-2.12l59.295-54.689 58.575 54.659a8 8 0 005.457 2.15h71c30.87 0 57.05-25.72 57.05-58.05v-206a8 8 0 00-8-8h-32.101a8 8 0 00-8 8v206c0 2.52-1.236 5.057-3.242 7.029-2.006 1.971-4.708 2.92-5.707 2.92h-67.873l-61.704-56.91a8 8 0 00-10.847 0l-61.707 56.915-20.87.034V76.109a8 8 0 00-2.343-5.656l-61.656-61.658v-124.686a8 8 0 00-8-8z" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#fff" enable-background="accumulate"/><path d="M-584.566-35.89h104l64-64 64 64h88" fill="none" stroke="#fff" stroke-width="53.333" enable-background="new"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M-264.617-115.89v206c0 10.027-9.374 17.948-16.95 17.948h-71l-64-59.029-64 59.03-32 .05v-32l-64-64v-128h-32v136l64 64v24l-104-.05v32.101h167.25l64.75-59.72 64 59.72h71c26.425 0 49.051-22.026 49.051-50.05v-206z" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#d5c370" enable-background="accumulate"/><path d="M-416.566-179.89v320l64 64v-320z" fill="#12121c" fill-opacity=".161" enable-background="new"/><path d="M-416.566-179.89v320l-64 64v-320z" fill="#fff" fill-opacity=".382" enable-background="new"/><path d="M-89.223-129.78v52.176a16 16 135 01-16 16h-1.67a16 16 135 00-16 16v1.67a16 16 135 01-16 16h-53.86a16 16 45 01-16-16v-35.34a16 16 135 0116-16h1.67a16 16 135 0016-16v-18.506a16 16 135 0116-16h53.86a16 16 45 0116 16zM30.393 26.758v133.82a16 16 135 01-16 16h-34.328a16 16 135 00-16 16v34.327a16 16 135 01-16 16h-137.136a16 16 45 01-16-16V126.25a16 16 135 0116-16h34.328a16 16 135 0016-16V26.758a16 16 135 0116-16H14.393a16 16 45 0116 16z" fill="#61a1d2"/><path fill="#fff" d="M-228.767-13.183h192.882v8.418h-192.882z"/></g><g transform="matrix(.74954 0 0 .74954 277.628 -114.688)" stroke-width="3.333"><circle r="12.689" cy="186.738" cx="64.723" fill="none" stroke="#d6d9dc" stroke-width="5.337" stroke-linejoin="round" enable-background="new"/><path fill="url(#p)" enable-background="new" d="M61.111 190.222h7.148v17.869h-7.148z"/><path fill="url(#q)" enable-background="new" d="M59.284 183.113H70.16v9.064H59.284z"/><path opacity=".2" enable-background="new" d="M61.097 192.177h7.251v1.813h-7.251zM62.91 183.113v7.251h-1.813v-7.251zM66.535 183.113v7.251h-1.813v-7.251zM70.161 183.113v7.251h-1.813v-7.251z"/><circle cx="64" cy="258.117" r="46" fill-opacity=".239" enable-background="new"/><circle cx="64" cy="253.887" r="46" fill="#a9a8aa" enable-background="new"/><circle r="46" cy="250" cx="64" fill="#d6d9dc" enable-background="new"/><circle cx="64" cy="250" r="42" fill="#d6d9dc" enable-background="new"/><g transform="matrix(1 0 0 -1 150 500)"><circle transform="rotate(-15)" r="39.682" cy="219.223" cx="-147.774" fill="#fff" enable-background="new"/></g><g transform="rotate(30 64 250.305)"><g fill="#fff" fill-rule="evenodd"><path d="M64.03 285.651l8.306-31.225H55.723z" fill="#deddda" enable-background="new"/><path d="M64.032 285.643l8.304-31.217h-8.304z" fill="#5e5c64" fill-opacity=".373" enable-background="new"/></g><g fill-rule="evenodd"><path transform="matrix(.24993 0 0 .31164 -67.726 -117.645)" d="M527.04 1123.5l-24 48h48z" fill="#1a1a1a" fill-opacity=".4" filter="url(#r)" enable-background="new"/><path d="M64 214.958l-8.307 31.225h16.614z" fill="#ed333b" enable-background="new"/><path d="M63.998 214.967l-8.305 31.216h8.305z" fill="#fff" fill-opacity=".373" enable-background="new"/></g><circle r="12" cy="250" cx="64" fill="url(#s)" enable-background="new"/><circle r="11" cy="-249" cx="64" transform="scale(1 -1)" fill="#ccc" enable-background="new"/></g></g><path style="marker:none" d="M470.692 157.964l-6.238.891-6.236.89-58.537 58.538-2.39 2.388-2.374 2.375a5.03 5.03 0 000 7.13l3.564 3.562a5.028 5.028 0 007.127 0l4.135-4.133 1.805-1.806 57.361-57.362.89-6.236z" fill-opacity=".159" enable-background="new"/><g stroke-width="3.333"><path style="marker:none" d="M48 77v-6l4-3v12z" fill="url(#t)" enable-background="new" transform="matrix(-.89099 .89099 .89099 .89099 443.44 45.823)"/><path d="M118.406 68h4.64c2.216 0 4 1.784 4 4v4c0 2.216-1.784 4-4 4h-4.64c-2.216 0-4-1.784-4-4v-4c0-2.216 1.784-4 4-4z" fill="url(#u)" transform="matrix(-.89099 .89099 .89099 .89099 443.44 45.823)"/><path style="marker:none" d="M470.17 150.96l-6.238.891 5.346 5.346z" fill="#424048" enable-background="new"/><g stroke-width="4.26"><path d="M466.962 162.009l-7.841-7.841-58.522 58.522 7.84 7.84z" fill="#ff7800" enable-background="new"/><path d="M461.26 156.306l-3.565-3.564-58.536 58.537 3.578 3.549z" fill="#ffa348" enable-background="new"/><path d="M464.823 159.87l3.564 3.564-58.536 58.537-3.55-3.58z" fill="#c64600" enable-background="new"/></g><path d="M116.379 68h4v12h-4z" fill="url(#v)" transform="matrix(-.89099 .89099 .89099 .89099 443.44 45.823)"/></g><g transform="matrix(.41754 0 0 .41754 650.26 -123.458)" stroke-width="1.008"><path d="M-1148.867 440c-17.248 0-31.133 13.885-31.133 31.133v77.734a31.059 31.059 0 0020 29.09V475.25c0-8.448 6.801-15.25 15.25-15.25h89.5c8.448 0 15.25 6.801 15.25 15.25v102.707a31.059 31.059 0 0020-29.09v-77.734c0-17.248-13.885-31.133-31.133-31.133z" fill="#0e3b26"/><g clip-path="url(#w)"><rect width="400" height="230" x="-1299.199" y="742.831" rx="59.195" ry="59.195" fill="url(#x)"/><rect width="320" height="75" x="-1259.199" y="912.831" rx="0" ry="0" fill="url(#y)"/></g><g clip-path="url(#z)"><rect width="400" height="400" x="-1300" y="540" rx="8.84" ry="8.84" fill="#26a269"/><rect width="320" height="222.169" x="-1259.199" y="817.831" rx="39.345" ry="39.345" fill="#2ec27e"/><rect width="240" height="20" x="-1220" y="857.831" rx="10.076" ry="10.076" fill="#26a269"/><path d="M-1174.842 864.266c-5.02 0-9.357 3.51-10.406 8.42h-.01l-4.824 18.078a10.645 10.645 0 00-.522 3.289c0 5.877 4.765 10.642 10.643 10.642h9.594c5.877 0 10.642-4.765 10.642-10.642 0-1.122-.177-2.237-.525-3.303l-4.162-18.049h-.02a10.643 10.643 0 00-10.408-8.435zm-.076 5.246a5.397 5.397 0 01.078 0 5.397 5.397 0 015.397 5.398 5.397 5.397 0 01-5.397 5.397 5.397 5.397 0 01-5.396-5.397 5.397 5.397 0 015.318-5.398z" fill="#0e3b26"/><rect width="440" height="180" x="-1320" y="520" rx="41.335" ry="41.335" opacity=".227"/></g><g clip-path="url(#A)"><rect width="440" height="180" x="-1320" y="500" rx="41.335" ry="41.335" fill="#57e389"/><rect width="400" height="280" x="-1300" y="380" rx="25.552" ry="25.552" fill="#2ec27e"/><rect width="400" height="260" x="-1300" y="320" rx="90.971" ry="90.971" fill="#26a269"/></g><rect width="110" height="90" x="-1150" y="640" rx="17.736" ry="17.736" fill="#57e389"/><rect width="70" height="50" x="-1130" y="660" rx="0" ry="0" fill="#0e3b26"/><path d="M-1130 730h70v11.544a14.559 14.559 120.15 01-7.345 12.646l-20.372 11.62a14.798 14.798.044 01-14.684-.011l-20.26-11.598a14.585 14.585 59.895 01-7.339-12.657z" fill="#0e3b26"/><rect width="30" height="60" x="-1110" y="690" rx="15.115" ry="15.115" fill="#57e389"/></g><path d="M487.688 8.077c-6.779 0-12.274 3.838-12.273 8.572.081.059.164.117.248.174h-.248v10.25c-2.416.409-4.605 1.256-6.365 2.441-3.996 2.763-15.329 8.951-15.329 8.951-2.671 1.543-4.609 4.385-4.609 7.285v33.428c0 3.46 2.445 6.51 6.162 8.313v1.213h.018c.014 1.081.257 2.121.67 3.111a16.92 16.92 0 00-2.862 2.05l.145.104h-.115v2.966a4.75 4.75 0 00-.03.021l.03.021v1.067l1.488 4.935c.717 6.47 7.884 11.61 16.91 12.123 9.025-.515 16.191-5.653 16.908-12.123l1.547-4.935v-4.075h-.174l.145-.103a16.919 16.919 0 00-2.746-1.969c.376-.878.595-1.8.66-2.754h1.719c.53.044 1.063.067 1.597.066 7.728 0 13.994-4.49 13.994-10.03h.11V67.77a5.65 5.65 0 00.818-.014v11.422h.11c0 5.54 6.264 10.031 13.992 10.031.534 0 1.069-.022 1.6-.066h.849c-.805 1.508-1.218 3.108-1.219 4.723v.103h-.03v9.01h.09c.79 6.851 8.777 12.123 18.366 12.123s17.574-5.272 18.363-12.123h.036v-.367a8.99 8.99 0 000-1.441v-6.585c.018-.24.028-.48.03-.72 0-2.171-.748-4.308-2.175-6.223v-.152c3.718-1.803 6.162-4.853 6.162-8.313V45.75c0-2.9-1.937-5.742-4.609-7.285 0 0-11.333-6.188-15.328-8.95-1.76-1.186-3.95-2.033-6.365-2.442v-10.25h-.006c0-.058.004-.116.004-.174 0-4.734-5.494-8.572-12.272-8.572-6.779 0-12.274 3.837-12.273 8.572v.174h-.026v20.066h.024c.006.392.049.784.13 1.172l-1.779 1.303c-.963-1.2-2.517-1.912-4.174-1.912-1.616 0-3.139.679-4.107 1.832l-2.482-1.815c.289-.184.565-.377.828-.58h.134V16.822h-.27c.085-.056.167-.114.249-.173 0-4.734-5.495-8.573-12.274-8.572z" fill-opacity=".219"/><g transform="matrix(.4095 0 0 .4095 -158.707 -39.028)" stroke-width="2.442"><g id="L" transform="translate(65.484)" stroke-width="4.884" stroke-opacity=".957"><ellipse cx="1600.026" cy="124.179" rx="29.971" ry="20.932" fill="#c0bfbc"/><ellipse style="font-variation-settings:normal" cx="1600.012" cy="173.41" rx="29.957" ry="21.025" fill="url(#B)"/><path fill="#c0bfbc" d="M1570 124.605h60v25h-60z"/><path style="font-variation-settings:normal" fill="url(#C)" d="M1570 145.605h60v28h-60z"/><ellipse style="font-variation-settings:normal" cx="1599.997" cy="145.581" rx="29.942" ry="21.025" fill="url(#D)"/><path d="M1622.143 148.953c-8.324 0-16.008 2.146-21.973 5.738l-34.77 25.418c-3.983 3.649-8.351 8.698-8.351 14.458v82.31h137.181v-81.629c0-7.083-4.729-14.026-11.253-17.793 0 0-27.677-15.11-37.434-21.857-6.142-4.137-14.4-6.645-23.4-6.645z" fill="url(#E)"/><path d="M1622.143 230.582c-8.324 0-16.008 2.145-21.973 5.737l-34.77 25.418c-4.683 3.76-8.007 10.188-8.084 15.14.001 13.529 15.3 24.496 34.17 24.496a47.54 47.54 0 003.905-.16h60.773c1.294.106 2.595.16 3.897.16 18.87 0 34.169-10.967 34.17-24.496-.932-8.63-5.519-14.149-11.255-17.793 0 0-27.676-15.11-37.433-21.857-6.143-4.137-14.4-6.645-23.4-6.645z" fill="#6c6b70"/><path style="font-variation-settings:normal" d="M1639.297 252.018c-21.983 0-39.802 12.514-39.802 27.95V280h-.074v20.139h.074c.203 15.334 17.974 27.69 39.824 27.69 21.849-.002 39.617-12.357 39.82-27.69h.043V280h-.08v-.031c0-15.437-17.82-27.952-39.804-27.951z" fill="url(#F)"/><ellipse cx="1639.492" cy="312.744" rx="45" ry="32.261" fill="url(#G)"/><path style="font-variation-settings:normal" fill="url(#H)" d="M1594.42 313h90v22h-90z"/><ellipse cx="1639.492" cy="332.343" rx="45" ry="32.261" fill="#a7a7ab"/><g clip-path="url(#I)" transform="translate(24.42)"><ellipse cx="1615.072" cy="332.343" rx="34.171" ry="24.497" fill="url(#J)"/><ellipse cx="1615.391" cy="325.694" rx="34.171" ry="24.497" fill="url(#K)"/></g></g><use xlink:href="#L" transform="matrix(-1 0 0 1 3243.066 0)" width="100%" height="100%"/><ellipse cx="1621.324" cy="186.14" rx="12.528" ry="11.158" fill="#d0cfcd"/><path fill="#d0cfcd" d="M1608.772 185.082h25.081v40.062h-25.081z"/><path fill="#cfcecc" d="M1608.772 223.012h25.081v14.926h-25.081z"/><ellipse cx="1621.312" cy="222.999" rx="12.516" ry="11.208" fill="#cfcecb"/><ellipse cx="1621.318" cy="237.833" rx="12.523" ry="11.208" fill="#a7a7ab"/></g></g></svg>
\ No newline at end of file
data/resources/style.css
View file @ 2f78574f
......@@ -20,6 +20,11 @@
transition-duration: 250ms;
transition-timing-function: ease-in-out;
}
window .titlebar button {
min-width: 60px;
}
/* pages */
@keyframes welcome-bg-move {
......@@ -38,15 +43,6 @@
}
.page { color: #000; }
.welcome-page {
background-repeat: no-repeat, repeat-x, repeat-x, no-repeat;
background-image: url('/org/gnome/Tour/start-fg.svg'),
url('/org/gnome/Tour/start-bg.svg'),
url('/org/gnome/Tour/start-bg-bg.svg'),
url('/org/gnome/Tour/start-bg-bg-bg.svg');
background-position: center 30%, -1400px 0, -600px 0, center 30%; /* wasn't able to properly loop with relative offsets */
animation: welcome-bg-move 60s linear infinite;
}
/* .page:nth-child(2) { background: linear-gradient(to right, #3584e4, #1a5fb4); } overview */
.page:nth-child(3) { } /* customize */
......
src/widgets/pages/welcome.rs
View file @ 2f78574f
......@@ -78,9 +78,7 @@ impl WelcomePageWidget {
#[cfg(not(feature = "video"))]
let header = {
let icon = glib::get_os_info("LOGO").unwrap_or_else(|| "start-here-symbolic".into());
let logo = gtk::Image::from_resource("/org/gnome/Tour/blank.svg");
let logo = gtk::Image::from_resource("/org/gnome/Tour/welcome.svg");
logo.show();
logo.upcast::<gtk::Widget>()
......@@ -167,41 +165,6 @@ impl WelcomePageWidget {
text.show();
container.add(&text);
let actions_container = gtk::BoxBuilder::new()
.orientation(gtk::Orientation::Horizontal)
.spacing(12)
.halign(gtk::Align::Center)
.margin_top(36)
.build();
let skip_tour_btn = gtk::ButtonBuilder::new()
.label(&gettext("_No Thanks"))
.height_request(40)
.width_request(180)
.use_underline(true)
.action_name("app.skip-tour")
.build();
skip_tour_btn.show();
actions_container.add(&skip_tour_btn);
let start_tour_btn = gtk::ButtonBuilder::new()
.label(&gettext("_Start Tour"))
.height_request(40)
.width_request(180)
.use_underline(true)
.action_name("app.start-tour")
.build();
start_tour_btn
.get_style_context()
.add_class("suggested-action");
start_tour_btn.show();
actions_container.add(&start_tour_btn);
actions_container.set_focus_child(Some(&start_tour_btn));
actions_container.show();
container.add(&actions_container);
container.show();
self.widget.add(&container);
self.widget.show();
......
src/widgets/paginator.rs
View file @ 2f78574f
......@@ -14,6 +14,8 @@ pub struct PaginatorWidget {
pages: RefCell<Vec<gtk::Widget>>,
current_page: RefCell<u32>,
next_btn: gtk::Button,
start_btn: gtk::Button,
finish_btn: gtk::Button,
close_btn: gtk::Button,
previous_btn: gtk::Button,
}
......@@ -27,7 +29,9 @@ impl PaginatorWidget {
carousel: libhandy::Carousel::new(),
carousel_dots: libhandy::CarouselIndicatorDots::new(),
headerbar: libhandy::HeaderBar::new(),
start_btn: gtk::Button::with_label(&gettext("_Start")),
next_btn: gtk::Button::with_label(&gettext("_Next")),
finish_btn: gtk::Button::with_label(&gettext("_Close")),
close_btn: gtk::Button::with_label(&gettext("_Close")),
previous_btn: gtk::Button::with_label(&gettext("_Previous")),
pages: RefCell::new(Vec::new()),
......@@ -71,27 +75,29 @@ impl PaginatorWidget {
let forelast_page = n_pages - 2.0;
let last_page = n_pages - 1.0;
let (opacity_close, opacity_previous, opacity_next) =
let (opacity_finish, opacity_previous, opacity_start, opacity_next) =
if (0.0 <= position) && (position < 1.0) {
(0.0, position, position)
} else if (1.0 <= position) && (position <= forelast_page) {
(0.0, 1.0, 1.0)
(0.0, position, 1.0, position)
} else if (0.0 <= position) && (position <= forelast_page) {
(0.0, 1.0, 1f64 - position, 1.0)
} else if (forelast_page < position) && (position <= last_page) {
(position - forelast_page, 1.0, 1.0)
(position - forelast_page, 1.0, 0.0, 1.0)
} else {
panic!("Position of the carousel is outside the allowed range");
};
self.close_btn.set_opacity(opacity_close);
self.close_btn.set_visible(opacity_close > 0_f64);
self.previous_btn.set_opacity(opacity_previous);
self.previous_btn.set_visible(opacity_previous > 0_f64);
self.start_btn.set_opacity(opacity_start);
self.start_btn.set_visible(opacity_start > 0_f64);
self.next_btn.set_opacity(opacity_next);
self.next_btn.set_visible(opacity_next > 0_f64);
self.headerbar.set_opacity(opacity_next);
self.finish_btn.set_opacity(opacity_finish);
self.finish_btn.set_visible(opacity_finish > 0_f64);
self.previous_btn.set_opacity(opacity_previous);
self.previous_btn.set_visible(opacity_previous > 0_f64);
self.current_page.replace(page_nr);
}
......@@ -106,11 +112,12 @@ impl PaginatorWidget {
.connect_property_position_notify(clone!(@weak p => move |_| {
p.update_position();
}));
let btn_size_group = gtk::SizeGroup::new(gtk::SizeGroupMode::Horizontal);
btn_size_group.add_widget(&self.previous_btn);
btn_size_group.add_widget(&self.next_btn);
btn_size_group.add_widget(&self.close_btn);
self.start_btn
.get_style_context()
.add_class("suggested-action");
self.start_btn.set_use_underline(true);
self.start_btn.set_action_name(Some("app.start-tour"));
self.start_btn.show();
self.next_btn
.get_style_context()
......@@ -118,25 +125,45 @@ impl PaginatorWidget {
self.next_btn.set_use_underline(true);
self.next_btn.set_action_name(Some("app.next-page"));
self.close_btn
.get_style_context()
.add_class("suggested-action");
self.close_btn.set_use_underline(true);
self.close_btn.set_action_name(Some("app.quit"));
self.close_btn.show();
self.finish_btn
.get_style_context()
.add_class("suggested-action");
self.finish_btn.set_use_underline(true);
self.finish_btn.set_action_name(Some("app.quit"));
self.previous_btn.set_use_underline(true);
self.previous_btn.set_action_name(Some("app.previous-page"));
let previous_overlay = gtk::Overlay::new();
previous_overlay.add(&self.close_btn);
previous_overlay.add_overlay(&self.previous_btn);
previous_overlay.show();
let next_overlay = gtk::Overlay::new();
next_overlay.add(&self.next_btn);
next_overlay.add_overlay(&self.close_btn);
next_overlay.add_overlay(&self.finish_btn);
next_overlay.show();
let start_overlay = gtk::Overlay::new();
start_overlay.add(&self.start_btn);
start_overlay.add_overlay(&next_overlay);
start_overlay.show();
let btn_size_group = gtk::SizeGroup::new(gtk::SizeGroupMode::Horizontal);
btn_size_group.add_widget(&self.previous_btn);
btn_size_group.add_widget(&self.close_btn);
btn_size_group.add_widget(&next_overlay);
btn_size_group.add_widget(&start_overlay);
btn_size_group.add_widget(&self.finish_btn);
self.headerbar.set_custom_title(Some(&self.carousel_dots));
self.headerbar.pack_start(&self.previous_btn);
self.headerbar.pack_end(&next_overlay);
self.headerbar.pack_start(&previous_overlay);
self.headerbar.pack_end(&start_overlay);
self.headerbar.set_show_close_button(false);
self.headerbar.set_opacity(0_f64);
self.headerbar.show();
self.widget.add(&self.headerbar);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment