From c68a487c8faaad3afede2b6454f0c1f5a006de0a Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 31 Aug 2012 15:14:35 -0400 Subject: floating-bar: ellipsize the filename separately from the details This patch does three things: - It adds API to the floating bar to have primary and details labels instead of a single label. The primary label is ellipsized separately from the details, so it makes a good fit for a filename. - Modifies the code setting status messages in NautilusView to split them into two separate strings - Removes obsolete code in NautilusView and NautilusWindowSlot that was setting long statuses for the old non-floating statusbar https://bugzilla.gnome.org/show_bug.cgi?id=660695 --- src/nautilus-window-slot.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/nautilus-window-slot.h') diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h index b55a419d2..ea91752eb 100644 --- a/src/nautilus-window-slot.h +++ b/src/nautilus-window-slot.h @@ -81,7 +81,6 @@ struct NautilusWindowSlot { /* Current location. */ GFile *location; char *title; - char *status_text; NautilusFile *viewed_file; gboolean viewed_file_seen; @@ -164,8 +163,8 @@ void nautilus_window_slot_set_viewed_file (NautilusWindowSlot *slot, void nautilus_window_slot_set_allow_stop (NautilusWindowSlot *slot, gboolean allow_stop); void nautilus_window_slot_set_status (NautilusWindowSlot *slot, - const char *status, - const char *short_status); + const char *primary_status, + const char *detail_status); void nautilus_window_slot_add_extra_location_widget (NautilusWindowSlot *slot, GtkWidget *widget); -- cgit v1.2.1