Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1523112 into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Roman Shchekin
Approved revision: 242
Merged at revision: 245
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1523112
Merge into: lp:ubuntu-docviewer-app
Diff against target: 84 lines (+41/-33)
1 file modified
src/app/qml/common/DetailsPage.qml (+41/-33)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1523112
Reviewer Review Type Date Requested Status
Roman Shchekin Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+281364@code.launchpad.net

Commit message

Added Flickable in DetailsPage. Content can be scrolled when bigger than the page.

Description of the change

Added Flickable in DetailsPage. Content can be scrolled when bigger than the page.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote :

The using of ListView can be better solution, but for now it is ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/common/DetailsPage.qml'
2--- src/app/qml/common/DetailsPage.qml 2015-10-23 10:46:24 +0000
3+++ src/app/qml/common/DetailsPage.qml 2015-12-26 18:46:12 +0000
4@@ -24,39 +24,47 @@
5 objectName: "detailsPage"
6 title: i18n.tr("Details")
7
8- Column {
9- width: Math.min(units.gu(80), parent.width)
10- anchors {
11- top: parent.top
12- bottom: parent.bottom
13- horizontalCenter: parent.horizontalCenter
14- }
15-
16- SubtitledListItem {
17- text: i18n.tr("Location")
18- subText: file.path
19- }
20-
21- SubtitledListItem {
22- text: i18n.tr("Size")
23- subText: Utils.printSize(i18n, file.info.size)
24- }
25-
26- SubtitledListItem {
27- text: i18n.tr("Created")
28- subText: file.info.creationTime.toLocaleString(Qt.locale())
29- }
30-
31- SubtitledListItem {
32- text: i18n.tr("Last modified")
33- subText: file.info.lastModified.toLocaleString(Qt.locale())
34- }
35-
36- SubtitledListItem {
37- // Used by Autopilot tests
38- objectName: "mimetypeItem"
39- text: i18n.tr("MIME type")
40- subText: file.mimetype.name
41+ Flickable {
42+ id: flick
43+ anchors.fill: parent
44+ interactive: true
45+
46+ contentWidth: parent.width
47+ contentHeight: layout.height
48+
49+ Column {
50+ id: layout
51+ width: Math.min(units.gu(80), parent.width)
52+ anchors.horizontalCenter: parent.horizontalCenter
53+
54+ SubtitledListItem {
55+ text: i18n.tr("Location")
56+ subText: file.path
57+ }
58+
59+ SubtitledListItem {
60+ text: i18n.tr("Size")
61+ subText: Utils.printSize(i18n, file.info.size)
62+ }
63+
64+ SubtitledListItem {
65+ text: i18n.tr("Created")
66+ subText: file.info.creationTime.toLocaleString(Qt.locale())
67+ }
68+
69+ SubtitledListItem {
70+ text: i18n.tr("Last modified")
71+ subText: file.info.lastModified.toLocaleString(Qt.locale())
72+ }
73+
74+ SubtitledListItem {
75+ // Used by Autopilot tests
76+ objectName: "mimetypeItem"
77+ text: i18n.tr("MIME type")
78+ subText: file.mimetype.name
79+ }
80 }
81 }
82+
83+ Scrollbar { flickableItem: flick }
84 }

Subscribers

People subscribed via source and target branches