diff --git a/dist/debian/menu b/dist/debian/menu index 3addde6b9..3e2e6f89d 100644 --- a/dist/debian/menu +++ b/dist/debian/menu @@ -1,2 +1,3 @@ ?package(valentina): needs="X11" section="Applications/Graphics" title="Valentina" command="valentina" ?package(valentina): needs="X11" section="Applications/Data Management" title="Tape" command="tape" +?package(valentina): needs="X11" section="Applications/Data Management" title="Puzzle" command="puzzle" diff --git a/dist/debian/source/include-binaries b/dist/debian/source/include-binaries index 5f9e9000a..92ff0082c 100644 --- a/dist/debian/source/include-binaries +++ b/dist/debian/source/include-binaries @@ -1,10 +1,13 @@ debian/usr/share/pixmaps/valentina.png debian/usr/share/pixmaps/tape.png +debian/usr/share/pixmaps/puzzle.png debian/usr/share/pixmaps/application-x-valentina-pattern.png debian/usr/share/pixmaps/application-x-valentina-i-measurements.png debian/usr/share/pixmaps/application-x-valentina-s-measurements.png +debian/usr/share/pixmaps/application-x-valentina-layout.png debian/valentina/usr/bin/valentina debian/valentina/usr/bin/tape +debian/valentina/usr/bin/puzzle debian/valentina/usr/share/valentina/diagrams.rcc debian/valentina/usr/share/valentina/translations/measurements_p0_cs_CZ.qm debian/valentina/usr/share/valentina/translations/measurements_p0_de_DE.qm diff --git a/dist/debian/valentina.manpages b/dist/debian/valentina.manpages index e2540884d..ca51f67c3 100644 --- a/dist/debian/valentina.manpages +++ b/dist/debian/valentina.manpages @@ -1,2 +1,3 @@ debian/valentina.1 debian/tape.1 +debian/puzzle.1 diff --git a/dist/debian/valentina.mime b/dist/debian/valentina.mime index 94de3debe..b863ec357 100644 --- a/dist/debian/valentina.mime +++ b/dist/debian/valentina.mime @@ -1,3 +1,4 @@ application/x-valentina-pattern; valentina %s; nametemplate=%s.val; description="Valentina pattern" edit=valentina '%s'; priority=6 application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurments" edit=tape '%s'; priority=6 application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina standard measurments" edit=tape '%s'; priority=6 +application/x-valentina-layout; puzzle %s; nametemplate=%s.vlt; description="Valentina layout" edit=puzzle '%s'; priority=6 diff --git a/dist/debian/valentina.sharedmimeinfo b/dist/debian/valentina.sharedmimeinfo index 41bb06377..ac60d8b05 100644 --- a/dist/debian/valentina.sharedmimeinfo +++ b/dist/debian/valentina.sharedmimeinfo @@ -282,4 +282,98 @@ + + + <_comment>Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina раскладка + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina розкладка + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + Valentina layout + + + diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild index e1721b09e..b5e2e5047 100644 --- a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild +++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild @@ -59,6 +59,7 @@ src_install() { doman dist/debian/${PN}.1 doman dist/debian/tape.1 + doman dist/debian/puzzle.1 cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die insinto /usr/share/mime/packages diff --git a/dist/macx/layout.icns b/dist/macx/layout.icns new file mode 100644 index 000000000..831979454 Binary files /dev/null and b/dist/macx/layout.icns differ diff --git a/dist/macx/puzzle/Info.plist b/dist/macx/puzzle/Info.plist index 5eaa2370b..b68500345 100755 --- a/dist/macx/puzzle/Info.plist +++ b/dist/macx/puzzle/Info.plist @@ -9,9 +9,9 @@ CFBundlePackageType APPL LSMinimumSystemVersion - 10.6 + 10.7 NSHumanReadableCopyright - © 2013-2020, Valentina project + © 2013-2021, Valentina project CFBundleSignature @TYPEINFO@ CFBundleExecutable @@ -19,11 +19,53 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.0 + 0.7.47 CFBundleVersion - 0.7.0.0 + 0.7.47.0 CFBundleInfoDictionaryVersion 6.0 + CFBundleDocumentTypes + + + CFBundleTypeRole + Editor + CFBundleTypeIconFile + layout.incs + LSItemContentTypes + + io.bitbucket.valentinaproject.vlt + + CFBundleTypeName + Valentina layout + LSHandlerRank + Owner + + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.text + public.xml + + UTTypeDescription + Valentina layout + UTTypeIconFile + layout.icns + UTTypeIdentifier + io.bitbucket.valentinaproject.vlt + UTTypeTagSpecification + + public.filename-extension + + vlt + + public.mime-type + text/xml + + + NSRequiresAquaSystemAppearance diff --git a/dist/puzzle.desktop b/dist/puzzle.desktop new file mode 100644 index 000000000..b166d63fe --- /dev/null +++ b/dist/puzzle.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Name=Puzzle +Exec=puzzle %F +Version=1.0 +GenericName=Valentina's layout editor +Comment=Create and edit layouts +Comment[uk]=Створюйте і редагуйте розкладки +Comment[ru]=Создавайте и редактируйте раскладку +Icon=puzzle +Terminal=false +MimeType=application/x-valentina-layout; +Categories=Qt;Utility;FileTools; +TryExec=puzzle diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 328c78c10..f5cdb0b93 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -151,6 +151,9 @@ gzip -9c dist/debian/%{name}.1 > dist/debian/%{name}.1.gz && gzip -9c dist/debian/tape.1 > dist/debian/tape.1.gz && %{__install} -Dm 644 dist/debian/tape.1.gz %{buildroot}%{_mandir}/man1/tape.1.gz +gzip -9c dist/debian/puzzle.1 > dist/debian/puzzle.1.gz && +%{__install} -Dm 644 dist/debian/puzzle.1.gz %{buildroot}%{_mandir}/man1/puzzle.1.gz + cp dist/debian/valentina.sharedmimeinfo dist/debian/%{name}.xml && %{__install} -Dm 644 dist/debian/%{name}.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml @@ -160,6 +163,7 @@ cp dist/debian/valentina.mime dist/debian/%{name} && %if 0%{?suse_version} > 0 %suse_update_desktop_file -r %{name} Graphics VectorGraphics 2DGraphics %suse_update_desktop_file -r tape Utility Applet +%suse_update_desktop_file -r puzzle Utility Applet %endif %post @@ -194,8 +198,10 @@ fi %license LICENSE_GPL.txt %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/tape.1* +%doc %{_mandir}/man1/puzzle.1* %{_bindir}/valentina %{_bindir}/tape +%{_bindir}/puzzle %{_libdir}/libvpropertyexplorer.so %{_libdir}/libvpropertyexplorer.so.* %{_libdir}/libqmuparser.so @@ -208,6 +214,7 @@ fi %{_datadir}/mime/packages/%{name}.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/tape.desktop +%{_datadir}/applications/puzzle.desktop %dir %{_datadir}/icons/ %dir %{_datadir}/icons/hicolor/ @@ -242,7 +249,7 @@ fi %{_datadir}/%{name}/labels/*.xml %clean -rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dist/debian/%{name} +rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/puzzle.1.gz dist/debian/%{name}.xml dist/debian/%{name} [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} diff --git a/dist/win/inno/valentina.iss b/dist/win/inno/valentina.iss index 518b888b3..3340818cc 100644 --- a/dist/win/inno/valentina.iss +++ b/dist/win/inno/valentina.iss @@ -86,6 +86,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip Name: "fileassoc1"; Description: "{cm:CreateFileAssocVal}"; GroupDescription: "{cm:FileAssoc}" Name: "fileassoc2"; Description: "{cm:CreateFileAssocVit}"; GroupDescription: "{cm:FileAssoc}" Name: "fileassoc3"; Description: "{cm:CreateFileAssocVst}"; GroupDescription: "{cm:FileAssoc}" +Name: "fileassoc4"; Description: "{cm:CreateFileAssocVlt}"; GroupDescription: "{cm:FileAssoc}" Name: "deletesettings"; Description: "{cm:RemoveAnyExistingSettings}"; GroupDescription: "{cm:ManageSettings}"; Flags: unchecked [Types] @@ -161,6 +162,7 @@ Name: "lang_files\chinese"; Description: "Chinese (China)"; Types: full custom; ; Signing Source: ".\valentina\valentina.exe"; DestDir: "{app}"; Flags: ignoreversion sign Source: ".\valentina\tape.exe"; DestDir: "{app}"; Flags: ignoreversion sign +Source: ".\valentina\puzzle.exe"; DestDir: "{app}"; Flags: ignoreversion sign Source: ".\valentina\vpropertyexplorer.dll"; DestDir: "{app}"; Flags: ignoreversion sign Source: ".\valentina\qmuparser2.dll"; DestDir: "{app}"; Flags: ignoreversion sign ; Localizations @@ -249,6 +251,7 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang Root: "HKCR"; Subkey: ".val"; ValueType: string; ValueName: ""; ValueData: "Valentina.Pattern"; Flags: uninsdeletevalue; Tasks: fileassoc1 Root: "HKCR"; Subkey: ".vit"; ValueType: string; ValueName: ""; ValueData: "Valentina.IndividualMeasurements"; Flags: uninsdeletevalue; Tasks: fileassoc2 Root: "HKCR"; Subkey: ".vst"; ValueType: string; ValueName: ""; ValueData: "Valentina.StandardMeasurements"; Flags: uninsdeletevalue; Tasks: fileassoc3 +Root: "HKCR"; Subkey: ".vlt"; ValueType: string; ValueName: ""; ValueData: "Valentina.Layout"; Flags: uninsdeletevalue; Tasks: fileassoc3 Root: "HKCR"; Subkey: "Valentina.Pattern"; ValueType: string; ValueData: "Valentina pattern file"; Flags: uninsdeletekey; Tasks: fileassoc1 Root: "HKCR"; Subkey: "Valentina.Pattern\DefaultIcon"; ValueType: string; ValueData: "{app}\pattern.ico,0"; Tasks: fileassoc1 @@ -262,6 +265,10 @@ Root: "HKCR"; Subkey: "Valentina.StandardMeasurements"; ValueType: string; Value Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\DefaultIcon"; ValueType: string; ValueData: "{app}\s-measurements.ico,0"; Tasks: fileassoc3 Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\shell\open\command"; ValueType: string; ValueData: """{app}\tape.exe"" ""%1"""; Tasks: fileassoc3 +Root: "HKCR"; Subkey: "Valentina.Layout"; ValueType: string; ValueData: "Valentina layout file"; Flags: uninsdeletekey; Tasks: fileassoc1 +Root: "HKCR"; Subkey: "Valentina.Layout\DefaultIcon"; ValueType: string; ValueData: "{app}\layout.ico,0"; Tasks: fileassoc1 +Root: "HKCR"; Subkey: "Valentina.Layout\shell\open\command"; ValueType: string; ValueData: """{app}\puzzle.exe"" ""%1"""; Tasks: fileassoc1 + [CustomMessages] FileAssoc = Create file associations english.FileAssoc = Create file associations @@ -287,6 +294,12 @@ russian.CreateFileAssocVst = *.vst (Мультиразмерный файл ме ukrainian.CreateFileAssocVst = *.vst (Мультирозмірний файл мірок) german.CreateFileAssocVst = *.vst (Multi-Size Maßdatei) +CreateFileAssocVlt = *.vlt (Layout file) +english.CreateFileAssocVlt = *.vlt (Layout file) +russian.CreateFileAssocVlt = *.vlt (Файл раскладки) +ukrainian.CreateFileAssocVlt = *.vlt (Файл роскладки) +german.CreateFileAssocVlt = *.vlt (Layoutdatei) + WarnRemoveOld = is installed at the moment. Remove old version? english.WarnRemoveOld = is installed at the moment. Remove old version? russian.WarnRemoveOld = установлена на данный момент. Удалить старую версию? diff --git a/dist/win/layout.ico b/dist/win/layout.ico new file mode 100644 index 000000000..3888c30e0 Binary files /dev/null and b/dist/win/layout.ico differ diff --git a/share/icons/128x128/apps/puzzle.png b/share/icons/128x128/apps/puzzle.png new file mode 100644 index 000000000..f28c66ef4 Binary files /dev/null and b/share/icons/128x128/apps/puzzle.png differ diff --git a/share/icons/128x128/mimetypes/application-x-valentina-layout.png b/share/icons/128x128/mimetypes/application-x-valentina-layout.png new file mode 100644 index 000000000..e424b5bb4 Binary files /dev/null and b/share/icons/128x128/mimetypes/application-x-valentina-layout.png differ diff --git a/share/icons/256x256/apps/puzzle.png b/share/icons/256x256/apps/puzzle.png new file mode 100644 index 000000000..d8b12f68b Binary files /dev/null and b/share/icons/256x256/apps/puzzle.png differ diff --git a/share/icons/256x256/mimetypes/application-x-valentina-layout.png b/share/icons/256x256/mimetypes/application-x-valentina-layout.png new file mode 100644 index 000000000..c71a5c413 Binary files /dev/null and b/share/icons/256x256/mimetypes/application-x-valentina-layout.png differ diff --git a/share/icons/48x48/apps/puzzle.png b/share/icons/48x48/apps/puzzle.png new file mode 100644 index 000000000..fe729270a Binary files /dev/null and b/share/icons/48x48/apps/puzzle.png differ diff --git a/share/icons/48x48/mimetypes/application-x-valentina-layout.png b/share/icons/48x48/mimetypes/application-x-valentina-layout.png new file mode 100644 index 000000000..d85f939c2 Binary files /dev/null and b/share/icons/48x48/mimetypes/application-x-valentina-layout.png differ diff --git a/share/icons/512x512/apps/puzzle.png b/share/icons/512x512/apps/puzzle.png new file mode 100644 index 000000000..03c919de0 Binary files /dev/null and b/share/icons/512x512/apps/puzzle.png differ diff --git a/share/icons/512x512/mimetypes/application-x-valentina-layout.png b/share/icons/512x512/mimetypes/application-x-valentina-layout.png new file mode 100644 index 000000000..9f370f115 Binary files /dev/null and b/share/icons/512x512/mimetypes/application-x-valentina-layout.png differ diff --git a/share/icons/64x64/apps/puzzle.png b/share/icons/64x64/apps/puzzle.png new file mode 100644 index 000000000..ea9aa050e Binary files /dev/null and b/share/icons/64x64/apps/puzzle.png differ diff --git a/share/icons/64x64/mimetypes/application-x-valentina-layout.png b/share/icons/64x64/mimetypes/application-x-valentina-layout.png new file mode 100644 index 000000000..2b37af605 Binary files /dev/null and b/share/icons/64x64/mimetypes/application-x-valentina-layout.png differ diff --git a/src/app/puzzle/puzzle.pro b/src/app/puzzle/puzzle.pro index 4d1e2fbd8..b77dc420f 100644 --- a/src/app/puzzle/puzzle.pro +++ b/src/app/puzzle/puzzle.pro @@ -66,17 +66,9 @@ include(../translations.pri) # Set "make install" command for Unix-like systems. unix{ - # Prefix for binary file. - isEmpty(PREFIX){ - PREFIX = $$DEFAULT_PREFIX - } - - unix:!macx{ - DATADIR =$$PREFIX/share - DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" - + !macx{ # Path to bin file after installation - target.path = $$PREFIX/bin + target.path = $$BINDIR INSTALLS += \ target @@ -112,8 +104,7 @@ unix{ QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/puzzle/Info.plist format.path = $$RESOURCES_DIR/ - format.files += $$PWD/../../../dist/macx/i-measurements.icns - format.files += $$PWD/../../../dist/macx/s-measurements.icns + format.files += $$PWD/../../../dist/macx/layout.icns QMAKE_BUNDLE_DATA += \ #libraries \ diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index f726878b6..1a77bfac3 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -149,66 +149,80 @@ unix{ tape.path = $$BINDIR tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape + puzzle.path = $$BINDIR + puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle + # .desktop file desktop.path = $$DATADIR/applications/ desktop.files += ../../../dist/$${TARGET}.desktop \ - desktop.files += ../../../dist/tape.desktop + desktop.files += ../../../dist/tape.desktop \ + desktop.files += ../../../dist/puzzle.desktop # logo hicolor_48_apps.path = $$DATADIR/icons/hicolor/48x48/apps/ hicolor_48_apps.files += \ ../../../share/icons/48x48/apps/$${TARGET}.png \ - ../../../share/icons/48x48/apps/tape.png + ../../../share/icons/48x48/apps/tape.png \ + ../../../share/icons/48x48/apps/puzzle.png hicolor_48_mimetypes.path = $$DATADIR/icons/hicolor/48x48/mimetypes/ hicolor_48_mimetypes.files += \ ../../../share/icons/48x48/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png \ - ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png + ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/48x48/mimetypes/application-x-valentina-layout.png hicolor_64_apps.path = $$DATADIR/icons/hicolor/64x64/apps/ hicolor_64_apps.files += \ ../../../share/icons/64x64/apps/$${TARGET}.png \ - ../../../share/icons/64x64/apps/tape.png + ../../../share/icons/64x64/apps/tape.png \ + ../../../share/icons/64x64/apps/puzzle.png hicolor_64_mimetypes.path = $$DATADIR/icons/hicolor/64x64/mimetypes/ hicolor_64_mimetypes.files += \ ../../../share/icons/64x64/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png \ - ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png + ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/64x64/mimetypes/application-x-valentina-layout.png hicolor_128_apps.path = $$DATADIR/icons/hicolor/128x128/apps/ hicolor_128_apps.files += \ ../../../share/icons/128x128/apps/$${TARGET}.png \ - ../../../share/icons/128x128/apps/tape.png + ../../../share/icons/128x128/apps/tape.png \ + ../../../share/icons/128x128/apps/puzzle.png hicolor_128_mimetypes.path = $$DATADIR/icons/hicolor/128x128/mimetypes/ hicolor_128_mimetypes.files += \ ../../../share/icons/128x128/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png \ - ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png + ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/128x128/mimetypes/application-x-valentina-layout.png hicolor_256_apps.path = $$DATADIR/icons/hicolor/256x256/apps/ hicolor_256_apps.files += \ ../../../share/icons/256x256/apps/$${TARGET}.png \ - ../../../share/icons/256x256/apps/tape.png + ../../../share/icons/256x256/apps/tape.png \ + ../../../share/icons/256x256/apps/puzzle.png hicolor_256_mimetypes.path = $$DATADIR/icons/hicolor/256x256/mimetypes/ hicolor_256_mimetypes.files += \ ../../../share/icons/256x256/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png \ - ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png + ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/256x256/mimetypes/application-x-valentina-layout.png hicolor_512_apps.path = $$DATADIR/icons/hicolor/512x512/apps/ hicolor_512_apps.files += \ ../../../share/icons/512x512/apps/$${TARGET}.png \ - ../../../share/icons/512x512/apps/tape.png + ../../../share/icons/512x512/apps/tape.png \ + ../../../share/icons/512x512/apps/puzzle.png hicolor_512_mimetypes.path = $$DATADIR/icons/hicolor/512x512/mimetypes/ hicolor_512_mimetypes.files += \ ../../../share/icons/512x512/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png \ - ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png + ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/512x512/mimetypes/application-x-valentina-layout.png # Path to translation files after installation translations.path = $$PKGDATADIR/translations/ @@ -229,6 +243,7 @@ unix{ INSTALLS += \ target \ tape \ + puzzle \ desktop \ hicolor_48_apps \ hicolor_48_mimetypes \ @@ -273,6 +288,9 @@ unix{ tape.path = $$MACOS_DIR tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$MACOS_DIR/tape + puzzle.path = $$MACOS_DIR + puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.app/$$MACOS_DIR/puzzle + # Utility pdftops need for saving a layout image to PS and EPS formates. xpdf.path = $$MACOS_DIR xpdf.files += $${PWD}/../../../dist/macx/bin64/pdftops @@ -298,6 +316,7 @@ unix{ icns_resources.files += $$PWD/../../../dist/macx/i-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/pattern.icns + icns_resources.files += $$PWD/../../../dist/macx/layout.icns # Copy to bundle multisize measurements files # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. @@ -309,6 +328,7 @@ unix{ label \ libraries \ tape \ + puzzle \ xpdf \ icns_resources } @@ -322,11 +342,13 @@ win32:*g++* { package.files += \ $${OUT_PWD}/$${DESTDIR}/valentina.exe \ $${OUT_PWD}/../tape/$${DESTDIR}/tape.exe \ + $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.exe \ $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc \ $$PWD/../../../dist/win/valentina.ico \ $$PWD/../../../dist/win/i-measurements.ico \ $$PWD/../../../dist/win/s-measurements.ico \ $$PWD/../../../dist/win/pattern.ico \ + $$PWD/../../../dist/win/layout.ico \ $$PWD/../../../dist/win/pdftops.exe \ $$PWD/../../../dist/win/EUDC.TTE \ $$PWD/../../../AUTHORS.txt \