Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 12:55:12 +03:00
Code Issues Wiki Activity

CompareDialog deleted just after creation

Browse source
This commit is contained in:
bsongis 2014-04-21 08:27:37 +02:00
parent 7f4d72c072
commit 5a06c42bca
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/comparedialog.cpp
View file

@ -31,6 +31,7 @@ CompareDialog::CompareDialog(QWidget * parent):
ui(new Ui::CompareDialog)
{
ui->setupUi(this);
this->setWindowIcon(CompanionIcon("compare.png"));
te = ui->textEdit;
this->setAcceptDrops(true);
@ -60,7 +61,8 @@ void CompareDialog::dragEnterEvent(QDragEnterEvent *event)
// accept just text/uri-list mime format
if (event->mimeData()->hasFormat("application/x-companion")) {
event->acceptProposedAction();
} else {
}
else {
event->ignore();
}
}
@ -119,7 +121,7 @@ void CompareDialog::dropEvent(QDropEvent *event)
}
}
else if (child->objectName().contains("label_2")) {
if(mimeData->hasFormat("application/x-companion")) {
if (mimeData->hasFormat("application/x-companion")) {
QByteArray gmData = mimeData->data("application/x-companion");
DragDropHeader *header = (DragDropHeader *)gmData.data();
if (!header->general_settings) {
@ -337,7 +339,8 @@ void CompareDialog::printPhases()
if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
gvars=1;
}
} else {
}
else {
gvars=1;
}
if (gvars==1) {

2
companion/src/comparedialog.ui
View file

@ -131,7 +131,7 @@
<connection>
<sender>closeButton</sender>
<signal>clicked()</signal>
<receiver>compareDialog</receiver>
<receiver>CompareDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

21
companion/src/mainwindow.cpp
View file

@ -1472,33 +1472,36 @@ void MainWindow::readFlash()
void MainWindow::burnConfig()
{
burnConfigDialog *bcd = new burnConfigDialog(this);
bcd->exec();
burnConfigDialog *bcd = new burnConfigDialog(this);
bcd->exec();
delete bcd;
}
void MainWindow::burnList()
{
burnConfigDialog *bcd = new burnConfigDialog(this);
bcd->listProgrammers();
burnConfigDialog *bcd = new burnConfigDialog(this);
bcd->listProgrammers();
}
void MainWindow::burnFuses()
{
fusesDialog *fd = new fusesDialog(this);
fd->exec();
fusesDialog *fd = new fusesDialog(this);
fd->exec();
delete fd;
}
void MainWindow::compare()
{
CompareDialog *fd = new CompareDialog(this);
fd->setAttribute(Qt::WA_DeleteOnClose, true);
fd->show();
delete fd;
}
void MainWindow::logFile()
{
logsDialog *fd = new logsDialog(this);
fd->show();
logsDialog *fd = new logsDialog(this);
fd->setAttribute(Qt::WA_DeleteOnClose, true);
fd->show();
}
void MainWindow::about()