|
 |
60072f |
From 73be5fcb0764cb8e7bdcbcf3ee06b833078d576a Mon Sep 17 00:00:00 2001
|
|
|
60072f |
From: Matthias Clasen <mclasen@redhat.com>
|
|
|
60072f |
Date: Sun, 31 Mar 2013 20:28:19 -0400
|
|
|
60072f |
Subject: [PATCH] info: Switch around GNOME and distro information
|
|
|
60072f |
|
|
|
60072f |
This makes the distribution logo prominent, and puts GNOME version
|
|
|
60072f |
information in the small print.
|
|
|
60072f |
|
|
|
60072f |
https://bugzilla.gnome.org/show_bug.cgi?id=695691
|
|
|
60072f |
---
|
|
|
60072f |
panels/info/cc-info-overview-panel.c | 7 ++-----
|
|
|
60072f |
panels/info/info-overview.ui | 14 ++++++++------
|
|
|
60072f |
2 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
60072f |
|
|
|
60072f |
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
|
|
|
60072f |
index 7a5879c6b..ce15e92d0 100644
|
|
|
60072f |
--- a/panels/info/cc-info-overview-panel.c
|
|
|
60072f |
+++ b/panels/info/cc-info-overview-panel.c
|
|
|
60072f |
@@ -446,7 +446,7 @@ static char *
|
|
|
60072f |
get_os_name (void)
|
|
|
60072f |
{
|
|
|
60072f |
GHashTable *os_info;
|
|
|
60072f |
- gchar *name, *version_id, *pretty_name, *build_id;
|
|
|
60072f |
+ gchar *name, *version_id, *build_id;
|
|
|
60072f |
gchar *result = NULL;
|
|
|
60072f |
g_autofree gchar *name_version = NULL;
|
|
|
60072f |
|
|
|
60072f |
@@ -457,12 +457,9 @@ get_os_name (void)
|
|
|
60072f |
|
|
|
60072f |
name = g_hash_table_lookup (os_info, "NAME");
|
|
|
60072f |
version_id = g_hash_table_lookup (os_info, "VERSION_ID");
|
|
|
60072f |
- pretty_name = g_hash_table_lookup (os_info, "PRETTY_NAME");
|
|
|
60072f |
build_id = g_hash_table_lookup (os_info, "BUILD_ID");
|
|
|
60072f |
|
|
|
60072f |
- if (pretty_name)
|
|
|
60072f |
- name_version = g_strdup (pretty_name);
|
|
|
60072f |
- else if (name && version_id)
|
|
|
60072f |
+ if (name && version_id)
|
|
|
60072f |
name_version = g_strdup_printf ("%s %s", name, version_id);
|
|
|
60072f |
else
|
|
|
60072f |
name_version = g_strdup (_("Unknown"));
|
|
|
60072f |
diff --git a/panels/info/info-overview.ui b/panels/info/info-overview.ui
|
|
|
60072f |
index 219a83c4c..aa87fbec2 100644
|
|
|
60072f |
--- a/panels/info/info-overview.ui
|
|
|
60072f |
+++ b/panels/info/info-overview.ui
|
|
|
60072f |
@@ -12,13 +12,14 @@
|
|
|
60072f |
<object class="GtkBox">
|
|
|
60072f |
<property name="visible">True</property>
|
|
|
60072f |
<property name="can_focus">False</property>
|
|
|
60072f |
- <property name="spacing">18</property>
|
|
|
60072f |
+ <property name="spacing">6</property>
|
|
|
60072f |
<property name="orientation">vertical</property>
|
|
|
60072f |
<child>
|
|
|
60072f |
<object class="GtkImage" id="system_image">
|
|
|
60072f |
<property name="visible">True</property>
|
|
|
60072f |
<property name="can_focus">False</property>
|
|
|
60072f |
- <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property>
|
|
|
60072f |
+ <property name="pixel_size">128</property>
|
|
|
60072f |
+ <property name="icon_name">fedora-logo-icon</property>
|
|
|
60072f |
</object>
|
|
|
60072f |
<packing>
|
|
|
60072f |
<property name="expand">False</property>
|
|
|
60072f |
@@ -27,11 +28,12 @@
|
|
|
60072f |
</packing>
|
|
|
60072f |
</child>
|
|
|
60072f |
<child>
|
|
|
60072f |
- <object class="GtkLabel" id="version_label">
|
|
|
60072f |
+ <object class="GtkLabel" id="os_name_label">
|
|
|
60072f |
<property name="visible">True</property>
|
|
|
60072f |
<property name="can_focus">False</property>
|
|
|
60072f |
<property name="label">Version 3.0</property>
|
|
|
60072f |
<property name="selectable">True</property>
|
|
|
60072f |
+ <property name="margin-bottom">24</property>
|
|
|
60072f |
<attributes>
|
|
|
60072f |
<attribute name="scale" value="1.25"/>
|
|
|
60072f |
</attributes>
|
|
|
60072f |
@@ -118,8 +120,8 @@
|
|
|
60072f |
<property name="visible">True</property>
|
|
|
60072f |
<property name="can_focus">False</property>
|
|
|
60072f |
<property name="xalign">1</property>
|
|
|
60072f |
- <property name="label" translatable="yes" comments="To translators: this field contains the distro name and version">OS name</property>
|
|
|
60072f |
- <property name="mnemonic_widget">os_name_label</property>
|
|
|
60072f |
+ <property name="label">GNOME</property>
|
|
|
60072f |
+ <property name="mnemonic_widget">version_label</property>
|
|
|
60072f |
<style>
|
|
|
60072f |
<class name="dim-label"/>
|
|
|
60072f |
</style>
|
|
|
60072f |
@@ -228,7 +230,7 @@
|
|
|
60072f |
</packing>
|
|
|
60072f |
</child>
|
|
|
60072f |
<child>
|
|
|
60072f |
- <object class="GtkLabel" id="os_name_label">
|
|
|
60072f |
+ <object class="GtkLabel" id="version_label">
|
|
|
60072f |
<property name="visible">True</property>
|
|
|
60072f |
<property name="can_focus">False</property>
|
|
|
60072f |
<property name="xalign">0</property>
|
|
|
60072f |
--
|
|
|
60072f |
2.13.0
|
|
|
60072f |
|