From 3273b0b0712a6b45c1a710888854a30f6c5a2f2f Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 5 Sep 2023 16:29:10 +0600
Subject: [PATCH] Changed titlebar from standard to GTK's

---
 source/ubl-utils.c        |  2 ++
 ublexec-application.glade | 49 ++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index 7e3a35e..fadaadc 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -1068,6 +1068,8 @@ char *yon_app_chooser_open_with_sections(char *section_name, char *section_filte
     gtk_dialog_add_buttons(GTK_DIALOG(dialog),_("Cancel"),0,_("Accept"),1,NULL);
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"ApplicationsWindow"));
     GtkWidget *box = GTK_WIDGET(gtk_builder_get_object(builder,"box"));
+    GtkWidget *header = GTK_WIDGET(gtk_builder_get_object(builder,"ApplicationsHeaderBar"));
+    gtk_window_set_titlebar(GTK_WINDOW(dialog),header);
     g_object_ref(box);
     gtk_container_remove(GTK_CONTAINER(window),box);
     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),box,1,1,5);
diff --git a/ublexec-application.glade b/ublexec-application.glade
index d6e2ca2..e248387 100644
--- a/ublexec-application.glade
+++ b/ublexec-application.glade
@@ -2,6 +2,30 @@
 <!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.24"/>
+  <object class="GtkHeaderBar" id="ApplicationsHeaderBar">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="show-close-button">True</property>
+    <child type="title">
+      <object class="GtkLabel" id="lblHeaderName1">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="halign">center</property>
+        <property name="label" translatable="yes">Applications</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="pixel-size">32</property>
+        <property name="icon-name">com.ublinux.ublexec</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkTreeStore" id="treestore1">
     <columns>
       <!-- column-name IconName -->
@@ -68,30 +92,7 @@
       </object>
     </child>
     <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerBar1">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkLabel" id="lblHeaderName1">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="halign">center</property>
-            <property name="label" translatable="yes">Applications</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ublexec</property>
-          </object>
-        </child>
-      </object>
+      <placeholder/>
     </child>
   </object>
 </interface>