1
=== modified file 'po/com.ubuntu.docviewer.pot'
2
--- po/com.ubuntu.docviewer.pot	2015-04-27 16:02:40 +0000
3
+++ po/com.ubuntu.docviewer.pot	2015-05-08 19:00:14 +0000
4
@@ -8,7 +8,7 @@
5
8
msgstr ""
8
msgstr ""
6
9
"Project-Id-Version: \n"
9
"Project-Id-Version: \n"
7
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
9
11
"POT-Creation-Date: 2015-04-27 18:02+0200\n"
11
"POT-Creation-Date: 2015-05-04 21:48+0200\n"
10
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
13
@@ -34,7 +34,7 @@
14
34
34
15
35
#: ../src/app/docviewer-application.cpp:164
35
#: ../src/app/docviewer-application.cpp:164
16
36
#: ../src/app/qml/documentPage/DocumentPage.qml:25
36
#: ../src/app/qml/documentPage/DocumentPage.qml:25
18
37
#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
37
#: /home/letozaf/autopilot-tests/build-test-toc-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
19
38
msgid "Document Viewer"
38
msgid "Document Viewer"
20
39
msgstr ""
39
msgstr ""
21
40
40
22
@@ -257,12 +257,12 @@
23
257
msgstr ""
257
msgstr ""
24
258
258
25
259
#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
259
#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
27
260
#: ../src/app/qml/pdfView/PdfContentsPage.qml:26
260
#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
28
261
#: ../src/app/qml/pdfView/PdfView.qml:37
261
#: ../src/app/qml/pdfView/PdfView.qml:37
29
262
msgid "Contents"
262
msgid "Contents"
30
263
msgstr ""
263
msgstr ""
31
264
264
33
265
#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
265
#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
34
266
msgid "Hide table of contents"
266
msgid "Hide table of contents"
35
267
msgstr ""
267
msgstr ""
36
268
268
37
@@ -319,6 +319,6 @@
38
319
msgid "Open"
319
msgid "Open"
39
320
msgstr ""
320
msgstr ""
40
321
321
42
322
#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
322
#: /home/letozaf/autopilot-tests/build-test-toc-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
43
323
msgid "documents;viewer;pdf;reader;"
323
msgid "documents;viewer;pdf;reader;"
44
324
msgstr ""
324
msgstr ""
45
325
325
46
=== modified file 'src/app/qml/pdfView/PdfContentsPage.qml'
47
--- src/app/qml/pdfView/PdfContentsPage.qml	2015-04-16 12:58:29 +0000
48
+++ src/app/qml/pdfView/PdfContentsPage.qml	2015-05-08 19:00:14 +0000
49
@@ -22,6 +22,12 @@
50
22
import "../upstreamComponents"
22
import "../upstreamComponents"
51
23
23
52
24
Page {
24
Page {
53
25
    id: pdfContents
54
26
    objectName: "pdfcontents"
55
27
56
28
    // this property will have to be removed when bug #1341671 will be fixed.
57
29
    property string testProperty: "for page name issue"
58
30
59
25
    // TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
31
    // TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
60
26
    title: i18n.tr("Contents")
32
    title: i18n.tr("Contents")
61
27
33
62
@@ -57,6 +63,7 @@
63
57
63
64
58
    ListView {
64
    ListView {
65
59
        id: view
65
        id: view
66
66
        objectName: "view"
67
60
        anchors.fill: parent
67
        anchors.fill: parent
68
61
        clip: true
68
        clip: true
69
62
69
70
@@ -64,6 +71,7 @@
71
64
71
72
65
        delegate: ListItemWithActions {
72
        delegate: ListItemWithActions {
73
66
            id: delegate
73
            id: delegate
74
74
            objectName: "delegate" + index
75
67
75
76
68
            width: parent.width
76
            width: parent.width
77
69
            height: (model.level === 0) ? units.gu(7) : units.gu(6)
77
            height: (model.level === 0) ? units.gu(7) : units.gu(6)
78
@@ -73,6 +81,7 @@
79
73
                                                      : Theme.palette.normal.background
81
                                                      : Theme.palette.normal.background
80
74
82
81
75
            AbstractButton {
83
            AbstractButton {
82
84
                objectName: "abstractbutton"
83
76
                anchors.fill: parent
85
                anchors.fill: parent
84
77
86
85
78
                onClicked: {
87
                onClicked: {
86
@@ -91,6 +100,7 @@
87
91
                spacing: units.gu(1)
100
                spacing: units.gu(1)
88
92
101
89
93
                Label {
102
                Label {
90
103
                    objectName: "content"
91
94
                    Layout.fillWidth: true
104
                    Layout.fillWidth: true
92
95
105
93
96
                    text: model.title
106
                    text: model.title
94
@@ -102,6 +112,7 @@
95
102
                }
112
                }
96
103
113
97
104
                Label {
114
                Label {
98
115
                    objectName: "pageindex"
99
105
                    text: model.pageIndex + 1
116
                    text: model.pageIndex + 1
100
106
                    font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
117
                    font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
101
107
                    color: (model.level === 0) ? UbuntuColors.midAubergine
118
                    color: (model.level === 0) ? UbuntuColors.midAubergine
102
108
119
103
=== modified file 'tests/autopilot/ubuntu_docviewer_app/__init__.py'
104
--- tests/autopilot/ubuntu_docviewer_app/__init__.py	2015-04-14 15:37:06 +0000
105
+++ tests/autopilot/ubuntu_docviewer_app/__init__.py	2015-05-08 19:00:14 +0000
106
@@ -20,6 +20,7 @@
107
20
from autopilot import logging as autopilot_logging
20
from autopilot import logging as autopilot_logging
108
21
logger = logging.getLogger(__name__)
21
logger = logging.getLogger(__name__)
109
22
22
110
23
from autopilot.introspection import dbus
111
23
import ubuntuuitoolkit
24
import ubuntuuitoolkit
112
24
25
113
25
26
114
@@ -58,10 +59,20 @@
115
58
        return self.wait_select_single(PdfView)
59
        return self.wait_select_single(PdfView)
116
59
60
117
60
    @autopilot_logging.log_action(logger.info)
61
    @autopilot_logging.log_action(logger.info)
118
62
    def open_PdfContentsPage(self):
119
63
        """Open the PdfContents Page.
120
64
121
65
        :return the PdfContents Page
122
66
123
67
        """
124
68
        return self.wait_select_single(PdfContentsPage)
125
69
126
70
    @autopilot_logging.log_action(logger.info)
127
61
    def get_PdfViewGotoDialog(self):
71
    def get_PdfViewGotoDialog(self):
128
62
        """Return a dialog emulator"""
72
        """Return a dialog emulator"""
129
63
        return self.wait_select_single(objectName="PdfViewGotoDialog")
73
        return self.wait_select_single(objectName="PdfViewGotoDialog")
130
64
74
131
75
    @autopilot_logging.log_action(logger.info)
132
65
    def go_to_page_from_dialog(self, page_no):
76
    def go_to_page_from_dialog(self, page_no):
133
66
        """ Go to page from get_PfdViewGotoDialog """
77
        """ Go to page from get_PfdViewGotoDialog """
134
67
        textfield = self.wait_select_single(
78
        textfield = self.wait_select_single(
135
@@ -70,6 +81,12 @@
136
70
        go_button = self.wait_select_single("Button", objectName="GOButton")
81
        go_button = self.wait_select_single("Button", objectName="GOButton")
137
71
        self.pointing_device.click_object(go_button)
82
        self.pointing_device.click_object(go_button)
138
72
83
139
84
    @autopilot_logging.log_action(logger.info)
140
85
    def click_go_to_page_button(self):
141
86
        """Click the go_to_page header button."""
142
87
        header = self.get_header()
143
88
        header.click_action_button('gotopage')
144
89
145
73
90
146
74
class Page(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
91
class Page(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
147
75
92
148
@@ -82,15 +99,85 @@
149
82
        self.main_view = self.get_root_instance().select_single(MainView)
99
        self.main_view = self.get_root_instance().select_single(MainView)
150
83
100
151
84
101
153
85
class PdfView(Page):
102
class PageWithBottomEdge(MainView):
154
103
    """
155
104
    An emulator class that makes it easy to interact with the bottom edge
156
105
    swipe page
157
106
    """
158
107
    def __init__(self, *args):
159
108
        super(PageWithBottomEdge, self).__init__(*args)
160
109
161
110
    def reveal_bottom_edge_page(self):
162
111
        """Bring the bottom edge page to the screen"""
163
112
        self.bottomEdgePageLoaded.wait_for(True)
164
113
        try:
165
114
            action_item = self.wait_select_single(objectName='bottomEdgeTip')
166
115
            action_item.visible.wait_for(True)
167
116
            action_item.stretched.wait_for(True)
168
117
            start_x = (action_item.globalRect.x +
169
118
                       (action_item.globalRect.width * 0.5))
170
119
            start_y = (action_item.globalRect.y + 1)
171
120
            stop_y = start_y - (self.height * 0.5)
172
121
            self.pointing_device.drag(start_x, start_y,
173
122
                                      start_x, stop_y, rate=2)
174
123
            self.isReady.wait_for(True)
175
124
        except dbus.StateNotFoundError:
176
125
            logger.error('BottomEdge element not found.')
177
126
            raise
178
127
179
128
180
129
class PdfView(PageWithBottomEdge):
181
86
    """Autopilot helper for PdfView page."""
130
    """Autopilot helper for PdfView page."""
182
87
131
183
88
    @autopilot_logging.log_action(logger.info)
132
    @autopilot_logging.log_action(logger.info)
184
89
    def toggle_header_visibility(self):
133
    def toggle_header_visibility(self):
185
90
        """Show/hide page header by clicking on the center of main view"""
134
        """Show/hide page header by clicking on the center of main view"""
192
91
        self.pointing_device.click_object(self.main_view)
135
        self.pointing_device.click_object(self)
193
92
136
194
93
    def click_go_to_page_button(self):
137
    def get_currentpage_number(self):
195
94
        """Click the go_to_page header button."""
138
        """return the value of the currentPage property"""
196
95
        header = self.main_view.get_header()
139
        return self.currentPage
197
96
        header.click_action_button('gotopage')
140
198
141
199
142
class PdfContentsPage(Page):
200
143
    """Autopilot helper for PdfContents page."""
201
144
202
145
    @autopilot_logging.log_action(logger.info)
203
146
    def get_content_and_line_pageindex(self, labelText):
204
147
        content_line, page_no = self._get_listitem(labelText)
205
148
        return content_line, page_no
206
149
207
150
    def _get_listitem(self, labelText):
208
151
        view_item = self.select_single(
209
152
            "QQuickListView", objectName="view")
210
153
        list_items_count = view_item.count
211
154
212
155
        index = 0
213
156
        for index in range(list_items_count):
214
157
            list_item = self.select_single(
215
158
                "ListItemWithActions", objectName="delegate{}".format(index))
216
159
            while list_item.y > (view_item.contentY +
217
160
                                 view_item.globalRect.height):
218
161
                self.scroll_pdfcontentspage()
219
162
            label = list_item.select_single("Label", objectName="content")
220
163
            if label.text == labelText:
221
164
                page_no = list_item.select_single(
222
165
                    "Label", objectName="pageindex").text
223
166
                return label, page_no
224
167
                break
225
168
226
169
    @autopilot_logging.log_action(logger.info)
227
170
    def click_content_line(self, content_line):
228
171
        self.pointing_device.click_object(content_line)
229
172
230
173
    @autopilot_logging.log_action(logger.info)
231
174
    def scroll_pdfcontentspage(self):
232
175
        action_item = self.select_single("QQuickListView")
233
176
        start_x = (action_item.globalRect.x +
234
177
                   (action_item.globalRect.width * 0.5))
235
178
        start_y = (action_item.globalRect.y +
236
179
                   (action_item.height * 0.8))
237
180
        stop_y = start_y - (action_item.height * 0.7)
238
181
        self.pointing_device.drag(start_x, start_y,
239
182
                                  start_x, stop_y, rate=2)
240
183
        action_item.moving.wait_for(False)
241
97
184
242
=== added file 'tests/autopilot/ubuntu_docviewer_app/files/serverguide.pdf'
243
98
Binary files tests/autopilot/ubuntu_docviewer_app/files/serverguide.pdf	1970-01-01 00:00:00 +0000 and tests/autopilot/ubuntu_docviewer_app/files/serverguide.pdf	2015-05-08 19:00:14 +0000 differ
185
Binary files tests/autopilot/ubuntu_docviewer_app/files/serverguide.pdf	1970-01-01 00:00:00 +0000 and tests/autopilot/ubuntu_docviewer_app/files/serverguide.pdf	2015-05-08 19:00:14 +0000 differ
244
=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py'
245
--- tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py	2015-04-14 15:37:06 +0000
246
+++ tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py	2015-05-08 19:00:14 +0000
247
@@ -60,7 +60,7 @@
248
60
        self.launch_app()
60
        self.launch_app()
249
61
        pdf = self.app.main_view.open_PdfView()
61
        pdf = self.app.main_view.open_PdfView()
250
62
        pdf.toggle_header_visibility()
62
        pdf.toggle_header_visibility()
252
63
        pdf.click_go_to_page_button()
63
        self.app.main_view.click_go_to_page_button()
253
64
        self.go_to_page_no(page_no)
64
        self.go_to_page_no(page_no)
254
65
65
255
66
        self.assertThat(
66
        self.assertThat(
256
67
67
257
=== added file 'tests/autopilot/ubuntu_docviewer_app/tests/test_toc.py'
258
--- tests/autopilot/ubuntu_docviewer_app/tests/test_toc.py	1970-01-01 00:00:00 +0000
259
+++ tests/autopilot/ubuntu_docviewer_app/tests/test_toc.py	2015-05-08 19:00:14 +0000
260
@@ -0,0 +1,47 @@
261
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
262
2
# Copyright 2013 Canonical
263
3
#
264
4
# This program is free software: you can redistribute it and/or modify it
265
5
# under the terms of the GNU General Public License version 3, as published
266
6
# by the Free Software Foundation.
267
7
268
8
"""Docviewer app autopilot tests."""
269
9
270
10
from ubuntu_docviewer_app.tests import DocviewerAppTestCase
271
11
272
12
import logging
273
13
logger = logging.getLogger(__name__)
274
14
275
15
276
16
class TestMainWindow(DocviewerAppTestCase):
277
17
278
18
    """Tests the TOC features"""
279
19
    scenarios = [
280
20
        ('Chapter 1',
281
21
            {'content_label': 'Chapter 1. Introduction'
282
22
             }),
283
23
284
24
        ('Chapter 3',
285
25
            {'content_label': 'Chapter 3. Package Management',
286
26
             })
287
27
    ]
288
28
289
29
    def setUp(self):
290
30
        super(TestMainWindow, self).setUp()
291
31
        self.filepath = 'ubuntu_docviewer_app/files/serverguide.pdf'
292
32
293
33
    def test_go_to_chapters_in_toc(self):
294
34
        """" Testing going to chapters from Table Of Contents     """
295
35
296
36
        self.launch_app()
297
37
        pdf = self.app.main_view.open_PdfView()
298
38
        pdf.reveal_bottom_edge_page()
299
39
        contents_page = self.app.main_view.open_PdfContentsPage()
300
40
        content_line, page_no = contents_page.\
301
41
            get_content_and_line_pageindex(self.content_label)
302
42
        contents_page.click_content_line(content_line)
303
43
304
44
        word_in_currentpage = pdf.get_currentpage_number().split()
305
45
        pdfview_currentpage = word_in_currentpage[1]
306
46
307
47
        self.assertEquals(pdfview_currentpage, page_no)
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-05-08
Nicholas Skaggs (community)		2015-05-01	Approve on 2015-05-08
Stefano Verzegnassi		2015-05-01	Approve on 2015-05-05
Review via email: mp+258082@code.launchpad.net