Skip to content

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

Merge branch 'wip/jimmac/gnome41' into 'master'

GNOME41 Tour Closes #41, #42, and #45 See merge request GNOME/gnome-tour!51
parents 6f8c4f53 2f32306c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 27 deletions
build-aux/org.gnome.TourDevel.json
View file @ c798156e
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
"--share=network" "--share=network"
], ],
"env" : { "env" : {
"GTK_DEBUG" : "interactive",
"CARGO_HOME" : "/run/build/gnome-tour/cargo", "CARGO_HOME" : "/run/build/gnome-tour/cargo",
"RUST_BACKTRACE" : "1", "RUST_BACKTRACE" : "1"
"GTK_DEBUG" : "interactive"
} }
}, },
"modules" : [ "modules" : [
......
data/resources.gresource.xml
View file @ c798156e
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<gresources> <gresources>
<gresource prefix="/org/gnome/Tour/"> <gresource prefix="/org/gnome/Tour/">
<file compressed="true" alias="style.css">resources/style.css</file> <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="welcome.svg">resources/assets/welcome.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="overview.svg">resources/assets/overview.svg</file>
<file compressed="true" alias="search.svg">resources/assets/search.svg</file>
<file compressed="true" alias="blank.svg">resources/assets/blank.svg</file>
<file compressed="true" alias="workspaces.svg">resources/assets/workspaces.svg</file> <file compressed="true" alias="workspaces.svg">resources/assets/workspaces.svg</file>
<file compressed="true" alias="makeyourown.svg">resources/assets/makeyourown.svg</file>
<file compressed="true" alias="updown-bg.svg">resources/assets/updown-bg.svg</file>
<file compressed="true" alias="hand-fg.svg">resources/assets/hand-fg.svg</file>
<file compressed="true" alias="leftright-bg.svg">resources/assets/leftright-bg.svg</file>
<file compressed="true" alias="ready-to-go.svg">resources/assets/ready-to-go.svg</file> <file compressed="true" alias="ready-to-go.svg">resources/assets/ready-to-go.svg</file>
<file compressed="true" alias="hand-fg.svg">resources/assets/hand-fg.svg</file>
<file compressed="true" alias="updown-bg.svg">resources/assets/updown-bg.svg</file>
<file compressed="true" alias="leftright-bg.svg">resources/assets/leftright-bg.svg</file>
</gresource> </gresource>
</gresources> </gresources>
data/resources/assets/blank.svg
View file @ c798156e
<svg xmlns="http://www.w3.org/2000/svg" width="600" height="300"><defs id="defs5677"><clipPath clipPathUnits="userSpaceOnUse" id="a"><rect y="-101.694" x="508.542" height="80.287" width="271.154" rx="0" ry="0" fill="#1a5fb4" stroke-width="2.793" stroke-linecap="round" id="rect5674"/></clipPath></defs></svg> <svg width="600" height="300" version="1.1" id="svg5" xmlns="http://www.w3.org/2000/svg"><defs id="defs5677"><clipPath clipPathUnits="userSpaceOnUse" id="a"><rect y="-101.694" x="508.542" height="80.287" width="271.154" rx="0" ry="0" fill="#1a5fb4" stroke-width="2.793" stroke-linecap="round" id="rect5674"/></clipPath></defs></svg>
\ No newline at end of file \ No newline at end of file
data/resources/assets/hand-fg.svg
View file @ c798156e
<svg xmlns="http://www.w3.org/2000/svg" width="600" height="300"><g transform="translate(25 15)" fill="#3584e4"><circle cx="315" cy="105" r="35" opacity=".5"/><circle cx="245" cy="105" r="35" opacity=".5"/><circle cx="280" cy="95" r="35" opacity=".5"/></g><path d="M270 109a15 15 0 0115 15v72a3 3 0 003 3h1a3 3 0 003-3v-8a14 14 0 0114-14 14 14 0 0114 14v8a3 3 0 003 3h1a3 3 0 003-3v-8a14 14 0 0114-14 14 14 0 0114 14v8a3 3 0 003 3h1a3 3 0 003-3v-1a14 14 0 0114-14 14 14 0 0114 14v74a30 30 0 01-30 30h-80a48.284 48.284 0 01-34.142-14.142l-47.511-47.511a13.61 13.61 0 01-1.264-17.79l.834-1.113a12.198 12.198 0 0116.754-2.675l28.04 19.63A7.81 7.81 0 00255 229V124a15 15 0 0115-15z" opacity=".05"/><path d="M270 105a15 15 0 0115 15v72a3 3 0 003 3h1a3 3 0 003-3v-83a14 14 0 0114-14 14 14 0 0114 14v83a3 3 0 003 3h1a3 3 0 003-3v-73a14 14 0 0114-14 14 14 0 0114 14v73a3 3 0 003 3h1a3 3 0 003-3v-1a14 14 0 0114-14 14 14 0 0114 14v74a30 30 0 01-30 30h-80a48.284 48.284 0 01-34.142-14.142l-45.71-45.71a15.812 15.812 0 01-1.029-21.229l.042-.051a14.582 14.582 0 0120.344-2.14l23.762 18.926A7.229 7.229 0 00255 225V120a15 15 0 0115-15z" fill="#f6f5f4"/><path d="M196.258 219.491c-1.993 5.044-.093 11.674 3.742 15.509l45.857 45.857A48.284 48.284 0 00280 295h80c16.569 0 30-13.431 30-30v-10c0 16.569-13.431 30-30 30h-80a48.284 48.284 0 01-34.143-14.143l-46.564-46.74a13.61 13.61 0 01-3.035-4.626z" fill="#deddda"/><defs id="defs5677"><clipPath clipPathUnits="userSpaceOnUse" id="a"><rect y="-101.694" x="508.542" height="80.287" width="271.154" rx="0" ry="0" fill="#1a5fb4" stroke-width="2.793" stroke-linecap="round" id="rect5674"/></clipPath></defs></svg> <svg xmlns="http://www.w3.org/2000/svg" width="600" height="300"><g transform="translate(25 15)"><circle style="opacity:.5;fill:#3584e4;fill-opacity:1;stroke:none;stroke-width:2.89323;stroke-linecap:round;stroke-linejoin:round" cx="315" cy="105" r="35"/><circle style="opacity:.5;fill:#3584e4;fill-opacity:1;stroke:none;stroke-width:2.89323;stroke-linecap:round;stroke-linejoin:round" cx="245" cy="105" r="35"/><circle style="opacity:.5;fill:#3584e4;fill-opacity:1;stroke:none;stroke-width:2.89323;stroke-linecap:round;stroke-linejoin:round" cx="280" cy="95" r="35"/></g><path style="opacity:.05;fill:#000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M440 104a15 15 45 0 1 15 15v72a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-8a14 14 135 0 1 14-14 14 14 45 0 1 14 14v8a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-8a14 14 135 0 1 14-14 14 14 45 0 1 14 14v8a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-1a14 14 135 0 1 14-14 14 14 45 0 1 14 14v74a30 30 135 0 1-30 30h-80a48.284 48.284 22.5 0 1-34.142-14.142l-47.511-47.511a13.61 13.61 85.935 0 1-1.264-17.79l.834-1.113a12.198 12.198 170.931 0 1 16.754-2.675l28.04 19.63A7.81 7.81 152.496 0 0 425 224V119a15 15 135 0 1 15-15z" transform="translate(-170 5)"/><path style="fill:#f6f5f4;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M440 100a15 15 45 0 1 15 15v72a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-83a14 14 135 0 1 14-14 14 14 45 0 1 14 14v83a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-73a14 14 135 0 1 14-14 14 14 45 0 1 14 14v73a3 3 45 0 0 3 3h1a3 3 135 0 0 3-3v-1a14 14 135 0 1 14-14 14 14 45 0 1 14 14v74a30 30 135 0 1-30 30h-80a48.284 48.284 22.5 0 1-34.142-14.142l-45.71-45.71a15.812 15.812 87.226 0 1-1.029-21.229l.042-.051a14.582 14.582 173.995 0 1 20.344-2.14l23.762 18.926A7.229 7.229 154.27 0 0 425 220V115a15 15 135 0 1 15-15z" transform="translate(-170 5)"/><path style="fill:#deddda;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M366.258 214.491c-1.993 5.044-.093 11.674 3.742 15.509l45.857 45.857A48.284 48.284 0 0 0 450 290h80c16.569 0 30-13.431 30-30v-10c0 16.569-13.431 30-30 30h-80a48.284 48.284 0 0 1-34.143-14.143l-46.564-46.74a13.61 13.61 0 0 1-3.035-4.626z" transform="translate(-170 5)"/></svg>
\ No newline at end of file \ No newline at end of file
data/resources/assets/leftright-bg.svg
View file @ c798156e
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="300"><defs><linearGradient id="a"><stop offset="0" stop-color="#1c71d8"/><stop offset="1" stop-color="#33d17a"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="114.955" y1="150.56" x2="497.629" y2="150.56" gradientUnits="userSpaceOnUse"/></defs><path d="M343.412 6.958L264.768 85.6a16 16 0 01-22.627 0l-41.083-41.083a16 16 0 00-22.628 0l-58.789 58.79a16 16 90 000 22.627l41.083 41.083a16 16 90 010 22.627l-23.096 23.097a16 16 90 000 22.627l58.789 58.79a16 16 180 0022.627 0L343.27 169.932a16 16 180 0122.627 0l45.625 45.625a16 16 180 0022.627 0l58.79-58.79a16.015 16.015 90.027 00.01-22.637L366.028 6.969a15.985 15.985.027 00-22.616-.011z" fill="url(#b)"/><rect width="324.179" height="195.739" x="145.536" y="48.014" rx="26.854" ry="26.854" fill="#c0bfbc"/><path d="M169.965 153.585l-8.563-8.563 8.563-8.563m-8.563 8.563h17.126m265.533 8.563l8.563-8.563-8.563-8.563m8.563 8.563h-17.126" stroke-width="5.138" fill="none" stroke="#fff" stroke-linecap="round"/></svg> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="300"><defs><linearGradient id="a"><stop style="stop-color:#1c71d8;stop-opacity:1" offset="0"/><stop style="stop-color:#33d17a;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="114.955" y1="150.56" x2="497.629" y2="150.56" gradientUnits="userSpaceOnUse"/></defs><path d="M343.412 6.958 264.768 85.6a16 16 0 0 1-22.627 0l-41.083-41.083a16 16 0 0 0-22.628 0l-58.789 58.79a16 16 90 0 0 0 22.627l41.083 41.083a16 16 90 0 1 0 22.627l-23.096 23.097a16 16 90 0 0 0 22.627l58.789 58.79a16 16 180 0 0 22.627 0L343.27 169.932a16 16 180 0 1 22.627 0l45.625 45.625a16 16 180 0 0 22.627 0l58.79-58.79a16.015 16.015 90.027 0 0 .01-22.637L366.028 6.969a15.985 15.985.027 0 0-22.616-.011z" fill="#e66100" style="fill-opacity:1;fill:url(#b)"/><rect width="324.179" height="195.739" x="145.536" y="48.014" rx="26.854" ry="26.854" fill="#c0bfbc"/><path d="m169.965 153.585-8.563-8.563 8.563-8.563m-8.563 8.563h17.126M444.061 153.585l8.563-8.563-8.563-8.563m8.563 8.563h-17.126" stroke-width="5.138" fill="none" stroke="#fff" stroke-linecap="round"/></svg>
\ No newline at end of file \ No newline at end of file
data/resources/assets/overview.svg
View file @ c798156e
This source diff could not be displayed because it is too large. You can view the blob instead.
data/resources/assets/updown-bg.svg
View file @ c798156e
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="300"><defs><linearGradient id="a"><stop offset="0" stop-color="#9141ac"/><stop offset="1" stop-color="#ed333b"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="260" y1="0" x2="260" y2="300" gradientUnits="userSpaceOnUse"/></defs><path d="M269.171 293.4l78.644-78.643a16 16 0 0122.627 0l41.083 41.083a16 16 0 0022.628 0l58.789-58.789a16 16 90 000-22.627l-41.083-41.083a16 16 90 010-22.627l23.096-23.097a16 16 90 000-22.627L416.166 6.2a16 16 180 00-22.627 0L269.314 130.426a16 16 180 01-22.627 0l-45.625-45.624a16 16 180 00-22.627 0l-58.79 58.789a16.015 16.015 90.027 00-.01 22.638l126.92 127.162a15.985 15.985.027 0022.616.011z" fill="url(#b)"/><rect width="324.179" height="195.739" x="145.536" y="48.014" rx="26.854" ry="26.854" fill="#c0bfbc"/><path d="M452.244 219.785l-8.563 8.563-8.563-8.563m8.563 8.563v-17.126m8.563-136.228l-8.563-8.563-8.563 8.563m8.563-8.563v17.125" stroke-width="5.138" fill="none" stroke="#fff" stroke-linecap="round"/></svg> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="300"><defs><linearGradient id="a"><stop style="stop-color:#9141ac;stop-opacity:1" offset="0"/><stop style="stop-color:#ed333b;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="260" y1="0" x2="260" y2="300" gradientUnits="userSpaceOnUse"/></defs><path d="m269.171 293.4 78.644-78.643a16 16 0 0 1 22.627 0l41.083 41.083a16 16 0 0 0 22.628 0l58.789-58.789a16 16 90 0 0 0-22.627l-41.083-41.083a16 16 90 0 1 0-22.627l23.096-23.097a16 16 90 0 0 0-22.627L416.166 6.2a16 16 180 0 0-22.627 0L269.314 130.426a16 16 180 0 1-22.627 0l-45.625-45.624a16 16 180 0 0-22.627 0l-58.79 58.789a16.015 16.015 90.027 0 0-.01 22.638l126.92 127.162a15.985 15.985.027 0 0 22.616.011z" fill="#2ec27e" style="fill-opacity:1;fill:url(#b)"/><rect width="324.179" height="195.739" x="145.536" y="48.014" rx="26.854" ry="26.854" fill="#c0bfbc"/><path d="m452.244 219.785-8.563 8.563-8.563-8.563m8.563 8.563v-17.126M452.244 74.994l-8.563-8.563-8.563 8.563m8.563-8.563v17.125" stroke-width="5.138" fill="none" stroke="#fff" stroke-linecap="round"/></svg>
\ No newline at end of file \ No newline at end of file
data/resources/assets/workspaces.svg
View file @ c798156e
This source diff could not be displayed because it is too large. You can view the blob instead.
src/widgets/pages/welcome.rs
View file @ c798156e
...@@ -150,7 +150,7 @@ impl WelcomePageWidget { ...@@ -150,7 +150,7 @@ impl WelcomePageWidget {
let title = gtk::Label::new(Some(&gettext("Start the Tour"))); let title = gtk::Label::new(Some(&gettext("Start the Tour")));
title.set_margin_top(36); title.set_margin_top(36);
title.get_style_context().add_class("large-title"); title.get_style_context().add_class("page-title");
title.show(); title.show();
container.add(&title); container.add(&title);
...@@ -158,7 +158,7 @@ impl WelcomePageWidget { ...@@ -158,7 +158,7 @@ impl WelcomePageWidget {
let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into()); let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into());
// Translators: The following string is formated as "Learn about new and essential features in GNOME 3.36" for example // Translators: The following string is formated as "Learn about new and essential features in GNOME 3.36" for example
let text = gtk::Label::new(Some(&i18n_f( let text = gtk::Label::new(Some(&i18n_f(
"Learn about new and essential features in {} {}.", "Learn about the key features in {} {}.",
&[&name, &version], &[&name, &version],
))); )));
text.get_style_context().add_class("body"); text.get_style_context().add_class("body");
......
src/widgets/window.rs
View file @ c798156e
...@@ -49,7 +49,7 @@ impl Window { ...@@ -49,7 +49,7 @@ impl Window {
ImagePageWidget::new( ImagePageWidget::new(
"/org/gnome/Tour/overview.svg", "/org/gnome/Tour/overview.svg",
gettext("Get an Overview"), gettext("Get an Overview"),
gettext("Press Activities to see open windows and apps."), gettext("Press the Super key to see open windows and apps."),
) )
.widget .widget
.upcast::<gtk::Widget>(), .upcast::<gtk::Widget>(),
...@@ -57,9 +57,9 @@ impl Window { ...@@ -57,9 +57,9 @@ impl Window {
self.paginator.borrow_mut().add_page( self.paginator.borrow_mut().add_page(
ImagePageWidget::new( ImagePageWidget::new(
"/org/gnome/Tour/makeyourown.svg", "/org/gnome/Tour/search.svg",
gettext("Make Apps Your Own"), gettext("Just Type to Search"),
gettext("Arrange the app grid to your liking."), gettext("Type in the overview to search. Launch apps, find things."),
) )
.widget .widget
.upcast::<gtk::Widget>(), .upcast::<gtk::Widget>(),
...@@ -69,7 +69,7 @@ impl Window { ...@@ -69,7 +69,7 @@ impl Window {
ImagePageWidget::new( ImagePageWidget::new(
"/org/gnome/Tour/workspaces.svg", "/org/gnome/Tour/workspaces.svg",
gettext("Keep on Top with Workspaces"), gettext("Keep on Top with Workspaces"),
gettext("Easily organize windows with the new workspaces view."), gettext("Easily organize windows with the workspaces view."),
) )
.widget .widget
.upcast::<gtk::Widget>(), .upcast::<gtk::Widget>(),
...@@ -99,11 +99,7 @@ impl Window { ...@@ -99,11 +99,7 @@ impl Window {
let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into()); let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into());
let last_page = ImagePageWidget::new( let last_page = ImagePageWidget::new(
"/org/gnome/Tour/ready-to-go.svg", "/org/gnome/Tour/ready-to-go.svg",
// Translators: The following string is formatted as "We hope that you enjoy GNOME 40" gettext("That's it. Have a nice day!"),
i18n_f(
"That's it! We hope that you enjoy {} {}.",
&[&name, &version],
),
gettext("To get more advice and tips, see the Help app."), gettext("To get more advice and tips, see the Help app."),
); );
last_page.widget.get_style_context().add_class("last-page"); last_page.widget.get_style_context().add_class("last-page");
......
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