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

Merge branch 'master' into PAAngle

Browse Source
This commit is contained in:
WandererFan
2020-06-02 19:23:36 -04:00
committed by GitHub
parent 25d419e1c0 47c9f01d22
commit 4ad649801a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/Tree.cpp
View File

@@ -4655,12 +4655,17 @@ void DocumentObjectItem::displayStatusInfo()
{
App::DocumentObject* Obj = object()->getObject();
QString info = QString::fromLatin1(Obj->getStatusString());
if ( Obj->mustExecute() == 1 && !Obj->isError())
info += QString::fromLatin1(" (but must be executed)");
#if (QT_VERSION >= 0x050000)
QString info = QApplication::translate(Obj->getTypeId().getName(), Obj->getStatusString());
#else
QString info = QApplication::translate(Obj->getTypeId().getName(), Obj->getStatusString(), 0, QApplication::UnicodeUTF8);
#endif
if (Obj->mustExecute() == 1 && !Obj->isError())
info += TreeWidget::tr(" (but must be executed)");
QString status = TreeWidget::tr("%1, Internal name: %2")
.arg(info,
QString::fromLatin1(Obj->getNameInDocument()));
.arg(info, QString::fromLatin1(Obj->getNameInDocument()));
if (!Obj->isError())
getMainWindow()->showMessage(status);