From f2a8d5ce570b6f8dfef7a132a24f118aca995584 Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Wed, 10 Jan 2024 13:05:04 -0500 Subject: [PATCH] Telemetry: some UI fixes --- src/homeWidget/mainwindow.cpp | 3 +++ src/widgets/dialogs/generaldialog.cpp | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/homeWidget/mainwindow.cpp b/src/homeWidget/mainwindow.cpp index b612d7d..c56a1ad 100644 --- a/src/homeWidget/mainwindow.cpp +++ b/src/homeWidget/mainwindow.cpp @@ -1093,6 +1093,9 @@ void MainWindow::on_audioBtn_clicked() void MainWindow::openTelemetryDialog() { log("Showing telemetry request dialog", className); + // Preventing a small race condition + global::usbms::usbmsDialog = false; + global::telemetry::telemetryDialog = true; generalDialogWindow = new generalDialog(this); diff --git a/src/widgets/dialogs/generaldialog.cpp b/src/widgets/dialogs/generaldialog.cpp index f20dd5d..7990310 100644 --- a/src/widgets/dialogs/generaldialog.cpp +++ b/src/widgets/dialogs/generaldialog.cpp @@ -231,7 +231,7 @@ generalDialog::generalDialog(QWidget *parent) : ui->stackedWidget->setCurrentIndex(0); ui->okBtn->setText("Send"); ui->cancelBtn->setText("Don't send"); - ui->bodyLabel->setText("We, InkBox OS developers, would like to know a bit more about our userbase.
We will be extremely grateful if you allow us to collect some information about your device.
Would you like to send it to us
?
No personal data will be transmitted.
"); + ui->bodyLabel->setText("We, the InkBox OS developers, would like to know a bit more about our userbase.
We would be extremely grateful if you would allow us to collect some information about your device.
Would you like to send it to us
?
No personal data will be transmitted.
"); ui->headerLabel->setText("Telemetry request"); QTimer::singleShot(50, this, SLOT(adjust_size())); } @@ -624,8 +624,18 @@ void generalDialog::adjust_size() { float widthProportion = 2; float heightProportion = 2; if(telemetryDialog) { - widthProportion = 2.8; - heightProportion = 2.6; + if(global::deviceID == "n705\n") { + widthProportion = 3.3; + heightProportion = 2.6; + } + else if(global::deviceID == "n873\n") { + widthProportion = 3; + heightProportion = 2.6; + } + else { + widthProportion = 3.4; + heightProportion = 2.6; + } } this->adjustSize();