From 569b070fff06fd8c99f4033a89e0bf8464d3fe66 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 22 Mar 2023 17:55:59 +0600
Subject: [PATCH] Fixed colons color, removed background image from css file

---
 source/ubl-settings-info.c |  10 ++-
 ubl-settings-info.css      |   4 +-
 ubl-settings-info.glade    | 158 ++++++++++++++++++++-----------------
 3 files changed, 94 insertions(+), 78 deletions(-)

diff --git a/source/ubl-settings-info.c b/source/ubl-settings-info.c
index 7315a93..4b15c6e 100644
--- a/source/ubl-settings-info.c
+++ b/source/ubl-settings-info.c
@@ -6,7 +6,7 @@
 #include "ubl-util-standard.c"
 #define cssPath "/usr/share/ubl-settings-info/css/ubl-settings-info.css"
 #define gladePath "/usr/share/ubl-settings-info/ui/ubl-settings-info.glade"
-#define HeaderImagePath "/usr/share/icons/hicolor/scalable/apps/com.ublinux.ubl-settings-info.svg"
+#define HeadBackgroundImagePath "/usr/share/ubl-settings-info/images/logo-background.png"
 #define LogoImagePath "/usr/share/ubl-settings-info/images/ublinux-logo.svg"
 #define LocaleName "ubl-settings-info"
 #define LocalePath "/usr/share/locale"
@@ -68,6 +68,11 @@ int main(int argc, char *argv[]){
     GtkWidget *HeaderTopic = GTK_WIDGET(gtk_builder_get_object(builder, "headerTopic"));
     GtkWidget *AboutButton = GTK_WIDGET(gtk_builder_get_object(builder,"MenuItemAbout"));
     GtkWidget *buttonSettings = GTK_WIDGET(gtk_builder_get_object(builder,"buttonSettings"));
+    GtkWidget *headBackgroundIcon = GTK_WIDGET(gtk_builder_get_object(builder,"HeadBackgroundImage"));
+    GtkWidget *headOverlay = GTK_WIDGET(gtk_builder_get_object(builder,"HeadOverlay"));
+    GtkWidget *headbox = GTK_WIDGET(gtk_builder_get_object(builder,"boxColor"));
+    gtk_image_set_from_file(GTK_IMAGE(headBackgroundIcon),HeadBackgroundImagePath);
+    gtk_overlay_add_overlay(GTK_OVERLAY(headOverlay),headbox);
     gtk_label_set_text(GTK_LABEL(HeaderTopic),_("System Information"));
     gtk_label_set_text(GTK_LABEL(headLabel),_("System Information"));
     g_signal_connect(G_OBJECT(AboutButton), "activate", G_CALLBACK(on_about),NULL);
@@ -110,7 +115,8 @@ int main(int argc, char *argv[]){
             
             line=strstr(path,": ");
             if (line!=NULL){
-            int size=strlen(path)-strlen(line);
+            line=yon_cut(line,strlen(line),1);
+            int size=strlen(path)-strlen(line)+1;
             pth=yon_cut(path,size,0);
             pth=yon_char_get_augumented("<span color='#1a5fb4'>",pth);
             pth=yon_char_get_augumented(pth,"</span>");
diff --git a/ubl-settings-info.css b/ubl-settings-info.css
index c8d1bf5..319f660 100644
--- a/ubl-settings-info.css
+++ b/ubl-settings-info.css
@@ -1,6 +1,4 @@
-.backset{
-    background: url("/usr/share/ubl-settings-info/images/logo-background.png") no-repeat; 
-}
+
 .textHead{
     text-shadow: 1px 1px #ffffff;
 }
diff --git a/ubl-settings-info.glade b/ubl-settings-info.glade
index 2b83663..c0c3d0c 100644
--- a/ubl-settings-info.glade
+++ b/ubl-settings-info.glade
@@ -63,6 +63,86 @@
       </object>
     </child>
   </object>
+  <object class="GtkBox" id="boxColor">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkImage">
+        <property name="width-request">90</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="margin-left">5</property>
+        <property name="margin-right">5</property>
+        <property name="margin-start">5</property>
+        <property name="margin-end">5</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
+        <property name="pixel-size">69</property>
+        <property name="icon-name">com.ublinux.ubl-settings-info</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="headLabel">
+                    <property name="width-request">255</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">System Info</property>
+                    <attributes>
+                      <attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="foreground" value="#000023233232"/>
+                      <attribute name="size" value="15360"/>
+                    </attributes>
+                    <style>
+                      <class name="textHead"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
   <object class="GtkMenu" id="menu2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -98,88 +178,20 @@
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox" id="boxColor">
+                  <object class="GtkOverlay" id="HeadOverlay">
+                    <property name="height-request">81</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
-                      <object class="GtkImage">
-                        <property name="width-request">90</property>
+                      <object class="GtkImage" id="HeadBackgroundImage">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="margin-top">6</property>
-                        <property name="margin-bottom">6</property>
-                        <property name="pixel-size">69</property>
-                        <property name="icon-name">com.ublinux.ubl-settings-info</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkLabel" id="headLabel">
-                                    <property name="width-request">255</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="label" translatable="yes">System Info</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="foreground" value="#000023233232"/>
-                                      <attribute name="size" value="15360"/>
-                                    </attributes>
-                                    <style>
-                                      <class name="textHead"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="stock">gtk-missing-image</property>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="index">-1</property>
                       </packing>
                     </child>
-                    <style>
-                      <class name="backset"/>
-                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>