diff --git a/src/plugins/qmldesigner/core/exceptions/exception.cpp b/src/plugins/qmldesigner/core/exceptions/exception.cpp index b4c89482db5c9072905855a8e2b853255c49debe..976e1bf20497af8b516ee35a4051bf2efd76b8d5 100644 --- a/src/plugins/qmldesigner/core/exceptions/exception.cpp +++ b/src/plugins/qmldesigner/core/exceptions/exception.cpp @@ -135,7 +135,7 @@ QString Exception::backTrace() const */ QString Exception::description() const { - return QString(); + return QString("file: %1, function: %2, line: %3").arg(m_file, m_function, QString::number(m_line)); } /*! diff --git a/src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp b/src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp index 27f907fbf2674f8f857ccd358ac050a8959b0712..59c97a418c5672215e19ecd0812e3c2b52eb92a1 100644 --- a/src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp +++ b/src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp @@ -28,6 +28,7 @@ **************************************************************************/ #include "invalidargumentexception.h" +#include <QString> /*! \class QmlDesigner::InvalidArgumentException @@ -50,6 +51,15 @@ InvalidArgumentException::InvalidArgumentException(int line, const QString &argument) : Exception(line, function, file), m_argument(argument) { + +} + +QString InvalidArgumentException::description() const +{ + if (function() == "createNode") + return QString(QObject::tr("Failed to create item of type %1")).arg(m_argument); + + return Exception::description(); } /*! diff --git a/src/plugins/qmldesigner/core/include/invalidargumentexception.h b/src/plugins/qmldesigner/core/include/invalidargumentexception.h index 108c31c393a12ce49b4413024e072819a45646b2..c6661509cb0b3cf9deb59d5c332da6d13ffd6f53 100644 --- a/src/plugins/qmldesigner/core/include/invalidargumentexception.h +++ b/src/plugins/qmldesigner/core/include/invalidargumentexception.h @@ -45,6 +45,7 @@ public: QString type() const; QString argument() const; + QString description() const; private: const QString m_argument; diff --git a/src/plugins/qmldesigner/core/model/model.cpp b/src/plugins/qmldesigner/core/model/model.cpp index d109030d85e0f87ddb7a1258e1b9d17bfc18dbd4..d3f6c2057e62dc3389407d78814851b31ffb74ff 100644 --- a/src/plugins/qmldesigner/core/model/model.cpp +++ b/src/plugins/qmldesigner/core/model/model.cpp @@ -169,9 +169,9 @@ InternalNode::Pointer ModelPrivate::createNode(const QString &typeString, const QList<QPair<QString, QVariant> > &propertyList) { if (typeString.isEmpty()) - throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, "typeString"); + throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, tr("invalid type")); if (!m_metaInfo.nodeMetaInfo(typeString).isValid()) - throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, "typeString"); + throw InvalidArgumentException(__LINE__, __FUNCTION__, __FILE__, typeString); InternalNode::Pointer newInternalNodePointer = InternalNode::create(typeString, majorVersion, minorVersion); diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index e9abc83860b06e43a333070393921aff3b8c0ca0..69c87605361b8823b14f3a1523bcfd8d2464c230 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -106,8 +106,10 @@ void DocumentWarningWidget::setError(const RewriterView::Error &error) QString str; if (error.type() == RewriterView::Error::ParseError) { str = tr("%3 (%1:%2)").arg(QString::number(error.line()), QString::number(error.column()), error.description()); + m_goToError->show(); } else if (error.type() == RewriterView::Error::InternalError) { - str = tr("Internal error (%1)") .arg(error.description()); + str = tr("Internal error (%1)").arg(error.description()); + m_goToError->hide(); } m_errorMessage->setText(str);