* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Dave Camp <dave@novell.com>
* Alexander Larsson <alexl@redhat.com>
* Cosimo Cecchi <ccecchi@redhat.com>
*/
+/**
+ * SECTION:gtkappchooserdialog
+ * @Title: GtkAppChooserDialog
+ * @Short_description: An application chooser dialog
+ *
+ * #GtkAppChooserDialog shows a #GtkAppChooserWidget inside a #GtkDialog.
+ *
+ * Note that #GtkAppChooserDialog does not have any interesting methods
+ * of its own. Instead, you should get the embedded #GtkAppChooserWidget
+ * using gtk_app_chooser_dialog_get_widget() and call its methods if
+ * the generic #GtkAppChooser interface is not sufficient for your needs.
+ *
+ * To set the heading that is shown above the #GtkAppChooserWidget,
+ * use gtk_app_chooser_dialog_set_heading().
+ */
#include "config.h"
#include "gtkappchooserdialog.h"
struct _GtkAppChooserDialogPrivate {
char *content_type;
GFile *gfile;
+ char *heading;
GtkWidget *label;
GtkWidget *button;
GtkWidget *show_more_button;
GtkAppChooserOnline *online;
+ GCancellable *online_cancellable;
gboolean show_more_clicked;
+ gboolean dismissed;
};
enum {
PROP_GFILE = 1,
PROP_CONTENT_TYPE,
- N_PROPERTIES
+ PROP_HEADING
};
static void gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface);
GtkAppChooserDialog *self = user_data;
GError *error = NULL;
- gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
+ gdk_threads_enter ();
+
+ _gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
- if (error != NULL)
+ if (self->priv->dismissed)
+ goto out;
+
+ if (error != NULL &&
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
show_error_dialog (_("Failed to look for applications online"),
error->message, GTK_WINDOW (self));
- g_error_free (error);
}
else
{
+ gtk_widget_set_sensitive (self->priv->online_button, TRUE);
gtk_app_chooser_refresh (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
}
+
+ out:
+ g_clear_object (&self->priv->online_cancellable);
+ g_clear_error (&error);
+ g_object_unref (self);
+
+ gdk_threads_leave ();
}
static void
{
GtkAppChooserDialog *self = user_data;
- gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
- self->priv->content_type,
- GTK_WINDOW (self),
- search_for_mimetype_ready_cb,
- self);
+ self->priv->online_cancellable = g_cancellable_new ();
+ gtk_widget_set_sensitive (self->priv->online_button, FALSE);
+
+ _gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
+ self->priv->content_type,
+ GTK_WINDOW (self),
+ self->priv->online_cancellable,
+ search_for_mimetype_ready_cb,
+ g_object_ref (self));
}
static void
{
GtkAppChooserDialog *self = user_data;
- self->priv->online = gtk_app_chooser_online_get_default_finish (source, res);
+ gdk_threads_enter ();
+
+ self->priv->online = _gtk_app_chooser_online_get_default_finish (source, res);
- if (self->priv->online != NULL)
+ if (self->priv->online != NULL &&
+ !self->priv->dismissed)
{
GtkWidget *action_area;
action_area = gtk_dialog_get_action_area (GTK_DIALOG (self));
- self->priv->online_button = gtk_button_new_with_label (_("Find applications online"));
+ self->priv->online_button = gtk_button_new_with_mnemonic (_("_Find applications online"));
gtk_box_pack_start (GTK_BOX (action_area), self->priv->online_button,
FALSE, FALSE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), self->priv->online_button,
g_signal_connect (self->priv->online_button, "clicked",
G_CALLBACK (online_button_clicked_cb), self);
+
+ if (!self->priv->content_type)
+ gtk_widget_set_sensitive (self->priv->online_button, FALSE);
+
gtk_widget_show (self->priv->online_button);
}
+
+ g_object_unref (self);
+
+ gdk_threads_leave ();
}
static void
ensure_online_button (GtkAppChooserDialog *self)
{
- gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self);
-}
-
-/* An application is valid if:
- *
- * 1) The file exists
- * 2) The user has permissions to run the file
- */
-static gboolean
-check_application (GtkAppChooserDialog *self,
- GAppInfo **app_out)
-{
- const char *command;
- char *path = NULL;
- char **argv = NULL;
- int argc;
- GError *error = NULL;
- gint retval = TRUE;
- GAppInfo *info;
-
- command = NULL;
-
- info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
- command = g_app_info_get_executable (info);
-
- g_shell_parse_argv (command, &argc, &argv, &error);
-
- if (error)
- {
- show_error_dialog (_("Could not run application"),
- error->message,
- GTK_WINDOW (self));
- g_error_free (error);
- retval = FALSE;
- goto cleanup;
- }
-
- path = g_find_program_in_path (argv[0]);
- if (!path)
- {
- char *error_message;
-
- error_message = g_strdup_printf (_("Could not find '%s'"),
- argv[0]);
-
- show_error_dialog (_("Could not find application"),
- error_message,
- GTK_WINDOW (self));
- g_free (error_message);
- retval = FALSE;
- goto cleanup;
- }
-
- *app_out = info;
-
- cleanup:
- g_strfreev (argv);
- g_free (path);
-
- return retval;
+ _gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb,
+ g_object_ref (self));
}
static void
app = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self));
- /* we don't care about reporting errors here */
- g_app_info_add_supports_type (app,
- self->priv->content_type,
- NULL);
+ if (app)
+ {
+ /* we don't care about reporting errors here */
+ if (self->priv->content_type)
+ g_app_info_set_as_last_used_for_type (app,
+ self->priv->content_type,
+ NULL);
+ g_object_unref (app);
+ }
+}
- g_object_unref (app);
+static void
+cancel_and_clear_cancellable (GtkAppChooserDialog *self)
+{
+ if (self->priv->online_cancellable != NULL)
+ {
+ g_cancellable_cancel (self->priv->online_cancellable);
+ g_clear_object (&self->priv->online_cancellable);
+ }
}
static void
case GTK_RESPONSE_OK:
add_or_find_application (self);
break;
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_DELETE_EVENT:
+ cancel_and_clear_cancellable (self);
+ self->priv->dismissed = TRUE;
default :
break;
}
gchar *description;
gchar *default_text;
gchar *string;
+ gboolean unknown;
PangoFontDescription *font_desc;
name = NULL;
extension = NULL;
label = NULL;
description = NULL;
+ unknown = TRUE;
if (self->priv->gfile != NULL)
{
extension = get_extension (name);
}
- description = g_content_type_get_description (self->priv->content_type);
+ if (self->priv->content_type)
+ {
+ description = g_content_type_get_description (self->priv->content_type);
+ unknown = g_content_type_is_unknown (self->priv->content_type);
+ }
+
gtk_window_set_title (GTK_WINDOW (self), "");
if (name != NULL)
{
/* 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);
+ unknown ? 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);
+ unknown ? self->priv->content_type : description);
}
font_desc = pango_font_description_new ();
pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
- gtk_widget_modify_font (self->priv->label, font_desc);
+ gtk_widget_override_font (self->priv->label, font_desc);
pango_font_description_free (font_desc);
- gtk_label_set_markup (GTK_LABEL (self->priv->label), label);
+ if (self->priv->heading != NULL)
+ gtk_label_set_markup (GTK_LABEL (self->priv->label), self->priv->heading);
+ else
+ gtk_label_set_markup (GTK_LABEL (self->priv->label), label);
default_text = g_strdup_printf ("<big><b>%s</b></big>\n%s",
string,
GtkAppChooserWidget *widget = GTK_APP_CHOOSER_WIDGET (source);
gboolean should_hide;
- should_hide = gtk_app_chooser_widget_get_show_all (widget) ||
+ should_hide = gtk_app_chooser_widget_get_show_other (widget) ||
self->priv->show_more_clicked;
if (should_hide)
{
GtkWidget *vbox;
GtkWidget *vbox2;
- GtkWidget *label;
GtkWidget *button, *w;
+ GAppInfo *info;
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
gtk_widget_show (vbox2);
self->priv->label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0, 0.5);
+ gtk_widget_set_halign (self->priv->label, GTK_ALIGN_START);
+ gtk_widget_set_valign (self->priv->label, GTK_ALIGN_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (self->priv->label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox2), self->priv->label,
FALSE, FALSE, 0);
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_signal_connect (self->priv->app_chooser_widget, "notify::show-all",
+ g_signal_connect (self->priv->app_chooser_widget, "notify::show-other",
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);
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
- /* Create a custom stock icon */
- self->priv->button = gtk_button_new ();
-
- label = gtk_label_new_with_mnemonic (_("_Open"));
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (self->priv->button));
- gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
- gtk_widget_show (label);
- self->priv->open_label = label;
-
- gtk_container_add (GTK_CONTAINER (self->priv->button),
- self->priv->open_label);
+ self->priv->button = gtk_dialog_add_button (GTK_DIALOG (self),
+ _("_Select"),
+ GTK_RESPONSE_OK);
- 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);
+ info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+ gtk_widget_set_sensitive (self->priv->button, info != NULL);
+ if (info)
+ g_object_unref (info);
gtk_dialog_set_default_response (GTK_DIALOG (self),
GTK_RESPONSE_OK);
gtk_app_chooser_dialog_get_app_info (GtkAppChooser *object)
{
GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
- GAppInfo *app = NULL;
-
- if (!check_application (self, &app))
- return NULL;
-
- return app;
+ return gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
}
static void
{
GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
- g_assert (self->priv->content_type != 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);
GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
g_clear_object (&self->priv->gfile);
+ cancel_and_clear_cancellable (self);
g_clear_object (&self->priv->online);
G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->dispose (object);
if (self->priv->content_type == NULL)
self->priv->content_type = g_value_dup_string (value);
break;
+ case PROP_HEADING:
+ gtk_app_chooser_dialog_set_heading (self, g_value_get_string (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
case PROP_CONTENT_TYPE:
g_value_set_string (value, self->priv->content_type);
break;
+ case PROP_HEADING:
+ g_value_set_string (value, self->priv->heading);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
G_PARAM_STATIC_STRINGS);
g_object_class_install_property (gobject_class, PROP_GFILE, pspec);
+ /**
+ * GtkAppChooserDialog:heading:
+ *
+ * The text to show at the top of the dialog.
+ * The string may contain Pango markup.
+ */
+ pspec = g_param_spec_string ("heading",
+ P_("Heading"),
+ P_("The text to show at the top of the dialog"),
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (gobject_class, PROP_HEADING, pspec);
+
+
g_type_class_add_private (klass, sizeof (GtkAppChooserDialogPrivate));
}
*
* Returns the #GtkAppChooserWidget of this dialog.
*
- * Returns: the #GtkAppChooserWidget of @self
+ * Returns: (transfer none): the #GtkAppChooserWidget of @self
*
* Since: 3.0
*/
return self->priv->app_chooser_widget;
}
+
+/**
+ * gtk_app_chooser_dialog_set_heading:
+ * @self: a #GtkAppChooserDialog
+ * @heading: a string containing Pango markup
+ *
+ * Sets the text to display at the top of the dialog.
+ * If the heading is not set, the dialog displays a default text.
+ */
+void
+gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self,
+ const gchar *heading)
+{
+ g_return_if_fail (GTK_IS_APP_CHOOSER_DIALOG (self));
+
+ g_free (self->priv->heading);
+ self->priv->heading = g_strdup (heading);
+
+ if (self->priv->label && self->priv->heading)
+ gtk_label_set_markup (GTK_LABEL (self->priv->label), self->priv->heading);
+
+ g_object_notify (G_OBJECT (self), "heading");
+}
+
+/**
+ * gtk_app_chooser_dialog_get_heading:
+ * @self: a #GtkAppChooserDialog
+ *
+ * Returns the text to display at the top of the dialog.
+ *
+ * Returns: the text to display at the top of the dialog, or %NULL, in which
+ * case a default text is displayed
+ */
+const gchar *
+gtk_app_chooser_dialog_get_heading (GtkAppChooserDialog *self)
+{
+ g_return_val_if_fail (GTK_IS_APP_CHOOSER_DIALOG (self), NULL);
+
+ return self->priv->heading;
+}
projects / ~andy / gtk / blobdiff