diff --git a/Proxmark3GUI.pro b/Proxmark3GUI.pro index 7cca555..fd00f45 100644 --- a/Proxmark3GUI.pro +++ b/Proxmark3GUI.pro @@ -56,7 +56,7 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -VERSION = 0.1.4 +VERSION = 0.2.0 QMAKE_TARGET_PRODUCT = "Proxmark3GUI" QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI" QMAKE_TARGET_COMPANY = "wh201906" diff --git a/README.md b/README.md index 02c691d..4c562f9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client -[中文](README/doc/README_zh_CN.md) +[中文介绍](README/doc/README_zh_CN.md) *** @@ -19,6 +19,7 @@ A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) clie + Support binary(.bin .dump) files and text(.eml) files + Analyze Access Bits + Support Chinese Magic Card ++ Have basic support for LF commands + Customize UI + ... @@ -40,7 +41,7 @@ This GUI is compatible with Iceman/RRG repo(tested on v4.9237) ## About Compiled Windows clients -A cool guy [Gator96100](https://github.com/Gator96100) creates [ProxSpace](https://github.com/Gator96100/ProxSpace) and makes it possible to compile both the firmware and client on Windows. +A cool guy [Gator96100](https://github.com/Gator96100) creates [ProxSpace](https://github.com/Gator96100/ProxSpace) and makes it possible to compile both the firmware and the client on Windows. Also, he makes the [pre-compiled Windows client](https://www.proxmarkbuilds.org/) so you can download it and run your PM3 client on Windows instantly. I included his compiled client in my releases so you can use the GUI on the fly, and you can also use the GUI with your prefered client. Great thanks to him. @@ -64,6 +65,11 @@ Great thanks to him. ## Update Log: +### V0.2 ++ Use Dock widget for more flexible layout ++ Support basic LF commands ++ Fix a bug in RawCommand tab + ### V0.1.4 + Optimize performance + Optimize UI diff --git a/README/doc/README_zh_CN.md b/README/doc/README_zh_CN.md index 9ae017d..6c2d0b4 100644 --- a/README/doc/README_zh_CN.md +++ b/README/doc/README_zh_CN.md @@ -19,7 +19,8 @@ + 可以打开二进制/文本格式的扇区数据文件 + 分析访问控制位(Access Bits) + 支持UID卡操作(UID快速读写,UFUID锁卡) -+ 自定义UI界面 ++ 支持部分低频命令 ++ 自定义UI界面,各选项卡可拆分组合 + ... *** @@ -63,6 +64,11 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客 ## 更新日志: +### V0.2 ++ 使用浮动窗口,界面配置更加灵活 ++ 支持部分低频命令 ++ 修复原始命令选项卡中的一个Bug + ### V0.1.4 + 优化性能 + 优化用户界面 diff --git a/README/doc/previews.md b/README/doc/previews.md index b9ae1cb..7e6cfae 100644 --- a/README/doc/previews.md +++ b/README/doc/previews.md @@ -13,4 +13,8 @@ Mifare Edit File: ![mf_editfile](../img/mf_editfile.gif) Mifare Trailer Decoder: -![mf_trailer](../img/mf_trailer.gif) \ No newline at end of file +![mf_trailer](../img/mf_trailer.gif) + +Dock Widget: +![dock1](../img/dock1.png) +![dock2](../img/dock2.png) \ No newline at end of file diff --git a/README/img/dock1.png b/README/img/dock1.png new file mode 100644 index 0000000..57a24c4 Binary files /dev/null and b/README/img/dock1.png differ diff --git a/README/img/dock2.png b/README/img/dock2.png new file mode 100644 index 0000000..a838e46 Binary files /dev/null and b/README/img/dock2.png differ diff --git a/README/img/preview.png b/README/img/preview.png index ad618be..327476d 100644 Binary files a/README/img/preview.png and b/README/img/preview.png differ diff --git a/README/img/preview_zh_CN.png b/README/img/preview_zh_CN.png index cb23753..92e1579 100644 Binary files a/README/img/preview_zh_CN.png and b/README/img/preview_zh_CN.png differ diff --git a/lang/en_US.ts b/lang/en_US.ts index f7ee879..cf98a07 100644 --- a/lang/en_US.ts +++ b/lang/en_US.ts @@ -1121,7 +1121,7 @@ or "-p <port> -f" - + Actural Freq: diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts index a997735..f0f2166 100644 --- a/lang/zh_CN.ts +++ b/lang/zh_CN.ts @@ -1137,7 +1137,7 @@ When setting the freq, the "hw setlfdivisor" will also be called.正在运行 - + Actural Freq: 实际频率: diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index f1eb116..a3920af 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -1152,6 +1152,8 @@ void MainWindow::setButtonsEnabled(bool st) ui->MF_sniffGroupBox->setEnabled(st); ui->Raw_CMDEdit->setEnabled(st); ui->Raw_sendCMDButton->setEnabled(st); + ui->LF_configGroupBox->setEnabled(st); + ui->LF_operationGroupBox->setEnabled(st); } void MainWindow::on_GroupBox_clicked(bool checked) diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 3caef34..666c15f 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -1567,7 +1567,7 @@ When setting the freq, the "hw setlfdivisor" will also be called. - + LF Operation