X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserentry.c;h=ce2b6cc9e7b38dbafe1c0837612541321249105d;hb=b9e189150bfd62c9e956e29324622058672600f0;hp=e68248d987e29a005f8336569d7d3ac9f2ae6cce;hpb=c8b617382d3b701253e79548f5eb0bad190337a7;p=~andy%2Fgtk
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index e68248d98..ce2b6cc9e 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -13,21 +13,24 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; 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 .
*/
-#include
+#include "config.h"
+
+#include "gtkfilechooserentry.h"
+
#include
#include "gtkcelllayout.h"
#include "gtkcellrenderertext.h"
#include "gtkentry.h"
-#include "gtkfilechooserentry.h"
+#include "gtkfilesystemmodel.h"
+#include "gtklabel.h"
#include "gtkmain.h"
+#include "gtksizerequest.h"
+#include "gtkwindow.h"
#include "gtkintl.h"
-#include "gtkalias.h"
typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
@@ -46,47 +49,33 @@ struct _GtkFileChooserEntry
GtkFileChooserAction action;
- GtkFileSystem *file_system;
- GtkFilePath *base_folder;
- GtkFilePath *current_folder_path;
+ GFile *base_folder;
+ GFile *current_folder_file;
+ gchar *dir_part;
gchar *file_part;
- gint file_part_pos;
- guint check_completion_idle;
- guint load_directory_idle;
-
- GtkFileFolder *current_folder;
- GtkFileSystemHandle *load_folder_handle;
- GtkListStore *completion_store;
+ GtkTreeModel *completion_store;
- guint has_completion : 1;
- guint in_change : 1;
+ guint current_folder_loaded : 1;
+ guint complete_on_load : 1;
guint eat_tabs : 1;
+ guint local_only : 1;
};
enum
{
DISPLAY_NAME_COLUMN,
- PATH_COLUMN,
+ FULL_PATH_COLUMN,
N_COLUMNS
};
-static void gtk_file_chooser_entry_iface_init (GtkEditableClass *iface);
-
static void gtk_file_chooser_entry_finalize (GObject *object);
static void gtk_file_chooser_entry_dispose (GObject *object);
static void gtk_file_chooser_entry_grab_focus (GtkWidget *widget);
-static gboolean gtk_file_chooser_entry_focus (GtkWidget *widget,
- GtkDirectionType direction);
-static void gtk_file_chooser_entry_activate (GtkEntry *entry);
-static void gtk_file_chooser_entry_changed (GtkEditable *editable);
-static void gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position);
-
-static void clear_completion_callback (GtkFileChooserEntry *chooser_entry,
- GParamSpec *pspec);
+static gboolean gtk_file_chooser_entry_tab_handler (GtkWidget *widget,
+ GdkEventKey *event);
+static gboolean gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event);
#ifdef G_OS_WIN32
static gint insert_text_callback (GtkFileChooserEntry *widget,
@@ -104,49 +93,66 @@ static gboolean match_selected_callback (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter,
GtkFileChooserEntry *chooser_entry);
-static gboolean completion_match_func (GtkEntryCompletion *comp,
- const char *key,
- GtkTreeIter *iter,
- gpointer data);
-static void files_added_cb (GtkFileSystem *file_system,
- GSList *added_uris,
- GtkFileChooserEntry *chooser_entry);
-static void files_deleted_cb (GtkFileSystem *file_system,
- GSList *deleted_uris,
- GtkFileChooserEntry *chooser_entry);
-static char *maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *path,
- gchar *display_name);
-static GtkEditableClass *parent_editable_iface;
+static void set_complete_on_load (GtkFileChooserEntry *chooser_entry,
+ gboolean complete_on_load);
+static void refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry);
+static void set_completion_folder (GtkFileChooserEntry *chooser_entry,
+ GFile *folder);
+static void finished_loading_cb (GtkFileSystemModel *model,
+ GError *error,
+ GtkFileChooserEntry *chooser_entry);
-G_DEFINE_TYPE_WITH_CODE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
- gtk_file_chooser_entry_iface_init))
+G_DEFINE_TYPE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY)
+
+static char *
+gtk_file_chooser_entry_get_completion_text (GtkFileChooserEntry *chooser_entry)
+{
+ GtkEditable *editable = GTK_EDITABLE (chooser_entry);
+ int start, end;
+
+ gtk_editable_get_selection_bounds (editable, &start, &end);
+ return gtk_editable_get_chars (editable, 0, MIN (start, end));
+}
static void
-_gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
+gtk_file_chooser_entry_dispatch_properties_changed (GObject *object,
+ guint n_pspecs,
+ GParamSpec **pspecs)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
+ guint i;
- gobject_class->finalize = gtk_file_chooser_entry_finalize;
- gobject_class->dispose = gtk_file_chooser_entry_dispose;
+ G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->dispatch_properties_changed (object, n_pspecs, pspecs);
- widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
- widget_class->focus = gtk_file_chooser_entry_focus;
+ /* What we are after: The text in front of the cursor was modified.
+ * Unfortunately, there's no other way to catch this. */
- entry_class->activate = gtk_file_chooser_entry_activate;
+ for (i = 0; i < n_pspecs; i++)
+ {
+ if (pspecs[i]->name == I_("cursor-position") ||
+ pspecs[i]->name == I_("selection-bound") ||
+ pspecs[i]->name == I_("text"))
+ {
+ set_complete_on_load (chooser_entry, FALSE);
+ refresh_current_folder_and_file_part (chooser_entry);
+ break;
+ }
+ }
}
static void
-gtk_file_chooser_entry_iface_init (GtkEditableClass *iface)
+_gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
{
- parent_editable_iface = g_type_interface_peek_parent (iface);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- iface->do_insert_text = gtk_file_chooser_entry_do_insert_text;
- iface->changed = gtk_file_chooser_entry_changed;
+ gobject_class->finalize = gtk_file_chooser_entry_finalize;
+ gobject_class->dispose = gtk_file_chooser_entry_dispose;
+ gobject_class->dispatch_properties_changed = gtk_file_chooser_entry_dispatch_properties_changed;
+
+ widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
+ widget_class->focus_out_event = gtk_file_chooser_entry_focus_out_event;
}
static void
@@ -155,13 +161,20 @@ _gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
GtkEntryCompletion *comp;
GtkCellRenderer *cell;
+ chooser_entry->local_only = TRUE;
+
g_object_set (chooser_entry, "truncate-multiline", TRUE, NULL);
comp = gtk_entry_completion_new ();
gtk_entry_completion_set_popup_single_match (comp, FALSE);
+ gtk_entry_completion_set_minimum_key_length (comp, 0);
+ /* see docs for gtk_entry_completion_set_text_column() */
+ g_object_set (comp, "text-column", FULL_PATH_COLUMN, NULL);
+ /* Need a match func here or entry completion uses a wrong one.
+ * We do our own filtering after all. */
gtk_entry_completion_set_match_func (comp,
- completion_match_func,
+ (GtkEntryCompletionMatchFunc) gtk_true,
chooser_entry,
NULL);
@@ -170,23 +183,22 @@ _gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
cell, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (comp),
cell,
- "text", 0);
+ "text", DISPLAY_NAME_COLUMN);
- g_signal_connect (comp, "match_selected",
+ g_signal_connect (comp, "match-selected",
G_CALLBACK (match_selected_callback), chooser_entry);
gtk_entry_set_completion (GTK_ENTRY (chooser_entry), comp);
g_object_unref (comp);
-
- g_signal_connect (chooser_entry, "notify::cursor-position",
- G_CALLBACK (clear_completion_callback), NULL);
- g_signal_connect (chooser_entry, "notify::selection-bound",
- G_CALLBACK (clear_completion_callback), NULL);
+ /* NB: This needs to happen after the completion is set, so this handler
+ * runs before the handler installed by entrycompletion */
+ g_signal_connect (chooser_entry, "key-press-event",
+ G_CALLBACK (gtk_file_chooser_entry_tab_handler), NULL);
#ifdef G_OS_WIN32
- g_signal_connect (chooser_entry, "insert_text",
+ g_signal_connect (chooser_entry, "insert-text",
G_CALLBACK (insert_text_callback), NULL);
- g_signal_connect (chooser_entry, "delete_text",
+ g_signal_connect (chooser_entry, "delete-text",
G_CALLBACK (delete_text_callback), NULL);
#endif
}
@@ -196,8 +208,13 @@ gtk_file_chooser_entry_finalize (GObject *object)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
- gtk_file_path_free (chooser_entry->base_folder);
- gtk_file_path_free (chooser_entry->current_folder_path);
+ if (chooser_entry->base_folder)
+ g_object_unref (chooser_entry->base_folder);
+
+ if (chooser_entry->current_folder_file)
+ g_object_unref (chooser_entry->current_folder_file);
+
+ g_free (chooser_entry->dir_part);
g_free (chooser_entry->file_part);
G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object);
@@ -208,45 +225,7 @@ gtk_file_chooser_entry_dispose (GObject *object)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
- if (chooser_entry->completion_store)
- {
- g_object_unref (chooser_entry->completion_store);
- chooser_entry->completion_store = NULL;
- }
-
- if (chooser_entry->load_folder_handle)
- {
- gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
- chooser_entry->load_folder_handle = NULL;
- }
-
- if (chooser_entry->current_folder)
- {
- g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
- G_CALLBACK (files_added_cb), chooser_entry);
- g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
- G_CALLBACK (files_deleted_cb), chooser_entry);
- g_object_unref (chooser_entry->current_folder);
- chooser_entry->current_folder = NULL;
- }
-
- if (chooser_entry->file_system)
- {
- g_object_unref (chooser_entry->file_system);
- chooser_entry->file_system = NULL;
- }
-
- if (chooser_entry->check_completion_idle)
- {
- g_source_remove (chooser_entry->check_completion_idle);
- chooser_entry->check_completion_idle = 0;
- }
-
- if (chooser_entry->load_directory_idle)
- {
- g_source_remove (chooser_entry->load_directory_idle);
- chooser_entry->load_directory_idle = 0;
- }
+ set_completion_folder (chooser_entry, NULL);
G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->dispose (object);
}
@@ -254,646 +233,404 @@ gtk_file_chooser_entry_dispose (GObject *object)
/* Match functions for the GtkEntryCompletion */
static gboolean
match_selected_callback (GtkEntryCompletion *completion,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkFileChooserEntry *chooser_entry)
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ GtkFileChooserEntry *chooser_entry)
{
- char *display_name;
- GtkFilePath *path;
+ char *path;
gint pos;
-
- gtk_tree_model_get (model, iter,
- DISPLAY_NAME_COLUMN, &display_name,
- PATH_COLUMN, &path,
- -1);
- if (!display_name || !path)
- {
- /* these shouldn't complain if passed NULL */
- gtk_file_path_free (path);
- g_free (display_name);
- return FALSE;
- }
-
- display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
-
- pos = chooser_entry->file_part_pos;
+ gtk_tree_model_get (model, iter,
+ FULL_PATH_COLUMN, &path,
+ -1);
- /* We don't set in_change here as we want to update the current_folder
- * variable */
gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
- pos, -1);
+ 0,
+ gtk_editable_get_position (GTK_EDITABLE (chooser_entry)));
+ pos = 0;
gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
- display_name, -1,
- &pos);
- gtk_editable_set_position (GTK_EDITABLE (chooser_entry), -1);
+ path,
+ -1,
+ &pos);
- gtk_file_path_free (path);
- g_free (display_name);
+ g_free (path);
return TRUE;
}
-/* Match function for the GtkEntryCompletion */
-static gboolean
-completion_match_func (GtkEntryCompletion *comp,
- const char *key_unused,
- GtkTreeIter *iter,
- gpointer data)
+static void
+set_complete_on_load (GtkFileChooserEntry *chooser_entry,
+ gboolean complete_on_load)
{
- GtkFileChooserEntry *chooser_entry;
- char *name;
- gboolean result;
- char *norm_file_part;
- char *norm_name;
-
- chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
-
- /* We ignore the key because it is the contents of the entry. Instead, we
- * just use our precomputed file_part.
- */
- if (!chooser_entry->file_part)
- {
- return FALSE;
- }
-
- gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store), iter, DISPLAY_NAME_COLUMN, &name, -1);
- if (!name)
- {
- return FALSE; /* Uninitialized row, ugh */
- }
-
- /* If we have an empty file_part, then we're at the root of a directory. In
- * that case, we want to match all non-dot files. We might want to match
- * dot_files too if show_hidden is TRUE on the fileselector in the future.
- */
- /* Additionally, support for gnome .hidden files would be sweet, too */
- if (chooser_entry->file_part[0] == '\000')
- {
- if (name[0] == '.')
- result = FALSE;
- else
- result = TRUE;
- g_free (name);
-
- return result;
- }
+ /* a completion was triggered, but we couldn't do it.
+ * So no text was inserted when pressing tab, so we beep */
+ if (chooser_entry->complete_on_load && !complete_on_load)
+ gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
+ chooser_entry->complete_on_load = complete_on_load;
+}
- norm_file_part = g_utf8_normalize (chooser_entry->file_part, -1, G_NORMALIZE_ALL);
- norm_name = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
+static gboolean
+is_valid_scheme_character (char c)
+{
+ return g_ascii_isalnum (c) || c == '+' || c == '-' || c == '.';
+}
-#ifdef G_PLATFORM_WIN32
- {
- gchar *temp;
+static gboolean
+has_uri_scheme (const char *str)
+{
+ const char *p;
- temp = norm_file_part;
- norm_file_part = g_utf8_casefold (norm_file_part, -1);
- g_free (temp);
+ p = str;
- temp = norm_name;
- norm_name = g_utf8_casefold (norm_name, -1);
- g_free (temp);
- }
-#endif
+ if (!is_valid_scheme_character (*p))
+ return FALSE;
- result = (strncmp (norm_file_part, norm_name, strlen (norm_file_part)) == 0);
+ do
+ p++;
+ while (is_valid_scheme_character (*p));
- g_free (norm_file_part);
- g_free (norm_name);
- g_free (name);
-
- return result;
+ return (strncmp (p, "://", 3) == 0);
}
-/* This function will append a directory separator to paths to
- * display_name iff the path associated with it is a directory.
- * maybe_append_separator_to_path will g_free the display_name and
- * return a new one if needed. Otherwise, it will return the old one.
- * You should be safe calling
- *
- * display_name = maybe_append_separator_to_path (entry, path, display_name);
- * ...
- * g_free (display_name);
- */
-static char *
-maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *path,
- gchar *display_name)
+static GFile *
+gtk_file_chooser_get_file_for_text (GtkFileChooserEntry *chooser_entry,
+ const gchar *str)
{
- if (!g_str_has_suffix (display_name, G_DIR_SEPARATOR_S) && path)
- {
- GtkFileInfo *info;
-
- info = gtk_file_folder_get_info (chooser_entry->current_folder,
- path, NULL); /* NULL-GError */
+ GFile *file;
- if (info)
- {
- if (gtk_file_info_get_is_folder (info))
- {
- gchar *tmp = display_name;
- display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
- g_free (tmp);
- }
-
- gtk_file_info_free (info);
- }
- }
+ if (str[0] == '~' || g_path_is_absolute (str) || has_uri_scheme (str))
+ file = g_file_parse_name (str);
+ else if (chooser_entry->base_folder != NULL)
+ file = g_file_resolve_relative_path (chooser_entry->base_folder, str);
+ else
+ file = NULL;
- return display_name;
+ return file;
}
-/* Determines if the completion model has entries with a common prefix relative
- * to the current contents of the entry. Also, if there's one and only one such
- * path, stores it in unique_path_ret.
- */
-static void
-find_common_prefix (GtkFileChooserEntry *chooser_entry,
- gchar **common_prefix_ret,
- GtkFilePath **unique_path_ret)
+static GFile *
+gtk_file_chooser_get_directory_for_text (GtkFileChooserEntry *chooser_entry,
+ const char * text)
{
- GtkTreeIter iter;
- gboolean valid;
+ GFile *file, *parent;
- *common_prefix_ret = NULL;
- *unique_path_ret = NULL;
+ file = gtk_file_chooser_get_file_for_text (chooser_entry, text);
- if (chooser_entry->completion_store == NULL)
- return;
+ if (file == NULL)
+ return NULL;
- valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+ if (text[0] == 0 || text[strlen (text) - 1] == G_DIR_SEPARATOR)
+ return file;
- while (valid)
- {
- gchar *display_name;
- GtkFilePath *path;
+ parent = g_file_get_parent (file);
+ g_object_unref (file);
- gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
- &iter,
- DISPLAY_NAME_COLUMN, &display_name,
- PATH_COLUMN, &path,
- -1);
-
- if (g_str_has_prefix (display_name, chooser_entry->file_part))
- {
- if (!*common_prefix_ret)
- {
- *common_prefix_ret = g_strdup (display_name);
- *unique_path_ret = gtk_file_path_copy (path);
- }
- else
- {
- gchar *p = *common_prefix_ret;
- const gchar *q = display_name;
-
- while (*p && *p == *q)
- {
- p++;
- q++;
- }
-
- *p = '\0';
-
- gtk_file_path_free (*unique_path_ret);
- *unique_path_ret = NULL;
- }
- }
-
- g_free (display_name);
- gtk_file_path_free (path);
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
- }
+ return parent;
}
-/* Finds a common prefix based on the contents of the entry and mandatorily appends it */
+/* Finds a common prefix based on the contents of the entry
+ * and mandatorily appends it
+ */
static void
-append_common_prefix (GtkFileChooserEntry *chooser_entry,
- gboolean highlight)
+explicitly_complete (GtkFileChooserEntry *chooser_entry)
{
- gchar *common_prefix;
- GtkFilePath *unique_path;
-
- find_common_prefix (chooser_entry, &common_prefix, &unique_path);
-
- if (unique_path)
- {
- common_prefix = maybe_append_separator_to_path (chooser_entry,
- unique_path,
- common_prefix);
- gtk_file_path_free (unique_path);
- }
+ chooser_entry->complete_on_load = FALSE;
- if (common_prefix)
+ if (chooser_entry->completion_store)
{
- gint file_part_len;
- gint common_prefix_len;
- gint pos;
+ char *completion, *text;
+ gsize completion_len, text_len;
+
+ text = gtk_file_chooser_entry_get_completion_text (chooser_entry);
+ text_len = strlen (text);
+ completion = gtk_entry_completion_compute_prefix (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), text);
+ completion_len = completion ? strlen (completion) : 0;
- file_part_len = g_utf8_strlen (chooser_entry->file_part, -1);
- common_prefix_len = g_utf8_strlen (common_prefix, -1);
-
- if (common_prefix_len > file_part_len)
- {
- pos = chooser_entry->file_part_pos;
-
- chooser_entry->in_change = TRUE;
- gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
- pos, -1);
- gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
- common_prefix, -1,
- &pos);
- chooser_entry->in_change = FALSE;
-
- if (highlight)
- {
- gtk_editable_select_region (GTK_EDITABLE (chooser_entry),
- chooser_entry->file_part_pos + file_part_len,
- chooser_entry->file_part_pos + common_prefix_len);
- chooser_entry->has_completion = TRUE;
- }
- }
+ if (completion_len > text_len)
+ {
+ GtkEditable *editable = GTK_EDITABLE (chooser_entry);
+ int pos = gtk_editable_get_position (editable);
- g_free (common_prefix);
+ gtk_editable_insert_text (editable,
+ completion + text_len,
+ completion_len - text_len,
+ &pos);
+ gtk_editable_set_position (editable, pos);
+ return;
+ }
}
-}
-
-static gboolean
-check_completion_callback (GtkFileChooserEntry *chooser_entry)
-{
- GDK_THREADS_ENTER ();
-
- g_assert (chooser_entry->file_part);
-
- chooser_entry->check_completion_idle = 0;
-
- if (strcmp (chooser_entry->file_part, "") == 0)
- goto done;
- /* We only insert the common prefix without requiring the user to hit Tab in
- * the "open" modes. For "save" modes, the user must hit Tab to cause the prefix
- * to be inserted. That happens in gtk_file_chooser_entry_focus().
- */
- if (chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN
- || chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- append_common_prefix (chooser_entry, TRUE);
-
- done:
-
- GDK_THREADS_LEAVE ();
-
- return FALSE;
+ gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
}
-static guint
-idle_add (GtkFileChooserEntry *chooser_entry,
- GCallback cb)
+static void
+gtk_file_chooser_entry_grab_focus (GtkWidget *widget)
{
- GSource *source;
- guint id;
-
- source = g_idle_source_new ();
- g_source_set_priority (source, G_PRIORITY_HIGH);
- g_source_set_closure (source,
- g_cclosure_new_object (cb, G_OBJECT (chooser_entry)));
- id = g_source_attach (source, NULL);
- g_source_unref (source);
-
- return id;
+ GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->grab_focus (widget);
+ _gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (widget));
}
static void
-add_completion_idle (GtkFileChooserEntry *chooser_entry)
+start_explicit_completion (GtkFileChooserEntry *chooser_entry)
{
- /* idle to update the selection based on the file list */
- if (chooser_entry->check_completion_idle == 0)
- chooser_entry->check_completion_idle =
- idle_add (chooser_entry, G_CALLBACK (check_completion_callback));
+ if (chooser_entry->current_folder_loaded)
+ explicitly_complete (chooser_entry);
+ else
+ set_complete_on_load (chooser_entry, TRUE);
}
-
-static void
-update_current_folder_files (GtkFileChooserEntry *chooser_entry,
- GSList *added_uris)
+static gboolean
+gtk_file_chooser_entry_tab_handler (GtkWidget *widget,
+ GdkEventKey *event)
{
- GSList *tmp_list;
-
- g_assert (chooser_entry->completion_store != NULL);
-
- /* Bah. Need to turn off sorting */
- for (tmp_list = added_uris; tmp_list; tmp_list = tmp_list->next)
- {
- GtkFileInfo *info;
- GtkFilePath *path;
-
- path = tmp_list->data;
+ GtkFileChooserEntry *chooser_entry;
+ GtkEditable *editable;
+ GdkModifierType state;
+ gint start, end;
- info = gtk_file_folder_get_info (chooser_entry->current_folder,
- path,
- NULL); /* NULL-GError */
- if (info)
- {
- gchar *display_name = g_strdup (gtk_file_info_get_display_name (info));
- GtkTreeIter iter;
+ chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
+ editable = GTK_EDITABLE (widget);
- display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+ if (!chooser_entry->eat_tabs)
+ return FALSE;
- gtk_list_store_append (chooser_entry->completion_store, &iter);
- gtk_list_store_set (chooser_entry->completion_store, &iter,
- DISPLAY_NAME_COLUMN, display_name,
- PATH_COLUMN, path,
- -1);
+ if (event->keyval != GDK_KEY_Tab)
+ return FALSE;
- gtk_file_info_free (info);
- g_free (display_name);
- }
- }
+ if (gtk_get_current_event_state (&state) &&
+ (state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+ return FALSE;
- /* FIXME: we want to turn off sorting temporarily. I suck... */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
- DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
+ /* This is a bit evil -- it makes Tab never leave the entry. It basically
+ * makes it 'safe' for people to hit. */
+ gtk_editable_get_selection_bounds (editable, &start, &end);
+
+ if (start != end)
+ gtk_editable_set_position (editable, MAX (start, end));
+ else
+ start_explicit_completion (chooser_entry);
- add_completion_idle (chooser_entry);
+ return TRUE;
}
-static void
-files_added_cb (GtkFileSystem *file_system,
- GSList *added_uris,
- GtkFileChooserEntry *chooser_entry)
+static gboolean
+gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event)
{
- update_current_folder_files (chooser_entry, added_uris);
-}
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
-static void
-files_deleted_cb (GtkFileSystem *file_system,
- GSList *deleted_uris,
- GtkFileChooserEntry *chooser_entry)
-{
- /* FIXME: gravy... */
+ set_complete_on_load (chooser_entry, FALSE);
+
+ return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus_out_event (widget, event);
}
static void
-load_directory_get_folder_callback (GtkFileSystemHandle *handle,
- GtkFileFolder *folder,
- const GError *error,
- gpointer data)
+update_inline_completion (GtkFileChooserEntry *chooser_entry)
{
- gboolean cancelled = handle->cancelled;
- GtkFileChooserEntry *chooser_entry = data;
-
- if (handle != chooser_entry->load_folder_handle)
- goto out;
+ GtkEntryCompletion *completion = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
- chooser_entry->load_folder_handle = NULL;
-
- if (cancelled || error)
- goto out;
+ if (!chooser_entry->current_folder_loaded)
+ {
+ gtk_entry_completion_set_inline_completion (completion, FALSE);
+ return;
+ }
- chooser_entry->current_folder = folder;
- g_signal_connect (chooser_entry->current_folder, "files-added",
- G_CALLBACK (files_added_cb), chooser_entry);
- g_signal_connect (chooser_entry->current_folder, "files-removed",
- G_CALLBACK (files_deleted_cb), chooser_entry);
-
- chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
- G_TYPE_STRING,
- GTK_TYPE_FILE_PATH);
+ switch (chooser_entry->action)
+ {
+ case GTK_FILE_CHOOSER_ACTION_OPEN:
+ case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+ gtk_entry_completion_set_inline_completion (completion, TRUE);
+ break;
+ case GTK_FILE_CHOOSER_ACTION_SAVE:
+ case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:
+ gtk_entry_completion_set_inline_completion (completion, FALSE);
+ break;
+ }
+}
- gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
- GTK_TREE_MODEL (chooser_entry->completion_store));
+static void
+discard_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+ if (!chooser_entry->completion_store)
+ return;
-out:
- g_object_unref (chooser_entry);
- g_object_unref (handle);
+ gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), NULL);
+ update_inline_completion (chooser_entry);
+ g_object_unref (chooser_entry->completion_store);
+ chooser_entry->completion_store = NULL;
}
static gboolean
-load_directory_callback (GtkFileChooserEntry *chooser_entry)
+completion_store_set (GtkFileSystemModel *model,
+ GFile *file,
+ GFileInfo *info,
+ int column,
+ GValue *value,
+ gpointer data)
{
- GDK_THREADS_ENTER ();
-
- chooser_entry->load_directory_idle = 0;
+ GtkFileChooserEntry *chooser_entry = data;
- /* guard against bogus settings*/
- if (chooser_entry->current_folder_path == NULL ||
- chooser_entry->file_system == NULL)
- goto done;
+ const char *prefix = "";
+ const char *suffix = "";
- if (chooser_entry->current_folder != NULL)
+ switch (column)
{
- g_warning ("idle activate multiple times without clearing the folder object first.");
- goto done;
- }
- g_assert (chooser_entry->completion_store == NULL);
+ case FULL_PATH_COLUMN:
+ prefix = chooser_entry->dir_part;
+ /* fall through */
+ case DISPLAY_NAME_COLUMN:
+ if (_gtk_file_info_consider_as_directory (info))
+ suffix = G_DIR_SEPARATOR_S;
- /* Load the folder */
- if (chooser_entry->load_folder_handle)
- gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
-
- chooser_entry->load_folder_handle =
- gtk_file_system_get_folder (chooser_entry->file_system,
- chooser_entry->current_folder_path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_FOLDER,
- load_directory_get_folder_callback,
- g_object_ref (chooser_entry));
-
- done:
-
- GDK_THREADS_LEAVE ();
+ g_value_take_string (value, g_strconcat (
+ prefix,
+ g_file_info_get_display_name (info),
+ suffix,
+ NULL));
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
- return FALSE;
+ return TRUE;
}
+/* Fills the completion store from the contents of the current folder */
static void
-gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position)
-{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
-
- parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
+populate_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+ chooser_entry->completion_store = GTK_TREE_MODEL (
+ _gtk_file_system_model_new_for_directory (chooser_entry->current_folder_file,
+ "standard::name,standard::display-name,standard::type",
+ completion_store_set,
+ chooser_entry,
+ N_COLUMNS,
+ G_TYPE_STRING,
+ G_TYPE_STRING));
+ g_signal_connect (chooser_entry->completion_store, "finished-loading",
+ G_CALLBACK (finished_loading_cb), chooser_entry);
+
+ _gtk_file_system_model_set_filter_folders (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ TRUE);
+ _gtk_file_system_model_set_show_files (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SAVE);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
+ DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
- if (! chooser_entry->in_change)
- add_completion_idle (GTK_FILE_CHOOSER_ENTRY (editable));
+ gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
+ chooser_entry->completion_store);
}
+/* Callback when the current folder finishes loading */
static void
-gtk_file_chooser_entry_grab_focus (GtkWidget *widget)
-{
- GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->grab_focus (widget);
- _gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (widget));
-}
-
-static gboolean
-gtk_file_chooser_entry_focus (GtkWidget *widget,
- GtkDirectionType direction)
+finished_loading_cb (GtkFileSystemModel *model,
+ GError *error,
+ GtkFileChooserEntry *chooser_entry)
{
- GtkFileChooserEntry *chooser_entry;
- GtkEditable *editable;
- GtkEntry *entry;
- GdkModifierType state;
- gboolean control_pressed;
+ GtkEntryCompletion *completion;
- chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
- editable = GTK_EDITABLE (widget);
- entry = GTK_ENTRY (widget);
+ chooser_entry->current_folder_loaded = TRUE;
- if (!chooser_entry->eat_tabs)
- return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
-
- control_pressed = FALSE;
-
- if (gtk_get_current_event_state (&state))
+ if (error)
{
- if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
- control_pressed = TRUE;
+ discard_completion_store (chooser_entry);
+ set_complete_on_load (chooser_entry, FALSE);
+ return;
}
- /* This is a bit evil -- it makes Tab never leave the entry. It basically
- * makes it 'safe' for people to hit. */
- if ((direction == GTK_DIR_TAB_FORWARD) &&
- (GTK_WIDGET_HAS_FOCUS (widget)) &&
- (! control_pressed))
- {
- gint pos = 0;
-
- if (!chooser_entry->has_completion
- && gtk_editable_get_position (editable) == entry->text_length)
- append_common_prefix (chooser_entry, FALSE);
+ if (chooser_entry->complete_on_load)
+ explicitly_complete (chooser_entry);
- gtk_editable_set_position (editable, entry->text_length);
-
- /* Trigger the completion window to pop up again by a
- * zero-length insertion, a bit of a hack.
- */
- gtk_editable_insert_text (editable, "", -1, &pos);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (chooser_entry), NULL);
- return TRUE;
- }
- else
- return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+ completion = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
+ update_inline_completion (chooser_entry);
+ gtk_entry_completion_complete (completion);
+ gtk_entry_completion_insert_prefix (completion);
}
static void
-gtk_file_chooser_entry_activate (GtkEntry *entry)
-{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
+set_completion_folder (GtkFileChooserEntry *chooser_entry,
+ GFile *folder_file)
+{
+ if (folder_file &&
+ chooser_entry->local_only
+ && !_gtk_file_has_native_path (folder_file))
+ folder_file = NULL;
+
+ if ((chooser_entry->current_folder_file
+ && folder_file
+ && g_file_equal (folder_file, chooser_entry->current_folder_file))
+ || chooser_entry->current_folder_file == folder_file)
+ return;
- if (chooser_entry->has_completion)
+ if (chooser_entry->current_folder_file)
{
- gtk_editable_set_position (GTK_EDITABLE (entry),
- entry->text_length);
+ g_object_unref (chooser_entry->current_folder_file);
+ chooser_entry->current_folder_file = NULL;
}
- GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
-}
+ chooser_entry->current_folder_loaded = FALSE;
-/* This will see if a path typed by the user is new, and installs the loading
- * idle if it is.
- */
-static void
-gtk_file_chooser_entry_maybe_update_directory (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *folder_path,
- gboolean force_reload)
-{
- gboolean queue_idle = FALSE;
+ discard_completion_store (chooser_entry);
- if (chooser_entry->current_folder_path)
+ if (folder_file)
{
- if (gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0 || force_reload)
- {
- /* We changed our current directory. We need to clear out the old
- * directory information.
- */
- if (chooser_entry->current_folder)
- {
- g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
- G_CALLBACK (files_added_cb), chooser_entry);
- g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
- G_CALLBACK (files_deleted_cb), chooser_entry);
-
- g_object_unref (chooser_entry->current_folder);
- chooser_entry->current_folder = NULL;
- }
- if (chooser_entry->completion_store)
- {
- gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), NULL);
- g_object_unref (chooser_entry->completion_store);
- chooser_entry->completion_store = NULL;
- }
-
- queue_idle = TRUE;
- }
-
- gtk_file_path_free (chooser_entry->current_folder_path);
+ chooser_entry->current_folder_file = g_object_ref (folder_file);
+ populate_completion_store (chooser_entry);
}
- else
- {
- queue_idle = TRUE;
- }
-
- chooser_entry->current_folder_path = folder_path;
-
- if (queue_idle && chooser_entry->load_directory_idle == 0)
- chooser_entry->load_directory_idle =
- idle_add (chooser_entry, G_CALLBACK (load_directory_callback));
}
-
-
static void
-gtk_file_chooser_entry_changed (GtkEditable *editable)
+refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry)
{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
- const gchar *text;
- GtkFilePath *folder_path;
- gchar *file_part;
- gsize total_len, file_part_len;
- gint file_part_pos;
+ GFile *folder_file;
+ char *text, *last_slash, *old_file_part;
- if (chooser_entry->in_change)
- return;
+ old_file_part = chooser_entry->file_part;
+ g_free (chooser_entry->dir_part);
- text = gtk_entry_get_text (GTK_ENTRY (editable));
-
- if (!chooser_entry->file_system ||
- !chooser_entry->base_folder ||
- !gtk_file_system_parse (chooser_entry->file_system,
- chooser_entry->base_folder, text,
- &folder_path, &file_part, NULL)) /* NULL-GError */
+ text = gtk_file_chooser_entry_get_completion_text (chooser_entry);
+
+ last_slash = strrchr (text, G_DIR_SEPARATOR);
+ if (last_slash)
{
- folder_path = gtk_file_path_copy (chooser_entry->base_folder);
- file_part = g_strdup ("");
- file_part_pos = -1;
+ chooser_entry->dir_part = g_strndup (text, last_slash - text + 1);
+ chooser_entry->file_part = g_strdup (last_slash + 1);
}
else
{
- file_part_len = strlen (file_part);
- total_len = strlen (text);
- if (total_len > file_part_len)
- file_part_pos = g_utf8_strlen (text, total_len - file_part_len);
- else
- file_part_pos = 0;
+ chooser_entry->dir_part = g_strdup ("");
+ chooser_entry->file_part = g_strdup (text);
}
- g_free (chooser_entry->file_part);
+ folder_file = gtk_file_chooser_get_directory_for_text (chooser_entry, text);
+ set_completion_folder (chooser_entry, folder_file);
+ if (folder_file)
+ g_object_unref (folder_file);
- chooser_entry->file_part = file_part;
- chooser_entry->file_part_pos = file_part_pos;
+ if (chooser_entry->completion_store &&
+ (g_strcmp0 (old_file_part, chooser_entry->file_part) != 0))
+ {
+ GtkFileFilter *filter;
+ char *pattern;
- gtk_file_chooser_entry_maybe_update_directory (chooser_entry, folder_path, file_part_pos == -1);
-}
+ filter = gtk_file_filter_new ();
+ pattern = g_strconcat (chooser_entry->file_part, "*", NULL);
+ gtk_file_filter_add_pattern (filter, pattern);
-static void
-clear_completion_callback (GtkFileChooserEntry *chooser_entry,
- GParamSpec *pspec)
-{
- if (chooser_entry->has_completion)
- {
- chooser_entry->has_completion = FALSE;
- gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+ _gtk_file_system_model_set_filter (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ filter);
+
+ g_free (pattern);
+ g_object_unref (filter);
}
+
+ g_free (text);
+ g_free (old_file_part);
}
#ifdef G_OS_WIN32
@@ -927,7 +664,7 @@ insert_text_callback (GtkFileChooserEntry *chooser_entry,
*position + (colon - new_text) != 1) ||
(new_text_length > 0 &&
*position <= 1 &&
- GTK_ENTRY (chooser_entry)->text_length >= 2 &&
+ gtk_entry_get_text_length (GTK_ENTRY (chooser_entry)) >= 2 &&
gtk_entry_get_text (GTK_ENTRY (chooser_entry))[1] == ':'))
{
gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
@@ -946,7 +683,7 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry,
{
/* If deleting a drive letter, delete the colon, too */
if (start_pos == 0 && end_pos == 1 &&
- GTK_ENTRY (chooser_entry)->text_length >= 2 &&
+ gtk_entry_get_text_length (GTK_ENTRY (chooser_entry)) >= 2 &&
gtk_entry_get_text (GTK_ENTRY (chooser_entry))[1] == ':')
{
g_signal_handlers_block_by_func (chooser_entry,
@@ -972,7 +709,7 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry,
* Return value: the newly created #GtkFileChooserEntry
**/
GtkWidget *
-_gtk_file_chooser_entry_new (gboolean eat_tabs)
+_gtk_file_chooser_entry_new (gboolean eat_tabs)
{
GtkFileChooserEntry *chooser_entry;
@@ -982,47 +719,34 @@ _gtk_file_chooser_entry_new (gboolean eat_tabs)
return GTK_WIDGET (chooser_entry);
}
-/**
- * _gtk_file_chooser_entry_set_file_system:
- * @chooser_entry: a #GtkFileChooser
- * @file_system: an object implementing #GtkFileSystem
- *
- * Sets the file system for @chooser_entry.
- **/
-void
-_gtk_file_chooser_entry_set_file_system (GtkFileChooserEntry *chooser_entry,
- GtkFileSystem *file_system)
-{
- g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
- g_return_if_fail (GTK_IS_FILE_SYSTEM (file_system));
-
- if (file_system != chooser_entry->file_system)
- {
- if (chooser_entry->file_system)
- g_object_unref (chooser_entry->file_system);
-
- chooser_entry->file_system = g_object_ref (file_system);
- }
-}
-
/**
* _gtk_file_chooser_entry_set_base_folder:
* @chooser_entry: a #GtkFileChooserEntry
- * @path: path of a folder in the chooser entries current file system.
+ * @file: file for a folder in the chooser entries current file system.
*
* Sets the folder with respect to which completions occur.
**/
void
_gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
- const GtkFilePath *path)
+ GFile *file)
{
+ g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
+ g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+ if (chooser_entry->base_folder == file ||
+ (file != NULL && chooser_entry->base_folder != NULL
+ && g_file_equal (chooser_entry->base_folder, file)))
+ return;
+
+ if (file)
+ g_object_ref (file);
+
if (chooser_entry->base_folder)
- gtk_file_path_free (chooser_entry->base_folder);
+ g_object_unref (chooser_entry->base_folder);
- chooser_entry->base_folder = gtk_file_path_copy (path);
+ chooser_entry->base_folder = file;
- gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
- _gtk_file_chooser_entry_select_filename (chooser_entry);
+ refresh_current_folder_and_file_part (chooser_entry);
}
/**
@@ -1030,25 +754,22 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
* @chooser_entry: a #GtkFileChooserEntry
*
* Gets the current folder for the #GtkFileChooserEntry. If the
- * user has only entered a filename, this will be the base folder
+ * user has only entered a filename, this will be in the base folder
* (see _gtk_file_chooser_entry_set_base_folder()), but if the
* user has entered a relative or absolute path, then it will
- * be different. If the user has entered a relative or absolute
- * path that doesn't point to a folder in the file system, it will
- * be %NULL.
+ * be different. If the user has entered unparsable text, or text which
+ * the entry cannot handle, this will return %NULL.
*
- * Return value: the path of current folder - this value is owned by the
- * chooser entry and must not be modified or freed.
+ * Return value: the file for the current folder - you must g_object_unref()
+ * the value after use.
**/
-const GtkFilePath *
+GFile *
_gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
{
- if (chooser_entry->has_completion)
- {
- gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
- GTK_ENTRY (chooser_entry)->text_length);
- }
- return chooser_entry->current_folder_path;
+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry), NULL);
+
+ return gtk_file_chooser_get_directory_for_text (chooser_entry,
+ gtk_entry_get_text (GTK_ENTRY (chooser_entry)));
}
/**
@@ -1057,7 +778,7 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
*
* Gets the non-folder portion of whatever the user has entered
* into the file selector. What is returned is a UTF-8 string,
- * and if a filename path is needed, gtk_file_system_make_path()
+ * and if a filename path is needed, g_file_get_child_for_display_name()
* must be used
*
* Return value: the entered filename - this value is owned by the
@@ -1066,31 +787,18 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
const gchar *
_gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry)
{
- if (chooser_entry->has_completion)
- {
- gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
- GTK_ENTRY (chooser_entry)->text_length);
- }
- return chooser_entry->file_part;
-}
+ const char *last_slash, *text;
-/**
- * _gtk_file_chooser_entry_set_file_part:
- * @chooser_entry: a #GtkFileChooserEntry
- * @file_part: text to display in the entry, in UTF-8
- *
- * Sets the current text shown in the file chooser entry.
- **/
-void
-_gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
- const gchar *file_part)
-{
- g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry), NULL);
- gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
+ text = gtk_entry_get_text (GTK_ENTRY (chooser_entry));
+ last_slash = strrchr (text, G_DIR_SEPARATOR);
+ if (last_slash)
+ return last_slash + 1;
+ else
+ return text;
}
-
/**
* _gtk_file_chooser_entry_set_action:
* @chooser_entry: a #GtkFileChooserEntry
@@ -1114,6 +822,8 @@ _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
comp = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
+ /* FIXME: do we need to actually set the following? */
+
switch (action)
{
case GTK_FILE_CHOOSER_ACTION_OPEN:
@@ -1125,6 +835,13 @@ _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
gtk_entry_completion_set_popup_single_match (comp, TRUE);
break;
}
+
+ if (chooser_entry->completion_store)
+ _gtk_file_system_model_set_show_files (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ action == GTK_FILE_CHOOSER_ACTION_SAVE);
+
+ update_inline_completion (chooser_entry);
}
}
@@ -1148,24 +865,21 @@ _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry)
gboolean
_gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
- const GtkFilePath *path)
+ GFile *file)
{
- gboolean retval = FALSE;
+ GtkTreeIter iter;
+ GFileInfo *info;
- if (chooser_entry->current_folder)
- {
- GtkFileInfo *file_info;
+ if (chooser_entry->completion_store == NULL ||
+ !_gtk_file_system_model_get_iter_for_file (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ &iter,
+ file))
+ return FALSE;
- file_info = gtk_file_folder_get_info (chooser_entry->current_folder,
- path, NULL);
- if (file_info)
- {
- retval = gtk_file_info_get_is_folder (file_info);
- gtk_file_info_free (file_info);
- }
- }
+ info = _gtk_file_system_model_get_info (GTK_FILE_SYSTEM_MODEL (chooser_entry->completion_store),
+ &iter);
- return retval;
+ return _gtk_file_info_consider_as_directory (info);
}
@@ -1193,3 +907,16 @@ _gtk_file_chooser_entry_select_filename (GtkFileChooserEntry *chooser_entry)
gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, (gint) len);
}
+void
+_gtk_file_chooser_entry_set_local_only (GtkFileChooserEntry *chooser_entry,
+ gboolean local_only)
+{
+ chooser_entry->local_only = local_only;
+ refresh_current_folder_and_file_part (chooser_entry);
+}
+
+gboolean
+_gtk_file_chooser_entry_get_local_only (GtkFileChooserEntry *chooser_entry)
+{
+ return chooser_entry->local_only;
+}