kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions 1 Packages Projects 9 Releases 2 Wiki Activity

0000665: Follow up 0000640: This file crashes FreeCAD UI latest Git

Browse Source
This commit is contained in:
wmayer
2012-10-01 13:58:40 +02:00
parent aa72516fbe
commit 58da2ebbcc
9 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/MainWindow.cpp
View File

@@ -734,7 +734,7 @@ void MainWindow::addWindow(MDIView* view)
#endif
#endif
connect(view, SIGNAL(message(const QString&, int)),
statusBar(), SLOT(showMessage(const QString&, int)));
this, SLOT(showMessage(const QString&, int)));
connect(this, SIGNAL(windowStateChanged(MDIView*)),
view, SLOT(windowStateChanged(MDIView*)));
@@ -799,7 +799,7 @@ void MainWindow::removeWindow(Gui::MDIView* view)
{
// free all connections
disconnect(view, SIGNAL(message(const QString&, int)),
statusBar(), SLOT(message(const QString&, int )));
this, SLOT(showMessage(const QString&, int )));
disconnect(this, SIGNAL(windowStateChanged(MDIView*)),
view, SLOT(windowStateChanged(MDIView*)));
view->removeEventFilter(this);
@@ -1552,7 +1552,16 @@ void MainWindow::showMessage (const QString& message, int timeout)
{
QFontMetrics fm(statusBar()->font());
QString msg = fm.elidedText(message, Qt::ElideMiddle, this->width()/2);
#if QT_VERSION != 0x040801
this->statusBar()->showMessage(msg, timeout);
#else
//#0000665: There is a crash under Ubuntu 12.04 (Qt 4.8.1)
QMetaObject::invokeMethod(statusBar(), "showMessage",
Qt::QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,msg),
Q_ARG(int, timeout));
#endif
}
// -------------------------------------------------------------