ui: set dialog confirm button text (#26365)

* ui: set dialog confirm button text

* short

* blue confirm
pull/26375/head
Cameron Clough 3 years ago committed by GitHub
parent b22fc70f52
commit e78280da12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      selfdrive/ui/qt/offroad/networking.cc
  2. 8
      selfdrive/ui/qt/offroad/settings.cc
  3. 2
      selfdrive/ui/qt/offroad/software_settings.cc
  4. 11
      selfdrive/ui/qt/widgets/input.cc
  5. 2
      selfdrive/ui/qt/widgets/input.h
  6. 16
      selfdrive/ui/translations/main_ja.ts
  7. 16
      selfdrive/ui/translations/main_ko.ts
  8. 16
      selfdrive/ui/translations/main_pt-BR.ts
  9. 16
      selfdrive/ui/translations/main_zh-CHS.ts
  10. 16
      selfdrive/ui/translations/main_zh-CHT.ts

@ -314,7 +314,7 @@ void WifiUI::refresh() {
QPushButton *forgetBtn = new QPushButton(tr("FORGET")); QPushButton *forgetBtn = new QPushButton(tr("FORGET"));
forgetBtn->setObjectName("forgetBtn"); forgetBtn->setObjectName("forgetBtn");
QObject::connect(forgetBtn, &QPushButton::clicked, [=]() { QObject::connect(forgetBtn, &QPushButton::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(network.ssid)), this)) { if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(network.ssid)), tr("Forget"), this)) {
wifi->forgetConnection(network.ssid); wifi->forgetConnection(network.ssid);
} }
}); });

@ -169,7 +169,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
auto resetCalibBtn = new ButtonControl(tr("Reset Calibration"), tr("RESET"), ""); auto resetCalibBtn = new ButtonControl(tr("Reset Calibration"), tr("RESET"), "");
connect(resetCalibBtn, &ButtonControl::showDescriptionEvent, this, &DevicePanel::updateCalibDescription); connect(resetCalibBtn, &ButtonControl::showDescriptionEvent, this, &DevicePanel::updateCalibDescription);
connect(resetCalibBtn, &ButtonControl::clicked, [&]() { connect(resetCalibBtn, &ButtonControl::clicked, [&]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to reset calibration?"), this)) { if (ConfirmationDialog::confirm(tr("Are you sure you want to reset calibration?"), tr("Reset"), this)) {
params.remove("CalibrationParams"); params.remove("CalibrationParams");
} }
}); });
@ -178,7 +178,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
if (!params.getBool("Passive")) { if (!params.getBool("Passive")) {
auto retrainingBtn = new ButtonControl(tr("Review Training Guide"), tr("REVIEW"), tr("Review the rules, features, and limitations of openpilot")); auto retrainingBtn = new ButtonControl(tr("Review Training Guide"), tr("REVIEW"), tr("Review the rules, features, and limitations of openpilot"));
connect(retrainingBtn, &ButtonControl::clicked, [=]() { connect(retrainingBtn, &ButtonControl::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), this)) { if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), tr("Review"), this)) {
emit reviewTrainingGuide(); emit reviewTrainingGuide();
} }
}); });
@ -266,7 +266,7 @@ void DevicePanel::updateCalibDescription() {
void DevicePanel::reboot() { void DevicePanel::reboot() {
if (!uiState()->engaged()) { if (!uiState()->engaged()) {
if (ConfirmationDialog::confirm(tr("Are you sure you want to reboot?"), this)) { if (ConfirmationDialog::confirm(tr("Are you sure you want to reboot?"), tr("Reboot"), this)) {
// Check engaged again in case it changed while the dialog was open // Check engaged again in case it changed while the dialog was open
if (!uiState()->engaged()) { if (!uiState()->engaged()) {
Params().putBool("DoReboot", true); Params().putBool("DoReboot", true);
@ -279,7 +279,7 @@ void DevicePanel::reboot() {
void DevicePanel::poweroff() { void DevicePanel::poweroff() {
if (!uiState()->engaged()) { if (!uiState()->engaged()) {
if (ConfirmationDialog::confirm(tr("Are you sure you want to power off?"), this)) { if (ConfirmationDialog::confirm(tr("Are you sure you want to power off?"), tr("Power Off"), this)) {
// Check engaged again in case it changed while the dialog was open // Check engaged again in case it changed while the dialog was open
if (!uiState()->engaged()) { if (!uiState()->engaged()) {
Params().putBool("DoShutdown", true); Params().putBool("DoShutdown", true);

@ -77,7 +77,7 @@ SoftwarePanel::SoftwarePanel(QWidget* parent) : ListWidget(parent) {
// uninstall button // uninstall button
auto uninstallBtn = new ButtonControl(tr("Uninstall %1").arg(getBrand()), tr("UNINSTALL")); auto uninstallBtn = new ButtonControl(tr("Uninstall %1").arg(getBrand()), tr("UNINSTALL"));
connect(uninstallBtn, &ButtonControl::clicked, [&]() { connect(uninstallBtn, &ButtonControl::clicked, [&]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to uninstall?"), this)) { if (ConfirmationDialog::confirm(tr("Are you sure you want to uninstall?"), tr("Uninstall"), this)) {
params.putBool("DoUninstall", true); params.putBool("DoUninstall", true);
} }
}); });

@ -185,7 +185,11 @@ void InputDialog::setMinLength(int length) {
ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text, ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text,
const bool rich, QWidget *parent) : QDialogBase(parent) { const bool rich, QWidget *parent) : QDialogBase(parent) {
QFrame *container = new QFrame(this); QFrame *container = new QFrame(this);
container->setStyleSheet("QFrame { background-color: #1B1B1B; color: #C9C9C9; }"); container->setStyleSheet(R"(
QFrame { background-color: #1B1B1B; color: #C9C9C9; }
#confirm_btn { background-color: #465BEA; }
#confirm_btn:pressed { background-color: #3049F4; }
)");
QVBoxLayout *main_layout = new QVBoxLayout(container); QVBoxLayout *main_layout = new QVBoxLayout(container);
main_layout->setContentsMargins(32, rich ? 32 : 120, 32, 32); main_layout->setContentsMargins(32, rich ? 32 : 120, 32, 32);
@ -208,6 +212,7 @@ ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString
if (confirm_text.length()) { if (confirm_text.length()) {
QPushButton* confirm_btn = new QPushButton(confirm_text); QPushButton* confirm_btn = new QPushButton(confirm_text);
confirm_btn->setObjectName("confirm_btn");
btn_layout->addWidget(confirm_btn); btn_layout->addWidget(confirm_btn);
QObject::connect(confirm_btn, &QPushButton::clicked, this, &ConfirmationDialog::accept); QObject::connect(confirm_btn, &QPushButton::clicked, this, &ConfirmationDialog::accept);
} }
@ -223,8 +228,8 @@ bool ConfirmationDialog::alert(const QString &prompt_text, QWidget *parent) {
return d.exec(); return d.exec();
} }
bool ConfirmationDialog::confirm(const QString &prompt_text, QWidget *parent) { bool ConfirmationDialog::confirm(const QString &prompt_text, const QString &confirm_text, QWidget *parent) {
ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), tr("Cancel"), false, parent); ConfirmationDialog d = ConfirmationDialog(prompt_text, confirm_text, tr("Cancel"), false, parent);
return d.exec(); return d.exec();
} }

@ -57,7 +57,7 @@ public:
explicit ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, explicit ConfirmationDialog(const QString &prompt_text, const QString &confirm_text,
const QString &cancel_text, const bool rich, QWidget* parent); const QString &cancel_text, const bool rich, QWidget* parent);
static bool alert(const QString &prompt_text, QWidget *parent); static bool alert(const QString &prompt_text, QWidget *parent);
static bool confirm(const QString &prompt_text, QWidget *parent); static bool confirm(const QString &prompt_text, const QString &confirm_text, QWidget *parent);
static bool rich(const QString &prompt_text, QWidget *parent); static bool rich(const QString &prompt_text, QWidget *parent);
}; };

@ -238,6 +238,14 @@
<source>Disengage to Power Off</source> <source>Disengage to Power Off</source>
<translation>openpilot </translation> <translation>openpilot </translation>
</message> </message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Review</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DriveStats</name> <name>DriveStats</name>
@ -854,6 +862,10 @@ location set</source>
<source>CHECK</source> <source>CHECK</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SshControl</name> <name>SshControl</name>
@ -1056,5 +1068,9 @@ location set</source>
<source>Forget Wi-Fi Network &quot;%1&quot;?</source> <source>Forget Wi-Fi Network &quot;%1&quot;?</source>
<translation>Wi-Fiネットワーク%1</translation> <translation>Wi-Fiネットワーク%1</translation>
</message> </message>
<message>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

@ -238,6 +238,14 @@
<source>Disengage to Power Off</source> <source>Disengage to Power Off</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Review</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DriveStats</name> <name>DriveStats</name>
@ -854,6 +862,10 @@ location set</source>
<source>CHECK</source> <source>CHECK</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SshControl</name> <name>SshControl</name>
@ -1056,5 +1068,9 @@ location set</source>
<source>Forget Wi-Fi Network &quot;%1&quot;?</source> <source>Forget Wi-Fi Network &quot;%1&quot;?</source>
<translation>wifi &quot;%1&quot;?</translation> <translation>wifi &quot;%1&quot;?</translation>
</message> </message>
<message>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

@ -238,6 +238,14 @@
<source>Disengage to Power Off</source> <source>Disengage to Power Off</source>
<translation>Desacione para Desligar</translation> <translation>Desacione para Desligar</translation>
</message> </message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Review</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DriveStats</name> <name>DriveStats</name>
@ -858,6 +866,10 @@ trabalho definido</translation>
<source>CHECK</source> <source>CHECK</source>
<translation>VERIFICAR</translation> <translation>VERIFICAR</translation>
</message> </message>
<message>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SshControl</name> <name>SshControl</name>
@ -1060,5 +1072,9 @@ trabalho definido</translation>
<source>Forget Wi-Fi Network &quot;%1&quot;?</source> <source>Forget Wi-Fi Network &quot;%1&quot;?</source>
<translation>Esquecer Rede Wi-Fi &quot;%1&quot;?</translation> <translation>Esquecer Rede Wi-Fi &quot;%1&quot;?</translation>
</message> </message>
<message>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

@ -238,6 +238,14 @@
<source>Disengage to Power Off</source> <source>Disengage to Power Off</source>
<translation>openpilot以关机</translation> <translation>openpilot以关机</translation>
</message> </message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Review</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DriveStats</name> <name>DriveStats</name>
@ -852,6 +860,10 @@ location set</source>
<source>CHECK</source> <source>CHECK</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SshControl</name> <name>SshControl</name>
@ -1054,5 +1066,9 @@ location set</source>
<source>Forget Wi-Fi Network &quot;%1&quot;?</source> <source>Forget Wi-Fi Network &quot;%1&quot;?</source>
<translation>WiFi网络 &quot;%1&quot;?</translation> <translation>WiFi网络 &quot;%1&quot;?</translation>
</message> </message>
<message>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

@ -238,6 +238,14 @@
<source>Disengage to Power Off</source> <source>Disengage to Power Off</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Review</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DriveStats</name> <name>DriveStats</name>
@ -854,6 +862,10 @@ location set</source>
<source>CHECK</source> <source>CHECK</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SshControl</name> <name>SshControl</name>
@ -1056,5 +1068,9 @@ location set</source>
<source>Forget Wi-Fi Network &quot;%1&quot;?</source> <source>Forget Wi-Fi Network &quot;%1&quot;?</source>
<translation> Wi-Fi &quot;%1&quot;?</translation> <translation> Wi-Fi &quot;%1&quot;?</translation>
</message> </message>
<message>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

Loading…
Cancel
Save