diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | doc/hildon-docs.sgml | 1 | ||||
| -rw-r--r-- | src/hildon-time-selector.c | 4 | ||||
| -rw-r--r-- | src/hildon-touch-selector-entry.c | 14 | ||||
| -rw-r--r-- | src/hildon-touch-selector.c | 15 | ||||
| -rw-r--r-- | src/hildon-touch-selector.h | 3 |
6 files changed, 41 insertions, 11 deletions
@@ -1,3 +1,18 @@ +2008-10-08 Alejandro Pinheiro <apinheiro@igalia.com> + + * src/hildon-touch-selector.h + (hildon_touch_selector_set_column_attributes): added deprecation + guard HILDON_DISABLE_DEPRECATED + * src/hildon-time-selector.c + (hildon_time_selector_set_time) + (hildon_time_selector_get_time): Fixed a typo on documentation + * src/hildon-touch-selector.c: update HildonTouchSelector and + HildonTouchSelectorColumn documentation + * src/hildon-touch-selector-entry.c: update "text-column" property + documentation + * doc/hildon-docs.sgml: added hildon-touch-selector-column in order + to be added to the general documentation. + 2008-10-08 Alejandro G. Castro <alex@igalia.com> * examples/hildon-pannable-area-example-4.c, diff --git a/doc/hildon-docs.sgml b/doc/hildon-docs.sgml index d95c27c..890ed97 100644 --- a/doc/hildon-docs.sgml +++ b/doc/hildon-docs.sgml @@ -43,6 +43,7 @@ <xi:include href="xml/hildon-time-picker.xml"/> <xi:include href="xml/hildon-app-menu.xml"/> <xi:include href="xml/hildon-touch-selector.xml"/> + <xi:include href="xml/hildon-touch-selector-column.xml"/> <xi:include href="xml/hildon-touch-selector-entry.xml"/> <xi:include href="xml/hildon-date-selector.xml"/> <xi:include href="xml/hildon-time-selector.xml"/> diff --git a/src/hildon-time-selector.c b/src/hildon-time-selector.c index 912da10..e28a4fc 100644 --- a/src/hildon-time-selector.c +++ b/src/hildon-time-selector.c @@ -396,7 +396,7 @@ hildon_time_selector_new () /** * hildon_time_selector_set_time * @selector: the #HildonTimeSelector - * @year: the current hour (0-23) + * @hours: the current hour (0-23) * @minutes: the current minute (0-59) * * Sets the current active hour on the #HildonTimeSelector widget @@ -439,7 +439,7 @@ hildon_time_selector_set_time (HildonTimeSelector * selector, /** * hildon_time_selector_get_time * @selector: the #HildonTimeSelector - * @year: to set the current hour (0-23) + * @hours: to set the current hour (0-23) * @minutes: to set the current minute (0-59) * * Gets the current active hour on the #HildonTimeSelector widget. Both @year diff --git a/src/hildon-touch-selector-entry.c b/src/hildon-touch-selector-entry.c index 376399f..97f1e3b 100644 --- a/src/hildon-touch-selector-entry.c +++ b/src/hildon-touch-selector-entry.c @@ -114,15 +114,19 @@ hildon_touch_selector_entry_class_init (HildonTouchSelectorEntryClass *klass) object_class->get_property = hildon_touch_selector_entry_get_property; object_class->set_property = hildon_touch_selector_entry_set_property; + /** + * HildonTouchSelectorEntry:text-column: + * + * Deprecated: now this property is in HildonTouchSelectorColumn use + * hildon_touch_selector_entry_set_text_column() and + * hildon_touch_selector_entry_get_text_column() to manage this. + * + **/ g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TEXT_COLUMN, g_param_spec_int ("text-column", "Text Column", - "A column in the data source model to get the strings from." - "Deprecated: now this property is in HildonTouchSelectorColumn" - "use hildon_touch_selector_entry_set_text_column() and" - "hildon_touch_selector_entry_get_text_column() to manage" - "this in a easy way", + "A column in the data source model to get the strings from.", -1, G_MAXINT, -1, diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c index 8bb87ac..7b59ce6 100644 --- a/src/hildon-touch-selector.c +++ b/src/hildon-touch-selector.c @@ -49,15 +49,15 @@ * The current selection has a string representation. In the most common cases, * each column model will contain a text column. You can configure * which column in particular using the #HildonTouchSelectorColumn property - * \"text-column\" + * #HildonTouchSelectorColumn:text-column * * You can get this string representation using * hildon_touch_selector_get_current_text(). * You can configure how the selection is printed with * hildon_touch_selector_set_print_func(), that sets the current hildon touch * selector print function. The widget has a default print function, that - * uses the \"text-column\" property on each #HildonTouchSelectorColumn to - * compose the final representation. + * uses the #HildonTouchSelectorColumn:text-column property on each + * #HildonTouchSelectorColumn to compose the final representation. * * If you create the selector using hildon_touch_selector_new_text() you * don't need to take care of this property, as the model is created internally. @@ -67,6 +67,15 @@ * */ +/** + * SECTION:hildon-touch-selector-column + * @short_description: A visible column in a #HildonTouchSelector + * + * #HildonTouchSelectorColumn object represents a visible column in + * #HildonTouchSelector. It allows to manage the cell renderers related to each + * column. + */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/hildon-touch-selector.h b/src/hildon-touch-selector.h index e4f8131..b3f84ed 100644 --- a/src/hildon-touch-selector.h +++ b/src/hildon-touch-selector.h @@ -117,12 +117,13 @@ hildon_touch_selector_append_column (HildonTouchSelector *selector, GtkTreeModel *model, GtkCellRenderer *cell_renderer, ...); - +#ifndef HILDON_DISABLE_DEPRECATED void hildon_touch_selector_set_column_attributes (HildonTouchSelector *selector, gint num_column, GtkCellRenderer *cell_renderer, ...); +#endif gboolean hildon_touch_selector_remove_column (HildonTouchSelector *selector, |