Begins adding settings, begins writing of new XML file

KeePit/KeePit.qrc

@@ -29,4 +29,7 @@
     <qresource prefix="/">
         <file>qml/PasswordInput.qml</file>
     </qresource>
+    <qresource prefix="/">
+        <file>qml/Settings.qml</file>
+    </qresource>
 </RCC>

KeePit/database.cpp

@@ -22,6 +22,7 @@
 #include <fstream>
 #include <string>
 #include <QVariant>
+#include <QString>
 #include <vector>
 
 #include "aes.h"
@@ -106,7 +107,21 @@ Database::~Database() {
 }
 
 void Database::createNewDatabase(QString filePath) {
-    WriteXmlFile::CreateNewDatabase(filePath);
+    // Create the XML (the file should also be SALSA'ed)
+    /*QString db = WriteXmlFile::CreateNewDatabase(filePath);
+    
+    //GZIP the string
+    char * cpy = new char[db.size()];
+    strncpy(cpy, db.toStdString().c_str(), db.size()); 
+    CA2GZIP gzip(cpy, db.size());
+    LPGZIP pgzip = gzip.pgzip; // zipped data pointer
+    
+    // Generate encryption aes keys and IV
+    // Encrypt it
+    //pgzip.
+
+    //Save it
+    */
 }
 
 ///

KeePit/qml/ListEntryItems.qml

@@ -56,6 +56,10 @@ Page {
         }
     }
 
+    // onCompleted: {
+    //     themeAction.iconName = switchTheme()
+    // }
+
     // Could be the name of the group
     header: PageHeader {
       id: pageHeader
@@ -72,6 +76,15 @@ Page {
                 }
             }
           },
+          Action {
+            id: themeAction
+            iconName: ""
+            text: i18n.tr("Swap")
+            onTriggered: {
+                switchTheme()
+                //iconName = iconName == "torch-off" ? "torch-on" : "torch-off"
+            }
+          },
         /*Action {
             text: i18n.tr("Settings")
             iconName: "settings"
@@ -117,9 +130,11 @@ Page {
                       width: 40
                       height: 40
                       name: getIconName(model)
+                      color: theme.palette.normal.baseText
                   }
                   Text {
                     text: title
+                    color: theme.palette.normal.baseText
                   }
                 }
 

KeePit/qml/Main.qml

@@ -54,7 +54,6 @@ MainView {
     property string keyFileName
     property date currentDate: new Date()
     property var locale: Qt.locale()
-
     property var selectedDatabaseToDelete: ({});
 
    Database {
@@ -72,7 +71,10 @@ MainView {
 
     PageStack {
            id: pageStack
-           Component.onCompleted: push(databaseListView)
+           Component.onCompleted: {
+               theme.name = settings.getSetting("theme")
+               push(databaseListView)
+           }
            onCurrentPageChanged: {
                if(currentPage != null) {
                 currentPage.forceActiveFocus()
@@ -126,6 +128,10 @@ MainView {
            CreateDatabase {
                id: createDatabase
            }
+
+           Settings {
+               id: settings
+           }
     }
 
     /*Component {
@@ -243,4 +249,16 @@ MainView {
     function resetLogoutTimer() {
         //resetTimer.restart();
     }
+
+    function switchTheme() {
+        theme.name = (theme.name == "Ubuntu.Components.Themes.SuruDark")
+            ? "Ubuntu.Components.Themes.Ambiance"
+            : "Ubuntu.Components.Themes.SuruDark"
+
+        settings.saveSetting("theme", theme.name);
+
+        return (theme.name == "Ubuntu.Components.Themes.SuruDark") 
+            ? "torch-off" 
+            : "torch-on"
+    }    
 }

KeePit/qml/Selector.qml

@@ -99,6 +99,7 @@ Page {
                     anchors.leftMargin: units.gu(2)
                     anchors.rightMargin: units.gu(2)
                     text: fileName
+                    color: theme.palette.normal.baseText
                 }
 
                 MouseArea {

KeePit/qml/Settings.qml

@@ -0,0 +1,62 @@
+/*
+* This file is part of KeePit
+*
+* Copyright (C) 2019 Dan Beavon
+*
+* 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 3 of the License, or
+* (at your option) any later version.
+*
+* 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 <https://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.4
+import QtQuick.LocalStorage 2.0
+
+Item {    
+    property var db: null
+
+    function openDB() {
+        if(db !== null) return;
+
+        db = LocalStorage.openDatabaseSync(appTitle, "0.1", "KeepIt Password Safe", 100000);
+
+        try {
+            db.transaction(function(tx){
+                tx.executeSql('CREATE TABLE IF NOT EXISTS settings(key TEXT UNIQUE, value TEXT)');
+                var table  = tx.executeSql("SELECT * FROM settings");
+                // Seed the table with default values
+                if (table.rows.length == 0) {
+                    tx.executeSql('INSERT INTO settings VALUES(?, ?)', ["theme", "Ubuntu.Components.Themes.SuruDark"]);
+                    console.log('Settings table added');
+                };
+            });
+        } catch (err) {
+            console.log("Error creating table in database: " + err);
+        };
+    }
+
+    function saveSetting(key, value) {
+        openDB();
+        db.transaction( function(tx){
+            tx.executeSql('INSERT OR REPLACE INTO settings VALUES(?, ?)', [key, value]);
+        });
+    }
+
+    function getSetting(key) {
+        openDB();
+        var res = "";
+        db.transaction(function(tx) {
+            var rs = tx.executeSql('SELECT value FROM settings WHERE key=?;', [key]);
+            res = rs.rows.item(0).value;
+        });
+        return res;
+    }
+}

KeePit/writexmlfile.cpp

@@ -111,7 +111,7 @@ WriteXmlFile::~WriteXmlFile()
 /// \brief WriteXmlFile::ToString
 /// \return
 ///
-void WriteXmlFile::CreateNewDatabase(QString filePath)
+QString WriteXmlFile::CreateNewDatabase(QString filePath)
 {
     Base64 base64;
 
@@ -288,5 +288,10 @@ void WriteXmlFile::CreateNewDatabase(QString filePath)
     lastTopVisibleEntry->SetText(UUID::EMPTYUUIDSTRING);
     group->InsertEndChild( lastTopVisibleEntry );
 
-	doc.SaveFile( filePath.toLocal8Bit().data() );
+	//doc.SaveFile( filePath.toLocal8Bit().data() );
+    XMLPrinter printer;
+    doc.Accept( &printer );
+    QString qStr(printer.CStr());
+
+    return qStr;
 }

KeePit/writexmlfile.h

@@ -37,7 +37,7 @@ class WriteXmlFile
 public:
     WriteXmlFile(const char*, size_t, Salsa20*);
     ~WriteXmlFile();
-    static void CreateNewDatabase(QString fileName);
+    static QString CreateNewDatabase(QString fileName);
 
 private:
     size_t m_size;