Ubuntu File Manager App

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

  1. migrate_toolkit_13
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 522
Merged at revision: 522
Proposed branch: lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Merge into: lp: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:~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.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.

lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 updated
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
lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 updated
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
=== modified file 'src/app/qml/components/AutoSpacedGrid.qml'
--- src/app/qml/components/AutoSpacedGrid.qml 2014-09-20 10:49:51 +0000
+++ src/app/qml/components/AutoSpacedGrid.qml 2016-01-29 07:30:41 +0000
@@ -16,7 +16,7 @@
16 * You should have received a copy of the GNU General Public License *16 * You should have received a copy of the GNU General Public License *
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. *17 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
18 ***************************************************************************/18 ***************************************************************************/
19import QtQuick 2.319import QtQuick 2.4
2020
21Item {21Item {
22 id: root22 id: root
2323
=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
--- src/app/qml/components/FolderIconDelegate.qml 2015-10-01 00:04:00 +0000
+++ src/app/qml/components/FolderIconDelegate.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import QtGraphicalEffects 1.019import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22Item {22Item {
23 id: delegate23 id: delegate
2424
=== modified file 'src/app/qml/components/FolderIconView.qml'
--- src/app/qml/components/FolderIconView.qml 2015-01-06 23:24:33 +0000
+++ src/app/qml/components/FolderIconView.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23Item {23Item {
24 id: root24 id: root
2525
=== modified file 'src/app/qml/components/FolderListDelegate.qml'
--- src/app/qml/components/FolderListDelegate.qml 2015-10-01 00:04:00 +0000
+++ src/app/qml/components/FolderListDelegate.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.3 as ListItem
21import org.nemomobile.folderlistmodel 1.021import org.nemomobile.folderlistmodel 1.0
2222
23ListItem.Subtitled {23ListItem.Subtitled {
2424
=== modified file 'src/app/qml/components/FolderListView.qml'
--- src/app/qml/components/FolderListView.qml 2015-01-06 23:24:33 +0000
+++ src/app/qml/components/FolderListView.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.020import Ubuntu.Components.ListItems 1.3
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
22import org.nemomobile.folderlistmodel 1.022import org.nemomobile.folderlistmodel 1.0
2323
24ListView {24ListView {
2525
=== modified file 'src/app/qml/components/NetAuthenticationHandler.qml'
--- src/app/qml/components/NetAuthenticationHandler.qml 2015-09-07 20:37:16 +0000
+++ src/app/qml/components/NetAuthenticationHandler.qml 2016-01-29 07:30:41 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.31import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import "../ui"3import "../ui"
44
5Item {5Item {
66
=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml 2014-10-24 03:00:16 +0000
+++ src/app/qml/components/PathHistoryRow.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Akiva16 * Authored by: Akiva
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.020import Ubuntu.Components.ListItems 1.3
2121
22/* Full path of your current folder and recent history, that you can jump to by clicking its members */22/* Full path of your current folder and recent history, that you can jump to by clicking its members */
23Flickable {23Flickable {
2424
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml 2015-09-06 00:11:02 +0000
+++ src/app/qml/components/PlacesSidebar.qml 2016-01-29 07:30:41 +0000
@@ -15,11 +15,11 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import QtGraphicalEffects 1.019import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.3
2323
24Sidebar {24Sidebar {
25 id: root25 id: root
2626
=== modified file 'src/app/qml/components/Sidebar.qml'
--- src/app/qml/components/Sidebar.qml 2014-09-20 10:49:51 +0000
+++ src/app/qml/components/Sidebar.qml 2016-01-29 07:30:41 +0000
@@ -17,9 +17,9 @@
17 * You should have received a copy of the GNU General Public License *17 * You should have received a copy of the GNU General Public License *
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. *18 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
19 ***************************************************************************/19 ***************************************************************************/
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.022import Ubuntu.Components.ListItems 1.3
2323
24/*!24/*!
25 \qmltype Sidebar25 \qmltype Sidebar
2626
=== modified file 'src/app/qml/components/VerticalDivider.qml'
--- src/app/qml/components/VerticalDivider.qml 2014-09-20 10:49:51 +0000
+++ src/app/qml/components/VerticalDivider.qml 2016-01-29 07:30:41 +0000
@@ -17,10 +17,10 @@
17 * You should have received a copy of the GNU General Public License *17 * You should have received a copy of the GNU General Public License *
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. *18 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
19 ***************************************************************************/19 ***************************************************************************/
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.022import Ubuntu.Components.ListItems 1.3
23import QtQuick 2.323import QtQuick 2.4
2424
25Item {25Item {
26 property string mode: "left" // or right26 property string mode: "left" // or right
2727
=== modified file 'src/app/qml/content-hub/FileOpener.qml'
--- src/app/qml/content-hub/FileOpener.qml 2014-10-24 12:27:12 +0000
+++ src/app/qml/content-hub/FileOpener.qml 2016-01-29 07:30:41 +0000
@@ -15,8 +15,8 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.018import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21import Ubuntu.Content 0.121import Ubuntu.Content 0.1
2222
2323
=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml 2015-11-02 18:01:09 +0000
+++ src/app/qml/filemanager.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import org.nemomobile.folderlistmodel 1.020import org.nemomobile.folderlistmodel 1.0
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
22import Ubuntu.Unity.Action 1.1 as UnityActions22import Ubuntu.Unity.Action 1.1 as UnityActions
23import U1db 1.0 as U1db23import U1db 1.0 as U1db
24import Ubuntu.Content 0.124import Ubuntu.Content 0.1
@@ -32,7 +32,6 @@
32 // objectName for functional testing purposes (autopilot-qt5)32 // objectName for functional testing purposes (autopilot-qt5)
33 objectName: "filemanager"33 objectName: "filemanager"
34 applicationName: "com.ubuntu.filemanager"34 applicationName: "com.ubuntu.filemanager"
35 useDeprecatedToolbar: false
3635
37 width: phone ? units.gu(40) : units.gu(100)36 width: phone ? units.gu(40) : units.gu(100)
38 height: units.gu(75)37 height: units.gu(75)
3938
=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml 2015-08-30 14:15:41 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Dialog {22Dialog {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/ConfirmDialog.qml'
--- src/app/qml/ui/ConfirmDialog.qml 2015-08-30 14:15:41 +0000
+++ src/app/qml/ui/ConfirmDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Dialog {22Dialog {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
--- src/app/qml/ui/ConfirmDialogWithInput.qml 2015-08-30 14:15:41 +0000
+++ src/app/qml/ui/ConfirmDialogWithInput.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Dialog {22Dialog {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/FileActionDialog.qml'
--- src/app/qml/ui/FileActionDialog.qml 2015-11-02 18:01:09 +0000
+++ src/app/qml/ui/FileActionDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import org.nemomobile.folderlistmodel 1.021import org.nemomobile.folderlistmodel 1.0
2222
23Dialog {23Dialog {
2424
=== modified file 'src/app/qml/ui/FileDetailsPopover.qml'
--- src/app/qml/ui/FileDetailsPopover.qml 2015-07-16 20:04:05 +0000
+++ src/app/qml/ui/FileDetailsPopover.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Popover {22Popover {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/FileOperationProgressDialog.qml'
--- src/app/qml/ui/FileOperationProgressDialog.qml 2014-10-06 12:27:18 +0000
+++ src/app/qml/ui/FileOperationProgressDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import org.nemomobile.folderlistmodel 1.021import org.nemomobile.folderlistmodel 1.0
2222
23Dialog {23Dialog {
2424
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml 2015-11-02 18:01:09 +0000
+++ src/app/qml/ui/FolderListPage.qml 2016-01-29 07:30:41 +0000
@@ -16,10 +16,10 @@
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 * Niklas Wenzel <nikwen.developer@gmail.com>17 * Niklas Wenzel <nikwen.developer@gmail.com>
18 */18 */
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
22import Ubuntu.Components.ListItems 1.022import Ubuntu.Components.ListItems 1.3
23import org.nemomobile.folderlistmodel 1.023import org.nemomobile.folderlistmodel 1.0
24import com.ubuntu.Archives 0.124import com.ubuntu.Archives 0.1
25import "../components"25import "../components"
2626
=== modified file 'src/app/qml/ui/GoToDialog.qml'
--- src/app/qml/ui/GoToDialog.qml 2015-10-20 10:03:51 +0000
+++ src/app/qml/ui/GoToDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Dialog {22Dialog {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/NetAuthenticationDialog.qml'
--- src/app/qml/ui/NetAuthenticationDialog.qml 2015-09-07 20:37:16 +0000
+++ src/app/qml/ui/NetAuthenticationDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Carlos Jose Mazieri <carlos.mazieri@gmail.com>16 * Authored by: Carlos Jose Mazieri <carlos.mazieri@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
2222
23Dialog {23Dialog {
24 id: authenticationDialog24 id: authenticationDialog
2525
=== modified file 'src/app/qml/ui/NotifyDialog.qml'
--- src/app/qml/ui/NotifyDialog.qml 2015-08-30 14:15:41 +0000
+++ src/app/qml/ui/NotifyDialog.qml 2016-01-29 07:30:41 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
2121
22Dialog {22Dialog {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/ui/PlacesPage.qml'
--- src/app/qml/ui/PlacesPage.qml 2015-10-20 10:03:51 +0000
+++ src/app/qml/ui/PlacesPage.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
22import org.nemomobile.folderlistmodel 1.022import org.nemomobile.folderlistmodel 1.0
2323
24Page {24Page {
2525
=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml 2015-10-19 12:39:27 +0000
+++ src/app/qml/ui/PlacesPopover.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
2222
23Popover {23Popover {
24 id: root24 id: root
2525
=== modified file 'src/app/qml/ui/SettingsSheet.qml'
--- src/app/qml/ui/SettingsSheet.qml 2014-10-18 00:35:24 +0000
+++ src/app/qml/ui/SettingsSheet.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.020import Ubuntu.Components.ListItems 1.3
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
2222
23/*23/*
24 * The Settings page holds global settings/preferences.24 * The Settings page holds global settings/preferences.
2525
=== modified file 'src/app/qml/ui/ViewPopover.qml'
--- src/app/qml/ui/ViewPopover.qml 2015-10-20 10:03:51 +0000
+++ src/app/qml/ui/ViewPopover.qml 2016-01-29 07:30:41 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
2222
23Popover {23Popover {
24 id: root24 id: root
2525
=== modified file 'src/app/qml/upstream/FakeHeader.qml'
--- src/app/qml/upstream/FakeHeader.qml 2014-10-23 20:54:30 +0000
+++ src/app/qml/upstream/FakeHeader.qml 2016-01-29 07:30:41 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Column {20Column {
21 id: fakeHeader21 id: fakeHeader
2222
=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
--- src/app/qml/upstream/PageWithBottomEdge.qml 2014-10-24 03:00:16 +0000
+++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-29 07:30:41 +0000
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.166import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page

Subscribers

People subscribed via source and target branches