[glade] Added GladeActionEditor.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Added GladeActionEditor.
- Date: Sun, 5 May 2013 12:36:34 +0000 (UTC)
commit 1968cf78f8ce8ccbbe65a67ccb2ba4756799cc75
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Sun May 5 20:38:21 2013 +0900
Added GladeActionEditor.
GladeActionEditor provides an internal extension port for subclasses
to extend the editor.
plugins/gtk+/Makefile.am | 3 +
plugins/gtk+/glade-action-editor.c | 92 +++++
plugins/gtk+/glade-action-editor.h | 57 +++
plugins/gtk+/glade-action-editor.ui | 459 ++++++++++++++++++++++++
plugins/gtk+/glade-gtk-action.c | 17 +
plugins/gtk+/glade-gtk-resources.gresource.xml | 1 +
plugins/gtk+/gtk+.xml.in | 22 +-
plugins/gtk-private/glade-gtk-private.xml | 13 +-
po/POTFILES.in | 2 +
9 files changed, 658 insertions(+), 8 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 826a9aa..ce9101e 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -25,6 +25,7 @@ libgladegtk_la_SOURCES = \
$(BUILT_SOURCES) \
glade-about-dialog-editor.c \
glade-accels.c \
+ glade-action-editor.c \
glade-activatable-editor.c \
glade-attributes.c \
glade-button-editor.c \
@@ -120,6 +121,7 @@ libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS)
noinst_HEADERS = \
glade-about-dialog-editor.h \
glade-accels.h \
+ glade-action-editor.h \
glade-activatable-editor.h \
glade-attributes.h \
glade-button-editor.h \
@@ -187,6 +189,7 @@ BUILT_SOURCES = \
UI_FILES = \
glade-about-dialog-editor.ui \
+ glade-action-editor.ui \
glade-activatable-editor.ui \
glade-button-editor.ui \
glade-entry-editor.ui \
diff --git a/plugins/gtk+/glade-action-editor.c b/plugins/gtk+/glade-action-editor.c
new file mode 100644
index 0000000..ff6bb46
--- /dev/null
+++ b/plugins/gtk+/glade-action-editor.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2013 Tristan Van Berkom.
+ *
+ * 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.1 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 program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Tristan Van Berkom <tvb gnome org>
+ */
+
+#include <config.h>
+#include <glib/gi18n-lib.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "glade-action-editor.h"
+
+static void glade_action_editor_grab_focus (GtkWidget * widget);
+
+struct _GladeActionEditorPrivate {
+ GtkWidget *embed;
+ GtkWidget *extension_port;
+};
+
+G_DEFINE_TYPE (GladeActionEditor, glade_action_editor, GLADE_TYPE_EDITOR_SKELETON)
+
+static void
+glade_action_editor_class_init (GladeActionEditorClass * klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ widget_class->grab_focus = glade_action_editor_grab_focus;
+
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-action-editor.ui");
+ gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, embed);
+ gtk_widget_class_bind_child_internal (widget_class, GladeActionEditorPrivate, extension_port);
+
+ g_type_class_add_private (object_class, sizeof (GladeActionEditorPrivate));
+}
+
+static void
+glade_action_editor_init (GladeActionEditor * self)
+{
+ self->priv =
+ G_TYPE_INSTANCE_GET_PRIVATE (self,
+ GLADE_TYPE_ACTION_EDITOR,
+ GladeActionEditorPrivate);
+
+ gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+static void
+glade_action_editor_grab_focus (GtkWidget * widget)
+{
+ GladeActionEditor *action_editor =
+ GLADE_ACTION_EDITOR (widget);
+
+ gtk_widget_grab_focus (action_editor->priv->embed);
+}
+
+/*************************************
+ * API *
+ *************************************/
+GtkWidget *
+glade_action_editor_new (void)
+{
+ return g_object_new (GLADE_TYPE_ACTION_EDITOR, NULL);
+}
+
+/*************************************
+ * Private Plugin Extensions *
+ *************************************/
+void
+glade_action_editor_post_create (GladeWidgetAdaptor *adaptor,
+ GObject *editor,
+ GladeCreateReason reason)
+{
+ GladeActionEditorPrivate *priv = GLADE_ACTION_EDITOR (editor)->priv;
+
+ gtk_widget_show (priv->extension_port);
+}
diff --git a/plugins/gtk+/glade-action-editor.h b/plugins/gtk+/glade-action-editor.h
new file mode 100644
index 0000000..c6eeac3
--- /dev/null
+++ b/plugins/gtk+/glade-action-editor.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2013 Tristan Van Berkom.
+ *
+ * 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.1 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 program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Tristan Van Berkom <tvb gnome org>
+ */
+#ifndef _GLADE_ACTION_EDITOR_H_
+#define _GLADE_ACTION_EDITOR_H_
+
+#include <gtk/gtk.h>
+#include <gladeui/glade.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TYPE_ACTION_EDITOR (glade_action_editor_get_type ())
+#define GLADE_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GLADE_TYPE_ACTION_EDITOR, GladeActionEditor))
+#define GLADE_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GLADE_TYPE_ACTION_EDITOR, GladeActionEditorClass))
+#define GLADE_IS_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTION_EDITOR))
+#define GLADE_IS_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ACTION_EDITOR))
+#define GLADE_ACTION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ACTION_EDITOR,
GladeActionEditorClass))
+
+typedef struct _GladeActionEditor GladeActionEditor;
+typedef struct _GladeActionEditorClass GladeActionEditorClass;
+typedef struct _GladeActionEditorPrivate GladeActionEditorPrivate;
+
+struct _GladeActionEditor
+{
+ GladeEditorSkeleton parent;
+
+ GladeActionEditorPrivate *priv;
+};
+
+struct _GladeActionEditorClass
+{
+ GladeEditorSkeletonClass parent;
+};
+
+GType glade_action_editor_get_type (void) G_GNUC_CONST;
+GtkWidget *glade_action_editor_new (void);
+
+G_END_DECLS
+
+#endif /* _GLADE_ACTION_EDITOR_H_ */
diff --git a/plugins/gtk+/glade-action-editor.ui b/plugins/gtk+/glade-action-editor.ui
new file mode 100644
index 0000000..515bc6f
--- /dev/null
+++ b/plugins/gtk+/glade-action-editor.ui
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="glade">
+ <!-- interface-requires gladeui 0.0 -->
+ <!-- interface-requires gtk+ 3.10 -->
+ <template class="GladeActionEditor" parent="GladeEditorSkeleton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkGrid" id="grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GladeEditorTable" id="embed">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="extension_port">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Action Attributes</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="label_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="label_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">4</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="short_label_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">short-label</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="short_label_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">short-label</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">4</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="tooltip_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">tooltip</property>
+ <property name="append_colon">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="tooltip_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="property_name">tooltip</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="stock_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">stock-id</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="icon_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">icon-name</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="stock_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">stock-id</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="icon_name_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">icon-name</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="visible_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">visible</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="sensitive_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">sensitive</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="image_always_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">always-show-image</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="hide_empty_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">hide-if-empty</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">11</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="toolbar_title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Toolbar Proxies</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="visible_vertical_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">visible-vertical</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="visible_horizontal_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">visible-horizontal</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">14</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="visible_overflown_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">visible-overflown</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">13</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="is_important_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">is-important</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">14</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="accel_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">accelerator</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="accel_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">accelerator</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child-editors>
+ <editor id="embed"/>
+ <editor id="label_label"/>
+ <editor id="label_editor"/>
+ <editor id="short_label_label"/>
+ <editor id="short_label_editor"/>
+ <editor id="tooltip_label"/>
+ <editor id="tooltip_editor"/>
+ <editor id="stock_label"/>
+ <editor id="icon_name_label"/>
+ <editor id="stock_editor"/>
+ <editor id="icon_name_editor"/>
+ <editor id="visible_editor"/>
+ <editor id="sensitive_editor"/>
+ <editor id="image_always_editor"/>
+ <editor id="hide_empty_editor"/>
+ <editor id="visible_vertical_editor"/>
+ <editor id="visible_horizontal_editor"/>
+ <editor id="visible_overflown_editor"/>
+ <editor id="is_important_editor"/>
+ <editor id="accel_label"/>
+ <editor id="accel_editor"/>
+ </child-editors>
+ </template>
+</interface>
diff --git a/plugins/gtk+/glade-gtk-action.c b/plugins/gtk+/glade-gtk-action.c
index 76aed93..0da6e59 100644
--- a/plugins/gtk+/glade-gtk-action.c
+++ b/plugins/gtk+/glade-gtk-action.c
@@ -26,6 +26,7 @@
#include <gladeui/glade.h>
#include "glade-gtk.h"
+#include "glade-action-editor.h"
void
glade_gtk_action_post_create (GladeWidgetAdaptor * adaptor,
@@ -43,3 +44,19 @@ glade_gtk_action_post_create (GladeWidgetAdaptor * adaptor,
glade_widget_property_set_sensitive (gwidget, "accelerator", FALSE,
ACTION_ACCEL_INSENSITIVE_MSG);
}
+
+GladeEditable *
+glade_gtk_action_create_editable (GladeWidgetAdaptor * adaptor,
+ GladeEditorPageType type)
+{
+ GladeEditable *editable;
+
+ if (type == GLADE_PAGE_GENERAL)
+ {
+ editable = (GladeEditable *) glade_action_editor_new ();
+ }
+ else
+ editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type);
+
+ return editable;
+}
diff --git a/plugins/gtk+/glade-gtk-resources.gresource.xml b/plugins/gtk+/glade-gtk-resources.gresource.xml
index 10b496d..d9b2869 100644
--- a/plugins/gtk+/glade-gtk-resources.gresource.xml
+++ b/plugins/gtk+/glade-gtk-resources.gresource.xml
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/gladegtk">
<file compressed="true" preprocess="xml-stripblanks">glade-about-dialog-editor.ui</file>
+ <file compressed="true" preprocess="xml-stripblanks">glade-action-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-activatable-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-button-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-entry-editor.ui</file>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index d132d46..420957e 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -2477,24 +2477,32 @@ embedded in another object</_tooltip>
<create-editor-property-function>glade_gtk_widget_create_eprop</create-editor-property-function>
<string-from-value-function>glade_gtk_widget_string_from_value</string-from-value-function>
<action-activate-function>glade_gtk_action_action_activate</action-activate-function>
+ <create-editable-function>glade_gtk_action_create_editable</create-editable-function>
<actions>
<action id="launch_editor" _name="Edit…" stock="gtk-edit" important="True"/>
</actions>
<properties>
<property id="name" disabled="True"/>
- <property id="label" translatable="True"/>
- <property id="short-label" translatable="True"/>
- <property id="tooltip" translatable="True"/>
- <property id="stock-id" stock-icon="True"/>
- <property id="icon-name" themed-icon="True" since="2.10"/>
+ <property id="label" translatable="True" custom-layout="True"/>
+ <property id="short-label" translatable="True" custom-layout="True"/>
+ <property id="tooltip" translatable="True" multiline="True" custom-layout="True"/>
+ <property id="stock-id" stock-icon="True" custom-layout="True"/>
+ <property id="icon-name" themed-icon="True" since="2.10" custom-layout="True"/>
<property id="gicon" disabled="True" since="2.16"/>
<property id="action-group" disabled="True"/>
- <property id="always-show-image" since="2.20"/>
+ <property id="always-show-image" since="2.20" custom-layout="True"/>
+ <property id="visible" custom-layout="True"/>
+ <property id="sensitive" custom-layout="True"/>
+ <property id="visible-vertical" custom-layout="True"/>
+ <property id="visible-horizontal" custom-layout="True"/>
+ <property id="visible-overflown" custom-layout="True"/>
+ <property id="is-important" custom-layout="True"/>
+ <property id="hide-if-empty" custom-layout="True"/>
<!-- Accelerator -->
<property id="accelerator" _name="Accelerator" ignore="True"
- common="False" save="False" weight="2.0">
+ save="False" weight="2.0" custom-layout="True">
<parameter-spec>
<type>GParamBoxed</type>
<value-type>GladeAccelGList</value-type>
diff --git a/plugins/gtk-private/glade-gtk-private.xml b/plugins/gtk-private/glade-gtk-private.xml
index 2ec6daf..14b6505 100644
--- a/plugins/gtk-private/glade-gtk-private.xml
+++ b/plugins/gtk-private/glade-gtk-private.xml
@@ -23,17 +23,28 @@
<object name="extension_port" anarchist="True"/>
</internal-children>
</glade-widget-class>
+ <glade-widget-class name="GladeActionEditor" generic-name="actioneditor" title="Action Editor"
+ icon-name="widget-gtk-action">
+ <post-create-function>glade_action_editor_post_create</post-create-function>
+ <properties>
+ <property id="size" disabled="True"/>
+ </properties>
+ <internal-children>
+ <object name="extension_port" anarchist="True"/>
+ </internal-children>
+ </glade-widget-class>
</glade-widget-classes>
<glade-widget-group name="glade-gtk-plugin" title="GTK+ Plugin Editors">
<default-palette-state expanded="False"/>
+ <glade-widget-class-ref name="GladeActionEditor"/>
+ <glade-widget-class-ref name="GladeWindowEditor"/>
<glade-widget-class-ref name="GladeActivatableEditor"/>
<glade-widget-class-ref name="GladeButtonEditor"/>
<glade-widget-class-ref name="GladeFileChooserEditor"/>
<glade-widget-class-ref name="GladeFontChooserEditor"/>
<glade-widget-class-ref name="GladeRecentChooserEditor"/>
- <glade-widget-class-ref name="GladeWindowEditor"/>
</glade-widget-group>
</glade-catalog>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 10bdc14..6e5f74a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,6 +54,7 @@ gladeui/icon-naming-spec.c
# gtk plugin backend
plugins/gtk+/glade-about-dialog-editor.c
plugins/gtk+/glade-accels.c
+plugins/gtk+/glade-action-editor.c
plugins/gtk+/glade-activatable-editor.c
plugins/gtk+/glade-attributes.c
plugins/gtk+/glade-button-editor.c
@@ -145,6 +146,7 @@ plugins/gtk+/glade-window-editor.c
plugins/gtk+/gtkunixprint.xml.in
plugins/gtk+/gtk+.xml.in
[type: gettext/glade]plugins/gtk+/glade-about-dialog-editor.ui
+[type: gettext/glade]plugins/gtk+/glade-action-editor.ui
[type: gettext/glade]plugins/gtk+/glade-activatable-editor.ui
[type: gettext/glade]plugins/gtk+/glade-button-editor.ui
[type: gettext/glade]plugins/gtk+/glade-entry-editor.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
