From 6926b2f17062b18b8e1a24e430556ac898dc0a3a Mon Sep 17 00:00:00 2001 From: wh201906 Date: Sat, 18 Feb 2023 15:25:40 +0800 Subject: [PATCH] UI: More configurable items UI part --- src/ui/mainwindow.cpp | 2 +- src/ui/mainwindow.h | 2 +- src/ui/mainwindow.ui | 1021 +++++++++++++++++++++++++---------------- 3 files changed, 631 insertions(+), 394 deletions(-) diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index e42fcaf..5de7884 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -1322,7 +1322,7 @@ void MainWindow::on_Set_Client_forceEnabledBox_stateChanged(int arg1) setButtonsEnabled(true); } -void MainWindow::on_Set_GUI_setLanguageButton_clicked() +void MainWindow::on_Set_UI_setLanguageButton_clicked() { Util::chooseLanguage(settings, this); } diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 1fcdb7f..82cd37d 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -172,7 +172,7 @@ private slots: void on_Set_Client_forceEnabledBox_stateChanged(int arg1); - void on_Set_GUI_setLanguageButton_clicked(); + void on_Set_UI_setLanguageButton_clicked(); void setButtonsEnabled(bool st); diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index b88f501..b94e633 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -2641,409 +2641,646 @@ or the communication between a tag and a reader. Settings - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + - - - - - Client - - - - - - GUI working directory: - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - Qt::Horizontal - - - - - - - Preload script path(Reconnect to apply): - - - - - - - - - - - - - - If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them, then put the path of the script there. - - - true - - - - - - - Qt::Horizontal - - - - - - - Client working directory(Reconnect to apply): - - - - - - - ../data - - - - - - - On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file. - - - true - - - - - - - Qt::Horizontal - - - - - - - Start arguments(Reconnect to apply): - - - - - - - <port> -f - - - - - - - -f is necessary because the GUI need to handle the output in time. In some cases, the arguments should be set to "-p /dev/<port> -f" or "-p <port> -f". - - - true - - - - - - - Qt::Horizontal - - - - - - - Config file(Reconnect to apply): - - - - - - - - - QComboBox::AdjustToContents - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - config.json - - - - - - - Different clients require different config files. You can change the content of config file if the command format changes. - - - true - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Keep buttons enabled even the client is running or disconnected - - - true - - - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Keep the client active even the PM3 hardware is disconnected.(Experimental) - - - true - - - - - - - - - - - - GUI + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 1017 + 790 + + + + + 0 - - - - - - - Language: - - - - - - - Choose Language - - - - - - - (Restart this app to use new language) - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - - - - - - Latest Release: - - - - - - - 0 - 0 - + + + 6 - - <html><head/><body><p><a href="https://github.com/wh201906/Proxmark3GUI/releases/"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/wh201906/Proxmark3GUI/releases/</span></a></p></body></html> - - - true - - - Qt::TextBrowserInteraction - - - - - - - - - - - Report Bugs: - - + + + + Client + + + + + + GUI working directory: + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + + + + Preload script path(Reconnect to apply): + + + + + + + + + + + + + + If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them, then put the path of the script there. + + + true + + + + + + + Qt::Horizontal + + + + + + + Client working directory(Reconnect to apply): + + + + + + + ../data + + + + + + + On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file. + + + true + + + + + + + Qt::Horizontal + + + + + + + Start arguments(Reconnect to apply): + + + + + + + <port> -f + + + + + + + -f is necessary because the GUI need to handle the output in time. In some cases, the arguments should be set to "-p /dev/<port> -f" or "-p <port> -f". + + + true + + + + + + + Qt::Horizontal + + + + + + + Config file(Reconnect to apply): + + + + + + + + + QComboBox::AdjustToContents + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + config.json + + + + + + + Different clients require different config files. You can change the content of config file if the command format changes. + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Keep buttons enabled even the client is running or disconnected + + + true + + + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Keep the client active even the PM3 hardware is disconnected.(Experimental) + + + true + + + + + + + + + + + + UI + + + + + + + + Language: + + + + + + + Choose Language + + + + + + + (Restart this app to use new language) + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Opacity: + + + + + + + 10 + + + 100 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + + + + 10 + + + 100 + + + 100 + + + + + + + + + + + + Theme: + + + + + + + + 0 + 0 + + + + + + + + Set + + + + + + + (Restart this app to use new theme) + + + + + + + + + + + Global Font: + + + + + + + + + + 1 + + + 65535 + + + 9 + + + + + + + Set + + + + + + + + + + + Data Font: + + + + + + + + + + 1 + + + 65535 + + + 9 + + + + + + + Set + + + + + + + + + + + Command Font: + + + + + + + + + + 1 + + + 65535 + + + 9 + + + + + + + Set + + + + + + + + + + + + + + Latest Release: + + + + + + + + 0 + 0 + + + + <html><head/><body><p><a href="https://github.com/wh201906/Proxmark3GUI/releases/"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/wh201906/Proxmark3GUI/releases/</span></a></p></body></html> + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + + Report Bugs: + + + + + + + + 0 + 0 + + + + <html><head/><body><p><a href="https://github.com/wh201906/Proxmark3GUI/issues/"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/wh201906/Proxmark3GUI/issues/</span></a></p></body></html> + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + - - - - 0 - 0 - - - - <html><head/><body><p><a href="https://github.com/wh201906/Proxmark3GUI/issues/"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/wh201906/Proxmark3GUI/issues/</span></a></p></body></html> + + + Qt::Horizontal - - true + + QSizePolicy::Minimum - - Qt::TextBrowserInteraction + + + 0 + 0 + - + - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 0 - 0 - - - + +