* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
+
+#include "gtkfilechooserentry.h"
+
#include <string.h>
#include "gtkalignment.h"
#include "gtkcelllayout.h"
#include "gtkcellrenderertext.h"
#include "gtkentry.h"
-#include "gtkfilechooserentry.h"
#include "gtklabel.h"
#include "gtkmain.h"
+#include "gtksizerequest.h"
#include "gtkwindow.h"
#include "gtkintl.h"
-#include "gtkalias.h"
typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
LOAD_COMPLETE_EXPLICIT_COMPLETION
} LoadCompleteAction;
+typedef enum
+{
+ REFRESH_OK,
+ REFRESH_INVALID_INPUT,
+ REFRESH_INCOMPLETE_HOSTNAME,
+ REFRESH_NONEXISTENT,
+ REFRESH_NOT_LOCAL
+} RefreshStatus;
+
struct _GtkFileChooserEntry
{
GtkEntry parent_instance;
GtkFileChooserAction action;
GtkFileSystem *file_system;
- GtkFilePath *base_folder;
+ GFile *base_folder;
+ GFile *current_folder_file;
gchar *file_part;
gint file_part_pos;
/* Folder being loaded or already loaded */
- GtkFilePath *current_folder_path;
- GtkFileFolder *current_folder;
- GtkFileSystemHandle *load_folder_handle;
+ GtkFolder *current_folder;
+ GCancellable *load_folder_cancellable;
LoadCompleteAction load_complete_action;
guint has_completion : 1;
guint in_change : 1;
guint eat_tabs : 1;
+ guint local_only : 1;
};
enum
{
DISPLAY_NAME_COLUMN,
- PATH_COLUMN,
+ FILE_COLUMN,
N_COLUMNS
};
#define COMPLETION_FEEDBACK_TIMEOUT_MS 2000
-static void gtk_file_chooser_entry_iface_init (GtkEditableClass *iface);
+static void gtk_file_chooser_entry_iface_init (GtkEditableInterface *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 void gtk_file_chooser_entry_unmap (GtkWidget *widget);
-static gboolean gtk_file_chooser_entry_focus (GtkWidget *widget,
- GtkDirectionType direction);
+static gboolean gtk_file_chooser_entry_key_press_event (GtkWidget *widget,
+ GdkEventKey *event);
static gboolean gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
GdkEventFocus *event);
static void gtk_file_chooser_entry_activate (GtkEntry *entry);
const char *key,
GtkTreeIter *iter,
gpointer data);
-static char *maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *path,
- gchar *display_name);
+static char *maybe_append_separator_to_file (GtkFileChooserEntry *chooser_entry,
+ GFile *file,
+ gchar *display_name,
+ gboolean *appended);
typedef enum {
REFRESH_UP_TO_CURSOR_POSITION,
REFRESH_WHOLE_TEXT
} RefreshMode;
-static void refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
+static RefreshStatus refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
RefreshMode refresh_mode);
-static void finished_loading_cb (GtkFileFolder *folder,
- gpointer data);
+static void finished_loading_cb (GtkFolder *folder,
+ gpointer data);
static void autocomplete (GtkFileChooserEntry *chooser_entry);
static void install_start_autocompletion_idle (GtkFileChooserEntry *chooser_entry);
static void remove_completion_feedback (GtkFileChooserEntry *chooser_entry);
static void pop_up_completion_feedback (GtkFileChooserEntry *chooser_entry,
const gchar *feedback);
-static GtkEditableClass *parent_editable_iface;
+static GtkEditableInterface *parent_editable_iface;
G_DEFINE_TYPE_WITH_CODE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY,
G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
widget_class->unmap = gtk_file_chooser_entry_unmap;
- widget_class->focus = gtk_file_chooser_entry_focus;
+ widget_class->key_press_event = gtk_file_chooser_entry_key_press_event;
widget_class->focus_out_event = gtk_file_chooser_entry_focus_out_event;
entry_class->activate = gtk_file_chooser_entry_activate;
}
static void
-gtk_file_chooser_entry_iface_init (GtkEditableClass *iface)
+gtk_file_chooser_entry_iface_init (GtkEditableInterface *iface)
{
parent_editable_iface = g_type_interface_peek_parent (iface);
GtkEntryCompletion *comp;
GtkCellRenderer *cell;
+ chooser_entry->local_only = TRUE;
+
g_object_set (chooser_entry, "truncate-multiline", TRUE, NULL);
comp = gtk_entry_completion_new ();
cell,
"text", 0);
- 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);
#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
}
{
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)
+ g_object_unref (chooser_entry->current_folder);
+
+ if (chooser_entry->current_folder_file)
+ g_object_unref (chooser_entry->current_folder_file);
+
g_free (chooser_entry->file_part);
G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object);
}
+static void
+discard_current_folder (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->current_folder)
+ {
+ g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+ G_CALLBACK (finished_loading_cb), chooser_entry);
+ g_object_unref (chooser_entry->current_folder);
+ chooser_entry->current_folder = NULL;
+ }
+}
+
+static void
+discard_loading_and_current_folder_file (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->load_folder_cancellable)
+ {
+ g_cancellable_cancel (chooser_entry->load_folder_cancellable);
+ chooser_entry->load_folder_cancellable = NULL;
+ }
+
+ if (chooser_entry->current_folder_file)
+ {
+ g_object_unref (chooser_entry->current_folder_file);
+ chooser_entry->current_folder_file = NULL;
+ }
+}
+
static void
gtk_file_chooser_entry_dispose (GObject *object)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
remove_completion_feedback (chooser_entry);
+ discard_current_folder (chooser_entry);
+ discard_loading_and_current_folder_file (chooser_entry);
if (chooser_entry->start_autocompletion_idle_id != 0)
{
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 (finished_loading_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);
GtkFileChooserEntry *chooser_entry)
{
char *display_name;
- GtkFilePath *path;
+ GFile *file;
gint pos;
+ gboolean dummy;
gtk_tree_model_get (model, iter,
DISPLAY_NAME_COLUMN, &display_name,
- PATH_COLUMN, &path,
+ FILE_COLUMN, &file,
-1);
- if (!display_name || !path)
+ if (!display_name || !file)
{
- /* these shouldn't complain if passed NULL */
- gtk_file_path_free (path);
+ if (file)
+ g_object_unref (file);
+
g_free (display_name);
return FALSE;
}
- display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+ display_name = maybe_append_separator_to_file (chooser_entry, file, display_name, &dummy);
pos = chooser_entry->file_part_pos;
&pos);
gtk_editable_set_position (GTK_EDITABLE (chooser_entry), -1);
- gtk_file_path_free (path);
+ g_object_unref (file);
g_free (display_name);
return TRUE;
static void
beep (GtkFileChooserEntry *chooser_entry)
{
- gdk_display_beep (gtk_widget_get_display (GTK_WIDGET (chooser_entry)));
+ gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
}
/* 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
+ * maybe_append_separator_to_file 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);
+ * display_name = maybe_append_separator_to_file (entry, file, display_name, &appended);
* ...
* g_free (display_name);
*/
static char *
-maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *path,
- gchar *display_name)
+maybe_append_separator_to_file (GtkFileChooserEntry *chooser_entry,
+ GFile *file,
+ gchar *display_name,
+ gboolean *appended)
{
- if (!g_str_has_suffix (display_name, G_DIR_SEPARATOR_S) && path)
+ *appended = FALSE;
+
+ if (!g_str_has_suffix (display_name, G_DIR_SEPARATOR_S) && file)
{
- GtkFileInfo *info;
-
- info = gtk_file_folder_get_info (chooser_entry->current_folder,
- path, NULL); /* NULL-GError */
+ GFileInfo *info;
+
+ info = _gtk_folder_get_info (chooser_entry->current_folder, file);
if (info)
{
- if (gtk_file_info_get_is_folder (info))
+ if (_gtk_file_info_consider_as_directory (info))
{
gchar *tmp = display_name;
display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
+ *appended = TRUE;
g_free (tmp);
}
-
- gtk_file_info_free (info);
+
+ g_object_unref (info);
}
}
return display_name;
}
+static char *
+trim_dir_separator_suffix (const char *str)
+{
+ int len;
+
+ len = strlen (str);
+ if (len > 0 && G_IS_DIR_SEPARATOR (str[len - 1]))
+ return g_strndup (str, len - 1);
+ else
+ return g_strdup (str);
+}
+
/* 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 gboolean
find_common_prefix (GtkFileChooserEntry *chooser_entry,
gchar **common_prefix_ret,
- GtkFilePath **unique_path_ret,
+ GFile **unique_file_ret,
gboolean *is_complete_not_unique_ret,
gboolean *prefix_expands_the_file_part_ret,
GError **error)
gboolean parsed;
gboolean valid;
char *text_up_to_cursor;
- GtkFilePath *parsed_folder_path;
+ GFile *parsed_folder_file;
char *parsed_file_part;
*common_prefix_ret = NULL;
- *unique_path_ret = NULL;
+ *unique_file_ret = NULL;
*is_complete_not_unique_ret = FALSE;
*prefix_expands_the_file_part_ret = FALSE;
text_up_to_cursor = gtk_editable_get_chars (editable, 0, gtk_editable_get_position (editable));
- parsed = gtk_file_system_parse (chooser_entry->file_system,
- chooser_entry->base_folder,
- text_up_to_cursor,
- &parsed_folder_path,
- &parsed_file_part,
- error);
+ parsed = _gtk_file_system_parse (chooser_entry->file_system,
+ chooser_entry->base_folder,
+ text_up_to_cursor,
+ &parsed_folder_file,
+ &parsed_file_part,
+ error);
g_free (text_up_to_cursor);
if (!parsed)
return FALSE;
- g_assert (parsed_folder_path != NULL
- && chooser_entry->current_folder_path != NULL
- && gtk_file_path_compare (parsed_folder_path, chooser_entry->current_folder_path) == 0);
+ g_assert (parsed_folder_file != NULL
+ && chooser_entry->current_folder != NULL
+ && g_file_equal (parsed_folder_file, chooser_entry->current_folder_file));
- gtk_file_path_free (parsed_folder_path);
+ g_object_unref (parsed_folder_file);
/* First pass: find the common prefix */
while (valid)
{
gchar *display_name;
- GtkFilePath *path;
+ GFile *file;
gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
&iter,
DISPLAY_NAME_COLUMN, &display_name,
- PATH_COLUMN, &path,
+ FILE_COLUMN, &file,
-1);
if (g_str_has_prefix (display_name, parsed_file_part))
{
if (!*common_prefix_ret)
{
- *common_prefix_ret = g_strdup (display_name);
- *unique_path_ret = gtk_file_path_copy (path);
+ *common_prefix_ret = trim_dir_separator_suffix (display_name);
+ *unique_file_ret = g_object_ref (file);
}
else
{
*p = '\0';
- gtk_file_path_free (*unique_path_ret);
- *unique_path_ret = NULL;
+ if (*unique_file_ret)
+ {
+ g_object_unref (*unique_file_ret);
+ *unique_file_ret = NULL;
+ }
}
}
g_free (display_name);
- gtk_file_path_free (path);
+ g_object_unref (file);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
}
if (G_IS_DIR_SEPARATOR (display_name[len - 1]))
len--;
- if (strncmp (*common_prefix_ret, display_name, len) == 0)
+ if (*unique_file_ret == NULL && strncmp (*common_prefix_ret, display_name, len) == 0)
*is_complete_not_unique_ret = TRUE;
g_free (display_name);
return TRUE;
}
+static gboolean
+char_after_cursor_is_directory_separator (GtkFileChooserEntry *chooser_entry)
+{
+ int cursor_pos;
+ gboolean result;
+
+ result = FALSE;
+
+ cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
+ if (cursor_pos < gtk_entry_get_text_length (GTK_ENTRY (chooser_entry)))
+ {
+ char *next_char_str;
+
+ next_char_str = gtk_editable_get_chars (GTK_EDITABLE (chooser_entry), cursor_pos, cursor_pos + 1);
+ if (G_IS_DIR_SEPARATOR (*next_char_str))
+ result = TRUE;
+
+ g_free (next_char_str);
+ }
+
+ return result;
+}
+
typedef enum {
INVALID_INPUT, /* what the user typed is bogus */
NO_MATCH, /* no matches based on what the user typed */
NOTHING_INSERTED_COMPLETE, /* what the user typed is already completed as far as it will go */
+ NOTHING_INSERTED_UNIQUE, /* what the user typed is already completed, and is a unique match */
COMPLETED, /* completion inserted (ambiguous suffix) */
COMPLETED_UNIQUE, /* completion inserted, and it is a complete name and a unique match */
COMPLETE_BUT_NOT_UNIQUE /* completion inserted, it is a complete name but not unique */
} CommonPrefixResult;
-/* 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 CommonPrefixResult
append_common_prefix (GtkFileChooserEntry *chooser_entry,
- gboolean highlight,
- gboolean show_errors)
+ gboolean highlight,
+ gboolean show_errors)
{
gchar *common_prefix;
- GtkFilePath *unique_path;
+ GFile *unique_file;
gboolean is_complete_not_unique;
gboolean prefix_expands_the_file_part;
GError *error;
- CommonPrefixResult result;
+ CommonPrefixResult result = NO_MATCH;
gboolean have_result;
clear_completions (chooser_entry);
return NO_MATCH;
error = NULL;
- if (!find_common_prefix (chooser_entry, &common_prefix, &unique_path, &is_complete_not_unique, &prefix_expands_the_file_part, &error))
+ if (!find_common_prefix (chooser_entry, &common_prefix, &unique_file, &is_complete_not_unique, &prefix_expands_the_file_part, &error))
{
- if (show_errors)
- {
- beep (chooser_entry);
- pop_up_completion_feedback (chooser_entry, _("Invalid path"));
- }
+ /* If the user types an incomplete hostname ("http://foo" without
+ * a slash after that), it's not an error. We just don't want to
+ * pop up a meaningless completion window in that state.
+ */
+ if (!g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME)
+ && show_errors)
+ {
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, _("Invalid path"));
+ }
g_error_free (error);
have_result = FALSE;
- if (unique_path)
+ if (unique_file)
{
- common_prefix = maybe_append_separator_to_path (chooser_entry,
- unique_path,
- common_prefix);
- gtk_file_path_free (unique_path);
+ if (!char_after_cursor_is_directory_separator (chooser_entry))
+ {
+ gboolean appended;
+
+ common_prefix = maybe_append_separator_to_file (chooser_entry,
+ unique_file,
+ common_prefix,
+ &appended);
+ if (appended)
+ prefix_expands_the_file_part = TRUE;
+ }
- if (common_prefix)
- result = COMPLETED_UNIQUE;
+ g_object_unref (unique_file);
+
+ if (prefix_expands_the_file_part)
+ result = COMPLETED_UNIQUE;
else
- result = INVALID_INPUT;
+ result = NOTHING_INSERTED_UNIQUE;
have_result = TRUE;
}
else
{
if (is_complete_not_unique)
- {
- result = COMPLETE_BUT_NOT_UNIQUE;
- have_result = TRUE;
- }
+ {
+ result = COMPLETE_BUT_NOT_UNIQUE;
+ have_result = TRUE;
+ }
}
if (common_prefix)
{
gint cursor_pos;
- gint common_prefix_len;
gint pos;
cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
- common_prefix_len = g_utf8_strlen (common_prefix, -1);
pos = chooser_entry->file_part_pos;
if (prefix_expands_the_file_part)
- {
- chooser_entry->in_change = TRUE;
- gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
- pos, cursor_pos);
- 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),
- cursor_pos,
- pos); /* equivalent to cursor_pos + common_prefix_len); */
- chooser_entry->has_completion = TRUE;
- }
- else
- gtk_editable_set_position (GTK_EDITABLE (chooser_entry), pos);
- }
- else
- {
- result = NOTHING_INSERTED_COMPLETE;
- have_result = TRUE;
- }
+ {
+ chooser_entry->in_change = TRUE;
+ gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
+ pos, cursor_pos);
+ gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
+ common_prefix, -1,
+ &pos);
+ chooser_entry->in_change = FALSE;
+
+ if (highlight)
+ {
+ /* equivalent to cursor_pos + common_prefix_len); */
+ gtk_editable_select_region (GTK_EDITABLE (chooser_entry),
+ cursor_pos,
+ pos);
+ chooser_entry->has_completion = TRUE;
+ }
+ else
+ gtk_editable_set_position (GTK_EDITABLE (chooser_entry), pos);
+ }
+ else if (!have_result)
+ {
+ result = NOTHING_INSERTED_COMPLETE;
+ have_result = TRUE;
+ }
g_free (common_prefix);
if (have_result)
- return result;
+ return result;
else
- return COMPLETED;
+ return COMPLETED;
}
else
{
if (have_result)
- return result;
+ return result;
else
- return NO_MATCH;
+ return NO_MATCH;
}
}
gint old_text_len;
gint insert_pos;
- old_text_len = GTK_ENTRY (chooser_entry)->text_length;
+ old_text_len = gtk_entry_get_text_length (GTK_ENTRY (chooser_entry));
insert_pos = *position;
parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
}
static gboolean
-completion_feedback_window_expose_event_cb (GtkWidget *widget,
- GdkEventExpose *event,
- gpointer data)
+completion_feedback_window_draw_cb (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer data)
{
/* Stolen from gtk_tooltip_paint_window() */
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+ GtkStyleContext *context;
- gtk_paint_flat_box (chooser_entry->completion_feedback_window->style,
- chooser_entry->completion_feedback_window->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- NULL,
- chooser_entry->completion_feedback_window,
- "tooltip",
- 0, 0,
- chooser_entry->completion_feedback_window->allocation.width,
- chooser_entry->completion_feedback_window->allocation.height);
+ context = gtk_widget_get_style_context (chooser_entry->completion_feedback_window);
+
+ gtk_render_background (context, cr, 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
+ gtk_render_frame (context, cr, 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
return FALSE;
}
+static void
+set_invisible_mouse_cursor (GdkWindow *window)
+{
+ GdkDisplay *display;
+ GdkCursor *cursor;
+
+ display = gdk_window_get_display (window);
+ cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
+
+ gdk_window_set_cursor (window, cursor);
+
+ g_object_unref (cursor);
+}
+
+static void
+completion_feedback_window_realize_cb (GtkWidget *widget,
+ gpointer data)
+{
+ /* We hide the mouse cursor inside the completion feedback window, since
+ * GtkEntry hides the cursor when the user types. We don't want the cursor to
+ * come back if the completion feedback ends up where the mouse is.
+ */
+ set_invisible_mouse_cursor (gtk_widget_get_window (widget));
+}
+
static void
create_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
{
/* Stolen from gtk_tooltip_init() */
+ GtkStyleContext *context;
GtkWidget *alignment;
+ GtkBorder padding, border;
chooser_entry->completion_feedback_window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_type_hint (GTK_WINDOW (chooser_entry->completion_feedback_window),
gtk_widget_set_name (chooser_entry->completion_feedback_window, "gtk-tooltip");
alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+ context = gtk_widget_get_style_context (chooser_entry->completion_feedback_window);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLTIP);
+
+ gtk_style_context_get_padding (context, 0, &padding);
+ gtk_style_context_get_border (context, 0, &border);
+
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
- chooser_entry->completion_feedback_window->style->ythickness,
- chooser_entry->completion_feedback_window->style->ythickness,
- chooser_entry->completion_feedback_window->style->xthickness,
- chooser_entry->completion_feedback_window->style->xthickness);
+ border.top + padding.top,
+ border.bottom + padding.bottom,
+ border.left + padding.left,
+ border.right + padding.right);
gtk_container_add (GTK_CONTAINER (chooser_entry->completion_feedback_window), alignment);
gtk_widget_show (alignment);
- g_signal_connect (chooser_entry->completion_feedback_window, "expose_event",
- G_CALLBACK (completion_feedback_window_expose_event_cb), chooser_entry);
+ g_signal_connect (chooser_entry->completion_feedback_window, "draw",
+ G_CALLBACK (completion_feedback_window_draw_cb), chooser_entry);
+ g_signal_connect (chooser_entry->completion_feedback_window, "realize",
+ G_CALLBACK (completion_feedback_window_realize_cb), chooser_entry);
+ /* FIXME: connect to motion-notify-event, and *show* the cursor when the mouse moves */
chooser_entry->completion_feedback_label = gtk_label_new (NULL);
gtk_container_add (GTK_CONTAINER (alignment), chooser_entry->completion_feedback_label);
static void
install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
{
- g_assert (chooser_entry->completion_feedback_timeout_id == 0);
+ if (chooser_entry->completion_feedback_timeout_id != 0)
+ g_source_remove (chooser_entry->completion_feedback_timeout_id);
chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
completion_feedback_timeout_cb,
gint layout_x, layout_y;
gint layout_index;
PangoRectangle strong_pos;
+ gint start_pos, end_pos;
layout = gtk_entry_get_layout (GTK_ENTRY (chooser_entry));
gtk_entry_get_layout_offsets (GTK_ENTRY (chooser_entry), &layout_x, &layout_y);
+ gtk_editable_get_selection_bounds (GTK_EDITABLE (chooser_entry), &start_pos, &end_pos);
layout_index = gtk_entry_text_index_to_layout_index (GTK_ENTRY (chooser_entry),
- GTK_ENTRY (chooser_entry)->current_pos);
+ end_pos);
+
pango_layout_get_cursor_pos (layout, layout_index, &strong_pos, NULL);
/* More or less stolen from gtk_tooltip_position() */
GtkRequisition feedback_req;
+ GtkWidget *widget = GTK_WIDGET (chooser_entry);
gint entry_x, entry_y;
gint cursor_x;
- GtkAllocation *entry_allocation;
+ GtkAllocation entry_allocation;
int feedback_x, feedback_y;
- gtk_widget_size_request (chooser_entry->completion_feedback_window, &feedback_req);
+ gtk_widget_get_preferred_size (chooser_entry->completion_feedback_window,
+ &feedback_req, NULL);
- gdk_window_get_origin (GTK_WIDGET (chooser_entry)->window, &entry_x, &entry_y);
- entry_allocation = &(GTK_WIDGET (chooser_entry)->allocation);
+ gdk_window_get_origin (gtk_widget_get_window (widget), &entry_x, &entry_y);
+ gtk_widget_get_allocation (widget, &entry_allocation);
get_entry_cursor_x (chooser_entry, &cursor_x);
- feedback_x = entry_x + cursor_x + 2; /* FIXME: fit to the screen if we bump on the screen's edge */
- feedback_y = entry_y + (entry_allocation->height - feedback_req.height) / 2;
+ /* FIXME: fit to the screen if we bump on the screen's edge */
+ /* cheap "half M-width", use height as approximation of character em-size */
+ feedback_x = entry_x + cursor_x + entry_allocation.height / 2;
+ feedback_y = entry_y + (entry_allocation.height - feedback_req.height) / 2;
gtk_window_move (GTK_WINDOW (chooser_entry->completion_feedback_window), feedback_x, feedback_y);
gtk_widget_show (chooser_entry->completion_feedback_window);
CommonPrefixResult result;
g_assert (chooser_entry->current_folder != NULL);
- g_assert (gtk_file_folder_is_finished_loading (chooser_entry->current_folder));
+ g_assert (_gtk_folder_is_finished_loading (chooser_entry->current_folder));
/* FIXME: see what Emacs does in case there is no common prefix, or there is more than one match:
*
case NO_MATCH:
beep (chooser_entry);
+ /* translators: this text is shown when there are no completions
+ * for something the user typed in a file chooser entry
+ */
pop_up_completion_feedback (chooser_entry, _("No match"));
break;
/* FIXME: pop up the suggestion window or scroll it */
break;
+ case NOTHING_INSERTED_UNIQUE:
+ /* translators: this text is shown when there is exactly one completion
+ * for something the user typed in a file chooser entry
+ */
+ pop_up_completion_feedback (chooser_entry, _("Sole completion"));
+ break;
+
case COMPLETED:
/* Nothing to do */
break;
case COMPLETED_UNIQUE:
- pop_up_completion_feedback (chooser_entry, _("Sole completion"));
- /* FIXME: if the user keeps hitting Tab after completing a unique match, present feedback with "Sole completion") */
+ /* Nothing to do */
break;
case COMPLETE_BUT_NOT_UNIQUE:
+ /* translators: this text is shown when the text in a file chooser
+ * entry is a complete filename, but could be continued to find
+ * a longer match
+ */
pop_up_completion_feedback (chooser_entry, _("Complete, but not unique"));
break;
static void
start_explicit_completion (GtkFileChooserEntry *chooser_entry)
{
- refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+ RefreshStatus status;
+ gboolean is_error;
+ char *feedback_msg;
+
+ status = refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
- if (!chooser_entry->current_folder_path)
+ is_error = FALSE;
+
+ switch (status)
{
- /* Here, no folder path means we couldn't parse what the user typed. */
+ case REFRESH_OK:
+ g_assert (chooser_entry->current_folder_file != NULL);
- beep (chooser_entry);
- pop_up_completion_feedback (chooser_entry, _("Invalid path"));
+ if (chooser_entry->current_folder && _gtk_folder_is_finished_loading (chooser_entry->current_folder))
+ explicitly_complete (chooser_entry);
+ else
+ {
+ chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION;
- chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+ /* Translators: this text is shown while the system is searching
+ * for possible completions for filenames in a file chooser entry. */
+ pop_up_completion_feedback (chooser_entry, _("Completing..."));
+ }
+
+ break;
+
+ case REFRESH_INVALID_INPUT:
+ is_error = TRUE;
+ /* Translators: this is shown in the feedback for Tab-completion in a file
+ * chooser's text entry, when the user enters an invalid path. */
+ feedback_msg = _("Invalid path");
+ break;
+
+ case REFRESH_INCOMPLETE_HOSTNAME:
+ is_error = TRUE;
+
+ if (chooser_entry->local_only)
+ {
+ /* hostnames in a local_only file chooser? user error */
+
+ /* Translators: this is shown in the feedback for Tab-completion in a
+ * file chooser's text entry when the user enters something like
+ * "sftp://blahblah" in an app that only supports local filenames. */
+ feedback_msg = _("Only local files may be selected");
+ }
+ else
+ {
+ /* Another option is to complete the hostname based on the remote volumes that are mounted */
+
+ /* Translators: this is shown in the feedback for Tab-completion in a
+ * file chooser's text entry when the user hasn't entered the first '/'
+ * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]") */
+ feedback_msg = _("Incomplete hostname; end it with '/'");
+ }
+
+ break;
+
+ case REFRESH_NONEXISTENT:
+ is_error = TRUE;
+
+ /* Translators: this is shown in the feedback for Tab-completion in a file
+ * chooser's text entry when the user enters a path that does not exist
+ * and then hits Tab */
+ feedback_msg = _("Path does not exist");
+ break;
+
+ case REFRESH_NOT_LOCAL:
+ is_error = TRUE;
+ feedback_msg = _("Only local files may be selected");
+ break;
+
+ default:
+ g_assert_not_reached ();
return;
}
- if (chooser_entry->current_folder
- && gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
+ if (is_error)
{
- explicitly_complete (chooser_entry);
- }
- else
- {
- chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION;
+ g_assert (chooser_entry->current_folder_file == NULL);
- pop_up_completion_feedback (chooser_entry, _("Completing..."));
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, feedback_msg);
+ chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
}
}
static gboolean
-gtk_file_chooser_entry_focus (GtkWidget *widget,
- GtkDirectionType direction)
+gtk_file_chooser_entry_key_press_event (GtkWidget *widget,
+ GdkEventKey *event)
{
GtkFileChooserEntry *chooser_entry;
GtkEditable *editable;
entry = GTK_ENTRY (widget);
if (!chooser_entry->eat_tabs)
- return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+ return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->key_press_event (widget, event);
control_pressed = FALSE;
/* 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))
+ if (event->keyval == GDK_KEY_Tab && !control_pressed)
{
if (chooser_entry->has_completion)
- gtk_editable_set_position (editable, entry->text_length);
+ gtk_editable_set_position (editable, gtk_entry_get_text_length (entry));
else
start_explicit_completion (chooser_entry);
return TRUE;
- }
- else
- return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+ }
+
+ return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->key_press_event (widget, event);
+
}
static gboolean
}
static void
-gtk_file_chooser_entry_activate (GtkEntry *entry)
+commit_completion_and_refresh (GtkFileChooserEntry *chooser_entry)
{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
-
if (chooser_entry->has_completion)
{
- gtk_editable_set_position (GTK_EDITABLE (entry),
- entry->text_length);
+ gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
+ gtk_entry_get_text_length (GTK_ENTRY (chooser_entry)));
}
+ /* Here we ignore the result of refresh_current_folder_and_file_part(); there is nothing we can do with it */
refresh_current_folder_and_file_part (chooser_entry, REFRESH_WHOLE_TEXT);
+}
+static void
+gtk_file_chooser_entry_activate (GtkEntry *entry)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
+
+ commit_completion_and_refresh (chooser_entry);
GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
}
static void
populate_completion_store (GtkFileChooserEntry *chooser_entry)
{
- GSList *paths;
+ GSList *files;
GSList *tmp_list;
discard_completion_store (chooser_entry);
- if (!gtk_file_folder_list_children (chooser_entry->current_folder, &paths, NULL)) /* NULL-GError */
- return;
+ files = _gtk_folder_list_children (chooser_entry->current_folder);
chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
- GTK_TYPE_FILE_PATH);
+ G_TYPE_FILE);
- for (tmp_list = paths; tmp_list; tmp_list = tmp_list->next)
+ for (tmp_list = files; tmp_list; tmp_list = tmp_list->next)
{
- GtkFileInfo *info;
- GtkFilePath *path;
+ GFileInfo *info;
+ GFile *file;
- path = tmp_list->data;
+ file = tmp_list->data;
+
+ info = _gtk_folder_get_info (chooser_entry->current_folder, file);
- 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));
+ gchar *display_name = g_strdup (g_file_info_get_display_name (info));
GtkTreeIter iter;
+ gboolean dummy;
- display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+ display_name = maybe_append_separator_to_file (chooser_entry, file, display_name, &dummy);
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,
+ FILE_COLUMN, file,
-1);
- gtk_file_info_free (info);
+ g_object_unref (info);
g_free (display_name);
}
}
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
/* Callback when the current folder finishes loading */
static void
-finished_loading_cb (GtkFileFolder *folder,
- gpointer data)
+finished_loading_cb (GtkFolder *folder,
+ gpointer data)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
/* Callback when the current folder's handle gets obtained (not necessarily loaded completely) */
static void
-load_directory_get_folder_callback (GtkFileSystemHandle *handle,
- GtkFileFolder *folder,
- const GError *error,
- gpointer data)
+load_directory_get_folder_callback (GCancellable *cancellable,
+ GtkFolder *folder,
+ const GError *error,
+ gpointer data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GtkFileChooserEntry *chooser_entry = data;
- if (handle != chooser_entry->load_folder_handle)
+ if (cancellable != chooser_entry->load_folder_cancellable)
goto out;
- chooser_entry->load_folder_handle = NULL;
+ chooser_entry->load_folder_cancellable = NULL;
if (error)
{
old_load_complete_action = chooser_entry->load_complete_action;
+ discard_completion_store (chooser_entry);
clear_completions (chooser_entry);
if (old_load_complete_action == LOAD_COMPLETE_EXPLICIT_COMPLETION)
pop_up_completion_feedback (chooser_entry, error->message);
}
- gtk_file_path_free (chooser_entry->current_folder_path);
- chooser_entry->current_folder_path = NULL;
+ discard_current_folder (chooser_entry);
}
if (cancelled || error)
goto out;
g_assert (folder != NULL);
- chooser_entry->current_folder = folder;
+ chooser_entry->current_folder = g_object_ref (folder);
discard_completion_store (chooser_entry);
- if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
+ if (_gtk_folder_is_finished_loading (chooser_entry->current_folder))
finish_folder_load (chooser_entry);
else
g_signal_connect (chooser_entry->current_folder, "finished-loading",
out:
g_object_unref (chooser_entry);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
-static void
+static RefreshStatus
start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
{
- if (chooser_entry->current_folder_path == NULL ||
- chooser_entry->file_system == NULL)
- return;
+ if (chooser_entry->file_system == NULL)
+ return REFRESH_OK;
+ g_assert (chooser_entry->current_folder_file != NULL);
g_assert (chooser_entry->current_folder == NULL);
- g_assert (chooser_entry->load_folder_handle == NULL);
+ g_assert (chooser_entry->load_folder_cancellable == NULL);
+
+ if (chooser_entry->local_only
+ && !g_file_is_native (chooser_entry->current_folder_file))
+ {
+ g_object_unref (chooser_entry->current_folder_file);
+ chooser_entry->current_folder_file = NULL;
+
+ return REFRESH_NOT_LOCAL;
+ }
+
+ chooser_entry->load_folder_cancellable =
+ _gtk_file_system_get_folder (chooser_entry->file_system,
+ chooser_entry->current_folder_file,
+ "standard::name,standard::display-name,standard::type",
+ load_directory_get_folder_callback,
+ g_object_ref (chooser_entry));
- 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));
+ return REFRESH_OK;
}
-static void
+static RefreshStatus
reload_current_folder (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *folder_path,
+ GFile *folder_file,
gboolean force_reload)
{
gboolean reload = FALSE;
- if (chooser_entry->current_folder_path)
+ g_assert (folder_file != NULL);
+
+ if (chooser_entry->current_folder_file)
{
- if ((folder_path && gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0)
+ if ((!(g_file_equal (folder_file, chooser_entry->current_folder_file)
+ && chooser_entry->load_folder_cancellable))
|| force_reload)
{
reload = TRUE;
- /* We changed our current directory. We need to clear out the old
- * directory information.
- */
- if (chooser_entry->current_folder)
- {
- if (chooser_entry->load_folder_handle)
- {
- gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
- chooser_entry->load_folder_handle = NULL;
- }
+ discard_current_folder (chooser_entry);
+ discard_loading_and_current_folder_file (chooser_entry);
- g_object_unref (chooser_entry->current_folder);
- chooser_entry->current_folder = NULL;
- }
-
- gtk_file_path_free (chooser_entry->current_folder_path);
- chooser_entry->current_folder_path = gtk_file_path_copy (folder_path);
+ chooser_entry->current_folder_file = g_object_ref (folder_file);
}
}
else
{
- chooser_entry->current_folder_path = gtk_file_path_copy (folder_path);
+ chooser_entry->current_folder_file = g_object_ref (folder_file);
reload = TRUE;
}
if (reload)
- start_loading_current_folder (chooser_entry);
+ return start_loading_current_folder (chooser_entry);
+ else
+ return REFRESH_OK;
}
-static void
+static RefreshStatus
refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
RefreshMode refresh_mode)
{
GtkEditable *editable;
gint end_pos;
gchar *text;
- GtkFilePath *folder_path;
+ GFile *folder_file;
gchar *file_part;
gsize total_len, file_part_len;
gint file_part_pos;
+ GError *error;
+ RefreshStatus result;
editable = GTK_EDITABLE (chooser_entry);
break;
case REFRESH_WHOLE_TEXT:
- end_pos = GTK_ENTRY (chooser_entry)->text_length;
+ end_pos = gtk_entry_get_text_length (GTK_ENTRY (chooser_entry));
break;
default:
g_assert_not_reached ();
- return;
+ return REFRESH_INVALID_INPUT;
}
text = gtk_editable_get_chars (editable, 0, end_pos);
-
+
+ error = NULL;
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 */
+ !_gtk_file_system_parse (chooser_entry->file_system,
+ chooser_entry->base_folder, text,
+ &folder_file, &file_part, &error))
{
- folder_path = gtk_file_path_copy (chooser_entry->base_folder);
+ if (g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME))
+ {
+ folder_file = NULL;
+ result = REFRESH_INCOMPLETE_HOSTNAME;
+ }
+ else
+ {
+ folder_file = (chooser_entry->base_folder) ? g_object_ref (chooser_entry->base_folder) : NULL;
+
+ if (g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_NONEXISTENT))
+ result = REFRESH_NONEXISTENT;
+ else
+ result = REFRESH_INVALID_INPUT;
+ }
+
+ if (error)
+ g_error_free (error);
+
file_part = g_strdup ("");
file_part_pos = -1;
}
else
{
+ g_assert (folder_file != NULL);
+
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;
+
+ result = REFRESH_OK;
}
g_free (text);
chooser_entry->file_part = file_part;
chooser_entry->file_part_pos = file_part_pos;
- reload_current_folder (chooser_entry, folder_path, file_part_pos == -1);
- gtk_file_path_free (folder_path);
+ if (result == REFRESH_OK)
+ {
+ result = reload_current_folder (chooser_entry, folder_file, file_part_pos == -1);
+ }
+ else
+ {
+ discard_current_folder (chooser_entry);
+ discard_loading_and_current_folder_file (chooser_entry);
+ }
+
+ if (folder_file)
+ g_object_unref (folder_file);
+
+ g_assert (/* we are OK and we have a current folder file and (loading process or folder handle)... */
+ ((result == REFRESH_OK)
+ && (chooser_entry->current_folder_file != NULL)
+ && (((chooser_entry->load_folder_cancellable != NULL) && (chooser_entry->current_folder == NULL))
+ || ((chooser_entry->load_folder_cancellable == NULL) && (chooser_entry->current_folder != NULL))))
+ /* ... OR we have an error, and we don't have a current folder file nor a loading process nor a folder handle */
+ || ((result != REFRESH_OK)
+ && (chooser_entry->current_folder_file == NULL)
+ && (chooser_entry->load_folder_cancellable == NULL)
+ && (chooser_entry->current_folder == NULL)));
+
+ return result;
}
static void
autocomplete (GtkFileChooserEntry *chooser_entry)
{
- g_assert (chooser_entry->current_folder != NULL);
- g_assert (gtk_file_folder_is_finished_loading (chooser_entry->current_folder));
- g_assert (gtk_editable_get_position (GTK_EDITABLE (chooser_entry)) == GTK_ENTRY (chooser_entry)->text_length);
+ if (!(chooser_entry->current_folder != NULL
+ && _gtk_folder_is_finished_loading (chooser_entry->current_folder)
+ && gtk_editable_get_position (GTK_EDITABLE (chooser_entry)) == gtk_entry_get_text_length (GTK_ENTRY (chooser_entry))))
+ return;
append_common_prefix (chooser_entry, TRUE, FALSE);
}
static void
start_autocompletion (GtkFileChooserEntry *chooser_entry)
{
- refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+ RefreshStatus status;
+
+ status = refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
- if (!chooser_entry->current_folder)
+ switch (status)
{
+ case REFRESH_OK:
+ g_assert (chooser_entry->current_folder_file != NULL);
+
+ if (chooser_entry->current_folder && _gtk_folder_is_finished_loading (chooser_entry->current_folder))
+ autocomplete (chooser_entry);
+ else
+ chooser_entry->load_complete_action = LOAD_COMPLETE_AUTOCOMPLETE;
+
+ break;
+
+ case REFRESH_INVALID_INPUT:
+ case REFRESH_INCOMPLETE_HOSTNAME:
+ case REFRESH_NONEXISTENT:
+ case REFRESH_NOT_LOCAL:
/* We don't beep or anything, since this is autocompletion - the user
* didn't request any action explicitly.
*/
- return;
- }
+ break;
- if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
- autocomplete (chooser_entry);
- else
- chooser_entry->load_complete_action = LOAD_COMPLETE_AUTOCOMPLETE;
+ default:
+ g_assert_not_reached ();
+ }
}
static gboolean
if (chooser_entry->start_autocompletion_idle_id != 0)
return;
- chooser_entry->start_autocompletion_idle_id = g_idle_add (start_autocompletion_idle_handler, chooser_entry);
+ chooser_entry->start_autocompletion_idle_id = gdk_threads_add_idle (start_autocompletion_idle_handler, chooser_entry);
}
#ifdef G_OS_WIN32
*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));
{
/* 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,
/**
* _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)
{
if (chooser_entry->base_folder)
- gtk_file_path_free (chooser_entry->base_folder);
+ g_object_unref (chooser_entry->base_folder);
+
+ chooser_entry->base_folder = file;
- chooser_entry->base_folder = gtk_file_path_copy (path);
+ if (chooser_entry->base_folder)
+ g_object_ref (chooser_entry->base_folder);
clear_completions (chooser_entry);
_gtk_file_chooser_entry_select_filename (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
+ * Return value: the file for the current folder - this value is owned by the
* chooser entry and must not be modified or freed.
**/
-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;
+ commit_completion_and_refresh (chooser_entry);
+ return chooser_entry->current_folder_file;
}
/**
*
* 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
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);
- }
-
- refresh_current_folder_and_file_part (chooser_entry, REFRESH_WHOLE_TEXT);
-
+ commit_completion_and_refresh (chooser_entry);
return chooser_entry->file_part;
}
gboolean
_gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
- const GtkFilePath *path)
+ GFile *file)
{
gboolean retval = FALSE;
if (chooser_entry->current_folder)
{
- GtkFileInfo *file_info;
+ GFileInfo *file_info;
+
+ file_info = _gtk_folder_get_info (chooser_entry->current_folder, file);
- 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);
+ retval = _gtk_file_info_consider_as_directory (file_info);
+ g_object_unref (file_info);
}
}
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;
+ clear_completions (chooser_entry);
+}
+
+gboolean
+_gtk_file_chooser_entry_get_local_only (GtkFileChooserEntry *chooser_entry)
+{
+ return chooser_entry->local_only;
+}
projects / ~andy / gtk / blobdiff