webbrowser-app

Merge lp:~osomon/webbrowser-app/icon into lp:webbrowser-app

  1. icon
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 562
Merged at revision: 616
Proposed branch: lp:~osomon/webbrowser-app/icon
Merge into: lp:webbrowser-app
Diff against target: 119 lines (+13/-5)
8 files modified
debian/control (+1/-1)
src/app/webbrowser/BookmarksView.qml (+1/-0)
src/app/webbrowser/Browser.qml (+2/-2)
src/app/webbrowser/NewTabView.qml (+1/-0)
src/app/webbrowser/PageDelegate.qml (+2/-1)
src/app/webbrowser/TabsList.qml (+1/-0)
src/app/webbrowser/TimelineView.qml (+1/-0)
src/app/webbrowser/UrlDelegate.qml (+4/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/icon
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+221850@code.launchpad.net

Commit message

Re-enable the favicon support now that oxide supports it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:556
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/874/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/980
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/73
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8566
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1028
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1028/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/874/rebuild

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

FAILED: Continuous integration, rev:561
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/930/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1464/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/129
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2002/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2795
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2795/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9524
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1221/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1646/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/930/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/icon updated
562. By Olivier Tilloy

Relax a bit the runtime dependency version check to make it succeed with the current version of oxide in the utopic archive (1.1.0~bzr640-0ubuntu1).

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:562
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/932/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1651
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1651/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/932/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-07-04 15:05:13 +0000
3+++ debian/control 2014-07-09 12:24:44 +0000
4@@ -33,7 +33,7 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 fonts-liberation,
8- liboxideqt-qmlplugin (>= 1.0.2),
9+ liboxideqt-qmlplugin (>= 1.1),
10 libqt5sql5-sqlite,
11 qtdeclarative5-dialogs-plugin,
12 qtdeclarative5-qtquick2-plugin,
13
14=== modified file 'src/app/webbrowser/BookmarksView.qml'
15--- src/app/webbrowser/BookmarksView.qml 2014-05-22 09:57:23 +0000
16+++ src/app/webbrowser/BookmarksView.qml 2014-07-09 12:24:44 +0000
17@@ -50,6 +50,7 @@
18
19 url: model.url
20 label: model.title ? model.title : model.url
21+ icon: model.icon
22
23 //property url thumbnailSource: "image://webthumbnail/" + model.url
24 //thumbnail: WebThumbnailer.thumbnailExists(model.url) ? thumbnailSource : ""
25
26=== modified file 'src/app/webbrowser/Browser.qml'
27--- src/app/webbrowser/Browser.qml 2014-07-08 08:22:55 +0000
28+++ src/app/webbrowser/Browser.qml 2014-07-09 12:24:44 +0000
29@@ -48,7 +48,7 @@
30 },
31 Actions.Bookmark {
32 enabled: currentWebview
33- onTriggered: _bookmarksModel.add(currentWebview.url, currentWebview.title, "")//currentWebview.icon)
34+ onTriggered: _bookmarksModel.add(currentWebview.url, currentWebview.title, currentWebview.icon)
35 },
36 Actions.NewTab {
37 onTriggered: openUrlInNewTab("", true)
38@@ -269,7 +269,7 @@
39
40 onLoadingChanged: {
41 if (lastLoadSucceeded) {
42- _historyModel.add(url, title, "")
43+ _historyModel.add(url, title, icon)
44 }
45 }
46
47
48=== modified file 'src/app/webbrowser/NewTabView.qml'
49--- src/app/webbrowser/NewTabView.qml 2014-07-04 14:18:28 +0000
50+++ src/app/webbrowser/NewTabView.qml 2014-07-09 12:24:44 +0000
51@@ -167,6 +167,7 @@
52
53 url: model.url
54 label: model.title ? model.title : model.url
55+ icon: model.icon
56
57 onClicked: historyEntryClicked(model.url)
58 }
59
60=== modified file 'src/app/webbrowser/PageDelegate.qml'
61--- src/app/webbrowser/PageDelegate.qml 2014-03-12 22:45:12 +0000
62+++ src/app/webbrowser/PageDelegate.qml 2014-07-09 12:24:44 +0000
63@@ -25,6 +25,7 @@
64 property url url
65 property alias thumbnail: thumbnail.source
66 property alias label: label.text
67+ property url icon
68 property bool canClose: false
69 property bool canBookmark: false
70 property bool bookmarked
71@@ -137,7 +138,7 @@
72 onBookmarkedChanged: {
73 var previouslyBookmarked = bookmarksModel.contains(pageDelegate.url)
74 if (bookmarked && !previouslyBookmarked) {
75- bookmarksModel.add(pageDelegate.url, pageDelegate.label, "")
76+ bookmarksModel.add(pageDelegate.url, pageDelegate.label, pageDelegate.icon)
77 } else if (!bookmarked && previouslyBookmarked) {
78 bookmarksModel.remove(pageDelegate.url)
79 }
80
81=== modified file 'src/app/webbrowser/TabsList.qml'
82--- src/app/webbrowser/TabsList.qml 2014-07-08 08:03:55 +0000
83+++ src/app/webbrowser/TabsList.qml 2014-07-09 12:24:44 +0000
84@@ -83,6 +83,7 @@
85
86 url: model.url
87 label: model.title ? model.title : model.url
88+ icon: model.icon
89 //thumbnail: model.webview.thumbnail
90 canClose: true
91
92
93=== modified file 'src/app/webbrowser/TimelineView.qml'
94--- src/app/webbrowser/TimelineView.qml 2014-05-29 15:30:11 +0000
95+++ src/app/webbrowser/TimelineView.qml 2014-07-09 12:24:44 +0000
96@@ -177,6 +177,7 @@
97
98 url: model.url
99 label: model.title ? model.title : model.url
100+ icon: model.icon
101
102 //property url thumbnailSource: "image://webthumbnail/" + model.url
103 //thumbnail: WebThumbnailer.thumbnailExists(model.url) ? thumbnailSource : ""
104
105=== modified file 'src/app/webbrowser/UrlDelegate.qml'
106--- src/app/webbrowser/UrlDelegate.qml 2014-07-04 12:37:04 +0000
107+++ src/app/webbrowser/UrlDelegate.qml 2014-07-09 12:24:44 +0000
108@@ -42,8 +42,11 @@
109 height: parent.height
110 width: parent.height
111
112- image: Image {
113+ Image {
114 id: icon
115+ anchors.centerIn: parent
116+ width: units.dp(16)
117+ height: units.dp(16)
118 }
119 }
120

Subscribers

People subscribed via source and target branches

to status/vote changes: