diff options
| author | Pavel Cisler <pavel@eazel.com> | 2001-04-09 23:02:47 +0000 |
|---|---|---|
| committer | Pavel Cisler <pce@src.gnome.org> | 2001-04-09 23:02:47 +0000 |
| commit | 68cc0f0655ec29189e20025adcf61b8c75569fff (patch) | |
| tree | 41709b7799de351dcba74a496f0d9e432ce129d5 | |
| parent | 30b95f9687e0ce5b45761194519fee6c624c65c4 (diff) | |
| download | nautilus-68cc0f0655ec29189e20025adcf61b8c75569fff.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-file-operations.c | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 4 |
4 files changed, 21 insertions, 10 deletions
@@ -1,3 +1,18 @@ +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: diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c index 3f9afe920..bb5d63780 100644 --- a/libnautilus-extensions/nautilus-file-operations.c +++ b/libnautilus-extensions/nautilus-file-operations.c @@ -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; diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 3f9afe920..bb5d63780 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -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; diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index e19e7b279..b40b69ecc 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -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); } |