Use pango ellipsisation instead of truncating the strings. Bug #410113.

2007-07-24  Christian Persch  <chpe@gnome.org>

	* libnautilus-private/nautilus-bookmark.c:
	(nautilus_bookmark_menu_item_new):
	* libnautilus-private/nautilus-customization-data.c:
	(nautilus_customization_data_new),
	(nautilus_customization_data_get_next_element_for_display):
	* libnautilus-private/nautilus-customization-data.h:
	* src/nautilus-application.c:
	* src/nautilus-bookmark-list.c: (new_bookmark_from_uri):
	* src/nautilus-navigation-window-menus.c: (connect_proxy_cb),
	(refresh_go_menu):
	* src/nautilus-places-sidebar.c: (bookmarks_drop_uris),
	(drag_data_received_callback):
	* src/nautilus-property-browser.c:
	(make_properties_from_directories):
	* src/nautilus-window-bookmarks.c: (connect_proxy_cb),
	(update_bookmarks):
	* src/nautilus-window-menus.c:
	(nautilus_menus_append_bookmark_to_menu):
	* test/test-nautilus-wrap-table.c: (main): Use pango ellipsisation
	instead of truncating the strings. Bug #410113.

svn path=/trunk/; revision=13025

1 files changed, 20 insertions, 0 deletions

diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 82ac93206..b9e70efbc 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -65,6 +65,7 @@
 #define MENU_PATH_HISTORY_PLACEHOLDER			"/MenuBar/Other Menus/Go/History Placeholder"
 
 #define RESPONSE_FORGET		1000
+#define MENU_ITEM_MAX_WIDTH_CHARS 32
 
 static void                  schedule_refresh_go_menu                      (NautilusNavigationWindow   *window);
 
@@ -296,6 +297,23 @@ show_bogus_history_window (NautilusWindow *window,
 	g_free (detail);
 }
 
+static void
+connect_proxy_cb (GtkActionGroup *action_group,
+                  GtkAction *action,
+                  GtkWidget *proxy,
+                  gpointer dummy)
+{
+	GtkLabel *label;
+
+	if (!GTK_IS_MENU_ITEM (proxy))
+		return;
+
+	label = GTK_LABEL (GTK_BIN (proxy)->child);
+
+	gtk_label_set_use_underline (label, FALSE);
+	gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+	gtk_label_set_max_width_chars (label, MENU_ITEM_MAX_WIDTH_CHARS);
+}
 
 /**
  * refresh_go_menu:
@@ -322,6 +340,8 @@ refresh_go_menu (NautilusNavigationWindow *window)
 
 	window->details->go_menu_merge_id = gtk_ui_manager_new_merge_id (ui_manager);
 	window->details->go_menu_action_group = gtk_action_group_new ("GoMenuGroup");
+	g_signal_connect (window->details->go_menu_action_group, "connect-proxy",
+			  G_CALLBACK (connect_proxy_cb), NULL);
 
 	gtk_ui_manager_insert_action_group (ui_manager,
 					    window->details->go_menu_action_group,