Commit 7f8ae32c authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Add gtk_file_chooser_set_current_name() to set the current entry contents.

Fri Jul 11 14:37:07 2003  Owen Taylor  <otaylor@redhat.com>

        * gtkfilechooser.[ch] gtkfilechooserprivate.h
        gtkfilechooserimpldefault.c: Add
        gtk_file_chooser_set_current_name() to set the current
        entry contents.

        * *.c: Consistently use '-' not '_' in property names and
        signal names.

        * gtkfilechooser.c: Document all exported functions.
parent 10d77dd6
This diff is collapsed.
...@@ -56,6 +56,8 @@ gboolean gtk_file_chooser_get_select_multiple (GtkFileChooser ...@@ -56,6 +56,8 @@ gboolean gtk_file_chooser_get_select_multiple (GtkFileChooser
/* Filename manipulation /* Filename manipulation
*/ */
void gtk_file_chooser_set_current_name (GtkFileChooser *chooser,
const gchar *name);
gchar * gtk_file_chooser_get_filename (GtkFileChooser *chooser); gchar * gtk_file_chooser_get_filename (GtkFileChooser *chooser);
void gtk_file_chooser_set_filename (GtkFileChooser *chooser, void gtk_file_chooser_set_filename (GtkFileChooser *chooser,
const char *filename); const char *filename);
......
...@@ -96,6 +96,8 @@ static void gtk_file_chooser_impl_default_get_property (GObject ...@@ -96,6 +96,8 @@ static void gtk_file_chooser_impl_default_get_property (GObject
static void gtk_file_chooser_impl_default_set_current_folder (GtkFileChooser *chooser, static void gtk_file_chooser_impl_default_set_current_folder (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
static GtkFilePath * gtk_file_chooser_impl_default_get_current_folder (GtkFileChooser *chooser); static GtkFilePath * gtk_file_chooser_impl_default_get_current_folder (GtkFileChooser *chooser);
static void gtk_file_chooser_impl_default_set_current_name (GtkFileChooser *chooser,
const gchar *name);
static void gtk_file_chooser_impl_default_select_path (GtkFileChooser *chooser, static void gtk_file_chooser_impl_default_select_path (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
static void gtk_file_chooser_impl_default_unselect_path (GtkFileChooser *chooser, static void gtk_file_chooser_impl_default_unselect_path (GtkFileChooser *chooser,
...@@ -191,6 +193,7 @@ gtk_file_chooser_impl_default_iface_init (GtkFileChooserIface *iface) ...@@ -191,6 +193,7 @@ gtk_file_chooser_impl_default_iface_init (GtkFileChooserIface *iface)
iface->get_file_system = gtk_file_chooser_impl_default_get_file_system; iface->get_file_system = gtk_file_chooser_impl_default_get_file_system;
iface->set_current_folder = gtk_file_chooser_impl_default_set_current_folder; iface->set_current_folder = gtk_file_chooser_impl_default_set_current_folder;
iface->get_current_folder = gtk_file_chooser_impl_default_get_current_folder; iface->get_current_folder = gtk_file_chooser_impl_default_get_current_folder;
iface->set_current_name = gtk_file_chooser_impl_default_set_current_name;
} }
static void static void
...@@ -523,6 +526,15 @@ gtk_file_chooser_impl_default_get_current_folder (GtkFileChooser *chooser) ...@@ -523,6 +526,15 @@ gtk_file_chooser_impl_default_get_current_folder (GtkFileChooser *chooser)
return gtk_file_path_copy (impl->current_folder); return gtk_file_path_copy (impl->current_folder);
} }
static void
gtk_file_chooser_impl_default_set_current_name (GtkFileChooser *chooser,
const gchar *name)
{
GtkFileChooserImplDefault *impl = GTK_FILE_CHOOSER_IMPL_DEFAULT (chooser);
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->entry), name);
}
static void static void
select_func (GtkFileSystemModel *model, select_func (GtkFileSystemModel *model,
GtkTreePath *path, GtkTreePath *path,
...@@ -551,11 +563,11 @@ gtk_file_chooser_impl_default_select_path (GtkFileChooser *chooser, ...@@ -551,11 +563,11 @@ gtk_file_chooser_impl_default_select_path (GtkFileChooser *chooser,
if (!parent_path) if (!parent_path)
{ {
_gtk_file_chooser_set_current_folder (chooser, path); _gtk_file_chooser_set_current_folder_path (chooser, path);
} }
else else
{ {
_gtk_file_chooser_set_current_folder (chooser, parent_path); _gtk_file_chooser_set_current_folder_path (chooser, parent_path);
gtk_file_path_free (parent_path); gtk_file_path_free (parent_path);
_gtk_file_system_model_path_do (impl->list_model, path, _gtk_file_system_model_path_do (impl->list_model, path,
select_func, impl); select_func, impl);
...@@ -825,11 +837,11 @@ tree_selection_changed (GtkTreeSelection *selection, ...@@ -825,11 +837,11 @@ tree_selection_changed (GtkTreeSelection *selection,
gtk_tree_view_set_search_column (GTK_TREE_VIEW (impl->list), gtk_tree_view_set_search_column (GTK_TREE_VIEW (impl->list),
GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME); GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME);
g_signal_emit_by_name (impl, "current_folder_changed", 0); g_signal_emit_by_name (impl, "current-folder-changed", 0);
update_chooser_entry (impl); update_chooser_entry (impl);
g_signal_emit_by_name (impl, "selection_changed", 0); g_signal_emit_by_name (impl, "selection-changed", 0);
} }
...@@ -839,7 +851,7 @@ list_selection_changed (GtkTreeSelection *selection, ...@@ -839,7 +851,7 @@ list_selection_changed (GtkTreeSelection *selection,
{ {
update_chooser_entry (impl); update_chooser_entry (impl);
g_signal_emit_by_name (impl, "selection_changed", 0); g_signal_emit_by_name (impl, "selection-changed", 0);
} }
static void static void
...@@ -896,7 +908,7 @@ entry_activate (GtkEntry *entry, ...@@ -896,7 +908,7 @@ entry_activate (GtkEntry *entry,
{ {
g_signal_stop_emission_by_name (entry, "activate"); g_signal_stop_emission_by_name (entry, "activate");
_gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (impl), new_folder); _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (impl), new_folder);
_gtk_file_chooser_entry_set_file_part (chooser_entry, ""); _gtk_file_chooser_entry_set_file_part (chooser_entry, "");
gtk_file_path_free (new_folder); gtk_file_path_free (new_folder);
......
...@@ -131,7 +131,7 @@ gtk_file_chooser_dialog_constructor (GType type, ...@@ -131,7 +131,7 @@ gtk_file_chooser_dialog_constructor (GType type,
if (priv->file_system) if (priv->file_system)
priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET,
"file_system", priv->file_system, "file-system", priv->file_system,
NULL); NULL);
else else
priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, NULL); priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, NULL);
......
...@@ -51,6 +51,8 @@ struct _GtkFileChooserIface ...@@ -51,6 +51,8 @@ struct _GtkFileChooserIface
void (*set_current_folder) (GtkFileChooser *chooser, void (*set_current_folder) (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
GtkFilePath * (*get_current_folder) (GtkFileChooser *chooser); GtkFilePath * (*get_current_folder) (GtkFileChooser *chooser);
void (*set_current_name) (GtkFileChooser *chooser,
const gchar *name);
void (*select_path) (GtkFileChooser *chooser, void (*select_path) (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
void (*unselect_path) (GtkFileChooser *chooser, void (*unselect_path) (GtkFileChooser *chooser,
...@@ -68,15 +70,15 @@ struct _GtkFileChooserIface ...@@ -68,15 +70,15 @@ struct _GtkFileChooserIface
const gchar *uri); const gchar *uri);
}; };
GtkFileSystem *_gtk_file_chooser_get_file_system (GtkFileChooser *chooser); GtkFileSystem *_gtk_file_chooser_get_file_system (GtkFileChooser *chooser);
void _gtk_file_chooser_set_current_folder (GtkFileChooser *chooser, void _gtk_file_chooser_set_current_folder_path (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
GtkFilePath * _gtk_file_chooser_get_current_folder (GtkFileChooser *chooser); GtkFilePath * _gtk_file_chooser_get_current_folder_path (GtkFileChooser *chooser);
void _gtk_file_chooser_select_path (GtkFileChooser *chooser, void _gtk_file_chooser_select_path (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
void _gtk_file_chooser_unselect_path (GtkFileChooser *chooser, void _gtk_file_chooser_unselect_path (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
GSList * _gtk_file_chooser_get_paths (GtkFileChooser *chooser); GSList * _gtk_file_chooser_get_paths (GtkFileChooser *chooser);
G_END_DECLS G_END_DECLS
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
static void delegate_set_current_folder (GtkFileChooser *chooser, static void delegate_set_current_folder (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
static GtkFilePath * delegate_get_current_folder (GtkFileChooser *chooser); static GtkFilePath * delegate_get_current_folder (GtkFileChooser *chooser);
static void delegate_set_current_name (GtkFileChooser *chooser,
const gchar *name);
static void delegate_select_path (GtkFileChooser *chooser, static void delegate_select_path (GtkFileChooser *chooser,
const GtkFilePath *path); const GtkFilePath *path);
static void delegate_unselect_path (GtkFileChooser *chooser, static void delegate_unselect_path (GtkFileChooser *chooser,
...@@ -61,37 +63,37 @@ _gtk_file_chooser_install_properties (GObjectClass *klass) ...@@ -61,37 +63,37 @@ _gtk_file_chooser_install_properties (GObjectClass *klass)
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_FILE_SYSTEM, GTK_FILE_CHOOSER_PROP_FILE_SYSTEM,
g_param_spec_override ("file_system", g_param_spec_override ("file-system",
GTK_TYPE_FILE_SYSTEM, GTK_TYPE_FILE_SYSTEM,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_FOLDER_MODE, GTK_FILE_CHOOSER_PROP_FOLDER_MODE,
g_param_spec_override ("folder_mode", g_param_spec_override ("folder-mode",
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_LOCAL_ONLY, GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
g_param_spec_override ("local_only", g_param_spec_override ("local-only",
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET, GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET,
g_param_spec_override ("preview_widget", g_param_spec_override ("preview-widget",
GTK_TYPE_WIDGET, GTK_TYPE_WIDGET,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE, GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE,
g_param_spec_override ("preview_widget_active", g_param_spec_override ("preview-widget-active",
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE, GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
g_param_spec_override ("select_multiple", g_param_spec_override ("select-multiple",
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (klass, g_object_class_install_property (klass,
GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN, GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
g_param_spec_override ("show_hidden", g_param_spec_override ("show-hidden",
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
} }
...@@ -112,6 +114,7 @@ _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface) ...@@ -112,6 +114,7 @@ _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface)
{ {
iface->set_current_folder = delegate_set_current_folder; iface->set_current_folder = delegate_set_current_folder;
iface->get_current_folder = delegate_get_current_folder; iface->get_current_folder = delegate_get_current_folder;
iface->set_current_name = delegate_set_current_name;
iface->select_path = delegate_select_path; iface->select_path = delegate_select_path;
iface->unselect_path = delegate_unselect_path; iface->unselect_path = delegate_unselect_path;
iface->select_all = delegate_select_all; iface->select_all = delegate_select_all;
...@@ -140,9 +143,9 @@ _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, ...@@ -140,9 +143,9 @@ _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
g_object_set_data (G_OBJECT (receiver), "gtk-file-chooser-delegate", delegate); g_object_set_data (G_OBJECT (receiver), "gtk-file-chooser-delegate", delegate);
g_signal_connect (delegate, "current_folder_changed", g_signal_connect (delegate, "current-folder-changed",
G_CALLBACK (delegate_current_folder_changed), receiver); G_CALLBACK (delegate_current_folder_changed), receiver);
g_signal_connect (delegate, "selection_changed", g_signal_connect (delegate, "selection-changed",
G_CALLBACK (delegate_selection_changed), receiver); G_CALLBACK (delegate_selection_changed), receiver);
} }
...@@ -194,25 +197,32 @@ static void ...@@ -194,25 +197,32 @@ static void
delegate_set_current_folder (GtkFileChooser *chooser, delegate_set_current_folder (GtkFileChooser *chooser,
const GtkFilePath *path) const GtkFilePath *path)
{ {
_gtk_file_chooser_set_current_folder (chooser, path); _gtk_file_chooser_set_current_folder_path (chooser, path);
} }
static GtkFilePath * static GtkFilePath *
delegate_get_current_folder (GtkFileChooser *chooser) delegate_get_current_folder (GtkFileChooser *chooser)
{ {
return _gtk_file_chooser_get_current_folder (get_delegate (chooser)); return _gtk_file_chooser_get_current_folder_path (get_delegate (chooser));
}
static void
delegate_set_current_name (GtkFileChooser *chooser,
const gchar *name)
{
gtk_file_chooser_set_current_name (get_delegate (chooser), name);
} }
static void static void
delegate_selection_changed (GtkFileChooser *chooser, delegate_selection_changed (GtkFileChooser *chooser,
gpointer data) gpointer data)
{ {
g_signal_emit_by_name (data, "selection_changed", 0); g_signal_emit_by_name (data, "selection-changed", 0);
} }
static void static void
delegate_current_folder_changed (GtkFileChooser *chooser, delegate_current_folder_changed (GtkFileChooser *chooser,
gpointer data) gpointer data)
{ {
g_signal_emit_by_name (data, "current_folder_changed", 0); g_signal_emit_by_name (data, "current-folder-changed", 0);
} }
...@@ -307,7 +307,7 @@ gtk_file_system_base_init (gpointer g_class) ...@@ -307,7 +307,7 @@ gtk_file_system_base_init (gpointer g_class)
{ {
GType iface_type = G_TYPE_FROM_INTERFACE (g_class); GType iface_type = G_TYPE_FROM_INTERFACE (g_class);
g_signal_new ("roots_changed", g_signal_new ("roots-changed",
iface_type, iface_type,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFileSystemIface, roots_changed), G_STRUCT_OFFSET (GtkFileSystemIface, roots_changed),
...@@ -553,7 +553,7 @@ gtk_file_folder_base_init (gpointer g_class) ...@@ -553,7 +553,7 @@ gtk_file_folder_base_init (gpointer g_class)
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
g_signal_new ("files_added", g_signal_new ("files-added",
iface_type, iface_type,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFileFolderIface, files_added), G_STRUCT_OFFSET (GtkFileFolderIface, files_added),
...@@ -561,7 +561,7 @@ gtk_file_folder_base_init (gpointer g_class) ...@@ -561,7 +561,7 @@ gtk_file_folder_base_init (gpointer g_class)
g_cclosure_marshal_VOID__POINTER, g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
g_signal_new ("files_changed", g_signal_new ("files-changed",
iface_type, iface_type,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFileFolderIface, files_changed), G_STRUCT_OFFSET (GtkFileFolderIface, files_changed),
...@@ -569,7 +569,7 @@ gtk_file_folder_base_init (gpointer g_class) ...@@ -569,7 +569,7 @@ gtk_file_folder_base_init (gpointer g_class)
g_cclosure_marshal_VOID__POINTER, g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
g_signal_new ("files_removed", g_signal_new ("files-removed",
iface_type, iface_type,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFileFolderIface, files_removed), G_STRUCT_OFFSET (GtkFileFolderIface, files_removed),
......
...@@ -590,18 +590,18 @@ _gtk_file_system_model_new (GtkFileSystem *file_system, ...@@ -590,18 +590,18 @@ _gtk_file_system_model_new (GtkFileSystem *file_system,
g_signal_connect_object (model->root_folder, "deleted", g_signal_connect_object (model->root_folder, "deleted",
G_CALLBACK (root_deleted_callback), model, 0); G_CALLBACK (root_deleted_callback), model, 0);
g_signal_connect_object (model->root_folder, "files_added", g_signal_connect_object (model->root_folder, "files-added",
G_CALLBACK (root_files_added_callback), model, 0); G_CALLBACK (root_files_added_callback), model, 0);
g_signal_connect_object (model->root_folder, "files_changed", g_signal_connect_object (model->root_folder, "files-changed",
G_CALLBACK (root_files_changed_callback), model, 0); G_CALLBACK (root_files_changed_callback), model, 0);
g_signal_connect_object (model->root_folder, "files_removed", g_signal_connect_object (model->root_folder, "files-removed",
G_CALLBACK (root_files_removed_callback), model, 0); G_CALLBACK (root_files_removed_callback), model, 0);
} }
} }
else else
{ {
roots = gtk_file_system_list_roots (file_system); roots = gtk_file_system_list_roots (file_system);
g_signal_connect_object (file_system, "roots_changed", g_signal_connect_object (file_system, "roots-changed",
G_CALLBACK (roots_changed_callback), model, 0); G_CALLBACK (roots_changed_callback), model, 0);
} }
...@@ -1200,11 +1200,11 @@ file_model_node_get_children (GtkFileSystemModel *model, ...@@ -1200,11 +1200,11 @@ file_model_node_get_children (GtkFileSystemModel *model,
g_signal_connect (node->folder, "deleted", g_signal_connect (node->folder, "deleted",
G_CALLBACK (deleted_callback), node); G_CALLBACK (deleted_callback), node);
g_signal_connect (node->folder, "files_added", g_signal_connect (node->folder, "files-added",
G_CALLBACK (files_added_callback), node); G_CALLBACK (files_added_callback), node);
g_signal_connect (node->folder, "files_changed", g_signal_connect (node->folder, "files-changed",
G_CALLBACK (files_changed_callback), node); G_CALLBACK (files_changed_callback), node);
g_signal_connect (node->folder, "files_removed", g_signal_connect (node->folder, "files-removed",
G_CALLBACK (files_removed_callback), node); G_CALLBACK (files_removed_callback), node);
g_object_set_data (G_OBJECT (node->folder), "model-node", node); g_object_set_data (G_OBJECT (node->folder), "model-node", node);
......
...@@ -63,7 +63,7 @@ main (int argc, char **argv) ...@@ -63,7 +63,7 @@ main (int argc, char **argv)
dialog = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG, dialog = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
"action", GTK_FILE_CHOOSER_ACTION_OPEN, "action", GTK_FILE_CHOOSER_ACTION_OPEN,
"file_system", file_system, "file-system", file_system,
"title", "Select a file", "title", "Select a file",
NULL); NULL);
...@@ -73,9 +73,9 @@ main (int argc, char **argv) ...@@ -73,9 +73,9 @@ main (int argc, char **argv)
NULL); NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
g_signal_connect (dialog, "selection_changed", g_signal_connect (dialog, "selection-changed",
G_CALLBACK (print_selected), NULL); G_CALLBACK (print_selected), NULL);
g_signal_connect (dialog, "current_folder_changed", g_signal_connect (dialog, "current-folder-changed",
G_CALLBACK (print_current_folder), NULL); G_CALLBACK (print_current_folder), NULL);
g_signal_connect (dialog, "response", g_signal_connect (dialog, "response",
G_CALLBACK (response_cb), NULL); G_CALLBACK (response_cb), NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment