[glade] Added GladeBoolToggle as property editor for boolean properties.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Added GladeBoolToggle as property editor for boolean properties.
- Date: Tue, 12 Mar 2013 22:31:32 +0000 (UTC)
commit b0ad5f34bd17794aef704dfa0bd225a05d83ff00
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Tue Mar 12 19:26:29 2013 -0300
Added GladeBoolToggle as property editor for boolean properties.
gladeui/Makefile.am | 6 +-
gladeui/glade-bool-toggle.c | 135 +++++++++++++++++++++++++++++++++++++++
gladeui/glade-bool-toggle.h | 57 ++++++++++++++++
gladeui/glade-editor-property.c | 21 ++++---
4 files changed, 208 insertions(+), 11 deletions(-)
---
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 141aaed..f44a628 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -89,7 +89,8 @@ libgladeui_2_la_SOURCES = \
glade-displayable-values.c \
glade-signal-model.c \
glade-cell-renderer-icon.c \
- glade-preview.c
+ glade-preview.c \
+ glade-bool-toggle.c
libgladeui_2_la_CPPFLAGS = \
$(common_defines) \
@@ -152,7 +153,8 @@ noinst_HEADERS = \
glade-design-private.h \
glade-preview-tokens.h \
glade-preview.h \
- glade-path.h
+ glade-path.h \
+ glade-bool-toggle.h
if PLATFORM_WIN32
libgladeui_2_la_LDFLAGS += -no-undefined
diff --git a/gladeui/glade-bool-toggle.c b/gladeui/glade-bool-toggle.c
new file mode 100644
index 0000000..8038ef6
--- /dev/null
+++ b/gladeui/glade-bool-toggle.c
@@ -0,0 +1,135 @@
+/*
+ * glade-bool-toggle.h
+ *
+ * Copyright (C) 2013 Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * Authors:
+ * Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define TRUE_STRING _("<span color='green'>✓</span>True")
+#define FALSE_STRING _("<span color='red'>✗</span>False")
+
+#include "glade-bool-toggle.h"
+#include <glib/gi18n-lib.h>
+
+G_DEFINE_TYPE (GladeBoolToggle, glade_bool_toggle, GTK_TYPE_TOGGLE_BUTTON);
+
+static void
+glade_bool_toggle_init (GladeBoolToggle *toggle)
+{
+ GtkWidget *label = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (label), FALSE_STRING);
+ gtk_container_add (GTK_CONTAINER (toggle), label);
+ gtk_widget_show (label);
+}
+
+static void
+glade_bool_toggle_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (glade_bool_toggle_parent_class)->finalize (object);
+}
+
+static gint
+layout_get_value (PangoLayout *layout, const gchar *string, gboolean width)
+{
+ PangoRectangle rect;
+ pango_layout_set_markup (layout, string, -1);
+ pango_layout_get_extents (layout, NULL, &rect);
+ pango_extents_to_pixels (&rect, NULL);
+ return width ? rect.width : rect.height;
+}
+
+static void
+glade_bool_toggle_get_preferred_size (GtkWidget *widget,
+ gboolean width,
+ gint *minimum,
+ gint *natural)
+{
+ PangoLayout *layout;
+ gint value, tmp;
+
+ layout = gtk_widget_create_pango_layout (widget, "");
+
+ value = MAX (layout_get_value (layout, TRUE_STRING, width),
+ layout_get_value (layout, FALSE_STRING, width));
+
+ /* Add some extra spacing */
+ tmp = layout_get_value (layout, (width) ? "-" : "'", TRUE);
+ value += (width) ? tmp*2 : tmp;
+
+ g_object_unref (layout);
+
+ if (minimum)
+ *minimum = value;
+
+ if (natural)
+ *natural = value;
+}
+
+static void
+glade_bool_toggle_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ glade_bool_toggle_get_preferred_size (widget, TRUE, minimum, natural);
+}
+
+static void
+glade_bool_toggle_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ glade_bool_toggle_get_preferred_size (widget, FALSE, minimum, natural);
+}
+
+static void
+glade_bool_toggle_toggled (GtkToggleButton *toggle_button)
+{
+ GtkWidget *label = gtk_bin_get_child (GTK_BIN (toggle_button));
+
+ if (GTK_IS_LABEL (label))
+ {
+ if (gtk_toggle_button_get_active (toggle_button))
+ gtk_label_set_markup (GTK_LABEL (label), TRUE_STRING);
+ else
+ gtk_label_set_markup (GTK_LABEL (label), FALSE_STRING);
+ }
+}
+
+static void
+glade_bool_toggle_class_init (GladeBoolToggleClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GtkToggleButtonClass *toggle_class = GTK_TOGGLE_BUTTON_CLASS (klass);
+
+ object_class->finalize = glade_bool_toggle_finalize;
+ widget_class->get_preferred_width = glade_bool_toggle_get_preferred_width;
+ widget_class->get_preferred_height = glade_bool_toggle_get_preferred_height;
+ toggle_class->toggled = glade_bool_toggle_toggled;
+}
+
+GtkWidget *
+_glade_bool_toggle_new (void)
+{
+ return g_object_new (GLADE_TYPE_BOOL_TOGGLE, NULL);
+}
diff --git a/gladeui/glade-bool-toggle.h b/gladeui/glade-bool-toggle.h
new file mode 100644
index 0000000..186c5b3
--- /dev/null
+++ b/gladeui/glade-bool-toggle.h
@@ -0,0 +1,57 @@
+/*
+ * glade-bool-toggle.h
+ *
+ * Copyright (C) 2013 Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * Authors:
+ * Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GLADE_BOOL_TOGGLE_H_
+#define _GLADE_BOOL_TOGGLE_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TYPE_BOOL_TOGGLE (glade_bool_toggle_get_type ())
+#define GLADE_BOOL_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_BOOL_TOGGLE,
GladeBoolToggle))
+#define GLADE_BOOL_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_BOOL_TOGGLE,
GladeBoolToggleClass))
+#define GLADE_IS_BOOL_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_BOOL_TOGGLE))
+#define GLADE_IS_BOOL_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_BOOL_TOGGLE))
+#define GLADE_BOOL_TOGGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_BOOL_TOGGLE,
GladeBoolToggleClass))
+
+typedef struct _GladeBoolToggleClass GladeBoolToggleClass;
+typedef struct _GladeBoolToggle GladeBoolToggle;
+
+struct _GladeBoolToggleClass
+{
+ GtkToggleButtonClass parent_class;
+};
+
+struct _GladeBoolToggle
+{
+ GtkToggleButton parent_instance;
+ gpointer priv;
+};
+
+GType glade_bool_toggle_get_type (void) G_GNUC_CONST;
+GtkWidget *_glade_bool_toggle_new (void);
+
+G_END_DECLS
+
+#endif /* _GLADE_BOOL_TOGGLE_H_ */
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 79186f1..79eed28 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -49,6 +49,7 @@
#include "glade-marshallers.h"
#include "glade-displayable-values.h"
#include "glade-named-icon-chooser-dialog.h"
+#include "glade-bool-toggle.h"
enum
{
@@ -2245,7 +2246,7 @@ typedef struct
{
GladeEditorProperty parent_instance;
- GtkWidget *gswitch;
+ GtkWidget *button;
} GladeEPropBool;
GLADE_MAKE_EPROP (GladeEPropBool, glade_eprop_bool)
@@ -2272,7 +2273,7 @@ glade_eprop_bool_load (GladeEditorProperty *eprop, GladeProperty *property)
{
GladeEPropBool *eprop_bool = GLADE_EPROP_BOOL (eprop);
gboolean state = g_value_get_boolean (glade_property_inline_value (property));
- gtk_switch_set_active (GTK_SWITCH (eprop_bool->gswitch), state);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (eprop_bool->button), state);
}
}
@@ -2287,7 +2288,7 @@ glade_eprop_bool_active_notify (GObject *gobject,
return;
g_value_init (&val, G_TYPE_BOOLEAN);
- g_value_set_boolean (&val, gtk_switch_get_active (GTK_SWITCH (gobject)));
+ g_value_set_boolean (&val, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gobject)));
glade_editor_property_commit_no_callback (eprop, &val);
@@ -2299,14 +2300,14 @@ glade_eprop_bool_create_input (GladeEditorProperty *eprop)
{
GladeEPropBool *eprop_bool = GLADE_EPROP_BOOL (eprop);
- eprop_bool->gswitch = gtk_switch_new ();
- gtk_widget_set_halign (eprop_bool->gswitch, GTK_ALIGN_START);
- gtk_widget_set_valign (eprop_bool->gswitch, GTK_ALIGN_CENTER);
+ eprop_bool->button = _glade_bool_toggle_new ();
+ gtk_widget_set_halign (eprop_bool->button, GTK_ALIGN_START);
+ gtk_widget_set_valign (eprop_bool->button, GTK_ALIGN_CENTER);
- g_signal_connect (eprop_bool->gswitch, "notify::active",
+ g_signal_connect (eprop_bool->button, "notify::active",
G_CALLBACK (glade_eprop_bool_active_notify), eprop);
- return eprop_bool->gswitch;
+ return eprop_bool->button;
}
@@ -2326,7 +2327,9 @@ GLADE_MAKE_EPROP (GladeEPropUnichar, glade_eprop_unichar)
#define GLADE_IS_EPROP_UNICHAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EPROP_UNICHAR))
#define GLADE_IS_EPROP_UNICHAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_EPROP_UNICHAR))
#define GLADE_EPROP_UNICHAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GLADE_EPROP_UNICHAR,
GladeEPropUnicharClass))
- static void glade_eprop_unichar_finalize (GObject *object)
+
+static void
+glade_eprop_unichar_finalize (GObject *object)
{
/* Chain up */
G_OBJECT_CLASS (editor_property_class)->finalize (object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]