Modified: trunk/Tools/ChangeLog (107815 => 107816)
--- trunk/Tools/ChangeLog 2012-02-15 15:33:07 UTC (rev 107815)
+++ trunk/Tools/ChangeLog 2012-02-15 15:38:06 UTC (rev 107816)
@@ -1,3 +1,15 @@
+2012-02-15 Michael Brüning <[email protected]>
+
+ [Qt] Add UI for HTTP authentication in the Qt MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=76347
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * MiniBrowser/qt/MiniBrowser.qrc:
+ * MiniBrowser/qt/qml/AuthenticationDialog.qml: Added.
+ * MiniBrowser/qt/qml/BrowserWindow.qml:
+ * MiniBrowser/qt/qml/DialogLineInput.qml:
+
2012-02-15 Simon Hausmann <[email protected]>
[Qt] Fix WebGL in QtTestBrowser
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc (107815 => 107816)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc 2012-02-15 15:33:07 UTC (rev 107815)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc 2012-02-15 15:38:06 UTC (rev 107816)
@@ -9,6 +9,7 @@
<file>icons/touch.png</file>
<file>icons/touchpoint.png</file>
<file>qml/AlertDialog.qml</file>
+ <file>qml/AuthenticationDialog.qml</file>
<file>qml/BrowserWindow.qml</file>
<file>qml/ConfirmDialog.qml</file>
<file>qml/Dialog.qml</file>
Copied: trunk/Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml (from rev 107815, trunk/Tools/MiniBrowser/qt/qml/DialogLineInput.qml) (0 => 107816)
--- trunk/Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml (rev 0)
+++ trunk/Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml 2012-02-15 15:38:06 UTC (rev 107816)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import QtQuick 2.0
+
+Dialog {
+ id: dialog
+
+ title: "Authentication required."
+ message: model.hostname + " requires authentication."
+
+ height: 250
+
+ DialogLineInput {
+ id: input
+ width: dialog.width - 30
+ text: model.prefilledUsername
+
+ onAccepted: model.accept(input.text, passwordInput.text)
+ }
+
+ DialogLineInput {
+ id: passwordInput
+ text: ""
+ width: dialog.width - 30
+ echoMode: TextInput.PasswordEchoOnEdit
+
+ onAccepted: model.accept(input.text, passwordInput.text)
+ }
+
+ Row {
+ id: buttonRow
+ spacing: 5
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ DialogButton {
+ text: "OK"
+ onClicked: model.accept(input.text, passwordInput.text)
+ }
+
+ DialogButton {
+ text: "Cancel"
+ onClicked: model.reject()
+ }
+ }
+}
Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (107815 => 107816)
--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-02-15 15:33:07 UTC (rev 107815)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-02-15 15:38:06 UTC (rev 107816)
@@ -310,6 +310,7 @@
experimental.alertDialog: AlertDialog { }
experimental.confirmDialog: ConfirmDialog { }
experimental.promptDialog: PromptDialog { }
+ experimental.authenticationDialog: AuthenticationDialog { }
}
ViewportInfoItem {
Modified: trunk/Tools/MiniBrowser/qt/qml/DialogLineInput.qml (107815 => 107816)
--- trunk/Tools/MiniBrowser/qt/qml/DialogLineInput.qml 2012-02-15 15:33:07 UTC (rev 107815)
+++ trunk/Tools/MiniBrowser/qt/qml/DialogLineInput.qml 2012-02-15 15:38:06 UTC (rev 107816)
@@ -31,6 +31,7 @@
id: dialogLineInput
property alias text: input.text
+ property alias echoMode: input.echoMode
signal accepted()
height: 20
