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

make install. Corrected paths to translations.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-08-08 11:22:51 +03:00
parent 65c09f7547
commit 1dece1e9e5
3 changed files with 78 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/tape/mapplication.cpp
View File

@ -241,8 +241,14 @@ QString MApplication::translationsPath() const
{
return QApplication::applicationDirPath() + "/../../valentina/bin" + trPath;
}
#else
#ifdef QT_DEBUG
#elif defined(Q_OS_MAC)
QDir dirBundle(QApplication::applicationDirPath() + QStringLiteral("/../Resources") + trPath);
if (dirBundle.exists())
{
return dirBundle.absolutePath();
}
else
{
QDir dir(QApplication::applicationDirPath() + trPath);
if (dir.exists())
{
@ -250,9 +256,10 @@ QString MApplication::translationsPath() const
}
else
{
return QApplication::applicationDirPath() + "/../../valentina/bin" + trPath;
return QStringLiteral("/usr/share/valentina/translations");
}
#else
}
#else // Unix
QDir dir1(QApplication::applicationDirPath() + trPath);
if (dir1.exists())
{
@ -269,7 +276,6 @@ QString MApplication::translationsPath() const
return QStringLiteral("/usr/share/valentina/translations");
}
#endif
#endif
}
//---------------------------------------------------------------------------------------------------------------------
@ -277,6 +283,15 @@ QString MApplication::diagramsPath() const
{
const QString dPath = QStringLiteral("/diagrams.rcc");
#ifdef Q_OS_WIN
return QApplication::applicationDirPath() + dPath;
#elif defined(Q_OS_MAC)
QFileInfo fileBundle(QApplication::applicationDirPath() + QStringLiteral("/../Resources") + dPath);
if (fileBundle.exists())
{
return fileBundle.absoluteFilePath();
}
else
{
QFileInfo file(QApplication::applicationDirPath() + dPath);
if (file.exists())
{
@ -284,10 +299,10 @@ QString MApplication::diagramsPath() const
}
else
{
return QApplication::applicationDirPath() + "../../app/tape/bin" + dPath;
return QStringLiteral("/usr/share/valentina") + dPath;
}
#else
#ifdef QT_DEBUG
}
#else // Unix
QFileInfo file(QApplication::applicationDirPath() + dPath);
if (file.exists())
{
@ -295,25 +310,8 @@ QString MApplication::diagramsPath() const
}
else
{
return QApplication::applicationDirPath() + "../../app/tape/bin" + dPath;
return QStringLiteral("/usr/share/valentina") + dPath;
}
#else
QFileInfo file1(QApplication::applicationDirPath() + dPath);
if (file1.exists())
{
return file1.absoluteFilePath();
}
QFileInfo file2(QApplication::applicationDirPath() + "../../app/tape/bin" + dPath);
if (file2.exists())
{
return file2.absoluteFilePath();
}
else
{
return QStringLiteral("/usr/share/valentina");
}
#endif
#endif
}

24
src/app/valentina/core/vapplication.cpp
View File

@ -277,10 +277,25 @@ QString VApplication::translationsPath() const
const QString trPath = QStringLiteral("/translations");
#ifdef Q_OS_WIN
return QApplication::applicationDirPath() + trPath;
#else
#ifdef QT_DEBUG
return QApplication::applicationDirPath() + trPath;
#else
#elif defined(Q_OS_MAC)
QDir dirBundle(QApplication::applicationDirPath() + QStringLiteral("/../Resources") + trPath);
if (dirBundle.exists())
{
return dirBundle.absolutePath();
}
else
{
QDir dir(QApplication::applicationDirPath() + trPath);
if (dir.exists())
{
return dir.absolutePath();
}
else
{
return QStringLiteral("/usr/share/valentina/translations");
}
}
#else // Unix
QDir dir(QApplication::applicationDirPath() + trPath);
if (dir.exists())
{
@ -290,7 +305,6 @@ QString VApplication::translationsPath() const
{
return QStringLiteral("/usr/share/valentina/translations");
}
#endif
#endif
}

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

@ -988,6 +988,9 @@ unix{
# Path to bin file after installation
target.path = $$PREFIX/bin
tape.path = $$PREFIX/bin
tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape
# .desktop file
desktop.path = $$DATADIR/applications/
desktop.files += ../../../dist/$${TARGET}.desktop
@ -1007,6 +1010,7 @@ unix{
INSTALLS += \
target \
tape \
desktop \
pixmaps \
translations \
@ -1788,6 +1792,9 @@ unix{
libraries.files += $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
tape.path = $$MACOS_DIR
tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape
# Utility pdftops need for saving a layout image to PS and EPS formates.
xpdf.path = $$MACOS_DIR
xpdf.files += $${PWD}/../../../dist/macx/bin64/pdftops
@ -1799,10 +1806,16 @@ unix{
standard.path = $$RESOURCES_DIR/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASHUREMENTS
# Copy to bundle standard measurements files
diagrams.path = $$RESOURCES_DIR/
diagrams.files = $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc
QMAKE_BUNDLE_DATA += \
standard \
libraries \
xpdf
tape \
xpdf \
diagrams
}
}
@ -1813,6 +1826,9 @@ win32{
package.files += \
$${OUT_PWD}/$${DESTDIR}/valentina.exe \
$${OUT_PWD}/$${DESTDIR}/valentina.exe.dbg \
$${OUT_PWD}/../tape/$${DESTDIR}/tape.exe \
$${OUT_PWD}/../tape/$${DESTDIR}/tape.exe.dbg \
$${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc \
$$PWD/../../../dist/win/valentina.ico \
$$PWD/../../../dist/win/curl.exe \
$$PWD/../../../dist/win/exchndl.dll \