Merge lp://qastaging/~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 into lp://qastaging/ubuntu-filemanager-app

Proposed by Florian Boucault
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 522
Merged at revision: 522
Proposed branch: lp://qastaging/~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Merge into: lp://qastaging/ubuntu-filemanager-app
Diff against target: 489 lines (+87/-88)
28 files modified
src/app/qml/components/AutoSpacedGrid.qml (+1/-1)
src/app/qml/components/FolderIconDelegate.qml (+2/-2)
src/app/qml/components/FolderIconView.qml (+4/-4)
src/app/qml/components/FolderListDelegate.qml (+3/-3)
src/app/qml/components/FolderListView.qml (+4/-4)
src/app/qml/components/NetAuthenticationHandler.qml (+2/-2)
src/app/qml/components/PathHistoryRow.qml (+3/-3)
src/app/qml/components/PlacesSidebar.qml (+4/-4)
src/app/qml/components/Sidebar.qml (+3/-3)
src/app/qml/components/VerticalDivider.qml (+4/-4)
src/app/qml/content-hub/FileOpener.qml (+2/-2)
src/app/qml/filemanager.qml (+3/-4)
src/app/qml/ui/AuthenticationDialog.qml (+3/-3)
src/app/qml/ui/ConfirmDialog.qml (+3/-3)
src/app/qml/ui/ConfirmDialogWithInput.qml (+3/-3)
src/app/qml/ui/FileActionDialog.qml (+3/-3)
src/app/qml/ui/FileDetailsPopover.qml (+3/-3)
src/app/qml/ui/FileOperationProgressDialog.qml (+3/-3)
src/app/qml/ui/FolderListPage.qml (+4/-4)
src/app/qml/ui/GoToDialog.qml (+3/-3)
src/app/qml/ui/NetAuthenticationDialog.qml (+4/-4)
src/app/qml/ui/NotifyDialog.qml (+3/-3)
src/app/qml/ui/PlacesPage.qml (+4/-4)
src/app/qml/ui/PlacesPopover.qml (+4/-4)
src/app/qml/ui/SettingsSheet.qml (+4/-4)
src/app/qml/ui/ViewPopover.qml (+4/-4)
src/app/qml/upstream/FakeHeader.qml (+2/-2)
src/app/qml/upstream/PageWithBottomEdge.qml (+2/-2)
To merge this branch: bzr merge lp://qastaging/~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+282915@code.qastaging.launchpad.net

Commit message

Migrated to version 1.3 of the Ubuntu UI Toolkit

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

This change was NOT tested. It is proposed for helping with the grunt work of changing the imports.

521. By Florian Boucault

Removed deprecated property 'useDeprecatedToolbar'

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Tested this and while it works, I'd like to land this along with an update to the colours which is in https://code.launchpad.net/~popey/ubuntu-filemanager-app/update-colours/+merge/283206

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) :
review: Approve
522. By Florian Boucault

Reverted changes to po/com.ubuntu.filemanager.pot

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches