[glade] GladeWidgetEditor: Removed the useless embedded GladeEditorTable.



commit 020115698c5d7304e3b1d9c51e6a4991677b4ae2
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Apr 21 15:55:41 2013 +0900

    GladeWidgetEditor: Removed the useless embedded GladeEditorTable.

 plugins/gtk+/glade-widget-editor.c  |  14 ----
 plugins/gtk+/glade-widget-editor.ui | 126 ++++++++++++++++--------------------
 2 files changed, 55 insertions(+), 85 deletions(-)
---
diff --git a/plugins/gtk+/glade-widget-editor.c b/plugins/gtk+/glade-widget-editor.c
index f4e7206..851acc6 100644
--- a/plugins/gtk+/glade-widget-editor.c
+++ b/plugins/gtk+/glade-widget-editor.c
@@ -31,15 +31,11 @@ static void glade_widget_editor_finalize (GObject * object);
 
 static void glade_widget_editor_editable_init (GladeEditableIface * iface);
 
-static void glade_widget_editor_grab_focus (GtkWidget * widget);
-
 static void markup_toggled (GtkWidget * widget, GladeWidgetEditor * widget_editor);
 static void custom_tooltip_toggled (GtkWidget * widget, GladeWidgetEditor * widget_editor);
 
 struct _GladeWidgetEditorPrivate
 {
-  GtkWidget *embed;
-
   GtkWidget *custom_tooltip_check;
   GtkWidget *tooltip_markup_check;
   GtkWidget *tooltip_label_notebook;
@@ -68,11 +64,9 @@ glade_widget_editor_class_init (GladeWidgetEditorClass * klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   object_class->finalize = glade_widget_editor_finalize;
-  widget_class->grab_focus = glade_widget_editor_grab_focus;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-widget-editor.ui");
 
-  gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, embed);
   gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, custom_tooltip_check);
   gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, tooltip_markup_check);
   gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, tooltip_label_notebook);
@@ -154,14 +148,6 @@ glade_widget_editor_finalize (GObject * object)
 }
 
 static void
-glade_widget_editor_grab_focus (GtkWidget * widget)
-{
-  GladeWidgetEditor *widget_editor = GLADE_WIDGET_EDITOR (widget);
-
-  gtk_widget_grab_focus (widget_editor->priv->embed);
-}
-
-static void
 custom_tooltip_toggled (GtkWidget         *widget,
                        GladeWidgetEditor *widget_editor)
 {
diff --git a/plugins/gtk+/glade-widget-editor.ui b/plugins/gtk+/glade-widget-editor.ui
index ba06119..ab501e6 100644
--- a/plugins/gtk+/glade-widget-editor.ui
+++ b/plugins/gtk+/glade-widget-editor.ui
@@ -31,7 +31,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">0</property>
             <property name="width">6</property>
             <property name="height">1</property>
           </packing>
@@ -48,7 +48,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">1</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -63,7 +63,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">1</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -80,7 +80,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="top_attach">2</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -96,7 +96,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
+            <property name="top_attach">2</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -145,7 +145,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">3</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -189,7 +189,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">3</property>
             <property name="width">4</property>
             <property name="height">3</property>
           </packing>
@@ -221,7 +221,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">5</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -241,7 +241,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
+            <property name="top_attach">10</property>
             <property name="width">6</property>
             <property name="height">1</property>
           </packing>
@@ -259,7 +259,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">11</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -276,7 +276,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">11</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -294,7 +294,7 @@
           </object>
           <packing>
             <property name="left_attach">4</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">11</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -312,7 +312,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
+            <property name="top_attach">12</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -329,7 +329,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
+            <property name="top_attach">12</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -347,7 +347,7 @@
           </object>
           <packing>
             <property name="left_attach">4</property>
-            <property name="top_attach">13</property>
+            <property name="top_attach">12</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -365,7 +365,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">13</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -382,7 +382,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">13</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -400,7 +400,7 @@
           </object>
           <packing>
             <property name="left_attach">4</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">13</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -418,7 +418,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">14</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -435,7 +435,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">14</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -455,7 +455,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
+            <property name="top_attach">15</property>
             <property name="width">5</property>
             <property name="height">1</property>
           </packing>
@@ -472,7 +472,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">7</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -488,27 +488,12 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">7</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <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="page_type">common</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="GladePropertyLabel" id="opacity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -520,7 +505,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -536,7 +521,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">6</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -554,7 +539,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
+            <property name="top_attach">22</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -571,7 +556,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
+            <property name="top_attach">23</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -588,7 +573,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
+            <property name="top_attach">22</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -604,7 +589,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
+            <property name="top_attach">23</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -621,7 +606,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
+            <property name="top_attach">8</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -637,7 +622,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
+            <property name="top_attach">8</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -661,7 +646,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">4</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -678,7 +663,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">25</property>
+            <property name="top_attach">24</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -694,7 +679,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
+            <property name="top_attach">24</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -711,7 +696,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
+            <property name="top_attach">9</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -727,7 +712,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">10</property>
+            <property name="top_attach">9</property>
             <property name="width">4</property>
             <property name="height">1</property>
           </packing>
@@ -746,7 +731,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
+            <property name="top_attach">16</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -765,7 +750,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -784,7 +769,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -800,7 +785,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -816,7 +801,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -835,7 +820,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
+            <property name="top_attach">16</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -854,7 +839,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -873,7 +858,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -889,7 +874,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">17</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -905,7 +890,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">18</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -925,7 +910,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
+            <property name="top_attach">19</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -944,7 +929,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -963,7 +948,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
+            <property name="top_attach">21</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -979,7 +964,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -995,7 +980,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">22</property>
+            <property name="top_attach">21</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -1013,7 +998,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -1031,7 +1016,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
+            <property name="top_attach">21</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -1047,7 +1032,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">20</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -1063,7 +1048,7 @@ instead of setting a literal tooltip</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">22</property>
+            <property name="top_attach">21</property>
             <property name="width">2</property>
             <property name="height">1</property>
           </packing>
@@ -1145,7 +1130,6 @@ instead of setting a literal tooltip</property>
       <editor id="double_buffered_editor"/>
       <editor id="accelerator_label"/>
       <editor id="accelerator_editor"/>
-      <editor id="embed"/>
       <editor id="opacity_label"/>
       <editor id="opacity_editor"/>
       <editor id="width_request_label"/>


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