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