[gnome-initial-setup] summary: Make prettier
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] summary: Make prettier
- Date: Thu, 31 Oct 2013 22:43:05 +0000 (UTC)
commit 516a34ce8639435fc482b9cf16f154551f41ea08
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Oct 31 17:55:32 2013 -0400
summary: Make prettier
gnome-initial-setup/pages/summary/cat.png | Bin 0 -> 1194 bytes
gnome-initial-setup/pages/summary/girl.png | Bin 0 -> 5389 bytes
.../pages/summary/gis-summary-page.c | 28 ++++++-
.../pages/summary/gis-summary-page.css | 9 ++
.../pages/summary/gis-summary-page.ui | 90 +++++++++++--------
gnome-initial-setup/pages/summary/grass.png | Bin 0 -> 20504 bytes
.../pages/summary/large-balloon.png | Bin 0 -> 4557 bytes
.../pages/summary/small-balloons.png | Bin 0 -> 2267 bytes
.../pages/summary/summary.gresource.xml | 6 ++
9 files changed, 94 insertions(+), 39 deletions(-)
---
diff --git a/gnome-initial-setup/pages/summary/cat.png b/gnome-initial-setup/pages/summary/cat.png
new file mode 100644
index 0000000..5f58a2d
Binary files /dev/null and b/gnome-initial-setup/pages/summary/cat.png differ
diff --git a/gnome-initial-setup/pages/summary/girl.png b/gnome-initial-setup/pages/summary/girl.png
new file mode 100644
index 0000000..4469a3f
Binary files /dev/null and b/gnome-initial-setup/pages/summary/girl.png differ
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index d500c02..4696355 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -350,11 +350,35 @@ gis_summary_page_constructed (GObject *object)
static void
gis_summary_page_locale_changed (GisPage *page)
{
- gis_page_set_title (page, _("Thank You"));
+ gis_page_set_title (page, _("Ready to Go"));
update_distro_name (GIS_SUMMARY_PAGE (page));
}
static void
+add_style_from_resource (const char *resource)
+{
+ GtkCssProvider *provider;
+ GFile *file;
+ char *uri;
+
+ provider = gtk_css_provider_new ();
+
+ uri = g_strconcat ("resource://", resource, NULL);
+ file = g_file_new_for_uri (uri);
+
+ if (!gtk_css_provider_load_from_file (provider, file, NULL))
+ goto out;
+
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+ out:
+ g_object_unref (file);
+ g_free (uri);
+}
+
+static void
gis_summary_page_class_init (GisSummaryPageClass *klass)
{
GisPageClass *page_class = GIS_PAGE_CLASS (klass);
@@ -369,6 +393,8 @@ gis_summary_page_class_init (GisSummaryPageClass *klass)
page_class->locale_changed = gis_summary_page_locale_changed;
page_class->shown = gis_summary_page_shown;
object_class->constructed = gis_summary_page_constructed;
+
+ add_style_from_resource ("/org/gnome/initial-setup/gis-summary-page.css");
}
static void
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.css
b/gnome-initial-setup/pages/summary/gis-summary-page.css
new file mode 100644
index 0000000..5a3085b
--- /dev/null
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.css
@@ -0,0 +1,9 @@
+
+.gis-summary-page {
+ background:
+ url("grass.png") repeat-x bottom center,
+ url("girl.png") no-repeat 15% bottom,
+ url("cat.png") no-repeat 30% bottom,
+ url("large-balloon.png") no-repeat 70% 25%,
+ url("small-balloons.png") no-repeat 35% 35%;
+}
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.ui
b/gnome-initial-setup/pages/summary/gis-summary-page.ui
index 28d3b0a..323e83d 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.ui
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.ui
@@ -2,51 +2,65 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<template class="GisSummaryPage" parent="GisPage">
+ <property name="margin-left">0</property>
+ <property name="margin-top">0</property>
+ <property name="margin-bottom">0</property>
+ <property name="margin-right">0</property>
<child>
- <object class="GtkBox" id="box">
+ <object class="GtkFrame" id="bg_frame">
<property name="visible">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="spacing">40</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">none</property>
+ <style>
+ <class name="gis-summary-page" />
+ </style>
<child>
- <object class="GtkImage" id="image">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">128</property>
- <property name="icon_name">object-select-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="details">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">You're all set!</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.6"/>
- </attributes>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="start_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <style>
- <class name="suggested-action"/>
- </style>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="spacing">20</property>
+ <property name="margin-top">75</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">You're all set!</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.6"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tagline">
+ <property name="visible">True</property>
+ <property name="justify">center</property>
+ <property name="label" translatable="yes">
+Thank you for choosing GNOME 3.
+We hope that you love it.
+ </property>
+ </object>
+ </child>
<child>
- <object class="GtkLabel" id="start_button_label">
+ <object class="GtkButton" id="start_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">4</property>
- <property name="ypad">4</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="start_button_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">4</property>
+ <property name="ypad">4</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/gnome-initial-setup/pages/summary/grass.png b/gnome-initial-setup/pages/summary/grass.png
new file mode 100644
index 0000000..459e7e6
Binary files /dev/null and b/gnome-initial-setup/pages/summary/grass.png differ
diff --git a/gnome-initial-setup/pages/summary/large-balloon.png
b/gnome-initial-setup/pages/summary/large-balloon.png
new file mode 100644
index 0000000..466e102
Binary files /dev/null and b/gnome-initial-setup/pages/summary/large-balloon.png differ
diff --git a/gnome-initial-setup/pages/summary/small-balloons.png
b/gnome-initial-setup/pages/summary/small-balloons.png
new file mode 100644
index 0000000..4e11b3c
Binary files /dev/null and b/gnome-initial-setup/pages/summary/small-balloons.png differ
diff --git a/gnome-initial-setup/pages/summary/summary.gresource.xml
b/gnome-initial-setup/pages/summary/summary.gresource.xml
index 91191bc..ca817f6 100644
--- a/gnome-initial-setup/pages/summary/summary.gresource.xml
+++ b/gnome-initial-setup/pages/summary/summary.gresource.xml
@@ -2,6 +2,12 @@
<gresources>
<gresource prefix="/org/gnome/initial-setup">
<file preprocess="xml-stripblanks" alias="gis-summary-page.ui">gis-summary-page.ui</file>
+ <file alias="gis-summary-page.css">gis-summary-page.css</file>
+ <file alias="grass.png">grass.png</file>
+ <file alias="girl.png">girl.png</file>
+ <file alias="cat.png">cat.png</file>
+ <file alias="large-balloon.png">large-balloon.png</file>
+ <file alias="small-balloons.png">small-balloons.png</file>
</gresource>
</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]