diff --git a/generators/comicbook/document.cpp b/generators/comicbook/document.cpp --- a/generators/comicbook/document.cpp +++ b/generators/comicbook/document.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -75,6 +76,15 @@ mime.inherits( QStringLiteral("application/x-tar") ) || mime.inherits( QStringLiteral("application/x-bzip") ) ) { mArchive = new KTar( fileName ); + if ( !processArchive() ) { + return false; + } + /** + * We have a 7z archive + */ + } else if ( mime.inherits( QStringLiteral("application/x-cb7") ) || mime.inherits( QStringLiteral("application/x-7z-compressed") ) ) { + mArchive = new K7Zip( fileName ); + if ( !processArchive() ) { return false; } diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -116,6 +116,7 @@ "application/x-cbz", "application/x-cbr", "application/x-cbt", + "application/x-cb7", "inode/directory" ], "Name": "ComicBook Backend", diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-cbz;application/x-cbr;application/x-cbt; +MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; Terminal=false Name=Okular Name[ar]=اوكلار @@ -165,54 +165,54 @@ InitialPreference=7 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true -X-KDE-Keywords=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[bg]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[bs]=cbr, cbz, cbt, Comic Book,stripovi -X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[da]=cbr,cbz,cbt,Comic Book -X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book -X-KDE-Keywords[el]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic -X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks -X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua -X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény -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,만화책 -X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[lv]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[mr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie -X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook -X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal -X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[pa]=cbr, cbz, cbt, ਕਾਮਿਕ ਬੁੱਕ -X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks -X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ro]=cbr, cbz, cbt, benzi desenate, comic -X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс -X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov -X-KDE-Keywords[sl]=cbr, cbz, cbt, strip -X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук -X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук -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[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx -X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 -X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ar]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[bg]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[bs]=cbr, cbz, cbt, cb7, Comic Book,stripovi +X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[da]=cbr,cbz,cbt,cb7,Comic Book +X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book +X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic +X-KDE-Keywords[et]=cbr, cbz, cbt, cb7, Comic Book, koomiks +X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua +X-KDE-Keywords[fi]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ga]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[hu]=cbr, cbz, cbt, cb7, Képregény +X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[is]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ja]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[kk]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[km]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book,만화책 +X-KDE-Keywords[lt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[lv]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[mr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[nb]=cbr, cbz, cbt, cb7, tegneserie +X-KDE-Keywords[nds]=cbr, cbz, cbt, cb7, Comicbook +X-KDE-Keywords[nl]=cbr, cbz, cbt, cb7, Stripverhaal +X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pa]=cbr, cbz, cbt, cb7, ਕਾਮਿਕ ਬੁੱਕ +X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks +X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ro]=cbr, cbz, cbt, cb7, benzi desenate, comic +X-KDE-Keywords[ru]=cbr, cbz, cbt, cb7, Comic Book, комикс +X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Comic Book, Kniha komiksov +X-KDE-Keywords[sl]=cbr, cbz, cbt, cb7, strip +X-KDE-Keywords[sr]=cbr, cbz, cbt, cb7, Comic Book,комикбук +X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, cb7, Comic Book,комикбук +X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, cb7, Comic Book,ComicBook +X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, cb7, Comic Book,ComicBook +X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[tr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,Comic Book,комікс +X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx +X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book,漫画书,漫画,连环画 +X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book diff --git a/generators/comicbook/okularComicbook.desktop b/generators/comicbook/okularComicbook.desktop --- a/generators/comicbook/okularComicbook.desktop +++ b/generators/comicbook/okularComicbook.desktop @@ -62,4 +62,4 @@ X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=okularpart Type=Service -MimeType=application/x-cbz;application/x-cbr;application/x-cbt; +MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-cbz;application/x-cbr;application/x-cbt; +MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; Name=Reader Name[ar]=التصيير Name[bg]=Четец @@ -156,54 +156,54 @@ Categories=Qt;KDE;Graphics;Office;Viewer; InitialPreference=2 NoDisplay=true -X-KDE-Keywords=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[bg]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[bs]=cbr, cbz, cbt, Comic Book,stripovi -X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[da]=cbr,cbz,cbt,Comic Book -X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book -X-KDE-Keywords[el]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic -X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks -X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua -X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény -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,만화책 -X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[lv]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[mr]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie -X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook -X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal -X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[pa]=cbr, cbz, cbt, ਕਾਮਿਕ ਬੁੱਕ -X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks -X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[ro]=cbr, cbz, cbt, benzi desenate, comic -X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс -X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov -X-KDE-Keywords[sl]=cbr, cbz, cbt, strip -X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук -X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук -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[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx -X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 -X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ar]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[bg]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[bs]=cbr, cbz, cbt, cb7, Comic Book,stripovi +X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[da]=cbr,cbz,cbt,cb7,Comic Book +X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book +X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic +X-KDE-Keywords[et]=cbr, cbz, cbt, cb7, Comic Book, koomiks +X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua +X-KDE-Keywords[fi]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ga]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[hu]=cbr, cbz, cbt, cb7, Képregény +X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[is]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ja]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[kk]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[km]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book,만화책 +X-KDE-Keywords[lt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[lv]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[mr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[nb]=cbr, cbz, cbt, cb7, tegneserie +X-KDE-Keywords[nds]=cbr, cbz, cbt, cb7, Comicbook +X-KDE-Keywords[nl]=cbr, cbz, cbt, cb7, Stripverhaal +X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pa]=cbr, cbz, cbt, cb7, ਕਾਮਿਕ ਬੁੱਕ +X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks +X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[ro]=cbr, cbz, cbt, cb7, benzi desenate, comic +X-KDE-Keywords[ru]=cbr, cbz, cbt, cb7, Comic Book, комикс +X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Comic Book, Kniha komiksov +X-KDE-Keywords[sl]=cbr, cbz, cbt, cb7, strip +X-KDE-Keywords[sr]=cbr, cbz, cbt, cb7, Comic Book,комикбук +X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, cb7, Comic Book,комикбук +X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, cb7, Comic Book,ComicBook +X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, cb7, Comic Book,ComicBook +X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[tr]=cbr, cbz, cbt, cb7, Comic Book +X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,Comic Book,комікс +X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx +X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book,漫画书,漫画,连环画 +X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -78,6 +78,7 @@ application/x-cbr application/x-cbz application/x-cbt + application/x-cb7 https://okular.kde.org