gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

replace display_name attribute with edit_name for renaming

Browse source 
The edit_name attribute corresponds to G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME
attribute. It is almost identical to display_name, except if there is
invalid encoding, and is preferred when implementing renaming functionality.

Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1540
This commit is contained in:
Anubhav Tyagi 2021-07-10 13:03:15 +05:30 committed by António Fernandes
parent c645351d79
commit 65f2828ab7
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nautilus-properties-window.c
View file

@ -686,8 +686,10 @@ update_name_field (NautilusPropertiesWindow *self)
{
const char *original_name = NULL;
g_autofree char *current_name = NULL;
gboolean use_label;
file = get_original_file (self);
use_label = !nautilus_file_can_rename (file);
if (file == NULL || nautilus_file_is_gone (file))
{
@ -695,7 +697,14 @@ update_name_field (NautilusPropertiesWindow *self)
}
else
{
current_name = nautilus_file_get_display_name (file);
if (use_label)
{
current_name = nautilus_file_get_display_name (file);
}
else
{
current_name = nautilus_file_get_edit_name (file);
}
}
/* If the file name has changed since the original name was stored,

16
src/nautilus-rename-file-popover-controller.c
View file

@ -219,11 +219,11 @@ static gboolean
name_entry_on_undo (GtkWidget *widget,
NautilusRenameFilePopoverController *self)
{
g_autofree gchar *display_name = NULL;
g_autofree gchar *edit_name = NULL;
display_name = nautilus_file_get_display_name (self->target_file);
edit_name = nautilus_file_get_edit_name (self->target_file);
gtk_entry_set_text (GTK_ENTRY (widget), display_name);
gtk_entry_set_text (GTK_ENTRY (widget), edit_name);
gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
@ -334,7 +334,7 @@ nautilus_rename_file_popover_controller_show_for_file (NautilusRenameFilePopov
GtkWidget *relative_to)
{
g_autoptr (NautilusDirectory) containing_directory = NULL;
g_autofree gchar *display_name = NULL;
g_autofree gchar *edit_name = NULL;
gint n_chars;
g_assert (NAUTILUS_IS_RENAME_FILE_POPOVER_CONTROLLER (self));
@ -380,9 +380,9 @@ nautilus_rename_file_popover_controller_show_for_file (NautilusRenameFilePopov
self->target_is_folder ? _("Folder name") :
_("File name"));
display_name = nautilus_file_get_display_name (self->target_file);
edit_name = nautilus_file_get_edit_name (self->target_file);
gtk_entry_set_text (GTK_ENTRY (self->name_entry), display_name);
gtk_entry_set_text (GTK_ENTRY (self->name_entry), edit_name);
gtk_popover_set_pointing_to (GTK_POPOVER (self->rename_file_popover), pointing_to);
gtk_popover_set_relative_to (GTK_POPOVER (self->rename_file_popover), relative_to);
@ -395,13 +395,13 @@ nautilus_rename_file_popover_controller_show_for_file (NautilusRenameFilePopov
gint end_offset;
/* Select the name part without the file extension */
eel_filename_get_rename_region (display_name,
eel_filename_get_rename_region (edit_name,
&start_offset, &end_offset);
gtk_editable_select_region (GTK_EDITABLE (self->name_entry),
start_offset, end_offset);
}
n_chars = g_utf8_strlen (display_name, -1);
n_chars = g_utf8_strlen (edit_name, -1);
gtk_entry_set_width_chars (GTK_ENTRY (self->name_entry),
MIN (MAX (n_chars, RENAME_ENTRY_MIN_CHARS),
RENAME_ENTRY_MAX_CHARS));