Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/release-2.1.2 into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 330
Merged at revision: 330
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/release-2.1.2
Merge into: lp:ubuntu-docviewer-app
Diff against target: 44 lines (+12/-1)
3 files modified
click/manifest.json.in (+1/-1)
debian/changelog (+2/-0)
src/app/qml/ubuntu-docviewer-app.qml (+9/-0)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/release-2.1.2
Reviewer Review Type Date Requested Status
Roman Shchekin Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+290962@code.launchpad.net

Commit message

* Bumped framework to 15.04.4
* Fixed broken night mode (i.e. app background is still white when the mode is enabled)
* Updated changelog

Description of the change

* Bumped framework to 15.04.4
* Fixed broken night mode (i.e. app background is still white when the mode is enabled)
* Updated changelog

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/manifest.json.in'
2--- click/manifest.json.in 2016-02-11 18:03:07 +0000
3+++ click/manifest.json.in 2016-04-05 09:34:25 +0000
4@@ -2,7 +2,7 @@
5 "name": "com.ubuntu.docviewer",
6 "title": "Document Viewer",
7 "description": "Document Viewer application for Ubuntu devices",
8- "framework": "ubuntu-sdk-15.04.3",
9+ "framework": "ubuntu-sdk-15.04.4",
10 "architecture": "@CLICK_ARCH@",
11 "icon": "@ICON@",
12 "hooks": {
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2016-02-11 18:03:07 +0000
16+++ debian/changelog 2016-04-05 09:34:25 +0000
17@@ -1,5 +1,7 @@
18 ubuntu-docviewer-app (2.1) vivid; urgency=medium
19
20+ * Fixed an issue with the documents list not updating the model entries (LP: #1483218)
21+ * New theming/UI components in OTA-10 fully supported (LP: #1551259)
22 * LibreOffice viewer: added support for spreadsheet documents with multiple sheets (LP: #1537755)
23 * LibreOffice viewer: limited zoom value to a minimum/maximum value (LP: #1501424)
24 * LibreOffice viewer: added a double-tap-to-zoom gesture (LP: #1541582)
25
26=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
27--- src/app/qml/ubuntu-docviewer-app.qml 2016-03-31 17:41:13 +0000
28+++ src/app/qml/ubuntu-docviewer-app.qml 2016-04-05 09:34:25 +0000
29@@ -180,6 +180,15 @@
30 filter.property: "name"
31 }
32
33+ // WORKAROUND: mainView backgroundColor is an alias for the window color, and does not
34+ // refer to a child QML Rectangle anymore. This breaks our night mode shader; for that
35+ // reason we need to re-add that QML Rectangle.
36+ Rectangle {
37+ anchors.fill: parent
38+ color: mainView.backgroundColor
39+ visible: nightModeEnabled
40+ }
41+
42 PageStack {
43 id: pageStack
44 }

Subscribers

People subscribed via source and target branches