cs_info: Fix cosmetic issues with system icon

- Support icon names, not just path (native HiDPI/symbolic support)
- Call the setting system-icon
- Move the icon to the top of the page
- Remove redundant page title
- Increase spacing

Author: clefebvre

data/org.cinnamon.gschema.xml

@@ -501,12 +501,11 @@
       <summary>If true, Cinnamon will no longer attempt to be the session notification handler.</summary>
     </key>
 
-    <key type="s" name="system-icon-path">
+    <key type="s" name="system-icon">
       <default>""</default>
       <summary>The logo to use in the system info settings</summary>
       <description>
         An icon name or absolute path to an icon, which will be used for the system icon in the "System Info" settings app.
-        The default path is the emblem-vendor image stored in /usr/share/icons/vendor.
         .
         Disabled if no value is set.
       </description>

files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py

@@ -95,16 +95,6 @@ def getProcInfos():
     return result
 
 
-def getSystemIcon():
-    schema = Gio.Settings(schema="org.cinnamon")
-
-    iconPath = schema.get_string("system-icon-path")
-    if iconPath == "":  # left empty, so its disabled
-        return None
-
-    return iconPath
-
-
 def createSystemInfos():
     procInfos = getProcInfos()
     infos = []
@@ -176,13 +166,27 @@ def on_module_selected(self):
         if not self.loaded:
             print("Loading Info module")
 
-            infos = createSystemInfos()
-
             page = SettingsPage()
-            page.set_spacing(10)
+            page.set_spacing(24)
             self.sidePage.add_widget(page)
 
-            settings = page.add_section(_("System info"))
+            schema = Gio.Settings(schema="org.cinnamon")
+            systemIcon = schema.get_string("system-icon")
+            if systemIcon != "":
+                try:
+                    if "/" in systemIcon:
+                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale (systemIconPath, -1, 100, True)
+                        systemIcon = Gtk.Image.new_from_pixbuf(pixbuf)
+                    else:
+                        systemIcon = Gtk.Image.new_from_icon_name(systemIcon, Gtk.IconSize.DIALOG)
+                        systemIcon.set_pixel_size(100)
+                    page.add(systemIcon)
+                except GLib.GError:
+                    pass
+
+            infos = createSystemInfos()
+
+            settings = page.add_section()
 
             for (key, value) in infos:
                 widget = SettingsWidget()
@@ -209,24 +213,13 @@ def on_module_selected(self):
                 settings.add_row(widget)
 
             if shutil.which("inxi"):
-                
                 widget = SettingsWidget()
 
                 button = Gtk.Button(label=_("Copy to clipboard"))
                 button.connect("clicked", self.on_copy_clipboard_button_clicked)
                 widget.pack_start(button, True, True, 0)
                 settings.add_row(widget)
 
-            systemIconPath = getSystemIcon()
-            if systemIconPath is not None:
-                try:
-                    pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale (systemIconPath, -1, 160, True)
-                    systemIcon = Gtk.Image.new_from_pixbuf(pixbuf)
-                    page.add(systemIcon)
-                except GLib.GError:
-                    pass
-
-    
     def on_copy_clipboard_button_clicked(self, button):
         try:
             # taken from https://github.com/linuxmint/xapp/blob/master/scripts/upload-system-info