GNOME.org
 

[glade/internal-children: 22/22] Merge branch 'master' into internal-children

commit f8861cca257abcbabfe90b8059113392970ed8a6
Merge: 206aef7 1126dee
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Wed Mar 9 13:04:43 2011 -0300

    Merge branch 'master' into internal-children
    
    Conflicts:
    	plugins/gtk+/glade-gtk.c
    	plugins/gtk+/gtk+.xml.in

 ChangeLog                                          |   75 +-
 data/icons/hicolor/16x16/apps/Makefile.am          |    4 +-
 .../hicolor/16x16/apps/{glade-3.png => glade.png}  |  Bin 527 -> 527 bytes
 .../hicolor/16x16/apps/{glade-3.xcf => glade.xcf}  |  Bin 2320 -> 2320 bytes
 data/icons/hicolor/22x22/apps/Makefile.am          |    4 +-
 .../hicolor/22x22/apps/{glade-3.png => glade.png}  |  Bin 1024 -> 1024 bytes
 .../hicolor/22x22/apps/{glade-3.xcf => glade.xcf}  |  Bin 3348 -> 3348 bytes
 data/icons/hicolor/24x24/apps/Makefile.am          |    2 +-
 .../hicolor/24x24/apps/{glade-3.png => glade.png}  |  Bin 1050 -> 1050 bytes
 data/icons/hicolor/32x32/apps/Makefile.am          |    4 +-
 .../hicolor/32x32/apps/{glade-3.png => glade.png}  |  Bin 1643 -> 1643 bytes
 .../hicolor/32x32/apps/{glade-3.svg => glade.svg}  |    0
 data/icons/hicolor/48x48/apps/Makefile.am          |    2 +-
 .../hicolor/48x48/apps/{glade-3.png => glade.png}  |  Bin 2394 -> 2394 bytes
 data/icons/hicolor/scalable/apps/Makefile.am       |    2 +-
 .../scalable/apps/{glade-3.svg => glade.svg}       |    0
 gladeui/glade-builtins.c                           |    4 +-
 gladeui/glade-design-layout.c                      |    6 +-
 gladeui/glade-editable.c                           |   17 +
 gladeui/glade-editable.h                           |   16 +-
 gladeui/glade-editor-property.c                    |    6 +-
 plugins/gtk+/glade-activatable-editor.c            |   11 +-
 plugins/gtk+/glade-activatable-editor.h            |    4 -
 plugins/gtk+/glade-button-editor.c                 |   86 +-
 plugins/gtk+/glade-button-editor.h                 |    4 -
 plugins/gtk+/glade-cell-renderer-editor.c          |   88 +-
 plugins/gtk+/glade-cell-renderer-editor.h          |    5 -
 plugins/gtk+/glade-entry-editor.c                  |  128 +-
 plugins/gtk+/glade-entry-editor.h                  |    4 -
 plugins/gtk+/glade-gtk-grid.c                      |   26 +-
 plugins/gtk+/glade-gtk.c                           |   57 +-
 plugins/gtk+/glade-icon-factory-editor.c           |    3 -
 plugins/gtk+/glade-icon-factory-editor.h           |    2 -
 plugins/gtk+/glade-image-editor.c                  |   65 +-
 plugins/gtk+/glade-image-editor.h                  |    4 -
 plugins/gtk+/glade-image-item-editor.c             |   37 +-
 plugins/gtk+/glade-image-item-editor.h             |   22 +-
 plugins/gtk+/glade-label-editor.c                  |  152 +-
 plugins/gtk+/glade-label-editor.h                  |    4 -
 plugins/gtk+/glade-store-editor.c                  |    3 -
 plugins/gtk+/glade-store-editor.h                  |    2 -
 plugins/gtk+/glade-tool-button-editor.c            |   92 +-
 plugins/gtk+/glade-tool-button-editor.h            |    4 -
 plugins/gtk+/glade-tool-item-group-editor.c        |   34 +-
 plugins/gtk+/glade-tool-item-group-editor.h        |    4 -
 plugins/gtk+/glade-treeview-editor.c               |    7 +-
 plugins/gtk+/glade-treeview-editor.h               |    2 -
 plugins/gtk+/gtk+.xml.in                           |   95 +-
 plugins/gtk+/icons/16x16/Makefile.am               |   44 +-
 .../icons/16x16/widget-gtk-appchooserbutton.png    |  Bin 0 -> 289 bytes
 .../icons/16x16/widget-gtk-appchooserdialog.png    |  Bin 0 -> 316 bytes
 .../icons/16x16/widget-gtk-appchooserwidget.png    |  Bin 0 -> 302 bytes
 .../gtk+/icons/16x16/widget-gtk-cellareabox.png    |  Bin 0 -> 198 bytes
 .../icons/16x16/widget-gtk-cellrendererspinner.png |  Bin 0 -> 407 bytes
 plugins/gtk+/icons/16x16/widget-gtk-clist.png      |  Bin 148 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-combo.png      |  Bin 157 -> 0 bytes
 .../gtk+/icons/16x16/widget-gtk-comboboxentry.png  |  Bin 153 -> 0 bytes
 .../gtk+/icons/16x16/widget-gtk-comboboxtext.png   |  Bin 0 -> 313 bytes
 plugins/gtk+/icons/16x16/widget-gtk-curve.png      |  Bin 222 -> 0 bytes
 .../gtk+/icons/16x16/widget-gtk-fileselection.png  |  Bin 227 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-gammacurve.png |  Bin 222 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-hruler.png     |  Bin 127 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-infobar.png    |  Bin 0 -> 332 bytes
 plugins/gtk+/icons/16x16/widget-gtk-list.png       |  Bin 126 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-listitem.png   |  Bin 94 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-optionmenu.png |  Bin 153 -> 0 bytes
 plugins/gtk+/icons/16x16/widget-gtk-ruler.png      |  Bin 127 -> 0 bytes
 .../icons/16x16/widget-gtk-tearoffmenuitem.png     |  Bin 0 -> 188 bytes
 plugins/gtk+/icons/16x16/widget-gtk-texttag.png    |  Bin 0 -> 325 bytes
 .../gtk+/icons/16x16/widget-gtk-texttagtable.png   |  Bin 0 -> 361 bytes
 .../gtk+/icons/16x16/widget-gtk-toolitemgroup.png  |  Bin 0 -> 304 bytes
 .../gtk+/icons/16x16/widget-gtk-toolpalette.png    |  Bin 0 -> 311 bytes
 plugins/gtk+/icons/16x16/widget-gtk-vruler.png     |  Bin 150 -> 0 bytes
 plugins/gtk+/icons/22x22/Makefile.am               |   41 +-
 .../icons/22x22/widget-gtk-appchooserbutton.png    |  Bin 0 -> 299 bytes
 .../icons/22x22/widget-gtk-appchooserdialog.png    |  Bin 0 -> 434 bytes
 .../icons/22x22/widget-gtk-appchooserwidget.png    |  Bin 0 -> 373 bytes
 .../gtk+/icons/22x22/widget-gtk-cellareabox.png    |  Bin 0 -> 206 bytes
 .../icons/22x22/widget-gtk-cellrendererspinner.png |  Bin 0 -> 575 bytes
 plugins/gtk+/icons/22x22/widget-gtk-clist.png      |  Bin 158 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-combo.png      |  Bin 164 -> 0 bytes
 .../gtk+/icons/22x22/widget-gtk-comboboxentry.png  |  Bin 170 -> 0 bytes
 .../gtk+/icons/22x22/widget-gtk-comboboxtext.png   |  Bin 0 -> 313 bytes
 plugins/gtk+/icons/22x22/widget-gtk-curve.png      |  Bin 235 -> 0 bytes
 .../gtk+/icons/22x22/widget-gtk-fileselection.png  |  Bin 265 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-gammacurve.png |  Bin 235 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-hruler.png     |  Bin 138 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-infobar.png    |  Bin 0 -> 292 bytes
 plugins/gtk+/icons/22x22/widget-gtk-list.png       |  Bin 135 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-listitem.png   |  Bin 95 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-optionmenu.png |  Bin 171 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-ruler.png      |  Bin 138 -> 0 bytes
 plugins/gtk+/icons/22x22/widget-gtk-switch.png     |  Bin 0 -> 274 bytes
 .../icons/22x22/widget-gtk-tearoffmenuitem.png     |  Bin 0 -> 201 bytes
 plugins/gtk+/icons/22x22/widget-gtk-texttag.png    |  Bin 0 -> 319 bytes
 .../gtk+/icons/22x22/widget-gtk-texttagtable.png   |  Bin 0 -> 387 bytes
 .../gtk+/icons/22x22/widget-gtk-toolitemgroup.png  |  Bin 0 -> 389 bytes
 .../gtk+/icons/22x22/widget-gtk-toolpalette.png    |  Bin 0 -> 374 bytes
 plugins/gtk+/icons/22x22/widget-gtk-vruler.png     |  Bin 158 -> 0 bytes
 po/es.po                                           |  364 +-
 po/fr.po                                           | 5693 ++++++++++----------
 po/hu.po                                           | 5644 ++++++++++----------
 po/ru.po                                           | 2393 +++++----
 103 files changed, 7546 insertions(+), 7720 deletions(-)
---
diff --cc plugins/gtk+/glade-gtk.c
index 1413ea3,7216261..2910339
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@@ -10382,6 -10654,44 +10384,33 @@@ glade_gtk_cell_layout_action_activate_a
  
  
  /*--------------------------- GtkTreeView ---------------------------------*/
 -void
 -glade_gtk_treeview_post_create (GladeWidgetAdaptor *adaptor,
 -				GObject            *object, 
 -				GladeCreateReason   reason)
 -{
 -  GladeWidget *widget = glade_widget_get_from_gobject (object);
 -
 -  glade_widget_adaptor_create_internal
 -    (widget, G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (object))),
 -     "selection", "treeview", FALSE, reason);
 -}
+ 
+ gboolean
+ glade_gtk_treeview_add_verify (GladeWidgetAdaptor *adaptor,
+ 			       GtkWidget          *container,
+ 			       GtkWidget          *child,
+ 			       gboolean            user_feedback)
+ {
+   if (!GTK_IS_TREE_VIEW_COLUMN (child))
+     {
+       if (user_feedback)
+ 	{
+ 	  GladeWidgetAdaptor *cell_adaptor = 
+ 	    glade_widget_adaptor_get_by_type (GTK_TYPE_TREE_VIEW_COLUMN);
+ 
+ 	  glade_util_ui_message (glade_app_get_window (),
+ 				 GLADE_UI_INFO, NULL,
+ 				 ONLY_THIS_GOES_IN_THAT_MSG,
+ 				 glade_widget_adaptor_get_title (cell_adaptor),
+ 				 glade_widget_adaptor_get_title (adaptor));
+ 	}
+ 
+       return FALSE;
+     }
+ 
+   return TRUE;
+ }
+ 
  static void
  glade_gtk_treeview_launch_editor (GObject * treeview)
  {
diff --cc plugins/gtk+/gtk+.xml.in
index 3d4f52b,42bbee6..9c21e8a
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@@ -2221,6 -2183,8 +2215,7 @@@ embedded in another object</_tooltip
  
  
      <glade-widget-class name="GtkTreeView" generic-name="treeview" _title="Tree View">
 -      <post-create-function>glade_gtk_treeview_post_create</post-create-function>
+       <add-child-verify-function>glade_gtk_treeview_add_verify</add-child-verify-function>
        <child-set-property-function>glade_gtk_treeview_set_child_property</child-set-property-function>
        <child-get-property-function>glade_gtk_treeview_get_child_property</child-get-property-function>
        <get-children-function>glade_gtk_treeview_get_children</get-children-function>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]