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

Merge with 9b961a80cc85

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2013-12-21 14:59:13 +02:00
commit 854880821d
9 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Valentina.pro
View File

@ -49,9 +49,11 @@ OTHER_FILES += share/resources/valentina.rc \
share/resources/icon/64x64/icon64x64.ico share/resources/icon/64x64/icon64x64.ico
TRANSLATIONS += share/translations/valentina_ru.ts \ TRANSLATIONS += share/translations/valentina_ru.ts \
share/translations/valentina_uk.ts share/translations/valentina_uk.ts \
share/translations/valentina_de.ts
unix:QMAKE_CXX = ccache g++ unix {
QMAKE_CXX = ccache g++
}
CONFIG += precompile_header CONFIG += precompile_header
# Precompiled headers (PCH) # Precompiled headers (PCH)
@ -123,7 +125,8 @@ desktop.files += dist/$${TARGET}.desktop
pixmaps.path = $$DATADIR/pixmaps/ pixmaps.path = $$DATADIR/pixmaps/
pixmaps.files += dist/$${TARGET}.png pixmaps.files += dist/$${TARGET}.png
INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \ INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \
share/translations/valentina_uk.qm share/translations/valentina_uk.qm \
share/translations/valentina_de.qm \
translations.path = $$DATADIR/$${TARGET}/translations/ translations.path = $$DATADIR/$${TARGET}/translations/
translations.files = $$INSTALL_TRANSLATIONS translations.files = $$INSTALL_TRANSLATIONS
INSTALLS += target \ INSTALLS += target \

49
src/dialogs/dialogbisector.ui
View File

@ -14,7 +14,7 @@
<string>Bisector</string> <string>Bisector</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>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -83,6 +83,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert marked variable into the formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip"> <property name="toolTip">
@ -92,7 +112,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/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">
@ -186,26 +206,6 @@
<item> <item>
<widget class="QLineEdit" name="lineEditNamePoint"/> <widget class="QLineEdit" name="lineEditNamePoint"/>
</item> </item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert marked variable into the formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -285,7 +285,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>
@ -410,12 +410,11 @@
<tabstop>radioButtonLengthArc</tabstop> <tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop> <tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop> <tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop> <tabstop>toolButtonEqual</tabstop>
<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>

4
src/dialogs/dialogdetail.cpp
View File

@ -87,7 +87,7 @@ void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type)
NewItem(id, Tool::NodeSplinePath, mode, NodeDetail::Contour); NewItem(id, Tool::NodeSplinePath, mode, NodeDetail::Contour);
break; break;
default: default:
qWarning()<<tr("Get wrong scene object. Ignore."); qWarning()<<tr("Got wrong scene object. Ignore.");
break; break;
} }
this->show(); this->show();
@ -173,7 +173,7 @@ void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::D
break; break;
} }
default: default:
qWarning()<<tr("Get wrong tools. Ignore."); qWarning()<<tr("Got wrong tools. Ignore.");
break; break;
} }

4
src/dialogs/dialogdetail.ui
View File

@ -88,7 +88,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Option</string> <string>Options</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -161,7 +161,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBoxSeams"> <widget class="QCheckBox" name="checkBoxSeams">
<property name="text"> <property name="text">
<string>Supplement for seams</string> <string>Seam allowance</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>

20
src/dialogs/dialogendline.ui
View File

@ -251,7 +251,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Angle degree </string> <string>Degree of angel</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -272,7 +272,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/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset> <normaloff>:/icon/24x24/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -289,7 +289,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/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset> <normaloff>:/icon/24x24/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -306,7 +306,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/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset> <normaloff>:/icon/24x24/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -323,7 +323,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/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset> <normaloff>:/icon/24x24/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -346,7 +346,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/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset> <normaloff>:/icon/24x24/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -363,7 +363,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/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset> <normaloff>:/icon/24x24/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -380,7 +380,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/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset> <normaloff>:/icon/24x24/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -397,7 +397,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/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset> <normaloff>:/icon/24x24/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -575,7 +575,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>

4
src/dialogs/dialoghistory.cpp
View File

@ -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 intersecting lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(), record = QString(tr("%5 - intersection of 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(),
@ -320,7 +320,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
break; break;
} }
default: default:
qWarning()<<tr("Get wrong tool type. Ignore."); qWarning()<<tr("Got wrong tool type. Ignore.");
break; break;
} }
return record; return record;

8
src/dialogs/dialoglineintersect.ui
View File

@ -6,15 +6,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>384</width> <width>370</width>
<height>196</height> <height>196</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point of line intersection</string> <string>Intersection of lines</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">
@ -173,7 +173,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>

20
src/dialogs/dialognormal.ui
View File

@ -14,7 +14,7 @@
<string>Normal</string> <string>Normal</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">
@ -95,7 +95,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/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">
@ -294,7 +294,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/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset> <normaloff>:/icon/24x24/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -311,7 +311,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/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset> <normaloff>:/icon/24x24/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -328,7 +328,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/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset> <normaloff>:/icon/24x24/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -345,7 +345,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/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset> <normaloff>:/icon/24x24/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -368,7 +368,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/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset> <normaloff>:/icon/24x24/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -385,7 +385,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/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset> <normaloff>:/icon/24x24/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -402,7 +402,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/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset> <normaloff>:/icon/24x24/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -419,7 +419,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/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset> <normaloff>:/icon/24x24/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">

6
src/geometry/vsplinepath.cpp
View File

@ -75,7 +75,7 @@ VSpline VSplinePath::GetSpline(qint32 index) const
} }
if (index < 1 || index > Count()) if (index < 1 || index > Count())
{ {
throw VException(tr("This spline is not exist.")); throw VException(tr("This spline does not exist."));
} }
VSpline spl(&points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(), VSpline spl(&points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(),
path[index-1].KAsm2(), path[index].KAsm1(), this->kCurve); path[index-1].KAsm2(), path[index].KAsm1(), this->kCurve);
@ -126,7 +126,7 @@ void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePoint::Position &p
{ {
if (indexSpline < 1 || indexSpline > Count()) if (indexSpline < 1 || indexSpline > Count())
{ {
throw VException(tr("This spline is not exist.")); throw VException(tr("This spline does not exist."));
} }
if (pos == SplinePoint::FirstPoint) if (pos == SplinePoint::FirstPoint)
{ {
@ -142,7 +142,7 @@ VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Positi
{ {
if (indexSpline < 1 || indexSpline > Count()) if (indexSpline < 1 || indexSpline > Count())
{ {
throw VException(tr("This spline is not exist.")); throw VException(tr("This spline does not exist."));
} }
if (pos == SplinePoint::FirstPoint) if (pos == SplinePoint::FirstPoint)
{ {