office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 10:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/19.12'

Browse source
This commit is contained in:
Albert Astals Cid 2020-03-02 22:22:06 +01:00
parent af99a04431 81c005710c
commit 4964e7e42d
22 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/page.cpp
View file

@ -116,10 +116,12 @@ void PagePrivate::imageRotationDone( RotationJob * job )
PixmapObject &object = it.value();
(*object.m_pixmap) = QPixmap::fromImage( job->image() );
object.m_rotation = job->rotation();
object.m_isPartialPixmap = job->isPartialUpdate();
} else {
PixmapObject object;
object.m_pixmap = new QPixmap( QPixmap::fromImage( job->image() ) );
object.m_rotation = job->rotation();
object.m_isPartialPixmap = job->isPartialUpdate();
m_pixmaps.insert( job->observer(), object );
}
@ -235,6 +237,9 @@ bool Page::hasPixmap( DocumentObserver *observer, int width, int height, const N
if ( width == -1 || height == -1 )
return true;
if ( it.value().m_isPartialPixmap )
return false;
const QPixmap *pixmap = it.value().m_pixmap;
return (pixmap->width() == width && pixmap->height() == height);
@ -554,6 +559,7 @@ void PagePrivate::setPixmap( DocumentObserver *observer, QPixmap *pixmap, const
}
it.value().m_pixmap = pixmap;
it.value().m_rotation = m_rotation;
it.value().m_isPartialPixmap = isPartialPixmap;
} else {
// it can happen that we get a setPixmap while closing and thus the page controller is gone
if ( m_doc->m_pageController )

3
core/page.h
View file

@ -141,8 +141,9 @@ class OKULARCORE_EXPORT Page
void setBoundingBox( const NormalizedRect& bbox );
/**
* Returns whether the page of size @p width x @p height has a @p pixmap
* Returns whether the page of size @p width x @p height has a @p pixmap
* in the region given by @p rect for the given @p observer
* If there is a partially rendered pixmap the answer is false.
*/
bool hasPixmap( DocumentObserver *observer, int width = -1, int height = -1, const NormalizedRect &rect = NormalizedRect() ) const;

1
core/page_p.h
View file

@ -146,6 +146,7 @@ class PagePrivate
public:
QPixmap *m_pixmap = nullptr;
Rotation m_rotation;
bool m_isPartialPixmap = false;
};
QMap< DocumentObserver*, PixmapObject > m_pixmaps;
QMap< const DocumentObserver*, TilesManager *> m_tilesManagers;

1
generators/chm/org.kde.okular-chm.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/comicbook/org.kde.okular-comicbook.metainfo.xml
View file

@ -84,6 +84,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/djvu/org.kde.okular-djvu.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/dvi/org.kde.okular-dvi.metainfo.xml
View file

@ -83,6 +83,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/epub/org.kde.okular-epub.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/fax/org.kde.okular-fax.metainfo.xml
View file

@ -82,6 +82,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/fictionbook/org.kde.okular-fb.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/kimgio/org.kde.okular-kimgio.metainfo.xml
View file

@ -104,6 +104,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/markdown/org.kde.okular-md.metainfo.xml
View file

@ -79,6 +79,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml
View file

@ -104,6 +104,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/ooo/org.kde.okular-ooo.metainfo.xml
View file

@ -79,6 +79,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/plucker/org.kde.okular-plucker.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/poppler/org.kde.okular-poppler.metainfo.xml
View file

@ -84,6 +84,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/spectre/org.kde.okular-spectre.metainfo.xml
View file

@ -88,6 +88,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/tiff/org.kde.okular-tiff.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/txt/org.kde.okular-txt.metainfo.xml
View file

@ -80,6 +80,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
generators/xps/org.kde.okular-xps.metainfo.xml
View file

@ -81,6 +81,7 @@
</mimetypes>
<url type="homepage">https://okular.kde.org</url>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
mobile/app/org.kde.okular.kirigami.appdata.xml
View file

@ -249,6 +249,7 @@
<binary>okularkirigami</binary>
</provides>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>

1
shell/org.kde.okular.appdata.xml
View file

@ -299,6 +299,7 @@
<value key="KDE::windows_store">https://www.microsoft.com/store/apps/9n41msq1wnm8</value>
</custom>
<releases>
<release version="1.9.3" date="2020-03-05"/>
<release version="1.9.2" date="2020-02-06"/>
<release version="1.9.1" date="2020-01-09"/>
<release version="1.9.0" date="2019-12-12"/>