diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
index 12d1f3f..6de706e 100644
--- a/ui/mainwindow.cpp
+++ b/ui/mainwindow.cpp
@@ -272,7 +272,6 @@ void MainWindow::uiInit()
for(int i = 0; i < 64; i++)
{
ui->MF_RW_blockBox->addItem(QString::number(i));
- ui->MF_UID_blockBox->addItem(QString::number(i));
}
on_Raw_CMDHistoryBox_stateChanged(Qt::Unchecked);
@@ -296,9 +295,9 @@ void MainWindow::setStatusBar(QLabel* target, const QString & text)
if(target == PM3VersionBar)
target->setText("HW Version:" + text);
else if(target == connectStatusBar)
- target->setText("Connecton State:" + text);
+ target->setText("PM3:" + text);
else if(target == programStatusBar)
- target->setText("Program State:" + text);
+ target->setText("State:" + text);
}
// ***********************************************
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 18ca70c..145df05 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -94,7 +94,7 @@
Mifare
-
+
-
-
@@ -147,6 +147,12 @@
Attack
+
+ 5
+
+
+ 5
+
-
@@ -162,12 +168,6 @@
-
-
-
- 0
- 30
-
-
Card Info
@@ -181,18 +181,6 @@
0
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Check Default
@@ -200,18 +188,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Nested
@@ -219,18 +195,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Hardnested
@@ -238,18 +202,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Sniff
@@ -257,18 +209,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
List Sniff Data
@@ -295,384 +235,88 @@
Read/Write
-
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Read All
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Write All
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Dump
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Restore
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
+
-
-
-
-
- Block:
-
-
-
- -
-
-
-
- 40
- 0
-
-
-
-
- 40
- 16777215
-
-
-
- true
-
-
-
- -
-
-
- Key:
-
-
-
- -
-
-
- FFFFFFFFFFFF
-
-
-
- -
-
-
- Key Type:
-
-
-
- -
-
-
-
- 35
- 0
-
-
-
-
- 35
- 16777215
-
-
+
-
-
- A
-
+
+
+ Block:
+
+
-
-
- B
-
+
+
+
+ 40
+ 0
+
+
+
+
+ 40
+ 16777215
+
+
+
+ true
+
+
-
-
- -
-
-
- Read Block
-
-
-
- -
-
-
- Write Block
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
- Chinese Magic Card(UID Card)
-
-
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Read All
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Write All
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Wipe
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Write UID
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- Lock UFUID Card
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
-
- About UID Card
-
-
+
-
+
+
+ Key:
+
+
+
+ -
+
+
+ FFFFFFFFFFFF
+
+
+
+ -
+
+
+ Key Type:
+
+
+
+ -
+
+
+
+ 35
+ 0
+
+
+
+
+ 35
+ 16777215
+
+
+
-
+
+ A
+
+
+ -
+
+ B
+
+
+
+
+
-
-
+
Qt::Horizontal
@@ -684,67 +328,165 @@
-
-
- -
-
-
-
-
-
- Block:
-
-
-
- -
-
-
-
- 40
- 0
-
-
-
-
- 40
- 16777215
-
-
-
- true
-
-
-
-
-
-
- Read Block
+
+
+ Normal(Require Password)
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
-
+
+
+ Read Block
+
+
+
+ -
+
+
+ Write Block
+
+
+
+ -
+
+
+ Read All
+
+
+
+ -
+
+
+ Write All
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Dump
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Restore
+
+
+
+
-
-
-
- Write Block
+
+
+ Chinese Magic Card(Without Password)
+
+
+ 5
+
+
+ 5
+
+
-
+
+
+ Lock UFUID Card
+
+
+
+ -
+
+
+ About UID Card
+
+
+
+ -
+
+
+ Read Block
+
+
+
+ -
+
+
+ Write Block
+
+
+
+ -
+
+
+ Read All
+
+
+
+ -
+
+
+ Write All
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Write UID
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Wipe
+
+
+
+
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
+
@@ -755,6 +497,15 @@
Simulate
+
+ 5
+
+
+ 9
+
+
+ 5
+
-
@@ -776,18 +527,6 @@
0
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Load from .eml
@@ -795,18 +534,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Load from data above
@@ -814,18 +541,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Clear
@@ -833,18 +548,6 @@
-
-
-
- 0
- 30
-
-
-
-
- 16777215
- 40
-
-
Simulate
@@ -969,16 +672,6 @@
-
true