diff --git a/src/app/app.pro b/src/app/app.pro index a8e1ac2a2..9e3840a62 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -1,670 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-06-18T12:36:43 -# -#------------------------------------------------- - -# Compilation main binary file - -# File with common stuff for whole project -include(../../Valentina.pri) - -# Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this -# library in installer. -QT += core gui widgets xml svg printsupport xmlpatterns - -# We want create executable file -TEMPLATE = app - -# Name of binary file -TARGET = valentina - -# Use out-of-source builds (shadow builds) -CONFIG -= debug_and_release debug_and_release_target - -# We use C++11 standard -CONFIG += c++11 - -# Since Qt 5.4.0 the source code location is recorded only in debug builds. -# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. -DEFINES += QT_MESSAGELOGCONTEXT - -# Directory for executable file -DESTDIR = bin - -# Directory for files created moc -MOC_DIR = moc - -# Directory for objecs files -OBJECTS_DIR = obj - -# Directory for files created rcc -RCC_DIR = rcc - -# Directory for files created uic -UI_DIR = uic - -# Suport subdirectories. Just better project code tree. -include(app.pri) - -# Resource files. This files will be included in binary. -RESOURCES += \ - share/resources/icon.qrc \ # All other icons except cursors and Windows theme. - share/resources/cursor.qrc \ # Tools cursor icons. - share/resources/theme.qrc \ # Windows theme icons. - share/resources/measurements.qrc \ # For measurements files that we save as resource. - share/resources/flags.qrc \ - share/resources/toolicon.qrc - -# Compilation will fail without this files after we added them to this section. -OTHER_FILES += \ - share/resources/valentina.rc \ # For Windows system. - share/resources/icon/64x64/icon64x64.ico # Valentina's logo. - -# Set using ccache. Function enable_ccache() defined in Valentina.pri. -macx { - CONFIG(debug, debug|release){ - $$enable_ccache()# Use only in debug mode on Mac - } -} else { - $$enable_ccache() -} - -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. -$$set_PCH() - -CONFIG(debug, debug|release){ - # Debug mode - unix { - #Turn on compilers warnings. - *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${UI_DIR}" \ - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - -isystem "$${OUT_PWD}/$${RCC_DIR}" \ - -isystem "$${OUT_PWD}/../libs/vtools/$${UI_DIR}" \ # For VTools UI files - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - - noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer - # do nothing - } else { - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer - QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS += -fsanitize=address - } - } - clang*{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${UI_DIR}" \ - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - -isystem "$${OUT_PWD}/$${RCC_DIR}" \ - -isystem "$${OUT_PWD}/../libs/vtools/$${UI_DIR}" \ # For VTools UI files - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. - - # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and - # want them in global list. Compromise decision delete them from local list. - QMAKE_CXXFLAGS -= \ - -Wmissing-prototypes \ - -Wundefined-reinterpret-cast - } - } else { - *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - } - } - - #Calculate latest tag distance and build revision only in release mode. Change number each time requare - #recompilation precompiled headers file. - DEFINES += "LATEST_TAG_DISTANCE=0" - DEFINES += "BUILD_REVISION=\\\"unknown\\\"" -}else{ - # Release mode - DEFINES += V_NO_ASSERT - !unix:*-g++{ - QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll - } - - noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols - # do nothing - } else { - # Turn on debug symbols in release mode on Unix systems. - # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ - QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 - QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 - QMAKE_LFLAGS_RELEASE = - } - } - - macx{ - HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS. - }else { - HG = hg # All other platforms all OK. - } - #latest tag distance number for using in version - HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') - isEmpty(HG_DISTANCE){ - HG_DISTANCE = 0 # if we can't find local revision left 0. - } - message("Latest tag distance:" $${HG_DISTANCE}) - DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. - - #build revision number for using in version - unix { - HG_HESH=$$system("$${HG} log -r. --template '{node|short}'") - } else { - # Use escape character before "|" on Windows - HG_HESH=$$system($${HG} log -r. --template "{node^|short}") - } - isEmpty(HG_HESH){ - HG_HESH = "unknown" # if we can't find build revision left unknown. - } - message("Build revision:" $${HG_HESH}) - DEFINES += "BUILD_REVISION=\\\"$${HG_HESH}\\\"" # Make available build revision number in sources. -} - -# Some extra information about Qt. Can be usefull. -message(Qt version: $$[QT_VERSION]) -message(Qt is installed in $$[QT_INSTALL_PREFIX]) -message(Qt resources can be found in the following locations:) -message(Documentation: $$[QT_INSTALL_DOCS]) -message(Header files: $$[QT_INSTALL_HEADERS]) -message(Libraries: $$[QT_INSTALL_LIBS]) -message(Binary files (executables): $$[QT_INSTALL_BINS]) -message(Plugins: $$[QT_INSTALL_PLUGINS]) -message(Data files: $$[QT_INSTALL_DATA]) -message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) -message(Settings: $$[QT_INSTALL_SETTINGS]) -message(Examples: $$[QT_INSTALL_EXAMPLES]) - -# Path to recource file. -win32:RC_FILE = share/resources/valentina.rc - -# Keep path to all files with standard measurements we support right now -INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst - -TRANSLATIONS_PATH = ../../share/translations - -# Add to this variable all translation files that you want install with program. -# For generation *.qm file first you need create *.ts. -# See section TRANSLATIONS in file ../../share/translations/translations.pro. -INSTALL_TRANSLATIONS += \ - $${TRANSLATIONS_PATH}/valentina_ru_RU.qm \ - $${TRANSLATIONS_PATH}/valentina_uk_UA.qm \ - $${TRANSLATIONS_PATH}/valentina_de_DE.qm \ - $${TRANSLATIONS_PATH}/valentina_cs_CZ.qm \ - $${TRANSLATIONS_PATH}/valentina_he_IL.qm \ - $${TRANSLATIONS_PATH}/valentina_fr_FR.qm \ - $${TRANSLATIONS_PATH}/valentina_it_IT.qm \ - $${TRANSLATIONS_PATH}/valentina_nl_NL.qm \ - $${TRANSLATIONS_PATH}/valentina_id_ID.qm \ - $${TRANSLATIONS_PATH}/valentina_es_ES.qm \ - $${TRANSLATIONS_PATH}/valentina_fi_FI.qm \ - $${TRANSLATIONS_PATH}/valentina_en_US.qm - -# 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\\\" - - # Path to bin file after installation - target.path = $$PREFIX/bin - - # .desktop file - desktop.path = $$DATADIR/applications/ - desktop.files += ../../dist/$${TARGET}.desktop - - # logo - pixmaps.path = $$DATADIR/pixmaps/ - pixmaps.files += ../../dist/$${TARGET}.png \ - ../../dist/application-x-valentina-pattern.png - - # Path to translation files after installation - translations.path = $$DATADIR/$${TARGET}/translations/ - translations.files = $$INSTALL_TRANSLATIONS - - # Path to standard measurement after installation - standard.path = $$DATADIR/$${TARGET}/tables/standard/ - standard.files = $$INSTALL_STANDARD_MEASHUREMENTS - - INSTALLS += \ - target \ - desktop \ - pixmaps \ - translations \ - standard - } - macx{ - # Some macx stuff - QMAKE_MAC_SDK = macosx - - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - # Path to resources in app bundle - RESOURCES_DIR = "Contents/Resources" - FRAMEWORKS_DIR = "Contents/Frameworks" - MACOS_DIR = "Contents/MacOS" - # On macx we will use app bundle. Bundle doesn't need bin directory inside. - # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. - target.path = $$MACOS_DIR - - # Copy in bundle translation files. - exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){ - TRANSLATION_ru_RU.files += \ - $${TRANSLATIONS_PATH}/valentina_ru_RU.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU - } - - exists($${TRANSLATIONS_PATH}/valentina_uk_UA.qm){ - TRANSLATION_uk_UA.files += \ - $${TRANSLATIONS_PATH}/valentina_uk_UA.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA - } - - exists($${TRANSLATIONS_PATH}/valentina_de_DE.qm){ - TRANSLATION_de_DE.files += \ - $${TRANSLATIONS_PATH}/valentina_de_DE.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_de_DE - } - - exists($${TRANSLATIONS_PATH}/valentina_cs_CZ.qm){ - TRANSLATION_cs_CZ.files += \ - $${TRANSLATIONS_PATH}/valentina_cs_CZ.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ - } - - exists($${TRANSLATIONS_PATH}/valentina_he_IL.qm){ - TRANSLATION_he_IL.files += \ - $${TRANSLATIONS_PATH}/valentina_he_IL.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_he_IL - } - - exists($${TRANSLATIONS_PATH}/valentina_fr_FR.qm){ - TRANSLATION_fr_FR.files += \ - $${TRANSLATIONS_PATH}/valentina_fr_FR.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR - } - - exists($${TRANSLATIONS_PATH}/valentina_it_IT.qm){ - TRANSLATION_it_IT.files += \ - $${TRANSLATIONS_PATH}/valentina_it_IT.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_it_IT - } - - exists($${TRANSLATIONS_PATH}/valentina_nl_NL.qm){ - TRANSLATION_nl_NL.files += \ - $${TRANSLATIONS_PATH}/valentina_nl_NL.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL - } - - exists($${TRANSLATIONS_PATH}/valentina_id_ID.qm){ - TRANSLATION_id_ID.files += \ - $${TRANSLATIONS_PATH}/valentina_id_ID.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_id_ID.path = "$$RESOURCES_DIR/translations/id_ID.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_id_ID - } - - exists($${TRANSLATIONS_PATH}/valentina_es_ES.qm){ - TRANSLATION_es_ES.files += \ - $${TRANSLATIONS_PATH}/valentina_es_ES.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_es_ES.path = "$$RESOURCES_DIR/translations/es_ES.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_es_ES - } - - exists($${TRANSLATIONS_PATH}/valentina_fi_FI.qm){ - TRANSLATION_fi_FI.files += \ - $${TRANSLATIONS_PATH}/valentina_fi_FI.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_fi_FI.path = "$$RESOURCES_DIR/translations/fi_FI.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI - } - - exists($${TRANSLATIONS_PATH}/valentina_en_US.qm){ - TRANSLATION_en_US.files += \ - $${TRANSLATIONS_PATH}/valentina_en_US.qm \ - $${TRANSLATIONS_PATH}/Localizable.strings - TRANSLATION_en_US.path = "$$RESOURCES_DIR/translations/en_US.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_en_US - } - - # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name. - # For bundle this names more then enough. We don't need care much about libraries versions. - libraries.path = $$FRAMEWORKS_DIR - libraries.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib - libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib - - # Utility pdftops need for saving a layout image to PS and EPS formates. - xpdf.path = $$MACOS_DIR - xpdf.files += $${PWD}/../../dist/macx/bin64/pdftops - - # logo on macx. - ICON = ../../dist/Valentina.icns - - # Copy to bundle standard measurements files - standard.path = $$RESOURCES_DIR/tables/standard/ - standard.files = $$INSTALL_STANDARD_MEASHUREMENTS - - QMAKE_BUNDLE_DATA += \ - standard \ - libraries \ - xpdf - } -} - -# "make install" command for Windows. -# Depend on nsis script and create installer in folder "package" -win32{ - package.path = $${OUT_PWD}/package/valentina - package.files += \ - $${OUT_PWD}/$${DESTDIR}/valentina.exe \ - $${OUT_PWD}/$${DESTDIR}/valentina.exe.dbg \ - $$PWD/../../dist/win/valentina.ico \ - $$PWD/../../dist/win/curl.exe \ - $$PWD/../../dist/win/exchndl.dll \ - $$PWD/../../dist/win/dbghelp.dll \ - $$PWD/../../dist/win/mgwhelp.dll \ - $$PWD/../../dist/win/symsrv.dll \ - $$PWD/../../dist/win/symsrv.yes \ - $$PWD/../../dist/win/pdftops.exe \ - $$PWD/../../AUTHORS.txt \ - $$PWD/../../LICENSE_GPL.txt \ - $$PWD/../../README.txt \ - $$PWD/../../ChangeLog.txt \ - $$PWD/../libs/qmuparser/LICENSE_BSD.txt \ - $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/qmuparser2.dll \ - $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/qmuparser2.dll.dbg \ - $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll \ - $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll.dbg \ - $$[QT_INSTALL_BINS]/icudt*.dll \ # Different name for different Qt releases - $$[QT_INSTALL_BINS]/icuin*.dll \ # Different name for different Qt releases - $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases - $$[QT_INSTALL_BINS]/Qt5Core.dll \ - $$[QT_INSTALL_BINS]/Qt5Gui.dll \ - $$[QT_INSTALL_BINS]/Qt5Network.dll \ - $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \ - $$[QT_INSTALL_BINS]/Qt5Svg.dll \ - $$[QT_INSTALL_BINS]/Qt5Widgets.dll \ - $$[QT_INSTALL_BINS]/Qt5Xml.dll \ - $$[QT_INSTALL_BINS]/Qt5XmlPatterns.dll \ - $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll - INSTALLS += package - - package_tables.path = $${OUT_PWD}/package/valentina/tables/standard - package_tables.files += $${OUT_PWD}/$${DESTDIR}/tables/standard/GOST_man_ru.vst - INSTALLS += package_tables - - package_translations.path = $${OUT_PWD}/package/valentina/translations - package_translations.files += \ - $$INSTALL_TRANSLATIONS \ # Valentina - $$[QT_INSTALL_TRANSLATIONS]/qt_ar.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_pl.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_pt.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_sk.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_sl.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_zh_TW.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_ca.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_cs.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_gl.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_he.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_hu.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_it.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_uk.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ca.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_cs.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_hu.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_it.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ja.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ru.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_sk.qm - INSTALLS += package_translations - - package_bearer.path = $${OUT_PWD}/package/valentina/bearer - package_bearer.files += \ - $$[QT_INSTALL_PLUGINS]/bearer/qgenericbearer.dll \ - $$[QT_INSTALL_PLUGINS]/bearer/qnativewifibearer.dll - INSTALLS += package_bearer - - package_iconengines.path = $${OUT_PWD}/package/valentina/iconengines - package_iconengines.files += $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon.dll - INSTALLS += package_iconengines - - package_imageformats.path = $${OUT_PWD}/package/valentina/imageformats - package_imageformats.files += \ - $$[QT_INSTALL_PLUGINS]/imageformats/qdds.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qgif.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qicns.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qico.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qjp2.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qmng.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qsvg.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtga.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtiff.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwebp.dll \ - INSTALLS += package_imageformats - - package_platforms.path = $${OUT_PWD}/package/valentina/platforms - package_platforms.files += $$[QT_INSTALL_PLUGINS]/platforms/qwindows.dll - INSTALLS += package_platforms - - package_printsupport.path = $${OUT_PWD}/package/valentina/printsupport - package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll - INSTALLS += package_printsupport - - package_nsis.path = $${OUT_PWD}/package - package_nsis.files += $$PWD/../../dist/win/nsis/valentina.nsi - INSTALLS += package_nsis - - package_nsis_headers.path = $${OUT_PWD}/package/headers - package_nsis_headers.files += \ - $$PWD/../../dist/win/nsis/headers/fileassoc.nsh \ - $$PWD/../../dist/win/nsis/headers/fileversion.nsh - INSTALLS += package_nsis_headers - - # Do the packaging - # First, mangle all of INSTALLS values. We depend on them. - unset(MANGLED_INSTALLS) - for(x, INSTALLS):MANGLED_INSTALLS += install_$${x} - build_package.path = $${OUT_PWD}/package - build_package.commands = \"C:/Program Files/NSIS/makensisw.exe\" \"$${OUT_PWD}/package/valentina.nsi\" - build_package.depends = $${MANGLED_INSTALLS} - INSTALLS += build_package -} - -# Some systems use special name for lrelease. For example opensuse 13.2 has lrelease-qt5. -isEmpty(LRELEASE){ - LRELEASE = lrelease -} - -# Run generation *.qm file for available *.ts files each time you run qmake. -for(_translation_name, INSTALL_TRANSLATIONS) { - _translation_name_qm = $$basename(_translation_name) - _translation_name_ts = $$section(_translation_name_qm, ".", 0, 0).ts - - system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) -removeidentical -nounfinished $$shell_path($${PWD}/$${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($${PWD}/$$_translation_name)) -} - -for(DIR, INSTALL_TRANSLATIONS) { - #add these absolute paths to a variable which - #ends up as 'mkcommands = path1 path2 path3 ...' - - tr_path += $${PWD}/$$DIR -} - -# Make possible run program even you do not install it. Seek files in local directory. -copyToDestdir($$tr_path, $$shell_path($${OUT_PWD}/$$DESTDIR/translations)) - -for(DIR, INSTALL_STANDARD_MEASHUREMENTS) { - #add these absolute paths to a variable which - #ends up as 'mkcommands = path1 path2 path3 ...' - st_path += $${PWD}/$$DIR -} - -copyToDestdir($$st_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard)) - -# When the GNU linker sees a library, it discards all symbols that it doesn't need. -# Add dependent library the first. - -#VTools static library (depend on VWidgets, VMisc, VPatternDB) -unix|win32: LIBS += -L$$OUT_PWD/../libs/vtools/$${DESTDIR}/ -lvtools - -INCLUDEPATH += $$PWD/../libs/vtools -INCLUDEPATH += $$OUT_PWD/../libs/vtools/$${UI_DIR} # For UI files -DEPENDPATH += $$PWD/../libs/vtools - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/vtools.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vtools/$${DESTDIR}/libvtools.a - -#VMisc static library -unix|win32: LIBS += -L$$OUT_PWD/../libs/vmisc/$${DESTDIR}/ -lvmisc - -INCLUDEPATH += $$PWD/../libs/vmisc -DEPENDPATH += $$PWD/../libs/vmisc - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a - -#VWidgets static library -unix|win32: LIBS += -L$$OUT_PWD/../libs/vwidgets/$${DESTDIR}/ -lvwidgets - -INCLUDEPATH += $$PWD/../libs/vwidgets -DEPENDPATH += $$PWD/../libs/vwidgets - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/vwidgets.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/libvwidgets.a - -#VPatternDB static library (depend on vgeometry) -unix|win32: LIBS += -L$$OUT_PWD/../libs/vpatterndb/$${DESTDIR} -lvpatterndb - -INCLUDEPATH += $$PWD/../libs/vpatterndb -DEPENDPATH += $$PWD/../libs/vpatterndb - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a - -# VGeometry static library (depend on ifc) -unix|win32: LIBS += -L$$OUT_PWD/../libs/vgeometry/$${DESTDIR}/ -lvgeometry - -INCLUDEPATH += $$PWD/../libs/vgeometry -DEPENDPATH += $$PWD/../libs/vgeometry - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/vgeometry.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/libvgeometry.a - -# IFC static library -unix|win32: LIBS += -L$$OUT_PWD/../libs/ifc/$${DESTDIR}/ -lifc - -INCLUDEPATH += $$PWD/../libs/ifc -DEPENDPATH += $$PWD/../libs/ifc - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/ifc/$${DESTDIR}/ifc.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/ifc/$${DESTDIR}/libifc.a - -# VObj static library -unix|win32: LIBS += -L$$OUT_PWD/../libs/vobj/$${DESTDIR}/ -lvobj - -INCLUDEPATH += $$PWD/../libs/vobj -DEPENDPATH += $$PWD/../libs/vobj - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vobj/$${DESTDIR}/vobj.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vobj/$${DESTDIR}/libvobj.a - -# VLayout static library -unix|win32: LIBS += -L$$OUT_PWD/../libs/vlayout/$${DESTDIR}/ -lvlayout - -INCLUDEPATH += $$PWD/../libs/vlayout -DEPENDPATH += $$PWD/../libs/vlayout - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/vlayout.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/libvlayout.a - -# QMuParser library -win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2 -else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser2 -else:unix: LIBS += -L$${OUT_PWD}/../libs/qmuparser/$${DESTDIR} -lqmuparser - -INCLUDEPATH += $${PWD}/../libs/qmuparser -DEPENDPATH += $${PWD}/../libs/qmuparser - -# VPropertyExplorer library -win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer -else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer -else:unix: LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer - -INCLUDEPATH += $${PWD}/../libs/vpropertyexplorer -DEPENDPATH += $${PWD}/../libs/vpropertyexplorer - -noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols - # do nothing -} else { - noStripDebugSymbols { # For enable run qmake with CONFIG+=noStripDebugSymbols - # do nothing - } else { - # Strip after you link all libaries. - CONFIG(release, debug|release){ - win32:!win32-msvc*{ - # Strip debug symbols. - QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && - QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && - QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} - } - - unix:!macx{ - # Strip debug symbols. - QMAKE_POST_LINK += objcopy --only-keep-debug ${TARGET} ${TARGET}.dbg && - QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} && - QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} - } - } - } -} - - -macx{ - # run macdeployqt to include all qt libraries in packet - QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app -} +TEMPLATE = subdirs +SUBDIRS = \ + valentina diff --git a/src/app/core/core.pri b/src/app/valentina/core/core.pri similarity index 100% rename from src/app/core/core.pri rename to src/app/valentina/core/core.pri diff --git a/src/app/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp similarity index 98% rename from src/app/core/vapplication.cpp rename to src/app/valentina/core/vapplication.cpp index 91415c7ed..732bfa647 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -27,12 +27,12 @@ *************************************************************************/ #include "vapplication.h" -#include "../libs/ifc/exception/vexceptionobjecterror.h" -#include "../libs/ifc/exception/vexceptionbadid.h" -#include "../libs/ifc/exception/vexceptionconversionerror.h" -#include "../libs/ifc/exception/vexceptionemptyparameter.h" -#include "../libs/ifc/exception/vexceptionwrongid.h" -#include "../libs/vwidgets/vmaingraphicsview.h" +#include "..//ifc/exception/vexceptionobjecterror.h" +#include "../ifc/exception/vexceptionbadid.h" +#include "../ifc/exception/vexceptionconversionerror.h" +#include "../ifc/exception/vexceptionemptyparameter.h" +#include "../ifc/exception/vexceptionwrongid.h" +#include "../vwidgets/vmaingraphicsview.h" #include "../version.h" #include "../vmisc/logging.h" diff --git a/src/app/core/vapplication.h b/src/app/valentina/core/vapplication.h similarity index 96% rename from src/app/core/vapplication.h rename to src/app/valentina/core/vapplication.h index 82962ce9e..b4c1a2ae2 100644 --- a/src/app/core/vapplication.h +++ b/src/app/valentina/core/vapplication.h @@ -29,10 +29,10 @@ #ifndef VAPPLICATION_H #define VAPPLICATION_H -#include "../libs/vmisc/vabstractapplication.h" +#include "../vmisc/vabstractapplication.h" #include "../options.h" -#include "../libs/vwidgets/vmaingraphicsview.h" -#include "../libs/vpatterndb/vtranslatevars.h" +#include "../vwidgets/vmaingraphicsview.h" +#include "../vpatterndb/vtranslatevars.h" #include "vsettings.h" class VApplication;// use in define diff --git a/src/app/core/vformulaproperty.cpp b/src/app/valentina/core/vformulaproperty.cpp similarity index 100% rename from src/app/core/vformulaproperty.cpp rename to src/app/valentina/core/vformulaproperty.cpp diff --git a/src/app/core/vformulaproperty.h b/src/app/valentina/core/vformulaproperty.h similarity index 100% rename from src/app/core/vformulaproperty.h rename to src/app/valentina/core/vformulaproperty.h diff --git a/src/app/core/vformulapropertyeditor.cpp b/src/app/valentina/core/vformulapropertyeditor.cpp similarity index 100% rename from src/app/core/vformulapropertyeditor.cpp rename to src/app/valentina/core/vformulapropertyeditor.cpp diff --git a/src/app/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h similarity index 100% rename from src/app/core/vformulapropertyeditor.h rename to src/app/valentina/core/vformulapropertyeditor.h diff --git a/src/app/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp similarity index 100% rename from src/app/core/vtooloptionspropertybrowser.cpp rename to src/app/valentina/core/vtooloptionspropertybrowser.cpp diff --git a/src/app/core/vtooloptionspropertybrowser.h b/src/app/valentina/core/vtooloptionspropertybrowser.h similarity index 100% rename from src/app/core/vtooloptionspropertybrowser.h rename to src/app/valentina/core/vtooloptionspropertybrowser.h diff --git a/src/app/dialogs/configdialog.cpp b/src/app/valentina/dialogs/configdialog.cpp similarity index 100% rename from src/app/dialogs/configdialog.cpp rename to src/app/valentina/dialogs/configdialog.cpp diff --git a/src/app/dialogs/configdialog.h b/src/app/valentina/dialogs/configdialog.h similarity index 100% rename from src/app/dialogs/configdialog.h rename to src/app/valentina/dialogs/configdialog.h diff --git a/src/app/dialogs/configpages/communitypage.cpp b/src/app/valentina/dialogs/configpages/communitypage.cpp similarity index 99% rename from src/app/dialogs/configpages/communitypage.cpp rename to src/app/valentina/dialogs/configpages/communitypage.cpp index c7e20a98a..9cd3729b7 100644 --- a/src/app/dialogs/configpages/communitypage.cpp +++ b/src/app/valentina/dialogs/configpages/communitypage.cpp @@ -29,7 +29,7 @@ #include "communitypage.h" #include "../../options.h" #include "../../core/vapplication.h" -#include "../../../libs/vmisc/vsettings.h" +#include "../vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/configpages/communitypage.h b/src/app/valentina/dialogs/configpages/communitypage.h similarity index 100% rename from src/app/dialogs/configpages/communitypage.h rename to src/app/valentina/dialogs/configpages/communitypage.h diff --git a/src/app/dialogs/configpages/configurationpage.cpp b/src/app/valentina/dialogs/configpages/configurationpage.cpp similarity index 99% rename from src/app/dialogs/configpages/configurationpage.cpp rename to src/app/valentina/dialogs/configpages/configurationpage.cpp index 3a4e7a694..b1b0f9806 100644 --- a/src/app/dialogs/configpages/configurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/configurationpage.cpp @@ -29,7 +29,7 @@ #include "configurationpage.h" #include "../../options.h" #include "../../core/vapplication.h" -#include "../../../libs/vmisc/vsettings.h" +#include "../vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/configpages/configurationpage.h b/src/app/valentina/dialogs/configpages/configurationpage.h similarity index 100% rename from src/app/dialogs/configpages/configurationpage.h rename to src/app/valentina/dialogs/configpages/configurationpage.h diff --git a/src/app/dialogs/configpages/pages.h b/src/app/valentina/dialogs/configpages/pages.h similarity index 100% rename from src/app/dialogs/configpages/pages.h rename to src/app/valentina/dialogs/configpages/pages.h diff --git a/src/app/dialogs/configpages/pathpage.cpp b/src/app/valentina/dialogs/configpages/pathpage.cpp similarity index 99% rename from src/app/dialogs/configpages/pathpage.cpp rename to src/app/valentina/dialogs/configpages/pathpage.cpp index 6b27c6c6a..e244ef747 100644 --- a/src/app/dialogs/configpages/pathpage.cpp +++ b/src/app/valentina/dialogs/configpages/pathpage.cpp @@ -29,7 +29,7 @@ #include "pathpage.h" #include "../../options.h" #include "../../core/vapplication.h" -#include "../../../libs/vmisc/vsettings.h" +#include "../vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/configpages/pathpage.h b/src/app/valentina/dialogs/configpages/pathpage.h similarity index 100% rename from src/app/dialogs/configpages/pathpage.h rename to src/app/valentina/dialogs/configpages/pathpage.h diff --git a/src/app/dialogs/configpages/patternpage.cpp b/src/app/valentina/dialogs/configpages/patternpage.cpp similarity index 98% rename from src/app/dialogs/configpages/patternpage.cpp rename to src/app/valentina/dialogs/configpages/patternpage.cpp index f9d59e30d..3360e7dc1 100644 --- a/src/app/dialogs/configpages/patternpage.cpp +++ b/src/app/valentina/dialogs/configpages/patternpage.cpp @@ -29,8 +29,8 @@ #include "patternpage.h" #include "../../options.h" #include "../../core/vapplication.h" -#include "../../../libs/vmisc/vsettings.h" -#include "../../../libs/vwidgets/vmaingraphicsview.h" +#include "../vmisc/vsettings.h" +#include "../vwidgets/vmaingraphicsview.h" #include #include #include diff --git a/src/app/dialogs/configpages/patternpage.h b/src/app/valentina/dialogs/configpages/patternpage.h similarity index 100% rename from src/app/dialogs/configpages/patternpage.h rename to src/app/valentina/dialogs/configpages/patternpage.h diff --git a/src/app/dialogs/dialogaboutapp.cpp b/src/app/valentina/dialogs/dialogaboutapp.cpp similarity index 100% rename from src/app/dialogs/dialogaboutapp.cpp rename to src/app/valentina/dialogs/dialogaboutapp.cpp diff --git a/src/app/dialogs/dialogaboutapp.h b/src/app/valentina/dialogs/dialogaboutapp.h similarity index 100% rename from src/app/dialogs/dialogaboutapp.h rename to src/app/valentina/dialogs/dialogaboutapp.h diff --git a/src/app/dialogs/dialogaboutapp.ui b/src/app/valentina/dialogs/dialogaboutapp.ui similarity index 100% rename from src/app/dialogs/dialogaboutapp.ui rename to src/app/valentina/dialogs/dialogaboutapp.ui diff --git a/src/app/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp similarity index 100% rename from src/app/dialogs/dialoghistory.cpp rename to src/app/valentina/dialogs/dialoghistory.cpp diff --git a/src/app/dialogs/dialoghistory.h b/src/app/valentina/dialogs/dialoghistory.h similarity index 100% rename from src/app/dialogs/dialoghistory.h rename to src/app/valentina/dialogs/dialoghistory.h diff --git a/src/app/dialogs/dialoghistory.ui b/src/app/valentina/dialogs/dialoghistory.ui similarity index 100% rename from src/app/dialogs/dialoghistory.ui rename to src/app/valentina/dialogs/dialoghistory.ui diff --git a/src/app/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp similarity index 100% rename from src/app/dialogs/dialogincrements.cpp rename to src/app/valentina/dialogs/dialogincrements.cpp diff --git a/src/app/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h similarity index 100% rename from src/app/dialogs/dialogincrements.h rename to src/app/valentina/dialogs/dialogincrements.h diff --git a/src/app/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui similarity index 100% rename from src/app/dialogs/dialogincrements.ui rename to src/app/valentina/dialogs/dialogincrements.ui diff --git a/src/app/dialogs/dialogindividualmeasurements.cpp b/src/app/valentina/dialogs/dialogindividualmeasurements.cpp similarity index 100% rename from src/app/dialogs/dialogindividualmeasurements.cpp rename to src/app/valentina/dialogs/dialogindividualmeasurements.cpp diff --git a/src/app/dialogs/dialogindividualmeasurements.h b/src/app/valentina/dialogs/dialogindividualmeasurements.h similarity index 100% rename from src/app/dialogs/dialogindividualmeasurements.h rename to src/app/valentina/dialogs/dialogindividualmeasurements.h diff --git a/src/app/dialogs/dialogindividualmeasurements.ui b/src/app/valentina/dialogs/dialogindividualmeasurements.ui similarity index 100% rename from src/app/dialogs/dialogindividualmeasurements.ui rename to src/app/valentina/dialogs/dialogindividualmeasurements.ui diff --git a/src/app/dialogs/dialoglayoutprogress.cpp b/src/app/valentina/dialogs/dialoglayoutprogress.cpp similarity index 100% rename from src/app/dialogs/dialoglayoutprogress.cpp rename to src/app/valentina/dialogs/dialoglayoutprogress.cpp diff --git a/src/app/dialogs/dialoglayoutprogress.h b/src/app/valentina/dialogs/dialoglayoutprogress.h similarity index 100% rename from src/app/dialogs/dialoglayoutprogress.h rename to src/app/valentina/dialogs/dialoglayoutprogress.h diff --git a/src/app/dialogs/dialoglayoutprogress.ui b/src/app/valentina/dialogs/dialoglayoutprogress.ui similarity index 100% rename from src/app/dialogs/dialoglayoutprogress.ui rename to src/app/valentina/dialogs/dialoglayoutprogress.ui diff --git a/src/app/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp similarity index 100% rename from src/app/dialogs/dialoglayoutsettings.cpp rename to src/app/valentina/dialogs/dialoglayoutsettings.cpp diff --git a/src/app/dialogs/dialoglayoutsettings.h b/src/app/valentina/dialogs/dialoglayoutsettings.h similarity index 100% rename from src/app/dialogs/dialoglayoutsettings.h rename to src/app/valentina/dialogs/dialoglayoutsettings.h diff --git a/src/app/dialogs/dialoglayoutsettings.ui b/src/app/valentina/dialogs/dialoglayoutsettings.ui similarity index 100% rename from src/app/dialogs/dialoglayoutsettings.ui rename to src/app/valentina/dialogs/dialoglayoutsettings.ui diff --git a/src/app/dialogs/dialogmeasurements.cpp b/src/app/valentina/dialogs/dialogmeasurements.cpp similarity index 100% rename from src/app/dialogs/dialogmeasurements.cpp rename to src/app/valentina/dialogs/dialogmeasurements.cpp diff --git a/src/app/dialogs/dialogmeasurements.h b/src/app/valentina/dialogs/dialogmeasurements.h similarity index 100% rename from src/app/dialogs/dialogmeasurements.h rename to src/app/valentina/dialogs/dialogmeasurements.h diff --git a/src/app/dialogs/dialogmeasurements.ui b/src/app/valentina/dialogs/dialogmeasurements.ui similarity index 100% rename from src/app/dialogs/dialogmeasurements.ui rename to src/app/valentina/dialogs/dialogmeasurements.ui diff --git a/src/app/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp similarity index 100% rename from src/app/dialogs/dialogpatternproperties.cpp rename to src/app/valentina/dialogs/dialogpatternproperties.cpp diff --git a/src/app/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h similarity index 100% rename from src/app/dialogs/dialogpatternproperties.h rename to src/app/valentina/dialogs/dialogpatternproperties.h diff --git a/src/app/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui similarity index 100% rename from src/app/dialogs/dialogpatternproperties.ui rename to src/app/valentina/dialogs/dialogpatternproperties.ui diff --git a/src/app/dialogs/dialogpatternxmledit.cpp b/src/app/valentina/dialogs/dialogpatternxmledit.cpp similarity index 100% rename from src/app/dialogs/dialogpatternxmledit.cpp rename to src/app/valentina/dialogs/dialogpatternxmledit.cpp diff --git a/src/app/dialogs/dialogpatternxmledit.h b/src/app/valentina/dialogs/dialogpatternxmledit.h similarity index 100% rename from src/app/dialogs/dialogpatternxmledit.h rename to src/app/valentina/dialogs/dialogpatternxmledit.h diff --git a/src/app/dialogs/dialogpatternxmledit.ui b/src/app/valentina/dialogs/dialogpatternxmledit.ui similarity index 100% rename from src/app/dialogs/dialogpatternxmledit.ui rename to src/app/valentina/dialogs/dialogpatternxmledit.ui diff --git a/src/app/dialogs/dialogs.h b/src/app/valentina/dialogs/dialogs.h similarity index 100% rename from src/app/dialogs/dialogs.h rename to src/app/valentina/dialogs/dialogs.h diff --git a/src/app/dialogs/dialogs.pri b/src/app/valentina/dialogs/dialogs.pri similarity index 100% rename from src/app/dialogs/dialogs.pri rename to src/app/valentina/dialogs/dialogs.pri diff --git a/src/app/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp similarity index 100% rename from src/app/dialogs/dialogsavelayout.cpp rename to src/app/valentina/dialogs/dialogsavelayout.cpp diff --git a/src/app/dialogs/dialogsavelayout.h b/src/app/valentina/dialogs/dialogsavelayout.h similarity index 100% rename from src/app/dialogs/dialogsavelayout.h rename to src/app/valentina/dialogs/dialogsavelayout.h diff --git a/src/app/dialogs/dialogsavelayout.ui b/src/app/valentina/dialogs/dialogsavelayout.ui similarity index 100% rename from src/app/dialogs/dialogsavelayout.ui rename to src/app/valentina/dialogs/dialogsavelayout.ui diff --git a/src/app/dialogs/dialogstandardmeasurements.cpp b/src/app/valentina/dialogs/dialogstandardmeasurements.cpp similarity index 100% rename from src/app/dialogs/dialogstandardmeasurements.cpp rename to src/app/valentina/dialogs/dialogstandardmeasurements.cpp diff --git a/src/app/dialogs/dialogstandardmeasurements.h b/src/app/valentina/dialogs/dialogstandardmeasurements.h similarity index 100% rename from src/app/dialogs/dialogstandardmeasurements.h rename to src/app/valentina/dialogs/dialogstandardmeasurements.h diff --git a/src/app/dialogs/dialogstandardmeasurements.ui b/src/app/valentina/dialogs/dialogstandardmeasurements.ui similarity index 100% rename from src/app/dialogs/dialogstandardmeasurements.ui rename to src/app/valentina/dialogs/dialogstandardmeasurements.ui diff --git a/src/app/doc/doxygen/Doxyfile b/src/app/valentina/doc/doxygen/Doxyfile similarity index 100% rename from src/app/doc/doxygen/Doxyfile rename to src/app/valentina/doc/doxygen/Doxyfile diff --git a/src/app/doc/doxygen/logo.png b/src/app/valentina/doc/doxygen/logo.png similarity index 100% rename from src/app/doc/doxygen/logo.png rename to src/app/valentina/doc/doxygen/logo.png diff --git a/src/app/main.cpp b/src/app/valentina/main.cpp similarity index 100% rename from src/app/main.cpp rename to src/app/valentina/main.cpp diff --git a/src/app/mainwindow.cpp b/src/app/valentina/mainwindow.cpp similarity index 99% rename from src/app/mainwindow.cpp rename to src/app/valentina/mainwindow.cpp index 5285da6ce..17965b55d 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -28,7 +28,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include "../libs/vgeometry/vspline.h" +#include "../vgeometry/vspline.h" #include "exception/vexceptionobjecterror.h" #include "exception/vexceptionconversionerror.h" #include "exception/vexceptionemptyparameter.h" @@ -38,12 +38,12 @@ #include "xml/vstandardmeasurements.h" #include "xml/vindividualmeasurements.h" #include "core/vapplication.h" -#include "../libs/vmisc/undoevent.h" -#include "../libs/vmisc/vsettings.h" +#include "../vmisc/undoevent.h" +#include "../vmisc/vsettings.h" #include "undocommands/renamepp.h" #include "core/vtooloptionspropertybrowser.h" #include "options.h" -#include "../libs/ifc/xml/vpatternconverter.h" +#include "../ifc/xml/vpatternconverter.h" #include "../vmisc/logging.h" #include diff --git a/src/app/mainwindow.h b/src/app/valentina/mainwindow.h similarity index 99% rename from src/app/mainwindow.h rename to src/app/valentina/mainwindow.h index 08975286a..b4df8102a 100644 --- a/src/app/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -30,8 +30,8 @@ #define MAINWINDOW_H #include "mainwindowsnogui.h" -#include "../libs/vwidgets/vmaingraphicsview.h" -#include "../libs/vtools/dialogs/tooldialogs.h" +#include "../vwidgets/vmaingraphicsview.h" +#include "../vtools/dialogs/tooldialogs.h" #include "dialogs/dialogs.h" #include "tools/vtooldetail.h" #include "tools/vtooluniondetails.h" diff --git a/src/app/mainwindow.ui b/src/app/valentina/mainwindow.ui similarity index 100% rename from src/app/mainwindow.ui rename to src/app/valentina/mainwindow.ui diff --git a/src/app/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp similarity index 99% rename from src/app/mainwindowsnogui.cpp rename to src/app/valentina/mainwindowsnogui.cpp index 6f94254dc..50f9d2b4f 100644 --- a/src/app/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -28,13 +28,13 @@ #include "mainwindowsnogui.h" #include "core/vapplication.h" -#include "../libs/vpatterndb/vcontainer.h" -#include "../libs/vobj/vobjpaintdevice.h" +#include "../vpatterndb/vcontainer.h" +#include "../vobj/vobjpaintdevice.h" #include "dialogs/dialoglayoutsettings.h" -#include "../libs/vlayout/vlayoutgenerator.h" +#include "../vlayout/vlayoutgenerator.h" #include "dialogs/dialoglayoutprogress.h" #include "dialogs/dialogsavelayout.h" -#include "../libs/vlayout/vposter.h" +#include "../vlayout/vposter.h" #include #include diff --git a/src/app/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h similarity index 97% rename from src/app/mainwindowsnogui.h rename to src/app/valentina/mainwindowsnogui.h index 4b1b78760..5823bd515 100644 --- a/src/app/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -31,8 +31,8 @@ #include -#include "../libs/vpatterndb/vdetail.h" -#include "../libs/vlayout/vlayoutdetail.h" +#include "../vpatterndb/vdetail.h" +#include "../vlayout/vlayoutdetail.h" #include "xml/vpattern.h" class QGraphicsScene; diff --git a/src/app/options.h b/src/app/valentina/options.h similarity index 93% rename from src/app/options.h rename to src/app/valentina/options.h index 61d989004..b12577d7a 100644 --- a/src/app/options.h +++ b/src/app/valentina/options.h @@ -29,9 +29,9 @@ #ifndef OPTIONS_H #define OPTIONS_H -#include "../libs/ifc/ifcdef.h" -#include "../libs/vgeometry/vgeometrydef.h" -#include "../libs/qmuparser/qmudef.h" +#include "../ifc/ifcdef.h" +#include "../vgeometry/vgeometrydef.h" +#include "../qmuparser/qmudef.h" #include "../vmisc/def.h" #ifdef Q_OS_WIN32 diff --git a/src/app/share/resources/cursor.qrc b/src/app/valentina/share/resources/cursor.qrc similarity index 100% rename from src/app/share/resources/cursor.qrc rename to src/app/valentina/share/resources/cursor.qrc diff --git a/src/app/share/resources/cursor/alongline_cursor.png b/src/app/valentina/share/resources/cursor/alongline_cursor.png similarity index 100% rename from src/app/share/resources/cursor/alongline_cursor.png rename to src/app/valentina/share/resources/cursor/alongline_cursor.png diff --git a/src/app/share/resources/cursor/arc_cursor.png b/src/app/valentina/share/resources/cursor/arc_cursor.png similarity index 100% rename from src/app/share/resources/cursor/arc_cursor.png rename to src/app/valentina/share/resources/cursor/arc_cursor.png diff --git a/src/app/share/resources/cursor/arc_cut_cursor.png b/src/app/valentina/share/resources/cursor/arc_cut_cursor.png similarity index 100% rename from src/app/share/resources/cursor/arc_cut_cursor.png rename to src/app/valentina/share/resources/cursor/arc_cut_cursor.png diff --git a/src/app/share/resources/cursor/arc_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png similarity index 100% rename from src/app/share/resources/cursor/arc_intersect_axis_cursor.png rename to src/app/valentina/share/resources/cursor/arc_intersect_axis_cursor.png diff --git a/src/app/share/resources/cursor/arc_with_length_cursor.png b/src/app/valentina/share/resources/cursor/arc_with_length_cursor.png similarity index 100% rename from src/app/share/resources/cursor/arc_with_length_cursor.png rename to src/app/valentina/share/resources/cursor/arc_with_length_cursor.png diff --git a/src/app/share/resources/cursor/bisector_cursor.png b/src/app/valentina/share/resources/cursor/bisector_cursor.png similarity index 100% rename from src/app/share/resources/cursor/bisector_cursor.png rename to src/app/valentina/share/resources/cursor/bisector_cursor.png diff --git a/src/app/share/resources/cursor/cursor-arrow-closehand.png b/src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png similarity index 100% rename from src/app/share/resources/cursor/cursor-arrow-closehand.png rename to src/app/valentina/share/resources/cursor/cursor-arrow-closehand.png diff --git a/src/app/share/resources/cursor/cursor-arrow-openhand.png b/src/app/valentina/share/resources/cursor/cursor-arrow-openhand.png similarity index 100% rename from src/app/share/resources/cursor/cursor-arrow-openhand.png rename to src/app/valentina/share/resources/cursor/cursor-arrow-openhand.png diff --git a/src/app/share/resources/cursor/curve_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png similarity index 100% rename from src/app/share/resources/cursor/curve_intersect_axis_cursor.png rename to src/app/valentina/share/resources/cursor/curve_intersect_axis_cursor.png diff --git a/src/app/share/resources/cursor/endline_cursor.png b/src/app/valentina/share/resources/cursor/endline_cursor.png similarity index 100% rename from src/app/share/resources/cursor/endline_cursor.png rename to src/app/valentina/share/resources/cursor/endline_cursor.png diff --git a/src/app/share/resources/cursor/height_cursor.png b/src/app/valentina/share/resources/cursor/height_cursor.png similarity index 100% rename from src/app/share/resources/cursor/height_cursor.png rename to src/app/valentina/share/resources/cursor/height_cursor.png diff --git a/src/app/share/resources/cursor/intersect_cursor.png b/src/app/valentina/share/resources/cursor/intersect_cursor.png similarity index 100% rename from src/app/share/resources/cursor/intersect_cursor.png rename to src/app/valentina/share/resources/cursor/intersect_cursor.png diff --git a/src/app/share/resources/cursor/line_cursor.png b/src/app/valentina/share/resources/cursor/line_cursor.png similarity index 100% rename from src/app/share/resources/cursor/line_cursor.png rename to src/app/valentina/share/resources/cursor/line_cursor.png diff --git a/src/app/share/resources/cursor/line_intersect_axis_cursor.png b/src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png similarity index 100% rename from src/app/share/resources/cursor/line_intersect_axis_cursor.png rename to src/app/valentina/share/resources/cursor/line_intersect_axis_cursor.png diff --git a/src/app/share/resources/cursor/new_detail_cursor.png b/src/app/valentina/share/resources/cursor/new_detail_cursor.png similarity index 100% rename from src/app/share/resources/cursor/new_detail_cursor.png rename to src/app/valentina/share/resources/cursor/new_detail_cursor.png diff --git a/src/app/share/resources/cursor/normal_cursor.png b/src/app/valentina/share/resources/cursor/normal_cursor.png similarity index 100% rename from src/app/share/resources/cursor/normal_cursor.png rename to src/app/valentina/share/resources/cursor/normal_cursor.png diff --git a/src/app/share/resources/cursor/point_from_arc_and_tangent_cursor.png b/src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png similarity index 100% rename from src/app/share/resources/cursor/point_from_arc_and_tangent_cursor.png rename to src/app/valentina/share/resources/cursor/point_from_arc_and_tangent_cursor.png diff --git a/src/app/share/resources/cursor/point_from_circle_and_tangent_cursor.png b/src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png similarity index 100% rename from src/app/share/resources/cursor/point_from_circle_and_tangent_cursor.png rename to src/app/valentina/share/resources/cursor/point_from_circle_and_tangent_cursor.png diff --git a/src/app/share/resources/cursor/point_of_intersection_arcs.png b/src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png similarity index 100% rename from src/app/share/resources/cursor/point_of_intersection_arcs.png rename to src/app/valentina/share/resources/cursor/point_of_intersection_arcs.png diff --git a/src/app/share/resources/cursor/point_of_intersection_circles.png b/src/app/valentina/share/resources/cursor/point_of_intersection_circles.png similarity index 100% rename from src/app/share/resources/cursor/point_of_intersection_circles.png rename to src/app/valentina/share/resources/cursor/point_of_intersection_circles.png diff --git a/src/app/share/resources/cursor/pointcontact_cursor.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png similarity index 100% rename from src/app/share/resources/cursor/pointcontact_cursor.png rename to src/app/valentina/share/resources/cursor/pointcontact_cursor.png diff --git a/src/app/share/resources/cursor/pointofintersect_cursor.png b/src/app/valentina/share/resources/cursor/pointofintersect_cursor.png similarity index 100% rename from src/app/share/resources/cursor/pointofintersect_cursor.png rename to src/app/valentina/share/resources/cursor/pointofintersect_cursor.png diff --git a/src/app/share/resources/cursor/shoulder_cursor.png b/src/app/valentina/share/resources/cursor/shoulder_cursor.png similarity index 100% rename from src/app/share/resources/cursor/shoulder_cursor.png rename to src/app/valentina/share/resources/cursor/shoulder_cursor.png diff --git a/src/app/share/resources/cursor/spline_cursor.png b/src/app/valentina/share/resources/cursor/spline_cursor.png similarity index 100% rename from src/app/share/resources/cursor/spline_cursor.png rename to src/app/valentina/share/resources/cursor/spline_cursor.png diff --git a/src/app/share/resources/cursor/spline_cut_point_cursor.png b/src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png similarity index 100% rename from src/app/share/resources/cursor/spline_cut_point_cursor.png rename to src/app/valentina/share/resources/cursor/spline_cut_point_cursor.png diff --git a/src/app/share/resources/cursor/splinepath_cursor.png b/src/app/valentina/share/resources/cursor/splinepath_cursor.png similarity index 100% rename from src/app/share/resources/cursor/splinepath_cursor.png rename to src/app/valentina/share/resources/cursor/splinepath_cursor.png diff --git a/src/app/share/resources/cursor/splinepath_cut_point_cursor.png b/src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png similarity index 100% rename from src/app/share/resources/cursor/splinepath_cut_point_cursor.png rename to src/app/valentina/share/resources/cursor/splinepath_cut_point_cursor.png diff --git a/src/app/share/resources/cursor/triangle_cursor.png b/src/app/valentina/share/resources/cursor/triangle_cursor.png similarity index 100% rename from src/app/share/resources/cursor/triangle_cursor.png rename to src/app/valentina/share/resources/cursor/triangle_cursor.png diff --git a/src/app/share/resources/cursor/true_darts_cursor.png b/src/app/valentina/share/resources/cursor/true_darts_cursor.png similarity index 100% rename from src/app/share/resources/cursor/true_darts_cursor.png rename to src/app/valentina/share/resources/cursor/true_darts_cursor.png diff --git a/src/app/share/resources/cursor/union_cursor.png b/src/app/valentina/share/resources/cursor/union_cursor.png similarity index 100% rename from src/app/share/resources/cursor/union_cursor.png rename to src/app/valentina/share/resources/cursor/union_cursor.png diff --git a/src/app/share/resources/flags.qrc b/src/app/valentina/share/resources/flags.qrc similarity index 100% rename from src/app/share/resources/flags.qrc rename to src/app/valentina/share/resources/flags.qrc diff --git a/src/app/share/resources/flags/CzechRepublic.png b/src/app/valentina/share/resources/flags/CzechRepublic.png similarity index 100% rename from src/app/share/resources/flags/CzechRepublic.png rename to src/app/valentina/share/resources/flags/CzechRepublic.png diff --git a/src/app/share/resources/flags/Finland.png b/src/app/valentina/share/resources/flags/Finland.png similarity index 100% rename from src/app/share/resources/flags/Finland.png rename to src/app/valentina/share/resources/flags/Finland.png diff --git a/src/app/share/resources/flags/France.png b/src/app/valentina/share/resources/flags/France.png similarity index 100% rename from src/app/share/resources/flags/France.png rename to src/app/valentina/share/resources/flags/France.png diff --git a/src/app/share/resources/flags/Germany.png b/src/app/valentina/share/resources/flags/Germany.png similarity index 100% rename from src/app/share/resources/flags/Germany.png rename to src/app/valentina/share/resources/flags/Germany.png diff --git a/src/app/share/resources/flags/Indonesia.png b/src/app/valentina/share/resources/flags/Indonesia.png similarity index 100% rename from src/app/share/resources/flags/Indonesia.png rename to src/app/valentina/share/resources/flags/Indonesia.png diff --git a/src/app/share/resources/flags/Israel.png b/src/app/valentina/share/resources/flags/Israel.png similarity index 100% rename from src/app/share/resources/flags/Israel.png rename to src/app/valentina/share/resources/flags/Israel.png diff --git a/src/app/share/resources/flags/Italy.png b/src/app/valentina/share/resources/flags/Italy.png similarity index 100% rename from src/app/share/resources/flags/Italy.png rename to src/app/valentina/share/resources/flags/Italy.png diff --git a/src/app/share/resources/flags/Netherlands.png b/src/app/valentina/share/resources/flags/Netherlands.png similarity index 100% rename from src/app/share/resources/flags/Netherlands.png rename to src/app/valentina/share/resources/flags/Netherlands.png diff --git a/src/app/share/resources/flags/Russia.png b/src/app/valentina/share/resources/flags/Russia.png similarity index 100% rename from src/app/share/resources/flags/Russia.png rename to src/app/valentina/share/resources/flags/Russia.png diff --git a/src/app/share/resources/flags/Spain.png b/src/app/valentina/share/resources/flags/Spain.png similarity index 100% rename from src/app/share/resources/flags/Spain.png rename to src/app/valentina/share/resources/flags/Spain.png diff --git a/src/app/share/resources/flags/Ukraine.png b/src/app/valentina/share/resources/flags/Ukraine.png similarity index 100% rename from src/app/share/resources/flags/Ukraine.png rename to src/app/valentina/share/resources/flags/Ukraine.png diff --git a/src/app/share/resources/flags/UnitedStates.png b/src/app/valentina/share/resources/flags/UnitedStates.png similarity index 100% rename from src/app/share/resources/flags/UnitedStates.png rename to src/app/valentina/share/resources/flags/UnitedStates.png diff --git a/src/app/share/resources/icon.qrc b/src/app/valentina/share/resources/icon.qrc similarity index 100% rename from src/app/share/resources/icon.qrc rename to src/app/valentina/share/resources/icon.qrc diff --git a/src/app/share/resources/icon/16x16/fx.png b/src/app/valentina/share/resources/icon/16x16/fx.png similarity index 100% rename from src/app/share/resources/icon/16x16/fx.png rename to src/app/valentina/share/resources/icon/16x16/fx.png diff --git a/src/app/share/resources/icon/16x16/info.png b/src/app/valentina/share/resources/icon/16x16/info.png similarity index 100% rename from src/app/share/resources/icon/16x16/info.png rename to src/app/valentina/share/resources/icon/16x16/info.png diff --git a/src/app/share/resources/icon/16x16/landscape.png b/src/app/valentina/share/resources/icon/16x16/landscape.png similarity index 100% rename from src/app/share/resources/icon/16x16/landscape.png rename to src/app/valentina/share/resources/icon/16x16/landscape.png diff --git a/src/app/share/resources/icon/16x16/measurement.png b/src/app/valentina/share/resources/icon/16x16/measurement.png similarity index 100% rename from src/app/share/resources/icon/16x16/measurement.png rename to src/app/valentina/share/resources/icon/16x16/measurement.png diff --git a/src/app/share/resources/icon/16x16/mirror.png b/src/app/valentina/share/resources/icon/16x16/mirror.png similarity index 100% rename from src/app/share/resources/icon/16x16/mirror.png rename to src/app/valentina/share/resources/icon/16x16/mirror.png diff --git a/src/app/share/resources/icon/16x16/portrait.png b/src/app/valentina/share/resources/icon/16x16/portrait.png similarity index 100% rename from src/app/share/resources/icon/16x16/portrait.png rename to src/app/valentina/share/resources/icon/16x16/portrait.png diff --git a/src/app/share/resources/icon/16x16/progress.gif b/src/app/valentina/share/resources/icon/16x16/progress.gif similarity index 100% rename from src/app/share/resources/icon/16x16/progress.gif rename to src/app/valentina/share/resources/icon/16x16/progress.gif diff --git a/src/app/share/resources/icon/16x16/roll.png b/src/app/valentina/share/resources/icon/16x16/roll.png similarity index 100% rename from src/app/share/resources/icon/16x16/roll.png rename to src/app/valentina/share/resources/icon/16x16/roll.png diff --git a/src/app/share/resources/icon/16x16/template.png b/src/app/valentina/share/resources/icon/16x16/template.png similarity index 100% rename from src/app/share/resources/icon/16x16/template.png rename to src/app/valentina/share/resources/icon/16x16/template.png diff --git a/src/app/share/resources/icon/16x16/toolsectionarc.png b/src/app/valentina/share/resources/icon/16x16/toolsectionarc.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectionarc.png rename to src/app/valentina/share/resources/icon/16x16/toolsectionarc.png diff --git a/src/app/share/resources/icon/16x16/toolsectioncurve.png b/src/app/valentina/share/resources/icon/16x16/toolsectioncurve.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectioncurve.png rename to src/app/valentina/share/resources/icon/16x16/toolsectioncurve.png diff --git a/src/app/share/resources/icon/16x16/toolsectiondetail.png b/src/app/valentina/share/resources/icon/16x16/toolsectiondetail.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectiondetail.png rename to src/app/valentina/share/resources/icon/16x16/toolsectiondetail.png diff --git a/src/app/share/resources/icon/16x16/toolsectionlayout.png b/src/app/valentina/share/resources/icon/16x16/toolsectionlayout.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectionlayout.png rename to src/app/valentina/share/resources/icon/16x16/toolsectionlayout.png diff --git a/src/app/share/resources/icon/16x16/toolsectionline.png b/src/app/valentina/share/resources/icon/16x16/toolsectionline.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectionline.png rename to src/app/valentina/share/resources/icon/16x16/toolsectionline.png diff --git a/src/app/share/resources/icon/16x16/toolsectionpoint.png b/src/app/valentina/share/resources/icon/16x16/toolsectionpoint.png similarity index 100% rename from src/app/share/resources/icon/16x16/toolsectionpoint.png rename to src/app/valentina/share/resources/icon/16x16/toolsectionpoint.png diff --git a/src/app/share/resources/icon/24x24/equal.png b/src/app/valentina/share/resources/icon/24x24/equal.png similarity index 100% rename from src/app/share/resources/icon/24x24/equal.png rename to src/app/valentina/share/resources/icon/24x24/equal.png diff --git a/src/app/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png b/src/app/valentina/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png similarity index 100% rename from src/app/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png rename to src/app/valentina/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png diff --git a/src/app/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png b/src/app/valentina/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png similarity index 100% rename from src/app/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png rename to src/app/valentina/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png diff --git a/src/app/share/resources/icon/24x24/fx.png b/src/app/valentina/share/resources/icon/24x24/fx.png similarity index 100% rename from src/app/share/resources/icon/24x24/fx.png rename to src/app/valentina/share/resources/icon/24x24/fx.png diff --git a/src/app/share/resources/icon/24x24/left_to_right_arrow.png b/src/app/valentina/share/resources/icon/24x24/left_to_right_arrow.png similarity index 100% rename from src/app/share/resources/icon/24x24/left_to_right_arrow.png rename to src/app/valentina/share/resources/icon/24x24/left_to_right_arrow.png diff --git a/src/app/share/resources/icon/24x24/putHere.png b/src/app/valentina/share/resources/icon/24x24/putHere.png similarity index 100% rename from src/app/share/resources/icon/24x24/putHere.png rename to src/app/valentina/share/resources/icon/24x24/putHere.png diff --git a/src/app/share/resources/icon/24x24/right_to_left_arrow.png b/src/app/valentina/share/resources/icon/24x24/right_to_left_arrow.png similarity index 100% rename from src/app/share/resources/icon/24x24/right_to_left_arrow.png rename to src/app/valentina/share/resources/icon/24x24/right_to_left_arrow.png diff --git a/src/app/share/resources/icon/32x32/arrowDown.png b/src/app/valentina/share/resources/icon/32x32/arrowDown.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowDown.png rename to src/app/valentina/share/resources/icon/32x32/arrowDown.png diff --git a/src/app/share/resources/icon/32x32/arrowLeft.png b/src/app/valentina/share/resources/icon/32x32/arrowLeft.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowLeft.png rename to src/app/valentina/share/resources/icon/32x32/arrowLeft.png diff --git a/src/app/share/resources/icon/32x32/arrowLeftDown.png b/src/app/valentina/share/resources/icon/32x32/arrowLeftDown.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowLeftDown.png rename to src/app/valentina/share/resources/icon/32x32/arrowLeftDown.png diff --git a/src/app/share/resources/icon/32x32/arrowLeftUp.png b/src/app/valentina/share/resources/icon/32x32/arrowLeftUp.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowLeftUp.png rename to src/app/valentina/share/resources/icon/32x32/arrowLeftUp.png diff --git a/src/app/share/resources/icon/32x32/arrowRight.png b/src/app/valentina/share/resources/icon/32x32/arrowRight.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowRight.png rename to src/app/valentina/share/resources/icon/32x32/arrowRight.png diff --git a/src/app/share/resources/icon/32x32/arrowRightDown.png b/src/app/valentina/share/resources/icon/32x32/arrowRightDown.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowRightDown.png rename to src/app/valentina/share/resources/icon/32x32/arrowRightDown.png diff --git a/src/app/share/resources/icon/32x32/arrowRightUp.png b/src/app/valentina/share/resources/icon/32x32/arrowRightUp.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowRightUp.png rename to src/app/valentina/share/resources/icon/32x32/arrowRightUp.png diff --git a/src/app/share/resources/icon/32x32/arrowUp.png b/src/app/valentina/share/resources/icon/32x32/arrowUp.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrowUp.png rename to src/app/valentina/share/resources/icon/32x32/arrowUp.png diff --git a/src/app/share/resources/icon/32x32/arrow_cursor.png b/src/app/valentina/share/resources/icon/32x32/arrow_cursor.png similarity index 100% rename from src/app/share/resources/icon/32x32/arrow_cursor.png rename to src/app/valentina/share/resources/icon/32x32/arrow_cursor.png diff --git a/src/app/share/resources/icon/32x32/clockwise.png b/src/app/valentina/share/resources/icon/32x32/clockwise.png similarity index 100% rename from src/app/share/resources/icon/32x32/clockwise.png rename to src/app/valentina/share/resources/icon/32x32/clockwise.png diff --git a/src/app/share/resources/icon/32x32/draw.png b/src/app/valentina/share/resources/icon/32x32/draw.png similarity index 100% rename from src/app/share/resources/icon/32x32/draw.png rename to src/app/valentina/share/resources/icon/32x32/draw.png diff --git a/src/app/share/resources/icon/32x32/export_to_picture_document.png b/src/app/valentina/share/resources/icon/32x32/export_to_picture_document.png similarity index 100% rename from src/app/share/resources/icon/32x32/export_to_picture_document.png rename to src/app/valentina/share/resources/icon/32x32/export_to_picture_document.png diff --git a/src/app/share/resources/icon/32x32/history.png b/src/app/valentina/share/resources/icon/32x32/history.png similarity index 100% rename from src/app/share/resources/icon/32x32/history.png rename to src/app/valentina/share/resources/icon/32x32/history.png diff --git a/src/app/share/resources/icon/32x32/kontur.png b/src/app/valentina/share/resources/icon/32x32/kontur.png similarity index 100% rename from src/app/share/resources/icon/32x32/kontur.png rename to src/app/valentina/share/resources/icon/32x32/kontur.png diff --git a/src/app/share/resources/icon/32x32/layout.png b/src/app/valentina/share/resources/icon/32x32/layout.png similarity index 100% rename from src/app/share/resources/icon/32x32/layout.png rename to src/app/valentina/share/resources/icon/32x32/layout.png diff --git a/src/app/share/resources/icon/32x32/new_draw.png b/src/app/valentina/share/resources/icon/32x32/new_draw.png similarity index 100% rename from src/app/share/resources/icon/32x32/new_draw.png rename to src/app/valentina/share/resources/icon/32x32/new_draw.png diff --git a/src/app/share/resources/icon/32x32/option_draw.png b/src/app/valentina/share/resources/icon/32x32/option_draw.png similarity index 100% rename from src/app/share/resources/icon/32x32/option_draw.png rename to src/app/valentina/share/resources/icon/32x32/option_draw.png diff --git a/src/app/share/resources/icon/32x32/pdf.png b/src/app/valentina/share/resources/icon/32x32/pdf.png similarity index 100% rename from src/app/share/resources/icon/32x32/pdf.png rename to src/app/valentina/share/resources/icon/32x32/pdf.png diff --git a/src/app/share/resources/icon/32x32/putHereLeft.png b/src/app/valentina/share/resources/icon/32x32/putHereLeft.png similarity index 100% rename from src/app/share/resources/icon/32x32/putHereLeft.png rename to src/app/valentina/share/resources/icon/32x32/putHereLeft.png diff --git a/src/app/share/resources/icon/32x32/put_after.png b/src/app/valentina/share/resources/icon/32x32/put_after.png similarity index 100% rename from src/app/share/resources/icon/32x32/put_after.png rename to src/app/valentina/share/resources/icon/32x32/put_after.png diff --git a/src/app/share/resources/icon/32x32/table.png b/src/app/valentina/share/resources/icon/32x32/table.png similarity index 100% rename from src/app/share/resources/icon/32x32/table.png rename to src/app/valentina/share/resources/icon/32x32/table.png diff --git a/src/app/share/resources/icon/64x64/icon64x64.ico b/src/app/valentina/share/resources/icon/64x64/icon64x64.ico similarity index 100% rename from src/app/share/resources/icon/64x64/icon64x64.ico rename to src/app/valentina/share/resources/icon/64x64/icon64x64.ico diff --git a/src/app/share/resources/icon/64x64/icon64x64.png b/src/app/valentina/share/resources/icon/64x64/icon64x64.png similarity index 100% rename from src/app/share/resources/icon/64x64/icon64x64.png rename to src/app/valentina/share/resources/icon/64x64/icon64x64.png diff --git a/src/app/share/resources/icon/Graduation.png b/src/app/valentina/share/resources/icon/Graduation.png similarity index 100% rename from src/app/share/resources/icon/Graduation.png rename to src/app/valentina/share/resources/icon/Graduation.png diff --git a/src/app/share/resources/icon/community_config.png b/src/app/valentina/share/resources/icon/community_config.png similarity index 100% rename from src/app/share/resources/icon/community_config.png rename to src/app/valentina/share/resources/icon/community_config.png diff --git a/src/app/share/resources/icon/config.png b/src/app/valentina/share/resources/icon/config.png similarity index 100% rename from src/app/share/resources/icon/config.png rename to src/app/valentina/share/resources/icon/config.png diff --git a/src/app/share/resources/icon/individual.png b/src/app/valentina/share/resources/icon/individual.png similarity index 100% rename from src/app/share/resources/icon/individual.png rename to src/app/valentina/share/resources/icon/individual.png diff --git a/src/app/share/resources/icon/logo.svg b/src/app/valentina/share/resources/icon/logo.svg similarity index 100% rename from src/app/share/resources/icon/logo.svg rename to src/app/valentina/share/resources/icon/logo.svg diff --git a/src/app/share/resources/icon/path_config.png b/src/app/valentina/share/resources/icon/path_config.png similarity index 100% rename from src/app/share/resources/icon/path_config.png rename to src/app/valentina/share/resources/icon/path_config.png diff --git a/src/app/share/resources/icon/pattern_config.png b/src/app/valentina/share/resources/icon/pattern_config.png similarity index 100% rename from src/app/share/resources/icon/pattern_config.png rename to src/app/valentina/share/resources/icon/pattern_config.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/application-exit.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-new.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-new.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-new.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-new.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-open.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-open.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-open.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-open.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-print-preview.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-print.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-print.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-print.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-print.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-save.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/document-save.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/document-save.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-delete.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-delete.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-delete.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-delete.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/go-down.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/go-down.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-next.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/go-next.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/go-next.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/go-next.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/help-contents.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/list-add.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/list-add.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/list-add.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/list-add.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/list-remove.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/object-rotate-left.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/preferences-other.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/process-stop.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-fit-best.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-in.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-original.png diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png b/src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png rename to src/app/valentina/share/resources/icons/win.icon.theme/16x16/actions/zoom-out.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/application-exit.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-new.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-new.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-new.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-new.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-open.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-open.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-open.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-open.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-print-preview.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-print.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-print.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-print.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-print.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-save.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/document-save.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/document-save.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-delete.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-delete.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-delete.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-delete.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/go-down.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/go-down.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/go-next.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/go-next.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/help-contents.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/help-contents.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/help-contents.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/help-contents.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/list-add.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/list-add.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/list-add.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/list-add.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/list-remove.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/object-rotate-left.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/preferences-other.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-fit-best.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-fit-best.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-fit-best.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-fit-best.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-in.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-original.png diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png b/src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png rename to src/app/valentina/share/resources/icons/win.icon.theme/24x24/actions/zoom-out.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/application-exit.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/application-exit.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/application-exit.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/application-exit.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-new.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-new.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-new.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-new.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-open.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-open.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-open.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-open.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-print-preview.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-print-preview.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-print-preview.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-print-preview.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-print.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-print.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-print.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-print.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-save.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/document-save.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/document-save.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-delete.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/go-down.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/go-down.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-next.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/go-next.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/go-next.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/go-next.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/help-contents.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/help-contents.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/help-contents.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/help-contents.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/list-add.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/list-add.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/list-add.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/list-add.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/list-remove.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/object-rotate-left.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/preferences-other.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/process-stop.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-fit-best.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-in.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-original.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-original.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-original.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-original.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/actions/zoom-out.png diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/emblems/emblem-system.png b/src/app/valentina/share/resources/icons/win.icon.theme/32x32/emblems/emblem-system.png similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/32x32/emblems/emblem-system.png rename to src/app/valentina/share/resources/icons/win.icon.theme/32x32/emblems/emblem-system.png diff --git a/src/app/share/resources/icons/win.icon.theme/index.theme b/src/app/valentina/share/resources/icons/win.icon.theme/index.theme similarity index 100% rename from src/app/share/resources/icons/win.icon.theme/index.theme rename to src/app/valentina/share/resources/icons/win.icon.theme/index.theme diff --git a/src/app/share/resources/measurements.qrc b/src/app/valentina/share/resources/measurements.qrc similarity index 100% rename from src/app/share/resources/measurements.qrc rename to src/app/valentina/share/resources/measurements.qrc diff --git a/src/app/share/resources/tables/individual/individual.vit b/src/app/valentina/share/resources/tables/individual/individual.vit similarity index 100% rename from src/app/share/resources/tables/individual/individual.vit rename to src/app/valentina/share/resources/tables/individual/individual.vit diff --git a/src/app/share/resources/tables/standard/GOST_man_ru.vst b/src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst similarity index 100% rename from src/app/share/resources/tables/standard/GOST_man_ru.vst rename to src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst diff --git a/src/app/share/resources/theme.qrc b/src/app/valentina/share/resources/theme.qrc similarity index 100% rename from src/app/share/resources/theme.qrc rename to src/app/valentina/share/resources/theme.qrc diff --git a/src/app/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc similarity index 100% rename from src/app/share/resources/toolicon.qrc rename to src/app/valentina/share/resources/toolicon.qrc diff --git a/src/app/share/resources/toolicon/32x32/along_line.png b/src/app/valentina/share/resources/toolicon/32x32/along_line.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/along_line.png rename to src/app/valentina/share/resources/toolicon/32x32/along_line.png diff --git a/src/app/share/resources/toolicon/32x32/arc.png b/src/app/valentina/share/resources/toolicon/32x32/arc.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/arc.png rename to src/app/valentina/share/resources/toolicon/32x32/arc.png diff --git a/src/app/share/resources/toolicon/32x32/arc_cut.png b/src/app/valentina/share/resources/toolicon/32x32/arc_cut.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/arc_cut.png rename to src/app/valentina/share/resources/toolicon/32x32/arc_cut.png diff --git a/src/app/share/resources/toolicon/32x32/arc_intersect_axis.png b/src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/arc_intersect_axis.png rename to src/app/valentina/share/resources/toolicon/32x32/arc_intersect_axis.png diff --git a/src/app/share/resources/toolicon/32x32/arc_with_length.png b/src/app/valentina/share/resources/toolicon/32x32/arc_with_length.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/arc_with_length.png rename to src/app/valentina/share/resources/toolicon/32x32/arc_with_length.png diff --git a/src/app/share/resources/toolicon/32x32/bisector.png b/src/app/valentina/share/resources/toolicon/32x32/bisector.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/bisector.png rename to src/app/valentina/share/resources/toolicon/32x32/bisector.png diff --git a/src/app/share/resources/toolicon/32x32/curve_intersect_axis.png b/src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/curve_intersect_axis.png rename to src/app/valentina/share/resources/toolicon/32x32/curve_intersect_axis.png diff --git a/src/app/share/resources/toolicon/32x32/height.png b/src/app/valentina/share/resources/toolicon/32x32/height.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/height.png rename to src/app/valentina/share/resources/toolicon/32x32/height.png diff --git a/src/app/share/resources/toolicon/32x32/intersect.png b/src/app/valentina/share/resources/toolicon/32x32/intersect.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/intersect.png rename to src/app/valentina/share/resources/toolicon/32x32/intersect.png diff --git a/src/app/share/resources/toolicon/32x32/line.png b/src/app/valentina/share/resources/toolicon/32x32/line.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/line.png rename to src/app/valentina/share/resources/toolicon/32x32/line.png diff --git a/src/app/share/resources/toolicon/32x32/line_intersect_axis.png b/src/app/valentina/share/resources/toolicon/32x32/line_intersect_axis.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/line_intersect_axis.png rename to src/app/valentina/share/resources/toolicon/32x32/line_intersect_axis.png diff --git a/src/app/share/resources/toolicon/32x32/new_detail.png b/src/app/valentina/share/resources/toolicon/32x32/new_detail.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/new_detail.png rename to src/app/valentina/share/resources/toolicon/32x32/new_detail.png diff --git a/src/app/share/resources/toolicon/32x32/normal.png b/src/app/valentina/share/resources/toolicon/32x32/normal.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/normal.png rename to src/app/valentina/share/resources/toolicon/32x32/normal.png diff --git a/src/app/share/resources/toolicon/32x32/point_from_arc_and_tangent.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_from_arc_and_tangent.png rename to src/app/valentina/share/resources/toolicon/32x32/point_from_arc_and_tangent.png diff --git a/src/app/share/resources/toolicon/32x32/point_from_circle_and_tangent.png b/src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_from_circle_and_tangent.png rename to src/app/valentina/share/resources/toolicon/32x32/point_from_circle_and_tangent.png diff --git a/src/app/share/resources/toolicon/32x32/point_of_contact.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_of_contact.png rename to src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png diff --git a/src/app/share/resources/toolicon/32x32/point_of_intersection.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_of_intersection.png rename to src/app/valentina/share/resources/toolicon/32x32/point_of_intersection.png diff --git a/src/app/share/resources/toolicon/32x32/point_of_intersection_arcs.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_of_intersection_arcs.png rename to src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_arcs.png diff --git a/src/app/share/resources/toolicon/32x32/point_of_intersection_circles.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/point_of_intersection_circles.png rename to src/app/valentina/share/resources/toolicon/32x32/point_of_intersection_circles.png diff --git a/src/app/share/resources/toolicon/32x32/segment.png b/src/app/valentina/share/resources/toolicon/32x32/segment.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/segment.png rename to src/app/valentina/share/resources/toolicon/32x32/segment.png diff --git a/src/app/share/resources/toolicon/32x32/shoulder.png b/src/app/valentina/share/resources/toolicon/32x32/shoulder.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/shoulder.png rename to src/app/valentina/share/resources/toolicon/32x32/shoulder.png diff --git a/src/app/share/resources/toolicon/32x32/spline.png b/src/app/valentina/share/resources/toolicon/32x32/spline.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/spline.png rename to src/app/valentina/share/resources/toolicon/32x32/spline.png diff --git a/src/app/share/resources/toolicon/32x32/splinePath.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/splinePath.png rename to src/app/valentina/share/resources/toolicon/32x32/splinePath.png diff --git a/src/app/share/resources/toolicon/32x32/splinePath_cut_point.png b/src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/splinePath_cut_point.png rename to src/app/valentina/share/resources/toolicon/32x32/splinePath_cut_point.png diff --git a/src/app/share/resources/toolicon/32x32/spline_cut_point.png b/src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/spline_cut_point.png rename to src/app/valentina/share/resources/toolicon/32x32/spline_cut_point.png diff --git a/src/app/share/resources/toolicon/32x32/triangle.png b/src/app/valentina/share/resources/toolicon/32x32/triangle.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/triangle.png rename to src/app/valentina/share/resources/toolicon/32x32/triangle.png diff --git a/src/app/share/resources/toolicon/32x32/true_darts.png b/src/app/valentina/share/resources/toolicon/32x32/true_darts.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/true_darts.png rename to src/app/valentina/share/resources/toolicon/32x32/true_darts.png diff --git a/src/app/share/resources/toolicon/32x32/union.png b/src/app/valentina/share/resources/toolicon/32x32/union.png similarity index 100% rename from src/app/share/resources/toolicon/32x32/union.png rename to src/app/valentina/share/resources/toolicon/32x32/union.png diff --git a/src/app/share/resources/toolicon/svg/arc_intersect_axis.svg b/src/app/valentina/share/resources/toolicon/svg/arc_intersect_axis.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/arc_intersect_axis.svg rename to src/app/valentina/share/resources/toolicon/svg/arc_intersect_axis.svg diff --git a/src/app/share/resources/toolicon/svg/arc_with_length.svg b/src/app/valentina/share/resources/toolicon/svg/arc_with_length.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/arc_with_length.svg rename to src/app/valentina/share/resources/toolicon/svg/arc_with_length.svg diff --git a/src/app/share/resources/toolicon/svg/curve_intersect_axis.svg b/src/app/valentina/share/resources/toolicon/svg/curve_intersect_axis.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/curve_intersect_axis.svg rename to src/app/valentina/share/resources/toolicon/svg/curve_intersect_axis.svg diff --git a/src/app/share/resources/toolicon/svg/line_intersect_axis.svg b/src/app/valentina/share/resources/toolicon/svg/line_intersect_axis.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/line_intersect_axis.svg rename to src/app/valentina/share/resources/toolicon/svg/line_intersect_axis.svg diff --git a/src/app/share/resources/toolicon/svg/point_from_arc_and_tangent.svg b/src/app/valentina/share/resources/toolicon/svg/point_from_arc_and_tangent.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/point_from_arc_and_tangent.svg rename to src/app/valentina/share/resources/toolicon/svg/point_from_arc_and_tangent.svg diff --git a/src/app/share/resources/toolicon/svg/point_from_circle_and_tangent.svg b/src/app/valentina/share/resources/toolicon/svg/point_from_circle_and_tangent.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/point_from_circle_and_tangent.svg rename to src/app/valentina/share/resources/toolicon/svg/point_from_circle_and_tangent.svg diff --git a/src/app/share/resources/toolicon/svg/point_of_contact.svg b/src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/point_of_contact.svg rename to src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg diff --git a/src/app/share/resources/toolicon/svg/point_of_intersection_arcs.svg b/src/app/valentina/share/resources/toolicon/svg/point_of_intersection_arcs.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/point_of_intersection_arcs.svg rename to src/app/valentina/share/resources/toolicon/svg/point_of_intersection_arcs.svg diff --git a/src/app/share/resources/toolicon/svg/point_of_intersection_circles.svg b/src/app/valentina/share/resources/toolicon/svg/point_of_intersection_circles.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/point_of_intersection_circles.svg rename to src/app/valentina/share/resources/toolicon/svg/point_of_intersection_circles.svg diff --git a/src/app/share/resources/toolicon/svg/true_darts.svg b/src/app/valentina/share/resources/toolicon/svg/true_darts.svg similarity index 100% rename from src/app/share/resources/toolicon/svg/true_darts.svg rename to src/app/valentina/share/resources/toolicon/svg/true_darts.svg diff --git a/src/app/share/resources/valentina.rc b/src/app/valentina/share/resources/valentina.rc similarity index 100% rename from src/app/share/resources/valentina.rc rename to src/app/valentina/share/resources/valentina.rc diff --git a/src/app/stable.cpp b/src/app/valentina/stable.cpp similarity index 100% rename from src/app/stable.cpp rename to src/app/valentina/stable.cpp diff --git a/src/app/stable.h b/src/app/valentina/stable.h similarity index 100% rename from src/app/stable.h rename to src/app/valentina/stable.h diff --git a/src/app/app.pri b/src/app/valentina/valentina.pri similarity index 100% rename from src/app/app.pri rename to src/app/valentina/valentina.pri diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro new file mode 100644 index 000000000..f8e285b68 --- /dev/null +++ b/src/app/valentina/valentina.pro @@ -0,0 +1,670 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-06-18T12:36:43 +# +#------------------------------------------------- + +# Compilation main binary file + +# File with common stuff for whole project +include(../../../Valentina.pri) + +# Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this +# library in installer. +QT += core gui widgets xml svg printsupport xmlpatterns + +# We want create executable file +TEMPLATE = app + +# Name of binary file +TARGET = valentina + +# Use out-of-source builds (shadow builds) +CONFIG -= debug_and_release debug_and_release_target + +# We use C++11 standard +CONFIG += c++11 + +# Since Qt 5.4.0 the source code location is recorded only in debug builds. +# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. +DEFINES += QT_MESSAGELOGCONTEXT + +# Directory for executable file +DESTDIR = bin + +# Directory for files created moc +MOC_DIR = moc + +# Directory for objecs files +OBJECTS_DIR = obj + +# Directory for files created rcc +RCC_DIR = rcc + +# Directory for files created uic +UI_DIR = uic + +# Suport subdirectories. Just better project code tree. +include(valentina.pri) + +# Resource files. This files will be included in binary. +RESOURCES += \ + share/resources/icon.qrc \ # All other icons except cursors and Windows theme. + share/resources/cursor.qrc \ # Tools cursor icons. + share/resources/theme.qrc \ # Windows theme icons. + share/resources/measurements.qrc \ # For measurements files that we save as resource. + share/resources/flags.qrc \ + share/resources/toolicon.qrc + +# Compilation will fail without this files after we added them to this section. +OTHER_FILES += \ + share/resources/valentina.rc \ # For Windows system. + share/resources/icon/64x64/icon64x64.ico # Valentina's logo. + +# Set using ccache. Function enable_ccache() defined in Valentina.pri. +macx { + CONFIG(debug, debug|release){ + $$enable_ccache()# Use only in debug mode on Mac + } +} else { + $$enable_ccache() +} + +# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +$$set_PCH() + +CONFIG(debug, debug|release){ + # Debug mode + unix { + #Turn on compilers warnings. + *-g++{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${UI_DIR}" \ + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + -isystem "$${OUT_PWD}/$${RCC_DIR}" \ + -isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } + } + clang*{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${UI_DIR}" \ + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + -isystem "$${OUT_PWD}/$${RCC_DIR}" \ + -isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files + $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and + # want them in global list. Compromise decision delete them from local list. + QMAKE_CXXFLAGS -= \ + -Wmissing-prototypes \ + -Wundefined-reinterpret-cast + } + } else { + *-g++{ + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } + + #Calculate latest tag distance and build revision only in release mode. Change number each time requare + #recompilation precompiled headers file. + DEFINES += "LATEST_TAG_DISTANCE=0" + DEFINES += "BUILD_REVISION=\\\"unknown\\\"" +}else{ + # Release mode + DEFINES += V_NO_ASSERT + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols + # do nothing + } else { + # Turn on debug symbols in release mode on Unix systems. + # On Mac OS X temporarily disabled. Need find way how to strip binary file. + !macx:!win32-msvc*{ + QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + } + } + + macx{ + HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS. + }else { + HG = hg # All other platforms all OK. + } + #latest tag distance number for using in version + HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}') + isEmpty(HG_DISTANCE){ + HG_DISTANCE = 0 # if we can't find local revision left 0. + } + message("Latest tag distance:" $${HG_DISTANCE}) + DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources. + + #build revision number for using in version + unix { + HG_HESH=$$system("$${HG} log -r. --template '{node|short}'") + } else { + # Use escape character before "|" on Windows + HG_HESH=$$system($${HG} log -r. --template "{node^|short}") + } + isEmpty(HG_HESH){ + HG_HESH = "unknown" # if we can't find build revision left unknown. + } + message("Build revision:" $${HG_HESH}) + DEFINES += "BUILD_REVISION=\\\"$${HG_HESH}\\\"" # Make available build revision number in sources. +} + +# Some extra information about Qt. Can be usefull. +message(Qt version: $$[QT_VERSION]) +message(Qt is installed in $$[QT_INSTALL_PREFIX]) +message(Qt resources can be found in the following locations:) +message(Documentation: $$[QT_INSTALL_DOCS]) +message(Header files: $$[QT_INSTALL_HEADERS]) +message(Libraries: $$[QT_INSTALL_LIBS]) +message(Binary files (executables): $$[QT_INSTALL_BINS]) +message(Plugins: $$[QT_INSTALL_PLUGINS]) +message(Data files: $$[QT_INSTALL_DATA]) +message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) +message(Settings: $$[QT_INSTALL_SETTINGS]) +message(Examples: $$[QT_INSTALL_EXAMPLES]) + +# Path to recource file. +win32:RC_FILE = share/resources/valentina.rc + +# Keep path to all files with standard measurements we support right now +INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst + +TRANSLATIONS_PATH = ../../../share/translations + +# Add to this variable all translation files that you want install with program. +# For generation *.qm file first you need create *.ts. +# See section TRANSLATIONS in file ../../share/translations/translations.pro. +INSTALL_TRANSLATIONS += \ + $${TRANSLATIONS_PATH}/valentina_ru_RU.qm \ + $${TRANSLATIONS_PATH}/valentina_uk_UA.qm \ + $${TRANSLATIONS_PATH}/valentina_de_DE.qm \ + $${TRANSLATIONS_PATH}/valentina_cs_CZ.qm \ + $${TRANSLATIONS_PATH}/valentina_he_IL.qm \ + $${TRANSLATIONS_PATH}/valentina_fr_FR.qm \ + $${TRANSLATIONS_PATH}/valentina_it_IT.qm \ + $${TRANSLATIONS_PATH}/valentina_nl_NL.qm \ + $${TRANSLATIONS_PATH}/valentina_id_ID.qm \ + $${TRANSLATIONS_PATH}/valentina_es_ES.qm \ + $${TRANSLATIONS_PATH}/valentina_fi_FI.qm \ + $${TRANSLATIONS_PATH}/valentina_en_US.qm + +# 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\\\" + + # Path to bin file after installation + target.path = $$PREFIX/bin + + # .desktop file + desktop.path = $$DATADIR/applications/ + desktop.files += ../../../dist/$${TARGET}.desktop + + # logo + pixmaps.path = $$DATADIR/pixmaps/ + pixmaps.files += ../../../dist/$${TARGET}.png \ + ../../../dist/application-x-valentina-pattern.png + + # Path to translation files after installation + translations.path = $$DATADIR/$${TARGET}/translations/ + translations.files = $$INSTALL_TRANSLATIONS + + # Path to standard measurement after installation + standard.path = $$DATADIR/$${TARGET}/tables/standard/ + standard.files = $$INSTALL_STANDARD_MEASHUREMENTS + + INSTALLS += \ + target \ + desktop \ + pixmaps \ + translations \ + standard + } + macx{ + # Some macx stuff + QMAKE_MAC_SDK = macosx + + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + # Path to resources in app bundle + RESOURCES_DIR = "Contents/Resources" + FRAMEWORKS_DIR = "Contents/Frameworks" + MACOS_DIR = "Contents/MacOS" + # On macx we will use app bundle. Bundle doesn't need bin directory inside. + # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. + target.path = $$MACOS_DIR + + # Copy in bundle translation files. + exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){ + TRANSLATION_ru_RU.files += \ + $${TRANSLATIONS_PATH}/valentina_ru_RU.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU + } + + exists($${TRANSLATIONS_PATH}/valentina_uk_UA.qm){ + TRANSLATION_uk_UA.files += \ + $${TRANSLATIONS_PATH}/valentina_uk_UA.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA + } + + exists($${TRANSLATIONS_PATH}/valentina_de_DE.qm){ + TRANSLATION_de_DE.files += \ + $${TRANSLATIONS_PATH}/valentina_de_DE.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_de_DE + } + + exists($${TRANSLATIONS_PATH}/valentina_cs_CZ.qm){ + TRANSLATION_cs_CZ.files += \ + $${TRANSLATIONS_PATH}/valentina_cs_CZ.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ + } + + exists($${TRANSLATIONS_PATH}/valentina_he_IL.qm){ + TRANSLATION_he_IL.files += \ + $${TRANSLATIONS_PATH}/valentina_he_IL.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_he_IL + } + + exists($${TRANSLATIONS_PATH}/valentina_fr_FR.qm){ + TRANSLATION_fr_FR.files += \ + $${TRANSLATIONS_PATH}/valentina_fr_FR.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR + } + + exists($${TRANSLATIONS_PATH}/valentina_it_IT.qm){ + TRANSLATION_it_IT.files += \ + $${TRANSLATIONS_PATH}/valentina_it_IT.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_it_IT + } + + exists($${TRANSLATIONS_PATH}/valentina_nl_NL.qm){ + TRANSLATION_nl_NL.files += \ + $${TRANSLATIONS_PATH}/valentina_nl_NL.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL + } + + exists($${TRANSLATIONS_PATH}/valentina_id_ID.qm){ + TRANSLATION_id_ID.files += \ + $${TRANSLATIONS_PATH}/valentina_id_ID.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_id_ID.path = "$$RESOURCES_DIR/translations/id_ID.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_id_ID + } + + exists($${TRANSLATIONS_PATH}/valentina_es_ES.qm){ + TRANSLATION_es_ES.files += \ + $${TRANSLATIONS_PATH}/valentina_es_ES.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_es_ES.path = "$$RESOURCES_DIR/translations/es_ES.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_es_ES + } + + exists($${TRANSLATIONS_PATH}/valentina_fi_FI.qm){ + TRANSLATION_fi_FI.files += \ + $${TRANSLATIONS_PATH}/valentina_fi_FI.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_fi_FI.path = "$$RESOURCES_DIR/translations/fi_FI.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI + } + + exists($${TRANSLATIONS_PATH}/valentina_en_US.qm){ + TRANSLATION_en_US.files += \ + $${TRANSLATIONS_PATH}/valentina_en_US.qm \ + $${TRANSLATIONS_PATH}/Localizable.strings + TRANSLATION_en_US.path = "$$RESOURCES_DIR/translations/en_US.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_en_US + } + + # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name. + # For bundle this names more then enough. We don't need care much about libraries versions. + libraries.path = $$FRAMEWORKS_DIR + libraries.files += $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib + libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib + + # Utility pdftops need for saving a layout image to PS and EPS formates. + xpdf.path = $$MACOS_DIR + xpdf.files += $${PWD}/../../../dist/macx/bin64/pdftops + + # logo on macx. + ICON = ../../../dist/Valentina.icns + + # Copy to bundle standard measurements files + standard.path = $$RESOURCES_DIR/tables/standard/ + standard.files = $$INSTALL_STANDARD_MEASHUREMENTS + + QMAKE_BUNDLE_DATA += \ + standard \ + libraries \ + xpdf + } +} + +# "make install" command for Windows. +# Depend on nsis script and create installer in folder "package" +win32{ + package.path = $${OUT_PWD}/package/valentina + package.files += \ + $${OUT_PWD}/$${DESTDIR}/valentina.exe \ + $${OUT_PWD}/$${DESTDIR}/valentina.exe.dbg \ + $$PWD/../../../dist/win/valentina.ico \ + $$PWD/../../../dist/win/curl.exe \ + $$PWD/../../../dist/win/exchndl.dll \ + $$PWD/../../../dist/win/dbghelp.dll \ + $$PWD/../../../dist/win/mgwhelp.dll \ + $$PWD/../../../dist/win/symsrv.dll \ + $$PWD/../../../dist/win/symsrv.yes \ + $$PWD/../../../dist/win/pdftops.exe \ + $$PWD/../../../AUTHORS.txt \ + $$PWD/../../../LICENSE_GPL.txt \ + $$PWD/../../../README.txt \ + $$PWD/../../../ChangeLog.txt \ + $$PWD/../../libs/qmuparser/LICENSE_BSD.txt \ + $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/qmuparser2.dll \ + $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/qmuparser2.dll.dbg \ + $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll \ + $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/vpropertyexplorer.dll.dbg \ + $$[QT_INSTALL_BINS]/icudt*.dll \ # Different name for different Qt releases + $$[QT_INSTALL_BINS]/icuin*.dll \ # Different name for different Qt releases + $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases + $$[QT_INSTALL_BINS]/Qt5Core.dll \ + $$[QT_INSTALL_BINS]/Qt5Gui.dll \ + $$[QT_INSTALL_BINS]/Qt5Network.dll \ + $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \ + $$[QT_INSTALL_BINS]/Qt5Svg.dll \ + $$[QT_INSTALL_BINS]/Qt5Widgets.dll \ + $$[QT_INSTALL_BINS]/Qt5Xml.dll \ + $$[QT_INSTALL_BINS]/Qt5XmlPatterns.dll \ + $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ + $$[QT_INSTALL_BINS]/libstdc++-6.dll \ + $$[QT_INSTALL_BINS]/libwinpthread-1.dll + INSTALLS += package + + package_tables.path = $${OUT_PWD}/package/valentina/tables/standard + package_tables.files += $${OUT_PWD}/$${DESTDIR}/tables/standard/GOST_man_ru.vst + INSTALLS += package_tables + + package_translations.path = $${OUT_PWD}/package/valentina/translations + package_translations.files += \ + $$INSTALL_TRANSLATIONS \ # Valentina + $$[QT_INSTALL_TRANSLATIONS]/qt_ar.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_pl.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_pt.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_sk.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_sl.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_zh_TW.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_ca.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_cs.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_gl.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_he.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_hu.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_it.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_uk.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ca.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_cs.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_hu.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_it.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ja.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ru.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_sk.qm + INSTALLS += package_translations + + package_bearer.path = $${OUT_PWD}/package/valentina/bearer + package_bearer.files += \ + $$[QT_INSTALL_PLUGINS]/bearer/qgenericbearer.dll \ + $$[QT_INSTALL_PLUGINS]/bearer/qnativewifibearer.dll + INSTALLS += package_bearer + + package_iconengines.path = $${OUT_PWD}/package/valentina/iconengines + package_iconengines.files += $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon.dll + INSTALLS += package_iconengines + + package_imageformats.path = $${OUT_PWD}/package/valentina/imageformats + package_imageformats.files += \ + $$[QT_INSTALL_PLUGINS]/imageformats/qdds.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qgif.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qicns.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qico.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qjp2.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qmng.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qsvg.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtga.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtiff.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwebp.dll \ + INSTALLS += package_imageformats + + package_platforms.path = $${OUT_PWD}/package/valentina/platforms + package_platforms.files += $$[QT_INSTALL_PLUGINS]/platforms/qwindows.dll + INSTALLS += package_platforms + + package_printsupport.path = $${OUT_PWD}/package/valentina/printsupport + package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll + INSTALLS += package_printsupport + + package_nsis.path = $${OUT_PWD}/package + package_nsis.files += $$PWD/../../dist/win/nsis/valentina.nsi + INSTALLS += package_nsis + + package_nsis_headers.path = $${OUT_PWD}/package/headers + package_nsis_headers.files += \ + $$PWD/../../../dist/win/nsis/headers/fileassoc.nsh \ + $$PWD/../../../dist/win/nsis/headers/fileversion.nsh + INSTALLS += package_nsis_headers + + # Do the packaging + # First, mangle all of INSTALLS values. We depend on them. + unset(MANGLED_INSTALLS) + for(x, INSTALLS):MANGLED_INSTALLS += install_$${x} + build_package.path = $${OUT_PWD}/package + build_package.commands = \"C:/Program Files/NSIS/makensisw.exe\" \"$${OUT_PWD}/package/valentina.nsi\" + build_package.depends = $${MANGLED_INSTALLS} + INSTALLS += build_package +} + +# Some systems use special name for lrelease. For example opensuse 13.2 has lrelease-qt5. +isEmpty(LRELEASE){ + LRELEASE = lrelease +} + +# Run generation *.qm file for available *.ts files each time you run qmake. +for(_translation_name, INSTALL_TRANSLATIONS) { + _translation_name_qm = $$basename(_translation_name) + _translation_name_ts = $$section(_translation_name_qm, ".", 0, 0).ts + + system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) -removeidentical -nounfinished $$shell_path($${PWD}/$${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($${PWD}/$$_translation_name)) +} + +for(DIR, INSTALL_TRANSLATIONS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + + tr_path += $${PWD}/$$DIR +} + +# Make possible run program even you do not install it. Seek files in local directory. +copyToDestdir($$tr_path, $$shell_path($${OUT_PWD}/$$DESTDIR/translations)) + +for(DIR, INSTALL_STANDARD_MEASHUREMENTS) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + st_path += $${PWD}/$$DIR +} + +copyToDestdir($$st_path, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard)) + +# When the GNU linker sees a library, it discards all symbols that it doesn't need. +# Add dependent library the first. + +#VTools static library (depend on VWidgets, VMisc, VPatternDB) +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtools/$${DESTDIR}/ -lvtools + +INCLUDEPATH += $$PWD/../../libs/vtools +INCLUDEPATH += $$OUT_PWD/../../libs/vtools/$${UI_DIR} # For UI files +DEPENDPATH += $$PWD/../../libs/vtools + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a + +#VMisc static library +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc + +INCLUDEPATH += $$PWD/../../libs/vmisc +DEPENDPATH += $$PWD/../../libs/vmisc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/vmisc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/libvmisc.a + +#VWidgets static library +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets + +INCLUDEPATH += $$PWD/../../libs/vwidgets +DEPENDPATH += $$PWD/../../libs/vwidgets + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a + +#VPatternDB static library (depend on vgeometry) +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb + +INCLUDEPATH += $$PWD/../../libs/vpatterndb +DEPENDPATH += $$PWD/../../libs/vpatterndb + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a + +# VGeometry static library (depend on ifc) +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/ -lvgeometry + +INCLUDEPATH += $$PWD/../../libs/vgeometry +DEPENDPATH += $$PWD/../../libs/vgeometry + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a + +# IFC static library +unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc + +INCLUDEPATH += $$PWD/../../libs/ifc +DEPENDPATH += $$PWD/../../libs/ifc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a + +# VObj static library +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vobj/$${DESTDIR}/ -lvobj + +INCLUDEPATH += $$PWD/../../libs/vobj +DEPENDPATH += $$PWD/../../libs/vobj + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vobj/$${DESTDIR}/vobj.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vobj/$${DESTDIR}/libvobj.a + +# VLayout static library +unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout + +INCLUDEPATH += $$PWD/../../libs/vlayout +DEPENDPATH += $$PWD/../../libs/vlayout + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a + +# QMuParser library +win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2 +else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2 +else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser + +INCLUDEPATH += $${PWD}/../../libs/qmuparser +DEPENDPATH += $${PWD}/../../libs/qmuparser + +# VPropertyExplorer library +win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer +else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer +else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer + +INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer +DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer + +noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols + # do nothing +} else { + noStripDebugSymbols { # For enable run qmake with CONFIG+=noStripDebugSymbols + # do nothing + } else { + # Strip after you link all libaries. + CONFIG(release, debug|release){ + win32:!win32-msvc*{ + # Strip debug symbols. + QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} + } + + unix:!macx{ + # Strip debug symbols. + QMAKE_POST_LINK += objcopy --only-keep-debug ${TARGET} ${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} + } + } + } +} + + +macx{ + # run macdeployqt to include all qt libraries in packet + QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app +} diff --git a/src/app/version.cpp b/src/app/valentina/version.cpp similarity index 100% rename from src/app/version.cpp rename to src/app/valentina/version.cpp diff --git a/src/app/version.h b/src/app/valentina/version.h similarity index 100% rename from src/app/version.h rename to src/app/valentina/version.h diff --git a/src/app/xml/vabstractmeasurements.cpp b/src/app/valentina/xml/vabstractmeasurements.cpp similarity index 100% rename from src/app/xml/vabstractmeasurements.cpp rename to src/app/valentina/xml/vabstractmeasurements.cpp diff --git a/src/app/xml/vabstractmeasurements.h b/src/app/valentina/xml/vabstractmeasurements.h similarity index 95% rename from src/app/xml/vabstractmeasurements.h rename to src/app/valentina/xml/vabstractmeasurements.h index 280bf70c2..0533da410 100644 --- a/src/app/xml/vabstractmeasurements.h +++ b/src/app/valentina/xml/vabstractmeasurements.h @@ -29,8 +29,8 @@ #ifndef VABSTRACTMEASUREMENTS_H #define VABSTRACTMEASUREMENTS_H -#include "../libs/ifc/xml/vdomdocument.h" -#include "../libs/vpatterndb/vcontainer.h" +#include "../ifc/xml/vdomdocument.h" +#include "../vpatterndb/vcontainer.h" class VAbstractMeasurements : public VDomDocument { diff --git a/src/app/xml/vindividualmeasurements.cpp b/src/app/valentina/xml/vindividualmeasurements.cpp similarity index 100% rename from src/app/xml/vindividualmeasurements.cpp rename to src/app/valentina/xml/vindividualmeasurements.cpp diff --git a/src/app/xml/vindividualmeasurements.h b/src/app/valentina/xml/vindividualmeasurements.h similarity index 100% rename from src/app/xml/vindividualmeasurements.h rename to src/app/valentina/xml/vindividualmeasurements.h diff --git a/src/app/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp similarity index 100% rename from src/app/xml/vpattern.cpp rename to src/app/valentina/xml/vpattern.cpp diff --git a/src/app/xml/vpattern.h b/src/app/valentina/xml/vpattern.h similarity index 98% rename from src/app/xml/vpattern.h rename to src/app/valentina/xml/vpattern.h index b42b26575..51de51c1c 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/valentina/xml/vpattern.h @@ -29,9 +29,9 @@ #ifndef VPATTERN_H #define VPATTERN_H -#include "../libs/ifc/xml/vabstractpattern.h" -#include "../libs/ifc/xml/vtoolrecord.h" -#include "../libs/vpatterndb/vcontainer.h" +#include "../ifc/xml/vabstractpattern.h" +#include "../ifc/xml/vtoolrecord.h" +#include "../vpatterndb/vcontainer.h" class VDataTool; class VMainGraphicsScene; diff --git a/src/app/xml/vstandardmeasurements.cpp b/src/app/valentina/xml/vstandardmeasurements.cpp similarity index 100% rename from src/app/xml/vstandardmeasurements.cpp rename to src/app/valentina/xml/vstandardmeasurements.cpp diff --git a/src/app/xml/vstandardmeasurements.h b/src/app/valentina/xml/vstandardmeasurements.h similarity index 100% rename from src/app/xml/vstandardmeasurements.h rename to src/app/valentina/xml/vstandardmeasurements.h diff --git a/src/app/xml/xml.pri b/src/app/valentina/xml/xml.pri similarity index 100% rename from src/app/xml/xml.pri rename to src/app/valentina/xml/xml.pri