GNOME.org
 

[gnome-initial-setup/mcatanzaro/resurrect-software-page: 3/3] software: update to more closely match current design


commit ea11d375cd126f82da4604f98a0c726a12ed6b5a
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Sat Jul 31 16:51:47 2021 -0500

    software: update to more closely match current design
    
    This is a lot closer to the current design for this page.

 .../pages/software/gis-software-page.c             |  29 +-----
 .../pages/software/gis-software-page.ui            | 113 +--------------------
 .../pages/software/gis-software-symbolic.svg       |   1 +
 .../pages/software/software.gresource.xml          |   3 +
 4 files changed, 9 insertions(+), 137 deletions(-)
---
diff --git a/gnome-initial-setup/pages/software/gis-software-page.c 
b/gnome-initial-setup/pages/software/gis-software-page.c
index 59a89c5d..a29634b8 100644
--- a/gnome-initial-setup/pages/software/gis-software-page.c
+++ b/gnome-initial-setup/pages/software/gis-software-page.c
@@ -37,7 +37,6 @@
 
 struct _GisSoftwarePagePrivate
 {
-  GtkWidget *more_popover;
   GtkWidget *proprietary_switch;
   GtkWidget *header;
 };
@@ -109,31 +108,9 @@ gis_software_page_locale_changed (GisPage *gis_page)
 {
   GisSoftwarePage *page = GIS_SOFTWARE_PAGE (gis_page);
   GisSoftwarePagePrivate *priv = gis_software_page_get_instance_private (page);
-  g_autoptr(GString) str = g_string_new (NULL);
-
-  gis_page_set_title (GIS_PAGE (page), _("Software Repositories"));
-
-  g_string_append (str,
-                   /* TRANSLATORS: this is the third party repositories info bar. */
-                   _("Access additional software from selected third party sources."));
-  g_string_append (str, " ");
-  g_string_append (str,
-                   /* TRANSLATORS: this is the third party repositories info bar. */
-                   _("Some of this software is proprietary and therefore has restrictions on use, sharing, 
and access to source code."));
-  g_object_set (priv->header, "subtitle", str->str, NULL);
-}
 
-static gboolean
-activate_link (const char *label,
-               const char *uri,
-               gpointer    data)
-{
-  GisSoftwarePage *page = GIS_SOFTWARE_PAGE (data);
-  GisSoftwarePagePrivate *priv = gis_software_page_get_instance_private (page);
-
-  gtk_widget_show (priv->more_popover);
-
-  return TRUE;
+  gis_page_set_title (GIS_PAGE (page), _("Third-Party Repositories"));
+  g_object_set (priv->header, "subtitle", _("Third-party repositories provide access to additional software 
from selected external sources. They include popular apps, as well as firmware that is important for some 
devices. Some proprietary software is included."), NULL);
 }
 
 static gboolean
@@ -153,10 +130,8 @@ gis_software_page_class_init (GisSoftwarePageClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), 
"/org/gnome/initial-setup/gis-software-page.ui");
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisSoftwarePage, more_popover);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisSoftwarePage, 
proprietary_switch);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisSoftwarePage, header);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), activate_link);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), state_set);
 
   page_class->page_id = PAGE_ID;
diff --git a/gnome-initial-setup/pages/software/gis-software-page.ui 
b/gnome-initial-setup/pages/software/gis-software-page.ui
index 0e669b34..d8a14fd8 100644
--- a/gnome-initial-setup/pages/software/gis-software-page.ui
+++ b/gnome-initial-setup/pages/software/gis-software-page.ui
@@ -13,22 +13,11 @@
           <object class="GisPageHeader" id="header">
             <property name="visible">True</property>
             <property name="margin_top">24</property>
-            <property name="title" translatable="yes">Additional Software Repositories</property>
-            <property name="icon_name">folder-download-symbolic</property>
+            <property name="title" translatable="yes">Third-Party Repositories</property>
+            <property name="icon_name">gis-software-symbolic</property>
             <property name="show_icon" bind-source="GisSoftwarePage" bind-property="small-screen" 
bind-flags="invert-boolean|sync-create"/>
           </object>
         </child>
-        <child>
-          <object class="GtkLabel" id="more_label">
-            <property name="visible">True</property>
-            <property name="margin-top">15</property>
-            <property name="halign">center</property>
-            <property name="max-width-chars">50</property>
-            <property name="use-markup">True</property>
-            <property name="label" translatable="yes">&lt;a href="more"&gt;Find out 
more…&lt;/a&gt;</property>
-            <signal name="activate-link" handler="activate_link"/>
-          </object>
-        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -39,7 +28,7 @@
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Third Party Repositories</property>
+                <property name="label" translatable="yes">Third-Party Repositories</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -54,103 +43,7 @@
             </child>
           </object>
         </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="valign">end</property>
-            <property name="halign">center</property>
-            <property name="spacing">64</property>
-            <property name="margin_bottom">64</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">64</property>
-                <property name="opacity">0.5</property>
-                <property name="icon_name">web-browser-symbolic</property>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">64</property>
-                <property name="opacity">0.5</property>
-                <property name="icon_name">text-editor-symbolic</property>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">64</property>
-                <property name="opacity">0.5</property>
-                <property name="icon_name">help-faq-symbolic</property>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">64</property>
-                <property name="opacity">0.5</property>
-                <property name="icon_name">input-gaming-symbolic</property>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
       </object>
     </child>
   </template>
-  <object class="GtkPopover" id="more_popover">
-    <property name="relative-to">more_label</property>
-    <property name="position">bottom</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">1</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">1</property>
-            <property name="max-width-chars">40</property>
-            <property name="margin-top">20</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-bottom">10</property>
-            <property name="wrap">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Proprietary software typically has restrictions on how 
it can be used and on access to source code. This prevents anyone but the software owner from inspecting, 
improving or learning from its code.</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">1</property>
-            <property name="max-width-chars">40</property>
-            <property name="wrap">True</property>
-            <property name="xalign">0</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-bottom">20</property>
-            <property name="label" translatable="yes">In contrast, Free Software can be freely run, copied, 
distributed, studied and modified.</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>
diff --git a/gnome-initial-setup/pages/software/gis-software-symbolic.svg 
b/gnome-initial-setup/pages/software/gis-software-symbolic.svg
new file mode 100644
index 00000000..f344c64d
--- /dev/null
+++ b/gnome-initial-setup/pages/software/gis-software-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"><g fill="#474747"><path d="M.002 
12c.004-.224.112-.53.304-.704l2.161-2.117c.233-.243.787-.292 1.011-.157.081.002 1.136.632 
1.289.866.616.946-.344 1.827-1.174 1.547l-.35-.212-1.602 1.572C1.004 13.32-.051 12.887 0 
12zM11.62.118c.389-.101.79-.11 1.17-.08l-1.36 2.305a.975.975 0 00.354 1.348l.874.508a.99.99 0 
001.357-.353l1.36-2.306c.212.314.4.666.502 1.053.486 1.853-.632 3.748-2.497 
4.234-.39.101-.79.11-1.17.08l-.803 1.116L7.997 8s1.52-2.577 1.628-2.595a3.483 3.483 0 01-.502-1.053C8.636 2.5 
9.754.604 11.619.118z" 
style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none"
 color="#000" font-weight="400" font-family="Sans" overflow="visible"/><path d="M3.599.719a3.5 3.5 0 
00-.655.219c-.017.624.086 1.441-.157 1.656-.238.21-1.036.034-1.653-.031a3.63 3.63 0 00-.312.75c.477.395 
1.138.839 1.154 1.156.016.32-.625.805-1.06 1.25.102.258.249.493.4
 05.719.607-.127 1.364-.374 1.623-.188.262.19.264 1.005.343 
1.625.249.075.512.105.78.125.28-.555.566-1.32.874-1.406.315-.089.962.458 
1.497.781.219-.152.413-.337.593-.531-.253-.573-.72-1.292-.593-1.594.128-.302.974-.47 
1.56-.687.005-.074.032-.145.032-.22 
0-.19-.035-.378-.063-.562-.605-.16-1.465-.241-1.622-.531-.157-.288.241-1.061.437-1.656a3.682 3.682 0 
00-.656-.469c-.5.375-1.082.994-1.404.938-.316-.056-.662-.82-.998-1.344-.04.007-.085-.008-.125 0zm.624 
1.875a1.686 1.686 0 11-1.685 1.688c0-.933.754-1.688 1.685-1.688z" style="marker:none" color="#000" 
overflow="visible"/><path d="M2.997 9h9.985l.008 6.063c0 .492-.472.937-.994.937H4.004a.996.996 0 01-.999-1z" 
style="marker:none" color="#bebebe" overflow="visible"/><path d="M15.96 
11.977c-.003-.224-.112-.53-.303-.704l-2.162-2.117c-.232-.243-.786-.292-1.01-.156-.081.002-1.136.63-1.289.865-.616.946.344
 1.827 1.174 1.547l.35-.212 1.602 1.572c.637.526 1.691.092 1.639-.795z" 
style="line-height:normal;-inkscape-font-specification:Sans;text-ind
 ent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#000" 
font-weight="400" font-family="Sans" overflow="visible"/></g></svg>
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/software/software.gresource.xml 
b/gnome-initial-setup/pages/software/software.gresource.xml
index 1f8384c0..caee9bd2 100644
--- a/gnome-initial-setup/pages/software/software.gresource.xml
+++ b/gnome-initial-setup/pages/software/software.gresource.xml
@@ -3,4 +3,7 @@
   <gresource prefix="/org/gnome/initial-setup">
     <file preprocess="xml-stripblanks" alias="gis-software-page.ui">gis-software-page.ui</file>
   </gresource>
+  <gresource prefix="/org/gnome/InitialSetup/icons">
+    <file compressed="true" alias="scalable/actions/gis-software-symbolic.svg" 
preprocess="xml-stripblanks">gis-software-symbolic.svg</file>
+  </gresource>
 </gresources>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]