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

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 326
Merged at revision: 337
Proposed branch: lp:~daker/webbrowser-app/fix.1169759
Merge into: lp:webbrowser-app
Diff against target: 63 lines (+47/-0)
2 files modified
src/app/Browser.qml (+1/-0)
src/app/PromptDialog.qml (+46/-0)
To merge this branch: bzr merge lp:~daker/webbrowser-app/fix.1169759
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+186926@code.launchpad.net

Commit message

Added support for Prompt dialogs

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks great!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~daker/webbrowser-app/fix.1169759 updated
326. By Adnane Belmadiaf

Merged trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml 2013-09-24 10:09:58 +0000
+++ src/app/Browser.qml 2013-09-24 12:01:22 +0000
@@ -352,6 +352,7 @@
352 experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}352 experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
353 experimental.alertDialog: AlertDialog { }353 experimental.alertDialog: AlertDialog { }
354 experimental.confirmDialog: ConfirmDialog { }354 experimental.confirmDialog: ConfirmDialog { }
355 experimental.promptDialog: PromptDialog { }
355356
356 selectionActions: ActionList {357 selectionActions: ActionList {
357 Action {358 Action {
358359
=== added file 'src/app/PromptDialog.qml'
--- src/app/PromptDialog.qml 1970-01-01 00:00:00 +0000
+++ src/app/PromptDialog.qml 2013-09-24 12:01:22 +0000
@@ -0,0 +1,46 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This file is part of webbrowser-app.
5 *
6 * webbrowser-app is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * webbrowser-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19import QtQuick 2.0
20import Ubuntu.Components 0.1
21import Ubuntu.Components.Popups 0.1 as Popups
22
23Popups.Dialog {
24 title: i18n.tr("JavaScript Prompt")
25 text: model.message
26
27 TextField {
28 id: input
29 text: model.defaultValue
30 onAccepted: model.accept(input.text)
31 }
32
33 Button {
34 text: i18n.tr("OK")
35 color: "green"
36 onClicked: model.accept(input.text)
37 }
38
39 Button {
40 text: i18n.tr("Cancel")
41 color: UbuntuColors.coolGrey
42 onClicked: model.reject()
43 }
44
45 Component.onCompleted: show()
46}
0\ No newline at end of file47\ No newline at end of file

Subscribers

People subscribed via source and target branches

to status/vote changes: