[gtk+] inspector: Add an initial action editor
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] inspector: Add an initial action editor
- Date: Thu, 5 Jun 2014 09:58:00 +0000 (UTC)
commit 27f692da2daa9a86a707c4e8da81cc683169e113
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jun 5 05:48:26 2014 -0400
inspector: Add an initial action editor
Use a popup, like we do for properties. For now, it allows
activating the action (with parameter, if necessary) and
setting the state.
gtk/inspector/Makefile.am | 2 +
gtk/inspector/action-editor.c | 419 +++++++++++++++++++++++++++++++++++++++++
gtk/inspector/action-editor.h | 59 ++++++
gtk/inspector/actions.c | 47 +++--
gtk/inspector/actions.ui | 4 +-
5 files changed, 512 insertions(+), 19 deletions(-)
---
diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
index 79b3219..896da9c 100644
--- a/gtk/inspector/Makefile.am
+++ b/gtk/inspector/Makefile.am
@@ -16,6 +16,8 @@ BUILT_SOURCES = \
$(template_headers)
libgtkinspector_la_SOURCES = \
+ action-editor.h \
+ action-editor.c \
actions.h \
actions.c \
button-path.h \
diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c
new file mode 100644
index 0000000..397cc74
--- /dev/null
+++ b/gtk/inspector/action-editor.c
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+#include "action-editor.h"
+
+struct _GtkInspectorActionEditorPrivate
+{
+ GActionGroup *group;
+ gchar *prefix;
+ gchar *name;
+ gboolean enabled;
+ const GVariantType *parameter_type;
+ GVariantType *state_type;
+ GtkWidget *activate_button;
+ GtkWidget *parameter_entry;
+ GtkWidget *state_entry;
+ GtkSizeGroup *sg;
+};
+
+enum
+{
+ PROP_0,
+ PROP_GROUP,
+ PROP_PREFIX,
+ PROP_NAME
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorActionEditor, gtk_inspector_action_editor, GTK_TYPE_BOX)
+
+static void
+gtk_inspector_action_editor_init (GtkInspectorActionEditor *editor)
+{
+ editor->priv = gtk_inspector_action_editor_get_instance_private (editor);
+ g_object_set (editor,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ "spacing", 10,
+ "margin", 10,
+ NULL);
+}
+
+typedef void (*VariantEditorChanged) (GtkWidget *editor, gpointer data);
+
+typedef struct {
+ GtkWidget *editor;
+ VariantEditorChanged callback;
+ gpointer data;
+} VariantEditorData;
+
+static void
+variant_editor_changed_cb (GObject *obj,
+ GParamSpec *pspec,
+ VariantEditorData *data)
+{
+ data->callback (data->editor, data->data);
+}
+
+static GtkWidget *
+variant_editor_new (const GVariantType *type,
+ VariantEditorChanged callback,
+ gpointer data)
+{
+ GtkWidget *editor;
+ GtkWidget *label;
+ GtkWidget *entry;
+ VariantEditorData *d;
+
+ d = g_new (VariantEditorData, 1);
+ d->callback = callback;
+ d->data = data;
+
+ if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN))
+ {
+ editor = gtk_toggle_button_new_with_label ("FALSE");
+ g_signal_connect (editor, "notify::active", G_CALLBACK (variant_editor_changed_cb), d);
+ }
+ else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
+ {
+ editor = gtk_entry_new ();
+ g_signal_connect (editor, "notify::text", G_CALLBACK (variant_editor_changed_cb), d);
+ }
+ else
+ {
+ editor = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ entry = gtk_entry_new ();
+ gtk_container_add (GTK_CONTAINER (editor), entry);
+ label = gtk_label_new (g_variant_type_peek_string (type));
+ gtk_container_add (GTK_CONTAINER (editor), label);
+ g_signal_connect (entry, "notify::text", G_CALLBACK (variant_editor_changed_cb), d);
+ }
+
+ g_object_set_data (G_OBJECT (editor), "type", (gpointer)type);
+ d->editor = editor;
+ g_object_set_data_full (G_OBJECT (editor), "callback", d, g_free);
+
+ gtk_widget_show_all (editor);
+
+ return editor;
+}
+
+static void
+variant_editor_set_value (GtkWidget *editor,
+ GVariant *value)
+{
+ const GVariantType *type;
+ gpointer data;
+
+ data = g_object_get_data (G_OBJECT (editor), "callback");
+ g_signal_handlers_block_by_func (editor, variant_editor_changed_cb, data);
+
+ type = g_variant_get_type (value);
+ if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN))
+ {
+ GtkToggleButton *tb = GTK_TOGGLE_BUTTON (editor);
+ GtkWidget *child;
+
+ gtk_toggle_button_set_active (tb, g_variant_get_boolean (value));
+ child = gtk_bin_get_child (GTK_BIN (tb));
+ gtk_label_set_text (GTK_LABEL (child),
+ g_variant_get_boolean (value) ? "TRUE" : "FALSE");
+ }
+ else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
+ {
+ GtkEntry *entry = GTK_ENTRY (editor);
+ gtk_entry_set_text (entry, g_variant_get_string (value, NULL));
+ }
+ else
+ {
+ GList *children;
+ GtkEntry *entry;
+ gchar *text;
+
+ children = gtk_container_get_children (GTK_CONTAINER (editor));
+ entry = children->data;
+ g_list_free (children);
+
+ text = g_variant_print (value, FALSE);
+ gtk_entry_set_text (entry, text);
+ g_free (text);
+ }
+
+ g_signal_handlers_unblock_by_func (editor, variant_editor_changed_cb, data);
+}
+
+GVariant *
+variant_editor_get_value (GtkWidget *editor)
+{
+ const GVariantType *type;
+ GVariant *value;
+
+ type = (const GVariantType *) g_object_get_data (G_OBJECT (editor), "type");
+ if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN))
+ {
+ GtkToggleButton *tb = GTK_TOGGLE_BUTTON (editor);
+ value = g_variant_new_boolean (gtk_toggle_button_get_active (tb));
+ }
+ else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
+ {
+ GtkEntry *entry = GTK_ENTRY (editor);
+ value = g_variant_new_string (gtk_entry_get_text (entry));
+ }
+ else
+ {
+ GList *children;
+ GtkEntry *entry;
+ const gchar *text;
+
+ children = gtk_container_get_children (GTK_CONTAINER (editor));
+ entry = children->data;
+ text = gtk_entry_get_text (entry);
+ g_list_free (children);
+
+ value = g_variant_parse (type, text, NULL, NULL, NULL);
+ }
+
+ return value;
+}
+
+static void
+activate_action (GtkWidget *button,
+ GtkInspectorActionEditor *r)
+{
+ GVariant *parameter = NULL;
+
+ if (r->priv->parameter_entry)
+ parameter = variant_editor_get_value (r->priv->parameter_entry);
+ g_action_group_activate_action (r->priv->group, r->priv->name, parameter);
+}
+
+static void
+parameter_changed (GtkWidget *editor,
+ gpointer data)
+{
+ GtkInspectorActionEditor *r = data;
+ GVariant *value;
+
+ value = variant_editor_get_value (editor);
+ gtk_widget_set_sensitive (r->priv->activate_button, r->priv->enabled && value != NULL);
+ if (value)
+ g_variant_unref (value);
+}
+
+static void
+state_changed (GtkWidget *editor,
+ gpointer data)
+{
+ GtkInspectorActionEditor *r = data;
+ GVariant *value;
+
+ value = variant_editor_get_value (editor);
+ if (value)
+ g_action_group_change_action_state (r->priv->group, r->priv->name, value);
+}
+
+static void
+action_enabled_changed_cb (GActionGroup *group,
+ const gchar *action_name,
+ gboolean enabled,
+ GtkInspectorActionEditor *r)
+{
+ r->priv->enabled = enabled;
+ if (r->priv->parameter_entry)
+ {
+ gtk_widget_set_sensitive (r->priv->parameter_entry, enabled);
+ parameter_changed (r->priv->parameter_entry, r);
+ }
+}
+
+static void
+action_state_changed_cb (GActionGroup *group,
+ const gchar *action_name,
+ GVariant *state,
+ GtkInspectorActionEditor *r)
+{
+ if (r->priv->state_entry)
+ variant_editor_set_value (r->priv->state_entry, state);
+}
+
+static void
+constructed (GObject *object)
+{
+ GtkInspectorActionEditor *r = GTK_INSPECTOR_ACTION_EDITOR (object);
+ GVariant *state;
+ gchar *fullname;
+ GtkWidget *row;
+ GtkWidget *label;
+
+ r->priv->enabled = g_action_group_get_action_enabled (r->priv->group, r->priv->name);
+ state = g_action_group_get_action_state (r->priv->group, r->priv->name);
+
+ fullname = g_strdup_printf ("%s.%s", r->priv->prefix, r->priv->name);
+ gtk_container_add (GTK_CONTAINER (r), gtk_label_new (fullname));
+ g_free (fullname);
+
+ r->priv->sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+ row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+
+ r->priv->activate_button = gtk_button_new_with_label (_("Activate"));
+ g_signal_connect (r->priv->activate_button, "clicked", G_CALLBACK (activate_action), r);
+
+ gtk_size_group_add_widget (r->priv->sg, r->priv->activate_button);
+ gtk_widget_set_sensitive (r->priv->activate_button, r->priv->enabled);
+ gtk_container_add (GTK_CONTAINER (row), r->priv->activate_button);
+
+ r->priv->parameter_type = g_action_group_get_action_parameter_type (r->priv->group, r->priv->name);
+ if (r->priv->parameter_type)
+ {
+ r->priv->parameter_entry = variant_editor_new (r->priv->parameter_type, parameter_changed, r);
+ gtk_widget_set_sensitive (r->priv->parameter_entry, r->priv->enabled);
+ gtk_container_add (GTK_CONTAINER (row), r->priv->parameter_entry);
+ }
+
+ gtk_container_add (GTK_CONTAINER (r), row);
+
+ if (state)
+ {
+ r->priv->state_type = g_variant_type_copy (g_variant_get_type (state));
+ row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ label = gtk_label_new (_("State"));
+ gtk_size_group_add_widget (r->priv->sg, label);
+ gtk_container_add (GTK_CONTAINER (row), label);
+ r->priv->state_entry = variant_editor_new (r->priv->state_type, state_changed, r);
+ variant_editor_set_value (r->priv->state_entry, state);
+ gtk_container_add (GTK_CONTAINER (row), r->priv->state_entry);
+ gtk_container_add (GTK_CONTAINER (r), row);
+ }
+
+ g_signal_connect (r->priv->group, "action-enabled-changed",
+ G_CALLBACK (action_enabled_changed_cb), r);
+ g_signal_connect (r->priv->group, "action-state-changed",
+ G_CALLBACK (action_state_changed_cb), r);
+
+ gtk_widget_show_all (GTK_WIDGET (r));
+}
+
+static void
+finalize (GObject *object)
+{
+ GtkInspectorActionEditor *r = GTK_INSPECTOR_ACTION_EDITOR (object);
+
+ g_free (r->priv->prefix);
+ g_free (r->priv->name);
+ g_object_unref (r->priv->sg);
+ if (r->priv->state_type)
+ g_variant_type_free (r->priv->state_type);
+ g_signal_handlers_disconnect_by_func (r->priv->group, action_enabled_changed_cb, r);
+ g_signal_handlers_disconnect_by_func (r->priv->group, action_state_changed_cb, r);
+
+ G_OBJECT_CLASS (gtk_inspector_action_editor_parent_class)->finalize (object);
+}
+
+static void
+get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkInspectorActionEditor *r = GTK_INSPECTOR_ACTION_EDITOR (object);
+
+ switch (param_id)
+ {
+ case PROP_GROUP:
+ g_value_set_object (value, r->priv->group);
+ break;
+
+ case PROP_PREFIX:
+ g_value_set_string (value, r->priv->prefix);
+ break;
+
+ case PROP_NAME:
+ g_value_set_string (value, r->priv->name);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ }
+}
+
+static void
+set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkInspectorActionEditor *r = GTK_INSPECTOR_ACTION_EDITOR (object);
+
+ switch (param_id)
+ {
+ case PROP_GROUP:
+ r->priv->group = g_value_get_object (value);
+ break;
+
+ case PROP_PREFIX:
+ g_free (r->priv->prefix);
+ r->priv->prefix = g_value_dup_string (value);
+ break;
+
+ case PROP_NAME:
+ g_free (r->priv->name);
+ r->priv->name = g_value_dup_string (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_inspector_action_editor_class_init (GtkInspectorActionEditorClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructed = constructed;
+ object_class->finalize = finalize;
+ object_class->get_property = get_property;
+ object_class->set_property = set_property;
+
+ g_object_class_install_property (object_class, PROP_GROUP,
+ g_param_spec_object ("group", "Action Group", "The Action Group containing the action",
+ G_TYPE_ACTION_GROUP, G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_PREFIX,
+ g_param_spec_string ("prefix", "Prefix", "The action name prefix",
+ NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class, PROP_NAME,
+ g_param_spec_string ("name", "Name", "The action name",
+ NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+}
+
+GtkWidget *
+gtk_inspector_action_editor_new (GActionGroup *group,
+ const gchar *prefix,
+ const gchar *name)
+{
+ return g_object_new (GTK_TYPE_INSPECTOR_ACTION_EDITOR,
+ "group", group,
+ "prefix", prefix,
+ "name", name,
+ NULL);
+}
diff --git a/gtk/inspector/action-editor.h b/gtk/inspector/action-editor.h
new file mode 100644
index 0000000..23f3549
--- /dev/null
+++ b/gtk/inspector/action-editor.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _GTK_INSPECTOR_ACTION_EDITOR_H_
+#define _GTK_INSPECTOR_ACTION_EDITOR_H_
+
+
+#include <gtk/gtk.h>
+
+
+#define GTK_TYPE_INSPECTOR_ACTION_EDITOR (gtk_inspector_action_editor_get_type())
+#define GTK_INSPECTOR_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
GTK_TYPE_INSPECTOR_ACTION_EDITOR, GtkInspectorActionEditor))
+#define GTK_INSPECTOR_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),
GTK_TYPE_INSPECTOR_ACTION_EDITOR, GtkInspectorActionEditorClass))
+#define GTK_INSPECTOR_IS_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
GTK_TYPE_INSPECTOR_ACTION_EDITOR))
+#define GTK_INSPECTOR_IS_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),
GTK_TYPE_INSPECTOR_ACTION_EDITOR))
+#define GTK_INSPECTOR_ACTION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
GTK_TYPE_INSPECTOR_ACTION_EDITOR, GtkInspectorActionEditorClass))
+
+typedef struct _GtkInspectorActionEditorPrivate GtkInspectorActionEditorPrivate;
+
+typedef struct
+{
+ GtkBox parent;
+ GtkInspectorActionEditorPrivate *priv;
+} GtkInspectorActionEditor;
+
+typedef struct
+{
+ GtkBoxClass parent;
+} GtkInspectorActionEditorClass;
+
+
+G_BEGIN_DECLS
+
+
+GType gtk_inspector_action_editor_get_type (void);
+GtkWidget *gtk_inspector_action_editor_new (GActionGroup *group,
+ const gchar *prefix,
+ const gchar *name);
+
+G_END_DECLS
+
+
+#endif // _GTK_INSPECTOR_ACTION_EDITOR_H_
+
+// vim: set et:
diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c
index ae3e345..e2620f5 100644
--- a/gtk/inspector/actions.c
+++ b/gtk/inspector/actions.c
@@ -18,6 +18,7 @@
#include "config.h"
#include <glib/gi18n-lib.h>
#include "actions.h"
+#include "action-editor.h"
#include "gtkwidgetprivate.h"
enum
@@ -224,30 +225,42 @@ gtk_inspector_actions_set_object (GtkInspectorActions *sl,
}
static void
-state_edited (GtkCellRenderer *cell,
- const gchar *path_string,
- const gchar *new_text,
- GtkInspectorActions *sl)
+row_activated (GtkTreeView *tv,
+ GtkTreePath *path,
+ GtkTreeViewColumn *col,
+ GtkInspectorActions *sl)
{
- GtkTreePath *path;
GtkTreeIter iter;
- GActionGroup *group;
+ GdkRectangle rect;
+ GtkWidget *popover;
+ gchar *prefix;
gchar *name;
- GError *error = NULL;
- GVariant *state;
+ GActionGroup *group;
+ GtkWidget *editor;
- path = gtk_tree_path_new_from_string (path_string);
gtk_tree_model_get_iter (GTK_TREE_MODEL (sl->priv->model), &iter, path);
- gtk_tree_path_free (path);
-
- gtk_tree_model_get (GTK_TREE_MODEL (sl->priv->model), &iter,
- COLUMN_GROUP, &group,
+ gtk_tree_model_get (GTK_TREE_MODEL (sl->priv->model),
+ &iter,
+ COLUMN_PREFIX, &prefix,
COLUMN_NAME, &name,
+ COLUMN_GROUP, &group,
-1);
- state = g_variant_parse (NULL, new_text, NULL, NULL, &error);
- if (state)
- g_action_group_change_action_state (group, name, state);
+
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (sl->priv->model), &iter, path);
+ gtk_tree_view_get_cell_area (tv, path, col, &rect);
+ gtk_tree_view_convert_bin_window_to_widget_coords (tv, rect.x, rect.y, &rect.x, &rect.y);
+
+ popover = gtk_popover_new (GTK_WIDGET (tv));
+ gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+
+ editor = gtk_inspector_action_editor_new (group, prefix, name);
+ gtk_container_add (GTK_CONTAINER (popover), editor);
+ gtk_widget_show (popover);
+
+ g_signal_connect (popover, "hide", G_CALLBACK (gtk_widget_destroy), NULL);
+
g_free (name);
+ g_free (prefix);
}
static void
@@ -257,7 +270,7 @@ gtk_inspector_actions_class_init (GtkInspectorActionsClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/actions.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorActions, model);
- gtk_widget_class_bind_template_callback (widget_class, state_edited);
+ gtk_widget_class_bind_template_callback (widget_class, row_activated);
}
// vim: set et sw=2 ts=2:
diff --git a/gtk/inspector/actions.ui b/gtk/inspector/actions.ui
index 0ffa560..232df4a 100644
--- a/gtk/inspector/actions.ui
+++ b/gtk/inspector/actions.ui
@@ -23,6 +23,8 @@
<object class= "GtkTreeView">
<property name="visible">True</property>
<property name="model">model</property>
+ <property name="activate-on-single-click">True</property>
+ <signal name="row-activated" handler="row_activated"/>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Prefix</property>
@@ -81,8 +83,6 @@
<child>
<object class="GtkCellRendererText">
<property name="scale">0.8</property>
- <property name="editable">True</property>
- <signal name="edited" handler="state_edited"/>
</object>
<attributes>
<attribute name="text">4</attribute>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]