diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-10-24 10:09:48 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2017-10-24 10:09:48 +0200 |
| commit | 6e1b6522c3651e7b6dd71aa37967d16eafdf260c (patch) | |
| tree | e0d63ce2392da93c6049d00f5c51f196fd34b9f8 | |
| parent | 7c7867770c6584996e9ff3c2618bb3288d6adc31 (diff) | |
| parent | 0374d7cbb4b586feed1e203a8260de923ca3b5b1 (diff) | |
Merge branch 'tezeb-master'
34 files changed, 169 insertions, 166 deletions
@@ -16,3 +16,4 @@ moc_*.cpp qrc_*.cpp ui_*.h localization/*.qm +build/ diff --git a/.travis.yml b/.travis.yml index a02d4b4b..9b39a548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ script: - qmake -Wall qtpass.pro - make -j$(nproc) - make check TESTARGS="--platform offscreen" -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/QtPass.app; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt main/QtPass.app; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi diff --git a/appdmg.json b/appdmg.json index 6d386c00..53df620f 100644 --- a/appdmg.json +++ b/appdmg.json @@ -4,7 +4,7 @@ "background": "artwork/icon.png", "icon-size": 80, "contents": [ - { "x": 64, "y": 64, "type": "file", "path": "src/QtPass.app" }, + { "x": 64, "y": 64, "type": "file", "path": "main/QtPass.app" }, { "x": 428, "y": 64, "type": "link", "path": "/Applications" }, { "x": 64, "y": 448, "type": "file", "path": "README.rtf" }, { "x": 428, "y": 448, "type": "file", "path": "LICENSE" } diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 5dfd3a09..1303e9f8 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 3533b070..5d9b6a13 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 00a5964e..372e673f 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -878,7 +878,7 @@ Neues Passwort-Datei: <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 4d0c19d7..7d6815c8 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -877,7 +877,7 @@ Neues Passwort-Datei: <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index e5d894e1..a63eb0bc 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index cfea8c56..aba3ef73 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index 5d8c8322..41c02d0d 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index ea91d2bf..c8c9fd1c 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -867,7 +867,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index 5000a351..3ff6ebba 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>GAD</translation> </message> diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index a6e01c62..98a91c3a 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -899,7 +899,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>GAD</translation> </message> diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index caee63a6..346de50d 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>GAD</translation> </message> diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index 3b9952b4..c1c1860e 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -965,7 +965,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index d1568257..069f5b49 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index 552cd90d..ae2d3ded 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index 6a55a1c4..08f48466 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -873,7 +873,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index 14d78785..867e0e43 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts index 22d867bd..18fb4b26 100644 --- a/localization/localization_nl_BE.ts +++ b/localization/localization_nl_BE.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts index 0ce90f34..1dd072c0 100644 --- a/localization/localization_nl_NL.ts +++ b/localization/localization_nl_NL.ts @@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index a3b50cb0..1500fc8d 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_pt_PT.ts b/localization/localization_pt_PT.ts index 1894228f..9a4511fe 100644 --- a/localization/localization_pt_PT.ts +++ b/localization/localization_pt_PT.ts @@ -863,7 +863,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index 0db28968..b2ca56f4 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -891,7 +891,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index c0efc12a..80947918 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -868,7 +868,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index e7b9046e..f80e7db9 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -891,7 +891,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/main.cpp" line="78"/> + <location filename="../main/main.cpp" line="78"/> <source>LTR</source> <translation>从左到右</translation> </message> diff --git a/src/main.cpp b/main/main.cpp index 8a18409c..8a18409c 100644 --- a/src/main.cpp +++ b/main/main.cpp diff --git a/main/main.pro b/main/main.pro new file mode 100644 index 00000000..e6480c94 --- /dev/null +++ b/main/main.pro @@ -0,0 +1,27 @@ +!include(../qtpass.pri) { error("Couldn't find the qtpass.pri file!") } + +TEMPLATE = app +QT += core gui + +CONFIG += c++11 +LIBS = -L"$$OUT_PWD/../src/$(OBJECTS_DIR)" -lqtpass $$LIBS +INCLUDEPATH += ../src + +macx { + TARGET = QtPass +} else { + TARGET = qtpass +} + +SOURCES += main.cpp + +isEmpty(PREFIX) { + PREFIX = $$(PREFIX) +} + +isEmpty(PREFIX) { + PREFIX = /usr/local +} +target.path = $$PREFIX/bin/ + +INSTALLS += target @@ -1,7 +1,80 @@ VERSION = 1.2.0-pre -TEMPLATE = subdirs - CONFIG(coverage) { QMAKE_LFLAGS += --coverage + QMAKE_CXXFLAGS += --coverage +} + +CONFIG(debug, debug|release) { + QMAKE_CXXFLAGS += -g -c -Wall -O0 + QMAKE_LFLAGS += -O0 +} + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +clang|gcc:QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas + +nosingleapp { + QMAKE_CXXFLAGS += -DSINGLE_APP=0 +} else { + QT += network + QMAKE_CXXFLAGS += -DSINGLE_APP=1 +} + +DEFINES += "VERSION=\"\\\"$$VERSION\\\"\"" + +CODECFORSRC = UTF-8 +CODECFORTR = UTF-8 + +macx { + QMAKE_MAC_SDK = macosx + QT += svg } + +isEmpty(QMAKE_LRELEASE) { + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + unix { + !exists($$QMAKE_LRELEASE) { + greaterThan(QT_MAJOR_VERSION, 4) { + QMAKE_LRELEASE = lrelease-qt5 + } else { + QMAKE_LRELEASE = lrelease-qt4 + } + } + } else { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } +} + +isEmpty(QMAKE_LUPDATE) { + win32|os2:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]\\lupdate.exe + else:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate + unix { + !exists($$QMAKE_LUPDATE) { + greaterThan(QT_MAJOR_VERSION, 4) { + QMAKE_LUPDATE = lupdate-qt5 + } else { + QMAKE_LUPDATE = lupdate-qt4 + } + } + } else { + !exists($$QMAKE_LUPDATE) { QMAKE_LUPDATE = lupdate } + } +} + +win32 { + RC_FILE = ../windows.rc + static { + QMAKE_LFLAGS += -static-libgcc -static-libstdc++ + } + gcc:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat + msvc:QMAKE_LFLAGS += /DYNAMICBASE /NXCOMPAT + LIBS += -lmpr -lbcrypt +} else:macx { + ICON = ../artwork/icon.icns + QMAKE_INFO_PLIST = ../qtpass.plist +} else:bsd { + LIBS += -L/usr/local/lib +} + @@ -1,7 +1,9 @@ !include(qtpass.pri) { error("Couldn't find the qtpass.pri file!") } -SUBDIRS += src tests +TEMPLATE = subdirs +SUBDIRS += src tests main tests.depends = src +main.depends = tests OTHER_FILES += LICENSE \ README.md \ @@ -55,3 +57,31 @@ CONFIG(coverage) { QMAKE_CLEAN += src/$$OBJECTS_DIR/*.gc?? src/*.gcov QMAKE_DISTCLEAN += -r src/$$OBJECTS_DIR/lcov/ } + +TRANSLATIONS += localization/localization_nl_NL.ts \ + localization/localization_de_DE.ts \ + localization/localization_es_ES.ts \ + localization/localization_gl_ES.ts \ + localization/localization_hu_HU.ts \ + localization/localization_sv_SE.ts \ + localization/localization_pl_PL.ts \ + localization/localization_ru_RU.ts \ + localization/localization_he_IL.ts \ + localization/localization_zh_CN.ts \ + localization/localization_ar_MA.ts \ + localization/localization_fr_FR.ts \ + localization/localization_fr_BE.ts \ + localization/localization_nl_BE.ts \ + localization/localization_fr_LU.ts \ + localization/localization_de_LU.ts \ + localization/localization_lb_LU.ts \ + localization/localization_en_GB.ts \ + localization/localization_en_US.ts \ + localization/localization_el_GR.ts \ + localization/localization_cs_CZ.ts \ + localization/localization_it_IT.ts \ + localization/localization_pt_PT.ts + +system($$QMAKE_LUPDATE $$_PRO_FILE_) +system($$QMAKE_LRELEASE $$_PRO_FILE_) + diff --git a/release-mac b/release-mac index 7266eed5..6f1d592f 100755 --- a/release-mac +++ b/release-mac @@ -4,4 +4,4 @@ sed 's/CHANGELOG\.md/https:\/\/qtpass.org\/docs\/md__c_h_a_n_g_e_l_o_g.html/' < sed 's/\[\!.*//' < README.changelog > README.clean pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean FAQ.md CONTRIBUTING.md CHANGELOG.md doxygen -qmake CONFIG+=release && make && macdeployqt src/QtPass.app && appdmg appdmg.json src/QtPass.dmg +qmake CONFIG+=release && make && macdeployqt main/QtPass.app && appdmg appdmg.json main/QtPass.dmg diff --git a/src/src.pro b/src/src.pro index 5cf24593..55a60b97 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,31 +1,12 @@ !include(../qtpass.pri) { error("Couldn't find the qtpass.pri file!") } -TEMPLATE = app +TEMPLATE = lib QT += core gui +TARGET = qtpass -CONFIG += c++11 +CONFIG += c++11 staticlib -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG(debug, debug|release) { - QMAKE_CXXFLAGS += -g -c -Wall -O0 - QMAKE_LFLAGS += -O0 -} - -CONFIG(coverage) { - QMAKE_CXXFLAGS += --coverage -} - -macx { - TARGET = QtPass - QMAKE_MAC_SDK = macosx - QT += svg -} else { - TARGET = qtpass -} - -SOURCES += main.cpp \ - mainwindow.cpp \ +SOURCES += mainwindow.cpp \ configdialog.cpp \ storemodel.cpp \ util.cpp \ @@ -71,79 +52,6 @@ FORMS += mainwindow.ui \ keygendialog.ui \ passworddialog.ui -clang|gcc:QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas - -nosingleapp { - QMAKE_CXXFLAGS += -DSINGLE_APP=0 -} else { - SOURCES += singleapplication.cpp - HEADERS += singleapplication.h - QT += network - QMAKE_CXXFLAGS += -DSINGLE_APP=1 -} - -DEFINES += "VERSION=\"\\\"$$VERSION\\\"\"" - - -TRANSLATIONS += ../localization/localization_nl_NL.ts \ - ../localization/localization_de_DE.ts \ - ../localization/localization_es_ES.ts \ - ../localization/localization_gl_ES.ts \ - ../localization/localization_hu_HU.ts \ - ../localization/localization_sv_SE.ts \ - ../localization/localization_pl_PL.ts \ - ../localization/localization_ru_RU.ts \ - ../localization/localization_he_IL.ts \ - ../localization/localization_zh_CN.ts \ - ../localization/localization_ar_MA.ts \ - ../localization/localization_fr_FR.ts \ - ../localization/localization_fr_BE.ts \ - ../localization/localization_nl_BE.ts \ - ../localization/localization_fr_LU.ts \ - ../localization/localization_de_LU.ts \ - ../localization/localization_lb_LU.ts \ - ../localization/localization_en_GB.ts \ - ../localization/localization_en_US.ts \ - ../localization/localization_el_GR.ts \ - ../localization/localization_cs_CZ.ts \ - ../localization/localization_it_IT.ts \ - ../localization/localization_pt_PT.ts - -CODECFORSRC = UTF-8 -CODECFORTR = UTF-8 - -isEmpty(QMAKE_LRELEASE) { - win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease - unix { - !exists($$QMAKE_LRELEASE) { - greaterThan(QT_MAJOR_VERSION, 4) { - QMAKE_LRELEASE = lrelease-qt5 - } else { - QMAKE_LRELEASE = lrelease-qt4 - } - } - } else { - !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } - } -} - -isEmpty(QMAKE_LUPDATE) { - win32|os2:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]\\lupdate.exe - else:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate - unix { - !exists($$QMAKE_LUPDATE) { - greaterThan(QT_MAJOR_VERSION, 4) { - QMAKE_LUPDATE = lupdate-qt5 - } else { - QMAKE_LUPDATE = lupdate-qt4 - } - } - } else { - !exists($$QMAKE_LUPDATE) { QMAKE_LUPDATE = lupdate } - } -} - updateqm.input = TRANSLATIONS updateqm.output = ../localization/${QMAKE_FILE_BASE}.qm updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../localization/${QMAKE_FILE_BASE}.qm @@ -151,38 +59,9 @@ updateqm.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += updateqm PRE_TARGETDEPS += compiler_updateqm_make_all -win32 { - system($$QMAKE_LUPDATE ../qtpass.pro) - system($$QMAKE_LRELEASE ../qtpass.pro) -} else { - system($$QMAKE_LUPDATE $$_PRO_FILE_) - system($$QMAKE_LRELEASE $$_PRO_FILE_) -} - RESOURCES += ../resources.qrc -win32 { - RC_FILE = ../windows.rc - static { - QMAK |