rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-1628 Some smaller changes tryingto addressthe modal dialog issues in Qt...

Browse Source
This commit is contained in:
m_thread 2015-01-15 09:42:58 +01:00
parent fb9bcde440
commit 85fb2b41b6
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/uploader/rebootdialog.cpp
View File

@ -28,8 +28,8 @@
#include "rebootdialog.h" #include "rebootdialog.h"
#include "ui_rebootdialog.h" #include "ui_rebootdialog.h"
RebootDialog::RebootDialog(UploaderGadgetWidget *uploader, QWidget *parent) : RebootDialog::RebootDialog(UploaderGadgetWidget *uploader) :
QDialog(parent), QDialog(uploader),
ui(new Ui::RebootDialog), m_uploader(uploader) ui(new Ui::RebootDialog), m_uploader(uploader)
{ {
ui->setupUi(this); ui->setupUi(this);

2
ground/openpilotgcs/src/plugins/uploader/rebootdialog.h
View File

@ -40,7 +40,7 @@ class RebootDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit RebootDialog(UploaderGadgetWidget *uploader, QWidget *parent = 0); explicit RebootDialog(UploaderGadgetWidget *uploader);
~RebootDialog(); ~RebootDialog();
signals: signals:

1
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -1014,7 +1014,6 @@ void UploaderGadgetWidget::autoUpdateStatus(uploader::ProgressStep status, QVari
{ {
QString msg; QString msg;
int remaining; int remaining;
switch (status) { switch (status) {
case uploader::WAITING_DISCONNECT: case uploader::WAITING_DISCONNECT:
m_config->autoUpdateLabel->setText(tr("Waiting for all OpenPilot boards to be disconnected from USB.")); m_config->autoUpdateLabel->setText(tr("Waiting for all OpenPilot boards to be disconnected from USB."));