b612
/
Proxmark3GUI
mirror of https://github.com/wh201906/Proxmark3GUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unfinished

Browse Source
pull/4/head
wh201906 4 years ago
parent 7ea9c363fd
commit b2baaede5d
3 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File

6
module/mifare.cpp
Unescape Escape View File

@ -845,7 +845,7 @@ bool Mifare::data_saveDataFile(const QString &filename, bool isBin)
{ {
for(int j = 0; j < 16; j++) for(int j = 0; j < 16; j++)
{ {
unsigned char Byt[2]; unsigned char Byt[2] = {0x0, 0x0};
for(int k = 0; k < 2; k++) for(int k = 0; k < 2; k++)
{ {
tmp = dataList->at(i).at(j * 2 + k).toUpper(); 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++) for(int j = 0; j < 6; j++)
{ {
unsigned char Byt[2]; unsigned char Byt[2] = {0x0, 0x0};
for(int k = 0; k < 2; k++) for(int k = 0; k < 2; k++)
{ {
tmp = keyAList->at(i).at(j * 2 + k).toUpper(); 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++) for(int j = 0; j < 6; j++)
{ {
unsigned char Byt[2]; unsigned char Byt[2] = {0x0, 0x0};
for(int k = 0; k < 2; k++) for(int k = 0; k < 2; k++)
{ {
tmp = keyBList->at(i).at(j * 2 + k).toUpper(); tmp = keyBList->at(i).at(j * 2 + k).toUpper();

3
ui/mainwindow.cpp
Unescape Escape View File

@ -567,6 +567,7 @@ void MainWindow::MF_widgetReset()
{ {
setTableItem(ui->MF_dataWidget, i, 0, ""); setTableItem(ui->MF_dataWidget, i, 0, "");
setTableItem(ui->MF_dataWidget, i, 1, QString::number(i)); setTableItem(ui->MF_dataWidget, i, 1, QString::number(i));
ui->MF_dataWidget->item(i, 1)->setCheckState(Qt::Checked);
setTableItem(ui->MF_dataWidget, i, 2, ""); setTableItem(ui->MF_dataWidget, i, 2, "");
ui->MF_RW_blockBox->addItem(QString::number(i)); 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->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Data")));
ui->MF_dataWidget->verticalHeader()->setVisible(false); ui->MF_dataWidget->verticalHeader()->setVisible(false);
ui->MF_dataWidget->setColumnWidth(0, 35); 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_dataWidget->setColumnWidth(2, 430);
ui->MF_keyWidget->setColumnCount(3); ui->MF_keyWidget->setColumnCount(3);

78
ui/mainwindow.ui
Unescape Escape View File

@ -180,25 +180,14 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_data2KeyBotton"> <widget class="QCheckBox" name="MF_checkAllBox">
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <string>All</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property> </property>
</widget>
</item>
<item>
<widget class="QPushButton" name="MF_data2KeyBotton">
<property name="text"> <property name="text">
<string>&gt;&gt;</string> <string>&gt;&gt;</string>
</property> </property>
@ -206,24 +195,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_key2DataBotton"> <widget class="QPushButton" name="MF_key2DataBotton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="text"> <property name="text">
<string>&lt;&lt;</string> <string>&lt;&lt;</string>
</property> </property>
@ -231,33 +202,8 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_fontButton"> <widget class="QPushButton" name="MF_fontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>20</horstretch>
<verstretch>20</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<family>Courier</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>F</string> <string>Fonts</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -674,14 +620,14 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="MF_RW_readAllButton"> <widget class="QPushButton" name="MF_RW_readAllButton">
<property name="text"> <property name="text">
<string>Read All</string> <string>Read Selected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="MF_RW_writeAllButton"> <widget class="QPushButton" name="MF_RW_writeAllButton">
<property name="text"> <property name="text">
<string>Write All</string> <string>Write Selected</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -766,14 +712,14 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="MF_UID_readAllButton"> <widget class="QPushButton" name="MF_UID_readAllButton">
<property name="text"> <property name="text">
<string>Read All</string> <string>Read Selected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="MF_UID_writeAllButton"> <widget class="QPushButton" name="MF_UID_writeAllButton">
<property name="text"> <property name="text">
<string>Write All</string> <string>Write Selected</string>
</property> </property>
</widget> </widget>
</item> </item>

Write Preview
Loading…
Cancel
Save