Skip to content

Commit 7ab2fbe

Browse files
committed
Add translations
1 parent 64b6b7e commit 7ab2fbe

File tree

15 files changed

+1445
-161
lines changed

15 files changed

+1445
-161
lines changed

plugins/robots/common/twoDModel/src/engine/items/curveItem.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ AbstractItem *CurveItem::clone() const
4848
{
4949
const auto cloned = new CurveItem({x1(), y1()}, {x2(), y2()});
5050
AbstractItem::copyTo(cloned);
51-
connect(&mMarker1, &Marker::xChanged, &cloned->mMarker1, [=]() { cloned->mMarker1.setX(mMarker1.x()); });
52-
connect(&mMarker1, &Marker::yChanged, &cloned->mMarker1, [=]() { cloned->mMarker1.setY(mMarker1.y()); });
53-
connect(&mMarker2, &Marker::xChanged, &cloned->mMarker2, [=]() { cloned->mMarker2.setX(mMarker2.x()); });
54-
connect(&mMarker2, &Marker::yChanged, &cloned->mMarker2, [=]() { cloned->mMarker2.setY(mMarker2.y()); });
51+
connect(&mMarker1, &MarkerItem::xChanged, &cloned->mMarker1, [=]() { cloned->mMarker1.setX(mMarker1.x()); });
52+
connect(&mMarker1, &MarkerItem::yChanged, &cloned->mMarker1, [=]() { cloned->mMarker1.setY(mMarker1.y()); });
53+
connect(&mMarker2, &MarkerItem::xChanged, &cloned->mMarker2, [=]() { cloned->mMarker2.setX(mMarker2.x()); });
54+
connect(&mMarker2, &MarkerItem::yChanged, &cloned->mMarker2, [=]() { cloned->mMarker2.setY(mMarker2.y()); });
5555
cloned->mMarker1.setPos(mMarker1.pos());
5656
cloned->mMarker2.setPos(mMarker2.pos());
5757
return cloned;
@@ -232,19 +232,19 @@ void CurveItem::setEditable(bool editable)
232232
mMarker2.setFlag(QGraphicsItem::ItemIsMovable, editable);
233233
}
234234

235-
Marker::Marker(QGraphicsItem *parent)
235+
MarkerItem::MarkerItem(QGraphicsItem *parent)
236236
: QGraphicsObject(parent)
237237
{
238238
setCursor(Qt::SizeAllCursor);
239239
setFlag(ItemSendsGeometryChanges);
240240
}
241241

242-
QRectF Marker::boundingRect() const
242+
QRectF MarkerItem::boundingRect() const
243243
{
244244
return QRectF(-markerSize.width() / 2, -markerSize.height() / 2, markerSize.width(), markerSize.height());
245245
}
246246

247-
void Marker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
247+
void MarkerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
248248
{
249249
Q_UNUSED(option)
250250
Q_UNUSED(widget)
@@ -258,7 +258,7 @@ void Marker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
258258
painter->restore();
259259
}
260260

261-
QVariant Marker::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
261+
QVariant MarkerItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
262262
{
263263
if (change == ItemPositionHasChanged) {
264264
parentItem()->update();
@@ -267,19 +267,19 @@ QVariant Marker::itemChange(QGraphicsItem::GraphicsItemChange change, const QVar
267267
return QGraphicsItem::itemChange(change, value);
268268
}
269269

270-
void Marker::mousePressEvent(QGraphicsSceneMouseEvent *event)
270+
void MarkerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
271271
{
272272
Q_UNUSED(event)
273273
emit static_cast<AbstractItem *>(parentItem())->mouseInteractionStarted();
274274
}
275275

276-
void Marker::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
276+
void MarkerItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
277277
{
278278
Q_UNUSED(event)
279279
if (flags() & ItemIsMovable) setPos(parentItem()->mapFromScene(event->scenePos()));
280280
}
281281

282-
void Marker::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
282+
void MarkerItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
283283
{
284284
Q_UNUSED(event)
285285
emit static_cast<AbstractItem *>(parentItem())->mouseInteractionStopped();

plugins/robots/common/twoDModel/src/engine/items/curveItem.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <qrutils/graphicsUtils/lineImpl.h>
1818

1919
#include "colorFieldItem.h"
20-
#include "marker.h"
20+
#include "markerItem.h"
2121

2222
namespace twoDModel {
2323
namespace items {
@@ -61,8 +61,8 @@ class CurveItem : public ColorFieldItem
6161

6262
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
6363

64-
twoDModel::items::Marker mMarker1;
65-
twoDModel::items::Marker mMarker2;
64+
MarkerItem mMarker1;
65+
MarkerItem mMarker2;
6666
};
6767

6868
}

plugins/robots/common/twoDModel/src/engine/items/marker.h renamed to plugins/robots/common/twoDModel/src/engine/items/markerItem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
namespace twoDModel {
1818
namespace items {
1919

20-
class Marker : public QGraphicsObject
20+
class MarkerItem : public QGraphicsObject
2121
{
2222
Q_OBJECT
2323
public:
24-
explicit Marker(QGraphicsItem *parent = nullptr);
24+
explicit MarkerItem(QGraphicsItem *parent = nullptr);
2525
QRectF boundingRect() const override;
2626

2727
private:

plugins/robots/common/twoDModel/twoDModel.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ HEADERS += \
101101
$$PWD/src/engine/items/stylusItem.h \
102102
$$PWD/src/engine/items/lineItem.h \
103103
$$PWD/src/engine/items/curveItem.h \
104-
$$PWD/src/engine/items/marker.h \
104+
$$PWD/src/engine/items/markerItem.h \
105105
$$PWD/src/engine/items/colorFieldItem.h \
106106
$$PWD/src/engine/items/rectangleItem.h \
107107
$$PWD/src/engine/items/ellipseItem.h \

0 commit comments

Comments
 (0)