diff options
author | Juan Pablo Ugarte <jpu@src.gnome.org> | 2007-07-12 18:17:31 +0000 |
---|---|---|
committer | Juan Pablo Ugarte <jpu@src.gnome.org> | 2007-07-12 18:17:31 +0000 |
commit | 25ab68be16a85e3f476449176074200af66cf200 (patch) | |
tree | ff3d6b59dbe4ddfc1eabf95c0e2e876004362099 | |
parent | deacca988449b715e3a2b1263d46e037ae389b28 (diff) | |
download | glade-25ab68be16a85e3f476449176074200af66cf200.tar.gz |
added gwa_displayable_values_check() and use it to check for displayable
* gladeui/glade-widget-adaptor.c: added gwa_displayable_values_check() and use it to check
for displayable values in enums and flags properties in glade_widget_adaptor_from_catalog()
this way we can check every properties not only the ones that are explicited in the catalog.
* gladeui/glade-property-class.c: removed displayable values check from
glade_property_class_update_from_node()
* plugins/gtk+/gtk+.xml.in: added displayable values for
GtkToolbar::icon-size
GtkLabel::wrap-mode
GtkIconView::selection-mode, orientation
GtkRange::lower-stepper-sensitivity, upper-stepper-sensitivity
GtkRuler::metric
GtkList::selection-mode
GtkCList::shadow-type, selection-mode, sort-type
svn path=/trunk/; revision=1462
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | gladeui/glade-property-class.c | 24 | ||||
-rw-r--r-- | gladeui/glade-widget-adaptor.c | 26 | ||||
-rw-r--r-- | plugins/gtk+/gtk+.xml.in | 101 |
4 files changed, 146 insertions, 23 deletions
@@ -1,3 +1,21 @@ +2007-07-12 Juan Pablo Ugarte <juanpablougarte@gmail.com> + + * gladeui/glade-widget-adaptor.c: added gwa_displayable_values_check() and use it to check + for displayable values in enums and flags properties in glade_widget_adaptor_from_catalog() + this way we can check every properties not only the ones that are explicited in the catalog. + + * gladeui/glade-property-class.c: removed displayable values check from + glade_property_class_update_from_node() + + * plugins/gtk+/gtk+.xml.in: added displayable values for + GtkToolbar::icon-size + GtkLabel::wrap-mode + GtkIconView::selection-mode, orientation + GtkRange::lower-stepper-sensitivity, upper-stepper-sensitivity + GtkRuler::metric + GtkList::selection-mode + GtkCList::shadow-type, selection-mode, sort-type + 2006-07-11 Tristan Van Berkom <tvb@gnome.org> * src/glade-window.c: Implemented docking view menu. diff --git a/gladeui/glade-property-class.c b/gladeui/glade-property-class.c index 8720d7f0..5631d96e 100644 --- a/gladeui/glade-property-class.c +++ b/gladeui/glade-property-class.c @@ -1752,26 +1752,10 @@ glade_property_class_update_from_node (GladeXmlNode *node, klass->save_always = glade_xml_get_property_boolean (node, GLADE_TAG_SAVE_ALWAYS, klass->save_always); /* If this property's value is an enumeration or flag then we try to get the displayable values */ - if (G_IS_PARAM_SPEC_ENUM(klass->pspec) || - G_IS_PARAM_SPEC_FLAGS(klass->pspec)) - { - child = glade_xml_search_child (node, GLADE_TAG_DISPLAYABLE_VALUES); - if (child) - { - klass->displayable_values = gpc_get_displayable_values_from_node - (child, klass, domain); - } - else if (!klass->displayable_values && klass->visible && - klass->pspec->value_type != GLADE_TYPE_STOCK && - klass->pspec->value_type != GLADE_TYPE_STOCK_IMAGE) - { - /* Displayable values could be defined in the parent class - * We do not need displayable values if the property is not visible - */ - g_message (_("No displayable values for %s::%s"), - ((GladeWidgetAdaptor*)klass->handle)->name, klass->id); - } - } + if ((G_IS_PARAM_SPEC_ENUM(klass->pspec) || G_IS_PARAM_SPEC_FLAGS(klass->pspec)) && + (child = glade_xml_search_child (node, GLADE_TAG_DISPLAYABLE_VALUES))) + klass->displayable_values = gpc_get_displayable_values_from_node + (child, klass, domain); /* A sprinkle of hard-code to get atk properties working right */ diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c index d44a5f1a..bb3dcce9 100644 --- a/gladeui/glade-widget-adaptor.c +++ b/gladeui/glade-widget-adaptor.c @@ -1451,6 +1451,29 @@ create_icon_name_for_adaptor (const gchar *adaptor_name, return name; } +static void +gwa_displayable_values_check (GladeWidgetAdaptor *adaptor, gboolean packing) +{ + GList *l, *p = (packing) ? adaptor->packing_props : adaptor->properties; + + for (l = p; l; l = g_list_next (l)) + { + GladePropertyClass *klass = l->data; + + if (adaptor->type == klass->pspec->owner_type && + (G_IS_PARAM_SPEC_ENUM (klass->pspec) || G_IS_PARAM_SPEC_FLAGS (klass->pspec)) && + !klass->displayable_values && klass->visible && + klass->pspec->value_type != GLADE_TYPE_STOCK && + klass->pspec->value_type != GLADE_TYPE_STOCK_IMAGE) + { + /* We do not need displayable values if the property is not visible */ + g_message (_("No displayable values for %sproperty %s::%s"), + (packing) ? "child " : "", + adaptor->name, klass->id); + } + } +} + /** * glade_widget_adaptor_from_catalog: * @class_node: A #GladeXmlNode @@ -1611,6 +1634,9 @@ glade_widget_adaptor_from_catalog (GladeXmlNode *class_node, gwa_properties_set_weight (&adaptor->packing_props, parent_type); } + gwa_displayable_values_check (adaptor, FALSE); + gwa_displayable_values_check (adaptor, TRUE); + glade_widget_adaptor_register (adaptor); return adaptor; diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in index efffea9f..3bc6bf83 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -431,6 +431,17 @@ embedded in another object</_tooltip> <value id="GTK_TOOLBAR_BOTH_HORIZ" _name="Text beside icons"/> </displayable-values> </property> + <property id="icon-size"> + <displayable-values> + <value id="GTK_ICON_SIZE_INVALID" _name="Invalid"/> + <value id="GTK_ICON_SIZE_MENU" _name="Menu"/> + <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"/> + <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"/> + <value id="GTK_ICON_SIZE_BUTTON" _name="Button"/> + <value id="GTK_ICON_SIZE_DND" _name="Drag & Drop"/> + <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"/> + </displayable-values> + </property> </properties> <packing-properties> @@ -542,6 +553,13 @@ embedded in another object</_tooltip> <value id="PANGO_ELLIPSIZE_END" _name="End"/> </displayable-values> </property> + <property id="wrap-mode"> + <displayable-values> + <value id="PANGO_WRAP_WORD" _name="Word"/> + <value id="PANGO_WRAP_CHAR" _name="Character"/> + <value id="PANGO_WRAP_WORD_CHAR" _name="Word Character"/> + </displayable-values> + </property> </properties> </glade-widget-class> @@ -810,7 +828,25 @@ embedded in another object</_tooltip> </properties> </glade-widget-class> - <glade-widget-class name="GtkIconView" generic-name="iconview" _title="Icon View" /> + <glade-widget-class name="GtkIconView" generic-name="iconview" _title="Icon View"> + <properties> + <property id="selection-mode"> + <displayable-values> + <value id="GTK_SELECTION_NONE" _name="None"/> + <value id="GTK_SELECTION_SINGLE" _name="Single"/> + <value id="GTK_SELECTION_BROWSE" _name="Browse"/> + <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/> + <value id="GTK_SELECTION_EXTENDED" _name="Extended"/> + </displayable-values> + </property> + <property id="orientation"> + <displayable-values> + <value id="GTK_ORIENTATION_HORIZONTAL" _name="Horizontal"/> + <value id="GTK_ORIENTATION_VERTICAL" _name="Vertical"/> + </displayable-values> + </property> + </properties> + </glade-widget-class> <glade-widget-class name="GtkProgressBar" generic-name="progressbar" _title="Progress Bar"> <properties> @@ -1048,6 +1084,20 @@ embedded in another object</_tooltip> <value id="GTK_UPDATE_DELAYED" _name="Delayed"/> </displayable-values> </property> + <property id="upper-stepper-sensitivity"> + <displayable-values> + <value id="GTK_SENSITIVITY_AUTO" _name="Automatic"/> + <value id="GTK_SENSITIVITY_ON" _name="On"/> + <value id="GTK_SENSITIVITY_OFF" _name="Off"/> + </displayable-values> + </property> + <property id="lower-stepper-sensitivity"> + <displayable-values> + <value id="GTK_SENSITIVITY_AUTO" _name="Automatic"/> + <value id="GTK_SENSITIVITY_ON" _name="On"/> + <value id="GTK_SENSITIVITY_OFF" _name="Off"/> + </displayable-values> + </property> </properties> </glade-widget-class> @@ -1347,6 +1397,13 @@ embedded in another object</_tooltip> <property default="10.0" id="upper"/> <property default="5.0" id="position"/> <property default="10.0" id="max-size"/> + <property id="metric"> + <displayable-values> + <value id="GTK_PIXELS" _name="Pixels"/> + <value id="GTK_INCHES" _name="Inches"/> + <value id="GTK_CENTIMETERS" _name="Centimeters"/> + </displayable-values> + </property> </properties> </glade-widget-class> @@ -1386,6 +1443,17 @@ embedded in another object</_tooltip> <glade-widget-class name="GtkList" generic-name="list" _title="List"> <add-child-function>glade_gtk_listitem_add_child</add-child-function> <remove-child-function>glade_gtk_listitem_remove_child</remove-child-function> + <properties> + <property id="selection-mode"> + <displayable-values> + <value id="GTK_SELECTION_NONE" _name="None"/> + <value id="GTK_SELECTION_SINGLE" _name="Single"/> + <value id="GTK_SELECTION_BROWSE" _name="Browse"/> + <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/> + <value id="GTK_SELECTION_EXTENDED" _name="Extended"/> + </displayable-values> + </property> + </properties> </glade-widget-class> <glade-widget-class name="GtkListItem" generic-name="listitem" _title="List Item"> @@ -1400,8 +1468,35 @@ embedded in another object</_tooltip> </properties> </glade-widget-class> - <glade-widget-class name="GtkCList" generic-name="clist" _title="Columned List"/> - + <glade-widget-class name="GtkCList" generic-name="clist" _title="Columned List"> + <properties> + <property id="selection-mode"> + <displayable-values> + <value id="GTK_SELECTION_NONE" _name="None"/> + <value id="GTK_SELECTION_SINGLE" _name="Single"/> + <value id="GTK_SELECTION_BROWSE" _name="Browse"/> + <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/> + <value id="GTK_SELECTION_EXTENDED" _name="Extended"/> + </displayable-values> + </property> + <property id="shadow-type"> + <displayable-values> + <value id="GTK_SHADOW_NONE" _name="None"/> + <value id="GTK_SHADOW_IN" _name="In"/> + <value id="GTK_SHADOW_OUT" _name="Out"/> + <value id="GTK_SHADOW_ETCHED_IN" _name="Etched In"/> + <value id="GTK_SHADOW_ETCHED_OUT" _name="Etched Out"/> + </displayable-values> + </property> + <property id="sort-type"> + <displayable-values> + <value id="GTK_SORT_ASCENDING" _name="Ascending"/> + <value id="GTK_SORT_DESCENDING" _name="Descending"/> + </displayable-values> + </property> + </properties> + </glade-widget-class> + <glade-widget-class name="GtkColorSelection" generic-name="colorselection" _title="Color Selection"/> <glade-widget-class name="GtkFontSelection" generic-name="fontselection" _title="Font Selection"/> |