From ee31ef4e3839ab02593934c5ee6dc1b72abc6927 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Jul 2004 16:22:57 +0000 Subject: [PATCH] Misc additions. 2004-07-07 Matthias Clasen * gtk/tmpl/*: Misc additions. * gtk/gtk-sections.txt: Updates. * gtk/tmpl/gtkcellrendererprogress.sgml: New file. * gtk/gtk-docs.sgml: Add GtkCellRendererProgress. * gtk/Makefile.am (HTML_IMAGES): Add file and directory icons. --- docs/reference/ChangeLog | 12 ++++++ docs/reference/gtk/Makefile.am | 2 + docs/reference/gtk/gtk-docs.sgml | 2 + docs/reference/gtk/gtk-sections.txt | 18 ++++++++ docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 5 +++ .../gtk/tmpl/gtkcellrendererprogress.sgml | 40 +++++++++++++++++ docs/reference/gtk/tmpl/gtkcombobox.sgml | 43 +++++++++++++++++++ .../gtk/tmpl/gtkentrycompletion.sgml | 24 ++++++++++- docs/reference/gtk/tmpl/gtkframe.sgml | 8 ++-- docs/reference/gtk/tmpl/gtkiconview.sgml | 10 ++++- docs/reference/gtk/tmpl/gtkstock.sgml | 18 ++++++++ docs/reference/gtk/tmpl/gtktoolbar.sgml | 2 + docs/reference/gtk/tmpl/gtktreeview.sgml | 39 +++++++++++++++-- 13 files changed, 211 insertions(+), 12 deletions(-) create mode 100644 docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index e9bc080d63..ec117d5b9d 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,15 @@ +2004-07-07 Matthias Clasen + + * gtk/tmpl/*: Misc additions. + + * gtk/gtk-sections.txt: Updates. + + * gtk/tmpl/gtkcellrendererprogress.sgml: New file. + + * gtk/gtk-docs.sgml: Add GtkCellRendererProgress. + + * gtk/Makefile.am (HTML_IMAGES): Add file and directory icons. + 2004-07-04 Matthias Clasen * gtk/gtk-docs.sgml: diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index ada1d59899..1bbb7a726a 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -124,9 +124,11 @@ HTML_IMAGES = \ $(top_srcdir)/gtk/stock-icons/stock_dialog_info_48.png \ $(top_srcdir)/gtk/stock-icons/stock_dialog_question_48.png \ $(top_srcdir)/gtk/stock-icons/stock_dialog_warning_48.png \ + $(top_srcdir)/gtk/stock-icons/stock_directory_24.png \ $(top_srcdir)/gtk/stock-icons/stock_dnd_32.png \ $(top_srcdir)/gtk/stock-icons/stock_dnd_multiple_32.png \ $(top_srcdir)/gtk/stock-icons/stock_exec_24.png \ + $(top_srcdir)/gtk/stock-icons/stock_file_24.png \ $(top_srcdir)/gtk/stock-icons/stock_search_24.png \ $(top_srcdir)/gtk/stock-icons/stock_search_replace_24.png \ $(top_srcdir)/gtk/stock-icons/stock_bottom_24.png \ diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index ba6b929bc3..eeb4a30a42 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -129,6 +129,7 @@ + @@ -383,6 +384,7 @@ that is, GUI components such as GtkButton or &GtkCellRenderer; &GtkCellEditable; &GtkCellRendererPixbuf; + &GtkCellRendererProgress; &GtkCellRendererText; &GtkCellRendererToggle; &GtkListStore; diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 0bb4fe8d08..87a738711d 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -692,6 +692,10 @@ gtk_combo_box_remove_text gtk_combo_box_get_active_text gtk_combo_box_popup gtk_combo_box_popdown +gtk_combo_box_get_row_separator_column +gtk_combo_box_set_row_separator_column +gtk_combo_box_set_add_tearoffs +gtk_combo_box_get_add_tearoffs GTK_TYPE_COMBO_BOX GTK_COMBO_BOX @@ -1554,6 +1558,14 @@ gtk_icon_view_get_selected_items gtk_icon_view_select_all gtk_icon_view_unselect_all gtk_icon_view_item_activated + +GTK_ICON_VIEW_CLASS +GTK_IS_ICON_VIEW +GTK_IS_ICON_VIEW_CLASS +GTK_ICON_VIEW_GET_CLASS +GTK_TYPE_ICON_VIEW +GTK_ICON_VIEW + gtk_icon_view_get_type @@ -3907,6 +3919,9 @@ gtk_tree_view_get_hover_selection gtk_tree_view_set_hover_selection GtkTreeDestroyCountFunc gtk_tree_view_set_destroy_count_func +GtkTreeViewRowSeparatorFunc +gtk_tree_view_get_row_separator_func +gtk_tree_view_set_row_separator_func GtkTreeSelectionClass GTK_TREE_VIEW @@ -4052,6 +4067,7 @@ GTK_IS_CELL_RENDERER_PROGRESS_CLASS GTK_CELL_RENDERER_PROGRESS_GET_CLASS gtk_cell_renderer_progress_get_type +GtkCellRendererProgressPrivate
@@ -5137,9 +5153,11 @@ GTK_STOCK_DIALOG_ERROR GTK_STOCK_DIALOG_INFO GTK_STOCK_DIALOG_QUESTION GTK_STOCK_DIALOG_WARNING +GTK_STOCK_DIRECTORY GTK_STOCK_DND GTK_STOCK_DND_MULTIPLE GTK_STOCK_EXECUTE +GTK_STOCK_FILE GTK_STOCK_FIND GTK_STOCK_FIND_AND_REPLACE GTK_STOCK_FLOPPY diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index e0755d92ee..6447612a12 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -108,6 +108,11 @@ it cannot be individually modified. + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml new file mode 100644 index 0000000000..eff71ec755 --- /dev/null +++ b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml @@ -0,0 +1,40 @@ + +GtkCellRendererProgress + + +Renders numbers as progress bars + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkcombobox.sgml b/docs/reference/gtk/tmpl/gtkcombobox.sgml index faa53d5882..78f1d5c7b1 100644 --- a/docs/reference/gtk/tmpl/gtkcombobox.sgml +++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml @@ -47,6 +47,11 @@ a widget used to choose from a list of items. + + + + + @@ -150,6 +155,8 @@ a widget used to choose from a list of items. @combo_box: +@index_: + @index: @@ -260,3 +267,39 @@ a widget used to choose from a list of items. @combo_box: + + + + + +@combo_box: +@Returns: + + + + + + + +@combo_box: +@column: + + + + + + + +@combo_box: +@add_tearoffs: + + + + + + + +@combo_box: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml index ddbc41625c..4b6c312bd2 100644 --- a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml +++ b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml @@ -77,6 +77,11 @@ The GtkEntryCompletion struct contains only private data. + + + + + A function which decides whether the row indicated by @iter matches a given @@ -173,8 +178,10 @@ to the unmodified key via gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp @completion: -@index: +@index_: @text: + +@index: @@ -183,8 +190,10 @@ to the unmodified key via gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp @completion: -@index: +@index_: @markup: + +@index: @@ -193,6 +202,8 @@ to the unmodified key via gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp @completion: +@index_: + @index: @@ -205,3 +216,12 @@ to the unmodified key via gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp @column: + + + + + +@completion: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index 7d8e42a62d..fbe0d1249f 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -83,16 +83,16 @@ label can be controlled with gtk_frame_set_label_align(). -@frame: -@xalign: -@yalign: +@frame: +@xalign: +@yalign: -@frame: +@frame: @type: diff --git a/docs/reference/gtk/tmpl/gtkiconview.sgml b/docs/reference/gtk/tmpl/gtkiconview.sgml index 66dc0abdbf..0ec291d9e0 100644 --- a/docs/reference/gtk/tmpl/gtkiconview.sgml +++ b/docs/reference/gtk/tmpl/gtkiconview.sgml @@ -9,19 +9,25 @@ A widget which displays a list of icons in a grid - - + + + + + +@iconview: the object which received the signal. +@Returns: + diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 5629491f6b..277b24b1a9 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -234,6 +234,14 @@ The "Warning" item. + + +The "Directory" icon. + + + + + The "Drag-And-Drop" icon. @@ -258,6 +266,16 @@ The "Execute" item. + + + +The "File" icon. + + + + + + The "Find" item. diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 7b695a98f6..f319821459 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -244,6 +244,8 @@ to a #GtkToolbar. @toolbar: @tool_item: +@index_: + @index: diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index f6ac199a17..ef983db4b6 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -951,9 +951,6 @@ has some similarity to strcmp() returning 0 for equal strings. @search_equal_func: @search_user_data: @search_destroy: - -@search_compare_func: -@search_data: @@ -971,7 +968,7 @@ has some similarity to strcmp() returning 0 for equal strings. @tree_view: -@hover: +@enable: @@ -1014,3 +1011,37 @@ has some similarity to strcmp() returning 0 for equal strings. @destroy: + + +Function type for determining whether the row pointed to by @iter should +be rendered as a separator. A common way to implement this is to have a +boolean column in the model, whose values the #GtkTreeViewRowSeparatorFunc +returns. + + +@model: the #GtkTreeModel +@iter: a #GtkTreeIter pointing at a row in @model +@data: user data +@Returns: %TRUE if the row is a separator + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@func: +@data: +@destroy: + +