diff options
author | Tristan Van Berkom <tvb@src.gnome.org> | 2006-06-24 19:32:21 +0000 |
---|---|---|
committer | Tristan Van Berkom <tvb@src.gnome.org> | 2006-06-24 19:32:21 +0000 |
commit | 155705b2e51bcfc5846c49ccd2a8612c2ecbe953 (patch) | |
tree | 18162be3cfae88a7c2b2c136dd55a820c0cfbe33 | |
parent | 787b428bd4e48b0bbfa1a2d4e120f84671850d04 (diff) | |
download | glade-155705b2e51bcfc5846c49ccd2a8612c2ecbe953.tar.gz |
Updated.
* TODO: Updated.
* doc/gladeui-sections.txt: Updated
* doc/Makefile.am: Ignoring some headers.
* configure.in: Package name is now glade3-2.91.3 and not glade-3-2.91.3,
this conforms with gnome server scripts and matches the cvs name and
bugzilla name.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | TODO | 1 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 5 | ||||
-rw-r--r-- | doc/gladeui-sections.txt | 21 | ||||
-rw-r--r-- | doc/tmpl/glade-fixed.sgml | 32 | ||||
-rw-r--r-- | doc/tmpl/glade-palette.sgml | 55 | ||||
-rw-r--r-- | doc/tmpl/glade-property.sgml | 22 | ||||
-rw-r--r-- | doc/tmpl/glade-utils.sgml | 11 | ||||
-rw-r--r-- | doc/tmpl/glade-widget.sgml | 2 | ||||
-rw-r--r-- | src/glade-palette.h | 3 | ||||
-rw-r--r-- | src/glade-property.c | 3 | ||||
-rw-r--r-- | src/glade-widget.c | 19 | ||||
-rw-r--r-- | src/glade-widget.h | 2 |
14 files changed, 159 insertions, 30 deletions
@@ -7,8 +7,19 @@ * src/main.c: Pass FALSE to gtk_get_option_group() and call gtk_init (NULL, NULL) later on; this way we pass --version without any display (fixes 339265) + * src/glade-widget.[ch], src/glade-property.c: removed glade_widget_is_dupping(), + use glade_property_[push/pop]_superuser() for that purpose. + * TODO: Updated. + * doc/gladeui-sections.txt: Updated + + * doc/Makefile.am: Ignoring some headers. + + * configure.in: Package name is now glade3-2.91.3 and not glade-3-2.91.3, + this conforms with gnome server scripts and matches the cvs name and + bugzilla name. + 2006-06-23 Vincent Geddes <vgeddes@metroweb.co.za> * src/main.c: @@ -10,4 +10,3 @@ Tasks/Bugs Blocking glade-3 3.0: o Implement "finish" signal on GladeProject (bug 345353) o Default notebook tab labels (bug 345438) o Sticky palette items feature (bug 303679) - o Change generated tarball name (bug 345470) diff --git a/configure.in b/configure.in index 95350091..0fae1c80 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(glade-3, 2.91.3, +AC_INIT(glade3, 2.91.3, http://bugzilla.gnome.org/enter_bug.cgi?product=glade3) AC_CANONICAL_SYSTEM diff --git a/doc/Makefile.am b/doc/Makefile.am index 161efe12..20ac89e7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,7 +62,10 @@ IGNORE_HFILES=\ glade-xml-utils.h \ glade-popup.h \ glade-devhelp.h \ - glade-gtk.h + glade-gtk.h \ + glade-palette-expander.h \ + glade-palette-item.h \ + glade-palette-box.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/gladeui-sections.txt b/doc/gladeui-sections.txt index ea292eb9..45fd9f50 100644 --- a/doc/gladeui-sections.txt +++ b/doc/gladeui-sections.txt @@ -9,8 +9,6 @@ glade_app_update_ui glade_app_set_window glade_app_get_window glade_app_get_editor -glade_app_get_add_class -glade_app_get_alt_class glade_app_get_palette glade_app_get_clipboard glade_app_get_clipboard_view @@ -185,6 +183,10 @@ GladeEditorTable <FILE>glade-fixed</FILE> <TITLE>GladeFixed</TITLE> GladeFixed +GLADE_FIXED_CURSOR_BOTTOM +GLADE_FIXED_CURSOR_RIGHT +GLADE_FIXED_CURSOR_TOP +GLADE_FIXED_CURSOR_LEFT <SUBSECTION Standard> glade_fixed_get_type GLADE_TYPE_FIXED @@ -201,7 +203,12 @@ GladeFixedClass <TITLE>GladePalette</TITLE> GladePalette glade_palette_new -glade_palette_unselect_widget +glade_palette_get_item_appearance +glade_palette_set_item_appearance +glade_palette_get_current_item_class +glade_palette_deselect_current_item +glade_palette_get_use_small_item_icons +glade_palette_set_use_small_item_icons <SUBSECTION Standard> GLADE_PALETTE GLADE_IS_PALETTE @@ -211,6 +218,8 @@ GLADE_PALETTE_CLASS GLADE_IS_PALETTE_CLASS GLADE_PALETTE_GET_CLASS GladePaletteClass +<SUBSECTION Private> +GladePalettePrivate </SECTION> <SECTION> @@ -352,6 +361,9 @@ glade_property_sync glade_property_load glade_property_read glade_property_write +glade_property_superuser +glade_property_push_superuser +glade_property_pop_superuser glade_property_get_tooltip glade_property_set_sensitive glade_property_get_sensitive @@ -499,7 +511,7 @@ glade_widget_has_launcher glade_widget_launch_editor glade_widget_get_parent glade_widget_set_parent -glade_widget_is_dupping +glade_widget_event_widget <SUBSECTION Standard> GLADE_WIDGET GLADE_IS_WIDGET @@ -588,6 +600,7 @@ glade_util_load_library glade_util_class_implements_interface glade_util_have_devhelp glade_util_search_devhelp +glade_util_deep_fixed_event </SECTION> diff --git a/doc/tmpl/glade-fixed.sgml b/doc/tmpl/glade-fixed.sgml index 1e899c96..bd17029d 100644 --- a/doc/tmpl/glade-fixed.sgml +++ b/doc/tmpl/glade-fixed.sgml @@ -93,3 +93,35 @@ for the values passed to configure-child via the #GdkRectangle. </para> +<!-- ##### MACRO GLADE_FIXED_CURSOR_BOTTOM ##### --> +<para> + +</para> + +@type: + + +<!-- ##### MACRO GLADE_FIXED_CURSOR_RIGHT ##### --> +<para> + +</para> + +@type: + + +<!-- ##### MACRO GLADE_FIXED_CURSOR_TOP ##### --> +<para> + +</para> + +@type: + + +<!-- ##### MACRO GLADE_FIXED_CURSOR_LEFT ##### --> +<para> + +</para> + +@type: + + diff --git a/doc/tmpl/glade-palette.sgml b/doc/tmpl/glade-palette.sgml index ad8fe158..56bb3e67 100644 --- a/doc/tmpl/glade-palette.sgml +++ b/doc/tmpl/glade-palette.sgml @@ -53,7 +53,62 @@ to the Glade core. </para> @catalogs: +@item_appearance: +@Returns: +<!-- # Unused Parameters # --> +@appearance: + + +<!-- ##### FUNCTION glade_palette_get_item_appearance ##### --> +<para> + +</para> + +@palette: +@Returns: + + +<!-- ##### FUNCTION glade_palette_set_item_appearance ##### --> +<para> + +</para> + +@palette: @appearance: + + +<!-- ##### FUNCTION glade_palette_get_current_item_class ##### --> +<para> + +</para> + +@palette: +@Returns: + + +<!-- ##### FUNCTION glade_palette_deselect_current_item ##### --> +<para> + +</para> + +@palette: + + +<!-- ##### FUNCTION glade_palette_get_use_small_item_icons ##### --> +<para> + +</para> + +@palette: @Returns: +<!-- ##### FUNCTION glade_palette_set_use_small_item_icons ##### --> +<para> + +</para> + +@palette: +@use_small_item_icons: + + diff --git a/doc/tmpl/glade-property.sgml b/doc/tmpl/glade-property.sgml index 66574a03..74d52c78 100644 --- a/doc/tmpl/glade-property.sgml +++ b/doc/tmpl/glade-property.sgml @@ -250,6 +250,28 @@ the #GladePropertyClass describes how a #GladeProperty will function. @Returns: +<!-- ##### FUNCTION glade_property_superuser ##### --> +<para> + +</para> + +@Returns: + + +<!-- ##### FUNCTION glade_property_push_superuser ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION glade_property_pop_superuser ##### --> +<para> + +</para> + + + <!-- ##### FUNCTION glade_property_get_tooltip ##### --> <para> diff --git a/doc/tmpl/glade-utils.sgml b/doc/tmpl/glade-utils.sgml index 70dd1a5b..b181c9c2 100644 --- a/doc/tmpl/glade-utils.sgml +++ b/doc/tmpl/glade-utils.sgml @@ -392,3 +392,14 @@ This is where all of that really usefull miscalanious stuff lands up. @devhelp: +<!-- ##### FUNCTION glade_util_deep_fixed_event ##### --> +<para> + +</para> + +@widget: +@event: +@gwidget: +@Returns: + + diff --git a/doc/tmpl/glade-widget.sgml b/doc/tmpl/glade-widget.sgml index 0563de28..24f74f5f 100644 --- a/doc/tmpl/glade-widget.sgml +++ b/doc/tmpl/glade-widget.sgml @@ -564,7 +564,7 @@ convenience api for getting and setting properties (mostly from the plugin). @parent: -<!-- ##### FUNCTION glade_widget_is_dupping ##### --> +<!-- ##### FUNCTION glade_widget_event_widget ##### --> <para> </para> diff --git a/src/glade-palette.h b/src/glade-palette.h index 5110e602..973344fc 100644 --- a/src/glade-palette.h +++ b/src/glade-palette.h @@ -64,7 +64,8 @@ LIBGLADEUI_API GType glade_palette_get_type (void) G_GNUC_CONST; LIBGLADEUI_API -GtkWidget *glade_palette_new (const GList *catalogs, GladeItemAppearance appearance); +GtkWidget *glade_palette_new (const GList *catalogs, + GladeItemAppearance item_appearance); LIBGLADEUI_API void glade_palette_deselect_current_item (GladePalette *palette); diff --git a/src/glade-property.c b/src/glade-property.c index 546458db..9a87ac8a 100644 --- a/src/glade-property.c +++ b/src/glade-property.c @@ -225,7 +225,6 @@ glade_property_set_value_impl (GladeProperty *property, const GValue *value) if (glade_property_superuser () == FALSE && property->widget && property->class->verify_function && - glade_widget_is_dupping() == FALSE && project && glade_project_is_loading (project) == FALSE) { GObject *object = glade_widget_get_object (property->widget); @@ -1592,7 +1591,7 @@ glade_property_get_enabled (GladeProperty *property) } -glade_property_su_stack = 0; +static gint glade_property_su_stack = 0; void glade_property_push_superuser (void) diff --git a/src/glade-widget.c b/src/glade-widget.c index 70bc51e7..c2820ec2 100644 --- a/src/glade-widget.c +++ b/src/glade-widget.c @@ -93,7 +93,6 @@ static GObjectClass *parent_class = NULL; * this is just a shortcut way to get the project. */ static GladeProject *loading_project = NULL; -static gboolean glade_widget_dupping = FALSE; static GQuark glade_widget_name_quark = 0; /* An optimization to avoid looking up the deepest @@ -2237,9 +2236,9 @@ glade_widget_dup (GladeWidget *template) g_return_val_if_fail (GLADE_IS_WIDGET (template), NULL); - glade_widget_dupping = TRUE; + glade_property_push_superuser (); widget = glade_widget_dup_internal (NULL, template); - glade_widget_dupping = FALSE; + glade_property_pop_superuser (); return widget; } @@ -3461,17 +3460,3 @@ glade_widget_launch_editor (GladeWidget *widget) } } while ((parent = parent->parent) != NULL); } - -/** - * glade_widget_is_dupping: - * - * This is used internally by #GladeProperty to avoid calling - * backend "verify-function"s at dup time. - * - * Returns: whether we are currently duplicating a widget or not - */ -gboolean -glade_widget_is_dupping (void) -{ - return glade_widget_dupping; -} diff --git a/src/glade-widget.h b/src/glade-widget.h index d0165f98..7f9dfad7 100644 --- a/src/glade-widget.h +++ b/src/glade-widget.h @@ -141,8 +141,6 @@ void glade_widget_rebuild (GladeWidget *g LIBGLADEUI_API GladeWidget *glade_widget_dup (GladeWidget *template); LIBGLADEUI_API -gboolean glade_widget_is_dupping (void); -LIBGLADEUI_API void glade_widget_copy_properties (GladeWidget *widget, GladeWidget *template); LIBGLADEUI_API |