| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I01e69c22f1e7f6f5b104bf4a29840708ed7b7d37
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
|
|
|
|
|
|
|
| |
The usual shortcut (control-A) now selects all text on the current page,
it is highlighted, and it can be copied to the clipboard.
Change-Id: I5e6d9cae675862808f8b9027cb47024ca65cf2fd
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
The build for iOS is static.
Change-Id: I3e6c13c920861a2a6bf0079e53e76322bb93935f
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
PdfStyle.qml can be overridden via file selectors, and contains extra
styling beyond what Control.palette provides.
Search results are highlighted with a lightened, translucent version of
the Controls style's accent color, and the current search result is
highlighted with a solid border with the accent color.
The text selection color comes from the Controls theme highlight color,
which tends to be the same as QPalette::Highlight.
The link underscore is also configurable in PdfStyle, but its color
comes from the Controls theme link color, which tends to be the same as
QPalette::link.
Task-number: QTBUG-82540
Change-Id: I7c7e80323cf5d7c94dde775a38cdec239a6351a9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
| |
So they look more like (old-school) web links.
The underlines are always horizontal and underneath the area of
occurrence though; rotated link text has not been tested.
Change-Id: I4fc01d88367b0cc9bbc23e9f85a3b42efb271fb8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Standard header for module code rather than for an example.
Change-Id: I39fad99f9c018530ccc12036eb502a78a521a0c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the single-page view, we bind to the PdfSearchModel.currentPageBoundingPolygons
property, which is convenient because it has a changed signal, so it
stays updated in all cases: when the user changes the search string,
when a different document is loaded, or when changing the current page.
In the multi-page view, we need to invoke a function to get the search
results on each page, because results are different on each page, and we
often need to show multiple pages at the same time. The challenge then
is how to ensure that it gets re-evaluated often enough. It requires
connecting to more than one signal; but there isn't any way to "kick" a
binding when some signal occurs, so the solution isn't very declarative,
unfortunately.
Change-Id: I72e7dad01b8cb6c43abcccf4fa46e443409b39e0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
This was done in 0b6a4d94945a975390b2574e6aff2568ebb7f061 for the
multipage example.
Change-Id: Ia5b51b9239521ab4d65e41aaebe52d178e75932d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
...as separate roles, to make alignment easier, and to avoid hard-coding
HTML tags in the Context role as it was before.
But the strings in these context roles are not always adjacent to the
search results in geometric coordinates sometimes, in some PDF files,
despite having adjacent character indices. I.e. the "next" character
after the search string, or the "previous" character before it, could be
anywhere on the page.
Change-Id: Ief0a490b64fdb3c3ca98506926650648b609ece1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
| |
Change-Id: Ib0a1aeac28350c8705899ab799ce776e6764b306
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you do the pinch on a trackpad, the mouse cursor doesn't move, and
the same visible part of the page will remain under the cursor after the
page is re-rendered. Likewise when doing the pinch on a touchscreen,
the centroid (midpoint between the two fingers) is held in place,
subject to the constraints that Flickable.returnToBounds() imposes.
Similar to 29cb44ee471908ac7c4cac70e3defb8bd72a80cd.
Also corrected the horizontal scrolling range according to rotation;
added left and right margins so that the page edges are more visible
when the page is wider than the view, and thus the horizontal scrolling
range feels more accurate while the scrollbars are still shown.
Change-Id: Ia2a15eee5bcd5c9e7f025634f02a5a546e6aab68
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
Now that the Image is being rotated and the "paper" rectangle is not,
we need to work in the right coordinate system for rendering of Shapes
on top, and for handling drags to select text.
Change-Id: I6bc1e2fe7997ffc4673720abdcd3b7e4d9bc9012
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you do the pinch on a trackpad, the mouse cursor doesn't move, and
the same visible part of the page will remain under the cursor after
the page is re-rendered. Likewise when doing the pinch on a touchscreen,
the centroid (midpoint between the two fingers) is held in place.
This is achieved by moving the scrollbars afterwards, subject to their
constraints.
Change-Id: I34caca4ebbb5c11007dd2462416a42c1a2d8e104
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Similar to f467edc97e66727be7fa3747913e4e01672d4b71:
NavigationStack is kept up-to-date when the scroll position changes, and
can go back to a previous position; and links can in theory jump to
specific positions and zoom levels, scrolling such that a specific x
coordinate is visible.
Change-Id: I2add617914d89b0dc5389e7c3d12d11580a1f82f
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
As with a2be3a7a79dc4fabe8675ea80a6ba550e0e4deec, this makes the search
feature more discoverable and touch-friendly.
Change-Id: I47e37273c583121d60985cc27c22f56e6d655ab0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
PdfPageView might be useful in some cases, but we need to get feature
parity with PdfMultiPageView as much as possible, including scrollbars.
Including them in the view is convenient, but also less flexible.
Change-Id: Ibbe6a090a5f5b1d340124986fe49672d682ddedb
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TableView is missing some features compared to ListView; so finding out
where we currently are (which row) and programmatic positioning on a
specific y coordinate of a specific row require some workarounds for now,
including helpers in PdfDocument.
TableView also assumes (and sporadically enforces) that all cells in a
column have the same width. So we need a placeholder Item for each page.
This also helps with rotation: the placeholder is now as wide as the
window or the image, whichever is wider, and the "paper" is centered
within; thus there's always room to rotate it.
There's still some problem with setting contentY in goToPage() after
the page has been zoomed to a size larger than the window: the values
look correct, but it scrolls too far.
But on the plus side, horizontal scrolling works. So now we attempt to
control the horizontal position too: NavigationStack tracks it, and can
go back to a previous position; and links can in theory jump to specific
positions and zoom levels, scrolling horizontally such that a specific x
coordinate is visible.
Includes minor UI tweaks to make it look better on iOS.
Change-Id: I643d8ef48ef815aeb49cae77dcb84c3682563d56
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On iOS, the native FileDialog doesn't work, sharing doesn't work, and
packaging files along with the application requires manual effort; so
a PDF file in resources seems to be the easiest alternative to make
the examples demo-able.
QPdfDocument wants a file path, because it uses QFile; but we like
to use URLs in Qt Quick. So it's a bit of an impedance mismatch,
there are several choices about when and where to do the conversion,
and it's hard to say which way is more correct. This way happens
to work for now.
Also do the rest of the things necessary to get this working on iOS.
Change-Id: Icb8614d5eed2510f101aefba534ef80cf890518f
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Hiding the search feature in a closed Drawer might not have been
sufficiently touch-friendly and discoverable, for example on iOS where
the user is not going to press control-F to start searching.
But the top toolbar is too full to put the search field back up there.
It's familiar from Firefox to have the search field at the bottom,
and we have enough space for it there. So now you can search and
jump around the search results without opening the drawer; but pressing
Enter in the search field opens the drawer. Hopefully swiping to open
the drawer is also convenient enough on touch platforms; otherwise we
could add another button for that, perhaps at the left of the footer.
Change-Id: Iaec63bc22b03e29156fee817d197daae5b0cf9d5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
As usual, coordinates are in the first quadrant, and we need to
convert to 4th quadrant to get a y value that can be used to adjust
contentY of a ListView or TableView.
The tooltip when hovering over links provides a way to verify that
the link really jumps where it's intended to.
Change-Id: I9107639f15496a987c0fa7c3c2e2583c3839cc6b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
If the document is null, ignore it.
Change-Id: I3cebd049fb5d16d0064dddf00183f231019ef03c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
| |
Change-Id: I20512187dcc872b2e0429968e9ad2a9899aee6c2
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now it looks more similar to PdfMultiPageView.qml: public properties
and functions are grouped by functionality, implementation details are
"below the fold", and properties and functions that we don't want to
expose as API are nested inside inner items.
Also fixed ColumnLayout attached properties.
Change-Id: Iafe6f983a34ca6bac9b0d4f3a26aba5a426e0232
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Amends 09a6eac4a63b32548ecc1ff5b16a5d8fc3ba1c04.
Change-Id: Id321d016a758d4f58d82a32575d034df226e083e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
| |
Change-Id: I855150578c9127b175c5907500d057b704fe5e0e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's a QAbstractListModel, so now PdfMultiPageView has a ListView in a
left-side Drawer showing all results found so far.
- In PdfMultiPageView, multiple pages exist at once, so it makes sense
to use the same searchmodel for all.
- It's faster and saves memory.
- Search results on each page can be cached.
- It's possible to show search results in a ListView or QListView.
Change-Id: I66fba6975954a09a4d23262be87ff8cc25ee7478
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This version still has separate PdfSearchModel instances on each page,
but now there are buttons to iterate and highlight the search results
in order. When you come to the last result on one page, hitting the
"Find Next" button will jump to the next page, and keep jumping forward
from there until another result is found. Unfortunately this jumping
takes time if it skips over a lot of pages because of empty search
results. That seems to be another reason to make PdfSearchModel into a
whole-document search model and use one instance.
Also reorganize PdfMultiPageView.qml's public API into sections
according to functionality rather than by type.
Change-Id: I677a764fcbf231b2656aff8abe7240a27582a696
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Unfortunately it's getting harder to do things declaratively, because we
have to avoid circular bindings, and because of needing to use imperative
APIs. The current-page spinbox provides onValueModified() to detect when
the user modifies it, distinct from the simple fact that the value changed.
We shouldn't make bindings to set ListView.currentIndex anyway, because
that results in slow animation (and loading pages in all delegates along
the way) rather than quick jumping to the correct page. Instead we need
to use ListView.positionViewAtIndex(), another imperative API, to get
quick jumps without having to calculate and set contentY in some other way.
Now we move toward the NavigationStack providing storage for the current
destination at all times. Changes there will trigger programmatically
moving the ListView.
When the user scrolls manually, that generates a "destination" in the
navigation stack, such that the back button can jump back to the
previous location, and then the forward button can return to the
destination where manual scrolling ended up.
Fixes: QTBUG-77510
Change-Id: I47544210d2e0f9aa790f3d2594839678374e463d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
So far it does not update the spinbox with the current page to which
the user has scrolled, because ListView.currentIndex doesn't change.
Change-Id: I5dfa644401f77628c71ad1db7d64c5f0ac1e0c65
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Push/back/forward behavior seems more correct now, but still no
autotest yet.
QPdfDestination might be useful to represent locations of search results,
for link destinations and maybe named destinations too.
Fixes: QTBUG-77512
Change-Id: I113b2c535a2cd302106e6546104c64e12985d387
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, scaleToWidth() and scaleToPage() choose the scale of the
first page to fit the given viewport size, and as long as all pages are
the same size, it works. On the other hand, the PinchHandler only
affects the scale of the page on which the pinch gesture occurs.
Calling resetScale(), scaleToWidth() or scaleToPage() undoes the
effect of any previous pinch gesture or any other kind of scaling change.
Task-number: QTBUG-77513
Change-Id: Ia3227ca9c4af263eb8505dbd6336657984c66ab0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- build the multipage example by default
- don't import anything that won't work with Qt 5.14
- set application attributes before creating an instance
(to fix the warning about that)
Change-Id: I265f49ca75cae1908d4c23848cba8c42e5e3824b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
HoverHandler.cursorShape is new API in 5.15, so we have to use
MouseArea for 5.14.
This patch can be reverted as soon as 5.14 is no longer supported.
Change-Id: I1c830215729038095ec33ece36a1a83108cbd835
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
So far it's a ListView with a page per delegate. Many features are working,
but zooming and rotation are not working yet.
Change-Id: I9ee7aa60ad4411bd8734fe2cd987a68906a5cf57
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Works well enough to use, but needs autotests and at least one fix.
Change-Id: I2114b9fb3b5ddf7cfe2106d4a4fbc7d74852c61d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
| |
Change-Id: I40b92000a4def105d22a3bd10d0544b0b0f0fe1e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This seems to make QPdfLinkModel happy for some reason; otherwise
QPdfLinkModelPrivate::update() does not succeed in getting page numbers
when it calls FPDFDest_GetDestPageIndex().
Amends 9231d3444555945297857ee4aae05919083ea479
Change-Id: Iaed3301a1ab304ac9813c3b605b2f9c7465bf8e7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
checkPageComplete() calls FPDFAvail_IsPageAvail(), which does some
initialization that is necessary before PDFium is able to provide any
information about that page. The static readImage() function in
qquickpixmapcache.cpp calls QImageReader::size() before rendering,
to determine the size of the image that will be read, and that
ends up calling QPdfDocument::pageSize(); so it's important to
"go to" that page before attempting to read its size. In summary,
checkPageComplete() is the "go to page" function that must be called
before any other page-specific function.
Amends 9231d3444555945297857ee4aae05919083ea479
Change-Id: Idf5ba9d013b62395c284d055fbfe835fe949df79
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Amends 4f5f0705bc161ff95899fdb2c5fcdb4581bf15bb.
Change-Id: I62563f5be367e8139dc4cdf12866c65f55a576b5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-81560
Change-Id: I9d75606634da4c604f34913908f97a91797d1813
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Internal links and web links populate the QALM, which can then
be used to drive a Repeater to position highlight rectangles
with TapHandlers, which will handle a click by jumping to the
link destination.
Fixes: QTBUG-77511
Change-Id: I3b5b96d6e82bfd578f31f631f24279173036a080
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
| |
So now you can select text by mouse-drag and copy it to the clipboard.
Task-number: QTBUG-77509
Change-Id: I689ee4158974de8bc541c319a5a5cc2f8f3c2ae6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
| |
Like some other image plugins, the PDF plugin now supports
ImageOption::ScaledClipRect and ScaledSize.
Change-Id: Ie7278752e49c885cc4580f30af1ec5e6310f8334
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
| |
Change-Id: Ic4c7d1a7458995415452e899b3dc369c9fe574f4
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
I would prefer to use the "import as" mechanism to allow the user to
customize prefixes rather than hard-coding them, actually; but
currently every QML type in the QtPDF module has a hard-coded Pdf prefix.
Change-Id: I4c00e7891c58e028280599d6089a821b9e285c1a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
| |
Change-Id: Ia56a07bc2d53bd4a2166566a9c95126a5d2f9154
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-81560
Change-Id: I159747a097a6a6a28c2355e8ff6b6c59a4f3a29a
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a viewer application is opened with a book-sized PDF, there's no
need to check hundreds of pages before we can render the first page.
Using it in QPdfIOHandler is even worse because this check needs to
be repeated each time we advance from one page to the next. But we
do need to ensure that the page we want to render is available.
Amends 945840bd067d9ca3179a667f48b451cc2087931b
Change-Id: Ib6576b1b91c63c2b57893d14b05632eff8cc4a15
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
| |
We need this, since 5.15 branch adds webrtc check.
Change-Id: I40b63bf38ed57562562305d34f9f5ce96dec31dd
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
|
|
|
|
|
|
|
|
| |
The pdfium build for qtwebengine should not use
features set for qtpdf.
Change-Id: Ibee97b774dda7e9157cadf28aa4a7a862bcba8ed
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
|