From afdf02b4bea88d001a74048cd065143530b28c3a Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Mon, 9 Jan 2017 01:33:21 +0100
Subject: [PATCH 1/8] Implement import of databases in CSV (Comma Separated
 Values) format (i.e. from other password managers)

---
 src/CMakeLists.txt                    |   5 +
 src/core/CsvParser.cpp                | 411 ++++++++++++++++++++
 src/core/CsvParser.h                  | 101 +++++
 src/gui/DatabaseTabWidget.cpp         |  17 +
 src/gui/DatabaseTabWidget.h           |   1 +
 src/gui/DatabaseWidget.cpp            |  25 +-
 src/gui/DatabaseWidget.h              |   6 +-
 src/gui/MainWindow.cpp                |   4 +-
 src/gui/MainWindow.ui                 |  24 +-
 src/gui/csvImport/CsvImportWidget.cpp | 289 ++++++++++++++
 src/gui/csvImport/CsvImportWidget.h   |  78 ++++
 src/gui/csvImport/CsvImportWidget.ui  | 524 ++++++++++++++++++++++++++
 src/gui/csvImport/CsvImportWizard.cpp |  72 ++++
 src/gui/csvImport/CsvImportWizard.h   |  55 +++
 src/gui/csvImport/CsvParserModel.cpp  | 139 +++++++
 src/gui/csvImport/CsvParserModel.h    |  59 +++
 src/main.cpp                          |   1 +
 tests/CMakeLists.txt                  |   3 +
 tests/TestCsvParser.cpp               | 335 ++++++++++++++++
 tests/TestCsvParser.h                 |  69 ++++
 20 files changed, 2209 insertions(+), 9 deletions(-)
 create mode 100644 src/core/CsvParser.cpp
 create mode 100644 src/core/CsvParser.h
 create mode 100644 src/gui/csvImport/CsvImportWidget.cpp
 create mode 100644 src/gui/csvImport/CsvImportWidget.h
 create mode 100644 src/gui/csvImport/CsvImportWidget.ui
 create mode 100644 src/gui/csvImport/CsvImportWizard.cpp
 create mode 100644 src/gui/csvImport/CsvImportWizard.h
 create mode 100644 src/gui/csvImport/CsvParserModel.cpp
 create mode 100644 src/gui/csvImport/CsvParserModel.h
 create mode 100644 tests/TestCsvParser.cpp
 create mode 100644 tests/TestCsvParser.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94a685737..f0b293a06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 set(keepassx_SOURCES
     core/AutoTypeAssociations.cpp
     core/Config.cpp
+    core/CsvParser.cpp
     core/Database.cpp
     core/DatabaseIcons.cpp
     core/Endian.cpp
@@ -102,6 +103,9 @@ set(keepassx_SOURCES
     gui/UnlockDatabaseWidget.cpp
     gui/UnlockDatabaseDialog.cpp
     gui/WelcomeWidget.cpp
+    gui/csvImport/CsvImportWidget.cpp
+    gui/csvImport/CsvImportWizard.cpp
+    gui/csvImport/CsvParserModel.cpp
     gui/entry/AutoTypeAssociationsModel.cpp
     gui/entry/EditEntryWidget.cpp
     gui/entry/EditEntryWidget_p.h
@@ -133,6 +137,7 @@ set(keepassx_FORMS
     gui/AboutDialog.ui
     gui/ChangeMasterKeyWidget.ui
     gui/CloneDialog.ui
+    gui/csvImport/CsvImportWidget.ui
     gui/DatabaseOpenWidget.ui
     gui/DatabaseSettingsWidget.ui
     gui/CategoryListWidget.ui
diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp
new file mode 100644
index 000000000..87b3f3403
--- /dev/null
+++ b/src/core/CsvParser.cpp
@@ -0,0 +1,411 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QTextCodec>
+#include <QObject>
+#include "core/Tools.h"
+#include "CsvParser.h"
+
+CsvParser::CsvParser()
+    : m_ch(0)
+    , m_comment('#')
+    , m_currCol(1)
+    , m_currRow(1)
+    , m_isBackslashSyntax(false)
+    , m_isEof(false)
+    , m_isFileLoaded(false)
+    , m_isGood(true)
+    , m_lastPos(-1)
+    , m_maxCols(0)
+    , m_qualifier('"')
+    , m_separator(',')
+    , m_statusMsg("")
+{
+    m_csv.setBuffer(&m_array);
+    m_ts.setDevice(&m_csv);
+    m_csv.open(QIODevice::ReadOnly);
+    m_ts.setCodec("UTF-8");
+}
+
+CsvParser::~CsvParser() {
+    m_csv.close();
+}
+
+bool CsvParser::isFileLoaded() {
+    return m_isFileLoaded;
+}
+
+bool CsvParser::reparse() {
+    reset();
+    return parseFile();
+}
+
+
+bool CsvParser::parse(QFile *device) {
+    clear();
+    if (nullptr == device) {
+        m_statusMsg += QObject::tr("NULL device\n");
+        return false;
+    }
+    if (!readFile(device)) {
+        return false;
+    }
+    return parseFile();
+}
+
+bool CsvParser::readFile(QFile *device) {
+    if (device->isOpen()) {
+        device->close();
+    }
+
+    device->open(QIODevice::ReadOnly);
+    if (!Tools::readAllFromDevice(device, m_array)) {
+        m_statusMsg += QObject::tr("Error reading from device\n");
+        m_isFileLoaded = false;
+    }
+    else {
+    device->close();
+
+    m_array.replace("\r\n", "\n");
+    m_array.replace("\r", "\n");
+    if (0 == m_array.size()) {
+        m_statusMsg += QObject::tr("File empty\n");
+    }
+    m_isFileLoaded = true;
+    }
+    return m_isFileLoaded;
+}
+
+void CsvParser::reset() {
+    m_ch = 0;
+    m_currCol = 1;
+    m_currRow = 1;
+    m_isEof = false;
+    m_isGood = true;
+    m_lastPos = -1;
+    m_maxCols = 0;
+    m_statusMsg = "";
+    m_ts.seek(0);
+    m_table.clear();
+    //the following are users' concern :)
+    //m_comment = '#';
+    //m_backslashSyntax = false;
+    //m_comment = '#';
+    //m_qualifier = '"';
+    //m_separator = ',';
+}
+
+void CsvParser::clear() {
+    reset();
+    m_isFileLoaded = false;
+    m_array.clear();
+}
+
+bool CsvParser::parseFile() {
+    parseRecord();
+    while (!m_isEof)
+    {
+        if (!skipEndline()) {
+            appendStatusMsg(QObject::tr("malformed string"));
+        }
+        m_currRow++;
+        m_currCol = 1;
+        parseRecord();
+    }
+    fillColumns();
+    return m_isGood;
+}
+
+void CsvParser::parseRecord() {
+    csvrow row;
+    if (isComment()) {
+        skipLine();
+        return;
+    }
+    else {
+        do {
+            parseField(row);
+            getChar(m_ch);
+        } while (isSeparator(m_ch) && !m_isEof);
+
+        if (!m_isEof) {
+            ungetChar();
+        }
+        if (isEmptyRow(row)) {
+            row.clear();
+            return;
+        }
+        m_table.push_back(row);
+        if (m_maxCols < row.size()) {
+            m_maxCols = row.size();
+        }
+        m_currCol++;
+    }
+}
+
+void CsvParser::parseField(csvrow& row) {
+    QString field;
+    peek(m_ch);
+    if (!isTerminator(m_ch))
+    {
+        if (isQualifier(m_ch)) {
+             parseQuoted(field);
+        }
+        else {
+             parseSimple(field);
+        }
+    }
+    row.push_back(field);
+}
+
+void CsvParser::parseSimple(QString &s) {
+    QChar c;
+    getChar(c);
+    while ((isText(c)) && (!m_isEof))
+    {
+        s.append(c);
+        getChar(c);
+    }
+    if (!m_isEof) {
+        ungetChar();
+    }
+}
+
+void CsvParser::parseQuoted(QString &s) {
+    //read and discard initial qualifier (e.g. quote)
+    getChar(m_ch);
+    parseEscaped(s);
+    //getChar(m_ch);
+    if (!isQualifier(m_ch)) {
+        appendStatusMsg(QObject::tr("missing closing quote"));
+    }
+}
+
+void CsvParser::parseEscaped(QString &s) {
+    parseEscapedText(s);
+    while (processEscapeMark(s, m_ch)) {
+        parseEscapedText(s);
+    }
+    if (!m_isEof) {
+        ungetChar();
+    }
+}
+
+void CsvParser::parseEscapedText(QString &s) {
+    getChar(m_ch);
+    while ((!isQualifier(m_ch)) && !m_isEof)
+    {
+        s.append(m_ch);
+        getChar(m_ch);
+    }
+}
+
+bool CsvParser::processEscapeMark(QString &s, QChar c) {
+    QChar buf;
+    peek(buf);
+    QChar c2;
+    //escape-character syntax, e.g. \"
+    if (true == m_isBackslashSyntax)
+    {
+        if (c != '\\') {
+            return false;
+        }
+        //consume (and append) second qualifier
+        getChar(c2);
+        if (m_isEof){
+            c2='\\';
+            s.append('\\');
+            return false;
+        }
+        else {
+            s.append(c2);
+            return true;
+        }
+    }
+    //double quote syntax, e.g. ""
+    else
+    {
+        if (!isQualifier(c)) {
+            return false;
+        }
+        peek(c2);
+        if (!m_isEof) { //not EOF, can read one char
+            if (isQualifier(c2)) {
+                s.append(c2);
+                getChar(c2);
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+void CsvParser::fillColumns() {
+    //fill the rows with lesser columns with empty fields
+
+    for (int i=0; i<m_table.size(); ++i) {
+        int gap = m_maxCols-m_table.at(i).size();
+        if (gap > 0) {
+            csvrow r = m_table.at(i);
+            for (int j=0; j<gap; ++j) {
+                r.append(QString(""));
+            }
+            m_table.replace(i, r);
+        }
+    }
+}
+
+void CsvParser::skipLine() {
+    m_ts.readLine();
+    m_ts.seek(m_ts.pos()-1);
+}
+
+bool CsvParser::skipEndline() {
+    getChar(m_ch);
+    return (m_ch == '\n');
+}
+
+
+void CsvParser::getChar(QChar& c) {
+    m_isEof = m_ts.atEnd();
+    if (!m_isEof) {
+        m_lastPos = m_ts.pos();
+        m_ts >> c;
+    }
+}
+
+void CsvParser::ungetChar() {
+    if (!m_ts.seek(m_lastPos))
+        m_statusMsg += QObject::tr("Internal: unget lower bound exceeded");
+}
+
+void CsvParser::peek(QChar& c) {
+    getChar(c);
+    if (!m_isEof) {
+        ungetChar();
+    }
+}
+
+bool CsvParser::isQualifier(const QChar c) const {
+    if (true == m_isBackslashSyntax && (c != m_qualifier)) {
+        return (c == '\\');
+    }
+    else {
+    return (c == m_qualifier);
+    }
+}
+
+bool CsvParser::isComment() {
+    bool result = false;
+    QChar c2;
+    qint64 pos = m_ts.pos();
+
+    do {
+        getChar(c2);
+    } while ((isSpace(c2) || isTab(c2)) && (!m_isEof));
+
+    if (c2 == m_comment) {
+        result = true;
+    }
+    m_ts.seek(pos);
+    return result;
+}
+
+bool CsvParser::isText(QChar c) const {
+     return !( (isCRLF(c)) || (isSeparator(c)) );
+}
+
+bool CsvParser::isEmptyRow(csvrow row) const {
+    csvrow::const_iterator it = row.constBegin();
+    for (; it != row.constEnd(); ++it) {
+        if ( ((*it) != "\n") && ((*it) != "") )
+            return false;
+    }
+    return true;
+}
+
+bool CsvParser::isCRLF(const QChar c) const {
+    return (c == '\n');
+}
+
+bool CsvParser::isSpace(const QChar c) const {
+    return (c == 0x20);
+}
+
+bool CsvParser::isTab(const QChar c) const {
+    return (c == '\t');
+}
+
+bool CsvParser::isSeparator(const QChar c) const {
+    return (c == m_separator);
+}
+
+bool CsvParser::isTerminator(const QChar c) const {
+    return (isSeparator(c) || (c == '\n') || (c == '\r'));
+}
+
+void CsvParser::setBackslashSyntax(bool set) {
+    m_isBackslashSyntax = set;
+}
+
+void CsvParser::setComment(const QChar c) {
+    m_comment = c.unicode();
+}
+
+void CsvParser::setCodec(const QString s) {
+    m_ts.setCodec(QTextCodec::codecForName(s.toLocal8Bit()));
+}
+
+void CsvParser::setFieldSeparator(const QChar c) {
+    m_separator = c.unicode();
+}
+
+void CsvParser::setTextQualifier(const QChar c) {
+    m_qualifier = c.unicode();
+}
+
+int CsvParser::getFileSize() const {
+    return m_csv.size();
+}
+
+const csvtable CsvParser::getCsvTable() const {
+    return m_table;
+}
+
+QString CsvParser::getStatus() const {
+    return m_statusMsg;
+}
+
+int CsvParser::getCsvCols() const {
+    if ((m_table.size() > 0) && (m_table.at(0).size() > 0))
+        return m_table.at(0).size();
+    else return 0;
+}
+
+int CsvParser::getCsvRows() const {
+    return m_table.size();
+}
+
+
+void CsvParser::appendStatusMsg(QString s) {
+    m_statusMsg += s
+      .append(" @" + QString::number(m_currRow))
+      .append(",")
+      .append(QString::number(m_currCol))
+      .append("\n");
+    m_isGood = false;
+}
diff --git a/src/core/CsvParser.h b/src/core/CsvParser.h
new file mode 100644
index 000000000..77c6d36e1
--- /dev/null
+++ b/src/core/CsvParser.h
@@ -0,0 +1,101 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_CSVPARSER_H
+#define KEEPASSX_CSVPARSER_H
+
+#include <QFile>
+#include <QBuffer>
+#include <QQueue>
+#include <QTextStream>
+
+typedef QStringList csvrow;
+typedef QList<csvrow> csvtable;
+
+class CsvParser {
+
+public:
+    CsvParser();
+    ~CsvParser();
+    //read data from device and parse it
+    bool parse(QFile *device);
+    bool isFileLoaded();
+    //reparse the same buffer (device is not opened again)
+    bool reparse();
+    void setCodec(const QString s);
+    void setComment(const QChar c);
+    void setFieldSeparator(const QChar c);
+    void setTextQualifier(const QChar c);
+    void setBackslashSyntax(bool set);
+     int getFileSize() const;
+     int getCsvRows() const;
+     int getCsvCols() const;
+    QString getStatus() const;
+    const csvtable getCsvTable() const;
+
+protected:
+    csvtable m_table;
+
+private:
+    QByteArray   m_array;
+    QBuffer      m_csv;
+    QChar        m_ch;
+    QChar        m_comment;
+    unsigned int m_currCol;
+    unsigned int m_currRow;
+    bool         m_isBackslashSyntax;
+    bool         m_isEof;
+    bool         m_isFileLoaded;
+    bool         m_isGood;
+    qint64       m_lastPos;
+    int          m_maxCols;
+    QChar        m_qualifier;
+    QChar        m_separator;
+    QString      m_statusMsg;
+    QTextStream  m_ts;
+
+    void getChar(QChar &c);
+    void ungetChar();
+    void peek(QChar &c);
+    void fillColumns();
+    bool isTerminator(const QChar c) const;
+    bool isSeparator(const QChar c) const;
+    bool isQualifier(const QChar c) const;
+    bool processEscapeMark(QString &s, QChar c);
+    bool isText(QChar c) const;
+    bool isComment();
+    bool isCRLF(const QChar c) const;
+    bool isSpace(const QChar c) const;
+    bool isTab(const QChar c) const;
+    bool isEmptyRow(csvrow row) const;
+    bool parseFile();
+    void parseRecord();
+    void parseField(csvrow& row);
+    void parseSimple(QString& s);
+    void parseQuoted(QString& s);
+    void parseEscaped(QString& s);
+    void parseEscapedText(QString &s);
+    bool readFile(QFile *device);
+    void reset();
+    void clear();
+    bool skipEndline();
+    void skipLine();
+    void appendStatusMsg(QString s);
+};
+
+#endif //CSVPARSER_H
+
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 910e94899..e3f4bc188 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -212,6 +212,23 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
     Q_EMIT messageDismissGlobal();
 }
 
+void DatabaseTabWidget::importCsv()
+{
+    QString fileName = fileDialog()->getOpenFileName(this, tr("Open CSV file"), QString(),
+            tr("CSV file") + " (*.csv);;" + tr("All files (*)"));
+
+    if (fileName.isEmpty()) {
+        return;
+    }
+
+    Database* db = new Database();
+    DatabaseManagerStruct dbStruct;
+    dbStruct.dbWidget = new DatabaseWidget(db, this);
+
+    insertDatabase(db, dbStruct);
+    dbStruct.dbWidget->switchToImportCsv(fileName);
+}
+
 void DatabaseTabWidget::mergeDatabase()
 {
     QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
index 8f01a987d..d48e0e9d0 100644
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -66,6 +66,7 @@ public:
 public Q_SLOTS:
     void newDatabase();
     void openDatabase();
+    void importCsv();
     void mergeDatabase();
     void importKeePass1Database();
     bool saveDatabase(int index = -1);
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 1cb1882d3..2a88d8a1a 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -122,6 +122,8 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     m_editGroupWidget->setObjectName("editGroupWidget");
     m_changeMasterKeyWidget = new ChangeMasterKeyWidget();
     m_changeMasterKeyWidget->headlineLabel()->setText(tr("Change master key"));
+    m_csvImportWizard = new CsvImportWizard();
+    m_csvImportWizard->setObjectName("csvImportWizard");
     QFont headlineLabelFont = m_changeMasterKeyWidget->headlineLabel()->font();
     headlineLabelFont.setBold(true);
     headlineLabelFont.setPointSize(headlineLabelFont.pointSize() + 2);
@@ -145,6 +147,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     addWidget(m_databaseSettingsWidget);
     addWidget(m_historyEditEntryWidget);
     addWidget(m_databaseOpenWidget);
+    addWidget(m_csvImportWizard);
     addWidget(m_databaseOpenMergeWidget);
     addWidget(m_keepass1OpenWidget);
     addWidget(m_unlockDatabaseWidget);
@@ -165,6 +168,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     connect(m_databaseOpenWidget, SIGNAL(editFinished(bool)), SLOT(openDatabase(bool)));
     connect(m_databaseOpenMergeWidget, SIGNAL(editFinished(bool)), SLOT(mergeDatabase(bool)));
     connect(m_keepass1OpenWidget, SIGNAL(editFinished(bool)), SLOT(openDatabase(bool)));
+    connect(m_csvImportWizard, SIGNAL(importFinished(bool)), SLOT(csvImportFinished(bool)));
     connect(m_unlockDatabaseWidget, SIGNAL(editFinished(bool)), SLOT(unlockDatabase(bool)));
 	connect(m_unlockDatabaseDialog, SIGNAL(unlockDone(bool)), SLOT(unlockDatabase(bool)));
     connect(&m_fileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onWatchedFileChanged()));
@@ -624,6 +628,16 @@ void DatabaseWidget::setCurrentWidget(QWidget* widget)
     adjustSize();
 }
 
+void DatabaseWidget::csvImportFinished(bool accepted)
+{
+    if (!accepted) {
+        Q_EMIT closeRequest();
+    }
+    else {
+        setCurrentWidget(m_mainWidget);
+    }
+}
+
 void DatabaseWidget::switchToView(bool accepted)
 {
     if (m_newGroup) {
@@ -844,12 +858,21 @@ void DatabaseWidget::switchToOpenDatabase(const QString& fileName, const QString
     m_databaseOpenWidget->enterKey(password, keyFile);
 }
 
+void DatabaseWidget::switchToImportCsv(const QString& fileName)
+{
+    updateFilename(fileName);
+    switchToMasterKeyChange();
+    m_csvImportWizard->load(fileName, m_db);
+    setCurrentWidget(m_csvImportWizard);
+}
+
 void DatabaseWidget::switchToOpenMergeDatabase(const QString& fileName)
 {
     m_databaseOpenMergeWidget->load(fileName);
     setCurrentWidget(m_databaseOpenMergeWidget);
 }
 
+
 void DatabaseWidget::switchToOpenMergeDatabase(const QString& fileName, const QString& password,
                                           const QString& keyFile)
 {
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 66ece0537..87d14a182 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -1,4 +1,4 @@
-/*
+/*
  *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 
 #include "gui/entry/EntryModel.h"
 #include "gui/MessageWidget.h"
+#include "gui/csvImport/CsvImportWizard.h"
 
 class ChangeMasterKeyWidget;
 class DatabaseOpenWidget;
@@ -143,6 +144,8 @@ public Q_SLOTS:
     void switchToDatabaseSettings();
     void switchToOpenDatabase(const QString& fileName);
     void switchToOpenDatabase(const QString& fileName, const QString& password, const QString& keyFile);
+    void switchToImportCsv(const QString& fileName);
+    void csvImportFinished(bool accepted);
     void switchToOpenMergeDatabase(const QString& fileName);
     void switchToOpenMergeDatabase(const QString& fileName, const QString& password, const QString& keyFile);
     void switchToImportKeepass1(const QString& fileName);
@@ -187,6 +190,7 @@ private:
     EditEntryWidget* m_historyEditEntryWidget;
     EditGroupWidget* m_editGroupWidget;
     ChangeMasterKeyWidget* m_changeMasterKeyWidget;
+    CsvImportWizard* m_csvImportWizard;
     DatabaseSettingsWidget* m_databaseSettingsWidget;
     DatabaseOpenWidget* m_databaseOpenWidget;
     DatabaseOpenWidget* m_databaseOpenMergeWidget;
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 763ada1ae..aa862465d 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -250,6 +250,8 @@ MainWindow::MainWindow()
             SLOT(changeMasterKey()));
     connect(m_ui->actionChangeDatabaseSettings, SIGNAL(triggered()), m_ui->tabWidget,
             SLOT(changeDatabaseSettings()));
+    connect(m_ui->actionImportCsv, SIGNAL(triggered()), m_ui->tabWidget,
+            SLOT(importCsv()));
     connect(m_ui->actionImportKeePass1, SIGNAL(triggered()), m_ui->tabWidget,
             SLOT(importKeePass1Database()));
     connect(m_ui->actionRepairDatabase, SIGNAL(triggered()), this,
@@ -487,7 +489,7 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
     m_ui->actionDatabaseNew->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
     m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
     m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
-    m_ui->actionImportKeePass1->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
+    m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
     m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget);
     m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
 
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 6e3ecf684..7a029eeef 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -176,6 +176,13 @@
       <string>&amp;Recent databases</string>
      </property>
     </widget>
+    <widget class="QMenu" name="menuImport">
+     <property name="title">
+      <string>Import</string>
+     </property>
+     <addaction name="actionImportKeePass1"/>
+     <addaction name="actionImportCsv"/>
+    </widget>
     <addaction name="actionDatabaseNew"/>
     <addaction name="actionDatabaseOpen"/>
     <addaction name="menuRecentDatabases"/>
@@ -187,7 +194,7 @@
     <addaction name="actionChangeDatabaseSettings"/>
     <addaction name="separator"/>
     <addaction name="actionDatabaseMerge"/>
-    <addaction name="actionImportKeePass1"/>
+    <addaction name="menuImport"/>
     <addaction name="actionExportCsv"/>
     <addaction name="actionRepairDatabase"/>
     <addaction name="separator"/>
@@ -394,11 +401,6 @@
     <string>Database settings</string>
    </property>
   </action>
-  <action name="actionImportKeePass1">
-   <property name="text">
-    <string>&amp;Import KeePass 1 database</string>
-   </property>
-  </action>
   <action name="actionEntryClone">
    <property name="enabled">
     <bool>false</bool>
@@ -506,6 +508,16 @@
     <string>&amp;Export to CSV file</string>
    </property>
   </action>
+  <action name="actionImportKeePass1">
+   <property name="text">
+    <string>Import KeePass 1 database</string>
+   </property>
+  </action>
+  <action name="actionImportCsv">
+   <property name="text">
+    <string>Import CSV file</string>
+   </property>
+  </action>
   <action name="actionRepairDatabase">
    <property name="text">
     <string>Re&amp;pair database</string>
diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
new file mode 100644
index 000000000..9e53d5af3
--- /dev/null
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -0,0 +1,289 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CsvImportWidget.h"
+#include "ui_CsvImportWidget.h"
+#include "gui/MessageBox.h"
+
+#include <QFile>
+#include <QFileInfo>
+
+//I wanted to make the CSV import GUI future-proof, so if one day you need entries
+//to have a new field, all you have to do is uncomment a row or two here, and the GUI will follow:
+//dynamic generation of comboBoxes, labels, placement and so on. Try it for immense fun!
+const QStringList CsvImportWidget::m_columnheader = QStringList()
+    << QObject::tr("Group")
+    << QObject::tr("Title")
+    << QObject::tr("Username")
+    << QObject::tr("Password")
+    << QObject::tr("URL")
+    << QObject::tr("Notes")
+//  << QObject::tr("Future field1")
+//  << QObject::tr("Future field2")
+//  << QObject::tr("Future field3")
+    ;
+
+CsvImportWidget::CsvImportWidget(QWidget *parent)
+    : QWidget(parent)
+    , m_ui(new Ui::CsvImportWidget())
+    , m_parserModel(new CsvParserModel(this))
+    , m_comboModel(new QStringListModel(this))
+    , m_comboMapper(new QSignalMapper(this))
+{
+    m_ui->setupUi(this);
+
+    QFont font = m_ui->labelHeadline->font();
+    font.setBold(true);
+    font.setPointSize(font.pointSize() + 2);
+    m_ui->labelHeadline->setFont(font);
+
+    m_ui->comboBoxCodec->addItems(QStringList() <<"UTF-8" <<"Windows-1252" <<"UTF-16" <<"UTF-16LE");
+    m_ui->comboBoxFieldSeparator->addItems(QStringList() <<"," <<";" <<"-" <<":" <<".");
+    m_ui->comboBoxTextQualifier->addItems(QStringList() <<"\"" <<"'" <<":" <<"." <<"|");
+    m_ui->comboBoxComment->addItems(QStringList() <<"#" <<";" <<":" <<"@");
+
+    m_ui->tableViewFields->setSelectionMode(QAbstractItemView::NoSelection);
+    m_ui->tableViewFields->setFocusPolicy(Qt::NoFocus);
+
+    for (int i=0; i<m_columnheader.count(); ++i) {
+        QLabel* label = new QLabel(m_columnheader.at(i), this);
+        label->setFixedWidth(label->minimumSizeHint().width());
+        font = label->font();
+        font.setBold(false);
+        label->setFont(font);
+
+        QComboBox* combo = new QComboBox(this);
+        font = combo->font();
+        font.setBold(false);
+        combo->setFont(font);
+        m_combos.append(combo);
+        combo->setModel(m_comboModel);
+        m_comboMapper->setMapping(combo, i);
+        connect(combo, SIGNAL(currentIndexChanged(int)), m_comboMapper, SLOT(map()));
+
+        //layout labels and combo fields in column-first order
+        int combo_rows = 1+(m_columnheader.count()-1)/2;
+        int x=i%combo_rows;
+        int y= 2*(i/combo_rows);
+        m_ui->gridLayout_combos->addWidget(label, x, y);
+        m_ui->gridLayout_combos->addWidget(combo, x, y+1);
+    }
+
+    m_parserModel->setHeaderLabels(m_columnheader);
+    m_ui->tableViewFields->setModel(m_parserModel);
+
+    connect(m_ui->spinBoxSkip, SIGNAL(valueChanged(int)), SLOT(skippedChanged(int)));
+    connect(m_ui->comboBoxCodec, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
+    connect(m_ui->comboBoxTextQualifier, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
+    connect(m_ui->comboBoxComment, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
+    connect(m_ui->comboBoxFieldSeparator, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
+    connect(m_ui->checkBoxBackslash, SIGNAL(toggled(bool)), SLOT(parse()));
+    connect(m_ui->pushButtonWarnings, SIGNAL(clicked()), this, SLOT(showReport()));
+    connect(m_comboMapper, SIGNAL(mapped(int)), this, SLOT(comboChanged(int)));
+
+    connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(writeDatabase()));
+    connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+}
+
+void CsvImportWidget::comboChanged(int comboId) {
+    QComboBox* currentSender = qobject_cast<QComboBox*>(m_comboMapper->mapping(comboId));
+    if (currentSender->currentIndex() != -1) {
+        //here is the line that actually updates the GUI table
+        m_parserModel->mapColumns(currentSender->currentIndex(), comboId);
+    }
+    updateTableview();
+}
+
+void CsvImportWidget::skippedChanged(int rows) {
+    m_parserModel->setSkippedRows(rows);
+    updateTableview();
+}
+
+CsvImportWidget::~CsvImportWidget() {}
+
+void CsvImportWidget::configParser() {
+    m_parserModel->setBackslashSyntax(m_ui->checkBoxBackslash->isChecked());
+    m_parserModel->setComment(m_ui->comboBoxComment->currentText().at(0));
+    m_parserModel->setTextQualifier(m_ui->comboBoxTextQualifier->currentText().at(0));
+    m_parserModel->setCodec(m_ui->comboBoxCodec->currentText());
+    m_parserModel->setFieldSeparator(m_ui->comboBoxFieldSeparator->currentText().at(0));
+}
+
+void CsvImportWidget::updateTableview() {
+    m_ui->tableViewFields->resizeRowsToContents();
+    m_ui->tableViewFields->resizeColumnsToContents();
+
+    for (int c=0; c<m_ui->tableViewFields->horizontalHeader()->count(); ++c) {
+        m_ui->tableViewFields->horizontalHeader()->setSectionResizeMode(
+                    c, QHeaderView::Stretch);
+    }
+}
+
+void CsvImportWidget::updatePreview() {
+
+    m_ui->labelSizeRowsCols->setText(m_parserModel->getFileInfo());
+    m_ui->spinBoxSkip->setValue(0);
+    m_ui->spinBoxSkip->setMaximum(m_parserModel->rowCount()-1);
+
+    int i;
+    QStringList list(tr("Not present in CSV file"));
+
+    for (i=1; i<m_parserModel->getCsvCols(); i++) {
+        QString s = QString(tr("Column ")) + QString::number(i);
+        list << s;
+    }
+    m_comboModel->setStringList(list);
+
+    i=1;
+    Q_FOREACH (QComboBox* b, m_combos) {
+        if (i < m_parserModel->getCsvCols()) {
+            b->setCurrentIndex(i);
+        }
+        else {
+            b->setCurrentIndex(0);
+        }
+        ++i;
+    }
+}
+
+void CsvImportWidget::load(const QString& filename, Database* const db) {
+    m_db = db;
+    m_parserModel->setFilename(filename);
+    m_ui->labelFilename->setText(filename);
+    Group* group = m_db->rootGroup();
+    group->setUuid(Uuid::random());
+    group->setNotes(tr("Imported from CSV file\nOriginal data: ") + filename);
+
+    parse();
+}
+
+void CsvImportWidget::parse() {
+    configParser();
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    bool good = m_parserModel->parse();
+    QApplication::restoreOverrideCursor();
+    updatePreview();
+    m_ui->pushButtonWarnings->setEnabled(!good);
+}
+
+void CsvImportWidget::showReport() {
+    MessageBox::warning(this, tr("Syntax error"), tr("While parsing file...\n")
+               .append(m_parserModel->getStatus()), QMessageBox::Ok, QMessageBox::Ok);
+}
+
+void CsvImportWidget::writeDatabase() {
+
+    checkGroupNames();
+    for (int r=0; r<m_parserModel->rowCount(); r++) {
+        //use the validity of second column as a GO/NOGO hint for all others fields
+        if (m_parserModel->data(m_parserModel->index(r, 1)).isValid()) {
+            Entry* entry = new Entry();
+            entry->setUuid(Uuid::random());
+            entry->setGroup(splitGroups(m_parserModel->data(m_parserModel->index(r, 0)).toString()));
+            entry->setTitle(    m_parserModel->data(m_parserModel->index(r, 1)).toString());
+            entry->setUsername( m_parserModel->data(m_parserModel->index(r, 2)).toString());
+            entry->setPassword( m_parserModel->data(m_parserModel->index(r, 3)).toString());
+            entry->setUrl(      m_parserModel->data(m_parserModel->index(r, 4)).toString());
+            entry->setNotes(    m_parserModel->data(m_parserModel->index(r, 5)).toString());
+        }
+    }
+
+    QBuffer buffer;
+    buffer.open(QBuffer::ReadWrite);
+
+    KeePass2Writer writer;
+    writer.writeDatabase(&buffer, m_db);
+    if (writer.hasError()) {
+        MessageBox::warning(this, tr("Error"), tr("CSV import: writer has errors:\n")
+                   .append((writer.errorString())), QMessageBox::Ok, QMessageBox::Ok);
+    }
+    Q_EMIT editFinished(true);
+}
+
+
+void CsvImportWidget::checkGroupNames() {
+    QString groupLabel;
+    QStringList groupList;
+    bool is_root  = false
+       , is_empty = false
+       , is_label = false;
+    for (int r=0; r<m_parserModel->rowCount(); r++) {
+        groupLabel = m_parserModel->data(m_parserModel->index(r, 0)).toString();
+        //check if group name is either "root", "" (empty) or some other label
+        groupList = groupLabel.split("/", QString::SkipEmptyParts);
+        if (not groupList.first().compare("Root", Qt::CaseSensitive))
+            is_root = true;
+        else if (not groupLabel.compare(""))
+            is_empty = true;
+        else
+            is_label = true;
+        groupList.clear();
+    }
+
+    if ((not is_label and (is_empty xor is_root))
+        or (is_label and not is_root)) {
+        m_db->rootGroup()->setName("Root");
+    }
+    else if ((is_empty and is_root)
+             or (is_label and not is_empty and is_root)) {
+        m_db->rootGroup()->setName("CSV IMPORTED");
+    }
+    else {
+        //SHOULD NEVER GET HERE
+        m_db->rootGroup()->setName("ROOT_FALLBACK");
+    }
+}
+
+Group *CsvImportWidget::splitGroups(QString label) {
+    //extract group names from nested path provided in "label"
+    Group *current = m_db->rootGroup();
+    QStringList groupList = label.split("/", QString::SkipEmptyParts);
+
+    //skip the creation of a subgroup of Root with the same name
+    if (m_db->rootGroup()->name() == "Root" && groupList.first() == "Root") {
+        groupList.removeFirst();
+    }
+
+    for (const QString& groupName : groupList) {
+        Group *children = hasChildren(current, groupName);
+        if (children == nullptr) {
+            Group *brandNew = new Group();
+            brandNew->setParent(current);
+            brandNew->setName(groupName);
+            current = brandNew;
+        }
+        else {
+            Q_ASSERT(children != nullptr);
+            current = children;
+        }
+    }
+    return current;
+}
+
+Group* CsvImportWidget::hasChildren(Group* current, QString groupName) {
+    //returns the group whose name is "groupName" and is child of "current" group
+    for (Group * group : current->children()) {
+        if (group->name() == groupName) {
+            return group;
+        }
+    }
+    return nullptr;
+}
+
+void CsvImportWidget::reject() {
+    Q_EMIT editFinished(false);
+}
diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h
new file mode 100644
index 000000000..f8798b560
--- /dev/null
+++ b/src/gui/csvImport/CsvImportWidget.h
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_CSVIMPORTWIDGET_H
+#define KEEPASSX_CSVIMPORTWIDGET_H
+
+#include <QScopedPointer>
+#include <QPushButton>
+#include <QStringListModel>
+#include <QSignalMapper>
+#include <QList>
+#include <QComboBox>
+#include <QStackedWidget>
+
+#include "format/KeePass2Writer.h"
+#include "gui/csvImport/CsvParserModel.h"
+#include "keys/PasswordKey.h"
+#include "core/Metadata.h"
+
+
+namespace Ui {
+    class CsvImportWidget;
+}
+
+class CsvImportWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CsvImportWidget(QWidget *parent = nullptr);
+    virtual ~CsvImportWidget();
+    void load(const QString& filename, Database* const db);
+
+Q_SIGNALS:
+    void editFinished(bool accepted);
+
+private Q_SLOTS:
+    void parse();
+    void showReport();
+    void comboChanged(int comboId);
+    void skippedChanged(int rows);
+    void writeDatabase();
+    void checkGroupNames();
+    void reject();
+
+private:
+    Q_DISABLE_COPY(CsvImportWidget)
+    const QScopedPointer<Ui::CsvImportWidget> m_ui;
+    CsvParserModel* const m_parserModel;
+    QStringListModel* const m_comboModel;
+    QSignalMapper* m_comboMapper;
+    QList<QComboBox*> m_combos;
+    Database *m_db;
+
+    KeePass2Writer m_writer;
+    static const QStringList m_columnheader;
+    void configParser();
+    void updatePreview();
+    void updateTableview();
+    Group* splitGroups(QString label);
+    Group* hasChildren(Group* current, QString groupName);
+};
+
+#endif // KEEPASSX_CSVIMPORTWIDGET_H
diff --git a/src/gui/csvImport/CsvImportWidget.ui b/src/gui/csvImport/CsvImportWidget.ui
new file mode 100644
index 000000000..5df2aa1af
--- /dev/null
+++ b/src/gui/csvImport/CsvImportWidget.ui
@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CsvImportWidget</class>
+ <widget class="QWidget" name="CsvImportWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>779</width>
+    <height>691</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="Encoding">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>137</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Encoding</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="2" column="2">
+       <spacer name="horizontalSpacer_9">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer_10">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelTextQualifier">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Text is qualified by</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="pushButtonWarnings">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Show parser warnings</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <spacer name="horizontalSpacer_7">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxFieldSeparator">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="4">
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelCodec">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Codec</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4">
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxCodec">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelFieldSeparator">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Fields are separated by</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelComments">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Comments start with</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxComment">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="comboBoxTextQualifier">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3">
+       <widget class="QCheckBox" name="checkBoxBackslash">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Treat '\' as escape character</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="labelSkipRows">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Skip first</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBoxSkip">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelSkipRows_2">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>rows</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="labelWarnings">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+          <kerning>true</kerning>
+         </font>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="groupBoxColumnAssociations">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Column layout</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_combos">
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="labelHeadline">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Import CSV fields</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelFilename">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>filename</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelSizeRowsCols">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>size, rows, columns</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="4" column="0">
+    <widget class="QGroupBox" name="groupBoxPreview">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Preview</string>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QTableView" name="tableViewFields">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <attribute name="horizontalHeaderVisible">
+         <bool>true</bool>
+        </attribute>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>27</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/csvImport/CsvImportWizard.cpp b/src/gui/csvImport/CsvImportWizard.cpp
new file mode 100644
index 000000000..f84a22959
--- /dev/null
+++ b/src/gui/csvImport/CsvImportWizard.cpp
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CsvImportWizard.h"
+#include <QApplication>
+#include <QLabel>
+#include "gui/MessageBox.h"
+
+
+CsvImportWizard::CsvImportWizard(QWidget *parent)
+    : DialogyWidget(parent)
+{
+    m_layout = new QGridLayout(this);
+    m_pages = new QStackedWidget(parent);
+    m_layout->addWidget(m_pages, 0, 0);
+
+    m_pages->addWidget(key = new ChangeMasterKeyWidget(m_pages));
+    m_pages->addWidget(parse = new CsvImportWidget(m_pages));
+    key->headlineLabel()->setText(tr("Import CSV file"));
+
+    connect(key, SIGNAL(editFinished(bool)), this, SLOT(keyFinished(bool)));
+    connect(parse, SIGNAL(editFinished(bool)), this, SLOT(parseFinished(bool)));
+}
+
+CsvImportWizard::~CsvImportWizard()
+{}
+
+void CsvImportWizard::load(const QString& filename, Database* database)
+{
+    m_db = database;
+    parse->load(filename, database);
+    key->clearForms();
+}
+
+void CsvImportWizard::keyFinished(bool accepted)
+{
+    if (!accepted) {
+        Q_EMIT(importFinished(false));
+        return;
+    }
+
+    m_pages->setCurrentIndex(m_pages->currentIndex()+1);
+
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    bool result = m_db->setKey(key->newMasterKey());
+    QApplication::restoreOverrideCursor();
+
+    if (!result) {
+        MessageBox::critical(this, tr("Error"), tr("Unable to calculate master key"));
+        Q_EMIT importFinished(false);
+        return;
+    }
+}
+
+void CsvImportWizard::parseFinished(bool accepted)
+{
+    Q_EMIT(importFinished(accepted));
+}
diff --git a/src/gui/csvImport/CsvImportWizard.h b/src/gui/csvImport/CsvImportWizard.h
new file mode 100644
index 000000000..5a83a19d8
--- /dev/null
+++ b/src/gui/csvImport/CsvImportWizard.h
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_CSVIMPORTWIZARD_H
+#define KEEPASSX_CSVIMPORTWIZARD_H
+
+#include <QStackedWidget>
+#include <QGridLayout>
+
+#include "CsvImportWidget.h"
+#include "core/Database.h"
+#include "gui/ChangeMasterKeyWidget.h"
+#include "gui/DialogyWidget.h"
+
+class CsvImportWidget;
+
+class CsvImportWizard : public DialogyWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CsvImportWizard(QWidget *parent = nullptr);
+    virtual ~CsvImportWizard();
+    void load(const QString& filename, Database *database);
+
+Q_SIGNALS:
+    void importFinished(bool accepted);
+
+private Q_SLOTS:
+    void keyFinished(bool accepted);
+    void parseFinished(bool accepted);
+
+private:
+    Database* m_db;
+    CsvImportWidget* parse;
+    ChangeMasterKeyWidget* key;
+    QStackedWidget *m_pages;
+    QGridLayout *m_layout;
+};
+
+#endif //KEEPASSX_CSVIMPORTWIZARD_H
diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp
new file mode 100644
index 000000000..3bc6c834c
--- /dev/null
+++ b/src/gui/csvImport/CsvParserModel.cpp
@@ -0,0 +1,139 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CsvParserModel.h"
+
+CsvParserModel::CsvParserModel(QObject *parent)
+    : QAbstractTableModel(parent)
+    , m_skipped(0)
+{}
+
+CsvParserModel::~CsvParserModel()
+{}
+
+void CsvParserModel::setFilename(const QString& filename) {
+    m_filename = filename;
+}
+
+QString CsvParserModel::getFileInfo(){
+    QString a(QString::number(getFileSize()).append(tr(" byte, ")));
+    a.append(QString::number(getCsvRows())).append(tr(" rows, "));
+    a.append(QString::number((getCsvCols()-1))).append(tr(" columns"));
+    return a;
+}
+
+bool CsvParserModel::parse() {
+    bool r;
+    beginResetModel();
+    m_columnMap.clear();
+    if (CsvParser::isFileLoaded()) {
+        r = CsvParser::reparse();
+    }
+    else {
+        QFile csv(m_filename);
+        r = CsvParser::parse(&csv);
+    }
+    for (int i=0; i<columnCount(); i++) {
+        m_columnMap.insert(i,0);
+    }
+    addEmptyColumn();
+    endResetModel();
+    return r;
+}
+
+void CsvParserModel::addEmptyColumn() {
+    for (int i=0; i<m_table.size(); ++i) {
+        csvrow r = m_table.at(i);
+        r.prepend(QString(""));
+        m_table.replace(i, r);
+    }
+}
+
+void CsvParserModel::mapColumns(int csvColumn, int dbColumn) {
+    if ((csvColumn < 0) || (dbColumn < 0) ) {
+        return;
+    }
+
+    beginResetModel();
+    if (csvColumn >= getCsvCols()) {
+        m_columnMap[dbColumn] = 0; //map to the empty column
+    }
+    else {
+        m_columnMap[dbColumn] = csvColumn;
+    }
+    endResetModel();
+}
+
+void CsvParserModel::setSkippedRows(int skipped) {
+    m_skipped = skipped;
+    QModelIndex topLeft = createIndex(skipped,0);
+    QModelIndex bottomRight = createIndex(m_skipped+rowCount(), columnCount());
+    Q_EMIT dataChanged(topLeft, bottomRight);
+    Q_EMIT layoutChanged();
+}
+
+void CsvParserModel::setHeaderLabels(QStringList l) {
+    m_columnHeader = l;
+}
+
+int CsvParserModel::rowCount(const QModelIndex &parent) const {
+    if (parent.isValid()) {
+        return 0;
+    }
+    return getCsvRows();
+}
+
+int CsvParserModel::columnCount(const QModelIndex &parent) const {
+    if (parent.isValid()) {
+        return 0;
+    }
+    return m_columnHeader.size();
+}
+
+QVariant CsvParserModel::data(const QModelIndex &index, int role) const {
+    if (   (index.column() >= m_columnHeader.size())
+        || (index.row()+m_skipped >= rowCount())
+        || !index.isValid() )
+    {
+        return QVariant();
+    }
+
+    if (role == Qt::DisplayRole) {
+        return m_table.at(index.row()+m_skipped).at(m_columnMap[index.column()]);
+    }
+    return QVariant();
+}
+
+QVariant CsvParserModel::headerData(int section, Qt::Orientation orientation, int role) const {
+    if (role == Qt::DisplayRole) {
+        if (orientation == Qt::Horizontal) {
+            if ( (section < 0) || (section >= m_columnHeader.size())) {
+                return QVariant();
+            }
+            return m_columnHeader.at(section);
+        }
+        else if (orientation == Qt::Vertical) {
+            if (section+m_skipped >= rowCount()) {
+                return QVariant();
+            }
+            return QString::number(section+1);
+        }
+    }
+    return QVariant();
+}
+
+
diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h
new file mode 100644
index 000000000..ae7bf6e20
--- /dev/null
+++ b/src/gui/csvImport/CsvParserModel.h
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_CSVPARSERMODEL_H
+#define KEEPASSX_CSVPARSERMODEL_H
+
+#include <QAbstractTableModel>
+#include <QMap>
+#include "core/Group.h"
+#include "core/CsvParser.h"
+
+class CsvParserModel : public QAbstractTableModel, public CsvParser
+{
+    Q_OBJECT
+
+public:
+    explicit CsvParserModel(QObject *parent = nullptr);
+    virtual ~CsvParserModel();
+    void setFilename(const QString& filename);
+    QString getFileInfo();
+    bool parse();
+
+    void setHeaderLabels(QStringList l);
+    void mapColumns(int csvColumn, int dbColumn);
+
+    virtual int rowCount(const QModelIndex &parent  = QModelIndex()) const Q_DECL_OVERRIDE;
+    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
+
+public Q_SLOTS:
+    void setSkippedRows(int skipped);
+
+private:
+    int m_skipped;
+    QString m_filename;
+    QStringList m_columnHeader;
+    //first column of model must be empty (aka combobox row "Not present in CSV file")
+    void addEmptyColumn();
+    //mapping CSV columns to keepassx columns
+    QMap<int, int> m_columnMap;
+};
+
+#endif //KEEPASSX_CSVPARSERMODEL_H
+
diff --git a/src/main.cpp b/src/main.cpp
index 0618cefae..ab8177f74 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@
 #include "crypto/Crypto.h"
 #include "gui/Application.h"
 #include "gui/MainWindow.h"
+#include "gui/csvImport/CsvImportWizard.h"
 #include "gui/MessageBox.h"
 
 #ifdef QT_STATIC
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5840a5b4b..4f64f4c65 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -154,6 +154,9 @@ endif()
 add_unit_test(NAME testentry SOURCES TestEntry.cpp
               LIBS ${TEST_LIBRARIES})
 
+add_unit_test(NAME testcsvparser SOURCES TestCsvParser.cpp
+              LIBS ${TEST_LIBRARIES})
+
 add_unit_test(NAME testrandom SOURCES TestRandom.cpp
               LIBS ${TEST_LIBRARIES})
 
diff --git a/tests/TestCsvParser.cpp b/tests/TestCsvParser.cpp
new file mode 100644
index 000000000..9ff93f025
--- /dev/null
+++ b/tests/TestCsvParser.cpp
@@ -0,0 +1,335 @@
+/*
+ *  Copyright (C) 2015 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TestCsvParser.h"
+#include <QTest>
+
+QTEST_GUILESS_MAIN(TestCsvParser)
+
+void TestCsvParser::initTestCase()
+{
+    parser = new CsvParser();
+}
+
+void TestCsvParser::cleanupTestCase()
+{
+    delete parser;
+}
+
+void TestCsvParser::init()
+{
+    file.setFileName("/tmp/keepassXn94do1x.csv");
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate))
+        QFAIL("Cannot open file!");
+    parser->setBackslashSyntax(false);
+    parser->setComment('#');
+    parser->setFieldSeparator(',');
+    parser->setTextQualifier(QChar('"'));
+}
+
+void TestCsvParser::cleanup()
+{
+    file.close();
+}
+
+/****************** TEST CASES ******************/
+void TestCsvParser::testMissingQuote() {
+    parser->setTextQualifier(':');
+    QTextStream out(&file);
+    out << "A,B\n:BM,1";
+    QEXPECT_FAIL("", "Bad format", Continue);
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QWARN(parser->getStatus().toLatin1());
+}
+
+void TestCsvParser::testMalformed() {
+    parser->setTextQualifier(':');
+    QTextStream out(&file);
+    out << "A,B,C\n:BM::,1,:2:";
+    QEXPECT_FAIL("", "Bad format", Continue);
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QWARN(parser->getStatus().toLatin1());
+}
+
+void TestCsvParser::testBackslashSyntax() {
+    parser->setBackslashSyntax(true);
+    parser->setTextQualifier(QChar('X'));
+    QTextStream out(&file);
+    //attended result: one"\t\"wo
+    out << "Xone\\\"\\\\t\\\\\\\"w\noX\n"
+        << "X13X,X2\\X,X,\"\"3\"X\r"
+        << "3,X\"4\"X,,\n"
+        << "XX\n"
+        << "\\";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.at(0).at(0) == "one\"\\t\\\"w\no");
+    QVERIFY(t.at(1).at(0) == "13");
+    QVERIFY(t.at(1).at(1) == "2X,");
+    QVERIFY(t.at(1).at(2) == "\"\"3\"X");
+    QVERIFY(t.at(2).at(0) == "3");
+    QVERIFY(t.at(2).at(1) == "\"4\"");
+    QVERIFY(t.at(2).at(2) == "");
+    QVERIFY(t.at(2).at(3) == "");
+    QVERIFY(t.at(3).at(0) == "\\");
+    QVERIFY(t.size() == 4);
+}
+
+void TestCsvParser::testQuoted() {
+    QTextStream out(&file);
+    out << "ro,w,\"end, of \"\"\"\"\"\"row\"\"\"\"\"\n"
+        << "2\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.at(0).at(0) == "ro");
+    QVERIFY(t.at(0).at(1) == "w");
+    QVERIFY(t.at(0).at(2) == "end, of \"\"\"row\"\"");
+    QVERIFY(t.at(1).at(0) == "2");
+    QVERIFY(t.size() == 2);
+}
+
+void TestCsvParser::testEmptySimple() {
+    QTextStream out(&file);
+    out <<"";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 0);
+}
+
+void TestCsvParser::testEmptyQuoted() {
+    QTextStream out(&file);
+    out <<"\"\"";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 0);
+}
+
+void TestCsvParser::testEmptyNewline() {
+    QTextStream out(&file);
+    out <<"\"\n\"";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 0);
+}
+
+void TestCsvParser::testEmptyFile()
+{
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 0);
+}
+
+void TestCsvParser::testNewline()
+{
+    QTextStream out(&file);
+    out << "1,2\n\n\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 1);
+    QVERIFY(t.at(0).at(0) == "1");
+    QVERIFY(t.at(0).at(1) == "2");
+}
+
+void TestCsvParser::testCR()
+{
+    QTextStream out(&file);
+    out << "1,2\r3,4";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 2);
+    QVERIFY(t.at(0).at(0) == "1");
+    QVERIFY(t.at(0).at(1) == "2");
+    QVERIFY(t.at(1).at(0) == "3");
+    QVERIFY(t.at(1).at(1) == "4");
+}
+
+void TestCsvParser::testLF()
+{
+    QTextStream out(&file);
+    out << "1,2\n3,4";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 2);
+    QVERIFY(t.at(0).at(0) == "1");
+    QVERIFY(t.at(0).at(1) == "2");
+    QVERIFY(t.at(1).at(0) == "3");
+    QVERIFY(t.at(1).at(1) == "4");
+}
+
+void TestCsvParser::testCRLF()
+{
+    QTextStream out(&file);
+    out << "1,2\r\n3,4";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 2);
+    QVERIFY(t.at(0).at(0) == "1");
+    QVERIFY(t.at(0).at(1) == "2");
+    QVERIFY(t.at(1).at(0) == "3");
+    QVERIFY(t.at(1).at(1) == "4");
+}
+
+void TestCsvParser::testComments()
+{
+    QTextStream out(&file);
+    out << "  #one\n"
+        << " \t  # two, three \r\n"
+        << " #, sing\t with\r"
+        << " #\t  me!\n"
+        << "useful,text #1!";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 1);
+    QVERIFY(t.at(0).at(0) == "useful");
+    QVERIFY(t.at(0).at(1) == "text #1!");
+}
+
+void TestCsvParser::testColumns() {
+    QTextStream out(&file);
+    out << "1,2\n"
+        << ",,,,,,,,,a\n"
+        << "a,b,c,d\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(parser->getCsvCols() == 10);
+}
+
+void TestCsvParser::testSimple() {
+    QTextStream out(&file);
+    out << ",,2\r,2,3\n"
+        << "A,,B\"\n"
+        << " ,,\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 4);
+    QVERIFY(t.at(0).at(0) == "");
+    QVERIFY(t.at(0).at(1) == "");
+    QVERIFY(t.at(0).at(2) == "2");
+    QVERIFY(t.at(1).at(0) == "");
+    QVERIFY(t.at(1).at(1) == "2");
+    QVERIFY(t.at(1).at(2) == "3");
+    QVERIFY(t.at(2).at(0) == "A");
+    QVERIFY(t.at(2).at(1) == "");
+    QVERIFY(t.at(2).at(2) == "B\"");
+    QVERIFY(t.at(3).at(0) == " ");
+    QVERIFY(t.at(3).at(1) == "");
+    QVERIFY(t.at(3).at(2) == "");
+}
+
+void TestCsvParser::testSeparator() {
+    parser->setFieldSeparator('\t');
+    QTextStream out(&file);
+    out << "\t\t2\r\t2\t3\n"
+        << "A\t\tB\"\n"
+        << " \t\t\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 4);
+    QVERIFY(t.at(0).at(0) == "");
+    QVERIFY(t.at(0).at(1) == "");
+    QVERIFY(t.at(0).at(2) == "2");
+    QVERIFY(t.at(1).at(0) == "");
+    QVERIFY(t.at(1).at(1) == "2");
+    QVERIFY(t.at(1).at(2) == "3");
+    QVERIFY(t.at(2).at(0) == "A");
+    QVERIFY(t.at(2).at(1) == "");
+    QVERIFY(t.at(2).at(2) == "B\"");
+    QVERIFY(t.at(3).at(0) == " ");
+    QVERIFY(t.at(3).at(1) == "");
+    QVERIFY(t.at(3).at(2) == "");
+}
+
+void TestCsvParser::testMultiline()
+{
+    parser->setTextQualifier(QChar(':'));
+    QTextStream out(&file);
+    out << ":1\r\n2a::b:,:3\r4:\n"
+        << "2\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.at(0).at(0) == "1\n2a:b");
+    QVERIFY(t.at(0).at(1) == "3\n4");
+    QVERIFY(t.at(1).at(0) == "2");
+    QVERIFY(t.size() == 2);
+}
+
+void TestCsvParser::testEmptyReparsing()
+{
+    parser->parse(nullptr);
+    QVERIFY(parser->reparse());
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 0);
+}
+
+void TestCsvParser::testReparsing()
+{
+    QTextStream out(&file);
+    out << ":te\r\nxt1:,:te\rxt2:,:end of \"this\n string\":\n"
+        << "2\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+
+    QEXPECT_FAIL("", "Wrong qualifier", Continue);
+    QVERIFY(t.at(0).at(0) == "te\nxt1");
+
+    parser->setTextQualifier(QChar(':'));
+
+    QVERIFY(parser->reparse());
+    t = parser->getCsvTable();
+    QVERIFY(t.at(0).at(0) == "te\nxt1");
+    QVERIFY(t.at(0).at(1) == "te\nxt2");
+    QVERIFY(t.at(0).at(2) == "end of \"this\n string\"");
+    QVERIFY(t.at(1).at(0) == "2");
+    QVERIFY(t.size() == 2);
+}
+
+void TestCsvParser::testQualifier() {
+    parser->setTextQualifier(QChar('X'));
+    QTextStream out(&file);
+    out << "X1X,X2XX,X,\"\"3\"\"\"X\r"
+        << "3,X\"4\"X,,\n";
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 2);
+    QVERIFY(t.at(0).at(0) == "1");
+    QVERIFY(t.at(0).at(1) == "2X,");
+    QVERIFY(t.at(0).at(2) == "\"\"3\"\"\"X");
+    QVERIFY(t.at(1).at(0) == "3");
+    QVERIFY(t.at(1).at(1) == "\"4\"");
+    QVERIFY(t.at(1).at(2) == "");
+    QVERIFY(t.at(1).at(3) == "");
+}
+
+void TestCsvParser::testUnicode() {
+    //QString m("Texte en fran\u00e7ais");
+    //CORRECT QString g("\u20AC");
+    //CORRECT QChar g(0x20AC);
+    //ERROR QChar g("\u20AC");
+    parser->setFieldSeparator(QChar('A'));
+    QTextStream out(&file);
+    out << QString("€1A2śA\"3śAż\"Ażac");
+
+    QVERIFY(parser->parse(&file));
+    t = parser->getCsvTable();
+    QVERIFY(t.size() == 1);
+    QVERIFY(t.at(0).at(0) == "€1");
+    QVERIFY(t.at(0).at(1) == "2ś");
+    QVERIFY(t.at(0).at(2) == "3śAż");
+    QVERIFY(t.at(0).at(3) == "żac");
+}
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
new file mode 100644
index 000000000..efdd96ab0
--- /dev/null
+++ b/tests/TestCsvParser.h
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (C) 2015 Enrico Mariotti <enricomariotti@yahoo.it>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_TESTCSVPARSER_H
+#define KEEPASSX_TESTCSVPARSER_H
+
+#include <QObject>
+#include <QFile>
+
+#include "core/CsvParser.h"
+
+class CsvParser;
+
+class TestCsvParser : public QObject
+{
+    Q_OBJECT
+
+public:
+
+private Q_SLOTS:
+    void init();
+    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
+
+    void testUnicode();
+    void testLF();
+    void testEmptyReparsing();
+    void testSimple();
+    void testEmptyQuoted();
+    void testEmptyNewline();
+    void testSeparator();
+    void testCR();
+    void testCRLF();
+    void testMalformed();
+    void testQualifier();
+    void testNewline();
+    void testEmptySimple();
+    void testMissingQuote();
+    void testComments();
+    void testBackslashSyntax();
+    void testReparsing();
+    void testEmptyFile();
+    void testQuoted();
+    void testMultiline();
+    void testColumns();
+
+private:
+    QFile file;
+    CsvParser* parser;
+    csvtable t;
+    void dumpRow(csvtable table, int row);
+};
+
+#endif // KEEPASSX_TESTCSVPARSER_H

From a7e358c27dedb31ccf01e53df9d4277583f6a4a7 Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Sat, 18 Feb 2017 01:51:31 +0100
Subject: [PATCH 2/8] Syntax style, spaces and pretty indentation

---
 src/core/CsvParser.cpp                | 174 +++++++++++---------------
 src/core/CsvParser.h                  |  44 +++----
 src/gui/DatabaseWidget.cpp            |   3 +
 src/gui/DatabaseWidget.h              |   1 +
 src/gui/MainWindow.cpp                |   1 +
 src/gui/csvImport/CsvImportWidget.cpp |  99 +++++++--------
 src/gui/csvImport/CsvImportWidget.h   |   8 +-
 src/gui/csvImport/CsvImportWidget.ui  | 160 ++++++++++++-----------
 src/gui/csvImport/CsvImportWizard.cpp |   8 +-
 src/gui/csvImport/CsvImportWizard.h   |   5 +-
 src/gui/csvImport/CsvParserModel.cpp  |  48 +++----
 src/gui/csvImport/CsvParserModel.h    |  13 +-
 tests/TestCsvParser.h                 |   4 +-
 13 files changed, 273 insertions(+), 295 deletions(-)

diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp
index 87b3f3403..288cd0404 100644
--- a/src/core/CsvParser.cpp
+++ b/src/core/CsvParser.cpp
@@ -15,10 +15,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CsvParser.h"
+
 #include <QTextCodec>
 #include <QObject>
+
 #include "core/Tools.h"
-#include "CsvParser.h"
 
 CsvParser::CsvParser()
     : m_ch(0)
@@ -61,16 +63,14 @@ bool CsvParser::parse(QFile *device) {
         m_statusMsg += QObject::tr("NULL device\n");
         return false;
     }
-    if (!readFile(device)) {
+    if (!readFile(device))
         return false;
-    }
     return parseFile();
 }
 
 bool CsvParser::readFile(QFile *device) {
-    if (device->isOpen()) {
+    if (device->isOpen())
         device->close();
-    }
 
     device->open(QIODevice::ReadOnly);
     if (!Tools::readAllFromDevice(device, m_array)) {
@@ -78,14 +78,14 @@ bool CsvParser::readFile(QFile *device) {
         m_isFileLoaded = false;
     }
     else {
-    device->close();
+        device->close();
 
-    m_array.replace("\r\n", "\n");
-    m_array.replace("\r", "\n");
-    if (0 == m_array.size()) {
-        m_statusMsg += QObject::tr("File empty\n");
-    }
-    m_isFileLoaded = true;
+        m_array.replace("\r\n", "\n");
+        m_array.replace("\r", "\n");
+        if (0 == m_array.size()) {
+            m_statusMsg += QObject::tr("File empty\n");
+        }
+        m_isFileLoaded = true;
     }
     return m_isFileLoaded;
 }
@@ -117,11 +117,9 @@ void CsvParser::clear() {
 
 bool CsvParser::parseFile() {
     parseRecord();
-    while (!m_isEof)
-    {
-        if (!skipEndline()) {
+    while (!m_isEof) {
+        if (!skipEndline())
             appendStatusMsg(QObject::tr("malformed string"));
-        }
         m_currRow++;
         m_currCol = 1;
         parseRecord();
@@ -131,43 +129,36 @@ bool CsvParser::parseFile() {
 }
 
 void CsvParser::parseRecord() {
-    csvrow row;
+    CsvRow row;
     if (isComment()) {
         skipLine();
         return;
     }
-    else {
-        do {
-            parseField(row);
-            getChar(m_ch);
-        } while (isSeparator(m_ch) && !m_isEof);
+    do {
+        parseField(row);
+        getChar(m_ch);
+    } while (isSeparator(m_ch) && !m_isEof);
 
-        if (!m_isEof) {
-            ungetChar();
-        }
-        if (isEmptyRow(row)) {
-            row.clear();
-            return;
-        }
-        m_table.push_back(row);
-        if (m_maxCols < row.size()) {
-            m_maxCols = row.size();
-        }
-        m_currCol++;
+    if (!m_isEof)
+        ungetChar();
+    if (isEmptyRow(row)) {
+        row.clear();
+        return;
     }
+    m_table.push_back(row);
+    if (m_maxCols < row.size())
+        m_maxCols = row.size();
+    m_currCol++;
 }
 
-void CsvParser::parseField(csvrow& row) {
+void CsvParser::parseField(CsvRow& row) {
     QString field;
     peek(m_ch);
-    if (!isTerminator(m_ch))
-    {
-        if (isQualifier(m_ch)) {
+    if (!isTerminator(m_ch)) {
+        if (isQualifier(m_ch))
              parseQuoted(field);
-        }
-        else {
-             parseSimple(field);
-        }
+        else
+            parseSimple(field);
     }
     row.push_back(field);
 }
@@ -175,14 +166,12 @@ void CsvParser::parseField(csvrow& row) {
 void CsvParser::parseSimple(QString &s) {
     QChar c;
     getChar(c);
-    while ((isText(c)) && (!m_isEof))
-    {
+    while ((isText(c)) && (!m_isEof)) {
         s.append(c);
         getChar(c);
     }
-    if (!m_isEof) {
+    if (!m_isEof)
         ungetChar();
-    }
 }
 
 void CsvParser::parseQuoted(QString &s) {
@@ -190,25 +179,21 @@ void CsvParser::parseQuoted(QString &s) {
     getChar(m_ch);
     parseEscaped(s);
     //getChar(m_ch);
-    if (!isQualifier(m_ch)) {
+    if (!isQualifier(m_ch))
         appendStatusMsg(QObject::tr("missing closing quote"));
-    }
 }
 
 void CsvParser::parseEscaped(QString &s) {
     parseEscapedText(s);
-    while (processEscapeMark(s, m_ch)) {
+    while (processEscapeMark(s, m_ch))
         parseEscapedText(s);
-    }
-    if (!m_isEof) {
+    if (!m_isEof)
         ungetChar();
-    }
 }
 
 void CsvParser::parseEscapedText(QString &s) {
     getChar(m_ch);
-    while ((!isQualifier(m_ch)) && !m_isEof)
-    {
+    while ((!isQualifier(m_ch)) && !m_isEof) {
         s.append(m_ch);
         getChar(m_ch);
     }
@@ -218,30 +203,25 @@ bool CsvParser::processEscapeMark(QString &s, QChar c) {
     QChar buf;
     peek(buf);
     QChar c2;
-    //escape-character syntax, e.g. \"
-    if (true == m_isBackslashSyntax)
-    {
+    if (true == m_isBackslashSyntax) {
+        //escape-character syntax, e.g. \"
         if (c != '\\') {
             return false;
         }
         //consume (and append) second qualifier
         getChar(c2);
-        if (m_isEof){
+        if (m_isEof) {
             c2='\\';
             s.append('\\');
             return false;
-        }
-        else {
+        } else {
             s.append(c2);
             return true;
         }
-    }
-    //double quote syntax, e.g. ""
-    else
-    {
-        if (!isQualifier(c)) {
+    } else {
+        //double quote syntax, e.g. ""
+        if (!isQualifier(c))
             return false;
-        }
         peek(c2);
         if (!m_isEof) { //not EOF, can read one char
             if (isQualifier(c2)) {
@@ -255,13 +235,12 @@ bool CsvParser::processEscapeMark(QString &s, QChar c) {
 }
 
 void CsvParser::fillColumns() {
-    //fill the rows with lesser columns with empty fields
-
-    for (int i=0; i<m_table.size(); ++i) {
+    //fill shorter rows with empty placeholder columns
+    for (int i = 0; i < m_table.size(); ++i) {
         int gap = m_maxCols-m_table.at(i).size();
         if (gap > 0) {
-            csvrow r = m_table.at(i);
-            for (int j=0; j<gap; ++j) {
+            CsvRow r = m_table.at(i);
+            for (int j = 0; j < gap; ++j) {
                 r.append(QString(""));
             }
             m_table.replace(i, r);
@@ -271,7 +250,7 @@ void CsvParser::fillColumns() {
 
 void CsvParser::skipLine() {
     m_ts.readLine();
-    m_ts.seek(m_ts.pos()-1);
+    m_ts.seek(m_ts.pos() - 1);
 }
 
 bool CsvParser::skipEndline() {
@@ -295,18 +274,15 @@ void CsvParser::ungetChar() {
 
 void CsvParser::peek(QChar& c) {
     getChar(c);
-    if (!m_isEof) {
+    if (!m_isEof)
         ungetChar();
-    }
 }
 
-bool CsvParser::isQualifier(const QChar c) const {
-    if (true == m_isBackslashSyntax && (c != m_qualifier)) {
+bool CsvParser::isQualifier(const QChar &c) const {
+    if (true == m_isBackslashSyntax && (c != m_qualifier))
         return (c == '\\');
-    }
-    else {
-    return (c == m_qualifier);
-    }
+    else
+        return (c == m_qualifier);
 }
 
 bool CsvParser::isComment() {
@@ -314,13 +290,11 @@ bool CsvParser::isComment() {
     QChar c2;
     qint64 pos = m_ts.pos();
 
-    do {
-        getChar(c2);
-    } while ((isSpace(c2) || isTab(c2)) && (!m_isEof));
+    do getChar(c2);
+    while ((isSpace(c2) || isTab(c2)) && (!m_isEof));
 
-    if (c2 == m_comment) {
+    if (c2 == m_comment)
         result = true;
-    }
     m_ts.seek(pos);
     return result;
 }
@@ -329,32 +303,31 @@ bool CsvParser::isText(QChar c) const {
      return !( (isCRLF(c)) || (isSeparator(c)) );
 }
 
-bool CsvParser::isEmptyRow(csvrow row) const {
-    csvrow::const_iterator it = row.constBegin();
-    for (; it != row.constEnd(); ++it) {
+bool CsvParser::isEmptyRow(CsvRow row) const {
+    CsvRow::const_iterator it = row.constBegin();
+    for (; it != row.constEnd(); ++it)
         if ( ((*it) != "\n") && ((*it) != "") )
             return false;
-    }
     return true;
 }
 
-bool CsvParser::isCRLF(const QChar c) const {
+bool CsvParser::isCRLF(const QChar &c) const {
     return (c == '\n');
 }
 
-bool CsvParser::isSpace(const QChar c) const {
+bool CsvParser::isSpace(const QChar &c) const {
     return (c == 0x20);
 }
 
-bool CsvParser::isTab(const QChar c) const {
+bool CsvParser::isTab(const QChar &c) const {
     return (c == '\t');
 }
 
-bool CsvParser::isSeparator(const QChar c) const {
+bool CsvParser::isSeparator(const QChar &c) const {
     return (c == m_separator);
 }
 
-bool CsvParser::isTerminator(const QChar c) const {
+bool CsvParser::isTerminator(const QChar &c) const {
     return (isSeparator(c) || (c == '\n') || (c == '\r'));
 }
 
@@ -362,19 +335,19 @@ void CsvParser::setBackslashSyntax(bool set) {
     m_isBackslashSyntax = set;
 }
 
-void CsvParser::setComment(const QChar c) {
+void CsvParser::setComment(const QChar &c) {
     m_comment = c.unicode();
 }
 
-void CsvParser::setCodec(const QString s) {
+void CsvParser::setCodec(const QString &s) {
     m_ts.setCodec(QTextCodec::codecForName(s.toLocal8Bit()));
 }
 
-void CsvParser::setFieldSeparator(const QChar c) {
+void CsvParser::setFieldSeparator(const QChar &c) {
     m_separator = c.unicode();
 }
 
-void CsvParser::setTextQualifier(const QChar c) {
+void CsvParser::setTextQualifier(const QChar &c) {
     m_qualifier = c.unicode();
 }
 
@@ -382,11 +355,14 @@ int CsvParser::getFileSize() const {
     return m_csv.size();
 }
 
-const csvtable CsvParser::getCsvTable() const {
+const CsvTable CsvParser::getCsvTable() const {
     return m_table;
 }
 
 QString CsvParser::getStatus() const {
+    if (m_statusMsg.size() > 100)
+        return m_statusMsg.section('\n', 0, 4)
+                .append("\n[...]\n").append(QObject::tr("More messages, skipped!"));
     return m_statusMsg;
 }
 
diff --git a/src/core/CsvParser.h b/src/core/CsvParser.h
index 77c6d36e1..f7c043a30 100644
--- a/src/core/CsvParser.h
+++ b/src/core/CsvParser.h
@@ -23,8 +23,8 @@
 #include <QQueue>
 #include <QTextStream>
 
-typedef QStringList csvrow;
-typedef QList<csvrow> csvtable;
+typedef QStringList CsvRow;
+typedef QList<CsvRow> CsvTable;
 
 class CsvParser {
 
@@ -36,19 +36,19 @@ public:
     bool isFileLoaded();
     //reparse the same buffer (device is not opened again)
     bool reparse();
-    void setCodec(const QString s);
-    void setComment(const QChar c);
-    void setFieldSeparator(const QChar c);
-    void setTextQualifier(const QChar c);
+    void setCodec(const QString &s);
+    void setComment(const QChar &c);
+    void setFieldSeparator(const QChar &c);
+    void setTextQualifier(const QChar &c);
     void setBackslashSyntax(bool set);
-     int getFileSize() const;
-     int getCsvRows() const;
-     int getCsvCols() const;
+    int getFileSize() const;
+    int getCsvRows() const;
+    int getCsvCols() const;
     QString getStatus() const;
-    const csvtable getCsvTable() const;
+    const CsvTable getCsvTable() const;
 
 protected:
-    csvtable m_table;
+    CsvTable m_table;
 
 private:
     QByteArray   m_array;
@@ -72,22 +72,22 @@ private:
     void ungetChar();
     void peek(QChar &c);
     void fillColumns();
-    bool isTerminator(const QChar c) const;
-    bool isSeparator(const QChar c) const;
-    bool isQualifier(const QChar c) const;
+    bool isTerminator(const QChar &c) const;
+    bool isSeparator(const QChar &c) const;
+    bool isQualifier(const QChar &c) const;
     bool processEscapeMark(QString &s, QChar c);
     bool isText(QChar c) const;
     bool isComment();
-    bool isCRLF(const QChar c) const;
-    bool isSpace(const QChar c) const;
-    bool isTab(const QChar c) const;
-    bool isEmptyRow(csvrow row) const;
+    bool isCRLF(const QChar &c) const;
+    bool isSpace(const QChar &c) const;
+    bool isTab(const QChar &c) const;
+    bool isEmptyRow(CsvRow row) const;
     bool parseFile();
     void parseRecord();
-    void parseField(csvrow& row);
-    void parseSimple(QString& s);
-    void parseQuoted(QString& s);
-    void parseEscaped(QString& s);
+    void parseField(CsvRow &row);
+    void parseSimple(QString &s);
+    void parseQuoted(QString &s);
+    void parseEscaped(QString &s);
     void parseEscapedText(QString &s);
     bool readFile(QFile *device);
     void reset();
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 2a88d8a1a..86319e910 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -196,6 +196,9 @@ DatabaseWidget::Mode DatabaseWidget::currentMode() const
     if (currentWidget() == nullptr) {
         return DatabaseWidget::None;
     }
+    else if (currentWidget() == m_csvImportWizard) {
+        return DatabaseWidget::ImportMode;
+    }
     else if (currentWidget() == m_mainWidget) {
         return DatabaseWidget::ViewMode;
     }
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 87d14a182..651b9d34f 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -61,6 +61,7 @@ public:
     enum Mode
     {
         None,
+        ImportMode,
         ViewMode,
         EditMode,
         LockedMode
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index aa862465d..47edaf482 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -425,6 +425,7 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             break;
         }
         case DatabaseWidget::EditMode:
+        case DatabaseWidget::ImportMode:
         case DatabaseWidget::LockedMode: {
             const QList<QAction*> entryActions = m_ui->menuEntries->actions();
             for (QAction* action : entryActions) {
diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
index 9e53d5af3..1e3c81a86 100644
--- a/src/gui/csvImport/CsvImportWidget.cpp
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -17,15 +17,17 @@
 
 #include "CsvImportWidget.h"
 #include "ui_CsvImportWidget.h"
-#include "gui/MessageBox.h"
 
 #include <QFile>
 #include <QFileInfo>
 
+#include "gui/MessageBox.h"
+#include "gui/MessageWidget.h"
+
 //I wanted to make the CSV import GUI future-proof, so if one day you need entries
 //to have a new field, all you have to do is uncomment a row or two here, and the GUI will follow:
 //dynamic generation of comboBoxes, labels, placement and so on. Try it for immense fun!
-const QStringList CsvImportWidget::m_columnheader = QStringList()
+const QStringList CsvImportWidget::m_columnHeader = QStringList()
     << QObject::tr("Group")
     << QObject::tr("Title")
     << QObject::tr("Username")
@@ -46,10 +48,7 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
 {
     m_ui->setupUi(this);
 
-    QFont font = m_ui->labelHeadline->font();
-    font.setBold(true);
-    font.setPointSize(font.pointSize() + 2);
-    m_ui->labelHeadline->setFont(font);
+    m_ui->messageWidget->setHidden(true);
 
     m_ui->comboBoxCodec->addItems(QStringList() <<"UTF-8" <<"Windows-1252" <<"UTF-16" <<"UTF-16LE");
     m_ui->comboBoxFieldSeparator->addItems(QStringList() <<"," <<";" <<"-" <<":" <<".");
@@ -59,10 +58,10 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
     m_ui->tableViewFields->setSelectionMode(QAbstractItemView::NoSelection);
     m_ui->tableViewFields->setFocusPolicy(Qt::NoFocus);
 
-    for (int i=0; i<m_columnheader.count(); ++i) {
-        QLabel* label = new QLabel(m_columnheader.at(i), this);
+    for (int i = 0; i < m_columnHeader.count(); ++i) {
+        QLabel* label = new QLabel(m_columnHeader.at(i), this);
         label->setFixedWidth(label->minimumSizeHint().width());
-        font = label->font();
+        QFont font = label->font();
         font.setBold(false);
         label->setFont(font);
 
@@ -76,14 +75,14 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
         connect(combo, SIGNAL(currentIndexChanged(int)), m_comboMapper, SLOT(map()));
 
         //layout labels and combo fields in column-first order
-        int combo_rows = 1+(m_columnheader.count()-1)/2;
-        int x=i%combo_rows;
-        int y= 2*(i/combo_rows);
+        int combo_rows = 1+(m_columnHeader.count()-1)/2;
+        int x = i%combo_rows;
+        int y = 2*(i/combo_rows);
         m_ui->gridLayout_combos->addWidget(label, x, y);
         m_ui->gridLayout_combos->addWidget(combo, x, y+1);
     }
 
-    m_parserModel->setHeaderLabels(m_columnheader);
+    m_parserModel->setHeaderLabels(m_columnHeader);
     m_ui->tableViewFields->setModel(m_parserModel);
 
     connect(m_ui->spinBoxSkip, SIGNAL(valueChanged(int)), SLOT(skippedChanged(int)));
@@ -101,10 +100,9 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
 
 void CsvImportWidget::comboChanged(int comboId) {
     QComboBox* currentSender = qobject_cast<QComboBox*>(m_comboMapper->mapping(comboId));
-    if (currentSender->currentIndex() != -1) {
-        //here is the line that actually updates the GUI table
+    if (currentSender->currentIndex() != -1)
+        //this line is the one that actually updates GUI table
         m_parserModel->mapColumns(currentSender->currentIndex(), comboId);
-    }
     updateTableview();
 }
 
@@ -127,7 +125,7 @@ void CsvImportWidget::updateTableview() {
     m_ui->tableViewFields->resizeRowsToContents();
     m_ui->tableViewFields->resizeColumnsToContents();
 
-    for (int c=0; c<m_ui->tableViewFields->horizontalHeader()->count(); ++c) {
+    for (int c = 0; c < m_ui->tableViewFields->horizontalHeader()->count(); ++c) {
         m_ui->tableViewFields->horizontalHeader()->setSectionResizeMode(
                     c, QHeaderView::Stretch);
     }
@@ -137,12 +135,12 @@ void CsvImportWidget::updatePreview() {
 
     m_ui->labelSizeRowsCols->setText(m_parserModel->getFileInfo());
     m_ui->spinBoxSkip->setValue(0);
-    m_ui->spinBoxSkip->setMaximum(m_parserModel->rowCount()-1);
+    m_ui->spinBoxSkip->setMaximum(m_parserModel->rowCount() - 1);
 
     int i;
     QStringList list(tr("Not present in CSV file"));
 
-    for (i=1; i<m_parserModel->getCsvCols(); i++) {
+    for (i = 1; i < m_parserModel->getCsvCols(); i++) {
         QString s = QString(tr("Column ")) + QString::number(i);
         list << s;
     }
@@ -150,12 +148,10 @@ void CsvImportWidget::updatePreview() {
 
     i=1;
     Q_FOREACH (QComboBox* b, m_combos) {
-        if (i < m_parserModel->getCsvCols()) {
+        if (i < m_parserModel->getCsvCols())
             b->setCurrentIndex(i);
-        }
-        else {
+        else
             b->setCurrentIndex(0);
-        }
         ++i;
     }
 }
@@ -166,7 +162,7 @@ void CsvImportWidget::load(const QString& filename, Database* const db) {
     m_ui->labelFilename->setText(filename);
     Group* group = m_db->rootGroup();
     group->setUuid(Uuid::random());
-    group->setNotes(tr("Imported from CSV file\nOriginal data: ") + filename);
+    group->setNotes(tr("Imported from CSV file").append("\n").append(tr("Original data: ")) + filename);
 
     parse();
 }
@@ -181,47 +177,48 @@ void CsvImportWidget::parse() {
 }
 
 void CsvImportWidget::showReport() {
-    MessageBox::warning(this, tr("Syntax error"), tr("While parsing file...\n")
-               .append(m_parserModel->getStatus()), QMessageBox::Ok, QMessageBox::Ok);
+//    MessageBox::warning(this, tr("Syntax error"), tr("While parsing file...\n")
+//               .append(m_parserModel->getStatus()), QMessageBox::Ok, QMessageBox::Ok);
+    m_ui->messageWidget->showMessage(tr("Syntax error while parsing file.").append("\n")
+                               .append(m_parserModel->getStatus()), MessageWidget::Warning);
 }
 
 void CsvImportWidget::writeDatabase() {
 
-    checkGroupNames();
-    for (int r=0; r<m_parserModel->rowCount(); r++) {
+    setRootGroup();
+    for (int r = 0; r < m_parserModel->rowCount(); r++)
         //use the validity of second column as a GO/NOGO hint for all others fields
         if (m_parserModel->data(m_parserModel->index(r, 1)).isValid()) {
             Entry* entry = new Entry();
             entry->setUuid(Uuid::random());
             entry->setGroup(splitGroups(m_parserModel->data(m_parserModel->index(r, 0)).toString()));
-            entry->setTitle(    m_parserModel->data(m_parserModel->index(r, 1)).toString());
-            entry->setUsername( m_parserModel->data(m_parserModel->index(r, 2)).toString());
-            entry->setPassword( m_parserModel->data(m_parserModel->index(r, 3)).toString());
-            entry->setUrl(      m_parserModel->data(m_parserModel->index(r, 4)).toString());
-            entry->setNotes(    m_parserModel->data(m_parserModel->index(r, 5)).toString());
+            entry->setTitle(m_parserModel->data(m_parserModel->index(r, 1)).toString());
+            entry->setUsername(m_parserModel->data(m_parserModel->index(r, 2)).toString());
+            entry->setPassword(m_parserModel->data(m_parserModel->index(r, 3)).toString());
+            entry->setUrl(m_parserModel->data(m_parserModel->index(r, 4)).toString());
+            entry->setNotes(m_parserModel->data(m_parserModel->index(r, 5)).toString());
         }
-    }
 
     QBuffer buffer;
     buffer.open(QBuffer::ReadWrite);
 
     KeePass2Writer writer;
     writer.writeDatabase(&buffer, m_db);
-    if (writer.hasError()) {
+    if (writer.hasError())
         MessageBox::warning(this, tr("Error"), tr("CSV import: writer has errors:\n")
                    .append((writer.errorString())), QMessageBox::Ok, QMessageBox::Ok);
-    }
     Q_EMIT editFinished(true);
 }
 
 
-void CsvImportWidget::checkGroupNames() {
+void CsvImportWidget::setRootGroup() {
     QString groupLabel;
     QStringList groupList;
-    bool is_root  = false
-       , is_empty = false
-       , is_label = false;
-    for (int r=0; r<m_parserModel->rowCount(); r++) {
+    bool is_root  = false;
+    bool is_empty = false;
+    bool is_label = false;
+
+    for (int r = 0; r < m_parserModel->rowCount(); r++) {
         groupLabel = m_parserModel->data(m_parserModel->index(r, 0)).toString();
         //check if group name is either "root", "" (empty) or some other label
         groupList = groupLabel.split("/", QString::SkipEmptyParts);
@@ -234,18 +231,13 @@ void CsvImportWidget::checkGroupNames() {
         groupList.clear();
     }
 
-    if ((not is_label and (is_empty xor is_root))
-        or (is_label and not is_root)) {
+    if ((not is_label and (is_empty xor is_root)) or (is_label and not is_root))
         m_db->rootGroup()->setName("Root");
-    }
-    else if ((is_empty and is_root)
-             or (is_label and not is_empty and is_root)) {
+    else if ((is_empty and is_root) or (is_label and not is_empty and is_root))
         m_db->rootGroup()->setName("CSV IMPORTED");
-    }
-    else {
+    else
         //SHOULD NEVER GET HERE
         m_db->rootGroup()->setName("ROOT_FALLBACK");
-    }
 }
 
 Group *CsvImportWidget::splitGroups(QString label) {
@@ -254,9 +246,8 @@ Group *CsvImportWidget::splitGroups(QString label) {
     QStringList groupList = label.split("/", QString::SkipEmptyParts);
 
     //skip the creation of a subgroup of Root with the same name
-    if (m_db->rootGroup()->name() == "Root" && groupList.first() == "Root") {
+    if (m_db->rootGroup()->name() == "Root" && groupList.first() == "Root")
         groupList.removeFirst();
-    }
 
     for (const QString& groupName : groupList) {
         Group *children = hasChildren(current, groupName);
@@ -265,8 +256,7 @@ Group *CsvImportWidget::splitGroups(QString label) {
             brandNew->setParent(current);
             brandNew->setName(groupName);
             current = brandNew;
-        }
-        else {
+        } else {
             Q_ASSERT(children != nullptr);
             current = children;
         }
@@ -277,9 +267,8 @@ Group *CsvImportWidget::splitGroups(QString label) {
 Group* CsvImportWidget::hasChildren(Group* current, QString groupName) {
     //returns the group whose name is "groupName" and is child of "current" group
     for (Group * group : current->children()) {
-        if (group->name() == groupName) {
+        if (group->name() == groupName)
             return group;
-        }
     }
     return nullptr;
 }
diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h
index f8798b560..1a71924ea 100644
--- a/src/gui/csvImport/CsvImportWidget.h
+++ b/src/gui/csvImport/CsvImportWidget.h
@@ -26,10 +26,10 @@
 #include <QComboBox>
 #include <QStackedWidget>
 
+#include "core/Metadata.h"
 #include "format/KeePass2Writer.h"
 #include "gui/csvImport/CsvParserModel.h"
 #include "keys/PasswordKey.h"
-#include "core/Metadata.h"
 
 
 namespace Ui {
@@ -42,7 +42,7 @@ class CsvImportWidget : public QWidget
 
 public:
     explicit CsvImportWidget(QWidget *parent = nullptr);
-    virtual ~CsvImportWidget();
+    ~CsvImportWidget();
     void load(const QString& filename, Database* const db);
 
 Q_SIGNALS:
@@ -54,7 +54,7 @@ private Q_SLOTS:
     void comboChanged(int comboId);
     void skippedChanged(int rows);
     void writeDatabase();
-    void checkGroupNames();
+    void setRootGroup();
     void reject();
 
 private:
@@ -67,7 +67,7 @@ private:
     Database *m_db;
 
     KeePass2Writer m_writer;
-    static const QStringList m_columnheader;
+    static const QStringList m_columnHeader;
     void configParser();
     void updatePreview();
     void updateTableview();
diff --git a/src/gui/csvImport/CsvImportWidget.ui b/src/gui/csvImport/CsvImportWidget.ui
index 5df2aa1af..8816c577c 100644
--- a/src/gui/csvImport/CsvImportWidget.ui
+++ b/src/gui/csvImport/CsvImportWidget.ui
@@ -14,7 +14,33 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
-   <item row="2" column="0">
+   <item row="2" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>758</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="Encoding">
      <property name="minimumSize">
       <size>
@@ -377,17 +403,7 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="4" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBoxColumnAssociations">
      <property name="font">
       <font>
@@ -409,50 +425,7 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QLabel" name="labelHeadline">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Import CSV fields</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelFilename">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>filename</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelSizeRowsCols">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>size, rows, columns</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0">
+   <item row="5" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBoxPreview">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -501,24 +474,69 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>27</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="0" column="0" rowspan="2">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="MessageWidget" name="messageWidget" native="true"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelHeadline">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Import CSV fields</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelFilename">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>filename</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelSizeRowsCols">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>size, rows, columns</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>MessageWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/MessageWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/gui/csvImport/CsvImportWizard.cpp b/src/gui/csvImport/CsvImportWizard.cpp
index f84a22959..0114fcf32 100644
--- a/src/gui/csvImport/CsvImportWizard.cpp
+++ b/src/gui/csvImport/CsvImportWizard.cpp
@@ -16,8 +16,10 @@
  */
 
 #include "CsvImportWizard.h"
+
 #include <QApplication>
 #include <QLabel>
+
 #include "gui/MessageBox.h"
 
 
@@ -49,7 +51,7 @@ void CsvImportWizard::load(const QString& filename, Database* database)
 void CsvImportWizard::keyFinished(bool accepted)
 {
     if (!accepted) {
-        Q_EMIT(importFinished(false));
+        emit(importFinished(false));
         return;
     }
 
@@ -61,12 +63,12 @@ void CsvImportWizard::keyFinished(bool accepted)
 
     if (!result) {
         MessageBox::critical(this, tr("Error"), tr("Unable to calculate master key"));
-        Q_EMIT importFinished(false);
+        emit(importFinished(false));
         return;
     }
 }
 
 void CsvImportWizard::parseFinished(bool accepted)
 {
-    Q_EMIT(importFinished(accepted));
+    emit(importFinished(accepted));
 }
diff --git a/src/gui/csvImport/CsvImportWizard.h b/src/gui/csvImport/CsvImportWizard.h
index 5a83a19d8..75d10bb9d 100644
--- a/src/gui/csvImport/CsvImportWizard.h
+++ b/src/gui/csvImport/CsvImportWizard.h
@@ -18,10 +18,11 @@
 #ifndef KEEPASSX_CSVIMPORTWIZARD_H
 #define KEEPASSX_CSVIMPORTWIZARD_H
 
+#include "CsvImportWidget.h"
+
 #include <QStackedWidget>
 #include <QGridLayout>
 
-#include "CsvImportWidget.h"
 #include "core/Database.h"
 #include "gui/ChangeMasterKeyWidget.h"
 #include "gui/DialogyWidget.h"
@@ -34,7 +35,7 @@ class CsvImportWizard : public DialogyWidget
 
 public:
     explicit CsvImportWizard(QWidget *parent = nullptr);
-    virtual ~CsvImportWizard();
+    ~CsvImportWizard();
     void load(const QString& filename, Database *database);
 
 Q_SIGNALS:
diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp
index 3bc6c834c..ba5d20d92 100644
--- a/src/gui/csvImport/CsvParserModel.cpp
+++ b/src/gui/csvImport/CsvParserModel.cpp
@@ -42,39 +42,33 @@ bool CsvParserModel::parse() {
     m_columnMap.clear();
     if (CsvParser::isFileLoaded()) {
         r = CsvParser::reparse();
-    }
-    else {
+    } else {
         QFile csv(m_filename);
         r = CsvParser::parse(&csv);
     }
-    for (int i=0; i<columnCount(); i++) {
+    for (int i = 0; i < columnCount(); i++)
         m_columnMap.insert(i,0);
-    }
     addEmptyColumn();
     endResetModel();
     return r;
 }
 
 void CsvParserModel::addEmptyColumn() {
-    for (int i=0; i<m_table.size(); ++i) {
-        csvrow r = m_table.at(i);
+    for (int i = 0; i < m_table.size(); ++i) {
+        CsvRow r = m_table.at(i);
         r.prepend(QString(""));
         m_table.replace(i, r);
     }
 }
 
 void CsvParserModel::mapColumns(int csvColumn, int dbColumn) {
-    if ((csvColumn < 0) || (dbColumn < 0) ) {
+    if ((csvColumn < 0) || (dbColumn < 0))
         return;
-    }
-
     beginResetModel();
-    if (csvColumn >= getCsvCols()) {
+    if (csvColumn >= getCsvCols())
         m_columnMap[dbColumn] = 0; //map to the empty column
-    }
-    else {
+    else
         m_columnMap[dbColumn] = csvColumn;
-    }
     endResetModel();
 }
 
@@ -82,8 +76,8 @@ void CsvParserModel::setSkippedRows(int skipped) {
     m_skipped = skipped;
     QModelIndex topLeft = createIndex(skipped,0);
     QModelIndex bottomRight = createIndex(m_skipped+rowCount(), columnCount());
-    Q_EMIT dataChanged(topLeft, bottomRight);
-    Q_EMIT layoutChanged();
+    emit dataChanged(topLeft, bottomRight);
+    emit layoutChanged();
 }
 
 void CsvParserModel::setHeaderLabels(QStringList l) {
@@ -91,45 +85,37 @@ void CsvParserModel::setHeaderLabels(QStringList l) {
 }
 
 int CsvParserModel::rowCount(const QModelIndex &parent) const {
-    if (parent.isValid()) {
+    if (parent.isValid())
         return 0;
-    }
     return getCsvRows();
 }
 
 int CsvParserModel::columnCount(const QModelIndex &parent) const {
-    if (parent.isValid()) {
+    if (parent.isValid())
         return 0;
-    }
     return m_columnHeader.size();
 }
 
 QVariant CsvParserModel::data(const QModelIndex &index, int role) const {
-    if (   (index.column() >= m_columnHeader.size())
+    if ((index.column() >= m_columnHeader.size())
         || (index.row()+m_skipped >= rowCount())
-        || !index.isValid() )
-    {
+        || !index.isValid()) {
         return QVariant();
     }
-
-    if (role == Qt::DisplayRole) {
+    if (role == Qt::DisplayRole)
         return m_table.at(index.row()+m_skipped).at(m_columnMap[index.column()]);
-    }
     return QVariant();
 }
 
 QVariant CsvParserModel::headerData(int section, Qt::Orientation orientation, int role) const {
     if (role == Qt::DisplayRole) {
         if (orientation == Qt::Horizontal) {
-            if ( (section < 0) || (section >= m_columnHeader.size())) {
+            if ((section < 0) || (section >= m_columnHeader.size()))
                 return QVariant();
-            }
             return m_columnHeader.at(section);
-        }
-        else if (orientation == Qt::Vertical) {
-            if (section+m_skipped >= rowCount()) {
+        } else if (orientation == Qt::Vertical) {
+            if (section+m_skipped >= rowCount())
                 return QVariant();
-            }
             return QString::number(section+1);
         }
     }
diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h
index ae7bf6e20..ff4f410d7 100644
--- a/src/gui/csvImport/CsvParserModel.h
+++ b/src/gui/csvImport/CsvParserModel.h
@@ -20,8 +20,9 @@
 
 #include <QAbstractTableModel>
 #include <QMap>
-#include "core/Group.h"
+
 #include "core/CsvParser.h"
+#include "core/Group.h"
 
 class CsvParserModel : public QAbstractTableModel, public CsvParser
 {
@@ -29,7 +30,7 @@ class CsvParserModel : public QAbstractTableModel, public CsvParser
 
 public:
     explicit CsvParserModel(QObject *parent = nullptr);
-    virtual ~CsvParserModel();
+    ~CsvParserModel();
     void setFilename(const QString& filename);
     QString getFileInfo();
     bool parse();
@@ -37,10 +38,10 @@ public:
     void setHeaderLabels(QStringList l);
     void mapColumns(int csvColumn, int dbColumn);
 
-    virtual int rowCount(const QModelIndex &parent  = QModelIndex()) const Q_DECL_OVERRIDE;
-    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent  = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
 public Q_SLOTS:
     void setSkippedRows(int skipped);
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
index efdd96ab0..975d86a92 100644
--- a/tests/TestCsvParser.h
+++ b/tests/TestCsvParser.h
@@ -62,8 +62,8 @@ private Q_SLOTS:
 private:
     QFile file;
     CsvParser* parser;
-    csvtable t;
-    void dumpRow(csvtable table, int row);
+    CsvTable t;
+    void dumpRow(CsvTable table, int row);
 };
 
 #endif // KEEPASSX_TESTCSVPARSER_H

From 41f9c3d2a1dac4c009dee2c53bcdb5bb7ccbd76e Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Wed, 22 Feb 2017 01:03:22 +0100
Subject: [PATCH 3/8] Better handle of parser status messages (critical/not
 critical) Use of messageWidget for displaying parser status messages
 setRootGroup assigns the right label to the root db folder test uses portable
 QTemporaryFile instead of hardcoded file

---
 src/core/CsvParser.cpp                |  24 +++---
 src/core/CsvParser.h                  |   2 +-
 src/gui/AboutDialog.ui                |   3 +-
 src/gui/csvImport/CsvImportWidget.cpp | 106 +++++++++++++++-----------
 src/gui/csvImport/CsvImportWidget.h   |   2 +-
 src/gui/csvImport/CsvImportWidget.ui  |  42 +++++-----
 src/gui/csvImport/CsvImportWizard.cpp |   5 +-
 src/gui/csvImport/CsvParserModel.cpp  |   2 +-
 tests/TestCsvParser.cpp               |  85 +++++++++++----------
 tests/TestCsvParser.h                 |   3 +-
 10 files changed, 150 insertions(+), 124 deletions(-)

diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp
index 288cd0404..0ab7f28cc 100644
--- a/src/core/CsvParser.cpp
+++ b/src/core/CsvParser.cpp
@@ -60,7 +60,7 @@ bool CsvParser::reparse() {
 bool CsvParser::parse(QFile *device) {
     clear();
     if (nullptr == device) {
-        m_statusMsg += QObject::tr("NULL device\n");
+        appendStatusMsg(QObject::tr("NULL device"), true);
         return false;
     }
     if (!readFile(device))
@@ -74,7 +74,7 @@ bool CsvParser::readFile(QFile *device) {
 
     device->open(QIODevice::ReadOnly);
     if (!Tools::readAllFromDevice(device, m_array)) {
-        m_statusMsg += QObject::tr("Error reading from device\n");
+        appendStatusMsg(QObject::tr("error reading from device"), true);
         m_isFileLoaded = false;
     }
     else {
@@ -82,9 +82,8 @@ bool CsvParser::readFile(QFile *device) {
 
         m_array.replace("\r\n", "\n");
         m_array.replace("\r", "\n");
-        if (0 == m_array.size()) {
-            m_statusMsg += QObject::tr("File empty\n");
-        }
+        if (0 == m_array.size())
+           appendStatusMsg(QObject::tr("file empty !\n"));
         m_isFileLoaded = true;
     }
     return m_isFileLoaded;
@@ -119,7 +118,7 @@ bool CsvParser::parseFile() {
     parseRecord();
     while (!m_isEof) {
         if (!skipEndline())
-            appendStatusMsg(QObject::tr("malformed string"));
+            appendStatusMsg(QObject::tr("malformed string"), true);
         m_currRow++;
         m_currCol = 1;
         parseRecord();
@@ -180,7 +179,7 @@ void CsvParser::parseQuoted(QString &s) {
     parseEscaped(s);
     //getChar(m_ch);
     if (!isQualifier(m_ch))
-        appendStatusMsg(QObject::tr("missing closing quote"));
+        appendStatusMsg(QObject::tr("missing closing quote"), true);
 }
 
 void CsvParser::parseEscaped(QString &s) {
@@ -269,7 +268,7 @@ void CsvParser::getChar(QChar& c) {
 
 void CsvParser::ungetChar() {
     if (!m_ts.seek(m_lastPos))
-        m_statusMsg += QObject::tr("Internal: unget lower bound exceeded");
+        appendStatusMsg(QObject::tr("INTERNAL - unget lower bound exceeded"), true);
 }
 
 void CsvParser::peek(QChar& c) {
@@ -360,9 +359,6 @@ const CsvTable CsvParser::getCsvTable() const {
 }
 
 QString CsvParser::getStatus() const {
-    if (m_statusMsg.size() > 100)
-        return m_statusMsg.section('\n', 0, 4)
-                .append("\n[...]\n").append(QObject::tr("More messages, skipped!"));
     return m_statusMsg;
 }
 
@@ -377,11 +373,11 @@ int CsvParser::getCsvRows() const {
 }
 
 
-void CsvParser::appendStatusMsg(QString s) {
+void CsvParser::appendStatusMsg(QString s, bool isCritical) {
     m_statusMsg += s
-      .append(" @" + QString::number(m_currRow))
+      .append(": (row,col) " + QString::number(m_currRow))
       .append(",")
       .append(QString::number(m_currCol))
       .append("\n");
-    m_isGood = false;
+    m_isGood = not isCritical;
 }
diff --git a/src/core/CsvParser.h b/src/core/CsvParser.h
index f7c043a30..48be05584 100644
--- a/src/core/CsvParser.h
+++ b/src/core/CsvParser.h
@@ -94,7 +94,7 @@ private:
     void clear();
     bool skipEndline();
     void skipLine();
-    void appendStatusMsg(QString s);
+    void appendStatusMsg(QString s, bool isCritical = false);
 };
 
 #endif //CSVPARSER_H
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index e1e706808..bfa27689a 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -160,8 +160,9 @@
 &lt;li&gt;debfx (KeePassX)&lt;/li&gt;
 &lt;li&gt;droidmonkey&lt;/li&gt;
 &lt;li&gt;louib&lt;/li&gt;
-&lt;li&gt;phoerious&lt;li&gt;
+&lt;li&gt;phoerious&lt;/li&gt;
 &lt;li&gt;thezero&lt;/li&gt;
+&lt;li&gt;seatedscribe&lt;/li&gt;
 &lt;/ul&gt;</string>
          </property>
         </widget>
diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
index 1e3c81a86..2c782b89f 100644
--- a/src/gui/csvImport/CsvImportWidget.cpp
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -48,8 +48,6 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
 {
     m_ui->setupUi(this);
 
-    m_ui->messageWidget->setHidden(true);
-
     m_ui->comboBoxCodec->addItems(QStringList() <<"UTF-8" <<"Windows-1252" <<"UTF-16" <<"UTF-16LE");
     m_ui->comboBoxFieldSeparator->addItems(QStringList() <<"," <<";" <<"-" <<":" <<".");
     m_ui->comboBoxTextQualifier->addItems(QStringList() <<"\"" <<"'" <<":" <<"." <<"|");
@@ -75,9 +73,9 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
         connect(combo, SIGNAL(currentIndexChanged(int)), m_comboMapper, SLOT(map()));
 
         //layout labels and combo fields in column-first order
-        int combo_rows = 1+(m_columnHeader.count()-1)/2;
-        int x = i%combo_rows;
-        int y = 2*(i/combo_rows);
+        int combo_rows = 1 + (m_columnHeader.count() - 1) / 2;
+        int x = i % combo_rows;
+        int y = 2 * (i / combo_rows);
         m_ui->gridLayout_combos->addWidget(label, x, y);
         m_ui->gridLayout_combos->addWidget(combo, x, y+1);
     }
@@ -91,7 +89,6 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
     connect(m_ui->comboBoxComment, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
     connect(m_ui->comboBoxFieldSeparator, SIGNAL(currentIndexChanged(int)), SLOT(parse()));
     connect(m_ui->checkBoxBackslash, SIGNAL(toggled(bool)), SLOT(parse()));
-    connect(m_ui->pushButtonWarnings, SIGNAL(clicked()), this, SLOT(showReport()));
     connect(m_comboMapper, SIGNAL(mapped(int)), this, SLOT(comboChanged(int)));
 
     connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(writeDatabase()));
@@ -125,17 +122,15 @@ void CsvImportWidget::updateTableview() {
     m_ui->tableViewFields->resizeRowsToContents();
     m_ui->tableViewFields->resizeColumnsToContents();
 
-    for (int c = 0; c < m_ui->tableViewFields->horizontalHeader()->count(); ++c) {
-        m_ui->tableViewFields->horizontalHeader()->setSectionResizeMode(
-                    c, QHeaderView::Stretch);
-    }
+    for (int c = 0; c < m_ui->tableViewFields->horizontalHeader()->count(); ++c)
+        m_ui->tableViewFields->horizontalHeader()->setSectionResizeMode(c, QHeaderView::Stretch);
 }
 
 void CsvImportWidget::updatePreview() {
 
     m_ui->labelSizeRowsCols->setText(m_parserModel->getFileInfo());
     m_ui->spinBoxSkip->setValue(0);
-    m_ui->spinBoxSkip->setMaximum(m_parserModel->rowCount() - 1);
+    m_ui->spinBoxSkip->setMaximum(qMax(0, m_parserModel->rowCount() - 1));
 
     int i;
     QStringList list(tr("Not present in CSV file"));
@@ -157,48 +152,63 @@ void CsvImportWidget::updatePreview() {
 }
 
 void CsvImportWidget::load(const QString& filename, Database* const db) {
+    //QApplication::processEvents();
     m_db = db;
     m_parserModel->setFilename(filename);
     m_ui->labelFilename->setText(filename);
     Group* group = m_db->rootGroup();
     group->setUuid(Uuid::random());
     group->setNotes(tr("Imported from CSV file").append("\n").append(tr("Original data: ")) + filename);
-
     parse();
 }
 
 void CsvImportWidget::parse() {
     configParser();
     QApplication::setOverrideCursor(Qt::WaitCursor);
+    //QApplication::processEvents();
     bool good = m_parserModel->parse();
-    QApplication::restoreOverrideCursor();
     updatePreview();
-    m_ui->pushButtonWarnings->setEnabled(!good);
+    QApplication::restoreOverrideCursor();
+    if (good)
+        //four newline are provided to avoid resizing at every Positive/Warning switch
+        m_ui->messageWidget->showMessage(QString("\n\n").append(tr("CSV syntax seems in good shape !"))
+                                         .append("\n\n"), MessageWidget::Positive);
+    else
+        m_ui->messageWidget->showMessage(tr("Error(s) detected in CSV file !").append("\n")
+                                         .append(formatStatusText()), MessageWidget::Warning);
+    QWidget::adjustSize();
 }
 
-void CsvImportWidget::showReport() {
-//    MessageBox::warning(this, tr("Syntax error"), tr("While parsing file...\n")
-//               .append(m_parserModel->getStatus()), QMessageBox::Ok, QMessageBox::Ok);
-    m_ui->messageWidget->showMessage(tr("Syntax error while parsing file.").append("\n")
-                               .append(m_parserModel->getStatus()), MessageWidget::Warning);
+
+QString CsvImportWidget::formatStatusText() const {
+    QString text = m_parserModel->getStatus();
+    int items = text.count('\n');
+    if (items > 3)
+        return text.section('\n', 0, 2)
+                .append("\n[").append(QString::number(items - 3))
+                .append(tr(" more messages skipped]"));
+    else
+        for (int i = 0; i < 3 - items; i++)
+            text.append(QString("\n"));
+        return text;
 }
 
 void CsvImportWidget::writeDatabase() {
 
     setRootGroup();
-    for (int r = 0; r < m_parserModel->rowCount(); r++)
-        //use the validity of second column as a GO/NOGO hint for all others fields
-        if (m_parserModel->data(m_parserModel->index(r, 1)).isValid()) {
-            Entry* entry = new Entry();
-            entry->setUuid(Uuid::random());
-            entry->setGroup(splitGroups(m_parserModel->data(m_parserModel->index(r, 0)).toString()));
-            entry->setTitle(m_parserModel->data(m_parserModel->index(r, 1)).toString());
-            entry->setUsername(m_parserModel->data(m_parserModel->index(r, 2)).toString());
-            entry->setPassword(m_parserModel->data(m_parserModel->index(r, 3)).toString());
-            entry->setUrl(m_parserModel->data(m_parserModel->index(r, 4)).toString());
-            entry->setNotes(m_parserModel->data(m_parserModel->index(r, 5)).toString());
-        }
-
+    for (int r = 0; r < m_parserModel->rowCount(); r++) {
+        //use validity of second column as a GO/NOGO for all others fields
+        if (not m_parserModel->data(m_parserModel->index(r, 1)).isValid())
+            continue;
+        Entry* entry = new Entry();
+        entry->setUuid(Uuid::random());
+        entry->setGroup(splitGroups(m_parserModel->data(m_parserModel->index(r, 0)).toString()));
+        entry->setTitle(m_parserModel->data(m_parserModel->index(r, 1)).toString());
+        entry->setUsername(m_parserModel->data(m_parserModel->index(r, 2)).toString());
+        entry->setPassword(m_parserModel->data(m_parserModel->index(r, 3)).toString());
+        entry->setUrl(m_parserModel->data(m_parserModel->index(r, 4)).toString());
+        entry->setNotes(m_parserModel->data(m_parserModel->index(r, 5)).toString());
+    }
     QBuffer buffer;
     buffer.open(QBuffer::ReadWrite);
 
@@ -207,7 +217,7 @@ void CsvImportWidget::writeDatabase() {
     if (writer.hasError())
         MessageBox::warning(this, tr("Error"), tr("CSV import: writer has errors:\n")
                    .append((writer.errorString())), QMessageBox::Ok, QMessageBox::Ok);
-    Q_EMIT editFinished(true);
+    emit editFinished(true);
 }
 
 
@@ -219,33 +229,39 @@ void CsvImportWidget::setRootGroup() {
     bool is_label = false;
 
     for (int r = 0; r < m_parserModel->rowCount(); r++) {
+        //use validity of second column as a GO/NOGO for all others fields
+        if (not m_parserModel->data(m_parserModel->index(r, 1)).isValid())
+            continue;
         groupLabel = m_parserModel->data(m_parserModel->index(r, 0)).toString();
         //check if group name is either "root", "" (empty) or some other label
         groupList = groupLabel.split("/", QString::SkipEmptyParts);
-        if (not groupList.first().compare("Root", Qt::CaseSensitive))
-            is_root = true;
-        else if (not groupLabel.compare(""))
+        if (groupList.isEmpty())
             is_empty = true;
         else
-            is_label = true;
+            if (not groupList.first().compare("Root", Qt::CaseSensitive))
+                is_root = true;
+            else if (not groupLabel.compare(""))
+                is_empty = true;
+            else
+                is_label = true;
+
         groupList.clear();
     }
 
-    if ((not is_label and (is_empty xor is_root)) or (is_label and not is_root))
-        m_db->rootGroup()->setName("Root");
-    else if ((is_empty and is_root) or (is_label and not is_empty and is_root))
+    if ((is_empty and is_root) or (is_label and not is_empty and is_root))
         m_db->rootGroup()->setName("CSV IMPORTED");
     else
-        //SHOULD NEVER GET HERE
-        m_db->rootGroup()->setName("ROOT_FALLBACK");
+        m_db->rootGroup()->setName("Root");
 }
 
 Group *CsvImportWidget::splitGroups(QString label) {
     //extract group names from nested path provided in "label"
     Group *current = m_db->rootGroup();
-    QStringList groupList = label.split("/", QString::SkipEmptyParts);
+    if (label.isEmpty())
+        return current;
 
-    //skip the creation of a subgroup of Root with the same name
+    QStringList groupList = label.split("/", QString::SkipEmptyParts);
+    //avoid the creation of a subgroup with the same name as Root
     if (m_db->rootGroup()->name() == "Root" && groupList.first() == "Root")
         groupList.removeFirst();
 
@@ -274,5 +290,5 @@ Group* CsvImportWidget::hasChildren(Group* current, QString groupName) {
 }
 
 void CsvImportWidget::reject() {
-    Q_EMIT editFinished(false);
+    emit editFinished(false);
 }
diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h
index 1a71924ea..2079e9f96 100644
--- a/src/gui/csvImport/CsvImportWidget.h
+++ b/src/gui/csvImport/CsvImportWidget.h
@@ -50,7 +50,6 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void parse();
-    void showReport();
     void comboChanged(int comboId);
     void skippedChanged(int rows);
     void writeDatabase();
@@ -73,6 +72,7 @@ private:
     void updateTableview();
     Group* splitGroups(QString label);
     Group* hasChildren(Group* current, QString groupName);
+    QString formatStatusText() const;
 };
 
 #endif // KEEPASSX_CSVIMPORTWIDGET_H
diff --git a/src/gui/csvImport/CsvImportWidget.ui b/src/gui/csvImport/CsvImportWidget.ui
index 8816c577c..82ee68dd2 100644
--- a/src/gui/csvImport/CsvImportWidget.ui
+++ b/src/gui/csvImport/CsvImportWidget.ui
@@ -122,22 +122,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
-       <widget class="QPushButton" name="pushButtonWarnings">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Show parser warnings</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="2">
        <spacer name="horizontalSpacer_7">
         <property name="orientation">
@@ -162,6 +146,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
         <property name="font">
          <font>
           <weight>50</weight>
@@ -239,6 +229,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
         <property name="font">
          <font>
           <weight>50</weight>
@@ -290,6 +286,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
         <property name="font">
          <font>
           <weight>50</weight>
@@ -309,6 +311,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
         <property name="font">
          <font>
           <weight>50</weight>
@@ -342,7 +350,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Treat '\' as escape character</string>
+         <string>Consider '\' as escape character</string>
         </property>
        </widget>
       </item>
diff --git a/src/gui/csvImport/CsvImportWizard.cpp b/src/gui/csvImport/CsvImportWizard.cpp
index 0114fcf32..a1e1757bb 100644
--- a/src/gui/csvImport/CsvImportWizard.cpp
+++ b/src/gui/csvImport/CsvImportWizard.cpp
@@ -33,6 +33,10 @@ CsvImportWizard::CsvImportWizard(QWidget *parent)
     m_pages->addWidget(key = new ChangeMasterKeyWidget(m_pages));
     m_pages->addWidget(parse = new CsvImportWidget(m_pages));
     key->headlineLabel()->setText(tr("Import CSV file"));
+    QFont headLineFont = key->headlineLabel()->font();
+    headLineFont.setBold(true);
+    headLineFont.setPointSize(headLineFont.pointSize() + 2);
+    key->headlineLabel()->setFont(headLineFont);
 
     connect(key, SIGNAL(editFinished(bool)), this, SLOT(keyFinished(bool)));
     connect(parse, SIGNAL(editFinished(bool)), this, SLOT(parseFinished(bool)));
@@ -64,7 +68,6 @@ void CsvImportWizard::keyFinished(bool accepted)
     if (!result) {
         MessageBox::critical(this, tr("Error"), tr("Unable to calculate master key"));
         emit(importFinished(false));
-        return;
     }
 }
 
diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp
index ba5d20d92..d315f1ad2 100644
--- a/src/gui/csvImport/CsvParserModel.cpp
+++ b/src/gui/csvImport/CsvParserModel.cpp
@@ -32,7 +32,7 @@ void CsvParserModel::setFilename(const QString& filename) {
 QString CsvParserModel::getFileInfo(){
     QString a(QString::number(getFileSize()).append(tr(" byte, ")));
     a.append(QString::number(getCsvRows())).append(tr(" rows, "));
-    a.append(QString::number((getCsvCols()-1))).append(tr(" columns"));
+    a.append(QString::number(qMax(0, getCsvCols()-1))).append(tr(" columns"));
     return a;
 }
 
diff --git a/tests/TestCsvParser.cpp b/tests/TestCsvParser.cpp
index 9ff93f025..93bcf0060 100644
--- a/tests/TestCsvParser.cpp
+++ b/tests/TestCsvParser.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "TestCsvParser.h"
+
 #include <QTest>
 
 QTEST_GUILESS_MAIN(TestCsvParser)
@@ -32,8 +33,8 @@ void TestCsvParser::cleanupTestCase()
 
 void TestCsvParser::init()
 {
-    file.setFileName("/tmp/keepassXn94do1x.csv");
-    if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate))
+    file = new QTemporaryFile();
+    if (not file->open())
         QFAIL("Cannot open file!");
     parser->setBackslashSyntax(false);
     parser->setComment('#');
@@ -43,26 +44,26 @@ void TestCsvParser::init()
 
 void TestCsvParser::cleanup()
 {
-    file.close();
+    file->remove();
 }
 
 /****************** TEST CASES ******************/
 void TestCsvParser::testMissingQuote() {
     parser->setTextQualifier(':');
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "A,B\n:BM,1";
     QEXPECT_FAIL("", "Bad format", Continue);
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QWARN(parser->getStatus().toLatin1());
 }
 
 void TestCsvParser::testMalformed() {
     parser->setTextQualifier(':');
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "A,B,C\n:BM::,1,:2:";
     QEXPECT_FAIL("", "Bad format", Continue);
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QWARN(parser->getStatus().toLatin1());
 }
@@ -70,14 +71,14 @@ void TestCsvParser::testMalformed() {
 void TestCsvParser::testBackslashSyntax() {
     parser->setBackslashSyntax(true);
     parser->setTextQualifier(QChar('X'));
-    QTextStream out(&file);
+    QTextStream out(file);
     //attended result: one"\t\"wo
     out << "Xone\\\"\\\\t\\\\\\\"w\noX\n"
         << "X13X,X2\\X,X,\"\"3\"X\r"
         << "3,X\"4\"X,,\n"
         << "XX\n"
         << "\\";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.at(0).at(0) == "one\"\\t\\\"w\no");
     QVERIFY(t.at(1).at(0) == "13");
@@ -92,10 +93,10 @@ void TestCsvParser::testBackslashSyntax() {
 }
 
 void TestCsvParser::testQuoted() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "ro,w,\"end, of \"\"\"\"\"\"row\"\"\"\"\"\n"
         << "2\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.at(0).at(0) == "ro");
     QVERIFY(t.at(0).at(1) == "w");
@@ -105,41 +106,41 @@ void TestCsvParser::testQuoted() {
 }
 
 void TestCsvParser::testEmptySimple() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out <<"";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 0);
 }
 
 void TestCsvParser::testEmptyQuoted() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out <<"\"\"";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 0);
 }
 
 void TestCsvParser::testEmptyNewline() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out <<"\"\n\"";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 0);
 }
 
 void TestCsvParser::testEmptyFile()
 {
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 0);
 }
 
 void TestCsvParser::testNewline()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "1,2\n\n\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 1);
     QVERIFY(t.at(0).at(0) == "1");
@@ -148,9 +149,9 @@ void TestCsvParser::testNewline()
 
 void TestCsvParser::testCR()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "1,2\r3,4";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 2);
     QVERIFY(t.at(0).at(0) == "1");
@@ -161,9 +162,9 @@ void TestCsvParser::testCR()
 
 void TestCsvParser::testLF()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "1,2\n3,4";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 2);
     QVERIFY(t.at(0).at(0) == "1");
@@ -174,9 +175,9 @@ void TestCsvParser::testLF()
 
 void TestCsvParser::testCRLF()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "1,2\r\n3,4";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 2);
     QVERIFY(t.at(0).at(0) == "1");
@@ -187,13 +188,13 @@ void TestCsvParser::testCRLF()
 
 void TestCsvParser::testComments()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "  #one\n"
         << " \t  # two, three \r\n"
         << " #, sing\t with\r"
         << " #\t  me!\n"
         << "useful,text #1!";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 1);
     QVERIFY(t.at(0).at(0) == "useful");
@@ -201,21 +202,21 @@ void TestCsvParser::testComments()
 }
 
 void TestCsvParser::testColumns() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "1,2\n"
         << ",,,,,,,,,a\n"
         << "a,b,c,d\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(parser->getCsvCols() == 10);
 }
 
 void TestCsvParser::testSimple() {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << ",,2\r,2,3\n"
         << "A,,B\"\n"
         << " ,,\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 4);
     QVERIFY(t.at(0).at(0) == "");
@@ -234,11 +235,11 @@ void TestCsvParser::testSimple() {
 
 void TestCsvParser::testSeparator() {
     parser->setFieldSeparator('\t');
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "\t\t2\r\t2\t3\n"
         << "A\t\tB\"\n"
         << " \t\t\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 4);
     QVERIFY(t.at(0).at(0) == "");
@@ -258,10 +259,10 @@ void TestCsvParser::testSeparator() {
 void TestCsvParser::testMultiline()
 {
     parser->setTextQualifier(QChar(':'));
-    QTextStream out(&file);
+    QTextStream out(file);
     out << ":1\r\n2a::b:,:3\r4:\n"
         << "2\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.at(0).at(0) == "1\n2a:b");
     QVERIFY(t.at(0).at(1) == "3\n4");
@@ -279,10 +280,10 @@ void TestCsvParser::testEmptyReparsing()
 
 void TestCsvParser::testReparsing()
 {
-    QTextStream out(&file);
+    QTextStream out(file);
     out << ":te\r\nxt1:,:te\rxt2:,:end of \"this\n string\":\n"
         << "2\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
 
     QEXPECT_FAIL("", "Wrong qualifier", Continue);
@@ -301,10 +302,10 @@ void TestCsvParser::testReparsing()
 
 void TestCsvParser::testQualifier() {
     parser->setTextQualifier(QChar('X'));
-    QTextStream out(&file);
+    QTextStream out(file);
     out << "X1X,X2XX,X,\"\"3\"\"\"X\r"
         << "3,X\"4\"X,,\n";
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 2);
     QVERIFY(t.at(0).at(0) == "1");
@@ -322,10 +323,10 @@ void TestCsvParser::testUnicode() {
     //CORRECT QChar g(0x20AC);
     //ERROR QChar g("\u20AC");
     parser->setFieldSeparator(QChar('A'));
-    QTextStream out(&file);
+    QTextStream out(file);
     out << QString("€1A2śA\"3śAż\"Ażac");
 
-    QVERIFY(parser->parse(&file));
+    QVERIFY(parser->parse(file));
     t = parser->getCsvTable();
     QVERIFY(t.size() == 1);
     QVERIFY(t.at(0).at(0) == "€1");
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
index 975d86a92..928ac4201 100644
--- a/tests/TestCsvParser.h
+++ b/tests/TestCsvParser.h
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QFile>
+#include <QTemporaryFile>
 
 #include "core/CsvParser.h"
 
@@ -60,7 +61,7 @@ private Q_SLOTS:
     void testColumns();
 
 private:
-    QFile file;
+    QTemporaryFile* file;
     CsvParser* parser;
     CsvTable t;
     void dumpRow(CsvTable table, int row);

From 39057a6aa085e603fcd0f24063bc101f7a77f0b4 Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Mon, 6 Mar 2017 00:47:49 +0100
Subject: [PATCH 4/8] Better widget positions, removed futile message when no
 errors shows up

---
 src/core/CsvParser.cpp                |   2 +-
 src/gui/AboutDialog.ui                |   1 -
 src/gui/csvImport/CsvImportWidget.cpp |  23 +-
 src/gui/csvImport/CsvImportWidget.ui  | 970 +++++++++++++-------------
 4 files changed, 515 insertions(+), 481 deletions(-)

diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp
index 0ab7f28cc..7f0443aac 100644
--- a/src/core/CsvParser.cpp
+++ b/src/core/CsvParser.cpp
@@ -315,7 +315,7 @@ bool CsvParser::isCRLF(const QChar &c) const {
 }
 
 bool CsvParser::isSpace(const QChar &c) const {
-    return (c == 0x20);
+    return (c == ' ');
 }
 
 bool CsvParser::isTab(const QChar &c) const {
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index bfa27689a..a853c0413 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -162,7 +162,6 @@
 &lt;li&gt;louib&lt;/li&gt;
 &lt;li&gt;phoerious&lt;/li&gt;
 &lt;li&gt;thezero&lt;/li&gt;
-&lt;li&gt;seatedscribe&lt;/li&gt;
 &lt;/ul&gt;</string>
          </property>
         </widget>
diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
index 2c782b89f..38eb09b93 100644
--- a/src/gui/csvImport/CsvImportWidget.cpp
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -20,6 +20,7 @@
 
 #include <QFile>
 #include <QFileInfo>
+#include <QSpacerItem>
 
 #include "gui/MessageBox.h"
 #include "gui/MessageWidget.h"
@@ -52,13 +53,13 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
     m_ui->comboBoxFieldSeparator->addItems(QStringList() <<"," <<";" <<"-" <<":" <<".");
     m_ui->comboBoxTextQualifier->addItems(QStringList() <<"\"" <<"'" <<":" <<"." <<"|");
     m_ui->comboBoxComment->addItems(QStringList() <<"#" <<";" <<":" <<"@");
-
     m_ui->tableViewFields->setSelectionMode(QAbstractItemView::NoSelection);
     m_ui->tableViewFields->setFocusPolicy(Qt::NoFocus);
+    m_ui->messageWidget->setHidden(true);
 
     for (int i = 0; i < m_columnHeader.count(); ++i) {
         QLabel* label = new QLabel(m_columnHeader.at(i), this);
-        label->setFixedWidth(label->minimumSizeHint().width());
+        label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
         QFont font = label->font();
         font.setBold(false);
         label->setFont(font);
@@ -78,6 +79,8 @@ CsvImportWidget::CsvImportWidget(QWidget *parent)
         int y = 2 * (i / combo_rows);
         m_ui->gridLayout_combos->addWidget(label, x, y);
         m_ui->gridLayout_combos->addWidget(combo, x, y+1);
+        QSpacerItem *item = new QSpacerItem(1,1, QSizePolicy::Expanding, QSizePolicy::Fixed);
+        m_ui->gridLayout_combos->addItem(item, x, y+2);
     }
 
     m_parserModel->setHeaderLabels(m_columnHeader);
@@ -169,13 +172,11 @@ void CsvImportWidget::parse() {
     bool good = m_parserModel->parse();
     updatePreview();
     QApplication::restoreOverrideCursor();
-    if (good)
-        //four newline are provided to avoid resizing at every Positive/Warning switch
-        m_ui->messageWidget->showMessage(QString("\n\n").append(tr("CSV syntax seems in good shape !"))
-                                         .append("\n\n"), MessageWidget::Positive);
-    else
+    if (!good)
         m_ui->messageWidget->showMessage(tr("Error(s) detected in CSV file !").append("\n")
                                          .append(formatStatusText()), MessageWidget::Warning);
+    else
+        m_ui->messageWidget->setHidden(true);
     QWidget::adjustSize();
 }
 
@@ -183,12 +184,12 @@ void CsvImportWidget::parse() {
 QString CsvImportWidget::formatStatusText() const {
     QString text = m_parserModel->getStatus();
     int items = text.count('\n');
-    if (items > 3)
-        return text.section('\n', 0, 2)
-                .append("\n[").append(QString::number(items - 3))
+    if (items > 2)
+        return text.section('\n', 0, 1)
+                .append("\n[").append(QString::number(items - 2))
                 .append(tr(" more messages skipped]"));
     else
-        for (int i = 0; i < 3 - items; i++)
+        for (int i = 0; i < 2 - items; i++)
             text.append(QString("\n"));
         return text;
 }
diff --git a/src/gui/csvImport/CsvImportWidget.ui b/src/gui/csvImport/CsvImportWidget.ui
index 82ee68dd2..1b4bed729 100644
--- a/src/gui/csvImport/CsvImportWidget.ui
+++ b/src/gui/csvImport/CsvImportWidget.ui
@@ -14,474 +14,6 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
-   <item row="2" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>758</width>
-       <height>24</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="6" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QGroupBox" name="Encoding">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>137</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="title">
-      <string>Encoding</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="2" column="2">
-       <spacer name="horizontalSpacer_9">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="2">
-       <spacer name="horizontalSpacer_10">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_6">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelTextQualifier">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Text is qualified by</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <spacer name="horizontalSpacer_7">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBoxFieldSeparator">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="editable">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Preferred</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="4">
-       <spacer name="horizontalSpacer_5">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelCodec">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Codec</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4">
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxCodec">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="editable">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelFieldSeparator">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Fields are separated by</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelComments">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Comments start with</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="comboBoxComment">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="editable">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QComboBox" name="comboBoxTextQualifier">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="editable">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>114</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="3">
-       <widget class="QCheckBox" name="checkBoxBackslash">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Consider '\' as escape character</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="labelSkipRows">
-          <property name="font">
-           <font>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Skip first</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="spinBoxSkip">
-          <property name="font">
-           <font>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelSkipRows_2">
-          <property name="font">
-           <font>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>rows</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="labelWarnings">
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-          <kerning>true</kerning>
-         </font>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBoxColumnAssociations">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="title">
-      <string>Column layout</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout_combos">
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBoxPreview">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>200</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="title">
-      <string>Preview</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QTableView" name="tableViewFields">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
-        <attribute name="horizontalHeaderVisible">
-         <bool>true</bool>
-        </attribute>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" rowspan="2">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
@@ -535,6 +67,508 @@
      </item>
     </layout>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="Encoding">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Encoding</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="4">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="4">
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3">
+       <widget class="QCheckBox" name="checkBoxBackslash">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Consider '\' an escape character</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelCodec">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Codec</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="labelWarnings">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+          <kerning>true</kerning>
+         </font>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelFieldSeparator">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Fields are separated by</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxFieldSeparator">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelComments">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Comments start with</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer_10">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="comboBoxTextQualifier">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="2">
+       <spacer name="horizontalSpacer_9">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelTextQualifier">
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Text is qualified by</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxCodec">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <spacer name="horizontalSpacer_7">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="3">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="labelSkipRows">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Skip first</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBoxSkip">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelSkipRows_2">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>rows</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxComment">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="4">
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>114</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxColumnAssociations">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Column layout</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_combos">
+        <property name="leftMargin">
+         <number>6</number>
+        </property>
+        <property name="rightMargin">
+         <number>6</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>758</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxPreview">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Preview</string>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QTableView" name="tableViewFields">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <attribute name="horizontalHeaderVisible">
+         <bool>true</bool>
+        </attribute>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

From f4791c19e18b219809197512a8a7a2cca68bb444 Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Mon, 6 Mar 2017 23:05:06 +0100
Subject: [PATCH 5/8] Assign uuid to newborn groups

---
 src/gui/csvImport/CsvImportWidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
index 38eb09b93..4d64296e9 100644
--- a/src/gui/csvImport/CsvImportWidget.cpp
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -272,6 +272,7 @@ Group *CsvImportWidget::splitGroups(QString label) {
             Group *brandNew = new Group();
             brandNew->setParent(current);
             brandNew->setName(groupName);
+            brandNew->setUuid(Uuid::random());
             current = brandNew;
         } else {
             Q_ASSERT(children != nullptr);

From 984602b7a0b6b79cb2c74f1e0b47f9e069945cd4 Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Wed, 8 Mar 2017 22:58:46 +0100
Subject: [PATCH 6/8] Enhance FormatStatusText(), other minor cosmetics

---
 src/gui/csvImport/CsvImportWidget.cpp | 19 ++++++++++---------
 src/gui/csvImport/CsvParserModel.cpp  |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
index 4d64296e9..ed00790f5 100644
--- a/src/gui/csvImport/CsvImportWidget.cpp
+++ b/src/gui/csvImport/CsvImportWidget.cpp
@@ -138,14 +138,14 @@ void CsvImportWidget::updatePreview() {
     int i;
     QStringList list(tr("Not present in CSV file"));
 
-    for (i = 1; i < m_parserModel->getCsvCols(); i++) {
+    for (i = 1; i < m_parserModel->getCsvCols(); ++i) {
         QString s = QString(tr("Column ")) + QString::number(i);
         list << s;
     }
     m_comboModel->setStringList(list);
 
     i=1;
-    Q_FOREACH (QComboBox* b, m_combos) {
+    for (QComboBox* b : m_combos) {
         if (i < m_parserModel->getCsvCols())
             b->setCurrentIndex(i);
         else
@@ -184,20 +184,21 @@ void CsvImportWidget::parse() {
 QString CsvImportWidget::formatStatusText() const {
     QString text = m_parserModel->getStatus();
     int items = text.count('\n');
-    if (items > 2)
+    if (items > 2) {
         return text.section('\n', 0, 1)
                 .append("\n[").append(QString::number(items - 2))
                 .append(tr(" more messages skipped]"));
-    else
-        for (int i = 0; i < 2 - items; i++)
-            text.append(QString("\n"));
-        return text;
+    }
+    if (items == 1) {
+        text.append(QString("\n"));
+    }
+    return text;
 }
 
 void CsvImportWidget::writeDatabase() {
 
     setRootGroup();
-    for (int r = 0; r < m_parserModel->rowCount(); r++) {
+    for (int r = 0; r < m_parserModel->rowCount(); ++r) {
         //use validity of second column as a GO/NOGO for all others fields
         if (not m_parserModel->data(m_parserModel->index(r, 1)).isValid())
             continue;
@@ -229,7 +230,7 @@ void CsvImportWidget::setRootGroup() {
     bool is_empty = false;
     bool is_label = false;
 
-    for (int r = 0; r < m_parserModel->rowCount(); r++) {
+    for (int r = 0; r < m_parserModel->rowCount(); ++r) {
         //use validity of second column as a GO/NOGO for all others fields
         if (not m_parserModel->data(m_parserModel->index(r, 1)).isValid())
             continue;
diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp
index d315f1ad2..efffda552 100644
--- a/src/gui/csvImport/CsvParserModel.cpp
+++ b/src/gui/csvImport/CsvParserModel.cpp
@@ -46,7 +46,7 @@ bool CsvParserModel::parse() {
         QFile csv(m_filename);
         r = CsvParser::parse(&csv);
     }
-    for (int i = 0; i < columnCount(); i++)
+    for (int i = 0; i < columnCount(); ++i)
         m_columnMap.insert(i,0);
     addEmptyColumn();
     endResetModel();

From 06bbd6e066857e0a18cf2e703fb94d6cb8e788ff Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Thu, 16 Mar 2017 21:46:53 +0100
Subject: [PATCH 7/8] Get rid of Q_{EMIT,SLOTS,SIGNALS}

---
 src/gui/DatabaseWidget.cpp          | 2 +-
 src/gui/csvImport/CsvImportWidget.h | 4 ++--
 src/gui/csvImport/CsvImportWizard.h | 4 ++--
 src/gui/csvImport/CsvParserModel.h  | 2 +-
 src/http/OptionDialog.ui            | 2 +-
 src/keys/drivers/YubiKey.h          | 2 +-
 tests/TestCsvParser.h               | 2 +-
 tests/TestYkChallengeResponseKey.h  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 1b4c7cc66..b4f623155 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -634,7 +634,7 @@ void DatabaseWidget::setCurrentWidget(QWidget* widget)
 void DatabaseWidget::csvImportFinished(bool accepted)
 {
     if (!accepted) {
-        Q_EMIT closeRequest();
+        emit closeRequest();
     }
     else {
         setCurrentWidget(m_mainWidget);
diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h
index 2079e9f96..aa463c08b 100644
--- a/src/gui/csvImport/CsvImportWidget.h
+++ b/src/gui/csvImport/CsvImportWidget.h
@@ -45,10 +45,10 @@ public:
     ~CsvImportWidget();
     void load(const QString& filename, Database* const db);
 
-Q_SIGNALS:
+signals:
     void editFinished(bool accepted);
 
-private Q_SLOTS:
+private slots:
     void parse();
     void comboChanged(int comboId);
     void skippedChanged(int rows);
diff --git a/src/gui/csvImport/CsvImportWizard.h b/src/gui/csvImport/CsvImportWizard.h
index 75d10bb9d..1c99259cd 100644
--- a/src/gui/csvImport/CsvImportWizard.h
+++ b/src/gui/csvImport/CsvImportWizard.h
@@ -38,10 +38,10 @@ public:
     ~CsvImportWizard();
     void load(const QString& filename, Database *database);
 
-Q_SIGNALS:
+signals:
     void importFinished(bool accepted);
 
-private Q_SLOTS:
+private slots:
     void keyFinished(bool accepted);
     void parseFinished(bool accepted);
 
diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h
index ff4f410d7..8cab4d4ff 100644
--- a/src/gui/csvImport/CsvParserModel.h
+++ b/src/gui/csvImport/CsvParserModel.h
@@ -43,7 +43,7 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-public Q_SLOTS:
+public slots:
     void setSkippedRows(int skipped);
 
 private:
diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui
index abe994772..1959f8052 100644
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -39,7 +39,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
diff --git a/src/keys/drivers/YubiKey.h b/src/keys/drivers/YubiKey.h
index 47341f9a2..8a7552136 100644
--- a/src/keys/drivers/YubiKey.h
+++ b/src/keys/drivers/YubiKey.h
@@ -77,7 +77,7 @@ public:
      */
     void detect();
 
-Q_SIGNALS:
+signals:
     /** Emitted in response to detect() when a device is found
      *
      * @slot is the slot number detected
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
index 928ac4201..0aa3d01ef 100644
--- a/tests/TestCsvParser.h
+++ b/tests/TestCsvParser.h
@@ -32,7 +32,7 @@ class TestCsvParser : public QObject
 
 public:
 
-private Q_SLOTS:
+private slots:
     void init();
     void cleanup();
     void initTestCase();
diff --git a/tests/TestYkChallengeResponseKey.h b/tests/TestYkChallengeResponseKey.h
index 4699b9101..309e014d5 100644
--- a/tests/TestYkChallengeResponseKey.h
+++ b/tests/TestYkChallengeResponseKey.h
@@ -26,7 +26,7 @@ class TestYubiKeyChalResp: public QObject
 {
     Q_OBJECT
 
-private Q_SLOTS:
+private slots:
     void initTestCase();
     void cleanupTestCase();
 

From 506a2b99c53ee8013e47bffaef8f88877b180361 Mon Sep 17 00:00:00 2001
From: seatedscribe <gitedscribe@gmail.com>
Date: Thu, 16 Mar 2017 22:55:26 +0100
Subject: [PATCH 8/8] Revert dialog index back to zero

---
 src/http/OptionDialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui
index 1959f8052..abe994772 100644
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -39,7 +39,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">