diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-05-29 21:41:49 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-05-29 21:44:32 +0900 |
| commit | c91feb08ba19e044205fe56c65a05d1959376873 (patch) | |
| tree | d3ec8deab0a90761bdd3969a0b166aac585682bb | |
| parent | 04a8b70fbaebca4f760535d33563a3e2137d9c5d (diff) | |
| download | tdeutils-c91feb08ba19e044205fe56c65a05d1959376873.tar.gz tdeutils-c91feb08ba19e044205fe56c65a05d1959376873.zip | |
Ark: removed duplicated zip-compressed format and minor code
rearrangement. This relates to bug 2794.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | ark/archiveformatinfo.cpp | 9 | ||||
| -rw-r--r-- | ark/ark.desktop | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index e3e6ac2..93cf928 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -48,27 +48,24 @@ ArchiveFormatInfo * ArchiveFormatInfo::self() void ArchiveFormatInfo::buildFormatInfos() { + addFormatInfo( TAR_FORMAT, "application/x-txz", ".tar.xz" ); addFormatInfo( TAR_FORMAT, "application/x-tgz", ".tar.gz" ); addFormatInfo( TAR_FORMAT, "application/x-tzo", ".tar.lzo" ); addFormatInfo( TAR_FORMAT, "application/x-tarz", ".tar.z" ); addFormatInfo( TAR_FORMAT, "application/x-tbz", ".tar.bz2" ); addFormatInfo( TAR_FORMAT, "application/x-tlz", ".tar.lzma" ); - addFormatInfo( TAR_FORMAT, "application/x-txz", ".tar.xz" ); - - // x-tar as the last one to get its comment for all the others, too addFormatInfo( TAR_FORMAT, "application/x-tar", ".tar" ); addFormatInfo( LHA_FORMAT, "application/x-lha", ".lha" ); - addFormatInfo( ZIP_FORMAT, "application/x-jar", ".jar" ); addFormatInfo( ZIP_FORMAT, "application/x-zip", ".zip" ); - addFormatInfo( ZIP_FORMAT, "application/x-zip-compressed", ".zip" ); + addFormatInfo( ZIP_FORMAT, "application/x-jar", ".jar" ); + addFormatInfo( COMPRESSED_FORMAT, "application/x-xz", ".xz" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-gzip", ".gz" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-bzip", ".bz" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-bzip2", ".bz2" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-lzma", ".lzma" ); - addFormatInfo( COMPRESSED_FORMAT, "application/x-xz", ".xz" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-lzop", ".lzo" ); addFormatInfo( COMPRESSED_FORMAT, "application/x-compress", ".Z" ); find( COMPRESSED_FORMAT ).description = i18n( "Compressed File" ); diff --git a/ark/ark.desktop b/ark/ark.desktop index ab4f83b..9936595 100644 --- a/ark/ark.desktop +++ b/ark/ark.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz +MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz GenericName=Archiving Tool GenericName[af]=Argiveer Program GenericName[ar]=أداة أرشفة |