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

Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

Browse source
This commit is contained in:
Albert Astals Cid 2014-03-01 17:03:23 +01:00
commit 3c79ac8ea1
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/generator.cpp
View file

@ -231,7 +231,7 @@ void Generator::generatePixmap( PixmapRequest *request )
* We create the text page for every page that is visible to the
* user, so he can use the text extraction tools without a delay.
*/
if ( hasFeature( TextExtraction ) && !request->page()->hasTextPage() && canGenerateTextPage() ) {
if ( hasFeature( TextExtraction ) && !request->page()->hasTextPage() && canGenerateTextPage() && !d->m_closing ) {
d->mTextPageReady = false;
d->textPageGenerationThread()->startGeneration( request->page() );
}

2
generators/mobipocket/libokularGenerator_mobi.desktop
View file

@ -24,6 +24,7 @@ Name[ia]=Documento De Mobipocket
Name[is]=Mobipocket skjal
Name[it]=Documento Mobipocket
Name[kk]=Mobipocket құжаты
Name[ko]=Mobipocket 문서
Name[lv]=Mobipocket dokuments
Name[nb]=Mobipocket-dokument
Name[nds]=Mobipocket-Dokment
@ -72,6 +73,7 @@ Comment[ia]=Retro-administration per Mobipocket pro Okular
Comment[is]=Mobipocket stuðningur fyrir Okular
Comment[it]=Backend Mobipocket per Okular
Comment[kk]=Okular-дың Mobipocket тетігі
Comment[ko]=Okular의 Mobipocket 백엔드
Comment[lv]=Mobipocket Okular aizmugure
Comment[nb]=Mobipocket-motor for Okular
Comment[nds]=Mobipocket-Hülpprogramm för Okular

1
generators/mobipocket/okularApplication_mobi.desktop
View file

@ -148,6 +148,7 @@ X-KDE-Keywords[hu]=mobipocket
X-KDE-Keywords[ia]=mobipocket
X-KDE-Keywords[it]=mobipocket
X-KDE-Keywords[kk]=mobipocket
X-KDE-Keywords[ko]=mobipocket
X-KDE-Keywords[nb]=mobipocket
X-KDE-Keywords[nds]=Mobipocket
X-KDE-Keywords[nl]=mobipocket