Commit 014ef6e2 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

tr()-fixes.

Change-Id: I82cc5d5aa50975ba281386b12dd496af55114bfe
Reviewed-on: http://codereview.qt.nokia.com/842

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 0ff8e646
...@@ -157,16 +157,16 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool) ...@@ -157,16 +157,16 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool)
} }
if (selectionMenuBool) { if (selectionMenuBool) {
QMenu *selectionMenu = new QMenu(QApplication::translate("ModelNodeContextMenu", "Selecion"), menu); QMenu *selectionMenu = new QMenu(tr("Selection"), menu);
menu->addMenu(selectionMenu); menu->addMenu(selectionMenu);
ModelNode parentNode; ModelNode parentNode;
if (singleSelected) { if (singleSelected) {
//ModelNodeAction *selectionAction; //ModelNodeAction *selectionAction;
//selectionAction = createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "DeSelect: ") + captionForModelNode(currentSingleNode), selectionMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::DeSelectModelNode); //selectionAction = createModelNodeAction(tr("DeSelect: ") + captionForModelNode(currentSingleNode), selectionMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::DeSelectModelNode);
//selectionMenu->addAction(selectionAction); //selectionMenu->addAction(selectionAction);
if (!currentSingleNode.isRootNode()) { if (!currentSingleNode.isRootNode()) {
parentNode = currentSingleNode.parentProperty().parentModelNode(); parentNode = currentSingleNode.parentProperty().parentModelNode();
selectionMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Select parent: ") + captionForModelNode(parentNode), selectionMenu->addAction(createModelNodeAction(tr("Select parent: %1").arg(captionForModelNode(parentNode)),
selectionMenu, QList<ModelNode>() << parentNode, ModelNodeAction::SelectModelNode)); selectionMenu, QList<ModelNode>() << parentNode, ModelNodeAction::SelectModelNode));
} }
...@@ -174,27 +174,27 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool) ...@@ -174,27 +174,27 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool)
} }
foreach (const ModelNode &node, m_view->allModelNodes()) { foreach (const ModelNode &node, m_view->allModelNodes()) {
if (node != currentSingleNode && node != parentNode && contains(node, m_scenePos) && !node.isRootNode()) if (node != currentSingleNode && node != parentNode && contains(node, m_scenePos) && !node.isRootNode())
selectionMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Select: ") + captionForModelNode(node), selectionMenu, QList<ModelNode>() << node, ModelNodeAction::SelectModelNode)); selectionMenu->addAction(createModelNodeAction(tr("Select: %1").arg(captionForModelNode(node)), selectionMenu, QList<ModelNode>() << node, ModelNodeAction::SelectModelNode));
} }
} }
QMenu *stackMenu = new QMenu(QApplication::translate("ModelNodeContextMenu", "Stack (z)"), menu); QMenu *stackMenu = new QMenu(tr("Stack (z)"), menu);
menu->addMenu(stackMenu); menu->addMenu(stackMenu);
stackMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "To Front"), stackMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ToFront, singleSelected)); stackMenu->addAction(createModelNodeAction(tr("To Front"), stackMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ToFront, singleSelected));
stackMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "To Back"), stackMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ToBack, singleSelected)); stackMenu->addAction(createModelNodeAction(tr("To Back"), stackMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ToBack, singleSelected));
stackMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Raise"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::Raise)); stackMenu->addAction(createModelNodeAction(tr("Raise"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::Raise));
stackMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Lower"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::Lower)); stackMenu->addAction(createModelNodeAction(tr("Lower"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::Lower));
stackMenu->addSeparator(); stackMenu->addSeparator();
stackMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Reset z property"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::ResetZ)); stackMenu->addAction(createModelNodeAction(tr("Reset z property"), stackMenu, QList<ModelNode>() << m_view->selectedModelNodes(), ModelNodeAction::ResetZ));
QMenu *editMenu = new QMenu(QApplication::translate("ModelNodeContextMenu", "Edit"), menu); QMenu *editMenu = new QMenu(tr("Edit"), menu);
menu->addMenu(editMenu); menu->addMenu(editMenu);
if (!selectionIsEmpty) { if (!selectionIsEmpty) {
//editMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Change Id"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::SetId, singleSelected)); //editMenu->addAction(createModelNodeAction(tr("Change Id"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::SetId, singleSelected));
editMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Reset Position"), editMenu, m_view->selectedModelNodes(), ModelNodeAction::ResetPosition)); editMenu->addAction(createModelNodeAction(tr("Reset Position"), editMenu, m_view->selectedModelNodes(), ModelNodeAction::ResetPosition));
editMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Reset Size"), editMenu, m_view->selectedModelNodes(), ModelNodeAction::ResetSize)); editMenu->addAction(createModelNodeAction(tr("Reset Size"), editMenu, m_view->selectedModelNodes(), ModelNodeAction::ResetSize));
editMenu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected)); editMenu->addAction(createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected));
} else { } else {
editMenu->setEnabled(false); editMenu->setEnabled(false);
...@@ -205,7 +205,7 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool) ...@@ -205,7 +205,7 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool)
if (singleSelected) { if (singleSelected) {
enterComponent = modelNodeIsComponent(currentSingleNode); enterComponent = modelNodeIsComponent(currentSingleNode);
} }
menu->addAction(createModelNodeAction(QApplication::translate("ModelNodeContextMenu", "Go into Component"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::EnterComponent, enterComponent)); menu->addAction(createModelNodeAction(tr("Go into Component"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::EnterComponent, enterComponent));
menu->exec(pos); menu->exec(pos);
menu->deleteLater(); menu->deleteLater();
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <QObject> #include <QObject>
#include <QPoint> #include <QPoint>
#include <QAction> #include <QAction>
#include <QCoreApplication>
#include <QMenu> #include <QMenu>
#include <qmlmodelview.h> #include <qmlmodelview.h>
...@@ -67,15 +68,12 @@ private: ...@@ -67,15 +68,12 @@ private:
class ModelNodeContextMenu class ModelNodeContextMenu
{ {
Q_DECLARE_TR_FUNCTIONS(QmlDesigner::ModelNodeContextMenu)
public: public:
ModelNodeContextMenu(QmlModelView *view); ModelNodeContextMenu(QmlModelView *view);
void execute(const QPoint &pos, bool selecetionMenu); void execute(const QPoint &pos, bool selectionMenu);
void setScenePos(const QPoint &pos); void setScenePos(const QPoint &pos);
signals:
public slots:
private: private:
ModelNodeAction* createModelNodeAction(const QString &description, QMenu *menu, const QList<ModelNode> &modelNodeList, ModelNodeAction::ModelNodeActionType type, bool enabled = true); ModelNodeAction* createModelNodeAction(const QString &description, QMenu *menu, const QList<ModelNode> &modelNodeList, ModelNodeAction::ModelNodeActionType type, bool enabled = true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment