Skip to content

fix: decouple specialCpuTarGzCompressor dconfig read from m_isOrderMode gate #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
add-uos wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
Open

fix: decouple specialCpuTarGzCompressor dconfig read from m_isOrderMode gate #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/source/page/compresssettingpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,13 @@ void CompressSettingPage::setSplitEnabled(bool bEnabled)
void CompressSettingPage::refreshCompressLevel(const QString &strType)
{
#ifdef DTKCORE_CLASS_DConfigFile
if (strType == "tar.gz" && m_dconfig) {
DConfig *dconfig = (DConfig *)m_dconfig;
if (dconfig && dconfig->isValid() && dconfig->keyList().contains("specialCpuTarGzCompressor")) {
int nCpu = dconfig->value("specialCpuTarGzCompressor").toInt();
m_pCpuCmb->setCurrentIndex(nCpu);
}
}
if(m_isOrderMode) {
// 其余格式支持设置压缩方式
// 设置压缩方式可用
Expand Down Expand Up @@ -501,15 +508,6 @@ void CompressSettingPage::refreshCompressLevel(const QString &strType)
int nMethod = dconfig->value("specialTarGzCompressor").toInt();
m_pCompressLevelCmb->setCurrentIndex(nMethod);
}
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialCpuTarGzCompressor")){
int nCpu = dconfig->value("specialCpuTarGzCompressor").toInt();
m_pCpuCmb->setCurrentIndex(nCpu);
}
} else if(strType == "tar.gz") {
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialTarGzCompressor")){
int nMethod = dconfig->value("specialTarGzCompressor").toInt();
m_pCompressLevelCmb->setCurrentIndex(nMethod);
}
} else if(strType == "tar.lz") {
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialTarLzCompressor")){
int nMethod = dconfig->value("specialTarLzCompressor").toInt();
Expand Down Expand Up @@ -804,12 +802,10 @@ void CompressSettingPage::slotAdvancedEnabled(bool bEnabled)
if (m_pCompressTypeLbl->text() == "tar.gz") {
m_pCpuCmb->setCurrentIndex(m_pCpuCmb->count() - 1);
#ifdef DTKCORE_CLASS_DConfigFile
if(m_isOrderMode) {
DConfig *dconfig = (DConfig *)m_dconfig;
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialCpuTarGzCompressor")){
int nCpu = dconfig->value("specialCpuTarGzCompressor").toInt();
m_pCpuCmb->setCurrentIndex(nCpu);
}
DConfig *dconfig = (DConfig *)m_dconfig;
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialCpuTarGzCompressor")){
int nCpu = dconfig->value("specialCpuTarGzCompressor").toInt();
m_pCpuCmb->setCurrentIndex(nCpu);
}
#endif
}
Expand Down
Loading