[gnome-initial-setup/wip/pwithnall/misc-fixes: 31/70] Bring back the welcome message/logo

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-initial-setup/wip/pwithnall/misc-fixes: 31/70] Bring back the welcome message/logo
Date: Fri, 11 Sep 2020 13:29:13 +0000 (UTC)

commit 1bfd15d0983bf5c145f136dfcc8592a04047a7c8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jun 6 18:53:40 2017 -0700

    Bring back the welcome message/logo
    
    Borrow the Endless OS logo from the control center, but make it 72px
    tall instead of 96px.
    
    Note, there is a ticket open to move the logo into the icon theme and
    reduce the divergence with the upstream code that assumes the vendor
    logo is a named icon: https://phabricator.endlessm.com/T26931
    
    https://phabricator.endlessm.com/T19117

 gnome-initial-setup/pages/language/EndlessLogo.svg | 104 +++++++++++++++++++++
 .../pages/language/gis-language-page.c             |  17 +++-
 .../pages/language/language.gresource.xml          |   1 +
 3 files changed, 118 insertions(+), 4 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/EndlessLogo.svg 
b/gnome-initial-setup/pages/language/EndlessLogo.svg
new file mode 100644
index 00000000..0a35d4a0
--- /dev/null
+++ b/gnome-initial-setup/pages/language/EndlessLogo.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 234.00001 72"
+   xml:space="preserve"
+   sodipodi:docname="EndlessLogo.svg"
+   width="234"
+   height="72"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata3778"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; 
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3776" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3200"
+     inkscape:window-height="1671"
+     id="namedview3774"
+     showgrid="false"
+     inkscape:zoom="6.8335991"
+     inkscape:cx="219.64999"
+     inkscape:cy="87"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style3749">
+       .st0{fill:#F15B25;}
+       .st1{fill:#424342;}
+</style><path
+     class="st0"
+     d="m 140.79192,8.40674 c -5.10204,0 -12.1477,2.854711 -18.70746,6.256069 l -6.31682,-3.279881 c 
5.16278,-2.854711 9.71817,-5.8309 12.20845,-7.592317 l 1.15403,-0.728863 c 0.48591,-0.364431 
0.54665,-1.093293 0.18222,-1.579202 l -0.66812,-0.911077 c -0.36443,-0.546647 -1.03256,-0.728862 
-1.39699,-0.42517 l -0.24295,0.182216 c -1.94364,1.396986 -6.68124,4.494651 -12.20845,7.653055 
-0.97182,0.546647 -1.8829,1.093294 -2.79397,1.579202 -8.56414,-3.705051 -14.820203,-5.527207 
-18.585997,-5.527207 -3.644309,0 -7.774528,0.850339 -7.774528,7.653056 0,3.644312 1.396987,7.956747 
7.774528,7.956747 5.102039,0 12.147707,-2.854711 18.707467,-6.256069 l 6.31681,3.219143 c -4.85908,2.793973 
-9.17152,5.527206 -11.72253,7.227886 v 0 l -1.45773,0.971816 c -0.54665,0.364431 -0.66813,1.093294 
-0.30369,1.63994 l 0.66812,0.911078 c 0.36443,0.485909 1.0933,0.668124 1.57921,0.303693 v 0 l 
0.91107,-0.607386 c 2.30807,-1.579202 6.55976,-4.312435 11.35811,-7.106408 0.97181,-0.546646 
1.88289,-1.093293 2.7939
 7,-1.518463 8.56414,3.644312 14.88094,5.527206 18.58599,5.527206 3.64431,0 7.77453,-0.850339 
7.77453,-7.653055 0,-3.583574 -1.39699,-7.896009 -7.83527,-7.896009 m -47.376057,7.774532 c -3.644309,0 
-4.373174,-1.639941 -4.373174,-4.494651 0,-3.583574 1.154032,-4.190959 4.373174,-4.190959 2.854717,0 
7.835267,1.396986 14.516507,4.069481 -6.19533,3.097666 -11.115145,4.616129 -14.516507,4.616129 m 
47.376057,4.373174 c -2.85471,0 -7.83527,-1.396985 -14.51651,-4.069481 6.25607,-2.976188 11.17589,-4.616129 
14.51651,-4.616129 3.64432,0 4.37317,1.639941 4.37317,4.494652 0.0608,3.644312 -1.09329,4.190958 
-4.37317,4.190958"
+     id="path3751"
+     inkscape:connector-curvature="0"
+     style="fill:#f15b25;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 181.24378,61.249262 c 0,4.859084 -2.36879,7.956749 -6.01311,7.956749 -3.64431,0 -6.01311,-3.097665 
-6.01311,-7.956749 0,-4.919819 2.30806,-7.956748 6.01311,-7.956748 3.64432,0.06075 6.01311,3.158407 
6.01311,7.956748 m -6.01311,-10.20407 c -5.10203,0 -8.56413,4.069484 -8.56413,10.20407 0,6.134594 
3.40135,10.204078 8.56413,10.204078 5.16278,0 8.5034,-4.069484 8.5034,-10.204078 -0.0608,-6.073851 
-3.40136,-10.20407 -8.5034,-10.20407"
+     id="path3753"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 198.615,59.973753 c -3.70504,-1.154033 -5.10203,-1.822155 -5.10203,-3.887265 0,-1.700677 
1.51847,-2.793974 3.88727,-2.793974 2.06511,0 3.52283,0.728865 4.55538,2.368807 l 0.3037,0.48591 c 
0.18221,0.242947 0.48591,0.364425 0.72886,0.182212 v 0 l 1.09329,-0.607387 c 0.24296,-0.182213 
0.36444,-0.48591 0.18222,-0.728857 v 0 l -0.36443,-0.546653 c -1.27551,-2.186587 -3.52284,-3.401354 
-6.43829,-3.401354 -3.76579,0 -6.3168,2.186587 -6.3168,5.223516 0,3.522832 2.73323,4.616122 6.55976,5.770154 
3.76579,1.154032 4.85908,2.065117 4.85908,4.008749 0,1.943632 -1.70068,3.1584 -4.49465,3.1584 -2.42954,0 
-4.19096,-1.154033 -5.22351,-3.34062 l -0.0608,-0.121477 c -0.18221,-0.30369 -0.48591,-0.364433 
-0.72887,-0.30369 l -1.09328,0.48591 c -0.3037,0.182212 -0.36444,0.485902 -0.3037,0.728857 l 0.18222,0.364433 
v 0 c 1.27551,2.733239 3.88726,4.312439 7.1064,4.312439 4.13022,0 7.04567,-2.308065 7.04567,-5.527207 
-0.0607,-3.279884 -2.30806,-4.616129 -6.37754,-5.830903"
+     id="path3755"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 52.781787,51.409624 h -4.61613 c -0.303692,0 -0.546646,0.242955 -0.546646,0.546645 v 18.585994 c 
0,0.30369 0.242954,0.546645 0.546646,0.546645 h 4.61613 c 6.438283,0 9.839645,-3.401362 9.839645,-9.900381 
0,-6.438283 -3.401362,-9.778903 -9.839645,-9.778903 m 7.410103,9.778903 c 0,5.223509 -2.24733,7.653051 
-7.106411,7.653051 H 50.109291 V 53.717689 h 2.976188 c 4.737604,0 7.106411,2.429542 7.106411,7.470838"
+     id="path3757"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 36.564598,51.409624 h -1.154033 c -0.303693,0 -0.546646,0.242955 -0.546646,0.546645 V 66.715734 L 
25.024276,51.834792 c -0.121477,-0.242955 -0.364431,-0.364433 -0.607385,-0.364433 h -1.579202 c -0.364431,0 
-0.607385,0.303698 -0.607385,0.607388 v 18.464516 c 0,0.30369 0.242954,0.546645 0.546646,0.546645 h 1.154032 
c 0.303693,0 0.546647,-0.242955 0.546647,-0.546645 V 55.418366 L 34.620965,70.66374 c 0.182215,0.242948 
0.303692,0.485903 0.607385,0.485903 h 1.275509 c 0.303693,0 0.546647,-0.242955 0.546647,-0.60738 V 52.017004 
c 0.121477,-0.364425 -0.182215,-0.60738 -0.485908,-0.60738"
+     id="path3759"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="M 83.394005,68.841578 H 74.647657 V 52.017004 c 0,-0.30369 -0.242955,-0.546645 -0.546645,-0.60738 h 
-1.336245 c -0.303697,0 -0.546652,0.30369 -0.546652,0.60738 v 18.525259 c 0,0.30369 0.242955,0.546645 
0.546652,0.546645 h 10.689981 c 0.30369,0 0.546644,-0.242955 0.546644,-0.546645 v -1.154032 c 0,-0.303698 
-0.242954,-0.546653 -0.607387,-0.546653"
+     id="path3761"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="M 12.026229,51.409624 H 0 v 19.679284 h 12.026229 c 0.303693,0 0.546648,-0.242955 0.546648,-0.546645 
v -1.154032 c 0,-0.303698 -0.242955,-0.546653 -0.546648,-0.546653 H 2.4295412 v -6.438284 h 6.5597619 c 
0.303693,0 0.5466464,-0.242954 0.5466464,-0.546644 v -1.154033 c 0,-0.30369 -0.2429534,-0.546645 
-0.5466464,-0.546645 H 2.4295412 v -6.377548 h 9.5966878 c 0.303693,0 0.546648,-0.242955 0.546648,-0.546645 v 
-1.154032 c 0,-0.425168 -0.242955,-0.668123 -0.546648,-0.668123"
+     id="path3763"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="M 104.89545,51.409624 H 93.415863 c -0.30369,0 -0.546645,0.242955 -0.546645,0.546645 v 18.585994 c 
0,0.30369 0.242955,0.546645 0.546645,0.546645 h 11.479587 c 0.30369,0 0.54665,-0.242955 0.54665,-0.546645 v 
-1.154032 c 0,-0.303698 -0.24296,-0.546653 -0.54665,-0.546653 h -9.59669 v -6.438284 h 6.55976 c 0.30369,0 
0.54665,-0.242954 0.54665,-0.546644 v -1.154033 c 0,-0.30369 -0.24296,-0.546645 -0.54665,-0.546645 h -6.55976 
v -6.377548 h 9.59669 c 0.30369,0 0.54665,-0.242955 0.54665,-0.546645 v -1.214775 c 0,-0.364425 
-0.18222,-0.60738 -0.54665,-0.60738"
+     id="path3765"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 143.40368,60.034495 c -3.64431,-1.154032 -5.0413,-1.822155 -5.0413,-3.887264 0,-1.700685 
1.51846,-2.793975 3.82653,-2.793975 2.06511,0 3.52284,0.728858 4.49465,2.3688 l 0.30369,0.48591 c 
0.18222,0.242955 0.48591,0.364432 0.72886,0.182212 v 0 l 1.0933,-0.60738 c 0.24296,-0.18222 0.36443,-0.48591 
0.18221,-0.728864 l -0.36443,-0.546645 c -1.27551,-2.186587 -3.52283,-3.401362 -6.43828,-3.401362 -3.70505,0 
-6.31681,2.186587 -6.31681,5.223516 0,3.522832 2.6725,4.616129 6.49903,5.770162 3.70504,1.154032 
4.79834,2.065109 4.79834,4.008741 0,1.943632 -1.70068,3.097665 -4.43392,3.097665 -2.42954,0 
-4.19095,-1.154033 -5.22351,-3.34062 l -0.0608,-0.121477 c -0.18221,-0.30369 -0.48591,-0.364433 
-0.72885,-0.30369 l -1.0933,0.48591 c -0.30369,0.182212 -0.36443,0.485902 -0.30369,0.728857 l 
0.18221,0.364433 v 0 c 1.27551,2.733239 3.82653,4.312439 7.10641,4.312439 4.06948,0 6.98493,-2.308065 
6.98493,-5.527207 0,-3.158407 -2.24733,-4.616129 -6.19532,-5.770161"
+     id="path3767"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 121.29485,60.034495 c -3.64431,-1.154032 -5.0413,-1.822155 -5.0413,-3.887264 0,-1.700685 
1.51847,-2.793975 3.82653,-2.793975 2.06511,0 3.52283,0.728858 4.49465,2.3688 l 0.30369,0.48591 c 
0.18222,0.242955 0.48591,0.364432 0.72887,0.182212 v 0 l 1.09329,-0.60738 c 0.24295,-0.18222 0.36443,-0.48591 
0.18222,-0.728864 l -0.36443,-0.546645 c -1.27551,-2.186587 -3.52284,-3.401362 -6.43829,-3.401362 -3.70505,0 
-6.3168,2.186587 -6.3168,5.223516 0,3.522832 2.67249,4.616129 6.49901,5.770162 3.70506,1.154032 
4.79835,2.065109 4.79835,4.008741 0,1.943632 -1.70068,3.097665 -4.43391,3.097665 -2.42954,0 
-4.19096,-1.154033 -5.22351,-3.34062 l -0.0607,-0.121477 c -0.18221,-0.30369 -0.48591,-0.364433 
-0.72887,-0.30369 l -1.09329,0.48591 c -0.30369,0.182212 -0.36443,0.485902 -0.30369,0.728857 l 
0.18222,0.364433 v 0 c 1.27551,2.733239 3.82653,4.312439 7.1064,4.312439 4.06949,0 6.98494,-2.308065 
6.98494,-5.527207 0.0607,-3.158407 -2.24733,-4.616129 -6.19534,-5.770161"
+     id="path3769"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /><path
+     class="st1"
+     d="m 220.42014,67.930501 0.85034,-0.668123 c 0.24296,-0.182212 0.60739,-0.182212 0.7896,0.121478 v 0 c 
1.15403,1.639942 3.09767,2.551019 5.10204,2.490277 2.85471,0 4.61613,-1.457722 4.61613,-3.887264 0,-2.85471 
-1.76142,-4.190954 -6.31681,-4.190954 h -0.0608 c -0.54665,0 -0.72887,-0.242955 -0.72887,-0.546653 v 
-0.728857 c 0,-0.48591 0.24296,-0.66813 0.60739,-0.66813 h 0.36443 c 4.19096,0 5.64868,-1.27551 
5.64868,-3.583567 0,-1.943639 -1.15403,-3.279884 -4.06948,-3.279884 -1.63994,0 -3.27988,0.668122 
-4.43391,1.882897 -0.24295,0.242955 -0.54665,0.242955 -0.85034,0.06075 l -0.72887,-0.668122 c 
-0.24295,-0.18222 -0.24295,-0.546645 -0.0608,-0.7896 v 0 c 1.63995,-1.639942 3.88727,-2.611762 
6.19533,-2.611762 4.31244,0 6.25607,2.308064 6.25607,5.102039 0,2.186587 -1.15403,4.312439 -3.46209,4.798349 
3.09766,0.06075 4.00874,3.522832 4.00874,5.344986 0,3.462097 -2.73323,5.891639 -7.04567,5.891639 -2.85471,0 
-5.34499,-1.154032 -6.9242,-3.279884 0,-0.30369 0,-0.60738 0.24296,-0.7896 z"
+     id="path3771"
+     inkscape:connector-curvature="0"
+     style="fill:#424342;stroke-width:0.60738534" /></svg>
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c 
b/gnome-initial-setup/pages/language/gis-language-page.c
index f5c5e70b..f21bbe1d 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -275,12 +275,21 @@ update_distro_logo (GisLanguagePage *page)
     { "SLES",                           "suse-logo-icon" },
   };
 
-  for (i = 0; i < G_N_ELEMENTS (id_to_logo); i++)
+  if (g_strcmp0 (id, "endless") == 0)
     {
-      if (g_strcmp0 (id, id_to_logo[i].id) == 0)
+      g_object_set (priv->logo,
+                    "resource", "/org/gnome/initial-setup/EndlessLogo.svg",
+                    NULL);
+    }
+  else
+    {
+      for (i = 0; i < G_N_ELEMENTS (id_to_logo); i++)
         {
-          g_object_set (priv->logo, "icon-name", id_to_logo[i].logo, NULL);
-          break;
+          if (g_strcmp0 (id, id_to_logo[i].id) == 0)
+            {
+              g_object_set (priv->logo, "icon-name", id_to_logo[i].logo, NULL);
+              break;
+            }
         }
     }
 }
diff --git a/gnome-initial-setup/pages/language/language.gresource.xml 
b/gnome-initial-setup/pages/language/language.gresource.xml
index de0688d3..1716b7b7 100644
--- a/gnome-initial-setup/pages/language/language.gresource.xml
+++ b/gnome-initial-setup/pages/language/language.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/org/gnome/initial-setup">
     <file preprocess="xml-stripblanks" alias="gis-language-page.ui">gis-language-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-welcome-widget.ui">gis-welcome-widget.ui</file>
+    <file>EndlessLogo.svg</file>
   </gresource>
   <gresource prefix="/org/gnome/control-center">
     <file preprocess="xml-stripblanks" alias="language-chooser.ui">language-chooser.ui</file>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]