<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173560] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173560">173560</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-12 08:59:12 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use a nicer HTTP authentication dialog
https://bugs.webkit.org/show_bug.cgi?id=136615
Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2014-09-12
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
(webkitAuthenticationDialogInitialize): Use a nicer layout.
(packTwoColumnLayoutInBox): Deleted.
(createLabel): Deleted.
(createEntry): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173559 => 173560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-12 15:44:42 UTC (rev 173559)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-12 15:59:12 UTC (rev 173560)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-12 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Use a nicer HTTP authentication dialog
+ https://bugs.webkit.org/show_bug.cgi?id=136615
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+ (webkitAuthenticationDialogInitialize): Use a nicer layout.
+ (packTwoColumnLayoutInBox): Deleted.
+ (createLabel): Deleted.
+ (createEntry): Deleted.
+
</ins><span class="cx"> 2014-09-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r173423): CertificateInfo is never sent to the UI process when using shared secondary process model
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (173559 => 173560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2014-09-12 15:44:42 UTC (rev 173559)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2014-09-12 15:59:12 UTC (rev 173560)
</span><span class="lines">@@ -71,67 +71,22 @@
</span><span class="cx"> gtk_widget_destroy(GTK_WIDGET(authDialog));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void packTwoColumnLayoutInBox(GtkWidget* box, ...)
</del><ins>+static GtkWidget* createLabelWithLineWrap(const char* text)
</ins><span class="cx"> {
</span><del>- va_list argumentList;
- va_start(argumentList, box);
-
- GtkWidget* grid = gtk_grid_new();
- gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
- gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
- gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE);
-
- GtkWidget* firstColumnWidget = va_arg(argumentList, GtkWidget*);
- int rowNumber = 0;
- while (firstColumnWidget) {
- GtkWidget* secondColumnWidget = va_arg(argumentList, GtkWidget*);
- int firstWidgetWidth = secondColumnWidget ? 1 : 2;
-
- gtk_grid_attach(GTK_GRID(grid), firstColumnWidget, 0, rowNumber, firstWidgetWidth, 1);
- gtk_widget_set_hexpand(firstColumnWidget, TRUE);
- gtk_widget_set_vexpand(firstColumnWidget, TRUE);
- gtk_widget_show(firstColumnWidget);
-
- if (secondColumnWidget) {
- gtk_grid_attach(GTK_GRID(grid), secondColumnWidget, 1, rowNumber, 1, 1);
- gtk_widget_set_hexpand(secondColumnWidget, TRUE);
- gtk_widget_set_vexpand(secondColumnWidget, TRUE);
- gtk_widget_show(secondColumnWidget);
- }
-
- firstColumnWidget = va_arg(argumentList, GtkWidget*);
- rowNumber++;
- }
-
- va_end(argumentList);
-
- gtk_box_pack_start(GTK_BOX(box), grid, FALSE, FALSE, 0);
- gtk_widget_show(grid);
-}
-
-static GtkWidget* createLabel(const char* labelString, int horizontalPadding = 0)
-{
- GtkWidget* label = gtk_label_new(labelString);
</del><ins>+ GtkWidget* label = gtk_label_new(text);
</ins><span class="cx"> gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
</span><del>- if (horizontalPadding)
- gtk_misc_set_padding(GTK_MISC(label), 0, horizontalPadding);
</del><ins>+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_label_set_max_width_chars(GTK_LABEL(label), 40);
</ins><span class="cx"> return label;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static GtkWidget* createEntry(GtkWidget** member)
-{
- *member = gtk_entry_new();
- gtk_entry_set_activates_default(GTK_ENTRY(*member), TRUE);
- return *member;
-}
-
</del><span class="cx"> static void webkitAuthenticationDialogInitialize(WebKitAuthenticationDialog* authDialog)
</span><span class="cx"> {
</span><span class="cx"> GtkWidget* frame = gtk_frame_new(0);
</span><span class="cx"> gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
</span><span class="cx">
</span><span class="cx"> GtkWidget* vBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
</span><del>- gtk_container_set_border_width(GTK_CONTAINER(vBox), 5);
</del><ins>+ gtk_container_set_border_width(GTK_CONTAINER(vBox), 12);
</ins><span class="cx">
</span><span class="cx"> GtkWidget* buttonBox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
</span><span class="cx"> gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
</span><span class="lines">@@ -151,40 +106,62 @@
</span><span class="cx"> gtk_box_pack_end(GTK_BOX(buttonBox), button, FALSE, TRUE, 0);
</span><span class="cx"> gtk_widget_show(button);
</span><span class="cx">
</span><del>- GtkWidget* authBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
</del><ins>+ GtkWidget* authBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
</ins><span class="cx"> gtk_container_set_border_width(GTK_CONTAINER(authBox), 5);
</span><span class="cx">
</span><del>- GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment(GTK_MISC(icon), 0.5, 0.0);
- gtk_box_pack_start(GTK_BOX(authBox), icon, FALSE, FALSE, 0);
- gtk_widget_show(icon);
-
</del><span class="cx"> const WebCore::AuthenticationChallenge& challenge = webkitAuthenticationRequestGetAuthenticationChallenge(priv->request.get())->core();
</span><ins>+ // Prompt on the HTTP authentication dialog.
</ins><span class="cx"> GUniquePtr<char> prompt(g_strdup_printf(_("The site %s:%i requests a username and password"),
</span><span class="cx"> challenge.protectionSpace().host().utf8().data(), challenge.protectionSpace().port()));
</span><del>- priv->rememberCheckButton = gtk_check_button_new_with_mnemonic(_("_Remember password"));
- gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN(priv->rememberCheckButton))), TRUE);
</del><ins>+ GtkWidget* label = createLabelWithLineWrap(prompt.get());
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(authBox), label, FALSE, FALSE, 0);
</ins><span class="cx">
</span><span class="cx"> String realm = challenge.protectionSpace().realm();
</span><span class="cx"> if (!realm.isEmpty()) {
</span><del>- packTwoColumnLayoutInBox(
- authBox,
- createLabel(prompt.get(), 6), nullptr,
- createLabel(_("Server message:")), createLabel(realm.utf8().data()),
- createLabel(_("Username:")), createEntry(&priv->loginEntry),
- createLabel(_("Password:")), createEntry(&priv->passwordEntry),
- priv->rememberCheckButton, nullptr,
- nullptr);
-
- } else {
- packTwoColumnLayoutInBox(
- authBox,
- createLabel(prompt.get(), 6), nullptr,
- createLabel(_("Username:")), createEntry(&priv->loginEntry),
- createLabel(_("Password:")), createEntry(&priv->passwordEntry),
- priv->rememberCheckButton, nullptr, nullptr,
- nullptr);
</del><ins>+ GUniquePtr<char> message(g_strdup_printf("%s “%s”", _("Server message:"), realm.utf8().data()));
+ label = createLabelWithLineWrap(message.get());
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(authBox), label, FALSE, FALSE, 0);
</ins><span class="cx"> }
</span><ins>+
+ // Check button on the HTTP authentication dialog.
+ priv->rememberCheckButton = gtk_check_button_new_with_mnemonic(_("_Remember password"));
+ gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN(priv->rememberCheckButton))), TRUE);
+
+ // Entry on the HTTP authentication dialog.
+ GtkWidget* loginLabel = gtk_label_new(_("Username:"));
+ gtk_widget_set_halign(loginLabel, GTK_ALIGN_END);
+ gtk_style_context_add_class(gtk_widget_get_style_context(loginLabel), GTK_STYLE_CLASS_DIM_LABEL);
+ gtk_widget_show(loginLabel);
+
+ priv->loginEntry = gtk_entry_new();
+ gtk_widget_set_hexpand(priv->loginEntry, TRUE);
+ gtk_entry_set_activates_default(GTK_ENTRY(priv->loginEntry), TRUE);
+ gtk_widget_show(priv->loginEntry);
+
+ // Entry on the HTTP authentication dialog.
+ GtkWidget* passwordLabel = gtk_label_new(_("Password:"));
+ gtk_widget_set_halign(passwordLabel, GTK_ALIGN_END);
+ gtk_style_context_add_class(gtk_widget_get_style_context(passwordLabel), GTK_STYLE_CLASS_DIM_LABEL);
+ gtk_widget_show(passwordLabel);
+
+ priv->passwordEntry = gtk_entry_new();
+ gtk_widget_set_hexpand(priv->passwordEntry, TRUE);
+ gtk_entry_set_activates_default(GTK_ENTRY(priv->passwordEntry), TRUE);
+ gtk_widget_show(priv->passwordEntry);
+
+ GtkWidget* grid = gtk_grid_new();
+ gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
+ gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
+ gtk_grid_attach(GTK_GRID(grid), loginLabel, 0, 0, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), priv->loginEntry, 1, 0, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), passwordLabel, 0, 1, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), priv->passwordEntry, 1, 1, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), priv->rememberCheckButton, 1, 2, 1, 1);
+ gtk_widget_show(grid);
+ gtk_box_pack_start(GTK_BOX(authBox), grid, FALSE, FALSE, 0);
+
</ins><span class="cx"> gtk_entry_set_visibility(GTK_ENTRY(priv->passwordEntry), FALSE);
</span><span class="cx"> gtk_widget_set_visible(priv->rememberCheckButton, priv->credentialStorageMode != DisallowPersistentStorage);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>