GTK: Force a size on download items and elide the dangerous download filename...

chrome/browser/gtk/download_item_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/download_item_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
@@ skipping 24 matching lines @@
 // bitmap that we use to draw it, i.e. 16, but can be more.
 const int kMenuButtonWidth = 16;
 
 // Padding on left and right of items in dangerous download prompt.
 const int kDangerousElementPadding = 3;
 
 // Amount of space we allot to showing the filename. If the filename is too wide
 // it will be elided.
 const int kTextWidth = 140;
 
+// Showing width of the dangerous file warning, in pixels.

[Evan Martin, 2009/07/13 21:22:33]

"Showing width" is a bit of strange wording (?)

+const int kDangerousTextWidth = 350;
+
 // The minimum width we will ever draw the download item. Used as a lower bound
 // during animation. This number comes from the width of the images used to
 // make the download item.
 const int kMinDownloadItemWidth = download_util::kSmallProgressIconSize;
 
 const char* kLabelColorMarkup = "<span color='#%s'>%s</span>";
 const char* kFilenameColor = "576C95";  // 87, 108, 149
 const char* kStatusColor = "7B8DAE";  // 123, 141, 174
 
 // New download item animation speed in milliseconds.
@@ skipping 219 matching lines @@
     gtk_box_pack_end(GTK_BOX(dangerous_hbox_), empty_label_b,
                      FALSE, FALSE, 0);
 
     // Create the warning icon.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     GdkPixbuf* download_pixbuf = rb.GetPixbufNamed(IDR_WARNING);
     GtkWidget* dangerous_image = gtk_image_new_from_pixbuf(download_pixbuf);
     gtk_box_pack_start(GTK_BOX(dangerous_hbox_), dangerous_image,
                        FALSE, FALSE, 0);
 
-    // Create the warning text.
-    // TODO(estade): the encoding might not be UTF8.
+    std::wstring elided_filename = gfx::ElideFilename(
+        get_download()->original_name(),
+        gfx::Font(), kTextWidth);
     std::string dangerous_warning =
         l10n_util::GetStringFUTF8(IDS_PROMPT_DANGEROUS_DOWNLOAD,
-        UTF8ToUTF16(get_download()->original_name().value()));
+        WideToUTF16(elided_filename));
     gchar* label_markup =
         g_markup_printf_escaped(kLabelColorMarkup, kFilenameColor,
                                 dangerous_warning.c_str());
     GtkWidget* dangerous_label = gtk_label_new(NULL);
     // Until we switch to vector graphics, force the font size.
     // 13.4px == 10pt @ 96dpi
     gtk_util::ForceFontSizePixels(dangerous_label, 13.4);
     gtk_label_set_markup(GTK_LABEL(dangerous_label), label_markup);
     gtk_label_set_line_wrap(GTK_LABEL(dangerous_label), TRUE);
     // We pass TRUE, TRUE so that the label will condense to less than its
     // request when the animation is going on.
     gtk_box_pack_start(GTK_BOX(dangerous_hbox_), dangerous_label,
                        TRUE, TRUE, 0);
+    gtk_widget_set_size_request(dangerous_label, kDangerousTextWidth, -1);
     g_free(label_markup);
 
     // Create the ok button.
     GtkWidget* dangerous_accept = gtk_button_new_with_label(
         l10n_util::GetStringUTF8(IDS_SAVE_DOWNLOAD).c_str());
     g_signal_connect(dangerous_accept, "clicked",
                      G_CALLBACK(OnDangerousAccept), this);
     gtk_util::CenterWidgetInHBox(dangerous_hbox_, dangerous_accept, false, 0);
 
     // Create the nevermind button.
@@ skipping 391 matching lines @@
       item->get_download());
 }
 
 // static
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button,
                                          DownloadItemGtk* item) {
   if (item->get_download()->state() == DownloadItem::IN_PROGRESS)
     item->get_download()->Cancel(true);
   item->get_download()->Remove(true);
 }