GNOME.org
 

[gnome-control-center] power: Use GtkBuilder for CcPowerProfileRow

commit 2dbab9d4fac9a4ac28e5e1257984b4e999df5b64
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Nov 23 11:39:18 2020 +1300

    power: Use GtkBuilder for CcPowerProfileRow

 panels/power/cc-power-panel.c        |  21 +++---
 panels/power/cc-power-profile-row.c  | 136 ++++++++---------------------------
 panels/power/cc-power-profile-row.h  |   3 +-
 panels/power/cc-power-profile-row.ui |  89 +++++++++++++++++++++++
 panels/power/power.gresource.xml     |   1 +
 5 files changed, 131 insertions(+), 119 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 33a2239ef..c9c4705da 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -133,7 +133,7 @@ struct _CcPowerPanel
 
   GDBusProxy    *power_profiles_proxy;
   guint          power_profiles_prop_id;
-  GtkWidget     *power_profiles_row[NUM_CC_POWER_PROFILES];
+  CcPowerProfileRow *power_profiles_row[NUM_CC_POWER_PROFILES];
   gboolean       power_profiles_in_update;
 
 #ifdef HAVE_NETWORK_MANAGER
@@ -1360,12 +1360,11 @@ static void
 performance_profile_set_inhibited (CcPowerPanel  *self,
                                    const char    *performance_inhibited)
 {
-  GtkWidget *row;
+  CcPowerProfileRow *row;
 
   row = self->power_profiles_row[CC_POWER_PROFILE_PERFORMANCE];
   g_assert (row != NULL);
-  cc_power_profile_row_set_performance_inhibited (CC_POWER_PROFILE_ROW (row),
-                                                  performance_inhibited);
+  cc_power_profile_row_set_performance_inhibited (row, performance_inhibited);
 }
 
 static void
@@ -1574,7 +1573,7 @@ setup_power_profiles (CcPowerPanel *self)
       const char *name;
       GtkRadioButton *button;
       CcPowerProfile profile;
-      GtkWidget *row;
+      CcPowerProfileRow *row;
 
       profile_variant = g_variant_get_child_value (profiles, i);
       if (!profile_variant ||
@@ -1588,18 +1587,18 @@ setup_power_profiles (CcPowerPanel *self)
                name, variant_lookup_string (profile_variant, "Driver"));
 
       profile = cc_power_profile_from_str (name);
-      row = cc_power_profile_row_new (cc_power_profile_from_str (name),
-                                      performance_inhibited);
+      row = cc_power_profile_row_new (cc_power_profile_from_str (name));
+      cc_power_profile_row_set_performance_inhibited (row, performance_inhibited);
       g_signal_connect_object (G_OBJECT (row), "button-toggled",
                                G_CALLBACK (power_profile_button_toggled_cb), self,
                                0);
       self->power_profiles_row[profile] = row;
-      gtk_widget_show (row);
-      gtk_container_add (GTK_CONTAINER (self->power_profile_listbox), row);
-      gtk_size_group_add_widget (self->row_sizegroup, row);
+      gtk_widget_show (GTK_WIDGET (row));
+      gtk_container_add (GTK_CONTAINER (self->power_profile_listbox), GTK_WIDGET (row));
+      gtk_size_group_add_widget (self->row_sizegroup, GTK_WIDGET (row));
 
       /* Connect radio button to group */
-      button = cc_power_profile_row_get_radio_button (CC_POWER_PROFILE_ROW (row));
+      button = cc_power_profile_row_get_radio_button (row);
       gtk_radio_button_join_group (button, last_button);
       last_button = button;
     }
diff --git a/panels/power/cc-power-profile-row.c b/panels/power/cc-power-profile-row.c
index 8da017959..ee66bdfd0 100644
--- a/panels/power/cc-power-profile-row.c
+++ b/panels/power/cc-power-profile-row.c
@@ -34,10 +34,13 @@ struct _CcPowerProfileRow
 {
   GtkListBoxRow parent_instance;
 
+  GtkRadioButton *button;
+  GtkImage       *icon_image;
+  GtkLabel       *subtitle_label;
+  GtkLabel       *title_label;
+
   CcPowerProfile power_profile;
   char *performance_inhibited;
-  GtkRadioButton *button;
-  GtkWidget *subtext;
 };
 
 G_DEFINE_TYPE (CcPowerProfileRow, cc_power_profile_row, GTK_TYPE_LIST_BOX_ROW)
@@ -72,9 +75,9 @@ performance_profile_set_inhibited (CcPowerProfileRow *self,
   if (self->power_profile != CC_POWER_PROFILE_PERFORMANCE)
     return;
 
-  gtk_style_context_remove_class (gtk_widget_get_style_context (self->subtext),
+  gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self->subtitle_label)),
                                   GTK_STYLE_CLASS_DIM_LABEL);
-  gtk_style_context_remove_class (gtk_widget_get_style_context (self->subtext),
+  gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self->subtitle_label)),
                                   GTK_STYLE_CLASS_ERROR);
 
   text = get_performance_inhibited_text (performance_inhibited);
@@ -82,86 +85,13 @@ performance_profile_set_inhibited (CcPowerProfileRow *self,
     inhibited = TRUE;
   else
     text = _("High performance and power usage.");
-  gtk_label_set_text (GTK_LABEL (self->subtext), text);
+  gtk_label_set_text (GTK_LABEL (self->subtitle_label), text);
 
-  gtk_style_context_add_class (gtk_widget_get_style_context (self->subtext),
+  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self->subtitle_label)),
                                inhibited ? GTK_STYLE_CLASS_ERROR : GTK_STYLE_CLASS_DIM_LABEL);
   gtk_widget_set_sensitive (GTK_WIDGET (self), !inhibited);
 }
 
-static GtkWidget *
-performance_row_new (const gchar  *title,
-                     const gchar  *icon_name,
-                     const gchar  *class_name,
-                     const gchar  *subtitle)
-{
-  PangoAttrList *attributes;
-  GtkWidget *grid, *button, *label, *image;
-  GtkStyleContext *context;
-
-  grid = gtk_grid_new ();
-  g_object_set (G_OBJECT (grid),
-                "margin-top", 6,
-                "margin-bottom", 6,
-                NULL);
-  gtk_widget_show (grid);
-
-  button = gtk_radio_button_new (NULL);
-  g_object_set (G_OBJECT (button),
-                "margin-end", 18,
-                "margin-start", 6,
-                NULL);
-  gtk_widget_show (button);
-  g_object_set_data (G_OBJECT (grid), "button", button);
-  gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 2);
-
-  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-  gtk_widget_set_margin_end (image, 6);
-  gtk_widget_show (image);
-  gtk_grid_attach (GTK_GRID (grid), image, 1, 0, 1, 1);
-
-  context = gtk_widget_get_style_context (image);
-  gtk_style_context_add_class (context, "power-profile");
-  if (class_name != NULL)
-    gtk_style_context_add_class (context, class_name);
-
-  label = gtk_label_new (title);
-  g_object_set (G_OBJECT (label),
-                "ellipsize", PANGO_ELLIPSIZE_END,
-                "halign", GTK_ALIGN_START,
-                "expand", TRUE,
-                "use-markup", TRUE,
-                "use-underline", TRUE,
-                "visible", TRUE,
-                "xalign", 0.0,
-                NULL);
-  gtk_widget_show (label);
-  gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
-
-  attributes = pango_attr_list_new ();
-  pango_attr_list_insert (attributes, pango_attr_scale_new (0.9));
-
-  label = gtk_label_new (subtitle);
-  g_object_set (G_OBJECT (label),
-                "ellipsize", PANGO_ELLIPSIZE_END,
-                "halign", GTK_ALIGN_START,
-                "expand", TRUE,
-                "use-markup", TRUE,
-                "use-underline", TRUE,
-                "visible", TRUE,
-                "xalign", 0.0,
-                "attributes", attributes,
-                NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (label),
-                               GTK_STYLE_CLASS_DIM_LABEL);
-  g_object_set_data (G_OBJECT (grid), "subtext", label);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 2, 1);
-
-  pango_attr_list_unref (attributes);
-
-  return grid;
-}
-
 static void
 cc_power_profile_row_button_toggled_cb (CcPowerProfileRow *self)
 {
@@ -171,6 +101,17 @@ cc_power_profile_row_button_toggled_cb (CcPowerProfileRow *self)
 static void
 cc_power_profile_row_class_init (CcPowerProfileRowClass *klass)
 {
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/control-center/power/cc-power-profile-row.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, CcPowerProfileRow, button);
+  gtk_widget_class_bind_template_child (widget_class, CcPowerProfileRow, icon_image);
+  gtk_widget_class_bind_template_child (widget_class, CcPowerProfileRow, subtitle_label);
+  gtk_widget_class_bind_template_child (widget_class, CcPowerProfileRow, title_label);
+
+  gtk_widget_class_bind_template_callback (widget_class, cc_power_profile_row_button_toggled_cb);
+
   signals[BUTTON_TOGGLED] =
     g_signal_new ("button-toggled",
                   G_TYPE_FROM_CLASS (klass),
@@ -183,6 +124,7 @@ cc_power_profile_row_class_init (CcPowerProfileRowClass *klass)
 static void
 cc_power_profile_row_init (CcPowerProfileRow *self)
 {
+  gtk_widget_init_template (GTK_WIDGET (self));
 }
 
 CcPowerProfile
@@ -229,19 +171,15 @@ cc_power_profile_row_get_active (CcPowerProfileRow *self)
   return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->button));
 }
 
-GtkWidget *
-cc_power_profile_row_new (CcPowerProfile  power_profile,
-                          const char     *performance_inhibited)
+CcPowerProfileRow *
+cc_power_profile_row_new (CcPowerProfile power_profile)
 {
   CcPowerProfileRow *self;
   const char *text, *subtext, *icon_name, *class_name;
-  GtkWidget *box, *title;
 
   self = g_object_new (CC_TYPE_POWER_PROFILE_ROW, NULL);
 
   self->power_profile = power_profile;
-  cc_power_profile_row_set_performance_inhibited (self, performance_inhibited);
-
   switch (self->power_profile)
     {
       case CC_POWER_PROFILE_PERFORMANCE:
@@ -266,27 +204,13 @@ cc_power_profile_row_new (CcPowerProfile  power_profile,
         g_assert_not_reached ();
     }
 
-  gtk_list_box_row_set_selectable (GTK_LIST_BOX_ROW (self), FALSE);
-  gtk_widget_show (GTK_WIDGET (self));
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (G_OBJECT (box),
-                "margin-end", 12,
-                "margin-start", 12,
-                "visible", TRUE,
-                NULL);
-  gtk_container_add (GTK_CONTAINER (self), box);
-
-  title = performance_row_new (text, icon_name, class_name, subtext);
-  self->subtext = g_object_get_data (G_OBJECT (title), "subtext");
-  self->button = g_object_get_data (G_OBJECT (title), "button");
-  g_signal_connect_object (G_OBJECT (self->button), "toggled",
-                           G_CALLBACK (cc_power_profile_row_button_toggled_cb),
-                           self, G_CONNECT_SWAPPED);
-  if (self->power_profile == CC_POWER_PROFILE_PERFORMANCE)
-    performance_profile_set_inhibited (self, self->performance_inhibited);
-  gtk_box_pack_start (GTK_BOX (box), title, TRUE, TRUE, 0);
-
-  return GTK_WIDGET (self);
+  gtk_label_set_markup (self->title_label, text);
+  gtk_label_set_markup (self->subtitle_label, subtext);
+  gtk_image_set_from_icon_name (self->icon_image, icon_name, GTK_ICON_SIZE_MENU);
+  if (class_name != NULL)
+    gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self->icon_image)), class_name);
+
+  return self;
 }
 
 CcPowerProfile
diff --git a/panels/power/cc-power-profile-row.h b/panels/power/cc-power-profile-row.h
index c1fc16dea..96c12a5e4 100644
--- a/panels/power/cc-power-profile-row.h
+++ b/panels/power/cc-power-profile-row.h
@@ -39,8 +39,7 @@ typedef enum
 #define CC_TYPE_POWER_PROFILE_ROW (cc_power_profile_row_get_type())
 G_DECLARE_FINAL_TYPE (CcPowerProfileRow, cc_power_profile_row, CC, POWER_PROFILE_ROW, GtkListBoxRow)
 
-GtkWidget *cc_power_profile_row_new                   (CcPowerProfile  power_profile,
-                                                       const char     *performance_inhibited);
+CcPowerProfileRow *cc_power_profile_row_new           (CcPowerProfile  power_profile);
 CcPowerProfile cc_power_profile_row_get_profile       (CcPowerProfileRow *row);
 GtkRadioButton *cc_power_profile_row_get_radio_button (CcPowerProfileRow *row);
 void cc_power_profile_row_set_active                  (CcPowerProfileRow *row, gboolean active);
diff --git a/panels/power/cc-power-profile-row.ui b/panels/power/cc-power-profile-row.ui
new file mode 100644
index 000000000..64516edf3
--- /dev/null
+++ b/panels/power/cc-power-profile-row.ui
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="CcPowerProfileRow" parent="GtkListBoxRow">
+    <property name="selectable">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="orientation">horizontal</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
+            <child>
+              <object class="GtkRadioButton" id="button">
+                <property name="visible">True</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">18</property>
+                <signal name="toggled" handler="cc_power_profile_row_button_toggled_cb" 
object="CcPowerProfileRow" swapped="yes"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="icon_image">
+                <property name="visible">True</property>
+                <property name="margin-end">6</property>
+                <style>
+                  <class name="power-profile"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="title_label">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="ellipsize">end</property>
+                <property name="expand">True</property>
+                <property name="use-markup">True</property>
+                <property name="use-underline">True</property>
+                <property name="xalign">0</property>
+                <property name="margin-end">6</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="subtitle_label">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="halign">start</property>
+                <property name="expand">True</property>
+                <property name="use-markup">True</property>
+                <property name="use-underline">True</property>
+                <property name="xalign">0</property>
+                <property name="margin-end">6</property>
+                <attributes>
+                  <attribute name="scale" value="0.9"/>
+                </attributes>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
+
diff --git a/panels/power/power.gresource.xml b/panels/power/power.gresource.xml
index 23cb3f8d7..31e92b415 100644
--- a/panels/power/power.gresource.xml
+++ b/panels/power/power.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/org/gnome/control-center/power">
     <file preprocess="xml-stripblanks">cc-battery-row.ui</file>
     <file preprocess="xml-stripblanks">cc-power-panel.ui</file>
+    <file preprocess="xml-stripblanks">cc-power-profile-row.ui</file>
     <file>battery-levels.css</file>
     <file>power-profiles.css</file>
   </gresource>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]