From 1c6b94718b66b4709183e2870b9b04817613f6c3 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 3 Nov 2015 11:41:30 +0100 Subject: Auto-updating translations, are they even installed? not confortable to delete the .qm's yet . . --- localization/localization_de_DE.qm | Bin qtpass.pro | 40 ++++++++++++++++++++++++++----------- resources.qrc | 8 ++++---- 3 files changed, 32 insertions(+), 16 deletions(-) mode change 100755 => 100644 localization/localization_de_DE.qm diff --git a/localization/localization_de_DE.qm b/localization/localization_de_DE.qm old mode 100755 new mode 100644 diff --git a/qtpass.pro b/qtpass.pro index 418df22c..756acab5 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -1,16 +1,32 @@ -#------------------------------------------------- -# -# QtPass is a GUI for pass, -# the standard unix password manager. -# -# Project created by QtCreator 2014-07-30T21:56:15 -# -#------------------------------------------------- +#---------------------------------------------------------- +# # +# QtPass is a GUI for pass, # +# the standard unix password manager. # +# # +# Project started by Anne Jan Brouwer 2014-07-30T21:56:15 # +# # +#---------------------------------------------------------- VERSION = 1.0.4 TEMPLATE = app QT += core gui +isEmpty(QMAKE_LRELEASE) { + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + unix { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } + } else { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } +} + +updateqm.input = TRANSLATIONS +updateqm.output = localization/${QMAKE_FILE_BASE}.qm +updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm localization/${QMAKE_FILE_BASE}.qm +updateqm.CONFIG += no_link target_predeps +QMAKE_EXTRA_COMPILERS += updateqm + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets macx { @@ -29,7 +45,7 @@ SOURCES += main.cpp\ keygendialog.cpp \ progressindicator.cpp \ trayicon.cpp \ - passworddialog.cpp + passworddialog.cpp HEADERS += mainwindow.h \ configdialog.h \ @@ -39,13 +55,13 @@ HEADERS += mainwindow.h \ keygendialog.h \ progressindicator.h \ trayicon.h \ - passworddialog.h + passworddialog.h FORMS += mainwindow.ui \ configdialog.ui \ usersdialog.ui \ keygendialog.ui \ - passworddialog.ui + passworddialog.ui QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas @@ -101,6 +117,6 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/ -INSTALLS += target +INSTALLS += target DEFINES += "VERSION=\"\\\"$$VERSION\\\"\"" diff --git a/resources.qrc b/resources.qrc index 1739c408..3e7c1703 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,5 +1,9 @@ + artwork/icon.icns + artwork/icon.ico + artwork/icon.png + artwork/icon.svg localization/localization_ar_MA.qm localization/localization_ar_MA.ts localization/localization_de_DE.qm @@ -18,10 +22,6 @@ localization/localization_pl_PL.ts localization/localization_ru_RU.qm localization/localization_ru_RU.ts - artwork/icon.icns - artwork/icon.ico - artwork/icon.png - artwork/icon.svg localization/localization_zh_CN.qm localization/localization_zh_CN.ts localization/localization_he_IL.ts -- cgit v1.2.3