office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into frameworks

Browse source 
Conflicts:
	core/version.h
This commit is contained in:
Montel Laurent 2014-11-30 12:56:10 +01:00
parent aad0211c10 b4727fd74d
commit 8f5e86cec5
10 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
okular v0.20.60
okular v0.21.60

2
generators/comicbook/active-documentviewer_comicbook.desktop
View file

@ -195,7 +195,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
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

2
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -175,7 +175,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
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

50
generators/epub/converter.cpp
View file

@ -247,43 +247,41 @@ QTextDocument* Converter::convert( const QString &fileName )
// handle embedded videos
QDomNodeList videoTags = dom.elementsByTagName("video");
if(!videoTags.isEmpty()) {
for (int i = 0; i < videoTags.size(); ++i) {
QDomNodeList sourceTags = videoTags.at(i).toElement().elementsByTagName("source");
if(!sourceTags.isEmpty()) {
QString lnk = sourceTags.at(0).toElement().attribute("src");
while(!videoTags.isEmpty()) {
QDomNodeList sourceTags = videoTags.at(0).toElement().elementsByTagName("source");
if(!sourceTags.isEmpty()) {
QString lnk = sourceTags.at(0).toElement().attribute("src");
Okular::Movie *movie = new Okular::Movie(mTextDocument->loadResource(EpubDocument::MovieResource,QUrl(lnk)).toString());
movie->setSize(videoSize);
movie->setShowControls(true);
Okular::Movie *movie = new Okular::Movie(mTextDocument->loadResource(EpubDocument::MovieResource,QUrl(lnk)).toString());
movie->setSize(videoSize);
movie->setShowControls(true);
Okular::MovieAnnotation *annot = new Okular::MovieAnnotation;
annot->setMovie(movie);
Okular::MovieAnnotation *annot = new Okular::MovieAnnotation;
annot->setMovie(movie);
movieAnnots.push_back(annot);
QDomDocument tempDoc;
tempDoc.setContent(QString("<pre>&lt;video&gt;&lt;/video&gt;</pre>"));
videoTags.at(i).parentNode().replaceChild(tempDoc.documentElement(),videoTags.at(i));
}
movieAnnots.push_back(annot);
QDomDocument tempDoc;
tempDoc.setContent(QString("<pre>&lt;video&gt;&lt;/video&gt;</pre>"));
videoTags.at(0).parentNode().replaceChild(tempDoc.documentElement(),videoTags.at(0));
}
}
//handle embedded audio
QDomNodeList audioTags = dom.elementsByTagName("audio");
if(!audioTags.isEmpty()) {
for (int i = 0; i < audioTags.size(); ++i) {
QString lnk = audioTags.at(i).toElement().attribute("src");
while(!audioTags.isEmpty()) {
QDomElement element = audioTags.at(0).toElement();
bool repeat = element.hasAttribute("loop");
QString lnk = element.attribute("src");
Okular::Sound *sound = new Okular::Sound(mTextDocument->loadResource(
EpubDocument::AudioResource, QUrl(lnk)).toByteArray());
Okular::Sound *sound = new Okular::Sound(mTextDocument->loadResource(
EpubDocument::AudioResource, QUrl(lnk)).toByteArray());
Okular::SoundAction *soundAction = new Okular::SoundAction(1.0,true,true,false,sound);
soundActions.push_back(soundAction);
Okular::SoundAction *soundAction = new Okular::SoundAction(1.0,true,repeat,false,sound);
soundActions.push_back(soundAction);
QDomDocument tempDoc;
tempDoc.setContent(QString("<pre>&lt;audio&gt;&lt;/audio&gt;</pre>"));
audioTags.at(i).parentNode().replaceChild(tempDoc.documentElement(),audioTags.at(i));
}
QDomDocument tempDoc;
tempDoc.setContent(QString("<pre>&lt;audio&gt;&lt;/audio&gt;</pre>"));
audioTags.at(0).parentNode().replaceChild(tempDoc.documentElement(),audioTags.at(0));
}
htmlContent = dom.toString();
}

2
generators/fictionbook/active-documentviewer_fb.desktop
View file

@ -195,7 +195,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=FictionBook, e-book, fb2,FictionBook,e‑knjig
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

2
generators/fictionbook/okularApplication_fb.desktop
View file

@ -175,7 +175,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=FictionBook, e-book, fb2,FictionBook,e‑knjig
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

2
generators/poppler/active-documentviewer_pdf.desktop
View file

@ -195,7 +195,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=PDF, Portable Document Format,PDF
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

2
generators/poppler/okularApplication_pdf.desktop
View file

@ -174,7 +174,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=PDF, Portable Document Format,PDF
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

8
generators/txt/active-documentviewer_txt.desktop
View file

@ -184,10 +184,10 @@ X-KDE-Keywords[pt_BR]=txt
X-KDE-Keywords[ru]=txt
X-KDE-Keywords[sk]=txt
X-KDE-Keywords[sl]=txt
X-KDE-Keywords[sr]=txt;обични;текст
X-KDE-Keywords[sr@ijekavian]=txt;обични;текст
X-KDE-Keywords[sr@ijekavianlatin]=txt;obični;tekst
X-KDE-Keywords[sr@latin]=txt;obični;tekst
X-KDE-Keywords[sr]=txt,обични,текст
X-KDE-Keywords[sr@ijekavian]=txt,обични,текст
X-KDE-Keywords[sr@ijekavianlatin]=txt,obični,tekst
X-KDE-Keywords[sr@latin]=txt,obični,tekst
X-KDE-Keywords[sv]=txt
X-KDE-Keywords[tr]=txt
X-KDE-Keywords[ug]=txt

8
generators/txt/okularApplication_txt.desktop
View file

@ -164,10 +164,10 @@ X-KDE-Keywords[pt_BR]=txt
X-KDE-Keywords[ru]=txt
X-KDE-Keywords[sk]=txt
X-KDE-Keywords[sl]=txt
X-KDE-Keywords[sr]=txt;обични;текст
X-KDE-Keywords[sr@ijekavian]=txt;обични;текст
X-KDE-Keywords[sr@ijekavianlatin]=txt;obični;tekst
X-KDE-Keywords[sr@latin]=txt;obični;tekst
X-KDE-Keywords[sr]=txt,обични,текст
X-KDE-Keywords[sr@ijekavian]=txt,обични,текст
X-KDE-Keywords[sr@ijekavianlatin]=txt,obični,tekst
X-KDE-Keywords[sr@latin]=txt,obični,tekst
X-KDE-Keywords[sv]=txt
X-KDE-Keywords[tr]=txt
X-KDE-Keywords[ug]=txt