gallery-app

Merge lp:~bfiller/gallery-app/fix-album-text into lp:gallery-app

  1. fix-album-text
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 1098
Merged at revision: 1100
Proposed branch: lp:~bfiller/gallery-app/fix-album-text
Merge into: lp:gallery-app
Diff against target: 66 lines (+5/-13)
2 files modified
rc/qml/AlbumViewer/AlbumCover.qml (+2/-10)
rc/qml/Components/TextEditOnClick.qml (+3/-3)
To merge this branch: bzr merge lp:~bfiller/gallery-app/fix-album-text
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Arthur Mello Pending
Review via email: mp+237878@code.launchpad.net

This proposal supersedes a proposal from 2014-10-08.

Commit message

Scale the album title proportionally to the album itself, so it works on all devices.

Description of the change

Scale the album title proportionally to the album itself, so it works on all devices.

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

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1057/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/232
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/232
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3999
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/777
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14344
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4326
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4326/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Arthur Mello (artmello) wrote : Posted in a previous version of this proposal

lgtm

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

FAILED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1059/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/234
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/234
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/478/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4028
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/621/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/786
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14467
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4357
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4357/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'rc/qml/AlbumViewer/AlbumCover.qml'
--- rc/qml/AlbumViewer/AlbumCover.qml 2013-06-20 11:54:49 +0000
+++ rc/qml/AlbumViewer/AlbumCover.qml 2014-10-10 01:26:59 +0000
@@ -87,10 +87,6 @@
87 height : xScale * (coverImageFull.height - 14)87 height : xScale * (coverImageFull.height - 14)
88 }88 }
8989
90 // internal
91 // Scale text and spacers by factor of cover size.
92 property real textScale: isPreview || width <= 0 || cover.previewPixelWidth <= 0
93 ? 1 : coverImageFull.sourceSize.width / cover.previewPixelWidth
94 /*!90 /*!
95 */91 */
96 property real spacerScale: cover.height / units.gu(33) // ratio of image height to canonical height92 property real spacerScale: cover.height / units.gu(33) // ratio of image height to canonical height
@@ -261,9 +257,7 @@
261 color: "#ffffff"257 color: "#ffffff"
262258
263 fontFamily: "Ubuntu"259 fontFamily: "Ubuntu"
264 // Subtract small amount due to a slight mismatch in preview vs.260 fontPixelSize: albumCover.height * 0.09
265 // full album cover aspect ratios.
266 fontPointSize: (pointUnits(16) * textScale) - (isPreview ? 2 : 0)
267 smooth: true261 smooth: true
268 textFormat: TextEdit.PlainText262 textFormat: TextEdit.PlainText
269263
@@ -319,9 +313,7 @@
319313
320 fontFamily: "Ubuntu"314 fontFamily: "Ubuntu"
321315
322 // Subtract small amount due to a slight mismatch in preview vs.316 fontPixelSize: albumCover.height * 0.07
323 // full album cover aspect ratios.
324 fontPointSize: (pointUnits(10) * textScale) - (isPreview ? 1 : 0)
325 smooth: true317 smooth: true
326 textFormat: TextEdit.PlainText318 textFormat: TextEdit.PlainText
327319
328320
=== modified file 'rc/qml/Components/TextEditOnClick.qml'
--- rc/qml/Components/TextEditOnClick.qml 2014-09-19 19:24:58 +0000
+++ rc/qml/Components/TextEditOnClick.qml 2014-10-10 01:26:59 +0000
@@ -52,7 +52,7 @@
52 property variant color: "#000000"52 property variant color: "#000000"
53 /*!53 /*!
54 */54 */
55 property real fontPointSize: 12.055 property real fontPixelSize
56 /*!56 /*!
57 */57 */
58 property string fontFamily: "sans-serif"58 property string fontFamily: "sans-serif"
@@ -118,7 +118,7 @@
118 horizontalAlignment: textEditOnClick.horizontalAlignment118 horizontalAlignment: textEditOnClick.horizontalAlignment
119 wrapMode: textEditOnClick.wrapMode119 wrapMode: textEditOnClick.wrapMode
120 color: textEditOnClick.color120 color: textEditOnClick.color
121 font.pointSize: textEditOnClick.fontPointSize121 font.pixelSize: textEditOnClick.fontPixelSize
122 font.family: textEditOnClick.fontFamily122 font.family: textEditOnClick.fontFamily
123 maximumLineCount: textEditOnClick.maximumLineCount123 maximumLineCount: textEditOnClick.maximumLineCount
124124
@@ -150,7 +150,7 @@
150 horizontalAlignment: textEditOnClick.horizontalAlignment150 horizontalAlignment: textEditOnClick.horizontalAlignment
151 wrapMode: textEditOnClick.wrapMode151 wrapMode: textEditOnClick.wrapMode
152 color: textEditOnClick.color152 color: textEditOnClick.color
153 font.pointSize: textEditOnClick.fontPointSize153 font.pixelSize: textEditOnClick.fontPixelSize
154 font.family: textEditOnClick.fontFamily154 font.family: textEditOnClick.fontFamily
155 inputMethodHints: Qt.ImhNoPredictiveText155 inputMethodHints: Qt.ImhNoPredictiveText
156156

Subscribers

People subscribed via source and target branches