* <row>
* <entry>up-folder</entry>
* <entry>
- * <keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo>
+ * <keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo>;
+ * <keycombo><keycap>Alt</keycap><keycap>Shift</keycap><keycap>Up</keycap></keycombo>
* <footnote>
* Both the individual Up key and the numeric
* keypad's Up key are supported.
- * </footnote>
- * ;
+ * </footnote>;
* <keycap>Backspace</keycap>
* </entry>
* </row>
* <row>
* <entry>down-folder</entry>
- * <entry><keycombo><keycap>Alt</keycap><keycap>Down</keycap></keycombo></entry>
+ * <entry>
+ * <keycombo><keycap>Alt</keycap><keycap>Down</keycap></keycombo>;
+ * <keycombo><keycap>Alt</keycap><keycap>Shift</keycap><keycap>Down</keycap></keycombo>
+ * <footnote>
+ * Both the individual Down key and the numeric
+ * keypad's Down key are supported.
+ * </footnote>
+ * </entry>
* </row>
* <row>
* <entry>home-folder</entry>
*/
-static void gtk_file_chooser_class_init (gpointer g_iface);
-
-GType
-gtk_file_chooser_get_type (void)
-{
- static GType file_chooser_type = 0;
-
- if (!file_chooser_type)
- {
- file_chooser_type = g_type_register_static_simple (G_TYPE_INTERFACE,
- I_("GtkFileChooser"),
- sizeof (GtkFileChooserIface),
- (GClassInitFunc) gtk_file_chooser_class_init,
- 0, NULL, 0);
-
- g_type_interface_add_prerequisite (file_chooser_type, GTK_TYPE_WIDGET);
- }
-
- return file_chooser_type;
-}
+typedef GtkFileChooserIface GtkFileChooserInterface;
+G_DEFINE_INTERFACE (GtkFileChooser, gtk_file_chooser, GTK_TYPE_WIDGET);
static gboolean
confirm_overwrite_accumulator (GSignalInvocationHint *ihint,
}
static void
-gtk_file_chooser_class_init (gpointer g_iface)
+gtk_file_chooser_default_init (GtkFileChooserInterface *iface)
{
- GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
+ GType iface_type = G_TYPE_FROM_INTERFACE (iface);
/**
* GtkFileChooser::current-folder-changed
_gtk_marshal_ENUM__VOID,
GTK_TYPE_FILE_CHOOSER_CONFIRMATION, 0);
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_enum ("action",
P_("Action"),
P_("The type of operation that the file selector is performing"),
GTK_TYPE_FILE_CHOOSER_ACTION,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_object ("filter",
P_("Filter"),
P_("The current filter for selecting which files are displayed"),
GTK_TYPE_FILE_FILTER,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("local-only",
P_("Local Only"),
P_("Whether the selected file(s) should be limited to local file: URLs"),
TRUE,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_object ("preview-widget",
P_("Preview widget"),
P_("Application supplied widget for custom previews."),
GTK_TYPE_WIDGET,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("preview-widget-active",
P_("Preview Widget Active"),
P_("Whether the application supplied widget for custom previews should be shown."),
TRUE,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("use-preview-label",
P_("Use Preview Label"),
P_("Whether to display a stock label with the name of the previewed file."),
TRUE,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_object ("extra-widget",
P_("Extra widget"),
P_("Application supplied widget for extra options."),
GTK_TYPE_WIDGET,
GTK_PARAM_READWRITE));
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("select-multiple",
P_("Select Multiple"),
P_("Whether to allow multiple files to be selected"),
FALSE,
GTK_PARAM_READWRITE));
-
- g_object_interface_install_property (g_iface,
+
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("show-hidden",
P_("Show Hidden"),
P_("Whether the hidden files and folders should be displayed"),
*
* Since: 2.8
*/
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("do-overwrite-confirmation",
P_("Do overwrite confirmation"),
P_("Whether a file chooser in save mode "
*
* Since: 2.18
*/
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("create-folders",
- P_("Allow folders creation"),
+ P_("Allow folder creation"),
P_("Whether a file chooser not in open mode "
"will offer the user to create new folders."),
TRUE,
/**
* gtk_file_chooser_get_local_only:
- * @chooser: a #GtkFileChoosre
+ * @chooser: a #GtkFileChooser
*
* Gets whether only local files can be selected in the
* file selector. See gtk_file_chooser_set_local_only()
* If the file chooser is in folder mode, this function returns the selected
* folder.
*
- * Return value: The currently selected filename, or %NULL
+ * Return value: (type filename): The currently selected filename, or %NULL
* if no file is selected, or the selected file can't
* be represented with a local filename. Free with g_free().
*
/**
* gtk_file_chooser_set_filename:
* @chooser: a #GtkFileChooser
- * @filename: the filename to set as current
+ * @filename: (type filename): the filename to set as current
*
* Sets @filename as the current filename for the file chooser, by changing
* to the file's parent folder and actually selecting the file in list. If
/**
* gtk_file_chooser_select_filename:
* @chooser: a #GtkFileChooser
- * @filename: the filename to select
+ * @filename: (type filename): the filename to select
*
* Selects a filename. If the file name isn't in the current
* folder of @chooser, then the current folder of @chooser will
/**
* gtk_file_chooser_unselect_filename:
* @chooser: a #GtkFileChooser
- * @filename: the filename to unselect
+ * @filename: (type filename): the filename to unselect
*
* Unselects a currently selected filename. If the filename
* is not in the current directory, does not exist, or
* folder cannot be represented as local filenames they will be ignored. (See
* gtk_file_chooser_get_uris())
*
- * Return value: (element-type utf8) (transfer full): a #GSList containing the filenames of all selected
- * files and subfolders in the current folder. Free the returned list
- * with g_slist_free(), and the filenames with g_free().
+ * Return value: (element-type filename) (transfer full): a #GSList
+ * containing the filenames of all selected files and subfolders in
+ * the current folder. Free the returned list with g_slist_free(),
+ * and the filenames with g_free().
*
* Since: 2.4
**/
/**
* gtk_file_chooser_set_current_folder:
* @chooser: a #GtkFileChooser
- * @filename: the full path of the new current folder
+ * @filename: (type filename): the full path of the new current folder
*
* Sets the current folder for @chooser from a local filename.
* The user will be shown the full contents of the current folder,
* Note that this is the folder that the file chooser is currently displaying
* (e.g. "/home/username/Documents"), which is <emphasis>not the same</emphasis>
* as the currently-selected folder if the chooser is in
- * %GTK_FILE_CHOOSER_SELECT_FOLDER mode
+ * %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode
* (e.g. "/home/username/Documents/selected-folder/". To get the
* currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the
* usual way to get the selection.
*
- * Return value: the full path of the current folder, or %NULL if the current
- * path cannot be represented as a local filename. Free with g_free(). This
- * function will also return %NULL if the file chooser was unable to load the
- * last folder that was requested from it; for example, as would be for calling
+ * Return value: (type filename): the full path of the current folder,
+ * or %NULL if the current path cannot be represented as a local
+ * filename. Free with g_free(). This function will also return
+ * %NULL if the file chooser was unable to load the last folder that
+ * was requested from it; for example, as would be for calling
* gtk_file_chooser_set_current_folder() on a nonexistent folder.
*
* Since: 2.4
/**
* gtk_file_chooser_set_current_name:
* @chooser: a #GtkFileChooser
- * @name: the filename to use, as a UTF-8 string
+ * @name: (type filename): the filename to use, as a UTF-8 string
*
* Sets the current name in the file selector, as if entered
* by the user. Note that the name passed in here is a UTF-8
/**
* gtk_file_chooser_get_current_folder_uri:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the current folder of @chooser as an URI.
* See gtk_file_chooser_set_current_folder_uri().
*
* Note that this is the folder that the file chooser is currently displaying
* (e.g. "file:///home/username/Documents"), which is <emphasis>not the same</emphasis>
* as the currently-selected folder if the chooser is in
- * %GTK_FILE_CHOOSER_SELECT_FOLDER mode
+ * %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode
* (e.g. "file:///home/username/Documents/selected-folder/". To get the
* currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the
* usual way to get the selection.
* @chooser: a #GtkFileChooser
* @file: the #GFile for the new folder
* @error: (allow-none): location to store error, or %NULL.
- *
+ *
* Sets the current folder for @chooser from a #GFile.
* Internal function, see gtk_file_chooser_set_current_folder_uri().
*
/**
* gtk_file_chooser_get_current_folder_file:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the current folder of @chooser as #GFile.
* See gtk_file_chooser_get_current_folder_uri().
- *
- * Return value: the #GFile for the current folder.
+ *
+ * Return value: (transfer full): the #GFile for the current folder.
*
* Since: 2.14
*/
{
g_return_val_if_fail (GTK_IS_FILE_CHOOSER (chooser), NULL);
- return GTK_FILE_CHOOSER_GET_IFACE (chooser)->get_current_folder (chooser);
+ return GTK_FILE_CHOOSER_GET_IFACE (chooser)->get_current_folder (chooser);
}
/**
* Lists all the selected files and subfolders in the current folder of @chooser
* as #GFile. An internal function, see gtk_file_chooser_get_uris().
*
- * Return value: (element-type utf8) (transfer full): a #GSList containing a #GFile for each selected
- * file and subfolder in the current folder. Free the returned list
- * with g_slist_free(), and the files with g_object_unref().
+ * Return value: (element-type GFile) (transfer full): a #GSList
+ * containing a #GFile for each selected file and subfolder in the
+ * current folder. Free the returned list with g_slist_free(), and
+ * the files with g_object_unref().
*
* Since: 2.14
**/
* If the file chooser is in folder mode, this function returns the selected
* folder.
*
- * Returns: a selected #GFile. You own the returned file; use
- * g_object_unref() to release it.
+ * Returns: (transfer full): a selected #GFile. You own the returned file;
+ * use g_object_unref() to release it.
*
* Since: 2.14
**/
/**
* gtk_file_chooser_get_preview_widget:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the current preview widget; see
* gtk_file_chooser_set_preview_widget().
- *
- * Return value: the current preview widget, or %NULL
+ *
+ * Return value: (transfer none): the current preview widget, or %NULL
*
* Since: 2.4
**/
/**
* gtk_file_chooser_get_preview_file:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the #GFile that should be previewed in a custom preview
* Internal function, see gtk_file_chooser_get_preview_uri().
- *
- * Return value: the #GFile for the file to preview, or %NULL if no file
- * is selected. Free with g_object_unref().
+ *
+ * Return value: (transfer full): the #GFile for the file to preview,
+ * or %NULL if no file is selected. Free with g_object_unref().
*
* Since: 2.14
**/
* Gets the filename that should be previewed in a custom preview
* widget. See gtk_file_chooser_set_preview_widget().
*
- * Return value: the filename to preview, or %NULL if no file
- * is selected, or if the selected file cannot be represented
+ * Return value: (type filename): the filename to preview, or %NULL if
+ * no file is selected, or if the selected file cannot be represented
* as a local filename. Free with g_free()
*
* Since: 2.4
/**
* gtk_file_chooser_get_extra_widget:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the current preview widget; see
* gtk_file_chooser_set_extra_widget().
- *
- * Return value: the current extra widget, or %NULL
+ *
+ * Return value: (transfer none): the current extra widget, or %NULL
*
* Since: 2.4
**/
* Lists the current set of user-selectable filters; see
* gtk_file_chooser_add_filter(), gtk_file_chooser_remove_filter().
*
- * Return value: (element-type utf8) (transfer container): a #GSList containing the current set of
- * user selectable filters. The contents of the list are
- * owned by GTK+, but you must free the list itself with
- * g_slist_free() when you are done with it.
+ * Return value: (element-type GtkFileFilter) (transfer container): a
+ * #GSList containing the current set of user selectable filters. The
+ * contents of the list are owned by GTK+, but you must free the list
+ * itself with g_slist_free() when you are done with it.
*
* Since: 2.4
**/
/**
* gtk_file_chooser_get_filter:
* @chooser: a #GtkFileChooser
- *
+ *
* Gets the current filter; see gtk_file_chooser_set_filter().
- *
- * Return value: the current filter, or %NULL
+ *
+ * Return value: (transfer none): the current filter, or %NULL
*
* Since: 2.4
**/
/**
* gtk_file_chooser_add_shortcut_folder:
* @chooser: a #GtkFileChooser
- * @folder: filename of the folder to add
+ * @folder: (type filename): filename of the folder to add
* @error: (allow-none): location to store error, or %NULL
*
* Adds a folder to be displayed with the shortcut folders in a file chooser.
/**
* gtk_file_chooser_remove_shortcut_folder:
* @chooser: a #GtkFileChooser
- * @folder: filename of the folder to remove
+ * @folder: (type filename): filename of the folder to remove
* @error: (allow-none): location to store error, or %NULL
*
* Removes a folder from a file chooser's list of shortcut folders.
* Queries the list of shortcut folders in the file chooser, as set by
* gtk_file_chooser_add_shortcut_folder().
*
- * Return value: (element-type utf8) (transfer full): A list of folder filenames, or %NULL if there are no shortcut
- * folders. Free the returned list with g_slist_free(), and the filenames with
+ * Return value: (element-type filename) (transfer full): A list of
+ * folder filenames, or %NULL if there are no shortcut folders. Free
+ * the returned list with g_slist_free(), and the filenames with
* g_free().
*
* Since: 2.4
* Queries the list of shortcut folders in the file chooser, as set by
* gtk_file_chooser_add_shortcut_folder_uri().
*
- * Return value: (element-type utf8) (transfer full): A list of folder URIs, or %NULL if there are no shortcut
- * folders. Free the returned list with g_slist_free(), and the URIs with
- * g_free().
+ * Return value: (element-type utf8) (transfer full): A list of folder
+ * URIs, or %NULL if there are no shortcut folders. Free the returned
+ * list with g_slist_free(), and the URIs with g_free().
*
* Since: 2.4
**/
return do_overwrite_confirmation;
}
-
-#if defined (G_OS_WIN32) && !defined (_WIN64)
-
-/* DLL ABI stability backward compatibility versions */
-
-#undef gtk_file_chooser_get_filename
-
-gchar *
-gtk_file_chooser_get_filename (GtkFileChooser *chooser)
-{
- gchar *utf8_filename = gtk_file_chooser_get_filename_utf8 (chooser);
- gchar *retval = g_locale_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
-
- g_free (utf8_filename);
-
- return retval;
-}
-
-#undef gtk_file_chooser_set_filename
-
-gboolean
-gtk_file_chooser_set_filename (GtkFileChooser *chooser,
- const gchar *filename)
-{
- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
- gboolean retval = gtk_file_chooser_set_filename_utf8 (chooser, utf8_filename);
-
- g_free (utf8_filename);
-
- return retval;
-}
-
-#undef gtk_file_chooser_select_filename
-
-gboolean
-gtk_file_chooser_select_filename (GtkFileChooser *chooser,
- const gchar *filename)
-{
- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
- gboolean retval = gtk_file_chooser_select_filename_utf8 (chooser, utf8_filename);
-
- g_free (utf8_filename);
-
- return retval;
-}
-
-#undef gtk_file_chooser_unselect_filename
-
-void
-gtk_file_chooser_unselect_filename (GtkFileChooser *chooser,
- const char *filename)
-{
- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
-
- gtk_file_chooser_unselect_filename_utf8 (chooser, utf8_filename);
- g_free (utf8_filename);
-}
-
-#undef gtk_file_chooser_get_filenames
-
-GSList *
-gtk_file_chooser_get_filenames (GtkFileChooser *chooser)
-{
- GSList *list = gtk_file_chooser_get_filenames_utf8 (chooser);
- GSList *rover = list;
-
- while (rover)
- {
- gchar *tem = (gchar *) rover->data;
- rover->data = g_locale_from_utf8 ((gchar *) rover->data, -1, NULL, NULL, NULL);
- g_free (tem);
- rover = rover->next;
- }
-
- return list;
-}
-
-#undef gtk_file_chooser_set_current_folder
-
-gboolean
-gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
- const gchar *filename)
-{
- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
- gboolean retval = gtk_file_chooser_set_current_folder_utf8 (chooser, utf8_filename);
-
- g_free (utf8_filename);
-
- return retval;
-}
-
-#undef gtk_file_chooser_get_current_folder
-
-gchar *
-gtk_file_chooser_get_current_folder (GtkFileChooser *chooser)
-{
- gchar *utf8_folder = gtk_file_chooser_get_current_folder_utf8 (chooser);
- gchar *retval = g_locale_from_utf8 (utf8_folder, -1, NULL, NULL, NULL);
-
- g_free (utf8_folder);
-
- return retval;
-}
-
-#undef gtk_file_chooser_get_preview_filename
-
-char *
-gtk_file_chooser_get_preview_filename (GtkFileChooser *chooser)
-{
- char *utf8_filename = gtk_file_chooser_get_preview_filename_utf8 (chooser);
- char *retval = g_locale_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
-
- g_free (utf8_filename);
-
- return retval;
-}
-
-#undef gtk_file_chooser_add_shortcut_folder
-
-gboolean
-gtk_file_chooser_add_shortcut_folder (GtkFileChooser *chooser,
- const char *folder,
- GError **error)
-{
- char *utf8_folder = g_locale_to_utf8 (folder, -1, NULL, NULL, NULL);
- gboolean retval =
- gtk_file_chooser_add_shortcut_folder_utf8 (chooser, utf8_folder, error);
-
- g_free (utf8_folder);
-
- return retval;
-}
-
-#undef gtk_file_chooser_remove_shortcut_folder
-
-gboolean
-gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
- const char *folder,
- GError **error)
-{
- char *utf8_folder = g_locale_to_utf8 (folder, -1, NULL, NULL, NULL);
- gboolean retval =
- gtk_file_chooser_remove_shortcut_folder_utf8 (chooser, utf8_folder, error);
-
- g_free (utf8_folder);
-
- return retval;
-}
-
-#undef gtk_file_chooser_list_shortcut_folders
-
-GSList *
-gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
-{
- GSList *list = gtk_file_chooser_list_shortcut_folders_utf8 (chooser);
- GSList *rover = list;
-
- while (rover)
- {
- gchar *tem = (gchar *) rover->data;
- rover->data = g_locale_from_utf8 ((gchar *) rover->data, -1, NULL, NULL, NULL);
- g_free (tem);
- rover = rover->next;
- }
-
- return list;
-}
-
-#endif
projects / ~andy / gtk / blobdiff