Commit f36c2e032adecfb17277d9c9becdfcb7051f2e4a

Authored by Peter Zhigalov
1 parent 5f743d01

Убрал вызовы setWindowIcon на OS X

src_qt/mainwindow.cpp
... ... @@ -397,7 +397,9 @@ void MainWindow::on_actionSave_Image_File_triggered()
397 397 msgBox.setWindowTitle(trUtf8("Error"));
398 398 msgBox.setText(trUtf8("Error: Can't save file"));
399 399 msgBox.setIcon(QMessageBox::Critical);
  400 +#if !defined (Q_OS_MAC)
400 401 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  402 +#endif
401 403 msgBox.exec();
402 404 }
403 405 }
... ... @@ -432,7 +434,9 @@ void MainWindow::on_actionIncrease_Interpolation_triggered()
432 434 msgBox.setWindowTitle(trUtf8("Error"));
433 435 msgBox.setText(trUtf8("Error: Memory limit exceeded"));
434 436 msgBox.setIcon(QMessageBox::Critical);
  437 +#if !defined (Q_OS_MAC)
435 438 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  439 +#endif
436 440 msgBox.exec();
437 441 }
438 442 }
... ... @@ -445,7 +449,9 @@ void MainWindow::on_actionIncrease_Interpolation_triggered()
445 449 msgBox.setWindowTitle(trUtf8("Error"));
446 450 msgBox.setText(trUtf8("Error: More than 10x interpolation is not supported"));
447 451 msgBox.setIcon(QMessageBox::Critical);
  452 +#if !defined (Q_OS_MAC)
448 453 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  454 +#endif
449 455 msgBox.exec();
450 456 }
451 457 }
... ... @@ -598,7 +604,9 @@ void MainWindow::on_actionAbout_FEM_Draw_triggered()
598 604 "Peter Zhigalov &lt;<a href=\"mailto:peter.zhigalov@gmail.com\">peter.zhigalov@gmail.com</a>&gt;"
599 605 ).replace(" ", "&nbsp;").replace("a&nbsp;href", "a href"));
600 606 msgBox.setIconPixmap(QPixmap::fromImage(QImage(":/resources/icon_64.png")));
  607 +#if !defined (Q_OS_MAC)
601 608 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  609 +#endif
602 610 msgBox.exec();
603 611 }
604 612  
... ... @@ -629,7 +637,9 @@ void MainWindow::on_actionAbout_Third_Party_Libraries_triggered()
629 637 "</table>"
630 638 ).replace(" ", "&nbsp;").replace("a&nbsp;href", "a href").replace("table&nbsp;border", "table border").replace("td&nbsp;style", "td style"));
631 639 msgBox.setIconPixmap(QPixmap::fromImage(QImage(":/resources/icon_64.png")));
  640 +#if !defined (Q_OS_MAC)
632 641 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  642 +#endif
633 643 msgBox.exec();
634 644 }
635 645  
... ... @@ -750,7 +760,9 @@ void MainWindow::dropEvent(QDropEvent * event)
750 760 msgBox.setWindowTitle(trUtf8("Error"));
751 761 msgBox.setText(trUtf8("Error: You can open only one file simultaneously!"));
752 762 msgBox.setIcon(QMessageBox::Critical);
  763 +#if !defined (Q_OS_MAC)
753 764 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  765 +#endif
754 766 msgBox.exec();
755 767 }
756 768 else
... ...
src_qt/paintwidget.cpp
... ... @@ -24,7 +24,9 @@ void paintwidget::print_io_error()
24 24 msgBox.setWindowTitle(trUtf8("Error"));
25 25 msgBox.setText(trUtf8("Error: Corrupted file"));
26 26 msgBox.setIcon(QMessageBox::Critical);
  27 +#if !defined (Q_OS_MAC)
27 28 msgBox.setWindowIcon(QIcon(":/resources/icon.ico"));
  29 +#endif
28 30 msgBox.exec();
29 31 }
30 32  
... ...