TheLanc3/QDiskInfo
1
0
Fork 0
mirror of https://github.com/edisionnano/QDiskInfo.git synced 2026-03-07 20:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix 4 issues

Browse Source 
Fixes #48
Fixes CustomButton doesn't get highlighted when clicking a radio button
Fixes issue where disksGroup actions were not being cleared
Fixes some warnings
This commit is contained in:
Spiros
2025-05-08 14:02:47 +03:00
parent 8b043fd0af
commit 3416cc7ac1
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jsonparser.cpp
View File

@@ -29,6 +29,8 @@ QVector<QPair<QString, int>> JsonParser::parse(const QString &json)
if (found) {
if (trimmedLine.contains("}")) {
break;
} else if (trimmedLine.contains("nsid")) { // smartctl now adds an nsid field, skip it for now
continue;
}
qsizetype colonPos = trimmedLine.indexOf(":");
if (colonPos != -1) {

20
src/mainwindow.cpp
View File

@@ -176,6 +176,13 @@ void MainWindow::updateUI()
bool firstTime = true;
globalIsNvme = false;
QList<QAction*> oldActions = disksGroup->actions();
for (QAction *action : std::as_const(oldActions)) {
disksGroup->removeAction(action);
menuDisk->removeAction(action);
delete action;
}
for (int i = 0; i < devices.size(); ++i) {
QJsonObject device = devices[i].toObject();
QString deviceName = device["name"].toString();
@@ -244,7 +251,12 @@ void MainWindow::updateUI()
}
} else if (isScsi) {
QJsonObject scsiErrorCounterLog = localObj.value("scsi_error_counter_log").toObject();
for (const QString key : {"read", "write", "verify"}) {
static const QString keys[] = {
QStringLiteral("read"),
QStringLiteral("write"),
QStringLiteral("verify")
};
for (const QString& key : keys) {
if (scsiErrorCounterLog.value(key).toObject().value("total_uncorrected_errors").toInt() != 0) {
caution = true;
}
@@ -329,6 +341,7 @@ void MainWindow::updateUI()
connect(diskAction, &QAction::triggered, this, [=]() {
updateWindow();
button->setChecked(true);
});
if (firstTime) {
@@ -960,6 +973,9 @@ void MainWindow::addNvmeLogTable(const QVector<QPair<QString, int>>& nvmeLogOrde
QString key = pair.first;
QString name = key.replace("_", " ");
if (name == "nsid") { // smartctl now adds an nsid field, skip it for now
continue;
}
name = Utils.toTitleCase(name);
int rawInt = pair.second;
@@ -1372,7 +1388,7 @@ void MainWindow::on_actionASCII_View_triggered()
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Save | QDialogButtonBox::Close, asciiViewDialog);
connect(buttonBox, &QDialogButtonBox::rejected, asciiViewDialog, &QDialog::close);
connect(buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [binaryData, this, deviceNodePath]() {
connect(buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, this, [binaryData, this, deviceNodePath]() {
QString filePath = QFileDialog::getSaveFileName(this, tr("Save Binary Data"), deviceNodePath.section('/', -1) + ".bin", tr("Binary Files (*.bin);;All Files (*)"));
if (!filePath.isEmpty()) {
QFile file(filePath);