Merge branch 'wip/purism/sadiq/info' into 'librem5-3-24'

Add new about page design

See merge request Librem5/gnome-control-center!5

debian/control

@@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgrilo-0.3-dev (>= 0.3.0),
                libgsound-dev,
                libgtk-3-dev (>= 3.22.20),
+               libepoxy-dev,
                libgtop2-dev,
                libgudev-1.0-dev [linux-any],
                libkrb5-dev,

debian/control.in

@@ -28,6 +28,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgrilo-0.3-dev (>= 0.3.0),
                libgsound-dev,
                libgtk-3-dev (>= 3.22.20),
+               libepoxy-dev,
                libgtop2-dev,
                libgudev-1.0-dev [linux-any],
                libkrb5-dev,

panels/common/cc-list-row.c

@@ -349,3 +349,20 @@ cc_list_row_set_secondary_label (CcListRow   *self,
   gtk_label_set_label (self->secondary_label, label);
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SECONDARY_LABEL]);
 }
+
+void
+cc_list_row_set_secondary_markup (CcListRow   *self,
+                                  const gchar *markup)
+{
+  g_return_if_fail (CC_IS_LIST_ROW (self));
+  g_return_if_fail (!self->show_switch);
+
+  if (!markup)
+    markup = "";
+
+  if (g_str_equal (markup, gtk_label_get_label (self->secondary_label)))
+    return;
+
+  gtk_label_set_markup (self->secondary_label, markup);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SECONDARY_LABEL]);
+}

panels/common/cc-list-row.h

@@ -39,5 +39,7 @@ gboolean   cc_list_row_get_active          (CcListRow *self);
 void       cc_list_row_activate            (CcListRow   *self);
 void       cc_list_row_set_secondary_label (CcListRow   *self,
                                             const gchar *label);
+void       cc_list_row_set_secondary_markup (CcListRow   *self,
+                                             const gchar *markup);
 
 G_END_DECLS

panels/common/cc-list-row.ui

@@ -50,6 +50,7 @@
             <property name="visible">1</property>
             <property name="valign">center</property>
             <property name="ellipsize">end</property>
+            <property name="selectable" bind-source="CcListRow" bind-property="activatable" bind-flags="sync-create|invert-boolean" />
             <style>
               <class name="dim-label"/>
             </style>

panels/common/cc-os-release.c

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2019 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "cc-os-release.h"
+
+gchar *
+cc_os_release_get_value (const gchar *key)
+{
+  g_autoptr(GHashTable) values = NULL;
+
+  values = cc_os_release_get_values ();
+  if (values == NULL)
+    return NULL;
+
+  return g_strdup (g_hash_table_lookup (values, key));
+}
+
+GHashTable *
+cc_os_release_get_values (void)
+{
+  g_autoptr(GHashTable) values = NULL;
+  g_autofree gchar *buffer = NULL;
+  g_auto(GStrv) lines = NULL;
+  int i;
+  g_autoptr(GError) error = NULL;
+
+  values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+  if (!g_file_get_contents ("/etc/os-release", &buffer, NULL, &error))
+    {
+       if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+         return NULL;
+
+       if (!g_file_get_contents ("/usr/lib/os-release", &buffer, NULL, NULL))
+         return NULL;
+    }
+
+  /* Default values in spec */
+  g_hash_table_insert (values, g_strdup ("NAME"), g_strdup ("Linux"));
+  g_hash_table_insert (values, g_strdup ("ID"), g_strdup ("Linux"));
+  g_hash_table_insert (values, g_strdup ("PRETTY_NAME"), g_strdup ("Linux"));
+
+  lines = g_strsplit (buffer, "\n", -1);
+  for (i = 0; lines[i] != NULL; i++)
+    {
+      gchar *line = lines[i];
+      g_auto(GStrv) tokens = NULL;
+      const gchar *key, *value;
+      g_autofree gchar *unquoted_value = NULL;
+
+      /* Skip comments */
+      if (g_str_has_prefix (line, "#"))
+        continue;
+
+      tokens = g_strsplit (line, "=", 2);
+      if (g_strv_length (tokens) < 2)
+        continue;
+      key = tokens[0];
+      value = tokens[1];
+      unquoted_value = g_shell_unquote (value, NULL);
+      if (unquoted_value != NULL)
+        value = unquoted_value;
+
+      g_hash_table_insert (values, g_strdup (key), g_strdup (value));
+    }
+
+  return g_steal_pointer (&values);
+}

panels/common/cc-os-release.h

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2019 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+gchar      *cc_os_release_get_value  (const gchar *key);
+
+GHashTable *cc_os_release_get_values (void);
+
+G_END_DECLS

panels/common/meson.build

@@ -43,6 +43,7 @@ libwidgets_dep = declare_dependency(
 
 sources = common_sources + files(
   'cc-common-language.c',
+  'cc-os-release.c',
   'cc-language-chooser.c',
   'cc-list-row.c',
   'cc-util.c'

panels/info-overview/GnomeLogoVerticalMedium.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="97.966095"
+   height="138.95122"
+   id="svg1903"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="GnomeLogoVerticalMedium.svg">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="818"
+     inkscape:window-height="738"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="2.0645911"
+     inkscape:cx="6.1022513"
+     inkscape:cy="68.392751"
+     inkscape:window-x="460"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1903"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs1905">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 244.11613 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="401.74014 : 244.11613 : 1"
+       inkscape:persp3d-origin="200.87007 : 162.74409 : 1"
+       id="perspective26" />
+  </defs>
+  <g
+     transform="matrix(0.30686102,0,0,0.30686102,-57.94673,-76.524295)"
+     id="layer1">
+    <g
+       transform="translate(925.8326,120.8762)"
+       id="g3963">
+      <g
+         transform="matrix(2.914897,0,0,2.914897,-717.5904,128.5015)"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="g3771">
+        <g
+           style="fill:#000000;fill-opacity:1"
+           id="g3773">
+          <path
+             d="M 86.068,0 C 61.466,0 56.851,35.041 70.691,35.041 84.529,35.041 110.671,0 86.068,0 z"
+             style="fill:#000000;fill-opacity:1"
+             id="path3775"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M 45.217,30.699 C 52.586,31.149 60.671,2.577 46.821,4.374 32.976,6.171 37.845,30.249 45.217,30.699 z"
+             style="fill:#000000;fill-opacity:1"
+             id="path3777"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M 11.445,48.453 C 16.686,46.146 12.12,23.581 3.208,29.735 -5.7,35.89 6.204,50.759 11.445,48.453 z"
+             style="fill:#000000;fill-opacity:1"
+             id="path3779"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M 26.212,36.642 C 32.451,35.37 32.793,9.778 21.667,14.369 10.539,18.961 19.978,37.916 26.212,36.642 l 0,0 z"
+             style="fill:#000000;fill-opacity:1"
+             id="path3781"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 58.791,93.913 c 1.107,8.454 -6.202,12.629 -13.36,7.179 C 22.644,83.743 83.16,75.088 79.171,51.386 75.86,31.712 15.495,37.769 8.621,68.553 3.968,89.374 27.774,118.26 52.614,118.26 c 12.22,0 26.315,-11.034 28.952,-25.012 C 83.58,82.589 57.867,86.86 58.791,93.913 l 0,0 z"
+             style="fill:#000000;fill-opacity:1"
+             id="path3783"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1.098291,0,0,1.098291,41.06056,-50.07504)"
+         id="g3956">
+        <path
+           d="m -565.99523,509.46063 c -8.08731,0.21792 -14.47394,3.12448 -19.17071,8.69866 -4.86385,5.80101 -7.31024,13.81651 -7.31024,24.03862 0,10.19394 2.44651,18.18745 7.31024,23.98846 4.88761,5.801 11.59815,8.69866 20.15764,8.69866 8.5831,0 15.3105,-2.89766 20.17436,-8.69866 4.86373,-5.80101 7.29358,-13.79452 7.29353,-23.98846 -5e-5,-10.22211 -2.4298,-18.23761 -7.29353,-24.03862 -4.86386,-5.80075 -11.59131,-8.69866 -20.17436,-8.69866 -0.33434,0 -0.6582,-0.009 -0.98693,0 z m 0.60221,11.77669 c 0.12927,-0.003 0.25357,0 0.38472,0 4.21998,0 7.48996,1.8261 9.8028,5.48697 2.31266,3.66086 3.47944,8.82788 3.47949,15.47362 0,6.61757 -1.16692,11.74604 -3.47949,15.40691 -2.31274,3.66086 -5.58286,5.50352 -9.8028,5.50352 -4.19632,0 -7.43983,-1.84266 -9.75257,-5.50352 -2.31274,-3.66087 -3.47944,-8.78934 -3.47949,-15.40691 0,-6.64574 1.16684,-11.81276 3.47949,-15.47362 2.24035,-3.54647 5.35963,-5.37604 9.36785,-5.48697 z"
+           style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+           id="path3787"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -657.35432,568.97161 c -7.12362,5.98235 -17.72219,5.91366 -22.13752,5.91366 -8.8932,0 -15.93855,-2.92879 -21.13613,-8.78612 -5.19765,-5.88525 -7.7964,-13.85456 -7.7964,-23.90791 0,-10.16578 2.64646,-18.16325 7.93945,-23.99241 5.293,-5.82892 12.54098,-8.74363 21.74413,-8.74363 3.55245,0 6.94991,0.39433 10.19254,1.18273 3.26638,0.78841 6.34203,1.95706 9.22697,3.50595 l -3.70487,10.9527 c -1.62185,-0.88773 -3.4788,-1.76286 -5.20022,-2.37807 -2.93262,-0.98557 -5.87712,-1.47823 -8.83351,-1.47823 -5.48379,0 -9.71581,1.81623 -12.69601,5.44892 -2.95649,3.60454 -4.4347,8.7718 -4.4347,15.50204 0,6.67415 1.4305,11.82733 4.29167,15.46003 2.86099,3.6327 7.16068,5.44892 12.19522,5.44892 5.11476,0 8.28269,-1.28922 9.97226,-2.64762 l 0,-10.91144 -11.08087,0 0,-10.89809 21.45799,0"
+           style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+           id="path3789"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -528.50252,510.59568 17.5241,0 12.15952,39.37066 12.23105,-39.37066 14.81181,0 6.69132,63.06461 -13.01787,0 -4.0148,-39.4349 -12.30257,39.62391 -8.72628,0 -12.30263,-40.9623 -4.01479,40.77329 -13.05365,0 6.69132,-63.06461"
+           style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+           id="path3793"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -455.68828,510.59568 37.15811,0 0,12.29183 -23.38928,0 0,13.08097 17.97969,0 0,10.95369 -17.97969,0 0,14.44629 24.17608,0 0,12.29183 -37.94491,0 0,-63.06461"
+           style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+           id="path3795"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -647.94283,510.59568 8.6869,0 27.44915,37.90083 0,-37.90083 11.71533,0 0,63.06461 -8.6869,0 -27.4491,-37.90083 0,37.90083 -11.71538,0 0,-63.06461"
+           style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+           id="path3791"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>

panels/info-overview/cc-info-overview-panel.h

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <shell/cc-panel.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_INFO_OVERVIEW_PANEL (cc_info_overview_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcInfoOverviewPanel, cc_info_overview_panel, CC, INFO_OVERVIEW_PANEL, CcPanel)
+
+GtkWidget *cc_info_overview_panel_new (void);
+
+G_END_DECLS

panels/info-overview/gnome-control-center-print-renderer.c

+/* -*- mode:c; c-basic-offset: 8; indent-tabs-mode: nil; -*- */
+/* Tool to set the property _GNOME_SESSION_ACCELERATED on the root window */
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author:
+ *   Bastien Nocera <hadess@hadess.net>
+ *   Matthias Clasen <mclasen@redhat.com>
+ */
+
+#include <gtk/gtk.h>
+#include <epoxy/gl.h>
+
+static char *
+get_gtk_gles_renderer (void)
+{
+        GtkWidget *win;
+        GdkGLContext *context;
+        char *renderer = NULL;
+
+        win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        gtk_widget_realize (win);
+        context = gdk_window_create_gl_context (gtk_widget_get_window (win), NULL);
+        if (!context)
+                return NULL;
+        gdk_gl_context_make_current (context);
+        renderer = g_strdup ((char *) glGetString (GL_RENDERER));
+        gdk_gl_context_clear_current ();
+        g_object_unref (context);
+
+        return renderer;
+}
+
+int
+main (int argc, char **argv)
+{
+        g_autofree char *renderer_string = NULL;
+
+        gtk_init (NULL, NULL);
+
+        renderer_string = get_gtk_gles_renderer ();
+        if (renderer_string) {
+                g_print ("%s", renderer_string);
+                return 0;
+        }
+        return 1;
+}

panels/info-overview/gnome-info-overview-panel.desktop.in.in

+[Desktop Entry]
+Name=About
+Comment=View information about your system
+Exec=gnome-control-center info-overview
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=help-about
+Terminal=false
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
+OnlyShowIn=GNOME;Unity;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=info
+X-GNOME-Bugzilla-Version=@VERSION@
+# Translators: Search terms to find the About panel.
+# Do NOT translate or localize the semicolons!
+# The list MUST also end with a semicolon!
+# "Preferred Applications" is the old name for the preference, so make
+# sure that you use the same "translation" for those keywords
+Keywords=device;system;information;hostname;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;

panels/info-overview/info-cleanup.c

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc
+ * Copyright (C) 2008 William Jon McCann <jmccann@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include "info-cleanup.h"
+
+typedef struct
+{
+  char *regex;
+  char *replacement;
+} ReplaceStrings;
+
+static char *
+prettify_info (const char *info)
+{
+  g_autofree char *escaped = NULL;
+  g_autofree gchar *pretty = NULL;
+  int   i;
+  static const ReplaceStrings rs[] = {
+    { "Mesa DRI ", ""},
+    { "Intel[(]R[)]", "Intel\302\256"},
+    { "Core[(]TM[)]", "Core\342\204\242"},
+    { "Atom[(]TM[)]", "Atom\342\204\242"},
+    { "Gallium .* on (AMD .*)", "\\1"},
+    { "(AMD .*) [(].*", "\\1"},
+    { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"},
+    { "AMD", "AMD\302\256"},
+    { "Graphics Controller", "Graphics"},
+  };
+
+  if (*info == '\0')
+    return NULL;
+
+  escaped = g_markup_escape_text (info, -1);
+  pretty = g_strdup (g_strstrip (escaped));
+
+  for (i = 0; i < G_N_ELEMENTS (rs); i++)
+    {
+      g_autoptr(GError) error = NULL;
+      g_autoptr(GRegex) re = NULL;
+      g_autofree gchar *new = NULL;
+
+      re = g_regex_new (rs[i].regex, 0, 0, &error);
+      if (re == NULL)
+        {
+          g_warning ("Error building regex: %s", error->message);
+          continue;
+        }
+
+      new = g_regex_replace (re,
+                             pretty,
+                             -1,
+                             0,
+                             rs[i].replacement,
+                             0,
+                             &error);
+
+      if (error != NULL)
+        {
+          g_warning ("Error replacing %s: %s", rs[i].regex, error->message);
+          continue;
+        }
+
+      g_free (pretty);
+      pretty = g_steal_pointer (&new);
+    }
+
+  return g_steal_pointer (&pretty);
+}
+
+static char *
+remove_duplicate_whitespace (const char *old)
+{
+  g_autofree gchar *new = NULL;
+  g_autoptr(GRegex) re = NULL;
+  g_autoptr(GError) error = NULL;
+
+  if (old == NULL)
+    return NULL;
+
+  re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, &error);
+  if (re == NULL)
+    {
+      g_warning ("Error building regex: %s", error->message);
+      return g_strdup (old);
+    }
+  new = g_regex_replace (re,
+                         old,
+                         -1,
+                         0,
+                         " ",
+                         0,
+                         &error);
+  if (new == NULL)
+    {
+      g_warning ("Error replacing string: %s", error->message);
+      return g_strdup (old);
+    }
+
+  return g_steal_pointer (&new);
+}
+
+char *
+info_cleanup (const char *input)
+{
+  g_autofree char *pretty = NULL;
+
+  pretty = prettify_info (input);
+  return remove_duplicate_whitespace (pretty);
+}

panels/info-overview/info-cleanup.h

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc
+ * Copyright (C) 2008 William Jon McCann <jmccann@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <glib.h>
+
+char *info_cleanup (const char *input);

panels/info-overview/info-overview.gresource.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/info-overview">
+    <file preprocess="xml-stripblanks">cc-info-overview-panel.ui</file>
+    <file>GnomeLogoVerticalMedium.svg</file>
+    <file>purism-logo.svg</file>
+  </gresource>
+</gresources>

panels/info-overview/meson.build

+epoxy_dep = dependency('epoxy')
+panels_list += cappletname
+desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
+
+desktop_in = configure_file(
+  input: desktop + '.in.in',
+  output: desktop + '.in',
+  configuration: desktop_conf
+)
+
+i18n.merge_file(
+  desktop,
+  type: 'desktop',
+  input: desktop_in,
+  output: desktop,
+  po_dir: po_dir,
+  install: true,
+  install_dir: control_center_desktopdir
+)
+
+cflags += [
+  '-DBINDIR="@0@"'.format(control_center_bindir),
+  '-DDATADIR="@0@"'.format(control_center_datadir),
+  '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir),
+]
+
+sources = files(
+  'cc-info-overview-panel.c',
+  'info-cleanup.c'
+)
+
+resource_data = files(
+  'GnomeLogoVerticalMedium.svg',
+  'purism-logo.svg',
+  'cc-info-overview-panel.ui'
+)
+
+sources += gnome.compile_resources(
+  'cc-' + cappletname + '-resources',
+  cappletname + '.gresource.xml',
+  c_name: 'cc_' + cappletname.underscorify (),
+  dependencies: resource_data,
+  export: true
+)
+
+deps = common_deps + [
+  dependency('udisks2', version: '>= 2.1.8'),
+  dependency('libgtop-2.0')
+]
+
+info_panel_lib = static_library(
+  cappletname,
+  sources: sources,
+  include_directories: [ top_inc, common_inc ],
+  dependencies: deps,
+  c_args: cflags
+)
+panels_libs += info_panel_lib
+
+executable(
+  'gnome-control-center-print-renderer',
+  'gnome-control-center-print-renderer.c',
+  include_directories: [ top_inc ],
+  dependencies: [ deps, epoxy_dep ],
+  c_args: cflags,
+  install: true,
+  install_dir: control_center_libexecdir,
+)

panels/info-overview/purism-logo.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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" width="162.5" height="137.49957" viewBox="0 0 162.5 137.49958" version="1.1" id="svg19258" inkscape:version="1.0beta2 (2b71d25d45, 2019-12-03)" sodipodi:docname="purism-narrw-larger.svg">
+  <defs id="defs19252">
+    <clipPath id="clipPath876" clipPathUnits="userSpaceOnUse">
+      <rect y="1253.5042" x="-105.25018" height="517.03516" width="455.13281" id="rect878" style="fill:#f6f5f4;fill-opacity:1;stroke-width:15;stroke-linecap:round;stroke-linejoin:round"/>
+    </clipPath>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.70710678" inkscape:cx="341.15469" inkscape:cy="30.965346" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" units="px" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:document-rotation="0" inkscape:snap-page="true">
+    <inkscape:grid type="xygrid" id="grid19822" originx="260.00017" originy="-23.827235"/>
+  </sodipodi:namedview>
+  <metadata id="metadata19255">
+    <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/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(260.00017,-1296.347)">
+    <g transform="matrix(1.2499982,0,0,1.2499982,64.999588,-324.08448)" id="g862">
+      <path style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:26.6667px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell Ultra-Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none" d="m -191.94549,1370.1868 c -1.57333,0 -2.64063,1.0661 -2.64063,2.6661 0,1.5733 1.0673,2.6406 2.64063,2.6406 1.57333,0 2.63867,-1.0673 2.63867,-2.6406 0,-1.6 -1.06534,-2.6661 -2.63867,-2.6661 z m -45.75196,1.6524 v 18.5078 h 4.61329 v -5.4395 h 1.51953 c 5.01333,0 8.32031,-2.7482 8.32031,-6.9082 0,-3.8666 -2.82688,-6.1601 -7.54688,-6.1601 z m 4.61329,4.0547 h 1.91992 c 1.86666,0 3.11914,1.0119 3.11914,2.5586 0,1.4933 -1.04002,2.4004 -2.69336,2.4004 h -2.3457 z m 51.99414,1.1191 c -4.05333,0 -6.24024,1.547 -6.24024,4.4004 0,5.04 6.82617,3.2809 6.82617,4.8809 0,0.5066 -0.71856,0.8515 -1.86523,0.8515 -1.14667,0 -2.80016,-0.3188 -4.16016,-0.7988 l -0.98828,3.2793 c 1.49334,0.6133 3.49339,0.9863 5.38672,0.9863 3.94667,0 6.1875,-1.6264 6.1875,-4.4531 0,-4.9866 -6.98633,-3.4656 -6.98633,-4.959 0,-0.4533 0.63992,-0.7207 1.91992,-0.7207 1.04,0 2.32029,0.1878 3.62696,0.5078 l 0.8789,-3.334 c -1.28,-0.4 -3.0126,-0.6406 -4.58593,-0.6406 z m 15.32226,0.1074 c -1.62667,0 -3.12151,0.6125 -4.21484,1.7325 l -0.66602,-1.5723 h -3.33398 v 13.0664 h 4.61328 v -8.6406 c 0.56,-0.4 1.20052,-0.586 1.86719,-0.586 1.70666,0 1.97265,1.1736 1.97265,2.1602 v 7.0664 h 4.58789 v -7.8398 c 0,-0.2667 -6.4e-4,-0.5335 -0.0273,-0.7735 0.56,-0.4 1.19992,-0.6133 1.91992,-0.6133 1.6,0 1.94727,1.0402 1.94727,2.1602 v 7.0664 h 4.61328 v -7.8398 c 0,-3.3333 -1.8395,-5.3868 -4.82617,-5.3868 -1.86666,0 -3.4138,0.7721 -4.48047,2.0254 -0.82666,-1.3067 -2.18599,-2.0254 -3.97266,-2.0254 z m -32.19336,0.053 c -1.54667,0 -3.01265,0.7728 -3.97265,2.1328 l -0.40039,-2.0253 h -3.59961 v 13.0664 h 4.61328 V 1382.4 c 0.69333,-0.7466 1.59927,-1.1738 2.58594,-1.1738 0.69333,0 1.49273,0.1872 2.05273,0.4805 l 1.04102,-3.9473 c -0.64001,-0.3733 -1.52032,-0.5859 -2.32032,-0.5859 z m -23.63086,0.1075 v 8.1054 c 0,3.1467 1.8126,5.1211 4.58594,5.1211 1.6,0 3.06614,-0.6672 4.13281,-1.8672 l 0.72071,1.7071 h 3.33398 v -13.0664 h -4.61328 v 8.5586 c -0.50667,0.4 -1.12112,0.668 -1.81445,0.668 -1.52,0 -1.73243,-1.2002 -1.73243,-2.1602 v -7.0664 z m 27.32618,0 v 13.0664 h 4.61328 v -13.0664 z" id="path855" inkscape:connector-curvature="0"/>
+      <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;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:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m -229,1312.3468 v 4 39 h 68 v -43 z m 8,8 h 52 v 27 h -52 z" id="path857" inkscape:connector-curvature="0"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file

panels/info/meson.build

 panel_names = [
   'default-apps',
-  'info-overview',
   'removable-media'
 ]
 
@@ -35,7 +34,7 @@ cflags += [
 
 sources = files(
   'cc-info-default-apps-panel.c',
-  'cc-info-overview-panel.c',
+  # 'cc-info-overview-panel.c',
   'cc-info-removable-media-panel.c',
   'info-cleanup.c'