feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
View File

@@ -202,7 +202,7 @@ void GraphicsScene::removeSelectedItems()
{
QVector<ScxmlTag*> tags = SceneUtils::findRemovedTags(m_baseItems);
if (tags.count() > 0) {
m_document->undoStack()->beginMacro(tr("Remove item(s)"));
m_document->undoStack()->beginMacro(tr("Remove items"));
// Then remove found tags
for (int i = tags.count(); i--;) {
@@ -368,7 +368,7 @@ void GraphicsScene::init()
void GraphicsScene::runLayoutToSelectedStates()
{
m_document->undoStack()->beginMacro(tr("Relayout"));
m_document->undoStack()->beginMacro(tr("Re-layout"));
QVector<BaseItem*> selectedItems;
foreach (BaseItem *node, m_baseItems) {

4
src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
View File

@@ -54,7 +54,7 @@ void IdWarningItem::setId(const QString &text)
// Check new id
if (m_id.isEmpty()) {
setReason(tr("Missing ID"));
setReason(tr("Missing ID."));
setWarningActive(true);
} else
checkDuplicates(m_id);
@@ -78,7 +78,7 @@ void IdWarningItem::checkDuplicates(const QString &id)
foundItems[0]->setWarningActive(false);
} else {
for (int i = 0; i < foundItems.count(); ++i) {
foundItems[i]->setReason(tr("Duplicate ID (%1)").arg(id));
foundItems[i]->setReason(tr("Duplicate ID (%1).").arg(id));
foundItems[i]->setWarningActive(true);
}
}

2
src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp
View File

@@ -36,7 +36,7 @@ InitialWarningItem::InitialWarningItem(InitialStateItem *parent)
setSeverity(OutputPane::Warning::ErrorType);
setTypeName(tr("Initial"));
setDescription(tr("One level can contain only one initial state."));
setReason(tr("Too many initial states at the same level"));
setReason(tr("Too many initial states at the same level."));
}
void InitialWarningItem::updatePos()

8
src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp
View File

@@ -38,7 +38,7 @@ StateWarningItem::StateWarningItem(StateItem *parent)
setDescription(tr("Draw some transitions to state."));
setPixmap(Utils::Icons::WARNING.pixmap());
setReason(tr("No input connection"));
setReason(tr("No input connection."));
}
void StateWarningItem::setIdWarning(IdWarningItem *idwarning)
@@ -56,15 +56,15 @@ void StateWarningItem::check()
bool inputProblem = !m_parentItem->isInitial() && !m_parentItem->hasInputTransitions(m_parentItem, true);
if (outputProblem && inputProblem) {
setReason(tr("No input or output connections (%1)").arg(m_parentItem->itemId()));
setReason(tr("No input or output connections (%1).").arg(m_parentItem->itemId()));
setDescription(tr("Draw some transitions to or from state."));
setWarningActive(true);
} else if (outputProblem) {
setReason(tr("No output connections (%1)").arg(m_parentItem->itemId()));
setReason(tr("No output connections (%1).").arg(m_parentItem->itemId()));
setDescription(tr("Draw some transitions from state."));
setWarningActive(true);
} else if (inputProblem) {
setReason(tr("No input connections (%1)").arg(m_parentItem->itemId()));
setReason(tr("No input connections (%1).").arg(m_parentItem->itemId()));
setDescription(tr("Draw some transitions to state."));
setWarningActive(true);
} else

2
src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp
View File

@@ -45,7 +45,7 @@ void TransitionWarningItem::check()
{
if (m_parentItem) {
if (m_parentItem->targetType() == TransitionItem::ExternalNoTarget) {
setReason(tr("Not Connected (%1)").arg(m_parentItem->tagValue("event")));
setReason(tr("Not connected (%1).").arg(m_parentItem->tagValue("event")));
setWarningActive(true);
} else
setWarningActive(false);