aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with 59ed7eb1342d

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2013-12-19 14:48:55 +02:00
commit 3fb97a7b37
33 changed files with 118 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/container/calculator.cpp
View File

@ -217,6 +217,7 @@ qreal Calculator::find_var(QString s)
void Calculator::serror(qint32 error) void Calculator::serror(qint32 error)
{ {
//TODO please translate text down here into english
QString e[]= QString e[]=
{ {
"Синтаксическая ошибка", "Синтаксическая ошибка",

3
src/container/vcontainer.cpp
View File

@ -357,7 +357,7 @@ QPainterPath VContainer::Equidistant(QVector<QPointF> points, const Detail::Equi
QVector<QPointF> ekvPoints; QVector<QPointF> ekvPoints;
if ( points.size() < 3 ) if ( points.size() < 3 )
{ {
qDebug()<<"Not enough points for build equidistant.\n"; qDebug()<<"Not enough points for building the equidistant.\n";
return ekv; return ekv;
} }
for (qint32 i = 0; i < points.size(); ++i ) for (qint32 i = 0; i < points.size(); ++i )
@ -383,6 +383,7 @@ QPainterPath VContainer::Equidistant(QVector<QPointF> points, const Detail::Equi
} }
for (qint32 i = 0; i < points.size(); ++i ) for (qint32 i = 0; i < points.size(); ++i )
{ {
//TODO please translate comments into english
if ( i == 0 && eqv == Detail::CloseEquidistant) if ( i == 0 && eqv == Detail::CloseEquidistant)
{//перша точка, ламана замкнена {//перша точка, ламана замкнена
ekvPoints<<EkvPoint(QLineF(points[points.size()-2], points[points.size()-1]), QLineF(points[1], points[0]), ekvPoints<<EkvPoint(QLineF(points[points.size()-2], points[points.size()-1]), QLineF(points[1], points[0]),

24
src/dialogs/dialogalongline.ui
View File

@ -14,7 +14,7 @@
<string>Point along line</string> <string>Point along line</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<property name="locale"> <property name="locale">
@ -76,20 +76,20 @@
<item> <item>
<widget class="QLineEdit" name="lineEditFormula"> <widget class="QLineEdit" name="lineEditFormula">
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of length of line</string> <string>Formula for the calculation of length of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset> <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -176,7 +176,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -186,13 +186,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHere"> <widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into the formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset> <normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -246,14 +246,14 @@
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Type line</string> <string>Type of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxLineType"> <widget class="QComboBox" name="comboBoxLineType">
<property name="toolTip"> <property name="toolTip">
<string>Show line from first point to our point</string> <string>Show line from first point to this point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -281,7 +281,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -326,7 +326,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert into formula</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -369,7 +369,7 @@
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../icon.qrc"/> <include location="../../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

2
src/dialogs/dialogarc.cpp
View File

@ -170,7 +170,7 @@ void DialogArc::ValChenged(int row)
if (ui->radioButtonLineAngles->isChecked()) if (ui->radioButtonLineAngles->isChecked())
{ {
QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineAngle(item->text())) QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineAngle(item->text()))
.arg(tr("Value angle of line.")); .arg(tr("Value of angle of line."));
ui->labelDescription->setText(desc); ui->labelDescription->setText(desc);
return; return;
} }

32
src/dialogs/dialogarc.ui
View File

@ -14,7 +14,7 @@
<string>Arc</string> <string>Arc</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<property name="locale"> <property name="locale">
@ -82,20 +82,20 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of radius of arc</string> <string>Formula for the calculation of radius of arc</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonPutHereRadius"> <widget class="QToolButton" name="toolButtonPutHereRadius">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into the formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset> <normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -109,13 +109,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonEqualRadius"> <widget class="QToolButton" name="toolButtonEqualRadius">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset> <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -218,13 +218,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHereF1"> <widget class="QToolButton" name="toolButtonPutHereF1">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset> <normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -238,13 +238,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonEqualF1"> <widget class="QToolButton" name="toolButtonEqualF1">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset> <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -347,13 +347,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHereF2"> <widget class="QToolButton" name="toolButtonPutHereF2">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert marked variable into formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset> <normaloff>:/icon/24x24/putHereLeft.png</normaloff>:/icon/24x24/putHereLeft.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -367,13 +367,13 @@
<item> <item>
<widget class="QToolButton" name="toolButtonEqualF2"> <widget class="QToolButton" name="toolButtonEqualF2">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset> <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -458,7 +458,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -563,7 +563,7 @@
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../icon.qrc"/> <include location="../../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

14
src/dialogs/dialogbisector.ui
View File

@ -79,14 +79,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of length of bisector</string> <string>Calculation of length of bisector by using the formula</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -179,7 +179,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -189,7 +189,7 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHere"> <widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert marked variable into the formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -292,7 +292,7 @@
<item> <item>
<widget class="QComboBox" name="comboBoxLineType"> <widget class="QComboBox" name="comboBoxLineType">
<property name="toolTip"> <property name="toolTip">
<string>Show line from second point to our point</string> <string>Show line from second point to this point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -320,7 +320,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -368,7 +368,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert into formula</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/dialogs/dialogdetail.ui
View File

@ -14,7 +14,7 @@
<string>Detail</string> <string>Detail</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<property name="locale"> <property name="locale">
@ -236,7 +236,7 @@
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../icon.qrc"/> <include location="../../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

22
src/dialogs/dialogendline.ui
View File

@ -11,10 +11,10 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point in the end of line</string> <string>Point in the end of a line</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<property name="locale"> <property name="locale">
@ -82,20 +82,20 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of length of line</string> <string>Formula for calculation of length of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset> <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -162,7 +162,7 @@
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icon.qrc"> <iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset> <normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -223,7 +223,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -441,14 +441,14 @@
<item> <item>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Type line</string> <string>Type of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxLineType"> <widget class="QComboBox" name="comboBoxLineType">
<property name="toolTip"> <property name="toolTip">
<string>Show line from first point to our point</string> <string>Show line from first point to this point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -476,7 +476,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -524,7 +524,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert in formula</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/dialogs/dialogheight.ui
View File

@ -65,7 +65,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -151,7 +151,7 @@
<item> <item>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Type line</string> <string>Type of line</string>
</property> </property>
</widget> </widget>
</item> </item>

12
src/dialogs/dialoghistory.cpp
View File

@ -205,7 +205,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
data->GetPoint(tool.getId()).name()); data->GetPoint(tool.getId()).name());
break; break;
case Tool::ShoulderPointTool: case Tool::ShoulderPointTool:
record = QString(tr("%1 - Point of soulder")).arg(data->GetPoint(tool.getId()).name()); record = QString(tr("%1 - Point of shoulder")).arg(data->GetPoint(tool.getId()).name());
break; break;
case Tool::NormalTool: case Tool::NormalTool:
domElement = doc->elementById(QString().setNum(tool.getId())); domElement = doc->elementById(QString().setNum(tool.getId()));
@ -214,7 +214,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
basePointId = domElement.attribute("firstPoint", "").toLongLong(); basePointId = domElement.attribute("firstPoint", "").toLongLong();
secondPointId = domElement.attribute("secondPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong();
} }
record = QString(tr("%3 - Normal to line %1_%2")).arg(data->GetPoint(basePointId).name(), record = QString(tr("%3 - normal to line %1_%2")).arg(data->GetPoint(basePointId).name(),
data->GetPoint(secondPointId).name(), data->GetPoint(secondPointId).name(),
data->GetPoint(tool.getId()).name()); data->GetPoint(tool.getId()).name());
break; break;
@ -226,7 +226,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
basePointId = domElement.attribute("secondPoint", "").toLongLong(); basePointId = domElement.attribute("secondPoint", "").toLongLong();
thirdPointId = domElement.attribute("thirdPoint", "").toLongLong(); thirdPointId = domElement.attribute("thirdPoint", "").toLongLong();
} }
record = QString(tr("%4 - Bisector of angle %1_%2_%3")).arg(data->GetPoint(firstPointId).name(), record = QString(tr("%4 - bisector of angle %1_%2_%3")).arg(data->GetPoint(firstPointId).name(),
data->GetPoint(basePointId).name(), data->GetPoint(basePointId).name(),
data->GetPoint(thirdPointId).name(), data->GetPoint(thirdPointId).name(),
data->GetPoint(tool.getId()).name()); data->GetPoint(tool.getId()).name());
@ -240,7 +240,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
p1Line2 = domElement.attribute("p1Line2", "").toLongLong(); p1Line2 = domElement.attribute("p1Line2", "").toLongLong();
p2Line2 = domElement.attribute("p2Line2", "").toLongLong(); p2Line2 = domElement.attribute("p2Line2", "").toLongLong();
} }
record = QString(tr("%5 - Point of intersection lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(), record = QString(tr("%5 - point of intersecting lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(),
data->GetPoint(p2Line1).name(), data->GetPoint(p2Line1).name(),
data->GetPoint(p1Line2).name(), data->GetPoint(p1Line2).name(),
data->GetPoint(p2Line2).name(), data->GetPoint(p2Line2).name(),
@ -282,7 +282,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
firstPointId = domElement.attribute("firstPoint", "").toLongLong(); firstPointId = domElement.attribute("firstPoint", "").toLongLong();
secondPointId = domElement.attribute("secondPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong();
} }
record = QString(tr("%4 - Point of contact arc with center in point %1 and line %2_%3")).arg( record = QString(tr("%4 - point of contact of arc with the center in point %1 and line %2_%3")).arg(
data->GetPoint(center).name(), data->GetPoint(firstPointId).name(), data->GetPoint(center).name(), data->GetPoint(firstPointId).name(),
data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name());
break; break;
@ -297,7 +297,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
p1LineId = domElement.attribute("p1Line", "").toLongLong(); p1LineId = domElement.attribute("p1Line", "").toLongLong();
p2LineId = domElement.attribute("p2Line", "").toLongLong(); p2LineId = domElement.attribute("p2Line", "").toLongLong();
} }
record = QString(tr("Point of perpendical from point %1 to line %2_%3")).arg( record = QString(tr("Point of perpendicular from point %1 to line %2_%3")).arg(
data->GetPoint(basePointId).name(), data->GetPoint(p1LineId).name(), data->GetPoint(basePointId).name(), data->GetPoint(p1LineId).name(),
data->GetPoint(p2LineId).name()); data->GetPoint(p2LineId).name());
break; break;

2
src/dialogs/dialogincrements.ui
View File

@ -31,7 +31,7 @@
</property> </property>
<widget class="QWidget" name="tabStandart"> <widget class="QWidget" name="tabStandart">
<attribute name="title"> <attribute name="title">
<string>Table sizes</string> <string>Sizes table</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">

2
src/dialogs/dialoglineintersect.ui
View File

@ -69,7 +69,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>

16
src/dialogs/dialognormal.ui
View File

@ -82,14 +82,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of length of normal</string> <string>Formula for calculation of length of normal</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -182,7 +182,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -192,7 +192,7 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHere"> <widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -460,14 +460,14 @@
<item> <item>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Type line</string> <string>Type of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxLineType"> <widget class="QComboBox" name="comboBoxLineType">
<property name="toolTip"> <property name="toolTip">
<string>Show line from first point to our point</string> <string>Show line from first point to this point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -495,7 +495,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -543,7 +543,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert into formula</string>
</property> </property>
</widget> </widget>
</item> </item>

14
src/dialogs/dialogpointofcontact.ui
View File

@ -82,14 +82,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of radius of arc</string> <string>Formula for calculation of radius of arc</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -182,7 +182,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -192,7 +192,7 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHere"> <widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -241,7 +241,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Slect point of center of arc</string> <string>Select point of center of arc</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -335,7 +335,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -383,7 +383,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert into formula.</string>
</property> </property>
</widget> </widget>
</item> </item>

6
src/dialogs/dialogpointofintersection.ui
View File

@ -62,7 +62,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -82,7 +82,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Point vertically</string> <string>vertical point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -106,7 +106,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Point horizontally</string> <string>horizontal point</string>
</property> </property>
</widget> </widget>
</item> </item>

12
src/dialogs/dialogshoulderpoint.ui
View File

@ -82,14 +82,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Formula calculation of length of line</string> <string>Formula for calculation of length of line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
<string>Calculate formula</string> <string>Calculate value</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -182,7 +182,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -192,7 +192,7 @@
<item> <item>
<widget class="QToolButton" name="toolButtonPutHere"> <widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip"> <property name="toolTip">
<string>Put variable into formula</string> <string>Insert variable into formula</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -356,7 +356,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonStandartTable"> <widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text"> <property name="text">
<string>Standart table</string> <string>Standard table</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -404,7 +404,7 @@
<item> <item>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="toolTip"> <property name="toolTip">
<string>Variables. Click twice to select.</string> <string>Variables - Click twice to insert into formula</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/dialogs/dialogsinglepoint.ui
View File

@ -111,7 +111,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Point name</string> <string>Point label</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEditName"> <widget class="QLineEdit" name="lineEditName">

2
src/dialogs/dialogtriangle.ui
View File

@ -65,7 +65,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>Name new point</string> <string>Point label</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/geometry/varc.cpp
View File

@ -167,7 +167,7 @@ QVector<QPointF> VArc::SplOfArc(qint32 number) const
qint32 n = NumberSplOfArc (); qint32 n = NumberSplOfArc ();
if ( number > n ) if ( number > n )
{ {
QString error = QString(tr("Arc have not this number of part.")); QString error = QString(tr("Arc has not this number of parts."));
throw VException(error); throw VException(error);
} }
qreal f1 = GetF1 (); qreal f1 = GetF1 ();

1
src/geometry/vspline.cpp
View File

@ -204,6 +204,7 @@ QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *in
return type; return type;
} }
} }
//TODO please translate into english
throw "Не можу знайти точку перетину сплайну з лінією."; throw "Не можу знайти точку перетину сплайну з лінією.";
} }

18
src/mainwindow.cpp
View File

@ -76,7 +76,7 @@ MainWindow::MainWindow(QWidget *parent)
QSizePolicy policy(QSizePolicy::Expanding, QSizePolicy::Expanding); QSizePolicy policy(QSizePolicy::Expanding, QSizePolicy::Expanding);
policy.setHorizontalStretch(12); policy.setHorizontalStretch(12);
view->setSizePolicy(policy); view->setSizePolicy(policy);
helpLabel = new QLabel(tr("Create new drawing for start working.")); helpLabel = new QLabel(tr("Create new pattern piece to start working."));
ui->statusBar->addWidget(helpLabel); ui->statusBar->addWidget(helpLabel);
connect(ui->actionArrowTool, &QAction::triggered, this, &MainWindow::ActionAroowTool); connect(ui->actionArrowTool, &QAction::triggered, this, &MainWindow::ActionAroowTool);
@ -137,7 +137,7 @@ void MainWindow::ActionNewDraw()
dlg->setInputMode( QInputDialog::TextInput ); dlg->setInputMode( QInputDialog::TextInput );
dlg->setLabelText(tr("Drawing:")); dlg->setLabelText(tr("Drawing:"));
dlg->setTextEchoMode(QLineEdit::Normal); dlg->setTextEchoMode(QLineEdit::Normal);
dlg->setWindowTitle(tr("Enter a name for the drawing.")); dlg->setWindowTitle(tr("Enter a label for the pattern piece."));
dlg->resize(300, 100); dlg->resize(300, 100);
dlg->setTextValue(nDraw); dlg->setTextValue(nDraw);
while (1) while (1)
@ -152,7 +152,7 @@ void MainWindow::ActionNewDraw()
index = comboBoxDraws->findText(nameDraw); index = comboBoxDraws->findText(nameDraw);
if (index != -1) if (index != -1)
{//we already have this name {//we already have this name
qCritical()<<tr("Error. Drawing of same name already exists."); qCritical()<<tr("Error. Pattern piece of same label already exists.");
} }
else else
{ {
@ -199,9 +199,9 @@ void MainWindow::OptionDraw()
QString nDraw = doc->GetNameActivDraw(); QString nDraw = doc->GetNameActivDraw();
QInputDialog *dlg = new QInputDialog(this); QInputDialog *dlg = new QInputDialog(this);
dlg->setInputMode( QInputDialog::TextInput ); dlg->setInputMode( QInputDialog::TextInput );
dlg->setLabelText(tr("Drawing:")); dlg->setLabelText(tr("Pattern piece:"));
dlg->setTextEchoMode(QLineEdit::Normal); dlg->setTextEchoMode(QLineEdit::Normal);
dlg->setWindowTitle(tr("Enter a new name for the drawing.")); dlg->setWindowTitle(tr("Enter a new label for the pattern piece."));
dlg->resize(300, 100); dlg->resize(300, 100);
dlg->setTextValue(nDraw); dlg->setTextValue(nDraw);
while (1) while (1)
@ -216,7 +216,7 @@ void MainWindow::OptionDraw()
index = comboBoxDraws->findText(nameDraw); index = comboBoxDraws->findText(nameDraw);
if (index != -1) if (index != -1)
{//we already have this name {//we already have this name
qCritical()<<tr("Error. Drawing of same name already exists."); qCritical()<<tr("Error. Pattern piece of same name already exists.");
} }
else else
{ {
@ -231,7 +231,7 @@ void MainWindow::OptionDraw()
} }
else else
{ {
QMessageBox::warning(this, tr("Error saving change!!!"), tr("Can't save new name of drawing")); QMessageBox::warning(this, tr("Error saving change!!!"), tr("Can't save new label of pattern piece"));
} }
} }
@ -1074,7 +1074,7 @@ bool MainWindow::SafeSaveing(const QString &fileName) const
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setWindowTitle(tr("Error!")); msgBox.setWindowTitle(tr("Error!"));
msgBox.setText(tr("Error don't unique id.")); msgBox.setText(tr("Error no unique id."));
msgBox.setInformativeText(e.ErrorMessage()); msgBox.setInformativeText(e.ErrorMessage());
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
@ -1247,7 +1247,7 @@ void MainWindow::OpenPattern(const QString &fileName)
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setWindowTitle(tr("Error!")); msgBox.setWindowTitle(tr("Error!"));
msgBox.setText(tr("Error don't unique id.")); msgBox.setText(tr("Error no unique id."));
msgBox.setInformativeText(e.ErrorMessage()); msgBox.setInformativeText(e.ErrorMessage());
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);

10
src/mainwindow.ui
View File

@ -589,7 +589,7 @@
</widget> </widget>
<widget class="QMenu" name="menuDrawing"> <widget class="QMenu" name="menuDrawing">
<property name="title"> <property name="title">
<string>Drawing</string> <string>Pattern piece</string>
</property> </property>
<addaction name="actionNewDraw"/> <addaction name="actionNewDraw"/>
<addaction name="actionOptionDraw"/> <addaction name="actionOptionDraw"/>
@ -775,10 +775,10 @@
<normaloff>:/icon/32x32/new_draw.png</normaloff>:/icon/32x32/new_draw.png</iconset> <normaloff>:/icon/32x32/new_draw.png</normaloff>:/icon/32x32/new_draw.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>New drawing</string> <string>New pattern piece</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Add new drawing</string> <string>Add new pattern piece</string>
</property> </property>
</action> </action>
<action name="actionOptionDraw"> <action name="actionOptionDraw">
@ -787,10 +787,10 @@
<normaloff>:/icon/32x32/option_draw.png</normaloff>:/icon/32x32/option_draw.png</iconset> <normaloff>:/icon/32x32/option_draw.png</normaloff>:/icon/32x32/option_draw.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Change the name of drawing</string> <string>Change the name of pattern piece</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Change the name of drawing</string> <string>Change the name of pattern piece</string>
</property> </property>
</action> </action>
<action name="actionTable"> <action name="actionTable">

2
src/tablewindow.cpp
View File

@ -26,6 +26,8 @@
** **
*************************************************************************/ *************************************************************************/
//TODO: If this class is still relevant, please translate all russian/ukrain text into english
#include "tablewindow.h" #include "tablewindow.h"
#include "ui_tablewindow.h" #include "ui_tablewindow.h"
#include "widgets/vtablegraphicsview.h" #include "widgets/vtablegraphicsview.h"

1
src/tools/drawTools/vtoollinepoint.cpp
View File

@ -35,6 +35,7 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64
mainLine(0) mainLine(0)
{ {
Q_ASSERT_X(basePointId > 0, Q_FUNC_INFO, "basePointId <= 0"); Q_ASSERT_X(basePointId > 0, Q_FUNC_INFO, "basePointId <= 0");
//TODO please translate comment
//Лінія, що з'єднує дві точки //Лінія, що з'єднує дві точки
QPointF point1 = data->GetPoint(basePointId).toQPointF(); QPointF point1 = data->GetPoint(basePointId).toQPointF();
QPointF point2 = data->GetPoint(id).toQPointF(); QPointF point2 = data->GetPoint(id).toQPointF();

1
src/tools/drawTools/vtoolsinglepoint.cpp
View File

@ -66,6 +66,7 @@ void VToolSinglePoint::AddToFile()
AddToCalculation(domElement); AddToCalculation(domElement);
} }
//TODO please translate comments into english
QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{ {
if (change == ItemPositionChange && scene()) if (change == ItemPositionChange && scene())

1
src/tools/modelingTools/vmodelingline.cpp
View File

@ -36,6 +36,7 @@ VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qin
secondPoint(secondPoint), dialogLine(QSharedPointer<DialogLine>()) secondPoint(secondPoint), dialogLine(QSharedPointer<DialogLine>())
{ {
ignoreFullUpdate = true; ignoreFullUpdate = true;
//TODO translate please
//Лінія //Лінія
VPointF first = data->GetPointModeling(firstPoint); VPointF first = data->GetPointModeling(firstPoint);
VPointF second = data->GetPointModeling(secondPoint); VPointF second = data->GetPointModeling(secondPoint);

2
src/tools/modelingTools/vmodelingtool.h
View File

@ -96,7 +96,7 @@ protected:
if (ignoreContextMenuEvent == false) if (ignoreContextMenuEvent == false)
{ {
QMenu menu; QMenu menu;
QAction *actionOption = menu.addAction(tr("Option")); QAction *actionOption = menu.addAction(tr("Options"));
QAction *actionRemove = 0; QAction *actionRemove = 0;
if (showRemove) if (showRemove)
{ {

1
src/tools/vabstracttool.cpp
View File

@ -26,6 +26,7 @@
** **
*************************************************************************/ *************************************************************************/
//TODO please translate comments into english
#include "vabstracttool.h" #include "vabstracttool.h"
const QString VAbstractTool::AttrId = QStringLiteral("id"); const QString VAbstractTool::AttrId = QStringLiteral("id");

1
src/tools/vtooldetail.cpp
View File

@ -299,6 +299,7 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const
{ {
if (change == ItemPositionHasChanged && scene()) if (change == ItemPositionHasChanged && scene())
{ {
//TODO please translate into english
// value - это новое положение. // value - это новое положение.
QPointF newPos = value.toPointF(); QPointF newPos = value.toPointF();
//qDebug()<<newPos; //qDebug()<<newPos;

1
src/widgets/vcontrolpointspline.cpp
View File

@ -25,6 +25,7 @@
** along with Valentina. If not, see <http://www.gnu.org/licenses/>. ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
** **
*************************************************************************/ *************************************************************************/
//TODO if this class is still in use: please translate all ukrainian text into english
#include "vcontrolpointspline.h" #include "vcontrolpointspline.h"

1
src/widgets/vitem.cpp
View File

@ -25,6 +25,7 @@
** along with Valentina. If not, see <http://www.gnu.org/licenses/>. ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
** **
*************************************************************************/ *************************************************************************/
//TODO if this class is still in use: please translate all ukrainian text into english
#include "vitem.h" #include "vitem.h"
#include "../options.h" #include "../options.h"

2
src/widgets/vmaingraphicsview.cpp
View File

@ -64,7 +64,7 @@ void VMainGraphicsView::scalingTime(qreal x)
Q_UNUSED(x); Q_UNUSED(x);
qreal factor = 1.0 + static_cast<qreal>(_numScheduledScalings) / 300.0; qreal factor = 1.0 + static_cast<qreal>(_numScheduledScalings) / 300.0;
if (QApplication::keyboardModifiers() == Qt::ControlModifier) if (QApplication::keyboardModifiers() == Qt::ControlModifier)
{// If you press CTRL this code will execute {// If you press CTRL this code will be executed
scale(factor, factor); scale(factor, factor);
emit NewFactor(factor); emit NewFactor(factor);
} }

5
src/widgets/vtablegraphicsview.cpp
View File

@ -25,6 +25,7 @@
** along with Valentina. If not, see <http://www.gnu.org/licenses/>. ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
** **
*************************************************************************/ *************************************************************************/
//TODO if this class is still in use: please translate ukrainian text into english
#include "vtablegraphicsview.h" #include "vtablegraphicsview.h"
@ -44,12 +45,12 @@ void VTableGraphicsView::selectionChanged()
QList<QGraphicsItem *> listSelectedItems = scene()->selectedItems(); QList<QGraphicsItem *> listSelectedItems = scene()->selectedItems();
if ( listSelectedItems.isEmpty() == true ) if ( listSelectedItems.isEmpty() == true )
{ {
qDebug() << tr("detail don't find"); qDebug() << tr("can't find detail");
emit itemChect(true); emit itemChect(true);
} }
else else
{ {
qDebug() << tr("detail find"); qDebug() << tr("detail found");
emit itemChect(false); emit itemChect(false);
} }
} }