[gnome-builder] libide/tweaks: port IdeTweaksRadio to IdeTweaksBinding
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] libide/tweaks: port IdeTweaksRadio to IdeTweaksBinding
- Date: Fri, 26 Aug 2022 04:21:01 +0000 (UTC)
commit 8f71cd764a8832f54074b5d2b9f62058bdb5fe21
Author: Christian Hergert <chergert redhat com>
Date: Thu Aug 25 21:20:50 2022 -0700
libide/tweaks: port IdeTweaksRadio to IdeTweaksBinding
src/libide/tweaks/ide-tweaks-radio.c | 118 ++++++++++++++++++++++++-----------
src/libide/tweaks/ide-tweaks-radio.h | 5 --
src/plugins/sysprof/tweaks.ui | 77 +++++++++++++++++++----
src/plugins/valgrind/tweaks.ui | 28 +++++++--
4 files changed, 172 insertions(+), 56 deletions(-)
---
diff --git a/src/libide/tweaks/ide-tweaks-radio.c b/src/libide/tweaks/ide-tweaks-radio.c
index 93ae690a5..2e7b57c7a 100644
--- a/src/libide/tweaks/ide-tweaks-radio.c
+++ b/src/libide/tweaks/ide-tweaks-radio.c
@@ -26,12 +26,13 @@
#include "ide-tweaks-radio.h"
+#include "gsettings-mapping.h"
+
struct _IdeTweaksRadio
{
IdeTweaksWidget parent_instance;
char *title;
char *subtitle;
- char *action_name;
GVariant *value;
};
@@ -39,7 +40,6 @@ enum {
PROP_0,
PROP_TITLE,
PROP_SUBTITLE,
- PROP_ACTION_NAME,
PROP_VALUE,
N_PROPS
};
@@ -48,22 +48,92 @@ G_DEFINE_FINAL_TYPE (IdeTweaksRadio, ide_tweaks_radio, IDE_TYPE_TWEAKS_WIDGET)
static GParamSpec *properties [N_PROPS];
+static void
+ide_tweaks_radio_notify_active_cb (GtkCheckButton *button,
+ GParamSpec *pspec,
+ IdeTweaksBinding *binding)
+{
+ GVariant *value;
+
+ g_assert (GTK_IS_CHECK_BUTTON (button));
+ g_assert (IDE_IS_TWEAKS_BINDING (binding));
+
+ value = g_object_get_data (G_OBJECT (button), "VALUE");
+
+ if (gtk_check_button_get_active (button))
+ ide_tweaks_binding_set_variant (binding, value);
+ else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN) &&
+ g_variant_get_boolean (value))
+ ide_tweaks_binding_set_variant (binding, g_variant_new_boolean (FALSE));
+}
+
+static void
+on_binding_changed_cb (GtkCheckButton *button,
+ IdeTweaksBinding *binding)
+{
+ g_auto(GValue) value = G_VALUE_INIT;
+ const GVariantType *variant_type;
+ GVariant *variant;
+ GVariant *to_compare;
+ gboolean active;
+ GType type;
+
+ g_assert (GTK_IS_CHECK_BUTTON (button));
+ g_assert (IDE_IS_TWEAKS_BINDING (binding));
+
+ if (!ide_tweaks_binding_get_expected_type (binding, &type))
+ return;
+
+ g_value_init (&value, type);
+ if (!ide_tweaks_binding_get_value (binding, &value))
+ return;
+
+ if (!(variant = g_object_get_data (G_OBJECT (button), "VALUE")))
+ return;
+
+ variant_type = g_variant_get_type (variant);
+ if (!(to_compare = g_settings_set_mapping (&value, variant_type, NULL)))
+ return;
+
+ active = g_variant_equal (variant, to_compare);
+
+ if (active != gtk_check_button_get_active (button))
+ gtk_check_button_set_active (button, active);
+}
+
static GtkWidget *
ide_tweaks_radio_create_for_item (IdeTweaksWidget *instance,
IdeTweaksItem *widget)
{
IdeTweaksRadio *self = (IdeTweaksRadio *)widget;
+ IdeTweaksBinding *binding;
AdwActionRow *row;
GtkWidget *radio;
g_assert (IDE_IS_TWEAKS_RADIO (self));
+ if (!(binding = ide_tweaks_widget_get_binding (IDE_TWEAKS_WIDGET (self))))
+ return NULL;
+
radio = g_object_new (GTK_TYPE_CHECK_BUTTON,
- "action-name", self->action_name,
- "action-target", self->value,
"can-target", FALSE,
"valign", GTK_ALIGN_CENTER,
NULL);
+ if (self->value)
+ g_object_set_data_full (G_OBJECT (radio),
+ "VALUE",
+ g_variant_ref (self->value),
+ (GDestroyNotify)g_variant_unref);
+ else
+ g_object_set_data_full (G_OBJECT (radio),
+ "VALUE",
+ g_variant_ref_sink (g_variant_new_boolean (TRUE)),
+ (GDestroyNotify)g_variant_unref);
+ g_signal_connect_object (radio,
+ "notify::active",
+ G_CALLBACK (ide_tweaks_radio_notify_active_cb),
+ binding,
+ 0);
gtk_widget_add_css_class (radio, "checkimage");
row = g_object_new (ADW_TYPE_ACTION_ROW,
@@ -73,6 +143,14 @@ ide_tweaks_radio_create_for_item (IdeTweaksWidget *instance,
NULL);
adw_action_row_add_suffix (row, radio);
+ g_signal_connect_object (binding,
+ "changed",
+ G_CALLBACK (on_binding_changed_cb),
+ radio,
+ G_CONNECT_SWAPPED);
+
+ on_binding_changed_cb (GTK_CHECK_BUTTON (radio), binding);
+
return GTK_WIDGET (row);
}
@@ -83,7 +161,6 @@ ide_tweaks_radio_dispose (GObject *object)
g_clear_pointer (&self->title, g_free);
g_clear_pointer (&self->subtitle, g_free);
- g_clear_pointer (&self->action_name, g_free);
g_clear_pointer (&self->value, g_variant_unref);
G_OBJECT_CLASS (ide_tweaks_radio_parent_class)->dispose (object);
@@ -99,10 +176,6 @@ ide_tweaks_radio_get_property (GObject *object,
switch (prop_id)
{
- case PROP_ACTION_NAME:
- g_value_set_string (value, ide_tweaks_radio_get_action_name (self));
- break;
-
case PROP_VALUE:
g_value_set_variant (value, ide_tweaks_radio_get_value (self));
break;
@@ -130,10 +203,6 @@ ide_tweaks_radio_set_property (GObject *object,
switch (prop_id)
{
- case PROP_ACTION_NAME:
- ide_tweaks_radio_set_action_name (self, g_value_get_string (value));
- break;
-
case PROP_VALUE:
ide_tweaks_radio_set_value (self, g_value_get_variant (value));
break;
@@ -163,11 +232,6 @@ ide_tweaks_radio_class_init (IdeTweaksRadioClass *klass)
widget_class->create_for_item = ide_tweaks_radio_create_for_item;
- properties[PROP_ACTION_NAME] =
- g_param_spec_string ("action-name", NULL, NULL,
- NULL,
- (G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
-
properties[PROP_VALUE] =
g_param_spec_variant ("value", NULL, NULL,
G_VARIANT_TYPE_ANY,
@@ -192,14 +256,6 @@ ide_tweaks_radio_init (IdeTweaksRadio *self)
{
}
-const char *
-ide_tweaks_radio_get_action_name (IdeTweaksRadio *self)
-{
- g_return_val_if_fail (IDE_IS_TWEAKS_RADIO (self), NULL);
-
- return self->action_name;
-}
-
/**
* ide_tweaks_radio_get_value:
* @self: a #IdeTweaksRadio
@@ -230,16 +286,6 @@ ide_tweaks_radio_get_title (IdeTweaksRadio *self)
return self->title;
}
-void
-ide_tweaks_radio_set_action_name (IdeTweaksRadio *self,
- const char *action_name)
-{
- g_return_if_fail (IDE_IS_TWEAKS_RADIO (self));
-
- if (ide_set_string (&self->action_name, action_name))
- g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_ACTION_NAME]);
-}
-
void
ide_tweaks_radio_set_value (IdeTweaksRadio *self,
GVariant *value)
diff --git a/src/libide/tweaks/ide-tweaks-radio.h b/src/libide/tweaks/ide-tweaks-radio.h
index cb191d29a..72cb64686 100644
--- a/src/libide/tweaks/ide-tweaks-radio.h
+++ b/src/libide/tweaks/ide-tweaks-radio.h
@@ -42,11 +42,6 @@ IDE_AVAILABLE_IN_ALL
void ide_tweaks_radio_set_subtitle (IdeTweaksRadio *self,
const char *subtitle);
IDE_AVAILABLE_IN_ALL
-const char *ide_tweaks_radio_get_action_name (IdeTweaksRadio *self);
-IDE_AVAILABLE_IN_ALL
-void ide_tweaks_radio_set_action_name (IdeTweaksRadio *self,
- const char *action_name);
-IDE_AVAILABLE_IN_ALL
GVariant *ide_tweaks_radio_get_value (IdeTweaksRadio *self);
IDE_AVAILABLE_IN_ALL
void ide_tweaks_radio_set_value (IdeTweaksRadio *self,
diff --git a/src/plugins/sysprof/tweaks.ui b/src/plugins/sysprof/tweaks.ui
index 6f5648e36..884f67aad 100644
--- a/src/plugins/sysprof/tweaks.ui
+++ b/src/plugins/sysprof/tweaks.ui
@@ -22,14 +22,24 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">CPU Usage</property>
<property name="subtitle" translatable="yes">Records CPU usage and CPU frequency
statistics</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.cpu-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">cpu-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Sample Callstacks</property>
<property name="subtitle" translatable="yes">Record stacktraces on a regular
interval and build a callgraph</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.perf-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">perf-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
@@ -64,14 +74,24 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Memory Usage</property>
<property name="subtitle" translatable="yes">Simple memory statistics about the
process such as total memory used</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.memory-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">memory-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Memory Profiling</property>
<property name="subtitle" translatable="yes">Record stacktraces of memory
allocations and releases</property>
- <property
name="action-name">settings.org.gnome.builder.sysprof.memprof-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">memprof-aid</property>
+ </object>
+ </property>
</object>
</child>
</object>
@@ -82,14 +102,24 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Energy Usage</property>
<property name="subtitle" translatable="yes">Record statistics about energy usage
using RAPL</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.energy-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">energy-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Battery Usage</property>
<property name="subtitle" translatable="yes">Record statistics about battery charge
and discharge rates</property>
- <property
name="action-name">settings.org.gnome.builder.sysprof.battery-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">battery-aid</property>
+ </object>
+ </property>
</object>
</child>
</object>
@@ -100,14 +130,24 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Network Usage</property>
<property name="subtitle" translatable="yes">Record statistics about network
usage</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.netdev-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">netdev-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Disk Usage</property>
<property name="subtitle" translatable="yes">Record statistics about battery charge
and discharge rates</property>
- <property
name="action-name">settings.org.gnome.builder.sysprof.diskstat-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">diskstat-aid</property>
+ </object>
+ </property>
</object>
</child>
</object>
@@ -118,7 +158,12 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">GNOME Shell Performance</property>
<property name="subtitle" translatable="yes">Collect performance and timing
information from GNOME Shell</property>
- <property
name="action-name">settings.org.gnome.builder.sysprof.compositor-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">compositor-aid</property>
+ </object>
+ </property>
</object>
</child>
</object>
@@ -130,14 +175,24 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">JavaScript</property>
<property name="subtitle" translatable="yes">Collect information from GJS-based
applications</property>
- <property name="action-name">settings.org.gnome.builder.sysprof.gjs-aid</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">gjs-aid</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Application Tracing</property>
<property name="subtitle" translatable="yes">Provide TRACE_FD environment variable
for applications to deliver custom events</property>
- <property
name="action-name">settings.org.gnome.builder.sysprof.allow-tracefd</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.sysprof</property>
+ <property name="schema-key">allow-tracefd</property>
+ </object>
+ </property>
</object>
</child>
</object>
diff --git a/src/plugins/valgrind/tweaks.ui b/src/plugins/valgrind/tweaks.ui
index e3ae2184e..217139bff 100644
--- a/src/plugins/valgrind/tweaks.ui
+++ b/src/plugins/valgrind/tweaks.ui
@@ -22,28 +22,48 @@
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Definite</property>
<property name="subtitle" translatable="yes">Include definite leaks in report
summary</property>
- <property
name="action-name">settings.org.gnome.builder.valgrind.leak-kind-definite</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.valgrind</property>
+ <property name="schema-key">leak-kind-definite</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Possible</property>
<property name="subtitle" translatable="yes">Include possible leaks in report
summary</property>
- <property
name="action-name">settings.org.gnome.builder.valgrind.leak-kind-possible</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.valgrind</property>
+ <property name="schema-key">leak-kind-possible</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Indirect</property>
<property name="subtitle" translatable="yes">Include indirect leaks in report
summary</property>
- <property
name="action-name">settings.org.gnome.builder.valgrind.leak-kind-indirect</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.valgrind</property>
+ <property name="schema-key">leak-kind-indirect</property>
+ </object>
+ </property>
</object>
</child>
<child>
<object class="IdeTweaksRadio">
<property name="title" translatable="yes">Reachable</property>
<property name="subtitle" translatable="yes">Include reachable leaks in report
summary</property>
- <property
name="action-name">settings.org.gnome.builder.valgrind.leak-kind-reachable</property>
+ <property name="binding">
+ <object class="IdeTweaksSetting">
+ <property name="schema-id">org.gnome.builder.valgrind</property>
+ <property name="schema-key">leak-kind-reachable</property>
+ </object>
+ </property>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
