UEFIExtract 0.2

- folder names made more human-readable
- no more double names in info.txt
This commit is contained in:
Nikolaj Schlej 2014-05-03 14:05:05 +02:00
parent e1c641ca08
commit 9bdd91bf19
2 changed files with 5 additions and 5 deletions

View File

@ -41,7 +41,7 @@ int main(int argc, char *argv[])
} }
else { else {
result = ERR_INVALID_PARAMETER; result = ERR_INVALID_PARAMETER;
std::cout << "UEFIExtract 0.1.0" << std::endl << std::endl << std::cout << "UEFIExtract 0.2" << std::endl << std::endl <<
"Usage: uefiextract imagefile\n" << std::endl; "Usage: uefiextract imagefile\n" << std::endl;
} }

View File

@ -3175,10 +3175,10 @@ UINT8 FfsEngine::dump(const QModelIndex & index, const QString path)
file.close(); file.close();
} }
QString info = tr("Name: %1\nType: %2\nSubtype: %3\n%4") QString info = tr("Type: %1\nSubtype: %2\n%3%4")
.arg(model->nameString(index))
.arg(model->typeString(index)) .arg(model->typeString(index))
.arg(model->subtypeString(index)) .arg(model->subtypeString(index))
.arg(model->textString(index).isEmpty() ? "" : tr("Text: %1\n").arg(model->textString(index)))
.arg(model->info(index)); .arg(model->info(index));
file.setFileName(tr("%1/info.txt").arg(path)); file.setFileName(tr("%1/info.txt").arg(path));
if (!file.open(QFile::Text | QFile::WriteOnly)) if (!file.open(QFile::Text | QFile::WriteOnly))
@ -3189,8 +3189,8 @@ UINT8 FfsEngine::dump(const QModelIndex & index, const QString path)
UINT8 result; UINT8 result;
for (int i = 0; i < model->rowCount(index); i++) { for (int i = 0; i < model->rowCount(index); i++) {
QModelIndex childIndex = index.child(i, 0); QModelIndex childIndex = index.child(i, 0);
QString childPath = tr("%1/%2 %3").arg(path).arg(i).arg(model->nameString(childIndex)); QString childPath = tr("%1/%2 %3").arg(path).arg(i).arg(model->textString(childIndex).isEmpty() ? model->nameString(childIndex) : model->textString(childIndex));
result = dump(index.child(i, index.column()), childPath); result = dump(childIndex, childPath);
if (result) if (result)
return result; return result;
} }