diff --git a/module/mifare.cpp b/module/mifare.cpp index ffa2663..b132be5 100644 --- a/module/mifare.cpp +++ b/module/mifare.cpp @@ -845,7 +845,7 @@ bool Mifare::data_saveDataFile(const QString &filename, bool isBin) { for(int j = 0; j < 16; j++) { - unsigned char Byt[2]; + unsigned char Byt[2] = {0x0, 0x0}; for(int k = 0; k < 2; k++) { tmp = dataList->at(i).at(j * 2 + k).toUpper(); @@ -889,7 +889,7 @@ bool Mifare::data_saveKeyFile(const QString &filename, bool isBin) { for(int j = 0; j < 6; j++) { - unsigned char Byt[2]; + unsigned char Byt[2] = {0x0, 0x0}; for(int k = 0; k < 2; k++) { tmp = keyAList->at(i).at(j * 2 + k).toUpper(); @@ -902,7 +902,7 @@ bool Mifare::data_saveKeyFile(const QString &filename, bool isBin) } for(int j = 0; j < 6; j++) { - unsigned char Byt[2]; + unsigned char Byt[2] = {0x0, 0x0}; for(int k = 0; k < 2; k++) { tmp = keyBList->at(i).at(j * 2 + k).toUpper(); diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index 5fcd3fc..c1c1769 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -567,6 +567,7 @@ void MainWindow::MF_widgetReset() { setTableItem(ui->MF_dataWidget, i, 0, ""); setTableItem(ui->MF_dataWidget, i, 1, QString::number(i)); + ui->MF_dataWidget->item(i, 1)->setCheckState(Qt::Checked); setTableItem(ui->MF_dataWidget, i, 2, ""); ui->MF_RW_blockBox->addItem(QString::number(i)); } @@ -604,7 +605,7 @@ void MainWindow::uiInit() ui->MF_dataWidget->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Data"))); ui->MF_dataWidget->verticalHeader()->setVisible(false); ui->MF_dataWidget->setColumnWidth(0, 35); - ui->MF_dataWidget->setColumnWidth(1, 35); + ui->MF_dataWidget->setColumnWidth(1, 55); ui->MF_dataWidget->setColumnWidth(2, 430); ui->MF_keyWidget->setColumnCount(3); diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index f3b3ef7..fe05683 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -180,25 +180,14 @@ - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - + + + All + + + + >> @@ -206,24 +195,6 @@ - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - << @@ -231,33 +202,8 @@ - - - 20 - 20 - - - - - 20 - 20 - - - - - 20 - 20 - - - - - Courier - 75 - true - - - F + Fonts @@ -674,14 +620,14 @@ - Read All + Read Selected - Write All + Write Selected @@ -766,14 +712,14 @@ - Read All + Read Selected - Write All + Write Selected