[glade] Added GladeMiscEditor



commit 2264f1de4865acad3ebd7c9e9d0ec1b3018497fe
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun May 19 17:48:32 2013 +0900

    Added GladeMiscEditor
    
    The GladeMiscEditor edits the common GtkMisc properties in various editors,
    this initial commit makes use of the editor in GladeImageEditor.

 plugins/gtk+/Makefile.am                       |    3 +
 plugins/gtk+/glade-gtk-resources.gresource.xml |    1 +
 plugins/gtk+/glade-image-editor.ui             |  253 +-----------------------
 plugins/gtk+/glade-misc-editor.c               |   48 +++++
 plugins/gtk+/glade-misc-editor.h               |   56 ++++++
 plugins/gtk+/glade-misc-editor.ui              |  207 +++++++++++++++++++
 plugins/gtk-private/glade-gtk-private.xml      |    4 +
 po/POTFILES.in                                 |    2 +
 8 files changed, 331 insertions(+), 243 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index bb1522b..20651a1 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -121,6 +121,7 @@ libgladegtk_la_SOURCES =            \
        glade-layout-editor.c           \
        glade-level-bar-editor.c        \
        glade-message-dialog-editor.c   \
+       glade-misc-editor.c             \
        glade-model-data.c              \
        glade-notebook-editor.c         \
        glade-progress-bar-editor.c     \
@@ -195,6 +196,7 @@ noinst_HEADERS =                    \
        glade-layout-editor.h           \
        glade-level-bar-editor.h        \
        glade-message-dialog-editor.h   \
+       glade-misc-editor.h             \
        glade-model-data.h              \
        glade-notebook-editor.h         \
        glade-progress-bar-editor.h     \
@@ -268,6 +270,7 @@ UI_FILES =                          \
        glade-layout-editor.ui          \
        glade-level-bar-editor.ui       \
        glade-message-dialog-editor.ui  \
+       glade-misc-editor.ui            \
        glade-notebook-editor.ui        \
        glade-progress-bar-editor.ui    \
        glade-real-tree-view-editor.ui  \
diff --git a/plugins/gtk+/glade-gtk-resources.gresource.xml b/plugins/gtk+/glade-gtk-resources.gresource.xml
index 66ee3d2..02d0427 100644
--- a/plugins/gtk+/glade-gtk-resources.gresource.xml
+++ b/plugins/gtk+/glade-gtk-resources.gresource.xml
@@ -26,6 +26,7 @@
     <file compressed="true" preprocess="xml-stripblanks">glade-layout-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">glade-level-bar-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">glade-message-dialog-editor.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">glade-misc-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">glade-progress-bar-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">glade-notebook-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">glade-real-tree-view-editor.ui</file>
diff --git a/plugins/gtk+/glade-image-editor.ui b/plugins/gtk+/glade-image-editor.ui
index 52b382f..a6b1f2d 100644
--- a/plugins/gtk+/glade-image-editor.ui
+++ b/plugins/gtk+/glade-image-editor.ui
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires glade-gtk-plugin 0.0 -->
   <!-- interface-requires gladeui 0.0 -->
   <!-- interface-requires gtk+ 3.8 -->
   <template class="GladeImageEditor" parent="GladeEditorSkeleton">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="has_focus">False</property>
-    <property name="is_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="has_focus">False</property>
-        <property name="is_focus">False</property>
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="image_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
             <property name="label" translatable="yes">Image</property>
@@ -40,8 +35,6 @@
           <object class="GtkRadioButton" id="stock_radio">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="receives_default">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
@@ -53,8 +46,6 @@
               <object class="GladePropertyLabel" id="stock_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="property_name">stock</property>
               </object>
             </child>
@@ -70,8 +61,6 @@
           <object class="GladePropertyShell" id="stock_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">stock</property>
           </object>
@@ -86,8 +75,6 @@
           <object class="GtkRadioButton" id="icon_radio">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="receives_default">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
@@ -100,8 +87,6 @@
               <object class="GladePropertyLabel" id="icon_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="property_name">icon-name</property>
               </object>
             </child>
@@ -117,8 +102,6 @@
           <object class="GladePropertyShell" id="icon_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">icon-name</property>
           </object>
@@ -133,8 +116,6 @@
           <object class="GladePropertyShell" id="use_fallback_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">use-fallback</property>
             <property name="editor_type">GladeEpropCheck</property>
@@ -150,8 +131,6 @@
           <object class="GtkRadioButton" id="resource_radio">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="receives_default">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
@@ -164,8 +143,6 @@
               <object class="GladePropertyLabel" id="resource_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="property_name">resource</property>
               </object>
             </child>
@@ -181,8 +158,6 @@
           <object class="GtkRadioButton" id="file_radio">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="receives_default">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
@@ -195,8 +170,6 @@
               <object class="GladePropertyLabel" id="file_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="property_name">pixbuf</property>
               </object>
             </child>
@@ -212,11 +185,9 @@
           <object class="GtkLabel" id="size_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
-            <property name="label" translatable="yes">Size and Alignment</property>
+            <property name="label" translatable="yes">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -232,8 +203,6 @@
           <object class="GladePropertyLabel" id="icon_size_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
             <property name="property_name">icon-size</property>
@@ -249,8 +218,6 @@
           <object class="GladePropertyLabel" id="pixel_size_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="margin_left">12</property>
             <property name="hexpand">False</property>
             <property name="property_name">pixel-size</property>
@@ -266,8 +233,6 @@
           <object class="GladePropertyShell" id="resource_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">resource</property>
           </object>
@@ -282,8 +247,6 @@
           <object class="GladePropertyShell" id="file_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">pixbuf</property>
           </object>
@@ -298,8 +261,6 @@
           <object class="GladePropertyShell" id="icon_size_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">icon-size</property>
           </object>
@@ -314,8 +275,6 @@
           <object class="GladePropertyShell" id="pixel_size_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="hexpand">False</property>
             <property name="property_name">pixel-size</property>
           </object>
@@ -327,194 +286,27 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="align_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="margin_left">12</property>
-            <property name="margin_top">4</property>
-            <property name="hexpand">False</property>
-            <property name="label" translatable="yes">Alignment</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="GtkLabel" id="padding_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="margin_top">4</property>
-            <property name="hexpand">False</property>
-            <property name="label" translatable="yes">Padding</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="GladePropertyLabel" id="halign_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">end</property>
-            <property name="margin_left">24</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">xalign</property>
-            <property name="custom_text" translatable="yes">Horizontal</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="valign_label">
+          <object class="GladeEditorTable" id="embed">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">end</property>
-            <property name="margin_left">24</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">yalign</property>
-            <property name="custom_text" translatable="yes">Vertical</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="hpad_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">end</property>
-            <property name="margin_left">12</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">xpad</property>
-            <property name="custom_text" translatable="yes">Horizontal</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyLabel" id="vpad_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="halign">end</property>
-            <property name="margin_left">12</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">ypad</property>
-            <property name="custom_text" translatable="yes">Vertical</property>
-          </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="halign_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">xalign</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="valign_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">yalign</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="hpad_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">xpad</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GladePropertyShell" id="vpad_editor">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
-            <property name="hexpand">False</property>
-            <property name="property_name">ypad</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">12</property>
-            <property name="width">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">6</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GladeEditorTable" id="embed">
+          <object class="GladeMiscEditor" id="misc_editor">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="top_attach">10</property>
             <property name="width">6</property>
             <property name="height">1</property>
           </packing>
@@ -567,24 +359,6 @@
         <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>
@@ -606,15 +380,8 @@
       <editor id="file_editor"/>
       <editor id="icon_size_editor"/>
       <editor id="pixel_size_editor"/>
-      <editor id="halign_label"/>
-      <editor id="valign_label"/>
-      <editor id="hpad_label"/>
-      <editor id="vpad_label"/>
-      <editor id="halign_editor"/>
-      <editor id="valign_editor"/>
-      <editor id="hpad_editor"/>
-      <editor id="vpad_editor"/>
       <editor id="embed"/>
+      <editor id="misc_editor"/>
     </child-editors>
   </template>
 </interface>
diff --git a/plugins/gtk+/glade-misc-editor.c b/plugins/gtk+/glade-misc-editor.c
new file mode 100644
index 0000000..69548ab
--- /dev/null
+++ b/plugins/gtk+/glade-misc-editor.c
@@ -0,0 +1,48 @@
+/*
+ * 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 <gladeui/glade.h>
+#include <glib/gi18n-lib.h>
+
+#include "glade-misc-editor.h"
+
+G_DEFINE_TYPE (GladeMiscEditor, glade_misc_editor, GLADE_TYPE_EDITOR_SKELETON)
+
+static void
+glade_misc_editor_class_init (GladeMiscEditorClass * klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-misc-editor.ui");
+}
+
+static void
+glade_misc_editor_init (GladeMiscEditor * self)
+{
+  gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+GtkWidget *
+glade_misc_editor_new (void)
+{
+  return g_object_new (GLADE_TYPE_MISC_EDITOR, NULL);
+}
diff --git a/plugins/gtk+/glade-misc-editor.h b/plugins/gtk+/glade-misc-editor.h
new file mode 100644
index 0000000..212d39b
--- /dev/null
+++ b/plugins/gtk+/glade-misc-editor.h
@@ -0,0 +1,56 @@
+/*
+ * 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_MISC_EDITOR_H_
+#define _GLADE_MISC_EDITOR_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TYPE_MISC_EDITOR           (glade_misc_editor_get_type ())
+#define GLADE_MISC_EDITOR(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MISC_EDITOR, 
GladeMiscEditor))
+#define GLADE_MISC_EDITOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MISC_EDITOR, 
GladeMiscEditorClass))
+#define GLADE_IS_MISC_EDITOR(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MISC_EDITOR))
+#define GLADE_IS_MISC_EDITOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MISC_EDITOR))
+#define GLADE_MISC_EDITOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MISC_EDITOR, 
GladeMiscEditorClass))
+
+typedef struct _GladeMiscEditor        GladeMiscEditor;
+typedef struct _GladeMiscEditorClass   GladeMiscEditorClass;
+typedef struct _GladeMiscEditorPrivate GladeMiscEditorPrivate;
+
+struct _GladeMiscEditor
+{
+  GladeEditorSkeleton  parent;
+
+  GladeMiscEditorPrivate *priv;
+};
+
+struct _GladeMiscEditorClass
+{
+  GladeEditorSkeletonClass parent;
+};
+
+GType            glade_misc_editor_get_type (void) G_GNUC_CONST;
+GtkWidget       *glade_misc_editor_new      (void);
+
+G_END_DECLS
+
+#endif  /* _GLADE_MISC_EDITOR_H_ */
diff --git a/plugins/gtk+/glade-misc-editor.ui b/plugins/gtk+/glade-misc-editor.ui
new file mode 100644
index 0000000..b8735a5
--- /dev/null
+++ b/plugins/gtk+/glade-misc-editor.ui
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="glade">
+  <!-- interface-requires gtk+ 3.10 -->
+  <!-- interface-requires gladeui 0.0 -->
+  <template class="GladeMiscEditor" parent="GladeEditorSkeleton">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <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">Alignment and Padding</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
+        <property name="hexpand">False</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GladePropertyLabel" id="halign_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">xalign</property>
+            <property name="custom_text" translatable="yes">Horizontal</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="valign_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">yalign</property>
+            <property name="custom_text" translatable="yes">Vertical</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="halign_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">xalign</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="valign_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">yalign</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="hpad_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">xpad</property>
+            <property name="custom_text" translatable="yes">Horizontal</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="vpad_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">ypad</property>
+            <property name="custom_text" translatable="yes">Vertical</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="hpad_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">xpad</property>
+          </object>
+          <packing>
+            <property name="left_attach">3</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="vpad_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">ypad</property>
+          </object>
+          <packing>
+            <property name="left_attach">3</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="align_label">
+            <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">Alignment</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="pad_label">
+            <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">Padding</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child-editors>
+      <editor id="halign_label"/>
+      <editor id="valign_label"/>
+      <editor id="halign_editor"/>
+      <editor id="valign_editor"/>
+      <editor id="hpad_label"/>
+      <editor id="vpad_label"/>
+      <editor id="hpad_editor"/>
+      <editor id="vpad_editor"/>
+    </child-editors>
+  </template>
+</interface>
diff --git a/plugins/gtk-private/glade-gtk-private.xml b/plugins/gtk-private/glade-gtk-private.xml
index 511c0ee..f2f5d56 100644
--- a/plugins/gtk-private/glade-gtk-private.xml
+++ b/plugins/gtk-private/glade-gtk-private.xml
@@ -57,6 +57,9 @@
     <glade-widget-class name="GladeScrollableEditor" generic-name="scrollableeditor" title="Scrollable 
Editor"
                        icon-name="widget-gtk-scrolledwindow"/>
 
+    <glade-widget-class name="GladeMiscEditor" generic-name="misceditor" title="Misc Editor"
+                       icon-name="widget-gtk-alignment"/>
+
   </glade-widget-classes>
 
   <glade-widget-group name="glade-gtk-plugin" title="GTK+ Plugin Editors">
@@ -69,6 +72,7 @@
     <glade-widget-class-ref name="GladeButtonEditor"/>
     <glade-widget-class-ref name="GladeEntryEditor"/>
     <glade-widget-class-ref name="GladeScrollableEditor"/>
+    <glade-widget-class-ref name="GladeMiscEditor"/>
     <glade-widget-class-ref name="GladeFileChooserEditor"/>
     <glade-widget-class-ref name="GladeFontChooserEditor"/>
     <glade-widget-class-ref name="GladeRecentChooserEditor"/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e49a5bb..5476680 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -150,6 +150,7 @@ plugins/gtk+/glade-label-editor.c
 plugins/gtk+/glade-layout-editor.c
 plugins/gtk+/glade-level-bar-editor.c
 plugins/gtk+/glade-message-dialog-editor.c
+plugins/gtk+/glade-misc-editor.c
 plugins/gtk+/glade-model-data.c
 plugins/gtk+/glade-notebook-editor.c
 plugins/gtk+/glade-progress-bar-editor.c
@@ -200,6 +201,7 @@ plugins/gtk+/gtk+.xml.in
 [type: gettext/glade]plugins/gtk+/glade-layout-editor.ui
 [type: gettext/glade]plugins/gtk+/glade-level-bar-editor.ui
 [type: gettext/glade]plugins/gtk+/glade-message-dialog-editor.ui
+[type: gettext/glade]plugins/gtk+/glade-misc-editor.ui
 [type: gettext/glade]plugins/gtk+/glade-notebook-editor.ui
 [type: gettext/glade]plugins/gtk+/glade-progress-bar-editor.ui
 [type: gettext/glade]plugins/gtk+/glade-real-tree-view-editor.ui



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]