[glade3/signal-tree-model: 93/93] Merge branch 'master' into signal-tree-model
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/signal-tree-model: 93/93] Merge branch 'master' into signal-tree-model
- Date: Thu, 16 Dec 2010 11:10:20 +0000 (UTC)
commit bf7899bc0a09caaa21836636a6e13b36e658bf5a
Merge: 03f6fb6 c51f387
Author: Johannes Schmid <jhs gnome org>
Date: Thu Dec 16 12:03:44 2010 +0100
Merge branch 'master' into signal-tree-model
Conflicts:
gladeui/glade-project.c
.gitignore | 36 +
ChangeLog | 106 +
configure.ac | 67 +-
data/.gitignore | 3 +
doc/.gitignore | 1 +
gladeui/.gitignore | 5 +
gladeui/Makefile.am | 64 +-
gladeui/glade-app.c | 22 +-
gladeui/glade-app.h | 2 +
gladeui/glade-base-editor.c | 2 +-
gladeui/glade-cell-renderer-icon.c | 2 +-
gladeui/glade-custom.c | 281 -
gladeui/glade-custom.h | 62 -
gladeui/glade-design-layout.c | 37 +-
gladeui/glade-editor-property.c | 2 +-
gladeui/glade-inspector.c | 59 +-
gladeui/glade-named-icon-chooser-dialog.c | 4 +-
gladeui/glade-placeholder.c | 33 +-
gladeui/glade-previewer.c | 333 ++
gladeui/glade-project.c | 492 ++-
gladeui/glade-project.h | 9 +-
gladeui/glade-utils.c | 324 +-
gladeui/glade-utils.h | 20 +-
gladeui/glade-widget.c | 2 +-
gladeui/glade-xml-utils.c | 16 +
gladeui/glade-xml-utils.h | 3 +
help/.gitignore | 8 +
help/Makefile.am | 2 +-
help/ja/ja.po | 852 +++
help/sl/sl.po | 542 ++
help/zh_CN/zh_CN.po | 30 +-
m4/.gitignore | 9 +
m4/python.m4 | 2 +-
plugins/.gitignore | 3 +
plugins/Makefile.am | 4 -
plugins/gnome/Makefile.am | 45 -
plugins/gnome/bonobo.xml.in | 56 -
plugins/gnome/canvas.xml.in | 88 -
plugins/gnome/glade-gnome.c | 1736 ------
plugins/gnome/gnome.xml.in | 384 --
plugins/gnome/icons/16x16/Makefile.am | 30 -
plugins/gnome/icons/16x16/widget-bonobo-dock.png | Bin 142 -> 0 bytes
.../gnome/icons/16x16/widget-bonobo-dockitem.png | Bin 156 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-about.png | Bin 221 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-app.png | Bin 168 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-appbar.png | Bin 113 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-canvas.png | Bin 108 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-colorpicker.png | Bin 199 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-dateedit.png | Bin 164 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-dialog.png | Bin 206 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-druid.png | Bin 150 -> 0 bytes
.../icons/16x16/widget-gnome-druidpageedge.png | Bin 150 -> 0 bytes
.../icons/16x16/widget-gnome-druidpagestandard.png | Bin 155 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-entry.png | Bin 153 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-fileentry.png | Bin 164 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-fontpicker.png | Bin 291 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-href.png | Bin 121 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-iconentry.png | Bin 204 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-iconlist.png | Bin 241 -> 0 bytes
.../icons/16x16/widget-gnome-iconselection.png | Bin 224 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-messagebox.png | Bin 229 -> 0 bytes
plugins/gnome/icons/16x16/widget-gnome-pixmap.png | Bin 268 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-pixmapentry.png | Bin 164 -> 0 bytes
.../gnome/icons/16x16/widget-gnome-propertybox.png | Bin 224 -> 0 bytes
plugins/gnome/icons/22x22/Makefile.am | 31 -
plugins/gnome/icons/22x22/widget-bonobo-dock.png | Bin 147 -> 0 bytes
.../gnome/icons/22x22/widget-bonobo-dockitem.png | Bin 174 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-about.png | Bin 236 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-app.png | Bin 181 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-appbar.png | Bin 122 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-canvas.png | Bin 115 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-colorpicker.png | Bin 168 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-dateedit.png | Bin 177 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-dialog.png | Bin 283 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-druid.png | Bin 143 -> 0 bytes
.../icons/22x22/widget-gnome-druidpageedge.png | Bin 143 -> 0 bytes
.../icons/22x22/widget-gnome-druidpagestandard.png | Bin 143 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-entry.png | Bin 170 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-fileentry.png | Bin 177 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-fontpicker.png | Bin 175 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-href.png | Bin 150 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-iconentry.png | Bin 226 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-iconlist.png | Bin 265 -> 0 bytes
.../icons/22x22/widget-gnome-iconselection.png | Bin 274 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-messagebox.png | Bin 310 -> 0 bytes
plugins/gnome/icons/22x22/widget-gnome-pixmap.png | Bin 269 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-pixmapentry.png | Bin 177 -> 0 bytes
.../gnome/icons/22x22/widget-gnome-propertybox.png | Bin 263 -> 0 bytes
plugins/gnome/icons/Makefile.am | 3 -
plugins/gtk+/.gitignore | 7 +
plugins/gtk+/Makefile.am | 2 +-
plugins/gtk+/fixed-bg.xpm | 2 +-
plugins/gtk+/glade-gtk.c | 416 +-
plugins/gtk+/gtk+.xml.in | 131 +-
plugins/python/.gitignore | 5 +
plugins/python/Makefile.am | 2 +-
po/.gitignore | 8 +
po/LINGUAS | 6 +
po/POTFILES.in | 7 -
po/ast.po | 4940 ++++++++++++++++++
po/ca valencia po | 3135 ++++++------
po/cs.po | 2769 +++++------
po/da.po | 3105 ++++++------
po/de.po | 2838 +++++-----
po/en_GB.po | 2849 +++++-----
po/eo.po | 5437 +++++++++++++++++++
po/es.po | 2476 +++++-----
po/et.po | 46 +-
po/fr.po | 2555 ++++------
po/gl.po | 2467 +++++-----
po/he.po | 3414 ++++++------
po/hu.po | 2553 ++++------
po/hy.po | 4984 ++++++++++++++++++
po/id.po | 5516 ++++++++++++++++++++
po/it.po | 3114 ++++++------
po/ja.po | 2854 +++++------
po/lt.po | 2724 +++++-----
po/pl.po | 4839 ++++++++++--------
po/ro.po | 5008 ++++++++++++++++++
po/ru.po | 2823 +++++-----
po/sl.po | 2998 +++++------
po/sr.po | 2846 +++++-----
po/sr latin po | 2846 +++++-----
po/sv.po | 2915 +++++------
po/ug.po | 4880 +++++++++++++++++
po/zh_CN.po | 5414 +++++++++++++-------
po/zh_HK.po | 3006 ++++++-----
po/zh_TW.po | 3034 ++++++-----
src/.gitignore | 8 +
src/Makefile.am | 20 +-
src/glade-window.c | 261 +-
src/{glade-3.rc.in => glade.rc.in} | 0
132 files changed, 67943 insertions(+), 37129 deletions(-)
---
diff --cc gladeui/Makefile.am
index c70e93a,df0e4b6..3e8ae6d
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@@ -60,10 -91,9 +91,10 @@@ libgladeui_2_la_SOURCES =
glade-displayable-values.c \
glade-editable.c \
glade-editor-table.c \
- glade-cell-renderer-icon.c
+ glade-cell-renderer-icon.c \
+ glade-signal-model.c
- libgladeui_1_la_CPPFLAGS = \
+ libgladeui_2_la_CPPFLAGS = \
$(common_defines) \
-I$(top_srcdir) \
-I$(top_builddir) \
diff --cc gladeui/glade-project.c
index 30272f9,91aa43a..dab52cc
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@@ -94,9 -96,12 +96,13 @@@ struct _GladeProjectPrivat
* requested
*/
+ GList *tree; /* List of toplevel Objects in this projects */
+ GList *objects; /* List of all objects in this project */
+ gint stamp; /* Stamp used for the iterators, increment when iterators become invalid */
+ gboolean previewable;
+
+ gint stamp; /* A a random int per instance of project used to stamp/check the
+ * GtkTreeIter->stamps */
- GList *tree; /* List of toplevel Objects in this projects */
- GList *objects; /* List of all objects in this project */
GList *selection; /* We need to keep the selection in the project
* because we have multiple projects and when the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
