Ubuntu File Manager App

Merge lp:~nikwen/ubuntu-filemanager-app/remove-popover-workaround into lp:ubuntu-filemanager-app

  1. remove-popover-workaround
  2. Merge into trunk
Proposed by Niklas Wenzel on 2015-06-14
Status: Merged
Approved by: Niklas Wenzel on 2015-08-28
Approved revision: 422
Merged at revision: 458
Proposed branch: lp:~nikwen/ubuntu-filemanager-app/remove-popover-workaround
Merge into: lp:ubuntu-filemanager-app
Diff against target: 27 lines (+0/-17)
1 file modified
src/app/qml/ui/FolderListPage.qml (+0/-17)
To merge this branch: bzr merge lp:~nikwen/ubuntu-filemanager-app/remove-popover-workaround
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-26
Arto Jalkanen 2015-06-14 Approve on 2015-08-25
Review via email: mp+261909@code.launchpad.net

Commit Message

Remove popover workaround for LP: #1395118

Description of the Change

Remove popover workaround for LP: #1395118.

This is becoming rather urgent now that the SDK team is creating a new set of popover/dialog components in order to not break things in the filemanager app.

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Niklas Wenzel (nikwen) wrote :

The issue here is that the chroot used for testing does not have the UI Toolkit patch. I think one should update those chroots as the patch was added around the second RTM release!

lp:~nikwen/ubuntu-filemanager-app/remove-popover-workaround updated on 2015-08-25
422. By Niklas Wenzel on 2015-08-25

Empty commit to make the autopilot tests rerun, hopefully in a vivid chroot this time

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Arto Jalkanen (ajalkane) :
review: Approve
Niklas Wenzel (nikwen) wrote :

Arto, thank you for approving this. Sadly, it looks like the tests still run on utopic. I'll talk to popey to get this fixed somehow.

Nicholas Skaggs (nskaggs) wrote :

Re-running under vivid.

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Niklas Wenzel (nikwen) wrote :

Thank you for modifying the test setup. Let's see if it merges now. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/ui/FolderListPage.qml'
2--- src/app/qml/ui/FolderListPage.qml 2015-06-20 19:13:13 +0000
3+++ src/app/qml/ui/FolderListPage.qml 2015-08-25 15:29:11 +0000
4@@ -526,23 +526,6 @@
5 archiveType = getArchiveType(actionSelectionPopover.model.fileName)
6 }
7
8- delegate: Empty { // NOTE: This is a workaround for LP: #1395118 and should be removed as soon as the patch for upstream gets released (https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1395118)
9- id: listItem
10- Label {
11- text: listItem.text
12- anchors {
13- verticalCenter: parent.verticalCenter
14- horizontalCenter: parent.horizontalCenter
15- }
16- wrapMode: Text.Wrap
17- color: Theme.palette.normal.overlayText
18- }
19- /*! \internal */
20- onTriggered: actionSelectionPopover.hide()
21- visible: enabled && ((action === undefined) || action.visible)
22- height: visible ? implicitHeight : 0
23- }
24-
25 actions: ActionList {
26 Action {
27 text: i18n.tr("Cut")

Subscribers

People subscribed via source and target branches