diff options
| -rw-r--r-- | gtk/gtkappchooser.c | 35 | ||||
| -rw-r--r-- | gtk/gtkappchooser.h | 17 | ||||
| -rw-r--r-- | gtk/gtkappchoosercombobox.c | 178 | ||||
| -rw-r--r-- | gtk/gtkappchoosercombobox.h | 36 | ||||
| -rw-r--r-- | gtk/gtkappchooserdialog.c | 258 | ||||
| -rw-r--r-- | gtk/gtkappchooserdialog.h | 34 | ||||
| -rw-r--r-- | gtk/gtkappchoosermodule.c | 4 | ||||
| -rw-r--r-- | gtk/gtkappchooseronline.c | 22 | ||||
| -rw-r--r-- | gtk/gtkappchooseronline.h | 48 | ||||
| -rw-r--r-- | gtk/gtkappchooseronlinedummy.h | 18 | ||||
| -rw-r--r-- | gtk/gtkappchooseronlinepk.c | 118 | ||||
| -rw-r--r-- | gtk/gtkappchooseronlinepk.h | 18 | ||||
| -rw-r--r-- | gtk/gtkappchooserprivate.h | 4 | ||||
| -rw-r--r-- | gtk/gtkappchooserwidget.c | 813 | ||||
| -rw-r--r-- | gtk/gtkappchooserwidget.h | 77 | ||||
| -rw-r--r-- | tests/testappchooser.c | 3 | ||||
| -rw-r--r-- | tests/testappchoosercombo.c | 23 |
17 files changed, 955 insertions, 751 deletions
diff --git a/gtk/gtkappchooser.c b/gtk/gtkappchooser.c index 74b552bb38..1e8843a1ff 100644 --- a/gtk/gtkappchooser.c +++ b/gtk/gtkappchooser.c @@ -21,7 +21,7 @@ * Authors: Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchooser.h" @@ -39,11 +39,11 @@ gtk_app_chooser_default_init (GtkAppChooserIface *iface) GParamSpec *pspec; pspec = g_param_spec_string ("content-type", - P_("Content type"), - P_("The content type used by the open with object"), - NULL, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); + P_("Content type"), + P_("The content type used by the open with object"), + NULL, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_interface_install_property (iface, pspec); } @@ -55,18 +55,37 @@ gtk_app_chooser_get_content_type (GtkAppChooser *self) g_return_val_if_fail (GTK_IS_APP_CHOOSER (self), NULL); g_object_get (self, - "content-type", &retval, - NULL); + "content-type", &retval, + NULL); return retval; } +/** + * gtk_app_chooser_get_app_info: + * @self: a #GtkAppChooser + * + * Returns the currently selected application. + * + * Returns: (transfer full): a #GAppInfo for the currently selected + * application, or %NULL if none is selected. Free with g_object_unref(). + * + * Since: 3.0 + */ GAppInfo * gtk_app_chooser_get_app_info (GtkAppChooser *self) { return GTK_APP_CHOOSER_GET_IFACE (self)->get_app_info (self); } +/** + * gtk_app_chooser_refresh: + * @self: a #GtkAppChooser + * + * Reload the list of applications. + * + * Since: 3.0 + */ void gtk_app_chooser_refresh (GtkAppChooser *self) { diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h index e1665291b9..35de8770c2 100644 --- a/gtk/gtkappchooser.h +++ b/gtk/gtkappchooser.h @@ -33,20 +33,17 @@ G_BEGIN_DECLS -#define GTK_TYPE_APP_CHOOSER\ - (gtk_app_chooser_get_type ()) -#define GTK_APP_CHOOSER(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER, GtkAppChooser)) -#define GTK_IS_APP_CHOOSER(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER)) +#define GTK_TYPE_APP_CHOOSER (gtk_app_chooser_get_type ()) +#define GTK_APP_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER, GtkAppChooser)) +#define GTK_IS_APP_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER)) typedef struct _GtkAppChooser GtkAppChooser; -GType gtk_app_chooser_get_type () G_GNUC_CONST; +GType gtk_app_chooser_get_type (void) G_GNUC_CONST; -GAppInfo * gtk_app_chooser_get_app_info (GtkAppChooser *self); -gchar * gtk_app_chooser_get_content_type (GtkAppChooser *self); -void gtk_app_chooser_refresh (GtkAppChooser *self); +GAppInfo * gtk_app_chooser_get_app_info (GtkAppChooser *self); +gchar * gtk_app_chooser_get_content_type (GtkAppChooser *self); +void gtk_app_chooser_refresh (GtkAppChooser *self); G_END_DECLS diff --git a/gtk/gtkappchoosercombobox.c b/gtk/gtkappchoosercombobox.c index 36f21b75fe..625f536ca0 100644 --- a/gtk/gtkappchoosercombobox.c +++ b/gtk/gtkappchoosercombobox.c @@ -21,7 +21,7 @@ * Authors: Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchoosercombobox.h" @@ -73,14 +73,14 @@ custom_app_data_free (gpointer boxed) #define CUSTOM_COMBO_DATA_TYPE custom_app_combo_data_get_type() G_DEFINE_BOXED_TYPE (CustomAppComboData, custom_app_combo_data, - custom_app_data_copy, - custom_app_data_free); + custom_app_data_copy, + custom_app_data_free); static void app_chooser_iface_init (GtkAppChooserIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkAppChooserComboBox, gtk_app_chooser_combo_box, GTK_TYPE_COMBO_BOX, - G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, - app_chooser_iface_init)); + G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, + app_chooser_iface_init)); struct _GtkAppChooserComboBoxPrivate { gchar *content_type; @@ -89,21 +89,21 @@ struct _GtkAppChooserComboBoxPrivate { static gboolean row_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) + GtkTreeIter *iter, + gpointer user_data) { gboolean separator; gtk_tree_model_get (model, iter, - COLUMN_SEPARATOR, &separator, - -1); + COLUMN_SEPARATOR, &separator, + -1); return separator; } static void get_first_iter (GtkListStore *store, - GtkTreeIter *iter) + GtkTreeIter *iter) { GtkTreeIter iter2; @@ -138,27 +138,27 @@ gtk_app_chooser_combo_box_populate (GtkAppChooserComboBox *self) icon = g_app_info_get_icon (app); if (icon == NULL) - icon = g_themed_icon_new ("x-application/executable"); + icon = g_themed_icon_new ("application-x-executable"); else - g_object_ref (icon); + g_object_ref (icon); if (first) - { - get_first_iter (self->priv->store, &iter); - first = FALSE; - } + { + get_first_iter (self->priv->store, &iter); + first = FALSE; + } else - { - gtk_list_store_insert_after (self->priv->store, &iter2, &iter); - iter = iter2; - } + { + gtk_list_store_insert_after (self->priv->store, &iter2, &iter); + iter = iter2; + } gtk_list_store_set (self->priv->store, &iter, - COLUMN_APP_INFO, app, - COLUMN_NAME, g_app_info_get_display_name (app), - COLUMN_ICON, icon, - COLUMN_CUSTOM, FALSE, - -1); + COLUMN_APP_INFO, app, + COLUMN_NAME, g_app_info_get_display_name (app), + COLUMN_ICON, icon, + COLUMN_CUSTOM, FALSE, + -1); g_object_unref (icon); } @@ -172,30 +172,30 @@ gtk_app_chooser_combo_box_build_ui (GtkAppChooserComboBox *self) GtkCellRenderer *cell; self->priv->store = gtk_list_store_new (NUM_COLUMNS, - G_TYPE_APP_INFO, - G_TYPE_STRING, - G_TYPE_ICON, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, - CUSTOM_COMBO_DATA_TYPE); + G_TYPE_APP_INFO, + G_TYPE_STRING, + G_TYPE_ICON, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + CUSTOM_COMBO_DATA_TYPE); gtk_combo_box_set_model (GTK_COMBO_BOX (self), - GTK_TREE_MODEL (self->priv->store)); + GTK_TREE_MODEL (self->priv->store)); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (self), - row_separator_func, NULL, NULL); + row_separator_func, NULL, NULL); cell = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell, - "gicon", COLUMN_ICON, - NULL); + "gicon", COLUMN_ICON, + NULL); cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell, - "text", COLUMN_NAME, - NULL); + "text", COLUMN_NAME, + NULL); gtk_app_chooser_combo_box_populate (self); } @@ -207,15 +207,15 @@ gtk_app_chooser_combo_box_remove_non_custom (GtkAppChooserComboBox *self) GtkTreeIter iter; gboolean custom, res; - model = GTK_TREE_MODEL (self->priv->store); + model = GTK_TREE_MODEL (self->priv->store); if (!gtk_tree_model_get_iter_first (model, &iter)) return; do { gtk_tree_model_get (model, &iter, - COLUMN_CUSTOM, &custom, - -1); + COLUMN_CUSTOM, &custom, + -1); if (custom) res = gtk_tree_model_iter_next (model, &iter); else @@ -235,10 +235,10 @@ gtk_app_chooser_combo_box_changed (GtkComboBox *object) return; gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter, - COLUMN_CUSTOM, &custom, - COLUMN_SEPARATOR, &separator, - COLUMN_CALLBACK, &custom_data, - -1); + COLUMN_CUSTOM, &custom, + COLUMN_SEPARATOR, &separator, + COLUMN_CALLBACK, &custom_data, + -1); if (custom && !separator && custom_data != NULL && custom_data->func != NULL) @@ -265,8 +265,8 @@ gtk_app_chooser_combo_box_get_app_info (GtkAppChooser *object) return NULL; gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter, - COLUMN_APP_INFO, &info, - -1); + COLUMN_APP_INFO, &info, + -1); return info; } @@ -285,10 +285,10 @@ gtk_app_chooser_combo_box_constructed (GObject *obj) } static void -gtk_app_chooser_combo_box_set_property (GObject *obj, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gtk_app_chooser_combo_box_set_property (GObject *obj, + guint property_id, + const GValue *value, + GParamSpec *pspec) { GtkAppChooserComboBox *self = GTK_APP_CHOOSER_COMBO_BOX (obj); @@ -304,10 +304,10 @@ gtk_app_chooser_combo_box_set_property (GObject *obj, } static void -gtk_app_chooser_combo_box_get_property (GObject *obj, - guint property_id, - GValue *value, - GParamSpec *pspec) +gtk_app_chooser_combo_box_get_property (GObject *obj, + guint property_id, + GValue *value, + GParamSpec *pspec) { GtkAppChooserComboBox *self = GTK_APP_CHOOSER_COMBO_BOX (obj); @@ -360,21 +360,40 @@ gtk_app_chooser_combo_box_class_init (GtkAppChooserComboBoxClass *klass) static void gtk_app_chooser_combo_box_init (GtkAppChooserComboBox *self) { - self->priv = - G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_COMBO_BOX, - GtkAppChooserComboBoxPrivate); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_COMBO_BOX, + GtkAppChooserComboBoxPrivate); } +/** + * gtk_app_chooser_combo_box_new: + * @content_type: the content type to show applications for + * + * Creates a new #GtkAppChooserComboBox for applications + * that can handle content of the given type. + * + * Returns: a newly created #GtkAppChooserComboBox + * + * Since: 3.0 + */ GtkWidget * gtk_app_chooser_combo_box_new (const gchar *content_type) { g_return_val_if_fail (content_type != NULL, NULL); return g_object_new (GTK_TYPE_APP_CHOOSER_COMBO_BOX, - "content-type", content_type, - NULL); + "content-type", content_type, + NULL); } +/** + * gtk_app_chooser_combo_box_append_separator: + * @self: a #GtkAppChooserComboBox + * + * Appends a separator to the list of applications that is shown + * in the popup. + * + * Since: 3.0 + */ void gtk_app_chooser_combo_box_append_separator (GtkAppChooserComboBox *self) { @@ -384,17 +403,30 @@ gtk_app_chooser_combo_box_append_separator (GtkAppChooserComboBox *self) gtk_list_store_append (self->priv->store, &iter); gtk_list_store_set (self->priv->store, &iter, - COLUMN_CUSTOM, TRUE, - COLUMN_SEPARATOR, TRUE, - -1); + COLUMN_CUSTOM, TRUE, + COLUMN_SEPARATOR, TRUE, + -1); } +/** + * gtk_app_chooser_combo_box_append_custom_item: + * @self: a #GtkAppChooserComboBox + * @label: the label for the custom item + * @icon: the icon for the custom item + * @func: callback to call if the item is activated + * @user_data: user data for @func + * + * Appends a custom item to the list of applications that is shown + * in the popup. See also gtk_app_chooser_combo_box_append_separator(). + * + * Since: 3.0 + */ void -gtk_app_chooser_combo_box_append_custom_item (GtkAppChooserComboBox *self, - const gchar *label, - GIcon *icon, - GtkAppChooserComboBoxItemFunc func, - gpointer user_data) +gtk_app_chooser_combo_box_append_custom_item (GtkAppChooserComboBox *self, + const gchar *label, + GIcon *icon, + GtkAppChooserComboBoxItemFunc func, + gpointer user_data) { GtkTreeIter iter; CustomAppComboData *data; @@ -405,10 +437,10 @@ gtk_app_chooser_combo_box_append_custom_item (GtkAppChooserComboBox *self, gtk_list_store_append (self->priv->store, &iter); gtk_list_store_set (self->priv->store, &iter, - COLUMN_NAME, label, - COLUMN_ICON, icon, - COLUMN_CALLBACK, data, - COLUMN_CUSTOM, TRUE, - COLUMN_SEPARATOR, FALSE, - -1); + COLUMN_NAME, label, + COLUMN_ICON, icon, + COLUMN_CALLBACK, data, + COLUMN_CUSTOM, TRUE, + COLUMN_SEPARATOR, FALSE, + -1); } diff --git a/gtk/gtkappchoosercombobox.h b/gtk/gtkappchoosercombobox.h index 4bd268b86e..b124c7a65e 100644 --- a/gtk/gtkappchoosercombobox.h +++ b/gtk/gtkappchoosercombobox.h @@ -31,25 +31,19 @@ #include <gtk/gtkcombobox.h> #include <gio/gio.h> -#define GTK_TYPE_APP_CHOOSER_COMBO_BOX\ - (gtk_app_chooser_combo_box_get_type ()) -#define GTK_APP_CHOOSER_COMBO_BOX(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBox)) -#define GTK_APP_CHOOSER_COMBO_BOX_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBoxClass)) -#define GTK_IS_APP_CHOOSER_COMBO_BOX(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX)) -#define GTK_IS_APP_CHOOSER_COMBO_BOX_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_COMBO_BOX)) -#define GTK_APP_CHOOSER_COMBO_BOX_GET_CLASS(obj)\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBoxClass)) +#define GTK_TYPE_APP_CHOOSER_COMBO_BOX (gtk_app_chooser_combo_box_get_type ()) +#define GTK_APP_CHOOSER_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBox)) +#define GTK_APP_CHOOSER_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBoxClass)) +#define GTK_IS_APP_CHOOSER_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX)) +#define GTK_IS_APP_CHOOSER_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_COMBO_BOX)) +#define GTK_APP_CHOOSER_COMBO_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_COMBO_BOX, GtkAppChooserComboBoxClass)) typedef struct _GtkAppChooserComboBox GtkAppChooserComboBox; typedef struct _GtkAppChooserComboBoxClass GtkAppChooserComboBoxClass; typedef struct _GtkAppChooserComboBoxPrivate GtkAppChooserComboBoxPrivate; typedef void (* GtkAppChooserComboBoxItemFunc) (GtkAppChooserComboBox *self, - gpointer user_data); + gpointer user_data); struct _GtkAppChooserComboBox { GtkComboBox parent; @@ -65,15 +59,15 @@ struct _GtkAppChooserComboBoxClass { gpointer padding[16]; }; -GType gtk_app_chooser_combo_box_get_type (void) G_GNUC_CONST; +GType gtk_app_chooser_combo_box_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_app_chooser_combo_box_new (const gchar *content_type); +GtkWidget * gtk_app_chooser_combo_box_new (const gchar *content_type); -void gtk_app_chooser_combo_box_append_separator (GtkAppChooserComboBox *self); -void gtk_app_chooser_combo_box_append_custom_item (GtkAppChooserComboBox *self, - const gchar *label, - GIcon *icon, - GtkAppChooserComboBoxItemFunc func, - gpointer user_data); +void gtk_app_chooser_combo_box_append_separator (GtkAppChooserComboBox *self); +void gtk_app_chooser_combo_box_append_custom_item (GtkAppChooserComboBox *self, + const gchar *label, + GIcon *icon, + GtkAppChooserComboBoxItemFunc func, + gpointer user_data); #endif /* __GTK_APP_CHOOSER_COMBO_BOX_H__ */ diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index e8edea8c52..4959ca9d83 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -24,7 +24,7 @@ * Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchooserdialog.h" @@ -32,10 +32,17 @@ #include "gtkappchooser.h" #include "gtkappchooseronline.h" #include "gtkappchooserprivate.h" +#include "gtkappchooserprivate.h" + +#include "gtkmessagedialog.h" +#include "gtklabel.h" +#include "gtkbbox.h" +#include "gtkbutton.h" +#include "gtkmenuitem.h" +#include "gtkstock.h" #include <string.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <gio/gio.h> #define sure_string(s) ((const char *) ((s) != NULL ? (s) : "")) @@ -64,36 +71,36 @@ enum { static void gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkAppChooserDialog, gtk_app_chooser_dialog, GTK_TYPE_DIALOG, - G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, - gtk_app_chooser_dialog_iface_init)); + G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, + gtk_app_chooser_dialog_iface_init)); static void show_error_dialog (const gchar *primary, - const gchar *secondary, - GtkWindow *parent) + const gchar *secondary, + GtkWindow *parent) { GtkWidget *message_dialog; message_dialog = gtk_message_dialog_new (parent, 0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - NULL); + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + NULL); g_object_set (message_dialog, - "text", primary, - "secondary-text", secondary, - NULL); + "text", primary, + "secondary-text", secondary, + NULL); gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK); gtk_widget_show (message_dialog); g_signal_connect (message_dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); + G_CALLBACK (gtk_widget_destroy), NULL); } static void -search_for_mimetype_ready_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) +search_for_mimetype_ready_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) { GtkAppChooserOnline *online = GTK_APP_CHOOSER_ONLINE (source); GtkAppChooserDialog *self = user_data; @@ -104,7 +111,7 @@ search_for_mimetype_ready_cb (GObject *source, if (error != NULL) { show_error_dialog (_("Failed to look for applications online"), - error->message, GTK_WINDOW (self)); + error->message, GTK_WINDOW (self)); g_error_free (error); } else @@ -117,7 +124,7 @@ search_for_mimetype_ready_cb (GObject *source, static void online_button_clicked_cb (GtkButton *b, - gpointer user_data) + gpointer user_data) { GtkAppChooserOnline *online; GtkAppChooserDialog *self = user_data; @@ -125,10 +132,10 @@ online_button_clicked_cb (GtkButton *b, online = gtk_app_chooser_online_get_default (); gtk_app_chooser_online_search_for_mimetype_async (online, - self->priv->content_type, - GTK_WINDOW (self), - search_for_mimetype_ready_cb, - self); + self->priv->content_type, + GTK_WINDOW (self), + search_for_mimetype_ready_cb, + self); } /* An application is valid if: @@ -137,8 +144,8 @@ online_button_clicked_cb (GtkButton *b, * 2) The user has permissions to run the file */ static gboolean -check_application (GtkAppChooserDialog *self, - GAppInfo **app_out) +check_application (GtkAppChooserDialog *self, + GAppInfo **app_out) { const char *command; char *path = NULL; @@ -158,8 +165,8 @@ check_application (GtkAppChooserDialog *self, if (error) { show_error_dialog (_("Could not run application"), - error->message, - GTK_WINDOW (self)); + error->message, + GTK_WINDOW (self)); g_error_free (error); retval = FALSE; goto cleanup; @@ -171,11 +178,11 @@ check_application (GtkAppChooserDialog *self, char *error_message; error_message = g_strdup_printf (_("Could not find '%s'"), - argv[0]); + argv[0]); show_error_dialog (_("Could not find application"), - error_message, - GTK_WINDOW (self)); + error_message, + GTK_WINDOW (self)); g_free (error_message); retval = FALSE; goto cleanup; @@ -199,16 +206,16 @@ add_or_find_application (GtkAppChooserDialog *self) /* we don't care about reporting errors here */ g_app_info_add_supports_type (app, - self->priv->content_type, - NULL); + self->priv->content_type, + NULL); g_object_unref (app); } static void gtk_app_chooser_dialog_response (GtkDialog *dialog, - gint response_id, - gpointer user_data) + gint response_id, + gpointer user_data) { GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (dialog); @@ -224,8 +231,8 @@ gtk_app_chooser_dialog_response (GtkDialog *dialog, static void widget_application_selected_cb (GtkAppChooserWidget *widget, - GAppInfo *app_info, - gpointer user_data) + GAppInfo *app_info, + gpointer user_data) { GtkAppChooserDialog *self = user_data; @@ -234,8 +241,8 @@ widget_application_selected_cb (GtkAppChooserWidget *widget, static void widget_application_activated_cb (GtkAppChooserWidget *widget, - GAppInfo *app_info, - gpointer user_data) + GAppInfo *app_info, + gpointer user_data) { GtkAppChooserDialog *self = user_data; @@ -258,7 +265,12 @@ get_extension (const char *basename) static void set_dialog_properties (GtkAppChooserDialog *self) { - char *label, *name, *extension, *description, *default_text, *string; + gchar *label; + gchar *name; + gchar *extension; + gchar *description; + gchar *default_text; + gchar *string; PangoFontDescription *font_desc; name = NULL; @@ -280,17 +292,17 @@ set_dialog_properties (GtkAppChooserDialog *self) /* Translators: %s is a filename */ label = g_strdup_printf (_("Select an application to open \"%s\""), name); string = g_strdup_printf (_("No applications available to open \"%s\""), - name); + name); } else { /* Translators: %s is a file type description */ label = g_strdup_printf (_("Select an application for \"%s\" files"), - g_content_type_is_unknown (self->priv->content_type) ? - self->priv->content_type : description); + g_content_type_is_unknown (self->priv->content_type) ? + self->priv->content_type : description); string = g_strdup_printf (_("No applications available to open \"%s\" files"), - g_content_type_is_unknown (self->priv->content_type) ? - self->priv->content_type : description); + g_content_type_is_unknown (self->priv->content_type) ? + self->priv->content_type : description); } font_desc = pango_font_description_new (); @@ -301,12 +313,12 @@ set_dialog_properties (GtkAppChooserDialog *self) gtk_label_set_markup (GTK_LABEL (self->priv->label), label); default_text = g_strdup_printf ("<big><b>%s</b></big>\n%s", - string, - _("Click \"Show other applications\", for more options, or " - "\"Find applications online\" to install a new application")); + string, + _("Click \"Show other applications\", for more options, or " + "\"Find applications online\" to install a new application")); gtk_app_chooser_widget_set_default_text (GTK_APP_CHOOSER_WIDGET (self->priv->app_chooser_widget), - default_text); + default_text); g_free (label); g_free (name); @@ -318,24 +330,24 @@ set_dialog_properties (GtkAppChooserDialog *self) static void show_more_button_clicked_cb (GtkButton *button, - gpointer user_data) + gpointer user_data) { GtkAppChooserDialog *self = user_data; g_object_set (self->priv->app_chooser_widget, - "show-recommended", TRUE, - "show-fallback", TRUE, - "show-other", TRUE, - NULL); + "show-recommended", TRUE, + "show-fallback", TRUE, + "show-other", TRUE, + NULL); gtk_widget_hide (self->priv->show_more_button); self->priv->show_more_clicked = TRUE; } static void -widget_notify_for_button_cb (GObject *source, - GParamSpec *pspec, - gpointer user_data) +widget_notify_for_button_cb (GObject *source, + GParamSpec *pspec, + gpointer user_data) { GtkAppChooserDialog *self = user_data; GtkAppChooserWidget *widget = GTK_APP_CHOOSER_WIDGET (source); @@ -350,7 +362,7 @@ widget_notify_for_button_cb (GObject *source, static void forget_menu_item_activate_cb (GtkMenuItem *item, - gpointer user_data) + gpointer user_data) { GtkAppChooserDialog *self = user_data; GAppInfo *info; @@ -359,8 +371,7 @@ forget_menu_item_activate_cb (GtkMenuItem *item, if (info != NULL) { - g_app_info_remove_supports_type (info, self->priv->content_type, - NULL); + g_app_info_remove_supports_type (info, self->priv->content_type, NULL); gtk_app_chooser_refresh (GTK_APP_CHOOSER (self)); @@ -377,16 +388,16 @@ build_forget_menu_item (GtkAppChooserDialog *self) gtk_widget_show (retval); g_signal_connect (retval, "activate", - G_CALLBACK (forget_menu_item_activate_cb), self); + G_CALLBACK (forget_menu_item_activate_cb), self); return retval; } static void widget_populate_popup_cb (GtkAppChooserWidget *widget, - GtkMenu *menu, - GAppInfo *info, - gpointer user_data) + GtkMenu *menu, + GAppInfo *info, + gpointer user_data) { GtkAppChooserDialog *self = user_data; GtkWidget *menu_item; @@ -412,7 +423,7 @@ build_dialog_ui (GtkAppChooserDialog *self) gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); - + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0); gtk_widget_show (vbox2); @@ -421,7 +432,7 @@ build_dialog_ui (GtkAppChooserDialog *self) gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0, 0.5); gtk_label_set_line_wrap (GTK_LABEL (self->priv->label), TRUE); gtk_box_pack_start (GTK_BOX (vbox2), self->priv->label, - FALSE, FALSE, 0); + FALSE, FALSE, 0); gtk_widget_show (self->priv->label); self->priv->app_chooser_widget = @@ -430,28 +441,28 @@ build_dialog_ui (GtkAppChooserDialog *self) gtk_widget_show (self->priv->app_chooser_widget); g_signal_connect (self->priv->app_chooser_widget, "application-selected", - G_CALLBACK (widget_application_selected_cb), self); + G_CALLBACK (widget_application_selected_cb), self); g_signal_connect (self->priv->app_chooser_widget, "application-activated", - G_CALLBACK (widget_application_activated_cb), self); + G_CALLBACK (widget_application_activated_cb), self); g_signal_connect (self->priv->app_chooser_widget, "notify::show-all", - G_CALLBACK (widget_notify_for_button_cb), self); + G_CALLBACK (widget_notify_for_button_cb), self); g_signal_connect (self->priv->app_chooser_widget, "populate-popup", - G_CALLBACK (widget_populate_popup_cb), self); + G_CALLBACK (widget_populate_popup_cb), self); button = gtk_button_new_with_label (_("Show other applications")); self->priv->show_more_button = button; w = gtk_image_new_from_stock (GTK_STOCK_ADD, - GTK_ICON_SIZE_BUTTON); + GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), w); gtk_box_pack_start (GTK_BOX (self->priv->app_chooser_widget), button, FALSE, FALSE, 6); gtk_widget_show_all (button); g_signal_connect (button, "clicked", - G_CALLBACK (show_more_button_clicked_cb), self); + G_CALLBACK (show_more_button_clicked_cb), self); gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL); /* Create a custom stock icon */ self->priv->button = gtk_button_new (); @@ -463,31 +474,31 @@ build_dialog_ui (GtkAppChooserDialog *self) self->priv->open_label = label; gtk_container_add (GTK_CONTAINER (self->priv->button), - self->priv->open_label); + self->priv->open_label); gtk_widget_show (self->priv->button); gtk_widget_set_can_default (self->priv->button, TRUE); gtk_dialog_add_action_widget (GTK_DIALOG (self), - self->priv->button, GTK_RESPONSE_OK); + self->priv->button, GTK_RESPONSE_OK); action_area = gtk_dialog_get_action_area (GTK_DIALOG (self)); self->priv->online_button = gtk_button_new_with_label (_("Find applications online")); gtk_box_pack_start (GTK_BOX (action_area), self->priv->online_button, - FALSE, FALSE, 0); + FALSE, FALSE, 0); gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), self->priv->online_button, - TRUE); + TRUE); gtk_widget_show (self->priv->online_button); g_signal_connect (self->priv->online_button, "clicked", - G_CALLBACK (online_button_clicked_cb), self); + G_CALLBACK (online_button_clicked_cb), self); gtk_dialog_set_default_response (GTK_DIALOG (self), - GTK_RESPONSE_OK); + GTK_RESPONSE_OK); } static void set_gfile_and_content_type (GtkAppChooserDialog *self, - GFile *file) + GFile *file) { GFileInfo *info; @@ -497,8 +508,8 @@ set_gfile_and_content_type (GtkAppChooserDialog *self, self->priv->gfile = g_object_ref (file); info = g_file_query_info (self->priv->gfile, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - 0, NULL, NULL); + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + 0, NULL, NULL); self->priv->content_type = g_strdup (g_file_info_get_content_type (info)); g_object_unref (info); @@ -530,7 +541,7 @@ gtk_app_chooser_dialog_constructed (GObject *object) GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object); g_assert (self->priv->content_type != NULL || - self->priv->gfile != NULL); + self->priv->gfile != NULL); if (G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->constructed != NULL) G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->constructed (object); @@ -553,10 +564,10 @@ gtk_app_chooser_dialog_finalize (GObject *object) } static void -gtk_app_chooser_dialog_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gtk_app_chooser_dialog_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object); @@ -568,7 +579,7 @@ gtk_app_chooser_dialog_set_property (GObject *object, case PROP_CONTENT_TYPE: /* don't try to override a value previously set with the GFile */ if (self->priv->content_type == NULL) - self->priv->content_type = g_value_dup_string (value); + self->priv->content_type = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -577,10 +588,10 @@ gtk_app_chooser_dialog_set_property (GObject *object, } static void -gtk_app_chooser_dialog_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +gtk_app_chooser_dialog_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object); @@ -588,7 +599,7 @@ gtk_app_chooser_dialog_get_property (GObject *object, { case PROP_GFILE: if (self->priv->gfile != NULL) - g_value_set_object (value, self->priv->gfile); + g_value_set_object (value, self->priv->gfile); break; case PROP_CONTENT_TYPE: g_value_set_string (value, self->priv->content_type); @@ -621,11 +632,11 @@ gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass) g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); pspec = g_param_spec_object ("gfile", - P_("GFile"), - P_("The GFile used by the open with dialog"), - G_TYPE_FILE, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); + P_("GFile"), + P_("The GFile used by the open with dialog"), + G_TYPE_FILE, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_GFILE, pspec); g_type_class_add_private (klass, sizeof (GtkAppChooserDialogPrivate)); @@ -635,24 +646,23 @@ static void gtk_app_chooser_dialog_init (GtkAppChooserDialog *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_DIALOG, - GtkAppChooserDialogPrivate); + GtkAppChooserDialogPrivate); /* we can't override the class signal handler here, as it's a RUN_LAST; * we want our signal handler instead to be executed before any user code. */ g_signal_connect (self, "response", - G_CALLBACK (gtk_app_chooser_dialog_response), NULL); + G_CALLBACK (gtk_app_chooser_dialog_response), NULL); } static void -set_parent_and_flags (GtkWidget *dialog, - GtkWindow *parent, - GtkDialogFlags flags) +set_parent_and_flags (GtkWidget *dialog, + GtkWindow *parent, + GtkDialogFlags flags) { if (parent != NULL) - gtk_window_set_transient_for (GTK_WINDOW (dialog), - parent); - + gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); + if (flags & GTK_DIALOG_MODAL) gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); @@ -666,25 +676,25 @@ set_parent_and_flags (GtkWidget *dialog, * @flags: flags for this dialog * @file: a #GFile * - * Creates a new #GtkAppChooserDialog for the provided #GFile, to allow - * the user to select an application for it. + * Creates a new #GtkAppChooserDialog for the provided #GFile, + * to allow the user to select an application for it. * * Returns: a newly created #GtkAppChooserDialog * * Since: 3.0 **/ GtkWidget * -gtk_app_chooser_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GFile *file) +gtk_app_chooser_dialog_new (GtkWindow *parent, + GtkDialogFlags flags, + GFile *file) { GtkWidget *retval; g_return_val_if_fail (G_IS_FILE (file), NULL); retval = g_object_new (GTK_TYPE_APP_CHOOSER_DIALOG, - "gfile", file, - NULL); + "gfile", file, + NULL); set_parent_and_flags (retval, parent, flags); @@ -697,31 +707,41 @@ gtk_app_chooser_dialog_new (GtkWindow *parent, * @flags: flags for this dialog * @content_type: a content type string * - * Creates a new #GtkAppChooserDialog for the provided content type, to allow - * the user to select an application for it. + * Creates a new #GtkAppChooserDialog for the provided content type, + * to allow the user to select an application for it. * * Returns: a newly created #GtkAppChooserDialog * * Since: 3.0 **/ GtkWidget * -gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, - GtkDialogFlags flags, - const gchar *content_type) +gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, + GtkDialogFlags flags, + const gchar *content_type) { GtkWidget *retval; g_return_val_if_fail (content_type != NULL, NULL); retval = g_object_new (GTK_TYPE_APP_CHOOSER_DIALOG, - "content-type", content_type, - NULL); + "content-type", content_type, + NULL); set_parent_and_flags (retval, parent, flags); return retval; } +/** + * gtk_app_chooser_dialog_get_widget: + * @self: a #GtkAppChooserDialog + * + * Returns the #GtkAppChooserWidget of this dialog. + * + * Returns: the #GtkAppChooserWidget of @self + * + * Since: 3.0 + */ GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self) { diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h index b29b0d9955..bcb3dd97d4 100644 --- a/gtk/gtkappchooserdialog.h +++ b/gtk/gtkappchooserdialog.h @@ -34,18 +34,12 @@ #include <gtk/gtkdialog.h> #include <gio/gio.h> -#define GTK_TYPE_APP_CHOOSER_DIALOG\ - (gtk_app_chooser_dialog_get_type ()) -#define GTK_APP_CHOOSER_DIALOG(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialog)) -#define GTK_APP_CHOOSER_DIALOG_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass)) -#define GTK_IS_APP_CHOOSER_DIALOG(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_DIALOG)) -#define GTK_IS_APP_CHOOSER_DIALOG_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_DIALOG)) -#define GTK_APP_CHOOSER_DIALOG_GET_CLASS(obj)\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass)) +#define GTK_TYPE_APP_CHOOSER_DIALOG (gtk_app_chooser_dialog_get_type ()) +#define GTK_APP_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialog)) +#define GTK_APP_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass)) +#define GTK_IS_APP_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_DIALOG)) +#define GTK_IS_APP_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_DIALOG)) +#define GTK_APP_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass)) typedef struct _GtkAppChooserDialog GtkAppChooserDialog; typedef struct _GtkAppChooserDialogClass GtkAppChooserDialogClass; @@ -65,15 +59,15 @@ struct _GtkAppChooserDialogClass { gpointer padding[16]; }; -GType gtk_app_chooser_dialog_get_type (void) G_GNUC_CONST; +GType gtk_app_chooser_dialog_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_app_chooser_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GFile *file); -GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, - GtkDialogFlags flags, - const gchar *content_type); +GtkWidget * gtk_app_chooser_dialog_new (GtkWindow *parent, + GtkDialogFlags flags, + GFile *file); +GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, + GtkDialogFlags flags, + const gchar *content_type); -GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self); +GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self); #endif /* __GTK_APP_CHOOSER_DIALOG_H__ */ diff --git a/gtk/gtkappchoosermodule.c b/gtk/gtkappchoosermodule.c index 096e393972..bc5c0e74af 100644 --- a/gtk/gtkappchoosermodule.c +++ b/gtk/gtkappchoosermodule.c @@ -21,7 +21,7 @@ * Authors: Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchoosermodule.h" @@ -45,7 +45,7 @@ _gtk_app_chooser_module_ensure (void) G_LOCK (registered_ep); if (!registered_ep) - { +{ registered_ep = TRUE; ep = g_io_extension_point_register ("gtkappchooser-online"); diff --git a/gtk/gtkappchooseronline.c b/gtk/gtkappchooseronline.c index 68e50208f3..34849d81da 100644 --- a/gtk/gtkappchooseronline.c +++ b/gtk/gtkappchooseronline.c @@ -21,7 +21,7 @@ * Authors: Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchooseronline.h" @@ -55,13 +55,11 @@ gtk_app_chooser_online_get_default (void) { /* pick the first */ extension = extensions->data; - retval = g_object_new (g_io_extension_get_type (extension), - NULL); + retval = g_object_new (g_io_extension_get_type (extension), NULL); } else { - retval = g_object_new (GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, - NULL); + retval = g_object_new (GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, NULL); } return retval; @@ -69,10 +67,10 @@ gtk_app_chooser_online_get_default (void) void gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data) + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data) { GtkAppChooserOnlineInterface *iface; @@ -84,9 +82,9 @@ gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, } gboolean -gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, - GAsyncResult *res, - GError **error) +gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, + GAsyncResult *res, + GError **error) { GtkAppChooserOnlineInterface *iface; diff --git a/gtk/gtkappchooseronline.h b/gtk/gtkappchooseronline.h index f514fdff2b..87ebc0893d 100644 --- a/gtk/gtkappchooseronline.h +++ b/gtk/gtkappchooseronline.h @@ -31,14 +31,10 @@ G_BEGIN_DECLS -#define GTK_TYPE_APP_CHOOSER_ONLINE\ - (gtk_app_chooser_online_get_type ()) -#define GTK_APP_CHOOSER_ONLINE(o)\ - (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnline)) -#define GTK_IS_APP_CHOOSER_ONLINE(o)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_APP_CHOOSER_ONLINE)) -#define GTK_APP_CHOOSER_ONLINE_GET_IFACE(obj)\ - (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnlineInterface)) +#define GTK_TYPE_APP_CHOOSER_ONLINE (gtk_app_chooser_online_get_type ()) +#define GTK_APP_CHOOSER_ONLINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnline)) +#define GTK_IS_APP_CHOOSER_ONLINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_APP_CHOOSER_ONLINE)) +#define GTK_APP_CHOOSER_ONLINE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnlineInterface)) typedef struct _GtkAppChooserOnline GtkAppChooserOnline; typedef struct _GtkAppChooserOnlineInterface GtkAppChooserOnlineInterface; @@ -47,27 +43,27 @@ struct _GtkAppChooserOnlineInterface { GTypeInterface g_iface; /* Methods */ - void (*search_for_mimetype_async) (GtkAppChooserOnline *self, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data); + void (*search_for_mimetype_async) (GtkAppChooserOnline *self, + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data); - gboolean (*search_for_mimetype_finish) (GtkAppChooserOnline *self, - GAsyncResult *res, - GError **error); + gboolean (*search_for_mimetype_finish) (GtkAppChooserOnline *self, + GAsyncResult *res, + GError **error); }; -GType gtk_app_chooser_online_get_type (void) G_GNUC_CONST; -void gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, - GAsyncResult *res, - GError **error); +GType gtk_app_chooser_online_get_type (void) G_GNUC_CONST; +void gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self, + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self, + GAsyncResult *res, + GError **error); -GtkAppChooserOnline * gtk_app_chooser_online_get_default (void); +GtkAppChooserOnline * gtk_app_chooser_online_get_default (void); #endif /* __GTK_APP_CHOOSER_ONLINE_H__ */ diff --git a/gtk/gtkappchooseronlinedummy.h b/gtk/gtkappchooseronlinedummy.h index 794fe4f4cd..12537093ba 100644 --- a/gtk/gtkappchooseronlinedummy.h +++ b/gtk/gtkappchooseronlinedummy.h @@ -27,18 +27,12 @@ #include <gtk/gtkappchooseronline.h> #include <glib.h> -#define GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY\ - (_gtk_app_chooser_online_dummy_get_type ()) -#define GTK_APP_CHOOSER_ONLINE_DUMMY(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummy)) -#define GTK_APP_CHOOSER_ONLINE_DUMMY_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummyClass)) -#define GTK_IS_APP_CHOOSER_ONLINE_DUMMY(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY)) -#define GTK_IS_APP_CHOOSER_ONLINE_DUMMY_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY)) -#define GTK_APP_CHOOSER_ONLINE_DUMMY_GET_CLASS(obj)\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummyClass)) +#define GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY (_gtk_app_chooser_online_dummy_get_type ()) +#define GTK_APP_CHOOSER_ONLINE_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummy)) +#define GTK_APP_CHOOSER_ONLINE_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummyClass)) +#define GTK_IS_APP_CHOOSER_ONLINE_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY)) +#define GTK_IS_APP_CHOOSER_ONLINE_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY)) +#define GTK_APP_CHOOSER_ONLINE_DUMMY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_DUMMY, GtkAppChooserOnlineDummyClass)) typedef struct _GtkAppChooserOnlineDummy GtkAppChooserOnlineDummy; typedef struct _GtkAppChooserOnlineDummyClass GtkAppChooserOnlineDummyClass; diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c index f14d4d3249..d307fb89be 100644 --- a/gtk/gtkappchooseronlinepk.c +++ b/gtk/gtkappchooseronlinepk.c @@ -21,12 +21,14 @@ * Authors: Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchooseronlinepk.h" #include "gtkappchooseronline.h" +#ifdef GDK_WINDOWING_X11 #include "x11/gdkx.h" +#endif #include <gio/gio.h> @@ -34,12 +36,12 @@ static void app_chooser_online_iface_init (GtkAppChooserOnlineInterface *iface); G_DEFINE_TYPE_WITH_CODE (GtkAppChooserOnlinePk, gtk_app_chooser_online_pk, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER_ONLINE, - app_chooser_online_iface_init) - g_io_extension_point_implement ("gtkappchooser-online", - g_define_type_id, - "packagekit", 10)); + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER_ONLINE, + app_chooser_online_iface_init) + g_io_extension_point_implement ("gtkappchooser-online", + g_define_type_id, + "packagekit", 10)); struct _GtkAppChooserOnlinePkPrivate { GSimpleAsyncResult *result; @@ -72,13 +74,13 @@ static void gtk_app_chooser_online_pk_init (GtkAppChooserOnlinePk *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_ONLINE_PK, - GtkAppChooserOnlinePkPrivate); + GtkAppChooserOnlinePkPrivate); } static gboolean pk_search_mime_finish (GtkAppChooserOnline *obj, - GAsyncResult *res, - GError **error) + GAsyncResult *res, + GError **error) { GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); @@ -86,9 +88,9 @@ pk_search_mime_finish (GtkAppChooserOnline *obj, } static void -install_mime_types_ready_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) +install_mime_types_ready_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) { GtkAppChooserOnlinePk *self = user_data; GDBusProxy *proxy = G_DBUS_PROXY (source); @@ -97,24 +99,25 @@ install_mime_types_ready_cb (GObject *source, variant = g_dbus_proxy_call_finish (proxy, res, &error); - if (variant == NULL) { - /* don't show errors if the user cancelled the installation explicitely - * or if PK wasn't able to find any apps - */ - if (g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.Cancelled") != 0 && - g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.NoPackagesFound") != 0) - g_simple_async_result_set_from_error (self->priv->result, error); + if (variant == NULL) + { + /* don't show errors if the user cancelled the installation explicitely + * or if PK wasn't able to find any apps + */ + if (g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.Cancelled") != 0 && + g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.NoPackagesFound") != 0) + g_simple_async_result_set_from_error (self->priv->result, error); - g_error_free (error); - } + g_error_free (error); + } g_simple_async_result_complete (self->priv->result); } static void -pk_proxy_appeared_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) +pk_proxy_appeared_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) { GtkAppChooserOnlinePk *self = user_data; GDBusProxy *proxy; @@ -125,58 +128,63 @@ pk_proxy_appeared_cb (GObject *source, proxy = g_dbus_proxy_new_for_bus_finish (res, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (self->priv->result, error); - g_error_free (error); + if (error != NULL) + { + g_simple_async_result_set_from_error (self->priv->result, error); + g_error_free (error); - g_simple_async_result_complete (self->priv->result); + g_simple_async_result_complete (self->priv->result); - return; - } + return; + } +#ifdef GDK_WINDOWING_X11 window = gtk_widget_get_window (GTK_WIDGET (self->priv->parent)); xid = GDK_WINDOW_XID (window); +#else + xid = 0; +#endif mime_types[0] = self->priv->content_type; mime_types[1] = NULL; g_dbus_proxy_call (proxy, - "InstallMimeTypes", - g_variant_new ("(u^ass)", - xid, - mime_types, - "hide-confirm-search"), - G_DBUS_CALL_FLAGS_NONE, - G_MAXINT, /* no timeout */ - NULL, - install_mime_types_ready_cb, - self); + "InstallMimeTypes", + g_variant_new ("(u^ass)", + xid, + mime_types, + "hide-confirm-search"), + G_DBUS_CALL_FLAGS_NONE, + G_MAXINT, /* no timeout */ + NULL, + install_mime_types_ready_cb, + self); } static void pk_search_mime_async (GtkAppChooserOnline *obj, - const gchar *content_type, - GtkWindow *parent, - GAsyncReadyCallback callback, - gpointer user_data) + const gchar *content_type, + GtkWindow *parent, + GAsyncReadyCallback callback, + gpointer user_data) { GtkAppChooserOnlinePk *self = GTK_APP_CHOOSER_ONLINE_PK (obj); self->priv->result = g_simple_async_result_new (G_OBJECT (self), - callback, user_data, - gtk_app_chooser_online_search_for_mimetype_async); + callback, user_data, + gtk_app_chooser_online_search_for_mimetype_async); self->priv->parent = parent; self->priv->content_type = g_strdup (content_type); g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - "org.freedesktop.PackageKit", - "/org/freedesktop/PackageKit", - "org.freedesktop.PackageKit.Modify", - NULL, - pk_proxy_appeared_cb, - self); + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.PackageKit", + "/org/freedesktop/PackageKit", + "org.freedesktop.PackageKit.Modify", + NULL, + pk_proxy_appeared_cb, + self); } static void diff --git a/gtk/gtkappchooseronlinepk.h b/gtk/gtkappchooseronlinepk.h index be5ec6ed6d..7d4264234f 100644 --- a/gtk/gtkappchooseronlinepk.h +++ b/gtk/gtkappchooseronlinepk.h @@ -27,18 +27,12 @@ #include <gtk/gtkappchooseronline.h> #include <glib.h> -#define GTK_TYPE_APP_CHOOSER_ONLINE_PK\ - (_gtk_app_chooser_online_pk_get_type ()) -#define GTK_APP_CHOOSER_ONLINE_PK(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePk)) -#define GTK_APP_CHOOSER_ONLINE_PK_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass)) -#define GTK_IS_APP_CHOOSER_ONLINE_PK(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK)) -#define GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK)) -#define GTK_APP_CHOOSER_ONLINE_PK_GET_CLASS(obj)\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass)) +#define GTK_TYPE_APP_CHOOSER_ONLINE_PK (_gtk_app_chooser_online_pk_get_type ()) +#define GTK_APP_CHOOSER_ONLINE_PK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePk)) +#define GTK_APP_CHOOSER_ONLINE_PK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass)) +#define GTK_IS_APP_CHOOSER_ONLINE_PK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK)) +#define GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK)) +#define GTK_APP_CHOOSER_ONLINE_PK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass)) typedef struct _GtkAppChooserOnlinePk GtkAppChooserOnlinePk; typedef struct _GtkAppChooserOnlinePkClass GtkAppChooserOnlinePkClass; diff --git a/gtk/gtkappchooserprivate.h b/gtk/gtkappchooserprivate.h index f3404aab2f..67e0a7c1dd 100644 --- a/gtk/gtkappchooserprivate.h +++ b/gtk/gtkappchooserprivate.h @@ -27,13 +27,13 @@ #include <glib.h> #include <gio/gio.h> +#include "gtkappchooser.h" #include "gtkappchooserwidget.h" typedef struct _GtkAppChooserIface GtkAppChooserIface; typedef GtkAppChooserIface GtkAppChooserInterface; -#define GTK_APP_CHOOSER_GET_IFACE(inst)\ - (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_APP_CHOOSER, GtkAppChooserIface)) +#define GTK_APP_CHOOSER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_APP_CHOOSER, GtkAppChooserIface)) struct _GtkAppChooserIface { GTypeInterface base_iface; diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index e80727358d..d8c15f77e1 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -24,18 +24,25 @@ * Cosimo Cecchi <ccecchi@redhat.com> */ -#include <config.h> +#include "config.h" #include "gtkappchooserwidget.h" #include "gtkintl.h" #include "gtkmarshalers.h" -#include "gtkappchooser.h" +#include "gtkappchooserwidget.h" #include "gtkappchooserprivate.h" +#include "gtkliststore.h" +#include "gtkcellrenderertext.h" +#include "gtkcellrendererpixbuf.h" +#include "gtktreeview.h" +#include "gtktreeselection.h" +#include "gtktreemodelsort.h" +#include "gtkorientable.h" +#include "gtkscrolledwindow.h" #include <string.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <gio/gio.h> struct _GtkAppChooserWidgetPrivate { @@ -94,12 +101,12 @@ static guint signals[N_SIGNALS] = { 0, }; static void gtk_app_chooser_widget_iface_init (GtkAppChooserIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkAppChooserWidget, gtk_app_chooser_widget, GTK_TYPE_BOX, - G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, - gtk_app_chooser_widget_iface_init)); + G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER, + gtk_app_chooser_widget_iface_init)); static void refresh_and_emit_app_selected (GtkAppChooserWidget *self, - GtkTreeSelection *selection) + GtkTreeSelection *selection) { GtkTreeModel *model; GtkTreeIter iter; @@ -107,11 +114,7 @@ refresh_and_emit_app_selected (GtkAppChooserWidget *self, gboolean should_emit = FALSE; if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gtk_tree_model_get (model, &iter, - COLUMN_APP_INFO, &info, - -1); - } + gtk_tree_model_get (model, &iter, COLUMN_APP_INFO, &info, -1); if (info == NULL) return; @@ -119,12 +122,12 @@ refresh_and_emit_app_selected (GtkAppChooserWidget *self, if (self->priv->selected_app_info) { if (!g_app_info_equal (self->priv->selected_app_info, info)) - { - should_emit = TRUE; - g_object_unref (self->priv->selected_app_info); + { + should_emit = TRUE; + g_object_unref (self->priv->selected_app_info); - self->priv->selected_app_info = info; - } + self->priv->selected_app_info = info; + } } else { @@ -134,12 +137,12 @@ refresh_and_emit_app_selected (GtkAppChooserWidget *self, if (should_emit) g_signal_emit (self, signals[SIGNAL_APPLICATION_SELECTED], 0, - self->priv->selected_app_info); + self->priv->selected_app_info); } static GAppInfo * get_app_info_for_event (GtkAppChooserWidget *self, - GdkEventButton *event) + GdkEventButton *event) { GtkTreePath *path = NULL; GtkTreeIter iter; @@ -148,9 +151,9 @@ get_app_info_for_event (GtkAppChooserWidget *self, gboolean recommended; if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (self->priv->program_list), - event->x, event->y, - &path, - NULL, NULL, NULL)) + event->x, event->y, + &path, + NULL, NULL, NULL)) return NULL; model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->program_list)); @@ -163,9 +166,9 @@ get_app_info_for_event (GtkAppChooserWidget *self, /* we only allow interaction with recommended applications */ gtk_tree_model_get (model, &iter, - COLUMN_APP_INFO, &info, - COLUMN_RECOMMENDED, &recommended, - -1); + COLUMN_APP_INFO, &info, + COLUMN_RECOMMENDED, &recommended, + -1); if (!recommended) g_clear_object (&info); @@ -174,9 +177,9 @@ get_app_info_for_event (GtkAppChooserWidget *self, } static gboolean -widget_button_press_event_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) +widget_button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { GtkAppChooserWidget *self = user_data; @@ -190,12 +193,12 @@ widget_button_press_event_cb (GtkWidget *widget, info = get_app_info_for_event (self, event); if (info == NULL) - return FALSE; + return FALSE; menu = gtk_menu_new (); g_signal_emit (self, signals[SIGNAL_POPULATE_POPUP], 0, - menu, info); + menu, info); g_object_unref (info); @@ -204,12 +207,12 @@ widget_button_press_event_cb (GtkWidget *widget, n_children = g_list_length (children); if (n_children > 0) - { - /* actually popup the menu */ - gtk_menu_attach_to_widget (GTK_MENU (menu), self->priv->program_list, NULL); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, - event->button, event->time); - } + { + /* actually popup the menu */ + gtk_menu_attach_to_widget (GTK_MENU (menu), self->priv->program_list, NULL); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, + event->button, event->time); + } g_list_free (children); } @@ -219,7 +222,7 @@ widget_button_press_event_cb (GtkWidget *widget, static gboolean path_is_heading (GtkTreeView *view, - GtkTreePath *path) + GtkTreePath *path) { GtkTreeIter iter; GtkTreeModel *model; @@ -228,17 +231,17 @@ path_is_heading (GtkTreeView *view, model = gtk_tree_view_get_model (view); gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, - COLUMN_HEADING, &res, - -1); + COLUMN_HEADING, &res, + -1); return res; } static void -program_list_selection_activated (GtkTreeView *view, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) +program_list_selection_activated (GtkTreeView *view, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data) { GtkAppChooserWidget *self = user_data; GtkTreeSelection *selection; @@ -251,20 +254,20 @@ program_list_selection_activated (GtkTreeView *view, refresh_and_emit_app_selected (self, selection); g_signal_emit (self, signals[SIGNAL_APPLICATION_ACTIVATED], 0, - self->priv->selected_app_info); + self->priv->selected_app_info); } static gboolean gtk_app_chooser_search_equal_func (GtkTreeModel *model, - int column, - const char *key, - GtkTreeIter *iter, - gpointer user_data) + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer user_data) { - char *normalized_key; - char *name, *normalized_name; - char *path, *normalized_path; - char *basename, *normalized_basename; + gchar *normalized_key; + gchar *name, *normalized_name; + gchar *path, *normalized_path; + gchar *basename, *normalized_basename; gboolean ret; if (key != NULL) @@ -275,42 +278,40 @@ gtk_app_chooser_search_equal_func (GtkTreeModel *model, ret = TRUE; gtk_tree_model_get (model, iter, - COLUMN_NAME, &name, - COLUMN_EXEC, &path, - -1); + COLUMN_NAME, &name, + COLUMN_EXEC, &path, + -1); if (name != NULL) - { - normalized_name = g_utf8_casefold (name, -1); - g_assert (normalized_name != NULL); + { + normalized_name = g_utf8_casefold (name, -1); + g_assert (normalized_name != NULL); - if (strncmp (normalized_name, normalized_key, strlen (normalized_key)) == 0) { - ret = FALSE; - } + if (strncmp (normalized_name, normalized_key, strlen (normalized_key)) == 0) + ret = FALSE; - g_free (normalized_name); - } + g_free (normalized_name); + } if (ret && path != NULL) - { - normalized_path = g_utf8_casefold (path, -1); - g_assert (normalized_path != NULL); + { + normalized_path = g_utf8_casefold (path, -1); + g_assert (normalized_path != NULL); - basename = g_path_get_basename (path); - g_assert (basename != NULL); + basename = g_path_get_basename (path); + g_assert (basename != NULL); - normalized_basename = g_utf8_casefold (basename, -1); - g_assert (normalized_basename != NULL); + normalized_basename = g_utf8_casefold (basename, -1); + g_assert (normalized_basename != NULL); - if (strncmp (normalized_path, normalized_key, strlen (normalized_key)) == 0 || - strncmp (normalized_basename, normalized_key, strlen (normalized_key)) == 0) { - ret = FALSE; - } + if (strncmp (normalized_path, normalized_key, strlen (normalized_key)) == 0 || + strncmp (normalized_basename, normalized_key, strlen (normalized_key)) == 0) + ret = FALSE; - g_free (basename); - g_free (normalized_basename); - g_free (normalized_path); - } + g_free (basename); + g_free (normalized_basename); + g_free (normalized_path); + } g_free (name); g_free (path); @@ -326,9 +327,9 @@ gtk_app_chooser_search_equal_func (GtkTreeModel *model, static gint gtk_app_chooser_sort_func (GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer user_data) + GtkTreeIter *a, + GtkTreeIter *b, + gpointer user_data) { gboolean a_recommended, b_recommended; gboolean a_fallback, b_fallback; @@ -344,20 +345,20 @@ gtk_app_chooser_sort_func (GtkTreeModel *model, */ gtk_tree_model_get (model, a, - COLUMN_NAME, &a_name, - COLUMN_RECOMMENDED, &a_recommended, - COLUMN_FALLBACK, &a_fallback, - COLUMN_HEADING, &a_heading, - COLUMN_DEFAULT, &a_default, - -1); + COLUMN_NAME, &a_name, + COLUMN_RECOMMENDED, &a_recommended, + COLUMN_FALLBACK, &a_fallback, + COLUMN_HEADING, &a_heading, + COLUMN_DEFAULT, &a_default, + -1); gtk_tree_model_get (model, b, - COLUMN_NAME, &b_name, - COLUMN_RECOMMENDED, &b_recommended, - COLUMN_FALLBACK, &b_fallback, - COLUMN_HEADING, &b_heading, - COLUMN_DEFAULT, &b_default, - -1); + COLUMN_NAME, &b_name, + COLUMN_RECOMMENDED, &b_recommended, + COLUMN_FALLBACK, &b_fallback, + COLUMN_HEADING, &b_heading, + COLUMN_DEFAULT, &b_default, + -1); /* the default one always wins */ if (a_default && !b_default) @@ -415,9 +416,9 @@ gtk_app_chooser_sort_func (GtkTreeModel *model, if (!a_recommended) { a_casefold = a_name != NULL ? - g_utf8_casefold (a_name, -1) : NULL; + g_utf8_casefold (a_name, -1) : NULL; b_casefold = b_name != NULL ? - g_utf8_casefold (b_name, -1) : NULL; + g_utf8_casefold (b_name, -1) : NULL; retval = g_strcmp0 (a_casefold, b_casefold); @@ -434,63 +435,63 @@ gtk_app_chooser_sort_func (GtkTreeModel *model, static void padding_cell_renderer_func (GtkTreeViewColumn *column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) { gboolean heading; gtk_tree_model_get (model, iter, - COLUMN_HEADING, &heading, - -1); + COLUMN_HEADING, &heading, + -1); if (heading) g_object_set (cell, - "visible", FALSE, - "xpad", 0, - "ypad", 0, - NULL); + "visible", FALSE, + "xpad", 0, + "ypad", 0, + NULL); else g_object_set (cell, - "visible", TRUE, - "xpad", 3, - "ypad", 3, - NULL); + "visible", TRUE, + "xpad", 3, + "ypad", 3, + NULL); } static gboolean gtk_app_chooser_selection_func (GtkTreeSelection *selection, - GtkTreeModel *model, - GtkTreePath *path, - gboolean path_currently_selected, - gpointer user_data) + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer user_data) { GtkTreeIter iter; gboolean heading; gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, - COLUMN_HEADING, &heading, - -1); + COLUMN_HEADING, &heading, + -1); return !heading; } static gint compare_apps_func (gconstpointer a, - gconstpointer b) + gconstpointer b) { return !g_app_info_equal (G_APP_INFO (a), G_APP_INFO (b)); } static gboolean gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self, - const gchar *heading_title, - gboolean show_headings, - gboolean recommended, - gboolean fallback, - GList *applications, - GList *exclude_apps) + const gchar *heading_title, + gboolean show_headings, + gboolean recommended, + gboolean fallback, + GList *applications, + GList *exclude_apps) { gboolean heading_added, unref_icon; GtkTreeIter iter; @@ -509,58 +510,57 @@ gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self, app = l->data; if (!g_app_info_supports_uris (app) && - !g_app_info_supports_files (app)) - continue; + !g_app_info_supports_files (app)) + continue; - if (exclude_apps != NULL && - g_list_find_custom (exclude_apps, app, - (GCompareFunc) compare_apps_func)) - continue; + if (g_list_find_custom (exclude_apps, app, + (GCompareFunc) compare_apps_func)) + continue; if (!heading_added && show_headings) - { - gtk_list_store_append (self->priv->program_list_store, &iter); - gtk_list_store_set (self->priv->program_list_store, &iter, - COLUMN_HEADING_TEXT, bold_string, - COLUMN_HEADING, TRUE, - COLUMN_RECOMMENDED, recommended, - COLUMN_FALLBACK, fallback, - -1); - - heading_added = TRUE; - } + { + gtk_list_store_append (self->priv->program_list_store, &iter); + gtk_list_store_set (self->priv->program_list_store, &iter, + COLUMN_HEADING_TEXT, bold_string, + COLUMN_HEADING, TRUE, + COLUMN_RECOMMENDED, recommended, + COLUMN_FALLBACK, fallback, + -1); + + heading_added = TRUE; + } app_string = g_markup_printf_escaped ("<b>%s</b>\n%s", - g_app_info_get_display_name (app) != NULL ? - g_app_info_get_display_name (app) : "", - g_app_info_get_description (app) != NULL ? - g_app_info_get_description (app) : ""); + g_app_info_get_display_name (app) != NULL ? + g_app_info_get_display_name (app) : "", + g_app_info_get_description (app) != NULL ? + g_app_info_get_description (app) : ""); icon = g_app_info_get_icon (app); unref_icon = FALSE; if (icon == NULL) - { - icon = g_themed_icon_new ("application-x-executable"); - unref_icon = TRUE; - } + { + icon = g_themed_icon_new ("application-x-executable"); + unref_icon = TRUE; + } gtk_list_store_append (self->priv->program_list_store, &iter); gtk_list_store_set (self->priv->program_list_store, &iter, - COLUMN_APP_INFO, app, - COLUMN_GICON, icon, - COLUMN_NAME, g_app_info_get_display_name (app), - COLUMN_DESC, app_string, - COLUMN_EXEC, g_app_info_get_executable (app), - COLUMN_HEADING, FALSE, - COLUMN_RECOMMENDED, recommended, - COLUMN_FALLBACK, fallback, - -1); + COLUMN_APP_INFO, app, + COLUMN_GICON, icon, + COLUMN_NAME, g_app_info_get_display_name (app), + COLUMN_DESC, app_string, + COLUMN_EXEC, g_app_info_get_executable (app), + COLUMN_HEADING, FALSE, + COLUMN_RECOMMENDED, recommended, + COLUMN_FALLBACK, fallback, + -1); retval = TRUE; g_free (app_string); if (unref_icon) - g_object_unref (icon); + g_object_unref (icon); } g_free (bold_string); @@ -571,7 +571,7 @@ gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self, static void gtk_app_chooser_add_default (GtkAppChooserWidget *self, - GAppInfo *app) + GAppInfo *app) { GtkTreeIter iter; GIcon *icon; @@ -583,18 +583,18 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self, gtk_list_store_append (self->priv->program_list_store, &iter); gtk_list_store_set (self->priv->program_list_store, &iter, - COLUMN_HEADING_TEXT, string, - COLUMN_HEADING, TRUE, - COLUMN_DEFAULT, TRUE, - -1); + COLUMN_HEADING_TEXT, string, + COLUMN_HEADING, TRUE, + COLUMN_DEFAULT, TRUE, + -1); g_free (string); string = g_markup_printf_escaped ("<b>%s</b>\n%s", - g_app_info_get_display_name (app) != NULL ? - g_app_info_get_display_name (app) : "", - g_app_info_get_description (app) != NULL ? - g_app_info_get_description (app) : ""); + g_app_info_get_display_name (app) != NULL ? + g_app_info_get_display_name (app) : "", + g_app_info_get_description (app) != NULL ? + g_app_info_get_description (app) : ""); icon = g_app_info_get_icon (app); if (icon == NULL) @@ -605,14 +605,14 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self, gtk_list_store_append (self->priv->program_list_store, &iter); gtk_list_store_set (self->priv->program_list_store, &iter, - COLUMN_APP_INFO, app, - COLUMN_GICON, icon, - COLUMN_NAME, g_app_info_get_display_name (app), - COLUMN_DESC, string, - COLUMN_EXEC, g_app_info_get_executable (app), - COLUMN_HEADING, FALSE, - COLUMN_DEFAULT, TRUE, - -1); + COLUMN_APP_INFO, app, + COLUMN_GICON, icon, + COLUMN_NAME, g_app_info_get_display_name (app), + COLUMN_DESC, string, + COLUMN_EXEC, g_app_info_get_executable (app), + COLUMN_HEADING, FALSE, + COLUMN_DEFAULT, TRUE, + -1); g_free (string); @@ -631,7 +631,7 @@ add_no_applications_label (GtkAppChooserWidget *self) { desc = g_content_type_get_description (self->priv->content_type); string = text = g_strdup_printf (_("No applications available to open \"%s\""), - desc); + desc); g_free (desc); } else @@ -641,11 +641,11 @@ add_no_applications_label (GtkAppChooserWidget *self) gtk_list_store_append (self->priv->program_list_store, &iter); gtk_list_store_set (self->priv->program_list_store, &iter, - COLUMN_HEADING_TEXT, string, - COLUMN_HEADING, TRUE, - -1); + COLUMN_HEADING_TEXT, string, + COLUMN_HEADING, TRUE, + -1); - g_free (text); + g_free (text); } static void @@ -661,14 +661,14 @@ gtk_app_chooser_widget_select_first (GtkAppChooserWidget *self) while (info == NULL) { gtk_tree_model_get (model, &iter, - COLUMN_APP_INFO, &info, - -1); + COLUMN_APP_INFO, &info, + -1); if (info != NULL) - break; + break; if (!gtk_tree_model_iter_next (model, &iter)) - break; + break; } if (info != NULL) @@ -685,7 +685,9 @@ gtk_app_chooser_widget_select_first (GtkAppChooserWidget *self) static void gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self) { - GList *all_applications = NULL, *recommended_apps = NULL, *fallback_apps = NULL; + GList *all_applications = NULL; + GList *recommended_apps = NULL; + GList *fallback_apps = NULL; GList *exclude_apps = NULL; GAppInfo *default_app = NULL; gboolean show_headings; @@ -702,11 +704,11 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self) default_app = g_app_info_get_default_for_type (self->priv->content_type, FALSE); if (default_app != NULL) - { - gtk_app_chooser_add_default (self, default_app); - apps_added = TRUE; - exclude_apps = g_list_prepend (exclude_apps, default_app); - } + { + gtk_app_chooser_add_default (self, default_app); + apps_added = TRUE; + exclude_apps = g_list_prepend (exclude_apps, default_app); + } } if (self->priv->show_recommended || self->priv->show_all) @@ -714,13 +716,13 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self) recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type); apps_added |= gtk_app_chooser_widget_add_section (self, _("Recommended Applications"), - show_headings, - !self->priv->show_all, /* mark as recommended */ - FALSE, /* mark as fallback */ - recommended_apps, exclude_apps); + show_headings, + !self->priv->show_all, /* mark as recommended */ + FALSE, /* mark as fallback */ + recommended_apps, exclude_apps); exclude_apps = g_list_concat (exclude_apps, - g_list_copy (recommended_apps)); + g_list_copy (recommended_apps)); } if (self->priv->show_fallback || self->priv->show_all) @@ -728,12 +730,12 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self) fallback_apps = g_app_info_get_fallback_for_type (self->priv->content_type); apps_added |= gtk_app_chooser_widget_add_section (self, _("Related Applications"), - show_headings, - FALSE, /* mark as recommended */ - !self->priv->show_all, /* mark as fallback */ - fallback_apps, exclude_apps); + show_headings, + FALSE, /* mark as recommended */ + !self->priv->show_all, /* mark as fallback */ + fallback_apps, exclude_apps); exclude_apps = g_list_concat (exclude_apps, - g_list_copy (fallback_apps)); + g_list_copy (fallback_apps)); } if (self->priv->show_other || self->priv->show_all) @@ -741,10 +743,10 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self) all_applications = g_app_info_get_all (); apps_added |= gtk_app_chooser_widget_add_section (self, _("Other Applications"), - show_headings, - FALSE, - FALSE, - all_applications, exclude_apps); + show_headings, + FALSE, + FALSE, + all_applications, exclude_apps); } if (!apps_added) @@ -777,32 +779,32 @@ gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self) /* create list store */ self->priv->program_list_store = gtk_list_store_new (NUM_COLUMNS, - G_TYPE_APP_INFO, - G_TYPE_ICON, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, - G_TYPE_STRING, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN); + G_TYPE_APP_INFO, + G_TYPE_ICON, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + G_TYPE_STRING, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN); sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (self->priv->program_list_store)); - gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->program_list), - GTK_TREE_MODEL (sort)); + gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->program_list), + GTK_TREE_MODEL (sort)); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort), - COLUMN_NAME, - GTK_SORT_ASCENDING); + COLUMN_NAME, + GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort), - COLUMN_NAME, - gtk_app_chooser_sort_func, - self, NULL); + COLUMN_NAME, + gtk_app_chooser_sort_func, + self, NULL); gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->program_list), - COLUMN_NAME); + COLUMN_NAME); gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (self->priv->program_list), - gtk_app_chooser_search_equal_func, - NULL, NULL); + gtk_app_chooser_search_equal_func, + NULL, NULL); column = gtk_tree_view_column_new (); @@ -810,51 +812,51 @@ gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self) renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); g_object_set (renderer, - "xpad", self->priv->show_all ? 0 : 6, - NULL); + "xpad", self->priv->show_all ? 0 : 6, + NULL); self->priv->padding_renderer = renderer; /* heading text renderer */ renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_attributes (column, renderer, - "markup", COLUMN_HEADING_TEXT, - "visible", COLUMN_HEADING, - NULL); + "markup", COLUMN_HEADING_TEXT, + "visible", COLUMN_HEADING, + NULL); g_object_set (renderer, - "ypad", 6, - "xpad", 0, - "wrap-width", 350, - "wrap-mode", PANGO_WRAP_WORD, - NULL); + "ypad", 6, + "xpad", 0, + "wrap-width", 350, + "wrap-mode", PANGO_WRAP_WORD, + NULL); /* padding renderer for non-heading cells */ renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer, - padding_cell_renderer_func, - NULL, NULL); + padding_cell_renderer_func, + NULL, NULL); /* app icon renderer */ renderer = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_attributes (column, renderer, - "gicon", COLUMN_GICON, - NULL); + "gicon", COLUMN_GICON, + NULL); g_object_set (renderer, - "stock-size", GTK_ICON_SIZE_DIALOG, - NULL); + "stock-size", GTK_ICON_SIZE_DIALOG, + NULL); /* app name renderer */ renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, - "markup", COLUMN_DESC, - NULL); + "markup", COLUMN_DESC, + NULL); g_object_set (renderer, - "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, - NULL); + "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, + NULL); gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME); gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->program_list), column); @@ -864,10 +866,10 @@ gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self) } static void -gtk_app_chooser_widget_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +gtk_app_chooser_widget_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object); @@ -901,10 +903,10 @@ gtk_app_chooser_widget_set_property (GObject *object, } static void -gtk_app_chooser_widget_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +gtk_app_chooser_widget_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object); @@ -990,77 +992,112 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); + /** + * GtkAppChooserWidget:show-default: + * + * The ::show-default property determines whether the app chooser + * should show the default handler for the content type in a + * separate section. If %FALSE, the default handler is listed + * among the recommended applications. + */ pspec = g_param_spec_boolean ("show-default", - P_("Show default app"), - P_("Whether the widget should show the default application"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + P_("Show default app"), + P_("Whether the widget should show the default application"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_DEFAULT, pspec); + /** + * GtkAppChooserWidget:show-recommended: + * + * The ::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. + */ pspec = g_param_spec_boolean ("show-recommended", - P_("Show recommended apps"), - P_("Whether the widget should show recommended applications"), - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + P_("Show recommended apps"), + P_("Whether the widget should show recommended applications"), + TRUE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_RECOMMENDED, pspec); + /** + * GtkAppChooserWidget:show-fallback: + * + * The ::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. + */ pspec = g_param_spec_boolean ("show-fallback", - P_("Show fallback apps"), - P_("Whether the widget should show fallback applications"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + P_("Show fallback apps"), + P_("Whether the widget should show fallback applications"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_FALLBACK, pspec); + /** + * GtkAppChooserWidget:show-other: + * + * The ::show-other property determines whether the app chooser + * should show a section for other applications. + */ pspec = g_param_spec_boolean ("show-other", - P_("Show other apps"), - P_("Whether the widget should show other applications"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + P_("Show other apps"), + P_("Whether the widget should show other applications"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_OTHER, pspec); + /** + * GtkAppChooserWidget:show-all: + * + * If the ::show-all property is %TRUE, the app chooser presents + * all applications in a single list, without subsections for + * default, recommended or related applications. + */ pspec = g_param_spec_boolean ("show-all", - P_("Show all apps"), - P_("Whether the widget should show all applications"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + P_("Show all apps"), + P_("Whether the widget should show all applications"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_SHOW_ALL, pspec); pspec = g_param_spec_string ("default-text", - P_("Widget's default text"), - P_("The default text appearing when there are no applications"), - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + P_("Widget's default text"), + P_("The default text appearing when there are no applications"), + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_DEFAULT_TEXT, pspec); signals[SIGNAL_APPLICATION_SELECTED] = g_signal_new ("application-selected", - GTK_TYPE_APP_CHOOSER_WIDGET, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_selected), - NULL, NULL, - _gtk_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, G_TYPE_APP_INFO); + GTK_TYPE_APP_CHOOSER_WIDGET, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_selected), + NULL, NULL, + _gtk_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, G_TYPE_APP_INFO); signals[SIGNAL_APPLICATION_ACTIVATED] = g_signal_new ("application-activated", - GTK_TYPE_APP_CHOOSER_WIDGET, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_activated), - NULL, NULL, - _gtk_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, G_TYPE_APP_INFO); + GTK_TYPE_APP_CHOOSER_WIDGET, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_activated), + NULL, NULL, + _gtk_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, G_TYPE_APP_INFO); signals[SIGNAL_POPULATE_POPUP] = g_signal_new ("populate-popup", - GTK_TYPE_APP_CHOOSER_WIDGET, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkAppChooserWidgetClass, populate_popup), - NULL, NULL, - _gtk_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, - 2, GTK_TYPE_MENU, G_TYPE_APP_INFO); + GTK_TYPE_APP_CHOOSER_WIDGET, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkAppChooserWidgetClass, populate_popup), + NULL, NULL, + _gtk_marshal_VOID__OBJECT_OBJECT, + G_TYPE_NONE, + 2, GTK_TYPE_MENU, G_TYPE_APP_INFO); g_type_class_add_private (klass, sizeof (GtkAppChooserWidgetPrivate)); } @@ -1072,21 +1109,21 @@ gtk_app_chooser_widget_init (GtkAppChooserWidget *self) GtkTreeSelection *selection; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_WIDGET, - GtkAppChooserWidgetPrivate); + GtkAppChooserWidgetPrivate); gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_size_request (scrolled_window, 400, 300); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_IN); + GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_widget_show (scrolled_window); self->priv->program_list = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->program_list), - FALSE); + FALSE); gtk_container_add (GTK_CONTAINER (scrolled_window), self->priv->program_list); gtk_box_pack_start (GTK_BOX (self), scrolled_window, TRUE, TRUE, 0); gtk_widget_show (self->priv->program_list); @@ -1094,16 +1131,16 @@ gtk_app_chooser_widget_init (GtkAppChooserWidget *self) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->program_list)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); gtk_tree_selection_set_select_function (selection, gtk_app_chooser_selection_func, - self, NULL); + self, NULL); g_signal_connect_swapped (selection, "changed", - G_CALLBACK (refresh_and_emit_app_selected), - self); + G_CALLBACK (refresh_and_emit_app_selected), + self); g_signal_connect (self->priv->program_list, "row-activated", - G_CALLBACK (program_list_selection_activated), - self); + G_CALLBACK (program_list_selection_activated), + self); g_signal_connect (self->priv->program_list, "button-press-event", - G_CALLBACK (widget_button_press_event_cb), - self); + G_CALLBACK (widget_button_press_event_cb), + self); } static GAppInfo * @@ -1128,8 +1165,8 @@ gtk_app_chooser_widget_refresh (GtkAppChooser *object) /* don't add additional xpad if we don't have headings */ g_object_set (self->priv->padding_renderer, - "visible", !self->priv->show_all, - NULL); + "visible", !self->priv->show_all, + NULL); gtk_app_chooser_widget_real_add_items (self); } @@ -1142,17 +1179,38 @@ gtk_app_chooser_widget_iface_init (GtkAppChooserIface *iface) iface->refresh = gtk_app_chooser_widget_refresh; } +/** + * gtk_app_chooser_widget_new: + * @content_type: the content type to show applications for + * + * Creates a new #GtkAppChooserWidget for applications + * that can handle content of the given type. + * + * Returns: a newly created #GtkAppChooserWidget + * + * Since: 3.0 + */ GtkWidget * gtk_app_chooser_widget_new (const gchar *content_type) { return g_object_new (GTK_TYPE_APP_CHOOSER_WIDGET, - "content-type", content_type, - NULL); + "content-type", content_type, + NULL); } +/** + * gtk_app_chooser_widget_set_show_default: + * @self: a #GtkAppChooserWidget + * @setting: the new value for #GtkAppChooserWidget:show-default + * + * Sets whether the app chooser should show the default handler + * for the content type in a separate section. + * + * Since: 3.0 + */ void gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self, - gboolean setting) + gboolean setting) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1166,6 +1224,17 @@ gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self, } } +/** + * gtk_app_chooser_widget_get_show_default: + * @self: a #GtkAppChooserWidget + * + * Returns the current value of the #GtkAppChooserWidget:show-default + * property. + * + * Returns: the value of #GtkAppChooserWidget:show-default + * + * Since: 3.0 + */ gboolean gtk_app_chooser_widget_get_show_default (GtkAppChooserWidget *self) { @@ -1174,9 +1243,19 @@ gtk_app_chooser_widget_get_show_default (GtkAppChooserWidget *self) return self->priv->show_default; } +/** + * gtk_app_chooser_widget_set_show_recommended: + * @self: a #GtkAppChooserWidget + * @setting: the new value for #GtkAppChooserWidget:show-recommended + * + * Sets whether the app chooser should show recommended applications + * for the content type in a separate section. + * + * Since: 3.0 + */ void gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self, - gboolean setting) + gboolean setting) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1190,6 +1269,17 @@ gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self, } } +/** + * gtk_app_chooser_widget_get_show_recommended: + * @self: a #GtkAppChooserWidget + * + * Returns the current value of the #GtkAppChooserWidget:show-recommended + * property. + * + * Returns: the value of #GtkAppChooserWidget:show-recommended + * + * Since: 3.0 + */ gboolean gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self) { @@ -1198,9 +1288,19 @@ gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self) return self->priv->show_recommended; } +/** + * gtk_app_chooser_widget_set_show_fallback: + * @self: a #GtkAppChooserWidget + * @setting: the new value for #GtkAppChooserWidget:show-fallback + * + * Sets whether the app chooser should show related applications + * for the content type in a separate section. + * + * Since: 3.0 + */ void gtk_app_chooser_widget_set_show_fallback (GtkAppChooserWidget *self, - gboolean setting) + gboolean setting) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1214,6 +1314,17 @@ gtk_app_chooser_widget_set_show_fallback (GtkAppChooserWidget *self, } } +/** + * gtk_app_chooser_widget_get_show_fallback: + * @self: a #GtkAppChooserWidget + * + * Returns the current value of the #GtkAppChooserWidget:show-fallback + * property. + * + * Returns: the value of #GtkAppChooserWidget:show-fallback + * + * Since: 3.0 + */ gboolean gtk_app_chooser_widget_get_show_fallback (GtkAppChooserWidget *self) { @@ -1222,9 +1333,19 @@ gtk_app_chooser_widget_get_show_fallback (GtkAppChooserWidget *self) return self->priv->show_fallback; } +/** + * gtk_app_chooser_widget_set_show_other: + * @self: a #GtkAppChooserWidget + * @setting: the new value for #GtkAppChooserWidget:show-other + * + * Sets whether the app chooser should show applications + * which are unrelated to the content type. + * + * Since: 3.0 + */ void gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget *self, - gboolean setting) + gboolean setting) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1238,16 +1359,38 @@ gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget *self, } } -gboolean gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self) +/** + * gtk_app_chooser_widget_get_show_other: + * @self: a #GtkAppChooserWidget + * + * Returns the current value of the #GtkAppChooserWidget:show-other + * property. + * + * Returns: the value of #GtkAppChooserWidget:show-other + * + * Since: 3.0 + */ +gboolean +gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self) { g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE); return self->priv->show_other; } +/** + * gtk_app_chooser_widget_set_show_all: + * @self: a #GtkAppChooserWidget + * @setting: the new value for #GtkAppChooserWidget:show-all + * + * Sets whether the app chooser should show all applications + * in a flat list. + * + * Since: 3.0 + */ void gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self, - gboolean setting) + gboolean setting) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1261,17 +1404,36 @@ gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self, } } +/** + * gtk_app_chooser_widget_get_show_all: + * @self: a #GtkAppChooserWidget + * + * Returns the current value of the #GtkAppChooserWidget:show-all + * property. + * + * Returns: the value of #GtkAppChooserWidget:show-all + * + * Since: 3.0 + */ gboolean gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self) { g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE); - return self->priv->show_all; + return self->priv->show_all; } +/** + * gtk_app_chooser_widget_set_default_text: + * @self: a #GtkAppChooserWidget + * @text: the new value for #GtkAppChooserWidget:default-text + * + * Sets the text that is shown if there are not applications + * that can handle the content type. + */ void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, - const gchar *text) + const gchar *text) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1286,6 +1448,17 @@ gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, } } +/** + * gtk_app_chooser_widget_get_default_text: + * @self: a #GtkAppChooserWidget + * + * Returns the text that is shown if there are not applications + * that can handle the content type. + * + * Returns: the value of #GtkAppChooserWidget:default-text + * + * Since: 3.0 + */ const gchar * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self) { diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h index a52b64e096..22b60f796b 100644 --- a/gtk/gtkappchooserwidget.h +++ b/gtk/gtkappchooserwidget.h @@ -35,18 +35,12 @@ #include <gtk/gtkmenu.h> #include <gio/gio.h> -#define GTK_TYPE_APP_CHOOSER_WIDGET\ - (gtk_app_chooser_widget_get_type ()) -#define GTK_APP_CHOOSER_WIDGET(obj)\ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidget)) -#define GTK_APP_CHOOSER_WIDGET_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass)) -#define GTK_IS_APP_CHOOSER_WIDGET(obj)\ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_WIDGET)) -#define GTK_IS_APP_CHOOSER_WIDGET_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_WIDGET)) -#define GTK_APP_CHOOSER_WIDGET_GET_CLASS(obj)\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass)) +#define GTK_TYPE_APP_CHOOSER_WIDGET (gtk_app_chooser_widget_get_type ()) +#define GTK_APP_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidget)) +#define GTK_APP_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass)) +#define GTK_IS_APP_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_WIDGET)) +#define GTK_IS_APP_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_WIDGET)) +#define GTK_APP_CHOOSER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass)) typedef struct _GtkAppChooserWidget GtkAppChooserWidget; typedef struct _GtkAppChooserWidgetClass GtkAppChooserWidgetClass; @@ -62,53 +56,46 @@ struct _GtkAppChooserWidget { struct _GtkAppChooserWidgetClass { GtkBoxClass parent_class; - void (* application_selected) (GtkAppChooserWidget *self, - GAppInfo *app_info); + void (* application_selected) (GtkAppChooserWidget *self, + GAppInfo *app_info); void (* application_activated) (GtkAppChooserWidget *self, - GAppInfo *app_info); + GAppInfo *app_info); - void (* populate_popup) (GtkAppChooserWidget *self, - GtkMenu *menu, - GAppInfo *app_info); + void (* populate_popup) (GtkAppChooserWidget *self, + GtkMenu *menu, + GAppInfo *app_info); /* padding for future class expansion */ gpointer padding[16]; }; -typedef enum { - GTK_APP_CHOOSER_WIDGET_SHOW_RECOMMENDED = 1 << 0, - GTK_APP_CHOOSER_WIDGET_SHOW_FALLBACK = 1 << 1, - GTK_APP_CHOOSER_WIDGET_SHOW_OTHER = 1 << 2, - GTK_APP_CHOOSER_WIDGET_SHOW_ALL = 1 << 3, -} GtkAppChooserWidgetShowFlags; +GType gtk_app_chooser_widget_get_type (void) G_GNUC_CONST; -GType gtk_app_chooser_widget_get_type (void) G_GNUC_CONST; +GtkWidget * gtk_app_chooser_widget_new (const gchar *content_type); -GtkWidget * gtk_app_chooser_widget_new (const gchar *content_type); +void gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self, + gboolean setting); +gboolean gtk_app_chooser_widget_get_show_default (GtkAppChooserWidget *self); -void gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self, - gboolean setting); -gboolean gtk_app_chooser_widget_get_show_default (GtkAppChooserWidget *self); +void gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self, + gboolean setting); +gboolean gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self); -void gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self, - gboolean setting); -gboolean gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self); +void gtk_app_chooser_widget_set_show_fallback (GtkAppChooserWidget *self, + gboolean setting); +gboolean gtk_app_chooser_widget_get_show_fallback (GtkAppChooserWidget *self); -void gtk_app_chooser_widget_set_show_fallback (GtkAppChooserWidget *self, - gboolean setting); -gboolean gtk_app_chooser_widget_get_show_fallback (GtkAppChooserWidget *self); +void gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget *self, + gboolean setting); +gboolean gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self); -void gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget *self, - gboolean setting); -gboolean gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self); +void gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self, + gboolean show_all); +gboolean gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self); -void gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self, - gboolean show_all); -gboolean gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self); - -void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, - const gchar *text); -const gchar * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self); +void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, + const gchar *text); +const gchar * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self); #endif /* __GTK_APP_CHOOSER_WIDGET_H__ */ diff --git a/tests/testappchooser.c b/tests/testappchooser.c index 9d32909d13..43b7f35e9b 100644 --- a/tests/testappchooser.c +++ b/tests/testappchooser.c @@ -81,8 +81,7 @@ prepare_dialog (void) if (use_file) { - dialog = gtk_app_chooser_dialog_new (GTK_WINDOW (toplevel), - 0, file); + dialog = gtk_app_chooser_dialog_new (GTK_WINDOW (toplevel), 0, file); } else { diff --git a/tests/testappchoosercombo.c b/tests/testappchoosercombo.c index 5739f1c246..59a44fa496 100644 --- a/tests/testappchoosercombo.c +++ b/tests/testappchoosercombo.c @@ -18,7 +18,6 @@ * Boston, MA 02111-1307, USA. */ -#include <config.h> #include <stdlib.h> #include <gtk/gtk.h> @@ -28,7 +27,7 @@ static GtkWidget *sel_image, *sel_name; static void combo_changed_cb (GtkComboBox *cb, - gpointer user_data) + gpointer user_data) { GAppInfo *app_info; @@ -38,7 +37,7 @@ combo_changed_cb (GtkComboBox *cb, return; gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_app_info_get_icon (app_info), - GTK_ICON_SIZE_DIALOG); + GTK_ICON_SIZE_DIALOG); gtk_label_set_text (GTK_LABEL (sel_name), g_app_info_get_display_name (app_info)); g_object_unref (app_info); @@ -46,11 +45,11 @@ combo_changed_cb (GtkComboBox *cb, static void special_item_activated_cb (GtkAppChooserComboBox *cb, - gpointer user_data) + gpointer user_data) { gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_themed_icon_new ("face-smile"), - GTK_ICON_SIZE_DIALOG); - gtk_label_set_text (GTK_LABEL (sel_name), "Special Item"); + GTK_ICON_SIZE_DIALOG); + gtk_label_set_text (GTK_LABEL (sel_name), "Special Item"); } int @@ -72,7 +71,7 @@ main (int argc, gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE, 0); g_signal_connect (combobox, "changed", - G_CALLBACK (combo_changed_cb), NULL); + G_CALLBACK (combo_changed_cb), NULL); w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (w), "<b>Selected app info</b>"); @@ -88,10 +87,10 @@ main (int argc, gtk_app_chooser_combo_box_append_separator (GTK_APP_CHOOSER_COMBO_BOX (combobox)); gtk_app_chooser_combo_box_append_custom_item (GTK_APP_CHOOSER_COMBO_BOX (combobox), - "Hey, I'm special!", - g_themed_icon_new ("face-smile"), - special_item_activated_cb, - NULL); + "Hey, I'm special!", + g_themed_icon_new ("face-smile"), + special_item_activated_cb, + NULL); /* test refresh on a combo */ gtk_app_chooser_refresh (GTK_APP_CHOOSER (combobox)); @@ -99,7 +98,7 @@ main (int argc, gtk_widget_show_all (toplevel); g_signal_connect (toplevel, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + G_CALLBACK (gtk_main_quit), NULL); gtk_main (); |