adds addService and fixes dialogs

- switched to Quick.Controls 1.4 to get better desktop integration
- added widgets to qt for the same reason

diff --git a/UserSheets.pro b/UserSheets.pro
index ac79a87a92be5182ce5d08ef7307f13097b9dd70..8e50682f3f86ea4bcef3c622017e0a045659c444 100644 (file)
--- a/UserSheets.pro
+++ b/UserSheets.pro
@@ -1,4 +1,4 @@
-QT += qml quick sql
+QT += qml quick sql widgets
 
 CONFIG += c++11
 

diff --git a/addhuman.qml b/addhuman.qml
index 8c316274d8f8aa396276103d0b486fd5ed96b1ef..5bdc884de04aa5813ff1a04a5a262e2c8a88e5bd 100644 (file)
--- a/addhuman.qml
+++ b/addhuman.qml
@@ -1,10 +1,13 @@
 import QtQuick 2.7
-import QtQuick.Controls 2.0
+//import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2
 
-Popup {
+Dialog {
   id: addhumanroot
+  visible: true
+  modality: Qt.ApplicationModal
   signal addHuman(var name, var firstname, var birthday)
   //width: 200
   //height: 200
@@ -32,7 +35,7 @@ Popup {
 
   TextField {
     id: firstname
-    anchors.left: lblname.right
+    anchors.left: lblfirstname.right
     anchors.top: name.bottom
     placeholderText: qsTr("Karl-Heinz")
   }
@@ -49,17 +52,5 @@ Popup {
       anchors.top: firstname.bottom
       weekNumbersVisible: true
   }
-
-  Button {
-      id:ok
-      onClicked: {
-          addHuman(name.text, firstname.text, birthday.selectedDate)
-          addhumanroot.close()
-      }
-      text: qsTr("OK")
-      anchors.bottom: parent.bottom
-      anchors.right: parent.right
-      visible: true
-  }
-
+  onAccepted: addHuman(name.text, firstname.text, birthday.selectedDate)
 }

diff --git a/addservice.qml b/addservice.qml
new file mode 100644 (file)
index 0000000..4a0941b
--- /dev/null
+++ b/addservice.qml
@@ -0,0 +1,53 @@
+import QtQuick 2.7
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2
+
+Dialog {
+  id: addserviceroot
+  visible: true
+  modality: Qt.ApplicationModal
+  signal addService(var name, var url, var description)
+  onAccepted: addService(name.text, url.text, description.text)
+  Label {
+    id: lblName
+    anchors.left: parent.left
+    anchors.verticalCenter: name.verticalCenter
+    text: qsTr("Name: ")
+  }
+
+  TextField {
+    id: name
+    anchors.left: lblName.right
+    anchors.top: parent.top
+    placeholderText: qsTr("service.com")
+  }
+
+  Label {
+    id: lblUrl
+    anchors.left: parent.left
+    anchors.verticalCenter: url.verticalCenter
+    text: qsTr("URL: ")
+  }
+
+  TextField {
+    id: url
+    anchors.left: lblUrl.right
+    anchors.top: name.bottom
+    placeholderText: qsTr("http://www.service.com")
+  }
+
+  Label {
+    id: lblDescription
+    anchors.left: parent.left
+    anchors.verticalCenter: description.verticalCenter
+    text: qsTr("Description: ")
+  }
+
+  TextField {
+    id: description
+    anchors.left: lblDescription.right
+    anchors.top: url.bottom
+    placeholderText: qsTr("Description")
+  }
+}

diff --git a/controller.cpp b/controller.cpp
index be53717daa059a5ff28f688c438834cf39c0fb4d..446b74d520bd8ac102eb26df7272c8d900cfd735 100644 (file)
--- a/controller.cpp
+++ b/controller.cpp
@@ -1,9 +1,12 @@
 #include "controller.h"
+#include <QDebug>
+#include <QQuickWindow>
 
-Controller::Controller(QQmlApplicationEngine* e, DataBase* d, QObject *parent) :
+Controller::Controller(DataBase* d, QObject *parent) :
   QObject(parent),
-  engine{e}, db{d}
+  db{d}
 {
+  engine = new QQmlApplicationEngine();
   this->engine->load(QUrl(QLatin1String("qrc:/main.qml")));
   //connect qml Signals to controller
   QList<QObject*> roots = engine->rootObjects();
@@ -12,18 +15,44 @@ Controller::Controller(QQmlApplicationEngine* e, DataBase* d, QObject *parent) :
   QObject::connect(qmlRoot,SIGNAL(openAddHuman()),
                    this, SLOT(openAddHuman()));
 
+  QObject::connect(qmlRoot, SIGNAL(openAddService()),
+                   this, SLOT(openAddService()));
+
 }
 
 
 void Controller::openAddHuman()
 {
-//  QQmlContext context(engine, engine->rootObjects().first());
-  QQmlComponent component(engine, QUrl(QStringLiteral("qrc:/addHuman.qml")));
-//  QQmlContext context = component.creationContext();
-  QObject* dialog = component.create(/*&context*/);
-//  dialog->setParent(engine->rootObjects().first());
-//  QObject::connect(dialog, SIGNAL(addHuman(QVariant, QVariant, QVariant)),
-//                   db, SLOT(addHuman(QVariant, QVariant, QVariant)));
+  QQmlComponent component(engine, QUrl(QStringLiteral("qrc:/addhuman.qml")), QQmlComponent::PreferSynchronous);
+
+  if (component.isReady()) {
+    QObject* dialog = component.create();
+    QQmlEngine::setObjectOwnership(dialog, QQmlEngine::CppOwnership);
+    dialog->setParent(engine->rootObjects().first());
+    QObject::connect(dialog, SIGNAL(addHuman(QVariant, QVariant, QVariant)),
+                     db, SLOT(addHuman(QVariant, QVariant, QVariant)));
+
+  } else {
+    qDebug() << "Dialog not loaded";
+  }
+}
+
+void Controller::openAddService()
+{
+  QQmlComponent component(engine, QUrl(QStringLiteral("qrc:/addservice.qml")), QQmlComponent::PreferSynchronous);
 
+  if (component.isReady()) {
+    QObject* dialog = component.create();
+    QQmlEngine::setObjectOwnership(dialog, QQmlEngine::CppOwnership);
+    dialog->setParent(engine->rootObjects().first());
+    QObject::connect(dialog, SIGNAL(addService(QVariant, QVariant, QVariant)),
+                     db, SLOT(addService(QVariant, QVariant, QVariant)));
+  } else {
+    qDebug()<<"Dialog not loaded";
+  }
+}
 
+Controller::~Controller()
+{
+  delete engine;
 }

diff --git a/controller.h b/controller.h
index 090a96e1ee3a93ae3ac2c0e8b9d4468ee571a080..029b5a0c9c9fce7044394e224a87a575d87ead3a 100644 (file)
--- a/controller.h
+++ b/controller.h
@@ -11,12 +11,14 @@ class Controller : public QObject
 {
   Q_OBJECT
 public:
-  explicit Controller(QQmlApplicationEngine* engine, DataBase* db, QObject *parent = 0);
+  explicit Controller(DataBase* db, QObject *parent = 0);
+  virtual ~Controller();
 
 signals:
 
 public slots:
   void openAddHuman();
+  void openAddService();
 
 private:
   QQmlApplicationEngine* engine;

diff --git a/database.cpp b/database.cpp
index be1c6ac118b968701877eaa25c0c9f78c746295e..6047d837676c9afe3586b4bebcf8dc0e6311c763 100644 (file)
--- a/database.cpp
+++ b/database.cpp
@@ -32,15 +32,16 @@ void DataBase::addHuman(const QVariant& name, const QVariant& firstname,
 
 }
 
-void DataBase::addService(const QString& name, const QUrl& url,
-                              const QString& description)
+void DataBase::addService(const QVariant& name, const QVariant& url,
+                              const QVariant& description)
 {
+  qDebug()<<"addService slot called with: "<<name<<", "<<url<<", "<< description;
   QSqlQuery q;
-  q.prepare(this->sqlAddService);
-  q.addBindValue(name);
-  q.addBindValue(url);
-  q.addBindValue(description);
-  q.exec();
+  if (!q.prepare(this->sqlAddService)) qDebug() << "error while preparing: " << q.lastError();
+  q.addBindValue(name.toString());
+  q.addBindValue(url.toUrl());
+  q.addBindValue(description.toString());
+  if (!q.exec())qDebug()<<"error: "<< q.lastError();
 }
 
 void DataBase::addUser(const QVariant& humanID, const QVariant& serviceID,

diff --git a/database.h b/database.h
index 56c80815f549933668ed2b6fdae1e8f51feae6bd..6f7d604a251683bdc6034e39364cddfae0467b33 100644 (file)
--- a/database.h
+++ b/database.h
@@ -20,8 +20,8 @@ public slots:
   void addHuman(const QVariant& name, const QVariant& firstname,
                     const QVariant& birthday);
 
-  void addService(const QString& name, const QUrl& url,
-                      const QString& description);
+  void addService(const QVariant& name, const QVariant& url,
+                      const QVariant& description);
 
   void addUser(const QVariant& humanID, const QVariant& serviceID,
                    const QString& username, const QString& password);
@@ -34,7 +34,7 @@ private:
   const QLatin1String sqlCreateHumanTable = QLatin1String(
         "create table human("
         "id integer primary key autoincrement,"
-        "name varchar,"
+        "name varchar not null,"
         "firstname varchar,"
         "birthday date"
         ")");
@@ -42,9 +42,9 @@ private:
   const QLatin1String sqlCreateServiceTable = QLatin1String(
         "create table service("
         "id integer primary key autoincrement,"
-        "name varchar,"
-        "url varchar,"
-        "desription varchar"
+        "name varchar not null,"
+        "url varchar not null,"
+        "description varchar"
         ")");
 
   const QLatin1String sqlCreateUserTable = QLatin1String(

diff --git a/main.cpp b/main.cpp
index b1c77b616a785c80301313fb1013d14b730bb878..536243b9435e7bb9c1ce5323da7b56a7e89758eb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-#include <QGuiApplication>
+#include <QApplication>
 #include <QQmlApplicationEngine>
 #include "database.h"
 #include "controller.h"
@@ -7,12 +7,11 @@
 
 int main(int argc, char *argv[])
 {
-  QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-  QGuiApplication app(argc, argv);
+//  QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+  QApplication app(argc, argv);
 
-  QQmlApplicationEngine engine;
   DataBase db;
-  Controller c(&engine, &db);
+  Controller c(&db);
 
   return app.exec();
 }

diff --git a/main.qml b/main.qml
index 6f911779ec2a0197ccc776733c171ca989f30f93..50af0d4f58516774d1a4042e40d48c058326d26f 100644 (file)
--- a/main.qml
+++ b/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtQuick.Controls 2.0
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.0
 
 ApplicationWindow {
@@ -9,14 +9,22 @@ ApplicationWindow {
   height: 480
   title: qsTr("Hello World")
   signal openAddHuman()
+  signal openAddService()
 
   Button {
     id: btnaddhuman
-    anchors.centerIn: parent
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
     visible: true
-    text: "Add Human"
-    onClicked: {
-      openAddHuman()
-    }
+    text: qsTr("Add Human")
+    onClicked: openAddHuman()
+  }
+
+  Button {
+    id: btnaddservice
+    anchors.left: btnaddhuman.right
+    anchors.bottom: parent.bottom
+    text: qsTr("Add Service")
+    onClicked: openAddService()
   }
 }

diff --git a/qml.qrc b/qml.qrc
index 5ddf2b47f5424d4851adc327e96c8167c611c158..99696fa0aa6314e0d203fb46b5779acc5e704aca 100644 (file)
--- a/qml.qrc
+++ b/qml.qrc
@@ -3,5 +3,6 @@
         <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>addhuman.qml</file>
+        <file>addservice.qml</file>
     </qresource>
 </RCC>

diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf
index 9f9367b7af67623af5f81e01f614d9724f815204..b01a3e723d30d05e20d8b026a3d2ce442eb1b07e 100644 (file)
--- a/qtquickcontrols2.conf
+++ b/qtquickcontrols2.conf
@@ -3,13 +3,13 @@
 ; http://doc.qt.io/qt-5/qtquickcontrols2-styles.html
 
 [Controls]
-Style=Universal
+Style=Material
 
 [Universal]
-Theme=Light
+Theme=Dark
 ;Accent=Steel
 
 [Material]
-Theme=Light
+Theme=Dark
 ;Accent=BlueGrey
 ;Primary=BlueGray