Commit 1133bb65 authored by Max Brazhnikov's avatar Max Brazhnikov Committed by Elvis Angelaccio
Browse files

cli7zplugin: add support for original 7-Zip

Rename p7zip to 7-Zip and make cli7zplugin to work with both p7zip and 7-Zip binaries.

BUG: 440135
parent d55d1487
Pipeline #180161 passed with stage
in 1 minute and 37 seconds
......@@ -7,7 +7,7 @@ set(kerfuffle_cli7z_SRCS cliplugin.cpp)
ecm_qt_declare_logging_category(kerfuffle_cli7z_SRCS
HEADER ark_debug.h
IDENTIFIER ARK
CATEGORY_NAME ark.cli7z DESCRIPTION "Ark p7zip" EXPORT ARK)
CATEGORY_NAME ark.cli7z DESCRIPTION "Ark 7z" EXPORT ARK)
# NOTE: the first double-quotes of the first mime and the last
# double-quotes of the last mime must NOT be escaped.
......@@ -24,9 +24,9 @@ kerfuffle_add_plugin(kerfuffle_cli7z ${kerfuffle_cli7z_SRCS})
set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLI7Z_MIMETYPES}" PARENT_SCOPE)
set(INSTALLED_KERFUFFLE_PLUGINS "${INSTALLED_KERFUFFLE_PLUGINS}kerfuffle_cli7z;" PARENT_SCOPE)
find_program(P7ZIP 7z)
if(P7ZIP)
message(STATUS "Found p7zip executable: ${P7ZIP}")
find_program(7ZIP 7z)
if(7ZIP)
message(STATUS "Found 7-Zip executable: ${7ZIP}")
else()
message(WARNING "Could not find the 7z executable. Ark won't be able to handle the 7z archive format.")
endif()
......@@ -323,7 +323,7 @@ bool CliPlugin::readDeleteLine(const QString &line)
{
if (line.startsWith(QLatin1String("Error: ")) &&
line.endsWith(QLatin1String(" is not supported archive"))) {
Q_EMIT error(i18n("Delete operation failed. Try upgrading p7zip or disabling the p7zip plugin in the configuration dialog."));
Q_EMIT error(i18n("Delete operation failed. Try upgrading 7z or disabling the 7z plugin in the configuration dialog."));
return false;
}
......
......@@ -47,7 +47,7 @@
"MimeTypes": [
"@SUPPORTED_MIMETYPES@"
],
"Name": "P7zip plugin",
"Name": "7z plugin",
"Name[ar]": "ملحق P7zip",
"Name[ast]": "Plugin pa p7zip",
"Name[az]": "p7zip qoşması",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment