Commit 68cc0f06 authored by Pavel Cisler's avatar Pavel Cisler Committed by Pavel Cisler

reviewed by: Michael Engber <engber@eazel.com>

2001-04-09  Pavel Cisler  <pavel@eazel.com>

	reviewed by: Michael Engber  <engber@eazel.com>

	Fix 6024 properties window and file copy dialog should ellipsize
		 paths in middle, not at start

	* libnautilus-extensions/nautilus-file-operations.c:
	(ellipsize_string_for_dialog):
	Use ellipsize_middle now that we support it.

	* src/file-manager/fm-list-view.c: (truncate_middle_callback),
	(get_cell_text):
	Use the new ellipsizing API.
parent 30b95f96
2001-04-09 Pavel Cisler <pavel@eazel.com>
reviewed by: Michael Engber <engber@eazel.com>
Fix 6024 properties window and file copy dialog should ellipsize
paths in middle, not at start
* libnautilus-extensions/nautilus-file-operations.c:
(ellipsize_string_for_dialog):
Use ellipsize_middle now that we support it.
* src/file-manager/fm-list-view.c: (truncate_middle_callback),
(get_cell_text):
Use the new ellipsizing API.
2001-04-09 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus-extensions/nautilus-sidebar-functions.h:
......
......@@ -234,10 +234,8 @@ ellipsize_string_for_dialog (const char *str)
/* get a nice length to ellipsize to, based on the font */
font = get_label_font ();
maximum_width = gdk_string_width (font, "MMMMMMMMMMMMMMMMMMMMMM");
/* FIXME: John Sullivan says we should ellipsize both URIs and
* file names in the middle, not the start.
*/
result = eel_string_ellipsize_start (str, font, maximum_width);
result = eel_string_ellipsize (str, font, maximum_width, EEL_ELLIPSIZE_MIDDLE);
gdk_font_unref (font);
return result;
......
......@@ -234,10 +234,8 @@ ellipsize_string_for_dialog (const char *str)
/* get a nice length to ellipsize to, based on the font */
font = get_label_font ();
maximum_width = gdk_string_width (font, "MMMMMMMMMMMMMMMMMMMMMM");
/* FIXME: John Sullivan says we should ellipsize both URIs and
* file names in the middle, not the start.
*/
result = eel_string_ellipsize_start (str, font, maximum_width);
result = eel_string_ellipsize (str, font, maximum_width, EEL_ELLIPSIZE_MIDDLE);
gdk_font_unref (font);
return result;
......
......@@ -1076,7 +1076,7 @@ measure_width_callback (const char *string, void *context)
static char *
truncate_middle_callback (const char *string, int width, void *context)
{
return eel_string_ellipsize_middle (string, (GdkFont *)context, width);
return eel_string_ellipsize (string, (GdkFont *)context, width, EEL_ELLIPSIZE_MIDDLE);
}
static char *
......@@ -1114,7 +1114,7 @@ get_cell_text (GtkWidget *widget, int column_index, int cell_width,
break;
}
return eel_string_ellipsize_end (cell_text, font, cell_width);
return eel_string_ellipsize (cell_text, font, cell_width, EEL_ELLIPSIZE_MIDDLE);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment