59 files changed, 268 insertions, 191 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 8dd9400d..1c40b40d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,12 +6,12 @@ build_script:
   - qmake qtpass.pro CONFIG+=static
   - mingw32-make
 #after_build:
-  - cmd: copy README.md release\README.txt
-  - cmd: copy LICENSE release\LICENSE.txt
+  - cmd: copy README.md src\release\README.txt
+  - cmd: copy LICENSE src\release\LICENSE.txt
   - iscc qtpass.iss
 artifacts:
   - path: Output\qtpass-*.exe
-  - path: release\qtpass.exe
+  - path: src\release\qtpass.exe
 deploy:
   provider: GitHub
   auth_token:
diff --git a/.travis.yml b/.travis.yml
index a3e71c37..a7d17677 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,13 +36,13 @@ script:
 - qmake -v
 - qmake -Wall qtpass.pro
 - make -j$(nproc)
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/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
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION  qtpass.pro | cut -d " " -f 6).dmg; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION  qtpass.pro | cut -d " " -f 6); fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION  qtpass.pri | cut -d " " -f 6).dmg; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION  qtpass.pri | cut -d " " -f 6); fi
 notifications:
   irc:
     channels:
diff --git a/Doxyfile b/Doxyfile
index 0a75d9e3..23ca7105 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -2374,7 +2374,7 @@ PLANTUML_INCLUDE_PATH  =
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 250
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the
diff --git a/appdmg.json b/appdmg.json
index 52481787..6d386c00 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": "QtPass.app" },
+    { "x": 64, "y": 64, "type": "file", "path": "src/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/qtpass.iss b/qtpass.iss
index c2abca02..3fd889ff 100644
--- a/qtpass.iss
+++ b/qtpass.iss
@@ -23,7 +23,7 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}

 DefaultDirName={pf}\{#MyAppName}

 DefaultGroupName={#MyAppName}

-LicenseFile=release\LICENSE.txt

+LicenseFile=src\release\LICENSE.txt

 OutputBaseFilename=qtpass-{#MyAppVersion}

 Compression=lzma

 SolidCompression=yes

@@ -73,9 +73,9 @@ Source: "{#QtDir}\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms\"; Flags: ignoreversion

 Source: "{#QtDir}\plugins\iconengines\qsvgicon.dll"; DestDir: "{app}\iconengines\"; Flags: ignoreversion

 

-Source: "release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion

-Source: "release\README.txt"; DestDir: "{app}"; Flags: ignoreversion

-Source: "release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion

+Source: "src\release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion

+Source: "src\release\README.txt"; DestDir: "{app}"; Flags: ignoreversion

+Source: "src\release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion

 

 [Icons]

 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

diff --git a/qtpass.pri b/qtpass.pri
new file mode 100644
index 00000000..38a0b33f
--- /dev/null
+++ b/qtpass.pri
@@ -0,0 +1,2 @@
+VERSION    = 1.2.0-pre
+
diff --git a/qtpass.pro b/qtpass.pro
index f3504534..bb0f73d1 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -1,175 +1,11 @@
-#---------------------------------------------------------#
-#                                                         #
-#   QtPass is a GUI for pass,                             #
-#           the standard unix password manager.           #
-#                                                         #
-# Project started by Anne Jan Brouwer 2014-07-30T21:56:15 #
-#                                                         #
-#---------------------------------------------------------#
+TEMPLATE = subdirs
 
-VERSION    = 1.2.0-pre
+SUBDIRS += src
 
-TEMPLATE   = app
-QT        += core gui
-
-CONFIG += c++11
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-macx {
-    TARGET = QtPass
-    QMAKE_MAC_SDK = macosx
-    QT += svg
-} else {
-    TARGET = qtpass
-}
-
-SOURCES   += main.cpp\
-             mainwindow.cpp \
-             configdialog.cpp \
-             storemodel.cpp \
-             util.cpp \
-             usersdialog.cpp \
-             keygendialog.cpp \
-             trayicon.cpp \
-             passworddialog.cpp \
-             qprogressindicator.cpp \
-             qpushbuttonwithclipboard.cpp \
-             qtpasssettings.cpp \
-             settingsconstants.cpp \
-             pass.cpp \
-             realpass.cpp \
-             imitatepass.cpp \
-             executor.cpp
-
-HEADERS   += mainwindow.h \
-             configdialog.h \
-             storemodel.h \
-             util.h \
-             usersdialog.h \
-             keygendialog.h \
-             trayicon.h \
-             passworddialog.h \
-             qprogressindicator.h \
-             deselectabletreeview.h \
-             qpushbuttonwithclipboard.h \
-             qtpasssettings.h \
-             enums.h \
-             settingsconstants.h \
-             pass.h \
-             realpass.h \
-             imitatepass.h \
-             datahelpers.h \
-             debughelper.h \
-             executor.h
-
-FORMS     += mainwindow.ui \
-             configdialog.ui \
-             usersdialog.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
-}
-
-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
-
-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 }
-    }
+CONFIG(debug, debug|release) {
+    SUBDIRS += tests
 }
 
-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
-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 {
-        QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-    }
-    gcc:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
-    msvc:QMAKE_LFLAGS += /DYNAMICBASE /NXCOMPAT
-    LIBS    += -lmpr
-} else:macx {
-    ICON = artwork/icon.icns
-    QMAKE_INFO_PLIST = qtpass.plist
-    #QMAKE_POST_LINK = cp -r $$PWD/icons $$OUT_PWD/QtPass.app/Contents/MacOS
-} else:bsd {
-    LIBS += -L/usr/local/lib
-}
 OTHER_FILES += LICENSE \
                README.md \
                qtpass.1
@@ -185,7 +21,6 @@ target.path = $$PREFIX/bin/
 
 INSTALLS += target
 
-DEFINES += "VERSION=\"\\\"$$VERSION\\\"\""
-
 DISTFILES += \
     settingsToDelete.txt
+
diff --git a/release-mac b/release-mac
index c0b1ac71..7266eed5 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 QtPass.app && appdmg appdmg.json QtPass.dmg
+qmake CONFIG+=release && make && macdeployqt src/QtPass.app && appdmg appdmg.json src/QtPass.dmg
diff --git a/configdialog.cpp b/src/configdialog.cpp
index 48144ad4..48144ad4 100644
--- a/configdialog.cpp
+++ b/src/configdialog.cpp
diff --git a/configdialog.h b/src/configdialog.h
index e9f4a121..e9f4a121 100644
--- a/configdialog.h
+++ b/src/configdialog.h
diff --git a/configdialog.ui b/src/configdialog.ui
index a23de17d..a23de17d 100644
--- a/configdialog.ui
+++ b/src/configdialog.ui
diff --git a/datahelpers.h b/src/datahelpers.h
index 5daef810..5daef810 100644
--- a/datahelpers.h
+++ b/src/datahelpers.h
diff --git a/debughelper.h b/src/debughelper.h
index be64a422..be64a422 100644
--- a/debughelper.h
+++ b/src/debughelper.h
diff --git a/deselectabletreeview.h b/src/deselectabletreeview.h
index ebd84c84..ebd84c84 100644
--- a/deselectabletreeview.h
+++ b/src/deselectabletreeview.h
diff --git a/enums.h b/src/enums.h
index 106d9bb0..106d9bb0 100644
--- a/enums.h
+++ b/src/enums.h
diff --git a/executor.cpp b/src/executor.cpp
index cb49ae4d..cb49ae4d 100644
--- a/executor.cpp
+++ b/src/executor.cpp
diff --git a/executor.h b/src/executor.h
index b821da0f..3507acde 100644
--- a/executor.h
+++ b/src/executor.h
@@ -88,7 +88,6 @@ signals:
   /**
    * @brief finished    signal that is emited when process finishes
    *
-   * @param id      identifier given when starting process
    * @param exitCode    return code of the process
    * @param output      stdout produced by the process, if requested when
    * executing
diff --git a/imitatepass.cpp b/src/imitatepass.cpp
index 5634c7c4..f33dd27d 100644
--- a/imitatepass.cpp
+++ b/src/imitatepass.cpp
@@ -67,7 +67,7 @@ int ImitatePass::Show_b(QString file) {
  * @brief ImitatePass::Insert create new file with encrypted content
  *
  * @param file      file to be created
- * @param value     value to be stored in file
+ * @param newValue  value to be stored in file
  * @param overwrite whether to overwrite existing file
  */
 void ImitatePass::Insert(QString file, QString newValue, bool overwrite) {
diff --git a/imitatepass.h b/src/imitatepass.h
index e9a24625..e9a24625 100644
--- a/imitatepass.h
+++ b/src/imitatepass.h
diff --git a/keygendialog.cpp b/src/keygendialog.cpp
index 9e3d27cc..9e3d27cc 100644
--- a/keygendialog.cpp
+++ b/src/keygendialog.cpp
diff --git a/keygendialog.h b/src/keygendialog.h
index 64af8307..64af8307 100644
--- a/keygendialog.h
+++ b/src/keygendialog.h
diff --git a/keygendialog.ui b/src/keygendialog.ui
index 867930dd..867930dd 100644
--- a/keygendialog.ui
+++ b/src/keygendialog.ui
diff --git a/main.cpp b/src/main.cpp
index c8720e6f..c8720e6f 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
index e5a41ad5..e5a41ad5 100644
--- a/mainwindow.cpp
+++ b/src/mainwindow.cpp
diff --git a/mainwindow.h b/src/mainwindow.h
index 6d42a371..6d42a371 100644
--- a/mainwindow.h
+++ b/src/mainwindow.h
diff --git a/mainwindow.ui b/src/mainwindow.ui
index 6c2096bb..6c2096bb 100644
--- a/mainwindow.ui
+++ b/src/mainwindow.ui
diff --git a/pass.cpp b/src/pass.cpp
index 646bc942..a7409e8b 100644
--- a/pass.cpp
+++ b/src/pass.cpp
@@ -55,7 +55,7 @@ void Pass::init(){
  * @brief Pass::Generate use either pwgen or internal password
  * generator
  * @param length of the desired password
- * @param selection character set to use for generation
+ * @param charset to use for generation
  * @return the password
  */
 //  TODO(bezet): this should definitely throw
@@ -104,8 +104,7 @@ QString Pass::Generate(int length, const QString &charset) {
 
 /**
  * @brief Pass::GenerateGPGKeys internal gpg keypair generator . .
- * @param batch     GnuPG style configuration string
- * @param keygenWindow
+ * @param batch GnuPG style configuration string
  */
 void Pass::GenerateGPGKeys(QString batch) {
   exec.execute(PASSWD_GENERATE, QtPassSettings::getGpgExecutable(),
diff --git a/pass.h b/src/pass.h
index e7f58dcb..e7f58dcb 100644
--- a/pass.h
+++ b/src/pass.h
diff --git a/passworddialog.cpp b/src/passworddialog.cpp
index 126310ca..08302e46 100644
--- a/passworddialog.cpp
+++ b/src/passworddialog.cpp
@@ -8,6 +8,8 @@
 
 /**
  * @brief PasswordDialog::PasswordDialog basic constructor.
+ * @param passConfig configuration constant
+ * @param pass pass or pass replacement wrapper
  * @param parent
  */
 PasswordDialog::PasswordDialog(const passwordConfiguration &passConfig,
diff --git a/passworddialog.h b/src/passworddialog.h
index f14c23bc..f14c23bc 100644
--- a/passworddialog.h
+++ b/src/passworddialog.h
diff --git a/passworddialog.ui b/src/passworddialog.ui
index 01270af5..01270af5 100644
--- a/passworddialog.ui
+++ b/src/passworddialog.ui
diff --git a/qprogressindicator.cpp b/src/qprogressindicator.cpp
index 009981f3..009981f3 100644
--- a/qprogressindicator.cpp
+++ b/src/qprogressindicator.cpp
diff --git a/qprogressindicator.h b/src/qprogressindicator.h
index f3f61e66..f3f61e66 100644
--- a/qprogressindicator.h
+++ b/src/qprogressindicator.h
diff --git a/qpushbuttonwithclipboard.cpp b/src/qpushbuttonwithclipboard.cpp
index c440bcd0..9ca1e7bd 100644
--- a/