1
=== modified file 'debian/control'
2
--- debian/control	2014-07-04 15:05:13 +0000
3
+++ debian/control	2014-07-09 13:31:51 +0000
4
@@ -33,7 +33,7 @@
5
33
Depends: ${misc:Depends},
33
Depends: ${misc:Depends},
6
34
         ${shlibs:Depends},
34
         ${shlibs:Depends},
7
35
         fonts-liberation,
35
         fonts-liberation,
9
36
         liboxideqt-qmlplugin (>= 1.0.2),
36
         liboxideqt-qmlplugin (>= 1.1),
10
37
         libqt5sql5-sqlite,
37
         libqt5sql5-sqlite,
11
38
         qtdeclarative5-dialogs-plugin,
38
         qtdeclarative5-dialogs-plugin,
12
39
         qtdeclarative5-qtquick2-plugin,
39
         qtdeclarative5-qtquick2-plugin,
13
@@ -56,7 +56,7 @@
14
56
Depends: ${misc:Depends},
56
Depends: ${misc:Depends},
15
57
         ${shlibs:Depends},
57
         ${shlibs:Depends},
16
58
         fonts-liberation,
58
         fonts-liberation,
18
59
         liboxideqt-qmlplugin (>= 1.0.2),
59
         liboxideqt-qmlplugin (>= 1.1),
19
60
         libqt5sql5-sqlite,
60
         libqt5sql5-sqlite,
20
61
         libqt5webkit5-qmlwebkitplugin,
61
         libqt5webkit5-qmlwebkitplugin,
21
62
         qtdeclarative5-accounts-plugin,
62
         qtdeclarative5-accounts-plugin,
22
63
63
23
=== modified file 'src/app/ContentDownloadDialog.qml'
24
--- src/app/ContentDownloadDialog.qml	2014-05-05 15:31:21 +0000
25
+++ src/app/ContentDownloadDialog.qml	2014-07-09 13:31:51 +0000
26
@@ -39,11 +39,11 @@
27
39
                activeTransfer = peer.request()
39
                activeTransfer = peer.request()
28
40
                activeTransfer.downloadId = downloadDialog.downloadId
40
                activeTransfer.downloadId = downloadDialog.downloadId
29
41
                activeTransfer.state = ContentTransfer.Downloading
41
                activeTransfer.state = ContentTransfer.Downloading
31
42
                downloadDialog.hide()
42
                PopupUtils.close(downloadDialog)
32
43
            }
43
            }
33
44
44
34
45
            onCancelPressed: {
45
            onCancelPressed: {
36
46
                downloadDialog.hide()
46
                PopupUtils.close(downloadDialog)
37
47
            }
47
            }
38
48
        }
48
        }
39
49
    }
49
    }
40
50
50
41
=== modified file 'src/app/ContentPickerDialog.qml'
42
--- src/app/ContentPickerDialog.qml	2014-05-22 16:11:25 +0000
43
+++ src/app/ContentPickerDialog.qml	2014-07-09 13:31:51 +0000
44
@@ -93,7 +93,12 @@
45
93
    
93
    
46
94
        Component.onCompleted: {
94
        Component.onCompleted: {
47
95
            if(acceptTypes.length === 1) {
95
            if(acceptTypes.length === 1) {
49
96
                peerPicker.contentType = MimeTypeMapper.mimeTypeToContentType(acceptTypes[0])
96
                var contentType = MimeTypeMapper.mimeTypeToContentType(acceptTypes[0])
50
97
                if(contentType == ContentType.Unknown) {
51
98
                    // If we don't recognise the type, allow uploads from any app
52
99
                    contentType = ContentType.All
53
100
                }
54
101
                peerPicker.contentType = contentType
55
97
            } else {
102
            } else {
56
98
                peerPicker.contentType = ContentType.All
103
                peerPicker.contentType = ContentType.All
57
99
            }
104
            }
58
100
105
59
=== modified file 'src/app/ContentShareDialog.qml'
60
--- src/app/ContentShareDialog.qml	2014-06-17 14:32:58 +0000
61
+++ src/app/ContentShareDialog.qml	2014-07-09 13:31:51 +0000
62
@@ -39,11 +39,11 @@
63
39
                activeTransfer = peer.request()
39
                activeTransfer = peer.request()
64
40
                activeTransfer.items = shareDialog.items
40
                activeTransfer.items = shareDialog.items
65
41
                activeTransfer.state = ContentTransfer.Charged
41
                activeTransfer.state = ContentTransfer.Charged
67
42
                shareDialog.hide()
42
                PopupUtils.close(shareDialog)
68
43
            }
43
            }
69
44
44
70
45
            onCancelPressed: {
45
            onCancelPressed: {
72
46
                shareDialog.hide()
46
                PopupUtils.close(shareDialog)
73
47
            }
47
            }
74
48
        }
48
        }
75
49
    }
49
    }
76
50
50
77
=== modified file 'src/app/Downloader.qml'
78
--- src/app/Downloader.qml	2014-05-12 10:13:50 +0000
79
+++ src/app/Downloader.qml	2014-07-09 13:31:51 +0000
80
@@ -18,34 +18,49 @@
81
18
18
82
19
import QtQuick 2.0
19
import QtQuick 2.0
83
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 0.1
84
21
import Ubuntu.Components.Popups 0.1
85
21
import Ubuntu.DownloadManager 0.1
22
import Ubuntu.DownloadManager 0.1
86
22
import Ubuntu.Content 0.1
23
import Ubuntu.Content 0.1
87
24
import "MimeTypeMapper.js" as MimeTypeMapper
88
25
import "FileExtensionMapper.js" as FileExtensionMapper
89
23
26
90
24
Item {
27
Item {
91
28
    id: downloadItem
92
25
29
94
26
    ContentDownloadDialog {
30
    Component {
95
27
        id: downloadDialog
31
        id: downloadDialog
96
32
        ContentDownloadDialog { }
97
28
    }
33
    }
98
29
34
99
30
    SingleDownload {
35
    SingleDownload {
100
31
        id: singleDownload
36
        id: singleDownload
101
32
        autoStart: false
37
        autoStart: false
102
38
        property var contentType
103
33
        onDownloadIdChanged: {
39
        onDownloadIdChanged: {
106
34
            downloadDialog.downloadId = singleDownload.downloadId
40
            PopupUtils.open(downloadDialog, downloadItem, {"contentType" : singleDownload.contentType, "downloadId" : singleDownload.downloadId})
105
35
            downloadDialog.show()
107
36
        }
41
        }
108
37
    }
42
    }
109
38
43
115
39
    function download(url, contentType) {
44
    function download(url, contentType, headers) {
116
40
        if(contentType) {
45
        singleDownload.contentType = contentType
117
41
            downloadDialog.contentType = contentType
46
        if(headers) {
118
42
        } else {
47
            singleDownload.headers = headers
114
43
            downloaddialog.contentType = ContentType.All
119
44
        }
48
        }
120
45
        singleDownload.download(url)
49
        singleDownload.download(url)
121
46
    }
50
    }
122
47
51
126
48
    function downloadPicture(url) {
52
    function downloadPicture(url, headers) {
127
49
        download(url, ContentType.Pictures)
53
        download(url, ContentType.Pictures, headers)
128
50
    }
54
    }
129
55
130
56
    function downloadMimeType(url, mimeType, headers, filename) {
131
57
        var contentType = MimeTypeMapper.mimeTypeToContentType(mimeType)
132
58
        if (contentType == ContentType.Unknown && filename) {
133
59
            // If we can't determine the content type from the mime-type
134
60
            // attempt to discover it from the file extension
135
61
            contentType = FileExtensionMapper.filenameToContentType(filename)
136
62
        }
137
63
        download(url, contentType, headers)
138
64
    }
139
65
140
51
}
66
}
141
52
67
142
=== added file 'src/app/FileExtensionMapper.js'
143
--- src/app/FileExtensionMapper.js	1970-01-01 00:00:00 +0000
144
+++ src/app/FileExtensionMapper.js	2014-07-09 13:31:51 +0000
145
@@ -0,0 +1,211 @@
146
1
/*
147
2
 * Copyright 2014 Canonical Ltd.
148
3
 *
149
4
 * This file is part of webbrowser-app.
150
5
 *
151
6
 * webbrowser-app is free software; you can redistribute it and/or modify
152
7
 * it under the terms of the GNU General Public License as published by
153
8
 * the Free Software Foundation; version 3.
154
9
 *
155
10
 * webbrowser-app is distributed in the hope that it will be useful,
156
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
157
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
158
13
 * GNU General Public License for more details.
159
14
 *
160
15
 * You should have received a copy of the GNU General Public License
161
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
162
17
*/
163
18
164
19
// Constructed from /etc/mime.types
165
20
function filenameToContentType(filename) {
166
21
    var filenameParts = filename.split(".");
167
22
    if(filenameParts.length === 1 || (filenameParts[0] === "" && filenameParts.length === 2)) {
168
23
        return ContentType.Unknown;
169
24
    }
170
25
    var ext = filenameParts.pop().toLowerCase();
171
26
    switch(ext) {
172
27
        case "art":
173
28
        case "bmp":
174
29
        case "cdr":
175
30
        case "cdt":
176
31
        case "cpt":
177
32
        case "cr2":
178
33
        case "crw":
179
34
        case "djv":
180
35
        case "djvu":
181
36
        case "erf":
182
37
        case "gif":
183
38
        case "ico":
184
39
        case "ief":
185
40
        case "jng":
186
41
        case "jp2":
187
42
        case "jpe":
188
43
        case "jpeg":
189
44
        case "jpf":
190
45
        case "jpg":
191
46
        case "jpg2":
192
47
        case "jpm":
193
48
        case "jpx":
194
49
        case "nef":
195
50
        case "orf":
196
51
        case "pat":
197
52
        case "pbm":
198
53
        case "pcx":
199
54
        case "pgm":
200
55
        case "png":
201
56
        case "pnm":
202
57
        case "ppm":
203
58
        case "psd":
204
59
        case "ras":
205
60
        case "rgb":
206
61
        case "svg":
207
62
        case "svgz":
208
63
        case "tif":
209
64
        case "tiff":
210
65
        case "wbmp":
211
66
        case "xbm":
212
67
        case "xpm":
213
68
        case "xwd":
214
69
            return ContentType.Pictures;
215
70
        case "3gp":
216
71
        case "asf":
217
72
        case "asx":
218
73
        case "avi":
219
74
        case "axv":
220
75
        case "dif":
221
76
        case "dl":
222
77
        case "dv":
223
78
        case "fli":
224
79
        case "flv":
225
80
        case "gl":
226
81
        case "lsf":
227
82
        case "lsx":
228
83
        case "m4v":
229
84
        case "mkv":
230
85
        case "mng":
231
86
        case "mov":
232
87
        case "movie":
233
88
        case "mp4":
234
89
        case "mpe":
235
90
        case "mpeg":
236
91
        case "mpg":
237
92
        case "mpv":
238
93
        case "mxu":
239
94
        case "ogv":
240
95
        case "qt":
241
96
        case "ts":
242
97
        case "webm":
243
98
        case "wm":
244
99
        case "wmv":
245
100
        case "wmx":
246
101
        case "wvx":
247
102
            return ContentType.Videos;
248
103
        case "aif":
249
104
        case "aifc":
250
105
        case "aiff":
251
106
        case "amr":
252
107
        case "au":
253
108
        case "awb":
254
109
        case "axa":
255
110
        case "csd":
256
111
        case "flac":
257
112
        case "gsm":
258
113
        case "kar":
259
114
        case "m3u":
260
115
        case "m4a":
261
116
        case "mid":
262
117
        case "midi":
263
118
        case "mp2":
264
119
        case "mp3":
265
120
        case "mpega":
266
121
        case "mpga":
267
122
        case "oga":
268
123
        case "ogg":
269
124
        case "opus":
270
125
        case "orc":
271
126
        case "pls":
272
127
        case "ra":
273
128
        case "ram":
274
129
        case "rm":
275
130
        case "sco":
276
131
        case "sd2":
277
132
        case "sid":
278
133
        case "snd":
279
134
        case "spx":
280
135
        case "wav":
281
136
        case "wax":
282
137
        case "wma":
283
138
            return ContentType.Music;
284
139
        case "vcard":
285
140
        case "vcf":
286
141
            return ContentType.Contacts;
287
142
        case "323":
288
143
        case "appcache":
289
144
        case "asc":
290
145
        case "bib":
291
146
        case "boo":
292
147
        case "brf":
293
148
        case "c":
294
149
        case "c++":
295
150
        case "cc":
296
151
        case "cls":
297
152
        case "cpp":
298
153
        case "csh":
299
154
        case "css":
300
155
        case "csv":
301
156
        case "cxx":
302
157
        case "d":
303
158
        case "diff":
304
159
        case "etx":
305
160
        case "gcd":
306
161
        case "h":
307
162
        case "hh":
308
163
        case "h++":
309
164
        case "hpp":
310
165
        case "hs":
311
166
        case "htc":
312
167
        case "htm":
313
168
        case "html":
314
169
        case "hxx":
315
170
        case "ics":
316
171
        case "icz":
317
172
        case "jad":
318
173
        case "java":
319
174
        case "lhs":
320
175
        case "ltx":
321
176
        case "ly":
322
177
        case "mml":
323
178
        case "moc":
324
179
        case "p":
325
180
        case "pas":
326
181
        case "patch":
327
182
        case "pl":
328
183
        case "pm":
329
184
        case "pot":
330
185
        case "py":
331
186
        case "rtx":
332
187
        case "scala":
333
188
        case "sct":
334
189
        case "sfv":
335
190
        case "sh":
336
191
        case "shtml":
337
192
        case "srt":
338
193
        case "sty":
339
194
        case "tcl":
340
195
        case "tex":
341
196
        case "text":
342
197
        case "tk":
343
198
        case "tm":
344
199
        case "tsv":
345
200
        case "ttl":
346
201
        case "txt":
347
202
        case "uls":
348
203
        case "vcs":
349
204
        case "wml":
350
205
        case "wmls":
351
206
        case "wsc":
352
207
            return ContentType.Documents;
353
208
        default:
354
209
            return ContentType.Unknown;
355
210
    }
356
211
}
357
0
212
358
=== modified file 'src/app/MimeTypeMapper.js'
359
--- src/app/MimeTypeMapper.js	2014-05-22 20:03:22 +0000
360
+++ src/app/MimeTypeMapper.js	2014-07-09 13:31:51 +0000
361
@@ -22,11 +22,13 @@
362
22
        return ContentType.Pictures;
22
        return ContentType.Pictures;
363
23
    } else if(mimeType.search("audio/") === 0) {
23
    } else if(mimeType.search("audio/") === 0) {
364
24
        return ContentType.Music;
24
        return ContentType.Music;
365
25
    } else if(mimeType.search("video/") === 0) {
366
26
        return ContentType.Videos;
367
25
    } else if(mimeType.search("text/x-vcard") === 0) {
27
    } else if(mimeType.search("text/x-vcard") === 0) {
368
26
        return ContentType.Contacts;
28
        return ContentType.Contacts;
369
27
    } else if(mimeType.search("text/") === 0) {
29
    } else if(mimeType.search("text/") === 0) {
370
28
        return ContentType.Documents;
30
        return ContentType.Documents;
371
29
    } else {
31
    } else {
373
30
        return ContentType.All;
32
        return ContentType.Unknown;
374
31
    }
33
    }
375
32
}
34
}
376
33
35
377
=== modified file 'src/app/Share.qml'
378
--- src/app/Share.qml	2014-06-20 15:52:26 +0000
379
+++ src/app/Share.qml	2014-07-09 13:31:51 +0000
380
@@ -18,14 +18,16 @@
381
18
18
382
19
import QtQuick 2.0
19
import QtQuick 2.0
383
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 0.1
384
21
import Ubuntu.Components.Popups 0.1
385
21
import Ubuntu.DownloadManager 0.1
22
import Ubuntu.DownloadManager 0.1
386
22
import Ubuntu.Content 0.1
23
import Ubuntu.Content 0.1
387
23
24
388
24
Item {
25
Item {
389
25
    id: shareItem
26
    id: shareItem
390
26
27
392
27
    ContentShareDialog {
28
    Component {
393
28
        id: shareDialog
29
        id: shareDialog
394
30
        ContentShareDialog { }
395
29
    }
31
    }
396
30
32
397
31
    Component {
33
    Component {
398
@@ -34,9 +36,8 @@
399
34
    }
36
    }
400
35
37
401
36
    function share(url, name, contentType) {
38
    function share(url, name, contentType) {
405
37
        shareDialog.contentType = contentType
39
        var sharePopup = PopupUtils.open(shareDialog, shareItem, {"contentType" : contentType})
406
38
        shareDialog.items.push(contentItemComponent.createObject(shareItem, {"url" : url, "name" : name}))
40
        sharePopup.items.push(contentItemComponent.createObject(shareItem, {"url" : url, "name" : name}))
404
39
        shareDialog.show()
407
40
    }
41
    }
408
41
42
409
42
    function shareLink(url, title) {
43
    function shareLink(url, title) {
410
43
44
411
=== modified file 'src/app/WebViewImpl.qml'
412
--- src/app/WebViewImpl.qml	2014-06-25 17:07:29 +0000
413
+++ src/app/WebViewImpl.qml	2014-07-09 13:31:51 +0000
414
@@ -37,11 +37,30 @@
415
37
    beforeUnloadDialog: BeforeUnloadDialog {}
37
    beforeUnloadDialog: BeforeUnloadDialog {}
416
38
    filePicker: filePickerLoader.item
38
    filePicker: filePickerLoader.item
417
39
39
418
40
    onDownloadRequested: {
419
41
        if (downloadLoader.status == Loader.Ready) {
420
42
            var headers = { }
421
43
            if(request.cookies.length > 0) {
422
44
                headers["Cookie"] = request.cookies.join(";")
423
45
            }
424
46
            if(request.referrer) {
425
47
                headers["Referer"] = request.referrer
426
48
            }
427
49
            headers["User-Agent"] = webview.context.userAgent
428
50
            downloadLoader.item.downloadMimeType(request.url, request.mimeType, headers, request.suggestedFilename)
429
51
        }
430
52
    }
431
53
432
40
    Loader {
54
    Loader {
433
41
        id: filePickerLoader
55
        id: filePickerLoader
434
42
        source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"
56
        source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"
435
43
    }
57
    }
436
44
58
437
59
    Loader {
438
60
        id: downloadLoader
439
61
        source: formFactor == "desktop" ? "" : "Downloader.qml"
440
62
    }
441
63
442
45
    selectionActions: ActionList {
64
    selectionActions: ActionList {
443
46
        Actions.Copy {
65
        Actions.Copy {
444
47
            onTriggered: copy()
66
            onTriggered: copy()
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-07-01	Approve on 2014-07-09
PS Jenkins bot	continuous-integration		Approve on 2014-07-09
Review via email: mp+225143@code.launchpad.net