Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-10-16 18:12:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2014-09-18 07:59:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-10-16 18:13:20.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 12 12:08:03 UTC 2014 - [email protected] + +- Update to 4.14.2 + * KDE 4.14.2 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.2.php + +------------------------------------------------------------------- Old: ---- okular-4.14.1.tar.xz New: ---- okular-4.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.w1cdXo/_old 2014-10-16 18:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.w1cdXo/_new 2014-10-16 18:13:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.14.1 +Version: 4.14.2 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.14.1.tar.xz -> okular-4.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/VERSION new/okular-4.14.2/VERSION --- old/okular-4.14.1/VERSION 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/VERSION 2014-10-09 21:32:34.000000000 +0200 @@ -1 +1 @@ -okular v0.20.0 +okular v0.20.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/active/app/active-documentviewer.desktop new/okular-4.14.2/active/app/active-documentviewer.desktop --- old/okular-4.14.1/active/app/active-documentviewer.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/active/app/active-documentviewer.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -67,6 +67,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/active/app/package/metadata.desktop new/okular-4.14.2/active/app/package/metadata.desktop --- old/okular-4.14.1/active/app/package/metadata.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/active/app/package/metadata.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -20,6 +20,7 @@ Name[ia]=Visor de documento Name[is]=Skjalaskoðari Name[it]=Visore di documenti +Name[ja]=文書ビューア Name[kk]=Құжатты қарау құралы Name[ko]=문서 뷰어 Name[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/core/version.h new/okular-4.14.2/core/version.h --- old/okular-4.14.1/core/version.h 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/core/version.h 2014-10-09 21:32:34.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.20.0" +#define OKULAR_VERSION_STRING "0.20.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 20 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 2 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/chm/active-documentviewer_chm.desktop new/okular-4.14.2/generators/chm/active-documentviewer_chm.desktop --- old/okular-4.14.1/generators/chm/active-documentviewer_chm.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/chm/active-documentviewer_chm.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -67,6 +67,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=chm X-KDE-Keywords[is]=chm X-KDE-Keywords[it]=chm +X-KDE-Keywords[ja]=chm X-KDE-Keywords[kk]=chm X-KDE-Keywords[km]=chm X-KDE-Keywords[ko]=chm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/chm/okularApplication_chm.desktop new/okular-4.14.2/generators/chm/okularApplication_chm.desktop --- old/okular-4.14.1/generators/chm/okularApplication_chm.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/chm/okularApplication_chm.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=chm X-KDE-Keywords[is]=chm X-KDE-Keywords[it]=chm +X-KDE-Keywords[ja]=chm X-KDE-Keywords[kk]=chm X-KDE-Keywords[km]=chm X-KDE-Keywords[ko]=chm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/comicbook/active-documentviewer_comicbook.desktop new/okular-4.14.2/generators/comicbook/active-documentviewer_comicbook.desktop --- old/okular-4.14.1/generators/comicbook/active-documentviewer_comicbook.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/comicbook/active-documentviewer_comicbook.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책 @@ -193,7 +195,7 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс +X-KDE-Keywords[uk]=cbr;cbz;cbt;Comic Book;комікс X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/comicbook/okularApplication_comicbook.desktop new/okular-4.14.2/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-4.14.1/generators/comicbook/okularApplication_comicbook.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/comicbook/okularApplication_comicbook.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책 @@ -174,7 +175,7 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс +X-KDE-Keywords[uk]=cbr;cbz;cbt;Comic Book;комікс X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/djvu/active-documentviewer_djvu.desktop new/okular-4.14.2/generators/djvu/active-documentviewer_djvu.desktop --- old/okular-4.14.1/generators/djvu/active-documentviewer_djvu.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/djvu/active-documentviewer_djvu.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=djvu X-KDE-Keywords[is]=djvu X-KDE-Keywords[it]=djvu +X-KDE-Keywords[ja]=djvu X-KDE-Keywords[kk]=djvu X-KDE-Keywords[km]=djvu X-KDE-Keywords[ko]=djvu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/djvu/okularApplication_djvu.desktop new/okular-4.14.2/generators/djvu/okularApplication_djvu.desktop --- old/okular-4.14.1/generators/djvu/okularApplication_djvu.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/djvu/okularApplication_djvu.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=djvu X-KDE-Keywords[is]=djvu X-KDE-Keywords[it]=djvu +X-KDE-Keywords[ja]=djvu X-KDE-Keywords[kk]=djvu X-KDE-Keywords[km]=djvu X-KDE-Keywords[ko]=djvu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/dvi/active-documentviewer_dvi.desktop new/okular-4.14.2/generators/dvi/active-documentviewer_dvi.desktop --- old/okular-4.14.1/generators/dvi/active-documentviewer_dvi.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/dvi/active-documentviewer_dvi.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=dvi X-KDE-Keywords[is]=dvi X-KDE-Keywords[it]=dvi +X-KDE-Keywords[ja]=dvi X-KDE-Keywords[kk]=dvi X-KDE-Keywords[km]=dvi X-KDE-Keywords[ko]=dvi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/dvi/okularApplication_dvi.desktop new/okular-4.14.2/generators/dvi/okularApplication_dvi.desktop --- old/okular-4.14.1/generators/dvi/okularApplication_dvi.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/dvi/okularApplication_dvi.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=dvi X-KDE-Keywords[is]=dvi X-KDE-Keywords[it]=dvi +X-KDE-Keywords[ja]=dvi X-KDE-Keywords[kk]=dvi X-KDE-Keywords[km]=dvi X-KDE-Keywords[ko]=dvi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/dvi/special.cpp new/okular-4.14.2/generators/dvi/special.cpp --- old/okular-4.14.1/generators/dvi/special.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/dvi/special.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -20,6 +20,7 @@ #include <kmimetype.h> #include <QFile> +#include <QFontDatabase> #include <QImage> #include <QPainter> @@ -421,11 +422,17 @@ QFont f = foreGroundPainter->font(); f.setPointSize(8); foreGroundPainter->setFont(f); - if (QFile::exists(EPSfilename)) - foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename); - else - foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), - i18n("File not found: \n %1", EPSfilename_orig)); + /* if the fonts are mapped for some reason to X bitmap fonts, + the call to drawText() in the non-GUI thread will produce a crash. + Ensure that the rendering of the text is performed only if + the threaded font rendering is available */ + if (QFontDatabase::supportsThreadedFontRendering()) { + if (QFile::exists(EPSfilename)) + foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), EPSfilename); + else + foreGroundPainter->drawText (bbox, (int)(Qt::AlignCenter), + i18n("File not found: \n %1", EPSfilename_orig)); + } foreGroundPainter->restore(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/epub/active-documentviewer_epub.desktop new/okular-4.14.2/generators/epub/active-documentviewer_epub.desktop --- old/okular-4.14.1/generators/epub/active-documentviewer_epub.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/epub/active-documentviewer_epub.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=epub, e-book X-KDE-Keywords[is]=epub, e-book, rafbók X-KDE-Keywords[it]=epub, e-book +X-KDE-Keywords[ja]=epub, e-book X-KDE-Keywords[kk]=epub, e-book X-KDE-Keywords[km]=epub, e-book X-KDE-Keywords[ko]=epub, e-book,전자책,이북 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/epub/okularApplication_epub.desktop new/okular-4.14.2/generators/epub/okularApplication_epub.desktop --- old/okular-4.14.1/generators/epub/okularApplication_epub.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/epub/okularApplication_epub.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=epub, e-book X-KDE-Keywords[is]=epub, e-book, rafbók X-KDE-Keywords[it]=epub, e-book +X-KDE-Keywords[ja]=epub, e-book X-KDE-Keywords[kk]=epub, e-book X-KDE-Keywords[km]=epub, e-book X-KDE-Keywords[ko]=epub, e-book,전자책,이북 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/fax/active-documentviewer_fax.desktop new/okular-4.14.2/generators/fax/active-documentviewer_fax.desktop --- old/okular-4.14.1/generators/fax/active-documentviewer_fax.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/fax/active-documentviewer_fax.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/fictionbook/active-documentviewer_fb.desktop new/okular-4.14.2/generators/fictionbook/active-documentviewer_fb.desktop --- old/okular-4.14.1/generators/fictionbook/active-documentviewer_fb.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/fictionbook/active-documentviewer_fb.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=FictionBook, e-book, fb2 X-KDE-Keywords[is]=FictionBook, e-book, fb2 X-KDE-Keywords[it]=FictionBook, e-book, fb2 +X-KDE-Keywords[ja]=FictionBook, e-book, fb2 X-KDE-Keywords[kk]=FictionBook, e-book, fb2 X-KDE-Keywords[km]=FictionBook, e-book, fb2 X-KDE-Keywords[ko]=FictionBook, e-book, fb2 @@ -193,7 +195,7 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 -X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга +X-KDE-Keywords[uk]=FictionBook;fb2;електронна,книга X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/fictionbook/okularApplication_fb.desktop new/okular-4.14.2/generators/fictionbook/okularApplication_fb.desktop --- old/okular-4.14.1/generators/fictionbook/okularApplication_fb.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/fictionbook/okularApplication_fb.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=FictionBook, e-book, fb2 X-KDE-Keywords[is]=FictionBook, e-book, fb2 X-KDE-Keywords[it]=FictionBook, e-book, fb2 +X-KDE-Keywords[ja]=FictionBook, e-book, fb2 X-KDE-Keywords[kk]=FictionBook, e-book, fb2 X-KDE-Keywords[km]=FictionBook, e-book, fb2 X-KDE-Keywords[ko]=FictionBook, e-book, fb2 @@ -174,7 +175,7 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 -X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга +X-KDE-Keywords[uk]=FictionBook;fb2;електронна,книга X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/kimgio/active-documentviewer_kimgio.desktop new/okular-4.14.2/generators/kimgio/active-documentviewer_kimgio.desktop --- old/okular-4.14.1/generators/kimgio/active-documentviewer_kimgio.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/kimgio/active-documentviewer_kimgio.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/mobipocket/libokularGenerator_mobi.desktop new/okular-4.14.2/generators/mobipocket/libokularGenerator_mobi.desktop --- old/okular-4.14.1/generators/mobipocket/libokularGenerator_mobi.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/mobipocket/libokularGenerator_mobi.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -23,6 +23,7 @@ Name[ia]=Documento De Mobipocket Name[is]=Mobipocket skjal Name[it]=Documento Mobipocket +Name[ja]=Mobipocket 文書 Name[kk]=Mobipocket құжаты Name[ko]=Mobipocket 문서 Name[lt]=Mobipocket dokumentas @@ -73,6 +74,7 @@ Comment[ia]=Retro-administration per Mobipocket pro Okular Comment[is]=Mobipocket stuðningur fyrir Okular Comment[it]=Backend Mobipocket per Okular +Comment[ja]=Okular の Mobipocket バックエンド Comment[kk]=Okular-дың Mobipocket тетігі Comment[ko]=Okular의 Mobipocket 백엔드 Comment[lt]=Mobipocket programinė sąsaja, skirta Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/mobipocket/okularApplication_mobi.desktop new/okular-4.14.2/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-4.14.1/generators/mobipocket/okularApplication_mobi.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/mobipocket/okularApplication_mobi.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -150,6 +150,7 @@ X-KDE-Keywords[ia]=mobipocket X-KDE-Keywords[is]=mobipocket X-KDE-Keywords[it]=mobipocket +X-KDE-Keywords[ja]=mobipocket X-KDE-Keywords[kk]=mobipocket X-KDE-Keywords[ko]=mobipocket X-KDE-Keywords[lt]=mobipocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/ooo/active-documentviewer_ooo.desktop new/okular-4.14.2/generators/ooo/active-documentviewer_ooo.desktop --- old/okular-4.14.1/generators/ooo/active-documentviewer_ooo.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/ooo/active-documentviewer_ooo.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/plucker/active-documentviewer_plucker.desktop new/okular-4.14.2/generators/plucker/active-documentviewer_plucker.desktop --- old/okular-4.14.1/generators/plucker/active-documentviewer_plucker.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/plucker/active-documentviewer_plucker.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=plucker X-KDE-Keywords[is]=plucker X-KDE-Keywords[it]=plucker +X-KDE-Keywords[ja]=plucker X-KDE-Keywords[kk]=plucker X-KDE-Keywords[km]=plucker X-KDE-Keywords[ko]=plucker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/plucker/okularApplication_plucker.desktop new/okular-4.14.2/generators/plucker/okularApplication_plucker.desktop --- old/okular-4.14.1/generators/plucker/okularApplication_plucker.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/plucker/okularApplication_plucker.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -151,6 +151,7 @@ X-KDE-Keywords[ia]=plucker X-KDE-Keywords[is]=plucker X-KDE-Keywords[it]=plucker +X-KDE-Keywords[ja]=plucker X-KDE-Keywords[kk]=plucker X-KDE-Keywords[km]=plucker X-KDE-Keywords[ko]=plucker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/poppler/active-documentviewer_pdf.desktop new/okular-4.14.2/generators/poppler/active-documentviewer_pdf.desktop --- old/okular-4.14.1/generators/poppler/active-documentviewer_pdf.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/poppler/active-documentviewer_pdf.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=PDF, Formato de Documento Portabile X-KDE-Keywords[is]=PDF, Portable Document Format X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile +X-KDE-Keywords[ja]=PDF X-KDE-Keywords[kk]=PDF, Portable Document Format X-KDE-Keywords[km]=PDF, Portable Document Format X-KDE-Keywords[ko]=PDF, Portable Document Format @@ -193,7 +195,7 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi -X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф +X-KDE-Keywords[uk]=PDF;Portable Document Format;пдф X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/poppler/okularApplication_pdf.desktop new/okular-4.14.2/generators/poppler/okularApplication_pdf.desktop --- old/okular-4.14.1/generators/poppler/okularApplication_pdf.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/poppler/okularApplication_pdf.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -150,6 +150,7 @@ X-KDE-Keywords[ia]=PDF, Formato de Documento Portabile X-KDE-Keywords[is]=PDF, Portable Document Format X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile +X-KDE-Keywords[ja]=PDF X-KDE-Keywords[kk]=PDF, Portable Document Format X-KDE-Keywords[km]=PDF, Portable Document Format X-KDE-Keywords[ko]=PDF, Portable Document Format @@ -173,7 +174,7 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi -X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф +X-KDE-Keywords[uk]=PDF;Portable Document Format;пдф X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/spectre/active-documentviewer_ghostview.desktop new/okular-4.14.2/generators/spectre/active-documentviewer_ghostview.desktop --- old/okular-4.14.1/generators/spectre/active-documentviewer_ghostview.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/spectre/active-documentviewer_ghostview.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -168,6 +169,7 @@ X-KDE-Keywords[ia]=PS, PostScript X-KDE-Keywords[is]=PS, PostScript X-KDE-Keywords[it]=PS, PostScript +X-KDE-Keywords[ja]=PS, PostScript, ポストスクリプト X-KDE-Keywords[kk]=PS, PostScript X-KDE-Keywords[ko]=PS, PostScript X-KDE-Keywords[lt]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/spectre/okularApplication_ghostview.desktop new/okular-4.14.2/generators/spectre/okularApplication_ghostview.desktop --- old/okular-4.14.1/generators/spectre/okularApplication_ghostview.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/spectre/okularApplication_ghostview.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -148,6 +148,7 @@ X-KDE-Keywords[ia]=PS, PostScript X-KDE-Keywords[is]=PS, PostScript X-KDE-Keywords[it]=PS, PostScript +X-KDE-Keywords[ja]=PS, PostScript, ポストスクリプト X-KDE-Keywords[kk]=PS, PostScript X-KDE-Keywords[ko]=PS, PostScript X-KDE-Keywords[lt]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/tiff/active-documentviewer_tiff.desktop new/okular-4.14.2/generators/tiff/active-documentviewer_tiff.desktop --- old/okular-4.14.1/generators/tiff/active-documentviewer_tiff.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/tiff/active-documentviewer_tiff.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/txt/active-documentviewer_txt.desktop new/okular-4.14.2/generators/txt/active-documentviewer_txt.desktop --- old/okular-4.14.1/generators/txt/active-documentviewer_txt.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/txt/active-documentviewer_txt.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -168,6 +169,7 @@ X-KDE-Keywords[ia]=txt X-KDE-Keywords[is]=txt X-KDE-Keywords[it]=txt, testo +X-KDE-Keywords[ja]=txt X-KDE-Keywords[kk]=txt X-KDE-Keywords[ko]=txt X-KDE-Keywords[lt]=txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/txt/libokularGenerator_txt.desktop new/okular-4.14.2/generators/txt/libokularGenerator_txt.desktop --- old/okular-4.14.1/generators/txt/libokularGenerator_txt.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/txt/libokularGenerator_txt.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -19,6 +19,7 @@ Name[ia]=txt Name[is]=txt Name[it]=testo +Name[ja]=txt Name[kk]=txt Name[ko]=txt Name[lt]=txt @@ -63,6 +64,7 @@ Comment[ia]=Retro-administration per Txt pro Okular Comment[is]=TXT stuðningur fyrir Okular Comment[it]=Backend di testo semplice per Okular +Comment[ja]=Okular の Txt バックエンド Comment[kk]=Okular-дың Txt тетігі Comment[ko]=Okular의 TXT 백엔드 Comment[lt]=Txt programinė sąsaja, skirta Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/txt/okularApplication_txt.desktop new/okular-4.14.2/generators/txt/okularApplication_txt.desktop --- old/okular-4.14.1/generators/txt/okularApplication_txt.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/txt/okularApplication_txt.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -149,6 +149,7 @@ X-KDE-Keywords[ia]=txt X-KDE-Keywords[is]=txt X-KDE-Keywords[it]=txt, testo +X-KDE-Keywords[ja]=txt X-KDE-Keywords[kk]=txt X-KDE-Keywords[ko]=txt X-KDE-Keywords[lt]=txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/xps/active-documentviewer_xps.desktop new/okular-4.14.2/generators/xps/active-documentviewer_xps.desktop --- old/okular-4.14.1/generators/xps/active-documentviewer_xps.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/xps/active-documentviewer_xps.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -68,6 +68,7 @@ GenericName[ia]=Visor de documento GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti +GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы GenericName[ko]=문서 뷰어 GenericName[lt]=Dokumentų žiūryklė @@ -170,6 +171,7 @@ X-KDE-Keywords[ia]=XPS X-KDE-Keywords[is]=XPS X-KDE-Keywords[it]=XPS +X-KDE-Keywords[ja]=XPS X-KDE-Keywords[kk]=XPS X-KDE-Keywords[km]=XPS X-KDE-Keywords[ko]=XPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/generators/xps/okularApplication_xps.desktop new/okular-4.14.2/generators/xps/okularApplication_xps.desktop --- old/okular-4.14.1/generators/xps/okularApplication_xps.desktop 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/generators/xps/okularApplication_xps.desktop 2014-10-09 21:32:34.000000000 +0200 @@ -150,6 +150,7 @@ X-KDE-Keywords[ia]=XPS X-KDE-Keywords[is]=XPS X-KDE-Keywords[it]=XPS +X-KDE-Keywords[ja]=XPS X-KDE-Keywords[kk]=XPS X-KDE-Keywords[km]=XPS X-KDE-Keywords[ko]=XPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/part.cpp new/okular-4.14.2/part.cpp --- old/okular-4.14.1/part.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/part.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -473,6 +473,7 @@ m_pageNumberTool = new MiniBar( 0, m_miniBarLogic ); connect( m_findBar, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*))); + connect( m_findBar, SIGNAL(onCloseButtonPressed()), m_pageView, SLOT(setFocus())); connect( m_miniBar, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*))); connect( m_pageView, SIGNAL(escPressed()), m_findBar, SLOT(resetSearch()) ); connect( m_pageNumberTool, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), m_pageView, SLOT(externalKeyPressEvent(QKeyEvent*))); @@ -1459,7 +1460,7 @@ } // if the 'OpenTOC' flag is set, open the TOC - if ( m_document->metaData( "OpenTOC" ).toBool() && m_sidebar->isItemEnabled( 0 ) && !m_sidebar->isCollapsed() ) + if ( m_document->metaData( "OpenTOC" ).toBool() && m_sidebar->isItemEnabled( 0 ) && !m_sidebar->isCollapsed() && m_sidebar->currentIndex() != 0 ) { m_sidebar->setCurrentIndex( 0, Sidebar::DoNotUncollapseIfCollapsed ); } @@ -1929,7 +1930,7 @@ m_sidebar->setItemEnabled(0, enable); // If present, show the TOC when a document is opened - if ( enable ) + if ( enable && m_sidebar->currentIndex() != 0 ) { m_sidebar->setCurrentIndex( 0, Sidebar::DoNotUncollapseIfCollapsed ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/shell/okular_main.cpp new/okular-4.14.2/shell/okular_main.cpp --- old/okular-4.14.1/shell/okular_main.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/shell/okular_main.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -135,6 +135,11 @@ } Shell* shell = new Shell( serializedOptions ); + if ( !shell->isValid() ) + { + return Error; + } + shell->show(); for ( int i = 0; i < paths.count(); ) { @@ -147,6 +152,10 @@ else { shell = new Shell( serializedOptions ); + if ( !shell->isValid() ) + { + return Error; + } shell->show(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/shell/shell.cpp new/okular-4.14.2/shell/shell.cpp --- old/okular-4.14.1/shell/shell.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/shell/shell.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -64,6 +64,7 @@ #ifdef KActivities_FOUND , m_activityResource(0) #endif + , m_isValid(true) { setObjectName( QLatin1String( "okular::Shell" ) ); setContextMenuPolicy( Qt::NoContextMenu ); @@ -79,6 +80,7 @@ { // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful + m_isValid = false; KMessageBox::error(this, i18n("Unable to find the Okular component.")); return; } @@ -130,10 +132,16 @@ } else { + m_isValid = false; KMessageBox::error(this, i18n("Unable to find the Okular component.")); } } +bool Shell::isValid() const +{ + return m_isValid; +} + void Shell::showOpenRecentMenu() { m_recent->menu()->popup(QCursor::pos()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/shell/shell.h new/okular-4.14.2/shell/shell.h --- old/okular-4.14.1/shell/shell.h 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/shell/shell.h 2014-10-09 21:32:34.000000000 +0200 @@ -60,6 +60,12 @@ virtual ~Shell(); QSize sizeHint() const; + + /** + * Returns false if Okular component wasn't found + **/ + bool isValid() const; + public slots: void slotQuit(); @@ -156,6 +162,7 @@ #ifdef KActivities_FOUND KActivities::ResourceInstance* m_activityResource; #endif + bool m_isValid; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/ui/annotwindow.cpp new/okular-4.14.2/ui/annotwindow.cpp --- old/okular-4.14.1/ui/annotwindow.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/ui/annotwindow.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -327,8 +327,8 @@ void AnnotWindow::slotsaveWindowText() { - QString contents = textEdit->toPlainText(); - int cursorPos = textEdit->textCursor().position(); + const QString contents = textEdit->toPlainText(); + const int cursorPos = textEdit->textCursor().position(); if (contents != m_annot->contents()) { m_document->editPageAnnotationContents( m_page, m_annot, contents, cursorPos, m_prevCursorPos, m_prevAnchorPos); @@ -344,6 +344,7 @@ { textEdit->setReadOnly( true ); disconnect(textEdit, SIGNAL(textChanged()), this,SLOT(slotsaveWindowText())); + disconnect(textEdit, SIGNAL(cursorPositionChanged()), this,SLOT(slotsaveWindowText())); textEdit->setAcceptRichText( true ); QString contents = m_annot->contents(); contents = Qt::convertFromPlainText( contents ); @@ -384,6 +385,7 @@ textEdit->setAcceptRichText( false ); textEdit->setPlainText( m_annot->contents() ); connect(textEdit, SIGNAL(textChanged()), this,SLOT(slotsaveWindowText())); + connect(textEdit, SIGNAL(cursorPositionChanged()), this,SLOT(slotsaveWindowText())); textEdit->setReadOnly( false ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/ui/findbar.cpp new/okular-4.14.2/ui/findbar.cpp --- old/okular-4.14.1/ui/findbar.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/ui/findbar.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -179,6 +179,7 @@ { m_search->lineEdit()->stopSearch(); } + emit onCloseButtonPressed(); close(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/ui/findbar.h new/okular-4.14.2/ui/findbar.h --- old/okular-4.14.1/ui/findbar.h 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/ui/findbar.h 2014-10-09 21:32:34.000000000 +0200 @@ -36,6 +36,7 @@ signals: void forwardKeyPressEvent( QKeyEvent* ); + void onCloseButtonPressed(); public slots: void findNext(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.1/ui/pageview.cpp new/okular-4.14.2/ui/pageview.cpp --- old/okular-4.14.1/ui/pageview.cpp 2014-08-24 22:38:33.000000000 +0200 +++ new/okular-4.14.2/ui/pageview.cpp 2014-10-09 21:32:34.000000000 +0200 @@ -2350,6 +2350,8 @@ static const double s_minDistance = 0.025; // FIXME?: empirical value? double distance = 0.0; rect = pageItem->page()->nearestObjectRect( Okular::ObjectRect::SourceRef, nX, nY, pageItem->uncroppedWidth(), pageItem->uncroppedHeight(), &distance ); + // distance is distanceSqr, adapt it to a normalized value + distance = distance / (pow( pageItem->uncroppedWidth(), 2 ) + pow( pageItem->uncroppedHeight(), 2 )); if ( rect && ( distance > s_minDistance ) ) rect = 0; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
