[gnome-builder/wip/gtk4-port] plugins/buildui: remove duplicate actions from popover



commit fe00aac0314cf0f89f61b47e18c8a0ade8ea4309
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 2 12:06:33 2022 -0700

    plugins/buildui: remove duplicate actions from popover
    
    These are now to be activated from the Build menu rather than the
    informational popover.

 src/plugins/buildui/gbp-buildui-omni-bar-section.c |   5 --
 .../buildui/gbp-buildui-omni-bar-section.ui        | 100 +--------------------
 2 files changed, 2 insertions(+), 103 deletions(-)
---
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.c 
b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
index 47538e84a..2ad126a23 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
@@ -35,7 +35,6 @@ struct _GbpBuilduiOmniBarSection
 
   IdeSignalGroup *build_manager_signals;
 
-  GtkButton      *configure_button;
   GtkLabel       *config_ready_label;
   GtkLabel       *popover_branch_label;
   GtkLabel       *popover_build_message;
@@ -77,7 +76,6 @@ gbp_buildui_omni_bar_section_notify_pipeline (GbpBuilduiOmniBarSection *self,
   IdePipeline *pipeline;
   const gchar *device_name = NULL;
   const gchar *runtime_name = NULL;
-  const gchar *config_id = "";
   const gchar *display_name = NULL;
 
   g_assert (IDE_IS_MAIN_THREAD ());
@@ -90,7 +88,6 @@ gbp_buildui_omni_bar_section_notify_pipeline (GbpBuilduiOmniBarSection *self,
       IdeRuntime *runtime = ide_config_get_runtime (config);
       IdeDevice *device = ide_pipeline_get_device (pipeline);
 
-      config_id = ide_config_get_id (config);
       display_name = ide_config_get_display_name (config);
 
       if (runtime != NULL)
@@ -106,7 +103,6 @@ gbp_buildui_omni_bar_section_notify_pipeline (GbpBuilduiOmniBarSection *self,
 
   gtk_label_set_label (self->popover_config_label, display_name);
   gtk_label_set_label (self->popover_device_label, device_name);
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (self->configure_button), "s", config_id);
 
   if (runtime_name != NULL)
     {
@@ -300,7 +296,6 @@ gbp_buildui_omni_bar_section_class_init (GbpBuilduiOmniBarSectionClass *klass)
 
   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);
-  gtk_widget_class_bind_template_child (widget_class, GbpBuilduiOmniBarSection, configure_button);
   gtk_widget_class_bind_template_child (widget_class, GbpBuilduiOmniBarSection, popover_branch_label);
   gtk_widget_class_bind_template_child (widget_class, GbpBuilduiOmniBarSection, popover_build_message);
   gtk_widget_class_bind_template_child (widget_class, GbpBuilduiOmniBarSection, popover_build_result_label);
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.ui 
b/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
index 8c699dbd5..d95788e87 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.ui
@@ -20,52 +20,19 @@
                     <property name="valign">baseline</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
+                    <property name="margin-bottom">12</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Update project dependencies</property>
-                    <property name="valign">baseline</property>
-                    <property name="action_name">win.update-dependencies</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="icon_name">software-update-available-symbolic</property>
-                      </object>
-                    </child>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="configure_button">
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Configure build preferences</property>
-                    <property name="valign">baseline</property>
-                    <property name="action_name">win.edit-config</property>
-                    <property name="action_target">''</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="icon_name">builder-build-configure-symbolic</property>
-                      </object>
-                    </child>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                  </object>
-                </child>
               </object>
             </child>
             <child>
               <object class="GtkGrid">
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">18</property>
+                <property name="margin-bottom">12</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="label" translatable="yes">Branch</property>
@@ -207,24 +174,6 @@
                         <property name="xalign">0</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="focus_on_click">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">View build console 
contents</property>
-                        <property name="halign">end</property>
-                        <property name="valign">baseline</property>
-                        <property name="action_name">win.view-output</property>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="icon_name">builder-build-info-symbolic</property>
-                          </object>
-                        </child>
-                        <style>
-                          <class name="image-button"/>
-                        </style>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>
@@ -339,51 +288,6 @@
             </child>
           </object>
         </child>
-        <child>
-          <object class="GtkBox">
-            <property name="margin_start">24</property>
-            <property name="margin_end">24</property>
-            <property name="margin_top">24</property>
-            <property name="spacing">6</property>
-            <!-- TRANSLATORS: valid values are True or False. DO NOT TRANSLATE False and True, otherwise 
it'll break the layout of the button. If the buttons in the build popover are too large because of 
translations, set to False to disable homogeneous sizing -->
-            <property name="homogeneous" translatable="yes">True</property>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">_Build</property>
-                <property name="use-underline">True</property>
-                <property name="receives_default">True</property>
-                <property name="action_name">build-manager.build</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">_Rebuild</property>
-                <property name="use-underline">True</property>
-                <property name="receives_default">True</property>
-                <property name="action_name">build-manager.rebuild</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">_Clean</property>
-                <property name="use-underline">True</property>
-                <property name="receives_default">True</property>
-                <property name="action_name">build-manager.clean</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">_Export Bundle</property>
-                <property name="use-underline">True</property>
-                <property name="receives_default">True</property>
-                <property name="action_name">build-manager.export</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
         <style>
           <class name="popover-content-area"/>
         </style>


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