minor bugfixes

- corrected copyright information in new codecs
- fixed thread combobox for the new codecs
- fixed lizard level combobox (level 10..49) are now there ;)
This commit is contained in:
Tino Reichardt
2017-05-27 13:05:35 +02:00
parent 0d0a8f32ea
commit 7fde161c29
7 changed files with 22 additions and 10 deletions

View File

@@ -1,6 +1,6 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7z LZ5 Plugin", "lz5")
MY_VERSION_INFO_DLL("7z Brotli Plugin", "Brotli")
101 ICON "../../Archive/Icons/7z.ico"

View File

@@ -1,6 +1,6 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7z LZ5 Plugin", "lz5")
MY_VERSION_INFO_DLL("7z Lizard Plugin", "Lizard")
101 ICON "../../Archive/Icons/7z.ico"

View File

@@ -1,6 +1,6 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7z LZ4 Plugin", "lz4")
MY_VERSION_INFO_DLL("7z LZ4 Plugin", "Lz4")
101 ICON "../../Archive/Icons/7z.ico"

View File

@@ -1,6 +1,6 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7z LZ5 Plugin", "lz5")
MY_VERSION_INFO_DLL("7z LZ5 Plugin", "Lz5")
101 ICON "../../Archive/Icons/7z.ico"

View File

@@ -1,6 +1,6 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7z ZStandard Plugin", "zstd")
MY_VERSION_INFO_DLL("7z ZStandard Plugin v1.x", "zstd")
101 ICON "../../Archive/Icons/7z.ico"

View File

@@ -1083,6 +1083,7 @@ void CCompressDialog::SetLevel()
UInt32 LevelsMask;
UInt32 LevelsStart = 0;
UInt32 langID = 0;
unsigned i, ir;
SetMethod(GetMethodID());
const CArcInfoEx &ai = (*ArcFormats)[GetFormatIndex()];
@@ -1113,16 +1114,25 @@ void CCompressDialog::SetLevel()
else
LevelsMask = g_Formats[GetStaticFormatIndex()].LevelsMask;
for (unsigned i = LevelsStart; i <= 49; i++)
for (i = LevelsStart; i <= 49; i++)
{
TCHAR s[40];
TCHAR t[50] = { TEXT('L'), TEXT('e'), TEXT('v'), TEXT('e'), TEXT('l'), TEXT(' '), 0 };
// lizard needs extra handling
if (GetMethodID() == kLIZARD) {
ir = i;
if (ir % 10 == 0) langID = 0;
while (ir > 19) { ir -= 10; }
} else {
ir = i;
}
// max reached
if (LevelsMask < (UInt32)(1 << i))
if (LevelsMask < (UInt32)(1 << ir))
break;
if ((LevelsMask & (1 << i)) != 0)
if ((LevelsMask & (1 << ir)) != 0)
{
ConvertUInt32ToString(i, s);
lstrcat(t, s);
@@ -1658,9 +1668,11 @@ void CCompressDialog::SetNumThreads()
int methodID = GetMethodID();
switch (methodID)
{
case kZSTD: numAlgoThreadsMax = 128; break;
case kBROTLI: numAlgoThreadsMax = 128; break;
case kLZ4: numAlgoThreadsMax = 128; break;
case kLZ5: numAlgoThreadsMax = 128; break;
case kZSTD: numAlgoThreadsMax = 128; break;
case kLIZARD: numAlgoThreadsMax = 128; break;
case kLZMA: numAlgoThreadsMax = 2; break;
case kLZMA2: numAlgoThreadsMax = 32; break;
case kBZip2: numAlgoThreadsMax = 32; break;