mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-18 23:04:03 +02:00
Compare commits
No commits in common. "2d9575400a37b5d15a4a3c62b9c43d0c05672ff8" and "a16e928c2cb00602e3144773995f28fcd0b73008" have entirely different histories.
2d9575400a
...
a16e928c2c
|
@ -113,7 +113,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
|
||||||
|
|
||||||
linuxdeployqt_task_template: &LINUXDEPLOYQT_TASK_TEMPLATE
|
linuxdeployqt_task_template: &LINUXDEPLOYQT_TASK_TEMPLATE
|
||||||
install_script:
|
install_script:
|
||||||
- bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential libgl1-mesa-dev libicu-dev"
|
- bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential"
|
||||||
build_script:
|
build_script:
|
||||||
- uname -a
|
- uname -a
|
||||||
- mkdir -pm 0700 $XDG_RUNTIME_DIR
|
- mkdir -pm 0700 $XDG_RUNTIME_DIR
|
||||||
|
@ -134,7 +134,6 @@ linuxdeployqt_task_template: &LINUXDEPLOYQT_TASK_TEMPLATE
|
||||||
- qbs config profiles.qt5.baseProfile ${COMPILER}
|
- qbs config profiles.qt5.baseProfile ${COMPILER}
|
||||||
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --jobs $(nproc) profile:qt5 config:release modules.buildconfig.enableCcache:${ENABLE_CCACHE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root modules.buildconfig.enableAppImage:true
|
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --jobs $(nproc) profile:qt5 config:release modules.buildconfig.enableCcache:${ENABLE_CCACHE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root modules.buildconfig.enableAppImage:true
|
||||||
- qbs -p autotest-runner -d build profile:qt5 config:release
|
- qbs -p autotest-runner -d build profile:qt5 config:release
|
||||||
- export LD_LIBRARY_PATH=/opt/qt515/lib:$CIRRUS_WORKING_DIR/build/install-root/usr/local/lib/valentina:$LD_LIBRARY_PATH
|
|
||||||
- linuxdeployqt $CIRRUS_WORKING_DIR/build/install-root/usr/local/share/applications/ua.com.smart-pattern.valentina.desktop -appimage -qmake='/opt/qt515/bin/qmake' -executable-dir=$CIRRUS_WORKING_DIR/build/install-root/usr/local/bin -extra-plugins=iconengines,platformthemes/libqgtk3.so
|
- linuxdeployqt $CIRRUS_WORKING_DIR/build/install-root/usr/local/share/applications/ua.com.smart-pattern.valentina.desktop -appimage -qmake='/opt/qt515/bin/qmake' -executable-dir=$CIRRUS_WORKING_DIR/build/install-root/usr/local/bin -extra-plugins=iconengines,platformthemes/libqgtk3.so
|
||||||
- ccache -s
|
- ccache -s
|
||||||
deploy_script:
|
deploy_script:
|
||||||
|
|
2
dist/ua.com.smart-pattern.puzzle.desktop
vendored
2
dist/ua.com.smart-pattern.puzzle.desktop
vendored
|
@ -10,7 +10,7 @@ Comment[uk]=Створюйте і редагуйте розкладки
|
||||||
Icon=puzzle
|
Icon=puzzle
|
||||||
Terminal=false
|
Terminal=false
|
||||||
MimeType=application/x-valentina-layout;
|
MimeType=application/x-valentina-layout;
|
||||||
Categories=Graphics;VectorGraphics;2DGraphics;Qt;Utility;FileTools;
|
Categories=Qt;Utility;FileTools;
|
||||||
TryExec=puzzle
|
TryExec=puzzle
|
||||||
Keywords=layout;nesting;
|
Keywords=layout;nesting;
|
||||||
StartupWMClass=puzzle
|
StartupWMClass=puzzle
|
||||||
|
|
4
dist/ua.com.smart-pattern.tape.desktop
vendored
4
dist/ua.com.smart-pattern.tape.desktop
vendored
|
@ -9,8 +9,8 @@ Comment=Create and edit measurements
|
||||||
Comment[uk]=Створюйте і редагуйте мірки
|
Comment[uk]=Створюйте і редагуйте мірки
|
||||||
Icon=tape
|
Icon=tape
|
||||||
Terminal=false
|
Terminal=false
|
||||||
MimeType=application/x-valentina-s-measurements;application/x-valentina-i-measurements;application/x-valentina-k-measurements;
|
MimeType=application/x-valentina-s-measurements;application/x-valentina-i-measurements;application/x-valentina-k-measurements
|
||||||
Categories=Qt;Utility;FileTools;Engineering;
|
Categories=Qt;Utility;FileTools;
|
||||||
TryExec=tape
|
TryExec=tape
|
||||||
Keywords=measurements;
|
Keywords=measurements;
|
||||||
StartupWMClass=tape
|
StartupWMClass=tape
|
||||||
|
|
2
dist/ua.com.smart-pattern.valentina.desktop
vendored
2
dist/ua.com.smart-pattern.valentina.desktop
vendored
|
@ -10,7 +10,7 @@ Comment[uk]=Створеня викрійок одягу
|
||||||
Icon=valentina
|
Icon=valentina
|
||||||
Terminal=false
|
Terminal=false
|
||||||
MimeType=application/x-valentina-pattern;
|
MimeType=application/x-valentina-pattern;
|
||||||
Categories=Graphics;VectorGraphics;2DGraphics;Qt;Engineering;FileTools;Utility;
|
Categories=Graphics;VectorGraphics;2DGraphics;Qt;Engineering;FileTools;
|
||||||
TryExec=valentina
|
TryExec=valentina
|
||||||
Keywords=pattern;
|
Keywords=pattern;
|
||||||
StartupWMClass=valentina
|
StartupWMClass=valentina
|
||||||
|
|
|
@ -282,7 +282,7 @@ VToolApp {
|
||||||
'application/x-valentina-k-measurements',
|
'application/x-valentina-k-measurements',
|
||||||
'application/x-valentina-layout'
|
'application/x-valentina-layout'
|
||||||
];
|
];
|
||||||
desktopKeys['MimeType'] = mimeTypes.join(';') + ';';
|
desktopKeys['MimeType'] = mimeTypes.join(';');
|
||||||
}
|
}
|
||||||
|
|
||||||
return (desktopKeys);
|
return (desktopKeys);
|
||||||
|
|
|
@ -1004,13 +1004,7 @@ auto VFoldLine::ThreeXPoints() const -> QVector<QVector<QPointF>>
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VFoldLine::TwoArrowsData() const -> ArrowsTextPosData
|
auto VFoldLine::TwoArrowsData() const -> ArrowsTextPosData
|
||||||
{
|
{
|
||||||
QT_WARNING_PUSH
|
|
||||||
QT_WARNING_DISABLE_GCC("-Wnoexcept")
|
|
||||||
|
|
||||||
ArrowsTextPosData data;
|
ArrowsTextPosData data;
|
||||||
|
|
||||||
QT_WARNING_POP
|
|
||||||
|
|
||||||
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
||||||
data.arrowsHeight = qFuzzyIsNull(m_height) ? defArrowsHeight : m_height;
|
data.arrowsHeight = qFuzzyIsNull(m_height) ? defArrowsHeight : m_height;
|
||||||
return data;
|
return data;
|
||||||
|
@ -1021,13 +1015,7 @@ auto VFoldLine::TwoArrowsTextAboveData() const -> ArrowsTextPosData
|
||||||
{
|
{
|
||||||
const qreal defLabelHeight = LabelTextHeight();
|
const qreal defLabelHeight = LabelTextHeight();
|
||||||
|
|
||||||
QT_WARNING_PUSH
|
|
||||||
QT_WARNING_DISABLE_GCC("-Wnoexcept")
|
|
||||||
|
|
||||||
ArrowsTextPosData data;
|
ArrowsTextPosData data;
|
||||||
|
|
||||||
QT_WARNING_POP
|
|
||||||
|
|
||||||
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
||||||
data.labelWidth = data.arrowsWidth;
|
data.labelWidth = data.arrowsWidth;
|
||||||
data.arrowsHeight =
|
data.arrowsHeight =
|
||||||
|
@ -1042,13 +1030,7 @@ auto VFoldLine::TwoArrowsTextUnderData() const -> ArrowsTextPosData
|
||||||
{
|
{
|
||||||
const qreal defLabelHeight = LabelTextHeight();
|
const qreal defLabelHeight = LabelTextHeight();
|
||||||
|
|
||||||
QT_WARNING_PUSH
|
|
||||||
QT_WARNING_DISABLE_GCC("-Wnoexcept")
|
|
||||||
|
|
||||||
ArrowsTextPosData data;
|
ArrowsTextPosData data;
|
||||||
|
|
||||||
QT_WARNING_POP
|
|
||||||
|
|
||||||
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
data.arrowsWidth = qFuzzyIsNull(m_width) ? m_foldLine.length() * 0.9 : qMin(m_width, m_foldLine.length());
|
||||||
data.labelWidth = data.arrowsWidth * 0.9;
|
data.labelWidth = data.arrowsWidth * 0.9;
|
||||||
data.labelHeight = qFuzzyIsNull(m_height) ? defLabelHeight : (defLabelHeight + CmToPixel(0.2)) - m_height;
|
data.labelHeight = qFuzzyIsNull(m_height) ? defLabelHeight : (defLabelHeight + CmToPixel(0.2)) - m_height;
|
||||||
|
|
Loading…
Reference in a new issue