diff --git a/packaging/org.eyecreate.vehiclevoyage.appdata.xml b/packaging/org.eyecreate.vehiclevoyage.appdata.xml index 1ca1480b8438be968b9042fc911bfaa2bf477d91..102e7638bac5f5c6f0b2540e5ef220e5d72f1e7d 100644 --- a/packaging/org.eyecreate.vehiclevoyage.appdata.xml +++ b/packaging/org.eyecreate.vehiclevoyage.appdata.xml @@ -18,6 +18,6 @@ - + diff --git a/packaging/org.eyecreate.vehiclevoyage.json b/packaging/org.eyecreate.vehiclevoyage.json index f35b6e4c733431e9118164586a8ee98f236b643b..d8845fbf82324f0cd4c7ecf44aa4eb5e7b888a1e 100644 --- a/packaging/org.eyecreate.vehiclevoyage.json +++ b/packaging/org.eyecreate.vehiclevoyage.json @@ -4,7 +4,7 @@ "command": "vehiclevoyage", "finish-args": [ "--share=ipc", - "runtime-version": "5.13", + "runtime-version": "5.14", "sdk": "org.kde.Sdk", "--share=network", "--socket=x11", diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml index b303054de3a7e8575a9e62ddb4150b68cb512019..827984e404d1cc3684bc1eb0b363f672807534d5 100644 --- a/src/contents/ui/main.qml +++ b/src/contents/ui/main.qml @@ -20,6 +20,7 @@ Kirigami.ApplicationWindow { id: mainPage mainAction: Kirigami.Action { text: qsTr("Add Vehicle") + iconName: "list-add" onTriggered: { router.navigateToRoute(["main","addvehicle"]); } @@ -65,6 +66,24 @@ Kirigami.ApplicationWindow { } } } + actions: [ + Kirigami.Action { + text: qsTr("Examine Logs") + iconName: "edit-find" + onTriggered: { + // + } + } + ] + hiddenActions: [ + Kirigami.Action { + text: qsTr("Delete") + iconName: "edit-delete" + onTriggered: { + vehicleModel.removeVehicle(index); + } + } + ] } Controls.ScrollBar.vertical: Controls.ScrollBar {} } diff --git a/src/db/sqlvehicle.cpp b/src/db/sqlvehicle.cpp index 87921da58b5cd7ef8c32a333dc5120585060e39a..0da4526ec11973b6b93491a70f5e13468ae37eaf 100644 --- a/src/db/sqlvehicle.cpp +++ b/src/db/sqlvehicle.cpp @@ -65,6 +65,7 @@ void SqlVehicle::addNewVehicle ( const QString name, const QString maker, const if(this->submitAll()) { printf("inserted new vehicle record"); this->database().commit(); + this->select(); } else { this->database().rollback(); printf("database error"); @@ -72,6 +73,20 @@ void SqlVehicle::addNewVehicle ( const QString name, const QString maker, const } +void SqlVehicle::removeVehicle(int index) +{ + this->removeRow(index); + if(this->submitAll()) { + printf("inserted new vehicle record"); + this->database().commit(); + this->select(); + } else { + this->database().rollback(); + printf("database error"); + } +} + + diff --git a/src/db/sqlvehicle.h b/src/db/sqlvehicle.h index faeed5b1af32d45715f179996333ce2607004bc3..fb82f4769c3aca513dbe4cf8e6096cb7a9a98a17 100644 --- a/src/db/sqlvehicle.h +++ b/src/db/sqlvehicle.h @@ -31,6 +31,7 @@ public: QHash roleNames() const override; Q_INVOKABLE QVariant data(const QModelIndex &index, int role) const override; Q_INVOKABLE void addNewVehicle(const QString name, const QString maker, const QString model, const int year, const QString image, const QString vin); + Q_INVOKABLE void removeVehicle(int index); private: diff --git a/src/main.cpp b/src/main.cpp index 7da7d0aa60baaf88ff7f03eeb68a9444abf0059a..05ec9d1ad002eb962ce2c07a803cd89b91c34181 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,6 +72,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) SqlVehicle vehicles(nullptr, db); SqlServiceRecord records(nullptr, db); + //Fill model with inital data. vehicles.select(); records.select();