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

Added default pattern label template.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-08-14 17:17:40 +03:00
parent 5c754a51d7
commit 0f4c993c83
11 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/OBS_debian/debian.valentina.dirs vendored
View File

@ -2,6 +2,7 @@
/usr/share/valentina/translations
/usr/share/valentina/tables/multisize
/usr/share/valentina/tables/templates
/usr/share/valentina/labels
/usr/share/mime/packages
/usr/share/applications

1
dist/OBS_debian/debian.valentina.install vendored
View File

@ -4,5 +4,6 @@ usr/share/valentina/*
usr/share/valentina/translations/*
usr/share/valentina/tables/multisize/*
usr/share/valentina/tables/templates/*
usr/share/valentina/labels/*
usr/share/pixmaps/*
usr/share/applications/*

12
dist/OBS_debian/debian.valentina.sharedmimeinfo vendored
View File

@ -76,8 +76,8 @@
<comment xml:lang="st">Valentina pattern</comment>
<comment xml:lang="sv">Valentina pattern</comment>
<comment xml:lang="ta">Valentina pattern</comment>
<comment xml:lang="te">OValentina pattern</comment>
<comment xml:lang="tg">OValentina pattern</comment>
<comment xml:lang="te">Valentina pattern</comment>
<comment xml:lang="tg">Valentina pattern</comment>
<comment xml:lang="th">Valentina pattern</comment>
<comment xml:lang="tn">Valentina pattern</comment>
<comment xml:lang="tr">Valentina pattern</comment>
@ -170,8 +170,8 @@
<comment xml:lang="st">Valentina individual measurments</comment>
<comment xml:lang="sv">Valentina individual measurments</comment>
<comment xml:lang="ta">Valentina individual measurments</comment>
<comment xml:lang="te">OValentina individual measurments</comment>
<comment xml:lang="tg">OValentina individual measurments</comment>
<comment xml:lang="te">Valentina individual measurments</comment>
<comment xml:lang="tg">Valentina individual measurments</comment>
<comment xml:lang="th">Valentina individual measurments</comment>
<comment xml:lang="tn">Valentina individual measurments</comment>
<comment xml:lang="tr">Valentina individual measurments</comment>
@ -264,8 +264,8 @@
<comment xml:lang="st">Valentina standard measurments</comment>
<comment xml:lang="sv">Valentina standard measurments</comment>
<comment xml:lang="ta">Valentina standard measurments</comment>
<comment xml:lang="te">OValentina standard measurments</comment>
<comment xml:lang="tg">OValentina standard measurments</comment>
<comment xml:lang="te">Valentina standard measurments</comment>
<comment xml:lang="tg">Valentina standard measurments</comment>
<comment xml:lang="th">Valentina standard measurments</comment>
<comment xml:lang="tn">Valentina standard measurments</comment>
<comment xml:lang="tr">Valentina standard measurments</comment>

1
dist/debian/valentina.dirs vendored
View File

@ -2,6 +2,7 @@
/usr/share/valentina/translations
/usr/share/valentina/tables/multisize
/usr/share/valentina/tables/templates
/usr/share/valentina/labels
/usr/share/mime/packages
/usr/share/applications

1
dist/debian/valentina.install vendored
View File

@ -4,5 +4,6 @@ usr/share/valentina/*
usr/share/valentina/translations/*
usr/share/valentina/tables/multisize/*
usr/share/valentina/tables/templates/*
usr/share/valentina/labels/*
usr/share/pixmaps/*
usr/share/applications/*

2
dist/rpm/valentina.spec vendored
View File

@ -154,6 +154,8 @@ fi
%{_datadir}/%{name}/tables/multisize/*.vst
%dir %{_datadir}/%{name}/tables/templates
%{_datadir}/%{name}/tables/templates/*.vit
%dir %{_datadir}/%{name}/labels
%{_datadir}/%{name}/labels/*.xml
%clean
rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dist/debian/%{name}

1
dist/win/inno/valentina.iss vendored
View File

@ -213,6 +213,7 @@ Source: ".\valentina\iconengines\*"; DestDir: "{app}\iconengines"; Flags: recurs
Source: ".\valentina\platforms\*"; DestDir: "{app}\platforms"; Flags: recursesubdirs createallsubdirs
Source: ".\valentina\printsupport\*"; DestDir: "{app}\printsupport"; Flags: recursesubdirs createallsubdirs
Source: ".\valentina\tables\*"; DestDir: "{app}\tables"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: ".\valentina\labels\*"; DestDir: "{app}\labels"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: ".\valentina\*.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: ".\valentina\*.dll"; DestDir: "{app}"
Source: ".\valentina\*.txt"; DestDir: "{app}"; Flags: ignoreversion

11
src/app/share/labels/def_pattern_label.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<version>1.0.0</version>
<lines>
<line alignment="0" bold="false" italic="false" text="%author%"/>
<line alignment="0" bold="false" italic="false" text="%patternName%"/>
<line alignment="0" bold="false" italic="false" text="%patternNumber%"/>
<line alignment="0" bold="false" italic="true" text="%customer%"/>
<line alignment="0" bold="false" italic="true" text="%date%"/>
</lines>
</template>

4
src/app/tables.pri
View File

@ -6,4 +6,8 @@ INSTALL_STANDARD_TEMPLATES += \
$$PWD/share/tables/templates/template_all_measurements.vit \
$$PWD/share/tables/templates/t_Aldrich_Women.vit
# Keep path to all label templates we provide right now
INSTALL_LABEL_TEMPLATES += $$PWD/share/labels/def_pattern_label.vst
copyToDestdir($$INSTALL_MULTISIZE_MEASUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/multisize))
copyToDestdir($$INSTALL_LABEL_TEMPLATES, $$shell_path($${OUT_PWD}/$$DESTDIR/labels))

16
src/app/valentina/valentina.pro
View File

@ -167,6 +167,10 @@ unix{
templates.path = /usr/share/$${TARGET}/tables/templates/
templates.files = $$INSTALL_STANDARD_TEMPLATES
# Path to label templates after installation
label.path = /usr/share/$${TARGET}/labels/
label.files = $$INSTALL_LABEL_TEMPLATES
INSTALLS += \
target \
tape \
@ -174,7 +178,8 @@ unix{
pixmaps \
translations \
multisize \
templates
templates \
label
}
macx{
# Some macx stuff
@ -234,6 +239,10 @@ unix{
templates.path = $$RESOURCES_DIR/tables/templates/
templates.files = $$INSTALL_STANDARD_TEMPLATES
# Path to label templates after installation
label.path = /usr/share/$${TARGET}/labels/
label.files = $$INSTALL_LABEL_TEMPLATES
icns_resources.path = $$RESOURCES_DIR/
icns_resources.files += $$PWD/../../../dist/macx/i-measurements.icns
icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns
@ -246,6 +255,7 @@ unix{
QMAKE_BUNDLE_DATA += \
templates \
multisize \
label \
libraries \
tape \
xpdf \
@ -316,6 +326,10 @@ win32:*g++* {
package_templates.files += $$INSTALL_STANDARD_TEMPLATES
INSTALLS += package_templates
package_labels.path = $${OUT_PWD}/../../../package/valentina/labels
package_labels.files += $$INSTALL_LABEL_TEMPLATES
INSTALLS += package_labels
package_translations.path = $${OUT_PWD}/../../../package/valentina/translations
package_translations.files += \
$$INSTALL_TRANSLATIONS \ # Valentina

2
src/libs/vmisc/vcommonsettings.cpp
View File

@ -48,7 +48,7 @@
const QString settingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
const QString settingPathsMultisizeMeasurements = QStringLiteral("paths/standard_measurements");
const QString settingPathsTemplates = QStringLiteral("paths/templates");
const QString settingPathsLabelTemplate = QStringLiteral("paths/labelTemplate");
const QString settingPathsLabelTemplate = QStringLiteral("paths/labels");
const QString settingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator");
const QString settingConfigurationAutosaveState = QStringLiteral("configuration/autosave/state");