Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2017-03-15 01:00:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Wed Mar 15 01:00:57 2017 rev:83 rq:478278 version:16.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2017-02-13 07:40:38.595276325 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2017-03-15 01:59:24.135905975 +0100 @@ -1,0 +2,16 @@ +Thu Mar 9 12:44:16 CET 2017 - lbeltr...@kde.org + +- Update to 16.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-16.12.3.php +- Changes since 16.12.2: + * djvu: Initialize to white if rendering fails + * indent++ + * Accumulate Control+Wheel Deltas until they reach QWheelEvent::DefaultDeltasPerStep + * Fix crash on CHM files that use "plain English" LCID + * Account for non local non relative video file urls + * Extend viewport update area when updating or clearing the a selection rectangle (kde#266537) + + +------------------------------------------------------------------- Old: ---- okular-16.12.2.tar.xz New: ---- okular-16.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.GYgfP6/_old 2017-03-15 01:59:24.747819466 +0100 +++ /var/tmp/diff_new_pack.GYgfP6/_new 2017-03-15 01:59:24.747819466 +0100 @@ -17,10 +17,10 @@ Name: okular -Version: 16.12.2 +Version: 16.12.3 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Document Viewer License: GPL-2.0+ ++++++ okular-16.12.2.tar.xz -> okular-16.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/CMakeLists.txt new/okular-16.12.3/CMakeLists.txt --- old/okular-16.12.2/CMakeLists.txt 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/CMakeLists.txt 2017-03-05 19:51:29.000000000 +0100 @@ -11,7 +11,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") include(ECMInstallIcons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/chm/lib/libchmtextencoding.cpp new/okular-16.12.3/generators/chm/lib/libchmtextencoding.cpp --- old/okular-16.12.2/generators/chm/lib/libchmtextencoding.cpp 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/chm/lib/libchmtextencoding.cpp 2017-03-05 19:51:29.000000000 +0100 @@ -171,7 +171,7 @@ 0x440A, 0x100A, 0x480A, 0x080A, 0x4C0A, 0x180A, 0x3C0A, 0x280A, 0x500A, 0x0C0A, 0x380A, 0x200A, 0x0441, 0x081D, 0x041D, 0x0434, 0x0435, 0x042B, 0x042C, 0x0439, 0x043A, 0x044E, 0x044F, 0x081A, - 0x0443, + 0x0443, 0x0009, 0 }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/chm/libokularGenerator_chmlib.json new/okular-16.12.3/generators/chm/libokularGenerator_chmlib.json --- old/okular-16.12.2/generators/chm/libokularGenerator_chmlib.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/chm/libokularGenerator_chmlib.json 2017-03-05 19:51:29.000000000 +0100 @@ -86,6 +86,7 @@ "Name[sv]": "CHM-gränssnitt", "Name[uk]": "Модуль CHM", "Name[x-test]": "xxCHM Backendxx", + "Name[zh_CN]": "CHM 后端", "Name[zh_TW]": "CHM 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/chm/org.kde.okular-chm.metainfo.xml new/okular-16.12.3/generators/chm/org.kde.okular-chm.metainfo.xml --- old/okular-16.12.2/generators/chm/org.kde.okular-chm.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/chm/org.kde.okular-chm.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">CHM-dokument</name> <name xml:lang="uk">документи CHM</name> <name xml:lang="x-test">xxCHM Documentsxx</name> + <name xml:lang="zh-CN">CHM 文档</name> <name xml:lang="zh-TW">CHM 文件</name> <summary>Adds support for reading CHM documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents CHM</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa CHM-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів CHM</summary> <summary xml:lang="x-test">xxAdds support for reading CHM documentsxx</summary> + <summary xml:lang="zh-CN">增加对 CHM 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入對讀取 CHM 文件的支援</summary> <mimetypes> <mimetype>application/x-chm</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/comicbook/libokularGenerator_comicbook.json new/okular-16.12.3/generators/comicbook/libokularGenerator_comicbook.json --- old/okular-16.12.2/generators/comicbook/libokularGenerator_comicbook.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/comicbook/libokularGenerator_comicbook.json 2017-03-05 19:51:29.000000000 +0100 @@ -83,6 +83,7 @@ "Name[sv]": "Comic Book-gränssnitt", "Name[uk]": "Модуль коміксів", "Name[x-test]": "xxComicBook Backendxx", + "Name[zh_CN]": "漫画书后端", "Name[zh_TW]": "ComicBook 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/comicbook/org.kde.okular-comicbook.metainfo.xml new/okular-16.12.3/generators/comicbook/org.kde.okular-comicbook.metainfo.xml --- old/okular-16.12.2/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Comic Book</name> <name xml:lang="uk">Комікси</name> <name xml:lang="x-test">xxComic Booksxx</name> + <name xml:lang="zh-CN">漫画书</name> <name xml:lang="zh-TW">漫畫書</name> <summary>Adds support for reading comic books</summary> <summary xml:lang="ca">Afegeix la implementació per llegir llibres de còmics</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa Comic Book</summary> <summary xml:lang="uk">Додає підтримку читання коміксів</summary> <summary xml:lang="x-test">xxAdds support for reading comic booksxx</summary> + <summary xml:lang="zh-CN">增加对漫画书的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取漫畫書的支援</summary> <mimetypes> <mimetype>application/x-cbr</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/djvu/kdjvu.cpp new/okular-16.12.3/generators/djvu/kdjvu.cpp --- old/okular-16.12.2/generators/djvu/kdjvu.cpp 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/djvu/kdjvu.cpp 2017-03-05 19:51:29.000000000 +0100 @@ -494,6 +494,10 @@ ddjvu_page_get_width( djvupage ); res = ddjvu_page_render( djvupage, DDJVU_RENDER_COLOR, &pagerect, &renderrect, m_format, res_img.bytesPerLine(), (char *)res_img.bits() ); + if (!res) + { + res_img.fill(Qt::white); + } #ifdef KDJVU_DEBUG qDebug() << "rendering result:" << res; #endif @@ -909,27 +913,27 @@ { if ( d->m_cacheEnabled ) { - bool found = false; - QList<ImageCacheItem*>::Iterator it = d->mImgCache.begin(), itEnd = d->mImgCache.end(); - for ( ; ( it != itEnd ) && !found; ++it ) - { - ImageCacheItem* cur = *it; - if ( ( cur->page == page ) && - ( rotation % 2 == 0 - ? cur->width == width && cur->height == height - : cur->width == height && cur->height == width ) ) - found = true; - } - if ( found ) - { - // taking the element and pushing to the top of the list - --it; - ImageCacheItem* cur2 = *it; - d->mImgCache.erase( it ); - d->mImgCache.push_front( cur2 ); + bool found = false; + QList<ImageCacheItem*>::Iterator it = d->mImgCache.begin(), itEnd = d->mImgCache.end(); + for ( ; ( it != itEnd ) && !found; ++it ) + { + ImageCacheItem* cur = *it; + if ( ( cur->page == page ) && + ( rotation % 2 == 0 + ? cur->width == width && cur->height == height + : cur->width == height && cur->height == width ) ) + found = true; + } + if ( found ) + { + // taking the element and pushing to the top of the list + --it; + ImageCacheItem* cur2 = *it; + d->mImgCache.erase( it ); + d->mImgCache.push_front( cur2 ); - return cur2->img; - } + return cur2->img; + } } if ( !d->m_pages_cache.at( page ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/djvu/libokularGenerator_djvu.json new/okular-16.12.3/generators/djvu/libokularGenerator_djvu.json --- old/okular-16.12.2/generators/djvu/libokularGenerator_djvu.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/djvu/libokularGenerator_djvu.json 2017-03-05 19:51:29.000000000 +0100 @@ -47,6 +47,7 @@ "Description[sv]": "DjVu-gränssnitt baserat på DjVuLibre", "Description[uk]": "Засіб обробки DjVu, заснований на DjVuLibre", "Description[x-test]": "xxDjVu backend based on DjVuLibrexx", + "Description[zh_CN]": "基于 DjVuLibre 的 DjVu 后端", "Description[zh_TW]": "基於 DjVuLibre 的 DjVu 後端介面", "Id": "okular_djvu", "License": "GPL", @@ -77,6 +78,7 @@ "Name[sv]": "DjVu-gränssnitt", "Name[uk]": "Модуль DjVu", "Name[x-test]": "xxDjVu Backendxx", + "Name[zh_CN]": "DjVu 后端", "Name[zh_TW]": "DjVu 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/djvu/org.kde.okular-djvu.metainfo.xml new/okular-16.12.3/generators/djvu/org.kde.okular-djvu.metainfo.xml --- old/okular-16.12.2/generators/djvu/org.kde.okular-djvu.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/djvu/org.kde.okular-djvu.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">DjVu-dokument</name> <name xml:lang="uk">документи DjVu</name> <name xml:lang="x-test">xxDjVu Documentsxx</name> + <name xml:lang="zh-CN">DjVu 文档</name> <name xml:lang="zh-TW">DjVu 文件</name> <summary>Adds support for reading DjVu documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents DjVu</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa DjVu-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів DjVu</summary> <summary xml:lang="x-test">xxAdds support for reading DjVu documentsxx</summary> + <summary xml:lang="zh-CN">增加对 DjVu 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 DjVu 文件的支援</summary> <mimetypes> <mimetype>image/vnd.djvu</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/dvi/libokularGenerator_dvi.json new/okular-16.12.3/generators/dvi/libokularGenerator_dvi.json --- old/okular-16.12.2/generators/dvi/libokularGenerator_dvi.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/dvi/libokularGenerator_dvi.json 2017-03-05 19:51:29.000000000 +0100 @@ -75,6 +75,7 @@ "Name[sv]": "DVI-gränssnitt", "Name[uk]": "Модуль DVI", "Name[x-test]": "xxDVI Backendxx", + "Name[zh_CN]": "DVI 后端", "Name[zh_TW]": "DVI 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/dvi/org.kde.okular-dvi.metainfo.xml new/okular-16.12.3/generators/dvi/org.kde.okular-dvi.metainfo.xml --- old/okular-16.12.2/generators/dvi/org.kde.okular-dvi.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/dvi/org.kde.okular-dvi.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">DVI-dokument</name> <name xml:lang="uk">документи DVI</name> <name xml:lang="x-test">xxDVI Documentsxx</name> + <name xml:lang="zh-CN">DVI 文档</name> <name xml:lang="zh-TW">DVI 文件</name> <summary>Adds support for reading DVI documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents DVI</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa DVI-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів DVI</summary> <summary xml:lang="x-test">xxAdds support for reading DVI documentsxx</summary> + <summary xml:lang="zh-CN">增加对 DVI 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 DVI 文件的支援</summary> <mimetypes> <mimetype>application/x-dvi</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/epub/libokularGenerator_epub.json new/okular-16.12.3/generators/epub/libokularGenerator_epub.json --- old/okular-16.12.2/generators/epub/libokularGenerator_epub.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/epub/libokularGenerator_epub.json 2017-03-05 19:51:29.000000000 +0100 @@ -45,6 +45,7 @@ "Description[sv]": "Ett Epub-gränssnitt", "Description[uk]": "Сервер EPub", "Description[x-test]": "xxAn EPub backendxx", + "Description[zh_CN]": "EPub 后端", "Description[zh_TW]": "EPub 後端介面", "Id": "okular_epub", "License": "GPL", @@ -75,6 +76,7 @@ "Name[sv]": "Epub-gränssnitt", "Name[uk]": "Модуль EPub", "Name[x-test]": "xxEPub Backendxx", + "Name[zh_CN]": "EPub 后端", "Name[zh_TW]": "EPub 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/epub/org.kde.okular-epub.metainfo.xml new/okular-16.12.3/generators/epub/org.kde.okular-epub.metainfo.xml --- old/okular-16.12.2/generators/epub/org.kde.okular-epub.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/epub/org.kde.okular-epub.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Epub</name> <name xml:lang="uk">EPub</name> <name xml:lang="x-test">xxEPubxx</name> + <name xml:lang="zh-CN">EPub</name> <name xml:lang="zh-TW">EPub</name> <summary>Adds support for reading E-Books</summary> <summary xml:lang="ca">Afegeix la implementació per llegir llibres electrònics</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa e-böcker</summary> <summary xml:lang="uk">Додає підтримку читання електронних книг</summary> <summary xml:lang="x-test">xxAdds support for reading E-Booksxx</summary> + <summary xml:lang="zh-CN">增加对电子书的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取電子書的支援</summary> <mimetypes> <mimetype>application/epub+zip</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/fax/libokularGenerator_fax.json new/okular-16.12.3/generators/fax/libokularGenerator_fax.json --- old/okular-16.12.2/generators/fax/libokularGenerator_fax.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/fax/libokularGenerator_fax.json 2017-03-05 19:51:29.000000000 +0100 @@ -48,6 +48,7 @@ "Description[sv]": "Ett G3/G4 telefax-dokumentgränssnitt", "Description[uk]": "Сервер документів факсів G3/G4", "Description[x-test]": "xxA G3/G4 fax document backendxx", + "Description[zh_CN]": "G3/G4 传真文档后端", "Description[zh_TW]": "G3/G4 fax 文件後端介面", "Id": "okular_fax", "License": "GPL", @@ -78,6 +79,7 @@ "Name[sv]": "Telefax-gränssnitt", "Name[uk]": "Модуль факсів", "Name[x-test]": "xxFax Backendxx", + "Name[zh_CN]": "传真后端", "Name[zh_TW]": "Fax 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/fax/org.kde.okular-fax.metainfo.xml new/okular-16.12.3/generators/fax/org.kde.okular-fax.metainfo.xml --- old/okular-16.12.2/generators/fax/org.kde.okular-fax.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/fax/org.kde.okular-fax.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Telefax</name> <name xml:lang="uk">факс</name> <name xml:lang="x-test">xxFaxxx</name> + <name xml:lang="zh-CN">传真</name> <name xml:lang="zh-TW">傳真</name> <summary>Adds support for reading Fax documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents de Fax</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa telefax-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів факсів</summary> <summary xml:lang="x-test">xxAdds support for reading Fax documentsxx</summary> + <summary xml:lang="zh-CN">增加对传真文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取傳真文件的支援</summary> <mimetypes> <mimetype>image/fax-g3</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/fictionbook/libokularGenerator_fb.json new/okular-16.12.3/generators/fictionbook/libokularGenerator_fb.json --- old/okular-16.12.2/generators/fictionbook/libokularGenerator_fb.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/fictionbook/libokularGenerator_fb.json 2017-03-05 19:51:29.000000000 +0100 @@ -79,6 +79,7 @@ "Name[sv]": "Fiction Book-gränssnitt", "Name[uk]": "Модуль белетристики", "Name[x-test]": "xxFiction Book Backendxx", + "Name[zh_CN]": "Fiction Book 后端", "Name[zh_TW]": "Fiction Book 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/fictionbook/org.kde.okular-fb.metainfo.xml new/okular-16.12.3/generators/fictionbook/org.kde.okular-fb.metainfo.xml --- old/okular-16.12.2/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Fiction Book</name> <name xml:lang="uk">FictionBook</name> <name xml:lang="x-test">xxFictionBookxx</name> + <name xml:lang="zh-CN">FictionBook</name> <name xml:lang="zh-TW">FictionBook</name> <summary>Adds support for reading FictionBooks</summary> <summary xml:lang="ca">Afegeix la implementació per llegir FictionBooks</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa Fiction Book</summary> <summary xml:lang="uk">Додає підтримку читання документів FictionBook (FB2)</summary> <summary xml:lang="x-test">xxAdds support for reading FictionBooksxx</summary> + <summary xml:lang="zh-CN">添加对 FictionBook 的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 FictionBooks 的支援</summary> <mimetypes> <mimetype>application/x-fictionbook+xml</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/kimgio/libokularGenerator_kimgio.json new/okular-16.12.3/generators/kimgio/libokularGenerator_kimgio.json --- old/okular-16.12.2/generators/kimgio/libokularGenerator_kimgio.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/kimgio/libokularGenerator_kimgio.json 2017-03-05 19:51:29.000000000 +0100 @@ -68,6 +68,7 @@ "Description[sv]": "Ett enkelt bildgränssnitt", "Description[uk]": "Проста програма для зображень", "Description[x-test]": "xxA simple image backendxx", + "Description[zh_CN]": "简单的图像后端", "Description[zh_TW]": "簡易的圖片後端介面", "Id": "okular_kimgio", "License": "GPL", @@ -120,6 +121,7 @@ "Name[sv]": "Bildgränssnitt", "Name[uk]": "Модуль зображень", "Name[x-test]": "xxImage Backendxx", + "Name[zh_CN]": "图像后端", "Name[zh_TW]": "圖片後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/kimgio/org.kde.okular-kimgio.metainfo.xml new/okular-16.12.3/generators/kimgio/org.kde.okular-kimgio.metainfo.xml --- old/okular-16.12.2/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Bilder</name> <name xml:lang="uk">Зображення</name> <name xml:lang="x-test">xxImagesxx</name> + <name xml:lang="zh-CN">图片</name> <name xml:lang="zh-TW">影像</name> <summary>Adds support for reading many image formats</summary> <summary xml:lang="ca">Afegeix la implementació per llegir molts formats d'imatges</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa många bildformat</summary> <summary xml:lang="uk">Додає підтримку читання зображень у багатьох форматах</summary> <summary xml:lang="x-test">xxAdds support for reading many image formatsxx</summary> + <summary xml:lang="zh-CN">支持多种图片格式的阅读</summary> <summary xml:lang="zh-TW">加入讀取許多影像格式的支援</summary> <mimetypes> <mimetype>image/bmp</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/mobipocket/libokularGenerator_mobi.json new/okular-16.12.3/generators/mobipocket/libokularGenerator_mobi.json --- old/okular-16.12.2/generators/mobipocket/libokularGenerator_mobi.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/mobipocket/libokularGenerator_mobi.json 2017-03-05 19:51:29.000000000 +0100 @@ -77,6 +77,7 @@ "Name[sv]": "Mobipocket-gränssnitt", "Name[uk]": "Модуль Mobipocket", "Name[x-test]": "xxMobipocket Backendxx", + "Name[zh_CN]": "Mobipocket 后端", "Name[zh_TW]": "Mobipocket 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml new/okular-16.12.3/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml --- old/okular-16.12.2/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Mobipocket</name> <name xml:lang="uk">Mobipocket</name> <name xml:lang="x-test">xxMobipocketxx</name> + <name xml:lang="zh-CN">Mobipocket</name> <name xml:lang="zh-TW">Mobipocket</name> <summary>Adds support for reading Mobipocket E-books</summary> <summary xml:lang="ca">Afegeix la implementació per llegir llibres electrònics Mobipocket</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa Mobipocket e-böcker</summary> <summary xml:lang="uk">Додає підтримку читання електронних книг у форматі Mobipocket</summary> <summary xml:lang="x-test">xxAdds support for reading Mobipocket E-booksxx</summary> + <summary xml:lang="zh-CN">增加对 Mobipocket 电子书的支持</summary> <summary xml:lang="zh-TW">加入讀取 Mobipocket 電子書的支援</summary> <mimetypes> <mimetype>image/bmp</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/ooo/libokularGenerator_ooo.json new/okular-16.12.3/generators/ooo/libokularGenerator_ooo.json --- old/okular-16.12.2/generators/ooo/libokularGenerator_ooo.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/ooo/libokularGenerator_ooo.json 2017-03-05 19:51:29.000000000 +0100 @@ -80,6 +80,7 @@ "Name[sv]": "OpenDocument-textgränssnitt", "Name[uk]": "Модуль текстових документів OpenDocument", "Name[x-test]": "xxOpenDocument Text Backendxx", + "Name[zh_CN]": "开放文档(ODF)文本后端", "Name[zh_TW]": "OpenDocument 文字檔後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/ooo/org.kde.okular-ooo.metainfo.xml new/okular-16.12.3/generators/ooo/org.kde.okular-ooo.metainfo.xml --- old/okular-16.12.2/generators/ooo/org.kde.okular-ooo.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/ooo/org.kde.okular-ooo.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">OpenDocument</name> <name xml:lang="uk">OpenDocument</name> <name xml:lang="x-test">xxOpenDocumentxx</name> + <name xml:lang="zh-CN">开放文档格式</name> <name xml:lang="zh-TW">OpenDocument</name> <summary>Adds support for reading OpenDocument text files</summary> <summary xml:lang="ca">Afegeix la implementació per llegir fitxers de text OpenDocument</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa OpenDocument-textfiler</summary> <summary xml:lang="uk">Додає підтримку читання текстових документів OpenDocument</summary> <summary xml:lang="x-test">xxAdds support for reading OpenDocument text filesxx</summary> + <summary xml:lang="zh-CN">增加对开放文档格式文本文件的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 OpenDocument 文字檔的支援</summary> <mimetypes> <mimetype>application/vnd.oasis.opendocument.text</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/plucker/libokularGenerator_plucker.json new/okular-16.12.3/generators/plucker/libokularGenerator_plucker.json --- old/okular-16.12.2/generators/plucker/libokularGenerator_plucker.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/plucker/libokularGenerator_plucker.json 2017-03-05 19:51:29.000000000 +0100 @@ -80,6 +80,7 @@ "Name[sv]": "Plucker-dokumentgränssnitt", "Name[uk]": "Модуль документів Plucker", "Name[x-test]": "xxPlucker Document Backendxx", + "Name[zh_CN]": "Plucker 文档后端", "Name[zh_TW]": "Pluker 文件後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/plucker/org.kde.okular-plucker.metainfo.xml new/okular-16.12.3/generators/plucker/org.kde.okular-plucker.metainfo.xml --- old/okular-16.12.2/generators/plucker/org.kde.okular-plucker.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/plucker/org.kde.okular-plucker.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Plucker</name> <name xml:lang="uk">Plucker</name> <name xml:lang="x-test">xxPluckerxx</name> + <name xml:lang="zh-CN">Plucker</name> <name xml:lang="zh-TW">Plucker</name> <summary>Adds support for reading Plucker documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents Plucker</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa Plucker-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів Plucker</summary> <summary xml:lang="x-test">xxAdds support for reading Plucker documentsxx</summary> + <summary xml:lang="zh-CN">增加对 Plucker 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 Plucker 文件的支援</summary> <mimetypes> <mimetype>application/prs.plucker</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/poppler/libokularGenerator_poppler.json new/okular-16.12.3/generators/poppler/libokularGenerator_poppler.json --- old/okular-16.12.2/generators/poppler/libokularGenerator_poppler.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/poppler/libokularGenerator_poppler.json 2017-03-05 19:51:29.000000000 +0100 @@ -79,6 +79,7 @@ "Name[sv]": "PDF-gränssnitt", "Name[uk]": "Модуль PDF", "Name[x-test]": "xxPDF Backendxx", + "Name[zh_CN]": "PDF 后端", "Name[zh_TW]": "PDF 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/poppler/org.kde.okular-poppler.metainfo.xml new/okular-16.12.3/generators/poppler/org.kde.okular-poppler.metainfo.xml --- old/okular-16.12.2/generators/poppler/org.kde.okular-poppler.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/poppler/org.kde.okular-poppler.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">PDF</name> <name xml:lang="uk">PDF</name> <name xml:lang="x-test">xxPDFxx</name> + <name xml:lang="zh-CN">PDF</name> <name xml:lang="zh-TW">PDF</name> <summary>Adds support for reading PDF documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents PDF</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa PDF-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів PDF</summary> <summary xml:lang="x-test">xxAdds support for reading PDF documentsxx</summary> + <summary xml:lang="zh-CN">增加对 PDF 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 PDF 文件的支援</summary> <mimetypes> <mimetype>application/pdf</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/spectre/libokularGenerator_ghostview.json new/okular-16.12.3/generators/spectre/libokularGenerator_ghostview.json --- old/okular-16.12.2/generators/spectre/libokularGenerator_ghostview.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/spectre/libokularGenerator_ghostview.json 2017-03-05 19:51:29.000000000 +0100 @@ -78,6 +78,7 @@ "Name[sv]": "PS-gränssnitt", "Name[uk]": "Модуль PS", "Name[x-test]": "xxPS Backendxx", + "Name[zh_CN]": "PS 后端", "Name[zh_TW]": "PS 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/spectre/org.kde.okular-spectre.metainfo.xml new/okular-16.12.3/generators/spectre/org.kde.okular-spectre.metainfo.xml --- old/okular-16.12.2/generators/spectre/org.kde.okular-spectre.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/spectre/org.kde.okular-spectre.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Postscript</name> <name xml:lang="uk">PostScript</name> <name xml:lang="x-test">xxPostScriptxx</name> + <name xml:lang="zh-CN">PostScript</name> <name xml:lang="zh-TW">PostScript</name> <summary>Adds support for reading PostScript documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents PostScript</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa Postscript-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів PostScript</summary> <summary xml:lang="x-test">xxAdds support for reading PostScript documentsxx</summary> + <summary xml:lang="zh-CN">增加对 PostScript 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 PostScript 文件的支援</summary> <mimetypes> <mimetype>application/postscript</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/tiff/libokularGenerator_tiff.json new/okular-16.12.3/generators/tiff/libokularGenerator_tiff.json --- old/okular-16.12.2/generators/tiff/libokularGenerator_tiff.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/tiff/libokularGenerator_tiff.json 2017-03-05 19:51:29.000000000 +0100 @@ -77,6 +77,7 @@ "Name[sv]": "TIFF-gränssnitt", "Name[uk]": "Модуль TIFF", "Name[x-test]": "xxTIFF Backendxx", + "Name[zh_CN]": "TIFF 后端", "Name[zh_TW]": "TIFF 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/tiff/org.kde.okular-tiff.metainfo.xml new/okular-16.12.3/generators/tiff/org.kde.okular-tiff.metainfo.xml --- old/okular-16.12.2/generators/tiff/org.kde.okular-tiff.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/tiff/org.kde.okular-tiff.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">TIFF</name> <name xml:lang="uk">Tiff</name> <name xml:lang="x-test">xxTiffxx</name> + <name xml:lang="zh-CN">TIFF</name> <name xml:lang="zh-TW">Tiff</name> <summary>Adds support for reading Tiff documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents TIFF</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa TIFF-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів TIFF</summary> <summary xml:lang="x-test">xxAdds support for reading Tiff documentsxx</summary> + <summary xml:lang="zh-CN">增加对 TIFF 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 Tiff 文件的支援</summary> <mimetypes> <mimetype>image/tiff</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/txt/libokularGenerator_txt.json new/okular-16.12.3/generators/txt/libokularGenerator_txt.json --- old/okular-16.12.2/generators/txt/libokularGenerator_txt.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/txt/libokularGenerator_txt.json 2017-03-05 19:51:29.000000000 +0100 @@ -76,6 +76,7 @@ "Name[sv]": "Textgränssnitt", "Name[uk]": "Модуль тексту", "Name[x-test]": "xxTxt Backendxx", + "Name[zh_CN]": "纯文本后端", "Name[zh_TW]": "Txt 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/txt/org.kde.okular-txt.metainfo.xml new/okular-16.12.3/generators/txt/org.kde.okular-txt.metainfo.xml --- old/okular-16.12.2/generators/txt/org.kde.okular-txt.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/txt/org.kde.okular-txt.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Text</name> <name xml:lang="uk">Текст</name> <name xml:lang="x-test">xxTextxx</name> + <name xml:lang="zh-CN">文本</name> <name xml:lang="zh-TW">文字</name> <summary>Adds support for reading plain text documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents de text net</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa text-dokument</summary> <summary xml:lang="uk">Додає підтримку читання звичайних текстових документів</summary> <summary xml:lang="x-test">xxAdds support for reading plain text documentsxx</summary> + <summary xml:lang="zh-CN">增加对纯文本文档的支持</summary> <summary xml:lang="zh-TW">加入讀取純文字文件的支援</summary> <mimetypes> <mimetype>text/plain</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/xps/libokularGenerator_xps.json new/okular-16.12.3/generators/xps/libokularGenerator_xps.json --- old/okular-16.12.2/generators/xps/libokularGenerator_xps.json 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/xps/libokularGenerator_xps.json 2017-03-05 19:51:29.000000000 +0100 @@ -66,6 +66,7 @@ "Description[sv]": "Ett XPS-gränssnitt", "Description[uk]": "Програма для XPS", "Description[x-test]": "xxAn XPS backendxx", + "Description[zh_CN]": "XPS 后端", "Description[zh_TW]": "XPS 後端介面", "Id": "okular_xps", "License": "GPL", @@ -97,6 +98,7 @@ "Name[sv]": "XPS-gränssnitt", "Name[uk]": "Модуль XPS", "Name[x-test]": "xxXPS Backendxx", + "Name[zh_CN]": "XPS 后端", "Name[zh_TW]": "XPS 後端介面", "ServiceTypes": [ "okular/Generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/generators/xps/org.kde.okular-xps.metainfo.xml new/okular-16.12.3/generators/xps/org.kde.okular-xps.metainfo.xml --- old/okular-16.12.2/generators/xps/org.kde.okular-xps.metainfo.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/generators/xps/org.kde.okular-xps.metainfo.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">XPS</name> <name xml:lang="uk">XPS</name> <name xml:lang="x-test">xxXPSxx</name> + <name xml:lang="zh-CN">XPS</name> <name xml:lang="zh-TW">XPS</name> <summary>Adds support for reading XPS documents</summary> <summary xml:lang="ca">Afegeix la implementació per llegir documents XPS</summary> @@ -51,6 +52,7 @@ <summary xml:lang="sv">Lägger till stöd för att läsa XPS-dokument</summary> <summary xml:lang="uk">Додає підтримку читання документів XPS</summary> <summary xml:lang="x-test">xxAdds support for reading XPS documentsxx</summary> + <summary xml:lang="zh-CN">增加对 XPS 文档的阅读支持</summary> <summary xml:lang="zh-TW">加入讀取 XPS 文件的支援</summary> <mimetypes> <mimetype>text/plain</mimetype> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/shell/org.kde.okular.appdata.xml new/okular-16.12.3/shell/org.kde.okular.appdata.xml --- old/okular-16.12.2/shell/org.kde.okular.appdata.xml 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/shell/org.kde.okular.appdata.xml 2017-03-05 19:51:29.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sv">Okular</name> <name xml:lang="uk">Okular</name> <name xml:lang="x-test">xxOkularxx</name> + <name xml:lang="zh-CN">Okular</name> <name xml:lang="zh-TW">Okular</name> <summary>Document Viewer</summary> <summary xml:lang="ca">Visualitzador de documents</summary> @@ -52,6 +53,7 @@ <summary xml:lang="sv">Dokumentvisare</summary> <summary xml:lang="uk">Програма для перегляду документів</summary> <summary xml:lang="x-test">xxDocument Viewerxx</summary> + <summary xml:lang="zh-CN">文档查看器</summary> <summary xml:lang="zh-TW">文件檢視器</summary> <description> <p> @@ -108,6 +110,7 @@ <li>Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax</li> <li xml:lang="ca">Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, ODT, Fiction Book, llibres de còmic, Plucker, EPub, Fax</li> <li xml:lang="ca-valencia">Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, ODT, Fiction Book, llibres de còmic, Plucker, EPub, Fax</li> + <li xml:lang="cs">Podporované formáty: PDF, PS, Tiff, CHM, DjVu, obrázky, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax</li> <li xml:lang="en-GB">Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax</li> <li xml:lang="es">Formatos permitidos: PDF, PS, Tiff, CHM, DjVu, imágenes, DVI, XPS, ODT, Fiction Book, libros de cómics, Plucker, EPub, Fax</li> <li xml:lang="et">Toetatud vormingud: PDF, PS, Tiff, CHM, DjVu, pildid, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, faks</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/ui/pageview.cpp new/okular-16.12.3/ui/pageview.cpp --- old/okular-16.12.2/ui/pageview.cpp 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/ui/pageview.cpp 2017-03-05 19:51:29.000000000 +0100 @@ -166,6 +166,7 @@ double lastSourceLocationViewportNormalizedX; double lastSourceLocationViewportNormalizedY; QTimer * viewportMoveTimer; + int controlWheelAccumulatedDelta; // auto scroll int scrollIncrement; QTimer * autoScrollTimer; @@ -312,6 +313,7 @@ d->lastSourceLocationViewportNormalizedX = 0.0; d->lastSourceLocationViewportNormalizedY = 0.0; d->viewportMoveTimer = 0; + d->controlWheelAccumulatedDelta = 0; d->scrollIncrement = 0; d->autoScrollTimer = 0; d->annotator = 0; @@ -1971,6 +1973,8 @@ void PageView::mouseMoveEvent( QMouseEvent * e ) { + d->controlWheelAccumulatedDelta = 0; + // don't perform any mouse action when no document is shown if ( d->items.isEmpty() ) return; @@ -2159,6 +2163,8 @@ void PageView::mousePressEvent( QMouseEvent * e ) { + d->controlWheelAccumulatedDelta = 0; + // don't perform any mouse action when no document is shown if ( d->items.isEmpty() ) return; @@ -2392,6 +2398,8 @@ void PageView::mouseReleaseEvent( QMouseEvent * e ) { + d->controlWheelAccumulatedDelta = 0; + // stop the drag scrolling d->dragScrollTimer.stop(); @@ -3192,6 +3200,8 @@ void PageView::mouseDoubleClickEvent( QMouseEvent * e ) { + d->controlWheelAccumulatedDelta = 0; + if ( e->button() == Qt::LeftButton ) { const QPoint eventPos = contentAreaPoint( e->pos() ); @@ -3254,43 +3264,55 @@ vScroll = verticalScrollBar()->value(); e->accept(); if ( (e->modifiers() & Qt::ControlModifier) == Qt::ControlModifier ) { - if ( e->delta() < 0 ) + d->controlWheelAccumulatedDelta += delta; + if ( d->controlWheelAccumulatedDelta <= -QWheelEvent::DefaultDeltasPerStep ) + { slotZoomOut(); - else + d->controlWheelAccumulatedDelta = 0; + } + else if ( d->controlWheelAccumulatedDelta >= QWheelEvent::DefaultDeltasPerStep ) + { slotZoomIn(); + d->controlWheelAccumulatedDelta = 0; + } } - else if ( delta <= -120 && !Okular::Settings::viewContinuous() && vScroll == verticalScrollBar()->maximum() ) + else { - // go to next page - if ( (int)d->document->currentPage() < d->items.count() - 1 ) + d->controlWheelAccumulatedDelta = 0; + + if ( delta <= -QWheelEvent::DefaultDeltasPerStep && !Okular::Settings::viewContinuous() && vScroll == verticalScrollBar()->maximum() ) { - // more optimized than document->setNextPage and then move view to top - Okular::DocumentViewport newViewport = d->document->viewport(); - newViewport.pageNumber += viewColumns(); - if ( newViewport.pageNumber >= (int)d->items.count() ) - newViewport.pageNumber = d->items.count() - 1; - newViewport.rePos.enabled = true; - newViewport.rePos.normalizedY = 0.0; - d->document->setViewport( newViewport ); - } - } - else if ( delta >= 120 && !Okular::Settings::viewContinuous() && vScroll == verticalScrollBar()->minimum() ) - { - // go to prev page - if ( d->document->currentPage() > 0 ) - { - // more optimized than document->setPrevPage and then move view to bottom - Okular::DocumentViewport newViewport = d->document->viewport(); - newViewport.pageNumber -= viewColumns(); - if ( newViewport.pageNumber < 0 ) - newViewport.pageNumber = 0; - newViewport.rePos.enabled = true; - newViewport.rePos.normalizedY = 1.0; - d->document->setViewport( newViewport ); + // go to next page + if ( (int)d->document->currentPage() < d->items.count() - 1 ) + { + // more optimized than document->setNextPage and then move view to top + Okular::DocumentViewport newViewport = d->document->viewport(); + newViewport.pageNumber += viewColumns(); + if ( newViewport.pageNumber >= (int)d->items.count() ) + newViewport.pageNumber = d->items.count() - 1; + newViewport.rePos.enabled = true; + newViewport.rePos.normalizedY = 0.0; + d->document->setViewport( newViewport ); + } + } + else if ( delta >= QWheelEvent::DefaultDeltasPerStep && !Okular::Settings::viewContinuous() && vScroll == verticalScrollBar()->minimum() ) + { + // go to prev page + if ( d->document->currentPage() > 0 ) + { + // more optimized than document->setPrevPage and then move view to bottom + Okular::DocumentViewport newViewport = d->document->viewport(); + newViewport.pageNumber -= viewColumns(); + if ( newViewport.pageNumber < 0 ) + newViewport.pageNumber = 0; + newViewport.rePos.enabled = true; + newViewport.rePos.normalizedY = 1.0; + d->document->setViewport( newViewport ); + } } + else + QAbstractScrollArea::wheelEvent( e ); } - else - QAbstractScrollArea::wheelEvent( e ); updateCursor(); } @@ -3718,7 +3740,7 @@ d->mouseSelectionRect.setBottomLeft( pos ); updateRect |= d->mouseSelectionRect; updateRect.translate( -contentAreaPosition() ); - viewport()->update( updateRect.adjusted( -1, -1, 1, 1 ) ); + viewport()->update( updateRect.adjusted( -1, -2, 2, 1 ) ); } else if ( d->mouseTextSelecting) { @@ -3796,7 +3818,7 @@ void PageView::selectionClear(const ClearMode mode) { - QRect updatedRect = d->mouseSelectionRect.normalized().adjusted( 0, 0, 1, 1 ); + QRect updatedRect = d->mouseSelectionRect.normalized().adjusted( -2, -2, 2, 2 ); d->mouseSelecting = false; d->mouseSelectionRect.setCoords( 0, 0, 0, 0 ); d->tableSelectionCols.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.2/ui/videowidget.cpp new/okular-16.12.3/ui/videowidget.cpp --- old/okular-16.12.2/ui/videowidget.cpp 2017-02-06 07:51:00.000000000 +0100 +++ new/okular-16.12.3/ui/videowidget.cpp 2017-03-05 19:51:29.000000000 +0100 @@ -99,6 +99,25 @@ double repetitionsLeft; }; +static QUrl urlFromUrlString(const QString &url, Okular::Document *document) +{ + QUrl newurl; + if ( url.startsWith( QLatin1Char( '/' ) ) ) + { + newurl = QUrl::fromLocalFile( url ); + } + else + { + newurl = QUrl( url ); + if ( newurl.isRelative() ) + { + newurl = document->currentDocument().adjusted(QUrl::RemoveFilename); + newurl.setPath( newurl.path() + url ); + } + } + return newurl; +} + void VideoWidget::Private::load() { repetitionsLeft = movie->playRepetitions(); @@ -107,21 +126,7 @@ loaded = true; - QString url = movie->url(); - QUrl newurl; - if ( QDir::isRelativePath( url ) ) - { - newurl = document->currentDocument().adjusted(QUrl::RemoveFilename); - newurl.setPath( newurl.path() + url ); - } - else - { - newurl = QUrl::fromLocalFile(url); - } - if ( newurl.isLocalFile() ) - player->load( newurl ); - else - player->load( newurl ); + player->load( urlFromUrlString( movie->url(), document ) ); connect( player->mediaObject(), SIGNAL( stateChanged( Phonon::State, Phonon::State ) ), q, SLOT( stateChanged( Phonon::State, Phonon::State ) ) ); @@ -145,23 +150,8 @@ void VideoWidget::Private::takeSnapshot() { - const QString url = movie->url(); - QUrl newurl; - if ( QDir::isRelativePath( url ) ) - { - newurl = document->currentDocument().adjusted(QUrl::RemoveFilename); - newurl.setPath( newurl.path() + url ); - } - else - { - newurl = QUrl::fromLocalFile(url); - } - - SnapshotTaker *taker = 0; - if ( newurl.isLocalFile() ) - taker = new SnapshotTaker( newurl, q ); - else - taker = new SnapshotTaker( newurl, q ); + const QUrl url = urlFromUrlString( movie->url(), document ); + SnapshotTaker *taker = new SnapshotTaker( url, q ); q->connect( taker, SIGNAL( finished( const QImage& ) ), q, SLOT( setPosterImage( const QImage& ) ) ); }
