Stefano Verzegnassi has proposed merging
lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-pdfview into
lp:ubuntu-docviewer-app with
lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50 as a
prerequisite.
Commit message:
Pdf viewer:
* Removed 'search' action (unused)
* Fixed keyboard hooks in the 'GoTo' dialog
* Fixed presentation mode color palette
* Use ScrollView component
Requested reviews:
Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-pdfview/+merge/290172
Pdf viewer:
* Removed 'search' action (unused)
* Fixed keyboard hooks in the 'GoTo' dialog
* Fixed presentation mode color palette
* Use ScrollView component
--
Your team Ubuntu Document Viewer Developers is requested to review the proposed
merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-pdfview into
lp:ubuntu-docviewer-app.
=== modified file 'src/app/qml/pdfView/PdfContentsPage.qml'
--- src/app/qml/pdfView/PdfContentsPage.qml 2016-03-26 18:44:11 +
+++ src/app/qml/pdfView/PdfContentsPage.qml 2016-03-26 18:44:11 +
@@ -24,7 +24,7 @@
objectName: "pdfcontents"
// this property will have to be removed when bug #1341671 will be fixed.
-property string testProperty: "for page name issue"
+property string testProperty: "for page name issue"
header: PageHeader {
// TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
@@ -50,74 +50,73 @@
view.positionViewAtIndex(i, ListView.Center);
}
-ListView {
-id: view
-objectName: "view"
+ScrollView {
anchors.fill: parent
-clip: true
-
-model: poppler.tocModel
-
-delegate: ListItem {
-id: delegate
-objectName: "delegate" + index
-
-onClicked: {
-pdfView.positionAtIndex(model.pageIndex);
-contentsBottomEdge.collapse();
-}
-
-// Highlighted property of ListItem is read-only. In order to
-// provide an highlight for the current page, we need to duplicate
-// the overlay.
-Rectangle {
-anchors.fill: parent
-color: Qt.rgba(0, 0, 0, 0.05)
-visible: view.currentIndex == model.index
-}
-
-/* UITK 1.3 spec: Three slot layout (A-B-C) */
-//
-// | | | |
-// | A | B | C |
-// |__|__ __|___|
-//
-ListItemLayout {
-id: listItemLayout
-objectName: "listItemLayout" + index
-anchors.fill: parent
-anchors.leftMargin: model.level * units.gu(4)
-
-/* UITK 1.3 specs: Slot A */
-title {
-text: model.title
-elide: Text.ElideRight
-//font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
-//color: (model.level == 0) ? UbuntuColors.midAubergine
-// : theme.palette.normal.backgroundText
-}
-
-/* UITK 1.3 specs: Slot B */
-Icon {
-SlotsLayout.position: SlotsLayout.Trailing
-width: units.gu(2); height: width
-name: "tick"
-color: UbuntuColors.green
-visible: view.currentIndex == model.index
-}
-
-/* UITK 1.3 specs: Slot C */
-Label {
-objectName: "pageindex"
-SlotsLayout.position: SlotsLayout.Last
-text: model.pageIndex + 1
-//font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
-//color: (model.level == 0) ? UbuntuColors.midAubergine
-// : theme.palette.normal.backgroundText
+
+ListView {
+id: view
+objectName: "view"
+anchors.fill: parent
+clip: true
+
+model: poppler.tocModel
+
+delegate: ListItem {
+id: delegate
+objectName: "delegate" + index
+
+property bool __isCurrentIndex: view.currentIndex == model.index
+
+onClicked: {
+pdfView.positionAtIndex(model.pageIndex);
+contentsBottomEdge.collapse();
+}
+
+// Highlighted property of ListItem is read-only. In order to
+// provide an highlight for the current page, we need to duplicate
+// the overlay.
+Rectangle {
+anchors.fill: parent
+color:
