Commit 59a224c28d9925786bde7cb6bc27c8c249a10b61

Authored by Peter Zhigalov
1 parent 2e02ba8b

Починил совместимость с Qt 4.4

Showing 1 changed file with 9 additions and 1 deletions
src_qt/mainwindow.cpp
... ... @@ -440,7 +440,11 @@ void MainWindow::on_actionShow_Isolines_triggered()
440 440 // Событие при запросе конфигурации цвета изолиний
441 441 void MainWindow::on_actionIsolines_Color_triggered()
442 442 {
  443 +#if !defined HAVE_LESS_THAN_QT45
443 444 QColor color = QColorDialog::getColor(ui->widget->isolines_config.color, this, trUtf8("Select Isolines Color"));
  445 +#else
  446 + QColor color = QColorDialog::getColor(ui->widget->isolines_config.color, this);
  447 +#endif
444 448 if(color != ui->widget->isolines_config.color)
445 449 {
446 450 ui->widget->isolines_config.color = color;
... ... @@ -470,7 +474,11 @@ void MainWindow::on_actionShow_Vectors_triggered()
470 474 // Событие при запросе конфигурации цвета векторов
471 475 void MainWindow::on_actionVectors_Color_triggered()
472 476 {
  477 +#if !defined HAVE_LESS_THAN_QT45
473 478 QColor color = QColorDialog::getColor(ui->widget->vectors_config.color, this, trUtf8("Select Vectors Color"));
  479 +#else
  480 + QColor color = QColorDialog::getColor(ui->widget->isolines_config.color, this);
  481 +#endif
474 482 if(color != ui->widget->vectors_config.color)
475 483 {
476 484 ui->widget->vectors_config.color = color;
... ... @@ -554,7 +562,7 @@ void MainWindow::on_actionAbout_FEM_Draw_triggered()
554 562 msgBox.setStandardButtons(QMessageBox::Ok);
555 563 msgBox.setDefaultButton(QMessageBox::Ok);
556 564 msgBox.setWindowTitle("About");
557   - msgBox.setText("<b>FEM Draw v1.5 (Qt)</b><br><br>"
  565 + msgBox.setText("<b>FEM Draw v1.6 beta1 (Qt)</b><br><br>"
558 566 "<a href=\"https://fami.codefreak.ru/osp/fem_draw/\">https://fami.codefreak.ru/osp/fem_draw/</a><br>"
559 567 "License: <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU GPL v3</a><br><br>"
560 568 "Copyright &copy; 2014-2016<br>"
... ...