From e8b86309996ed9cf2f165c0d73d20378c9734a4e Mon Sep 17 00:00:00 2001 From: cosina Date: Thu, 19 Dec 2013 15:30:11 +0100 Subject: [PATCH 1/3] small wording fixes --HG-- branch : develop --- src/dialogs/dialogbisector.ui | 49 +++++++++++++++--------------- src/dialogs/dialogdetail.cpp | 4 +-- src/dialogs/dialogdetail.ui | 4 +-- src/dialogs/dialogendline.ui | 20 ++++++------ src/dialogs/dialoghistory.cpp | 4 +-- src/dialogs/dialoglineintersect.ui | 8 ++--- src/dialogs/dialognormal.ui | 20 ++++++------ src/geometry/vsplinepath.cpp | 6 ++-- 8 files changed, 57 insertions(+), 58 deletions(-) diff --git a/src/dialogs/dialogbisector.ui b/src/dialogs/dialogbisector.ui index bab63fbc7..32b1c777e 100644 --- a/src/dialogs/dialogbisector.ui +++ b/src/dialogs/dialogbisector.ui @@ -14,7 +14,7 @@ Bisector - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -83,6 +83,26 @@ + + + + Insert marked variable into the formula + + + ... + + + + :/icon/24x24/putHere.png:/icon/24x24/putHere.png + + + + 24 + 24 + + + + @@ -92,7 +112,7 @@ ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -186,26 +206,6 @@ - - - - Insert marked variable into the formula - - - ... - - - - :/icon/24x24/putHere.png:/icon/24x24/putHere.png - - - - 24 - 24 - - - - @@ -285,7 +285,7 @@ - Type line + Type of line @@ -410,12 +410,11 @@ radioButtonLengthArc radioButtonLengthSpline listWidget - toolButtonPutHere toolButtonEqual buttonBox - + diff --git a/src/dialogs/dialogdetail.cpp b/src/dialogs/dialogdetail.cpp index 6b1b7ab9b..74780726a 100644 --- a/src/dialogs/dialogdetail.cpp +++ b/src/dialogs/dialogdetail.cpp @@ -87,7 +87,7 @@ void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type) NewItem(id, Tool::NodeSplinePath, mode, NodeDetail::Contour); break; default: - qWarning()<show(); @@ -173,7 +173,7 @@ void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::D break; } default: - qWarning()< - Option + Options @@ -161,7 +161,7 @@ - Supplement for seams + Seam allowance true diff --git a/src/dialogs/dialogendline.ui b/src/dialogs/dialogendline.ui index 9601b58d8..578808a41 100644 --- a/src/dialogs/dialogendline.ui +++ b/src/dialogs/dialogendline.ui @@ -251,7 +251,7 @@ - Angle degree + Degree of angel @@ -272,7 +272,7 @@ ... - + :/icon/24x24/arrowRightUp.png:/icon/24x24/arrowRightUp.png @@ -289,7 +289,7 @@ ... - + :/icon/24x24/arrowLeftUp.png:/icon/24x24/arrowLeftUp.png @@ -306,7 +306,7 @@ ... - + :/icon/24x24/arrowLeft.png:/icon/24x24/arrowLeft.png @@ -323,7 +323,7 @@ ... - + :/icon/24x24/arrowRight.png:/icon/24x24/arrowRight.png @@ -346,7 +346,7 @@ ... - + :/icon/24x24/arrowUp.png:/icon/24x24/arrowUp.png @@ -363,7 +363,7 @@ ... - + :/icon/24x24/arrowDown.png:/icon/24x24/arrowDown.png @@ -380,7 +380,7 @@ ... - + :/icon/24x24/arrowLeftDown.png:/icon/24x24/arrowLeftDown.png @@ -397,7 +397,7 @@ ... - + :/icon/24x24/arrowRightDown.png:/icon/24x24/arrowRightDown.png @@ -575,7 +575,7 @@ buttonBox - + diff --git a/src/dialogs/dialoghistory.cpp b/src/dialogs/dialoghistory.cpp index 268a7db85..1ac2394a5 100644 --- a/src/dialogs/dialoghistory.cpp +++ b/src/dialogs/dialoghistory.cpp @@ -240,7 +240,7 @@ QString DialogHistory::Record(const VToolRecord &tool) p1Line2 = domElement.attribute("p1Line2", "").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(p1Line2).name(), data->GetPoint(p2Line2).name(), @@ -320,7 +320,7 @@ QString DialogHistory::Record(const VToolRecord &tool) break; } default: - qWarning()< 0 0 - 384 + 370 196 - Point of line intersection + Intersection of lines - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -173,7 +173,7 @@ buttonBox - + diff --git a/src/dialogs/dialognormal.ui b/src/dialogs/dialognormal.ui index 70d5491a4..079a90e4d 100644 --- a/src/dialogs/dialognormal.ui +++ b/src/dialogs/dialognormal.ui @@ -14,7 +14,7 @@ Normal - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -95,7 +95,7 @@ ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -294,7 +294,7 @@ ... - + :/icon/24x24/arrowRightUp.png:/icon/24x24/arrowRightUp.png @@ -311,7 +311,7 @@ ... - + :/icon/24x24/arrowLeftUp.png:/icon/24x24/arrowLeftUp.png @@ -328,7 +328,7 @@ ... - + :/icon/24x24/arrowLeft.png:/icon/24x24/arrowLeft.png @@ -345,7 +345,7 @@ ... - + :/icon/24x24/arrowRight.png:/icon/24x24/arrowRight.png @@ -368,7 +368,7 @@ ... - + :/icon/24x24/arrowUp.png:/icon/24x24/arrowUp.png @@ -385,7 +385,7 @@ ... - + :/icon/24x24/arrowDown.png:/icon/24x24/arrowDown.png @@ -402,7 +402,7 @@ ... - + :/icon/24x24/arrowLeftDown.png:/icon/24x24/arrowLeftDown.png @@ -419,7 +419,7 @@ ... - + :/icon/24x24/arrowRightDown.png:/icon/24x24/arrowRightDown.png diff --git a/src/geometry/vsplinepath.cpp b/src/geometry/vsplinepath.cpp index 79b2acf76..2dfd02166 100644 --- a/src/geometry/vsplinepath.cpp +++ b/src/geometry/vsplinepath.cpp @@ -75,7 +75,7 @@ VSpline VSplinePath::GetSpline(qint32 index) const } 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(), 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()) { - throw VException(tr("This spline is not exist.")); + throw VException(tr("This spline does not exist.")); } if (pos == SplinePoint::FirstPoint) { @@ -142,7 +142,7 @@ VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Positi { 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) { From de862c7b7fe6538d81df115ba38e0aa470a129e2 Mon Sep 17 00:00:00 2001 From: cosina Date: Fri, 20 Dec 2013 10:45:19 +0100 Subject: [PATCH 2/3] configured for successful windows built :) --HG-- branch : develop --- Valentina.pro | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Valentina.pro b/Valentina.pro index 9a86f63ea..e37603bbc 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -21,7 +21,7 @@ CONFIG += c++11 DESTDIR = bin # files created moc -MOC_DIR = moc +#MOC_DIR = moc # objecs files OBJECTS_DIR = obj @@ -49,9 +49,12 @@ OTHER_FILES += share/resources/valentina.rc \ share/resources/icon/64x64/icon64x64.ico TRANSLATIONS += share/translations/valentina_ru.ts \ - share/translations/valentina_uk.ts - -unix:QMAKE_CXX = ccache g++ + share/translations/valentina_uk.ts \ + share/translations/valentina_de.ts +QMAKE_CXX = g++ +unix { +QMAKE_CXX = ccache g++ +} CONFIG += precompile_header # Precompiled headers (PCH) @@ -65,7 +68,8 @@ CONFIG(debug, debug|release){ *-g++{ QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \ + -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" \ +# -isystem "$${MOC_DIR}" \ -isystem "$${RCC_DIR}" \ -Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \ @@ -105,7 +109,7 @@ win32:RC_FILE = share/resources/valentina.rc QMAKE_DISTCLEAN += $${DESTDIR}/* \ $${OBJECTS_DIR}/* \ $${UI_DIR}/* \ - $${MOC_DIR}/* \ +# $${MOC_DIR}/* \ $${RCC_DIR}/* unix { @@ -123,7 +127,8 @@ desktop.files += dist/$${TARGET}.desktop pixmaps.path = $$DATADIR/pixmaps/ pixmaps.files += dist/$${TARGET}.png 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.files = $$INSTALL_TRANSLATIONS INSTALLS += target \ From 93e73e50412b1a39c4efdbdcb29e4e525df191b0 Mon Sep 17 00:00:00 2001 From: cosina Date: Fri, 20 Dec 2013 15:47:11 +0100 Subject: [PATCH 3/3] just kept the language file changes - the rest is like it was before... sorry --HG-- branch : develop --- Valentina.pro | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Valentina.pro b/Valentina.pro index e37603bbc..496310cf8 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -21,7 +21,7 @@ CONFIG += c++11 DESTDIR = bin # files created moc -#MOC_DIR = moc +MOC_DIR = moc # objecs files OBJECTS_DIR = obj @@ -51,7 +51,6 @@ OTHER_FILES += share/resources/valentina.rc \ TRANSLATIONS += share/translations/valentina_ru.ts \ share/translations/valentina_uk.ts \ share/translations/valentina_de.ts -QMAKE_CXX = g++ unix { QMAKE_CXX = ccache g++ } @@ -68,8 +67,7 @@ CONFIG(debug, debug|release){ *-g++{ QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" \ -# -isystem "$${MOC_DIR}" \ + -isystem "/usr/include/qt5/QtCore" -isystem "$${UI_DIR}" -isystem "$${MOC_DIR}" \ -isystem "$${RCC_DIR}" \ -Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \ @@ -109,7 +107,7 @@ win32:RC_FILE = share/resources/valentina.rc QMAKE_DISTCLEAN += $${DESTDIR}/* \ $${OBJECTS_DIR}/* \ $${UI_DIR}/* \ -# $${MOC_DIR}/* \ + $${MOC_DIR}/* \ $${RCC_DIR}/* unix {