Skip to content

Commit 32867eb

Browse files
committed
fix: 适配osconfig定制
适配osconfig定制 Task: https://pms.uniontech.com/task-view-377485.html Log: 适配osconfig定制
1 parent cf99746 commit 32867eb

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

src/assets/org.deepin.compressor.method.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
"magic": "dsg.config.meta",
33
"version": "1.0",
44
"contents": {
5+
"specialCustomizedType": {
6+
"value": -1,
7+
"serial": 0,
8+
"flags": ["global"],
9+
"name": "Special Customized Type",
10+
"name[zh_CN]": "定制类型",
11+
"description": "Customized Type",
12+
"permissions": "readwrite",
13+
"visibility": "private"
14+
},
515
"specialCompressorType": {
616
"value": 11,
717
"serial": 0,

src/source/page/compresssettingpage.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -690,19 +690,11 @@ void CompressSettingPage::setDefaultName(const QString &strName)
690690
void CompressSettingPage::initConfig()
691691
{
692692
#ifdef DTKCORE_CLASS_DConfigFile
693-
QProcess process;
694-
process.start("dmidecode");
695-
process.waitForStarted();
696-
process.waitForFinished();
697-
QString result = process.readAll();
698-
QStringList lines = result.split('\n');
699-
for (const QString &line : lines) {
700-
if (line.contains("String 4", Qt::CaseInsensitive)) {
701-
m_isOrderMode = line.contains("PGUX", Qt::CaseInsensitive) || line.contains("FXK11", Qt::CaseInsensitive) || line.contains("FXSK11", Qt::CaseInsensitive);
702-
}
703-
}
704-
process.close();
705693
m_dconfig = DConfig::create("org.deepin.compressor","org.deepin.compressor.method");
694+
DConfig *dconfig = (DConfig *)m_dconfig;
695+
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("specialCustomizedType")){
696+
m_isOrderMode = dconfig->value("specialCustomizedType").toInt() == 1;
697+
}
706698
#endif
707699
}
708700

0 commit comments

Comments
 (0)