Merge lp:~daker/webbrowser-app/fix.1227055 into lp:webbrowser-app

[Adnane Belmadiaf]

Added certificateVerificationDialog component

[Olivier Tilloy (osomon)]

42 + // TRANSLATORS: %1 refers to the URL of the current website

One tiny nitpick: %1 refers to the hostname, not the full URL of the website. Can you please update the comment?

Regarding the translation template updates, since there are other pending MRs that add new strings, I suggest we wait and update the template once all those changes have been merged.

review: Needs Fixing

[Olivier Tilloy (osomon)]

Looks great, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3819
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/188
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1349
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1349/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1135
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1146

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/249/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3833/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1361/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/193/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/193/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/193/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3845/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1363/console

review: Needs Fixing (continuous-integration)

[lp:~daker/webbrowser-app/fix.1227055]

327. By Adnane Belmadiaf on 2013-09-23

Merged trunk
Fixed merge conflicts

[Adnane Belmadiaf (daker)]

Can you please reapprove this.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml	2013-09-23 14:48:21 +0000
+++ src/app/Browser.qml	2013-09-23 20:22:39 +0000
@@ -346,6 +346,7 @@
             devicePixelRatio: browser.qtwebkitdpr
 
             experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
+            experimental.certificateVerificationDialog: CertificateVerificationDialog { }
             experimental.authenticationDialog: AuthenticationDialog {}
             experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
             experimental.alertDialog: AlertDialog { }

=== added file 'src/app/CertificateVerificationDialog.qml'
--- src/app/CertificateVerificationDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/CertificateVerificationDialog.qml	2013-09-23 20:22:39 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
+
+Popups.Dialog {
+    title: i18n.tr("This connection is untrusted")
+    // TRANSLATORS: %1 refers to the hostname
+    text: i18n.tr("You are trying to securely reach %1, but the security certificate of this website is not trusted.").arg(model.hostname)
+
+    Button {
+        text: i18n.tr("Proceed anyway")
+        color: "red"
+        onClicked: model.accept()
+    }
+
+    Button {
+        text: i18n.tr("Back to safety")
+        color: "green"
+        onClicked: model.reject()
+    }
+
+    Component.onCompleted: show()
+}