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,7 +165,7 @@ InitialPreference=7 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true -X-KDE-Keywords=cbr, cbz, cbt, Comic Book +X-KDE-Keywords=cbr, cbz, cbt, cb7, 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 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,7 +156,7 @@ Categories=Qt;KDE;Graphics;Office;Viewer; InitialPreference=2 NoDisplay=true -X-KDE-Keywords=cbr, cbz, cbt, Comic Book +X-KDE-Keywords=cbr, cbz, cbt, cb7, 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 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