[Xfce4-commits] [xfce/libxfce4ui] 02/03: about: Add xfce version and vendor info

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 37f7100bf1e5e8f9d1244a34b208f6ef198aacb0
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sun Sep 29 01:09:56 2019 +0200

    about: Add xfce version and vendor info
---
 xfce4-about/main.c                   | 14 +++++++++-
 xfce4-about/xfce4-about-dialog.glade | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/xfce4-about/main.c b/xfce4-about/main.c
index fa2f810..0e2fed7 100644
--- a/xfce4-about/main.c
+++ b/xfce4-about/main.c
@@ -60,6 +60,7 @@ static void
 xfce_about_system (GtkBuilder *builder)
 {
   GObject *label;
+  GObject *vendor_info;
   glibtop_mem mem;
   const glibtop_sysinfo *info;
   g_autofree char *device_text = NULL;
@@ -68,7 +69,6 @@ xfce_about_system (GtkBuilder *builder)
   g_autofree char *os_name_text = NULL;
   g_autofree char *os_type_text = NULL;
 
-
   label = gtk_builder_get_object (builder, "device");
   device_text = get_system_info (DEVICE_NAME);
   gtk_label_set_text (GTK_LABEL (label), device_text ? device_text : "");
@@ -87,6 +87,18 @@ xfce_about_system (GtkBuilder *builder)
 
   label = gtk_builder_get_object (builder, "disk");
 
+  label = gtk_builder_get_object (builder, "xfce-version");
+  gtk_label_set_text (GTK_LABEL (label), xfce_version_string ());
+
+  label = gtk_builder_get_object (builder, "vendor-info");
+  vendor_info = gtk_builder_get_object (builder, "vendor-info-label");
+#ifdef VENDOR_INFO
+  gtk_label_set_text (GTK_LABEL (label), VENDOR_INFO);
+#else
+  gtk_widget_hide (GTK_WIDGET (vendor_info));
+  gtk_widget_hide (GTK_WIDGET (label));
+#endif
+
   label = gtk_builder_get_object (builder, "osname");
   os_name_text = get_os_name ();
   gtk_label_set_text (GTK_LABEL (label), os_name_text ? os_name_text : "");
diff --git a/xfce4-about/xfce4-about-dialog.glade b/xfce4-about/xfce4-about-dialog.glade
index a9b3875..2c03fc2 100644
--- a/xfce4-about/xfce4-about-dialog.glade
+++ b/xfce4-about/xfce4-about-dialog.glade
@@ -584,6 +584,56 @@ NO WARRANTY
                         <property name="top_attach">5</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Xfce Version</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">7</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="xfce-version">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">label</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">7</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="vendor-info-label">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Distributor</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">8</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="vendor-info">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">label</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">8</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.