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

Redesign UI

Browse Source
pull/2/head
wh201906 5 years ago
parent b2fa97ff18
commit b6be875261
2 changed files with 239 additions and 547 deletions
Show Stats Download Patch File Download Diff File

5
ui/mainwindow.cpp
Unescape Escape View File

@ -272,7 +272,6 @@ void MainWindow::uiInit()
for(int i = 0; i < 64; i++) for(int i = 0; i < 64; i++)
{ {
ui->MF_RW_blockBox->addItem(QString::number(i)); ui->MF_RW_blockBox->addItem(QString::number(i));
ui->MF_UID_blockBox->addItem(QString::number(i));
} }
on_Raw_CMDHistoryBox_stateChanged(Qt::Unchecked); on_Raw_CMDHistoryBox_stateChanged(Qt::Unchecked);
@ -296,9 +295,9 @@ void MainWindow::setStatusBar(QLabel* target, const QString & text)
if(target == PM3VersionBar) if(target == PM3VersionBar)
target->setText("HW Version:" + text); target->setText("HW Version:" + text);
else if(target == connectStatusBar) else if(target == connectStatusBar)
target->setText("Connecton State:" + text); target->setText("PM3:" + text);
else if(target == programStatusBar) else if(target == programStatusBar)
target->setText("Program State:" + text); target->setText("State:" + text);
} }
// *********************************************** // ***********************************************

519
ui/mainwindow.ui
Unescape Escape View File

@ -94,7 +94,7 @@
<attribute name="title"> <attribute name="title">
<string>Mifare</string> <string>Mifare</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
@ -147,6 +147,12 @@
<string>Attack</string> <string>Attack</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="topMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -162,12 +168,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Attack_infoButton"> <widget class="QPushButton" name="MF_Attack_infoButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Card Info</string> <string>Card Info</string>
</property> </property>
@ -181,18 +181,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Check Default</string> <string>Check Default</string>
</property> </property>
@ -200,18 +188,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Attack_nestedButton"> <widget class="QPushButton" name="MF_Attack_nestedButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Nested</string> <string>Nested</string>
</property> </property>
@ -219,18 +195,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Attack_hardnestedButton"> <widget class="QPushButton" name="MF_Attack_hardnestedButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Hardnested</string> <string>Hardnested</string>
</property> </property>
@ -238,18 +202,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Attack_sniffButton"> <widget class="QPushButton" name="MF_Attack_sniffButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Sniff</string> <string>Sniff</string>
</property> </property>
@ -257,18 +209,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Attack_listButton"> <widget class="QPushButton" name="MF_Attack_listButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>List Sniff Data</string> <string>List Sniff Data</string>
</property> </property>
@ -295,127 +235,11 @@
<property name="title"> <property name="title">
<string>Read/Write</string> <string>Read/Write</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="MF_RW_readAllButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Read All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="MF_RW_writeAllButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Write All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="MF_RW_dumpButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Dump</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="MF_RW_restoreButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Restore</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
@ -489,22 +313,10 @@
</item> </item>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QPushButton" name="MF_RW_readBlockButton">
<property name="text">
<string>Read Block</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="MF_RW_writeBlockButton">
<property name="text">
<string>Write Block</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_10"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -516,235 +328,165 @@
</property> </property>
</spacer> </spacer>
</item> </item>
</layout>
</item>
<item>
<widget class="QLineEdit" name="MF_RW_dataEdit"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="MF_UIDGroupBox"> <widget class="QGroupBox" name="MF_NormalGroupBox">
<property name="title"> <property name="title">
<string>Chinese Magic Card(UID Card)</string> <string>Normal(Require Password)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <layout class="QGridLayout" name="gridLayout_2">
<size> <property name="topMargin">
<width>40</width> <number>5</number>
<height>20</height>
</size>
</property> </property>
</spacer> <property name="bottomMargin">
</item> <number>5</number>
<item>
<widget class="QPushButton" name="MF_UID_readAllButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property> </property>
<property name="maximumSize"> <property name="spacing">
<size> <number>5</number>
<width>16777215</width>
<height>40</height>
</size>
</property> </property>
<item row="2" column="0">
<widget class="QPushButton" name="MF_RW_readBlockButton">
<property name="text"> <property name="text">
<string>Read All</string> <string>Read Block</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="1">
<widget class="QPushButton" name="MF_UID_writeAllButton"> <widget class="QPushButton" name="MF_RW_writeBlockButton">
<property name="minimumSize"> <property name="text">
<size> <string>Write Block</string>
<width>0</width>
<height>30</height>
</size>
</property> </property>
<property name="maximumSize"> </widget>
<size> </item>
<width>16777215</width> <item row="0" column="0">
<height>40</height> <widget class="QPushButton" name="MF_RW_readAllButton">
</size> <property name="text">
<string>Read All</string>
</property> </property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="MF_RW_writeAllButton">
<property name="text"> <property name="text">
<string>Write All</string> <string>Write All</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QPushButton" name="MF_UID_wipeButton"> <widget class="QPushButton" name="MF_RW_dumpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Wipe</string> <string>Dump</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QPushButton" name="MF_UID_writeUIDButton"> <widget class="QPushButton" name="MF_RW_restoreButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Write UID</string> <string>Restore</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QGroupBox" name="MF_UIDGroupBox">
<property name="minimumSize"> <property name="title">
<size> <string>Chinese Magic Card(Without Password)</string>
<width>0</width>
<height>30</height>
</size>
</property> </property>
<property name="maximumSize"> <layout class="QGridLayout" name="gridLayout">
<size> <property name="topMargin">
<width>16777215</width> <number>5</number>
<height>40</height> </property>
</size> <property name="bottomMargin">
<number>5</number>
</property> </property>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton">
<property name="text"> <property name="text">
<string>Lock UFUID Card</string> <string>Lock UFUID Card</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="2">
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="pushButton_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>About UID Card</string> <string>About UID Card</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<spacer name="horizontalSpacer_12"> <widget class="QPushButton" name="MF_UID_readBlockButton">
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>Read Block</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item>
</layout>
</item> </item>
<item> <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_13"> <widget class="QPushButton" name="MF_UID_writeBlockButton">
<item>
<widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Block:</string> <string>Write Block</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0">
<widget class="QComboBox" name="MF_UID_blockBox"> <widget class="QPushButton" name="MF_UID_readAllButton">
<property name="minimumSize"> <property name="text">
<size> <string>Read All</string>
<width>40</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>16777215</height>
</size>
</property>
<property name="editable">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QPushButton" name="MF_UID_readBlockButton"> <widget class="QPushButton" name="MF_UID_writeAllButton">
<property name="text"> <property name="text">
<string>Read Block</string> <string>Write All</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QPushButton" name="MF_UID_writeBlockButton"> <widget class="QPushButton" name="MF_UID_writeUIDButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Write Block</string> <string>Write UID</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<spacer name="horizontalSpacer_13"> <widget class="QPushButton" name="MF_UID_wipeButton">
<property name="orientation"> <property name="sizePolicy">
<enum>Qt::Horizontal</enum> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Wipe</string>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="MF_UID_dataEdit"/> <widget class="QLineEdit" name="MF_RW_dataEdit"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -755,6 +497,15 @@
<string>Simulate</string> <string>Simulate</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_11"> <layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item> <item>
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
@ -776,18 +527,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Load from .eml</string> <string>Load from .eml</string>
</property> </property>
@ -795,18 +534,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Sim_loadDataButton"> <widget class="QPushButton" name="MF_Sim_loadDataButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Load from data above</string> <string>Load from data above</string>
</property> </property>
@ -814,18 +541,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Sim_clearButton"> <widget class="QPushButton" name="MF_Sim_clearButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Clear</string> <string>Clear</string>
</property> </property>
@ -833,18 +548,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="MF_Sim_simButton"> <widget class="QPushButton" name="MF_Sim_simButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Simulate</string> <string>Simulate</string>
</property> </property>
@ -969,16 +672,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>787</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"> <widget class="QStatusBar" name="statusbar">
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>

Write Preview
Loading…
Cancel
Save