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

Subscribers

People subscribed via source and target branches

to status/vote changes: