[gnome-builder/wip/gtk4-port] Plugins/buildui: Port GbpBuilduiOmniBarSection to GTK4



commit 3a2714378470d31fa0d4ee626f4866fb1adada54
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Apr 26 00:14:33 2022 -0300

    Plugins/buildui: Port GbpBuilduiOmniBarSection to GTK4
    
    Another relatively straightfoward port. DzlSignalGroup can be
    trivially replaced by IdeSignalGroup, with the same API. The
    only noticeable differences are that it now inherits AdwBin,
    and that the IdeSignalGroup is cleaned up on dispose, since
    GTK4 doesn't have GtkWidget.destroy anymore.
    
    I took the liberty to cleanup the UI file here too.

 src/plugins/buildui/gbp-buildui-omni-bar-section.c |  48 ++--
 src/plugins/buildui/gbp-buildui-omni-bar-section.h |   4 +-
 .../buildui/gbp-buildui-omni-bar-section.ui        | 294 +++++----------------
 src/plugins/buildui/meson.build                    |   2 +-
 4 files changed, 93 insertions(+), 255 deletions(-)
---
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.c 
b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
index b980071c5..4e9deccd0 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <dazzle.h>
 #include <glib/gi18n.h>
 #include <libide-foundry.h>
 #include <libide-gui.h>
@@ -32,9 +31,9 @@
 
 struct _GbpBuilduiOmniBarSection
 {
-  GtkBin          parent_instance;
+  AdwBin          parent_instance;
 
-  DzlSignalGroup *build_manager_signals;
+  IdeSignalGroup *build_manager_signals;
 
   GtkButton      *configure_button;
   GtkLabel       *config_ready_label;
@@ -52,7 +51,7 @@ struct _GbpBuilduiOmniBarSection
   GtkRevealer    *popover_details_revealer;
 };
 
-G_DEFINE_FINAL_TYPE (GbpBuilduiOmniBarSection, gbp_buildui_omni_bar_section, GTK_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (GbpBuilduiOmniBarSection, gbp_buildui_omni_bar_section, ADW_TYPE_BIN)
 
 static void
 gbp_buildui_omni_bar_section_notify_can_build (GbpBuilduiOmniBarSection *self,
@@ -203,7 +202,7 @@ gbp_buildui_omni_bar_section_build_started (GbpBuilduiOmniBarSection *self,
   gtk_revealer_set_reveal_child (self->popover_details_revealer, TRUE);
 
   gtk_label_set_label (self->popover_build_result_label, _("Building…"));
-  dzl_gtk_widget_remove_style_class (GTK_WIDGET (self->popover_build_result_label), "error");
+  gtk_widget_remove_css_class (GTK_WIDGET (self->popover_build_result_label), "error");
 
   IDE_EXIT;
 }
@@ -221,7 +220,7 @@ gbp_buildui_omni_bar_section_build_failed (GbpBuilduiOmniBarSection *self,
   g_assert (IDE_IS_BUILD_MANAGER (build_manager));
 
   gtk_label_set_label (self->popover_build_result_label, _("Failed"));
-  dzl_gtk_widget_add_style_class (GTK_WIDGET (self->popover_build_result_label), "error");
+  gtk_widget_add_css_class (GTK_WIDGET (self->popover_build_result_label), "error");
 
   IDE_EXIT;
 }
@@ -246,7 +245,7 @@ gbp_buildui_omni_bar_section_build_finished (GbpBuilduiOmniBarSection *self,
 static void
 gbp_buildui_omni_bar_section_bind_build_manager (GbpBuilduiOmniBarSection *self,
                                                  IdeBuildManager          *build_manager,
-                                                 DzlSignalGroup           *signals)
+                                                 IdeSignalGroup           *signals)
 {
   IdeContext *context;
   IdeVcs *vcs;
@@ -254,7 +253,7 @@ gbp_buildui_omni_bar_section_bind_build_manager (GbpBuilduiOmniBarSection *self,
   g_assert (IDE_IS_MAIN_THREAD ());
   g_assert (GBP_IS_BUILDUI_OMNI_BAR_SECTION (self));
   g_assert (IDE_IS_BUILD_MANAGER (build_manager));
-  g_assert (DZL_IS_SIGNAL_GROUP (signals));
+  g_assert (IDE_IS_SIGNAL_GROUP (signals));
 
   gbp_buildui_omni_bar_section_notify_can_build (self, NULL, build_manager);
   gbp_buildui_omni_bar_section_notify_pipeline (self, NULL, build_manager);
@@ -276,27 +275,28 @@ gbp_buildui_omni_bar_section_bind_build_manager (GbpBuilduiOmniBarSection *self,
 }
 
 static void
-gbp_buildui_omni_bar_section_destroy (GtkWidget *widget)
+gbp_buildui_omni_bar_section_dispose (GObject *object)
 {
-  GbpBuilduiOmniBarSection *self = (GbpBuilduiOmniBarSection *)widget;
+  GbpBuilduiOmniBarSection *self = (GbpBuilduiOmniBarSection *)object;
 
   g_assert (GBP_IS_BUILDUI_OMNI_BAR_SECTION (self));
 
   if (self->build_manager_signals)
     {
-      dzl_signal_group_set_target (self->build_manager_signals, NULL);
+      ide_signal_group_set_target (self->build_manager_signals, NULL);
       g_clear_object (&self->build_manager_signals);
     }
 
-  GTK_WIDGET_CLASS (gbp_buildui_omni_bar_section_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gbp_buildui_omni_bar_section_parent_class)->dispose (object);
 }
 
 static void
 gbp_buildui_omni_bar_section_class_init (GbpBuilduiOmniBarSectionClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  widget_class->destroy = gbp_buildui_omni_bar_section_destroy;
+  object_class->dispose = gbp_buildui_omni_bar_section_dispose;
 
   gtk_widget_class_set_template_from_resource (widget_class, 
"/plugins/buildui/gbp-buildui-omni-bar-section.ui");
   gtk_widget_class_bind_template_child (widget_class, GbpBuilduiOmniBarSection, config_ready_label);
@@ -319,53 +319,53 @@ gbp_buildui_omni_bar_section_init (GbpBuilduiOmniBarSection *self)
 {
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  self->build_manager_signals = dzl_signal_group_new (IDE_TYPE_BUILD_MANAGER);
+  self->build_manager_signals = ide_signal_group_new (IDE_TYPE_BUILD_MANAGER);
   g_signal_connect_object (self->build_manager_signals,
                            "bind",
                            G_CALLBACK (gbp_buildui_omni_bar_section_bind_build_manager),
                            self,
                            G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::can-build",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_can_build),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::message",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_message),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::pipeline",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_pipeline),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::error-count",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_error_count),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::warning-count",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_warning_count),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "notify::last-build-time",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_notify_last_build_time),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "build-started",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_build_started),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "build-failed",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_build_failed),
                                    self,
                                    G_CONNECT_SWAPPED);
-  dzl_signal_group_connect_object (self->build_manager_signals,
+  ide_signal_group_connect_object (self->build_manager_signals,
                                    "build-finished",
                                    G_CALLBACK (gbp_buildui_omni_bar_section_build_finished),
                                    self,
@@ -382,5 +382,5 @@ gbp_buildui_omni_bar_section_set_context (GbpBuilduiOmniBarSection *self,
   g_return_if_fail (IDE_IS_CONTEXT (context));
 
   build_manager = ide_build_manager_from_context (context);
-  dzl_signal_group_set_target (self->build_manager_signals, build_manager);
+  ide_signal_group_set_target (self->build_manager_signals, build_manager);
 }
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.h 
b/src/plugins/buildui/gbp-buildui-omni-bar-section.h
index a064b44f3..e49946b03 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.h
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.h
@@ -20,14 +20,14 @@
 
 #pragma once
 
-#include <gtk/gtk.h>
+#include <adwaita.h>
 #include <libide-core.h>
 
 G_BEGIN_DECLS
 
 #define GBP_TYPE_BUILDUI_OMNI_BAR_SECTION (gbp_buildui_omni_bar_section_get_type())
 
-G_DECLARE_FINAL_TYPE (GbpBuilduiOmniBarSection, gbp_buildui_omni_bar_section, GBP, BUILDUI_OMNI_BAR_SECTION, 
GtkBin)
+G_DECLARE_FINAL_TYPE (GbpBuilduiOmniBarSection, gbp_buildui_omni_bar_section, GBP, BUILDUI_OMNI_BAR_SECTION, 
AdwBin)
 
 void gbp_buildui_omni_bar_section_set_context (GbpBuilduiOmniBarSection *self,
                                                IdeContext               *context);
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.ui 
b/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
index 5e919801f..8c699dbd5 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
-  <template class="GbpBuilduiOmniBarSection" parent="GtkBin">
-    <property name="can_focus">False</property>
+  <requires lib="gtk+" version="4.0"/>
+  <template class="GbpBuilduiOmniBarSection" parent="AdwBin">
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">24</property>
             <property name="margin_end">24</property>
             <property name="margin_top">24</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="popover_project_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">baseline</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
@@ -34,15 +24,9 @@
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton">
-                    <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Update project dependencies</property>
@@ -50,8 +34,6 @@
                     <property name="action_name">win.update-dependencies</property>
                     <child>
                       <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">software-update-available-symbolic</property>
                       </object>
                     </child>
@@ -59,15 +41,9 @@
                       <class name="image-button"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="configure_button">
-                    <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Configure build preferences</property>
@@ -76,8 +52,6 @@
                     <property name="action_target">''</property>
                     <child>
                       <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">builder-build-configure-symbolic</property>
                       </object>
                     </child>
@@ -85,152 +59,113 @@
                       <class name="image-button"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">18</property>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Branch</property>
                     <property name="xalign">1</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="popover_branch_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="build_profile_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Build Profile</property>
                     <property name="xalign">1</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="popover_config_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="runtime_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Runtime</property>
                     <property name="xalign">1</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="popover_runtime_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_markup">True</property>
                     <property name="xalign">0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="device_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Device</property>
                     <property name="xalign">1</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">3</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="popover_device_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="use_markup">True</property>
                     <property name="xalign">0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">3</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="config_ready_label">
-            <property name="can_focus">False</property>
             <property name="margin_top">12</property>
             <property name="label" translatable="yes">There is a problem with the current build 
configuration.</property>
             <property name="xalign">0.5</property>
@@ -241,34 +176,21 @@
               <class name="warning"/>
             </style>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="popover_details_revealer">
-            <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="margin_start">24</property>
                 <property name="margin_end">24</property>
                 <property name="margin_top">24</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="valign">baseline</property>
                         <property name="label" translatable="yes">Build status</property>
                         <property name="xalign">0</property>
@@ -276,30 +198,17 @@
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="popover_build_message">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="valign">baseline</property>
                         <property name="hexpand">True</property>
                         <property name="ellipsize">end</property>
                         <property name="xalign">0</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton">
-                        <property name="visible">True</property>
                         <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">View build console 
contents</property>
@@ -308,8 +217,6 @@
                         <property name="action_name">win.view-output</property>
                         <child>
                           <object class="GtkImage">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="icon_name">builder-build-info-symbolic</property>
                           </object>
                         </child>
@@ -317,163 +224,123 @@
                           <class name="image-button"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkGrid" id="build_status_grid">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">18</property>
                     <child>
                       <object class="GtkLabel" id="last_build_title">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">False</property>
                         <property name="label" translatable="yes">Last build</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="popover_last_build_time_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="width_chars">10</property>
                         <property name="xalign">0</property>
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="build_result_title">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">False</property>
                         <property name="label" translatable="yes">Build result</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="popover_build_result_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="width_chars">10</property>
                         <property name="xalign">0</property>
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="error_title">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">False</property>
                         <property name="label" translatable="yes">Errors</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="column">2</property>
+                          <property name="row">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="popover_errors_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label">0</property>
                         <property name="width_chars">10</property>
                         <property name="xalign">0</property>
+                        <layout>
+                          <property name="column">3</property>
+                          <property name="row">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="warning_title">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">False</property>
                         <property name="label" translatable="yes">Warnings</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="column">2</property>
+                          <property name="row">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="popover_warnings_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label">0</property>
                         <property name="width_chars">10</property>
                         <property name="xalign">0</property>
+                        <layout>
+                          <property name="column">3</property>
+                          <property name="row">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">24</property>
             <property name="margin_end">24</property>
             <property name="margin_top">24</property>
@@ -484,67 +351,38 @@
               <object class="GtkButton">
                 <property name="label" translatable="yes">_Build</property>
                 <property name="use-underline">True</property>
-                <property name="visible">True</property>
                 <property name="receives_default">True</property>
                 <property name="action_name">build-manager.build</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">_Rebuild</property>
                 <property name="use-underline">True</property>
-                <property name="visible">True</property>
                 <property name="receives_default">True</property>
                 <property name="action_name">build-manager.rebuild</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">_Clean</property>
                 <property name="use-underline">True</property>
-                <property name="visible">True</property>
                 <property name="receives_default">True</property>
                 <property name="action_name">build-manager.clean</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">_Export Bundle</property>
                 <property name="use-underline">True</property>
-                <property name="visible">True</property>
                 <property name="receives_default">True</property>
                 <property name="action_name">build-manager.export</property>
                 <style>
                   <class name="suggested-action"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
         <style>
           <class name="popover-content-area"/>
diff --git a/src/plugins/buildui/meson.build b/src/plugins/buildui/meson.build
index 14e14ee0b..c3c3a6b83 100644
--- a/src/plugins/buildui/meson.build
+++ b/src/plugins/buildui/meson.build
@@ -4,7 +4,7 @@ plugins_sources += files([
   #'gbp-buildui-config-view-addin.c',
   #'gbp-buildui-editor-page-addin.c',
   'gbp-buildui-log-pane.c',
-  #'gbp-buildui-omni-bar-section.c',
+  'gbp-buildui-omni-bar-section.c',
   #'gbp-buildui-pane.c',
   #'gbp-buildui-runtime-categories.c',
   #'gbp-buildui-runtime-row.c',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]