From 4fe23cae7841a0c330bb0ed948fd38124e0e7eb0 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 30 Nov 2010 17:27:53 +0100 Subject: [PATCH] app-chooser: other misc doc fixes --- docs/reference/gtk/gtk-docs.sgml | 9 ++++++++- docs/reference/gtk/gtk3-sections.txt | 17 +++++++++++++++++ docs/reference/gtk/gtk3.types | 5 ++++- gtk/gtk.symbols | 4 ++++ gtk/gtkappchooserbutton.c | 4 ++-- gtk/gtkappchooserdialog.c | 2 +- gtk/gtkappchooserwidget.c | 15 +++++++++++---- gtk/gtkappchooserwidget.h | 2 +- tests/Makefile.am | 4 ++-- 9 files changed, 50 insertions(+), 12 deletions(-) diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 63e3c33ace..5963787271 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -200,7 +200,6 @@ - @@ -298,6 +297,14 @@ + + Choosing from installed applications + + + + + + Interface builder diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index 11da682d82..cb3dc21502 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -6411,6 +6411,23 @@ GtkSwitchPrivate gtk_switch_get_type +
+gtkappchooser +GtkAppChooser +GtkAppChooser +gtk_app_chooser_get_app_info +gtk_app_chooser_get_content_type +gtk_app_chooser_refresh + + +GTK_TYPE_APP_CHOOSER +GTK_APP_CHOOSER +GTK_IS_APP_CHOOSER + + +gtk_app_chooser_get_type +
+
gtkappchooserbutton GtkAppChooserButton diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types index 88071c9cd8..6b43eccf7f 100644 --- a/docs/reference/gtk/gtk3.types +++ b/docs/reference/gtk/gtk3.types @@ -11,6 +11,10 @@ gtk_action_group_get_type gtk_activatable_get_type gtk_adjustment_get_type gtk_alignment_get_type +gtk_app_chooser_get_type +gtk_app_chooser_button_get_type +gtk_app_chooser_dialog_get_type +gtk_app_chooser_widget_get_type gtk_application_get_type gtk_arrow_get_type gtk_aspect_frame_get_type @@ -94,7 +98,6 @@ gtk_misc_get_type gtk_mount_operation_get_type gtk_notebook_get_type gtk_offscreen_window_get_type -gtk_open_with_dialog_get_type gtk_orientable_get_type gtk_page_setup_get_type gtk_page_setup_unix_dialog_get_type diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 6ca513652e..a950ae1f99 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -178,6 +178,10 @@ gtk_alignment_new gtk_alignment_set gtk_alignment_set_padding gtk_alternative_dialog_button_order +gtk_app_chooser_get_app_info +gtk_app_chooser_get_content_type +gtk_app_chooser_get_type G_GNUC_CONST +gtk_app_chooser_refresh gtk_app_chooser_button_append_custom_item gtk_app_chooser_button_append_separator gtk_app_chooser_button_get_show_dialog_item diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c index d95d435dee..639520cbf5 100644 --- a/gtk/gtkappchooserbutton.c +++ b/gtk/gtkappchooserbutton.c @@ -512,7 +512,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass) /** * GtkAppChooserButton:show-dialog-item: * - * The ::show-dialog-item property determines whether the dropdown menu + * The #GtkAppChooserButton:show-dialog-item property determines whether the dropdown menu * should show an item that triggers a #GtkAppChooserDialog when clicked. */ pspec = @@ -689,7 +689,7 @@ gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self) } /** - * gtk_app_chooser_button_get_show_dialog_item: + * gtk_app_chooser_button_set_show_dialog_item: * @self: a #GtkAppChooserButton * @setting: the new value for #GtkAppChooserButton:show-dialog-item * diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 1c453ab50e..83cf7e00e4 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -774,7 +774,7 @@ gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, * * Returns the #GtkAppChooserWidget of this dialog. * - * Returns: the #GtkAppChooserWidget of @self + * Returns: (transfer none): the #GtkAppChooserWidget of @self * * Since: 3.0 */ diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index b73638c187..95510e9a35 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -1010,7 +1010,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) /** * GtkAppChooserWidget:show-recommended: * - * The ::show-recommended property determines whether the app chooser + * The #GtkAppChooserWidget:show-recommended property determines whether the app chooser * should show a section for recommended applications. If %FALSE, the * recommended applications are listed among the other applications. */ @@ -1024,7 +1024,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) /** * GtkAppChooserWidget:show-fallback: * - * The ::show-fallback property determines whether the app chooser + * The #GtkAppChooserWidget:show-fallback property determines whether the app chooser * should show a section for related applications. If %FALSE, the * related applications are listed among the other applications. */ @@ -1038,7 +1038,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) /** * GtkAppChooserWidget:show-other: * - * The ::show-other property determines whether the app chooser + * The #GtkAppChooserWidget:show-other property determines whether the app chooser * should show a section for other applications. */ pspec = g_param_spec_boolean ("show-other", @@ -1051,7 +1051,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) /** * GtkAppChooserWidget:show-all: * - * If the ::show-all property is %TRUE, the app chooser presents + * If the #GtkAppChooserWidget:show-all property is %TRUE, the app chooser presents * all applications in a single list, without subsections for * default, recommended or related applications. */ @@ -1062,6 +1062,13 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_ALL, pspec); + /** + * GtkAppChooserWidget:default-text: + * + * The #GtkAppChooserWidget:default-text property determines the text that appears + * in the widget when there are no applications for the given content type. + * See also gtk_app_chooser_widget_set_default_text(). + */ pspec = g_param_spec_string ("default-text", P_("Widget's default text"), P_("The default text appearing when there are no applications"), diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h index 22b60f796b..e12541762c 100644 --- a/gtk/gtkappchooserwidget.h +++ b/gtk/gtkappchooserwidget.h @@ -91,7 +91,7 @@ void gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget * gboolean gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self); void gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self, - gboolean show_all); + gboolean setting); gboolean gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self); void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, diff --git a/tests/Makefile.am b/tests/Makefile.am index 71354056e8..4d63c11065 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,6 +31,8 @@ noinst_PROGRAMS = $(TEST_PROGS) \ print-editor \ testaccel \ testadjustsize \ + testappchooser \ + testappchooserbutton \ testassistant \ testbbox \ testbuttons \ @@ -66,8 +68,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ testoffscreen \ testoffscreenwindow \ testorientable \ - testappchooser \ - testappchooserbutton \ testprint \ testrecentchooser \ testrecentchoosermenu \