Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-textview into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

[TextView] Switch to UITK 1.3 PageHeader component

[TextView] Switch to UITK 1.3 PageHeader component

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:315
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/259/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/795/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/259/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:315
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/260/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/810/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/260/rebuild

review: Approve (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-textview]

316. By Stefano Verzegnassi on 2016-03-26

Updated copyright

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:316
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/264/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/818/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/264/rebuild

review: Approve (continuous-integration)

[Roman Shchekin (mrqtros)]

Like it.
BTW, did you move all Pages to PageHeader approach? When I was developing Shorts I found that if you mix both old and new approches UITK works in strange way...

review: Approve

[Stefano Verzegnassi (verzegnassi-stefano)]

Yes, I'm moving all the pages to the new approach (there are already a few MPs for them).

Thanks for the review!

=== modified file 'src/app/qml/textView/TextView.qml'
--- src/app/qml/textView/TextView.qml	2015-12-26 18:27:13 +0000
+++ src/app/qml/textView/TextView.qml	2016-03-26 18:46:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,10 +23,11 @@
 
 Page {
     id: textPage
-    title: DocumentViewer.getFileBaseNameFromPath(file.path)
 
-    // Reset night mode shader settings when closing the page
-    // Component.onDestruction: mainView.nightModeEnabled = false
+    header: TextViewDefaultHeader {
+        title: DocumentViewer.getFileBaseNameFromPath(file.path)
+        activityRunning: textAreaMain.isLoading
+    }
 
     TextArea {
         id: textAreaMain
@@ -34,7 +35,12 @@
 
         property bool isLoading: true
 
-        anchors.fill: parent
+        anchors {
+            top: textPage.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
 
         // FIXME: If set to true, some of the keyboard hooks are disabled
         // And it's not possible to move the cursor with arrow keys.
@@ -61,14 +67,4 @@
             background: Rectangle { color: "white" }
         }
     }
-
-    // *** HEADER ***
-    state: "default"
-    states: [
-        TextViewDefaultHeader {
-            name: "default"
-            targetPage: textPage
-            activityRunning: textAreaMain.isLoading
-        }
-    ]
 }

=== modified file 'src/app/qml/textView/TextViewDefaultHeader.qml'
--- src/app/qml/textView/TextViewDefaultHeader.qml	2015-11-13 21:19:46 +0000
+++ src/app/qml/textView/TextViewDefaultHeader.qml	2016-03-26 18:46:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,44 +20,30 @@
 import Ubuntu.Components.Popups 1.3
 import DocumentViewer 1.0
 
-PageHeadState {
+PageHeader {
     id: rootItem
 
-    property Page targetPage
     property alias activityRunning: activity.running
 
-    head: targetPage.head
-
-    contents: RowLayout {
-        anchors.fill: parent
-        spacing: units.gu(1)
-
-        ActivityIndicator { id: activity; visible: running }
-
-        Column {
-            id: layout
-            Layout.fillWidth: true
-
-            Label {
-                width: parent.width
-                //horizontalAlignment: Text.AlignHCenter
-                elide: Text.ElideMiddle
-
-                font.weight: Font.DemiBold
-                text: targetPage.title
-            }
-            Label {
-                width: parent.width
-                //horizontalAlignment: Text.AlignHCenter
-                elide: Text.ElideMiddle
-
-                textSize: Label.Small
-                text: file.mimetype.description
-            }
-        }
+    contents: ListItemLayout {
+        anchors.centerIn: parent
+
+        ActivityIndicator {
+            id: activity
+            SlotsLayout.position: SlotsLayout.Leading
+            visible: running
+        }
+
+        title {
+            font.weight: Font.DemiBold
+            elide: Text.ElideMiddle
+            text: rootItem.title
+        }
+
+        subtitle.text: file.mimetype.description
     }
 
-    actions: [
+    trailingActionBar.actions: [
         Action {
             iconName: "night-mode"
             text: mainView.nightModeEnabled ? i18n.tr("Disable night mode") : i18n.tr("Enable night mode")