AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-07 11:20:09 +00:00
Code Issues Projects Releases Wiki Activity

filechooserentry: Keep an extra column for the full path

Browse Source 
This is identical to the display name when not having a path that
changes the folder. Otherwise it will have the full path that was
entered in the entry. Say when from your home dir, you type
"../../usr/li", the full path for "lib" and "lib64" will be
"../../usr/lib" and "../../usr/lib64" respectively. This value isn't
used yet, but will be soon.
This commit is contained in:
Benjamin Otte 2011-11-05 22:31:40 +01:00
parent fc775dfa5b
commit cde8ae7b1e
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkfilechooserentry.c
View File

@ -69,6 +69,7 @@ struct _GtkFileChooserEntry
GFile *base_folder; GFile *base_folder;
GFile *current_folder_file; GFile *current_folder_file;
gchar *dir_part;
gchar *file_part; gchar *file_part;
gint file_part_pos; gint file_part_pos;
@ -90,6 +91,7 @@ struct _GtkFileChooserEntry
enum enum
{ {
DISPLAY_NAME_COLUMN, DISPLAY_NAME_COLUMN,
FULL_PATH_COLUMN,
FILE_COLUMN, FILE_COLUMN,
N_COLUMNS N_COLUMNS
}; };
@ -242,6 +244,7 @@ gtk_file_chooser_entry_finalize (GObject *object)
if (chooser_entry->current_folder_file) if (chooser_entry->current_folder_file)
g_object_unref (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_free (chooser_entry->file_part);
G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object); G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object);
@ -1294,16 +1297,28 @@ completion_store_set (GtkFileSystemModel *model,
GValue *value, GValue *value,
gpointer data) gpointer data)
{ {
GtkFileChooserEntry *chooser_entry = data;
const char *prefix = "";
const char *suffix = "";
switch (column) switch (column)
{ {
case FILE_COLUMN: case FILE_COLUMN:
g_value_set_object (value, file); g_value_set_object (value, file);
break; break;
case FULL_PATH_COLUMN:
prefix = chooser_entry->dir_part;
/* fall through */
case DISPLAY_NAME_COLUMN: case DISPLAY_NAME_COLUMN:
if (_gtk_file_info_consider_as_directory (info)) if (_gtk_file_info_consider_as_directory (info))
g_value_take_string (value, g_strconcat (g_file_info_get_display_name (info), G_DIR_SEPARATOR_S, NULL)); suffix = G_DIR_SEPARATOR_S;
else
g_value_set_string (value, g_file_info_get_display_name (info)); g_value_take_string (value, g_strconcat (
prefix,
g_file_info_get_display_name (info),
suffix,
NULL));
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
@ -1326,6 +1341,7 @@ populate_completion_store (GtkFileChooserEntry *chooser_entry)
chooser_entry, chooser_entry,
N_COLUMNS, N_COLUMNS,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_FILE)); G_TYPE_FILE));
g_signal_connect (chooser_entry->completion_store, "finished-loading", g_signal_connect (chooser_entry->completion_store, "finished-loading",
G_CALLBACK (finished_loading_cb), chooser_entry); G_CALLBACK (finished_loading_cb), chooser_entry);
@ -1493,13 +1509,15 @@ refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
result = REFRESH_OK; result = REFRESH_OK;
} }
g_free (text);
g_free (chooser_entry->file_part); g_free (chooser_entry->file_part);
g_free (chooser_entry->dir_part);
chooser_entry->dir_part = file_part_pos > 0 ? g_strndup (text, file_part_pos) : g_strdup ("");
chooser_entry->file_part = file_part; chooser_entry->file_part = file_part;
chooser_entry->file_part_pos = file_part_pos; chooser_entry->file_part_pos = file_part_pos;
g_free (text);
if (result == REFRESH_OK) if (result == REFRESH_OK)
{ {
result = reload_current_folder (chooser_entry, folder_file); result = reload_current_folder (chooser_entry, folder_file);