Skip to content

Commit

Permalink
- Set proper message for MAC.
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19841 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adeas31 committed Mar 28, 2014
1 parent 5815df4 commit 7a1582e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
14 changes: 12 additions & 2 deletions OMEdit/OMEditGUI/GUI/Widgets/TransformationsWidget.cpp
Expand Up @@ -825,7 +825,12 @@ void TransformationsWidget::fetchOperations(OMVariable &variable)
}
else
{
QString message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG);
QString message;
#ifdef Q_OS_MAC
message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG).arg(GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG_MSG_MAC));
#else
message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG).arg(GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG_MSG));
#endif
QStringList values;
values << message;
QString toolTip = message;
Expand Down Expand Up @@ -957,7 +962,12 @@ void TransformationsWidget::fetchOperations(OMEquation &equation)
}
else
{
QString message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG);
QString message;
#ifdef Q_OS_MAC
message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG).arg(GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG_MSG_MAC));
#else
message = GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG).arg(GUIMessages::getMessage(GUIMessages::SET_INFO_XML_FLAG_MSG));
#endif
QStringList values;
values << message;
QString toolTip = message;
Expand Down
6 changes: 5 additions & 1 deletion OMEdit/OMEditGUI/Util/Helper.cpp
Expand Up @@ -435,7 +435,11 @@ QString GUIMessages::getMessage(int type)
case WRONG_MODIFIER:
return tr("The Modifier '%1' format is invalid. The correct format is 'phi(start=1)'");
case SET_INFO_XML_FLAG:
return tr("The operations were not generated. You must set the +d=infoXmlOperations flag. Enable it via Tools->Options->Simulation->OMC Flags and simulate again.");
return tr("The operations were not generated. You must set the +d=infoXmlOperations flag. Enable it via %1 and simulate again.");
case SET_INFO_XML_FLAG_MSG:
return tr("Tools->Options->Simulation->OMC Flags");
case SET_INFO_XML_FLAG_MSG_MAC:
return tr("OMEdit->Preferences->Simulation->OMC Flags");
default:
return "";
}
Expand Down
4 changes: 3 additions & 1 deletion OMEdit/OMEditGUI/Util/Helper.h
Expand Up @@ -271,7 +271,9 @@ class GUIMessages : public QObject
XML_GENERATED,
DELETE_CLASS_MSG,
WRONG_MODIFIER,
SET_INFO_XML_FLAG
SET_INFO_XML_FLAG,
SET_INFO_XML_FLAG_MSG,
SET_INFO_XML_FLAG_MSG_MAC
};

static QString getMessage(int type);
Expand Down

0 comments on commit 7a1582e

Please sign in to comment.