Released version 0.9.0

* Updated to DOtherSide 0.8.0
* Added basic support for QObject connections
* Added support for defining multiple QObject in the same nim file

Author: filcuc

.gitignore

@@ -4,3 +4,5 @@ nimcache
 *.nimproject*
 *.exe
 *.qmlc
+*.idea
+*main

README.md

@@ -3,7 +3,7 @@
 QML binding for the Nim programming language
 
 ## Requirements
-* [DOtherside](https://github.com/filcuc/DOtherSide) 0.7.X
+* [DOtherside](https://github.com/filcuc/DOtherSide) 0.8.X
 * [Nim](http://nim-lang.org/) 1.2.0 or higher
 
 ## Build instructions

doc/nimqml.md

@@ -2,8 +2,8 @@
 	Filippo Cucchetto <filippocucchetto@gmail.com>
 
 	Will Szumski <will@cowboycoders.org>
-:Version: 0.8.0
-:Date: 2021/01/05
+:Version: 0.9.0
+:Date: 2021/05/01
 
 
 Introduction

examples/abstractitemmodel/abstractitemmodel.nimble

@@ -7,4 +7,4 @@ description   = "abstractitemmodel"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"

examples/charts/charts.nimble

@@ -7,5 +7,5 @@ description   = "charts"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"
 

examples/connections/main.nim

@@ -0,0 +1,93 @@
+import nimqml
+
+
+QtObject:
+  type Contact* = ref object of QObject
+    name: string
+
+  proc delete*(self: Contact) =
+    self.QObject.delete
+
+  proc setup(self: Contact) =
+    self.QObject.setup
+
+  proc newContact(): Contact =
+    new(result, delete)
+    result.name = ""
+    result.setup
+
+  proc name*(self: Contact): string {.slot.} =
+    result = self.name
+
+  proc nameChanged*(self: Contact, firstName: string) {.signal.}
+
+  proc setName*(self: Contact, name: string) {.slot.} =
+    if self.name != name:
+      self.name = name
+      self.nameChanged(name)
+
+  proc `name=`*(self: Contact, name: string) = self.setName(name)
+
+  QtProperty[string] name:
+    read = name
+    write = setName
+    notify = nameChanged
+
+
+proc main() =
+  block: # Raw string connection
+    let c1 = newContact()
+    let c2 = newContact()
+    discard QObject.connect(c1, SIGNAL("nameChanged(QString)"), c2, SLOT("setName(QString)"))
+    assert(c1.name != "John" and c2.name != "John")
+    c1.setName("John")
+    assert(c2.name == "John")
+  block: # Signal and slot connection
+    let c1 = newContact()
+    let c2 = newContact()
+    discard QObject.connect(c1, nameChanged, c2, setName)
+    assert(c1.name != "John" and c2.name != "John")
+    c1.setName("John")
+    assert(c2.name == "John")
+  block: # Signal and lambda connection
+    let c1 = newContact()
+    let c2 = newContact()
+    proc callback(name: string) =
+      c2.setName(name)
+    discard QObject.connect(c1, nameChanged, callback)
+    assert(c1.name != "John" and c2.name != "John")
+    c1.setName("John")
+    assert(c2.name == "John")
+  block: # Signal and lambda with context
+    let c1 = newContact()
+    let c2 = newContact()
+    proc callback(name: string) =
+      c2.setName(name)
+    discard QObject.connect(c1, nameChanged, c2, callback)
+    assert(c1.name != "John" and c2.name != "John")
+    c1.setName("John")
+    assert(c2.name == "John")
+  block: # Signal and slot disconnection with connection
+    let c1 = newContact()
+    let c2 = newContact()
+    let c = QObject.connect(c1, nameChanged, c2, setName)
+    assert(c1.name != "John" and c2.name != "John")
+    c1.setName("John")
+    assert(c2.name == "John")
+    QObject.disconnect(c)
+    c1.setName("Doo")
+    assert(c2.name == "John")
+  block: # Signal and slot disconnection automatic with destruction
+    let c1 = newContact()
+    block:
+      let c2 = newContact()
+      defer: c2.delete
+      discard QObject.connect(c1, nameChanged, c2, setName)
+      assert(c1.name != "John" and c2.name != "John")
+      c1.setName("John")
+      assert(c2.name == "John")
+    c1.setName("Doo")
+
+if isMainModule:
+  main()
+  GC_fullcollect()

examples/connections/main.nim.cfg

@@ -0,0 +1 @@
+--path:"../../src"

examples/contactapp/contactapp.nimble

@@ -7,4 +7,4 @@ description   = "contactapp"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"

examples/helloworld/helloworld.nimble

@@ -7,4 +7,4 @@ description   = "helloworld"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"

examples/qmlregistertype/qmlregistertype.nimble

@@ -7,4 +7,4 @@ description   = "qmlregistertype"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"

examples/resourcebundling/resourcebundling.nimble

@@ -9,7 +9,7 @@ bin = @["main"]
 
 # Dependencies
 
-requires @["nim >= 1.0.0", "nimqml >= 0.8.0"]
+requires @["nim >= 1.2.0", "nimqml >= 0.9.0"]
 
 task build, "Compile the binary":
   exec ("nim c main")

examples/simpledata/simpledata.nimble

@@ -7,5 +7,5 @@ description   = "simpledata"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"
 

examples/slotsandproperties/slotsandproperties.nimble

@@ -7,4 +7,4 @@ description   = "slotsandproperties"
 license       = "MIT"
 
 [Deps]
-Requires: "nim >= 1.0.0, nimqml >= 0.8.0"
+Requires: "nim >= 1.2.0, nimqml >= 0.9.0"

nimqml.nimble

@@ -1,10 +1,10 @@
 [Package]
 name          = "nimqml"
-version       = "0.8.0"
+version       = "0.9.0"
 author        = "Filippo Cucchetto"
 description   = "QML bindings for Nim"
 license       = "LGPLv3"
 srcDir        = "src"
 
 [Deps]
-Requires: "nim >= 1.0.0"
+Requires: "nim >= 1.2.0"

src/nimqml.nim

@@ -10,10 +10,13 @@ template debugMsg(typeName: string, procName: string) =
     message &= procName
     debugMsg(message)
 
+include "nimqml/private/nimqmlmacros.nim"
 include "nimqml/private/dotherside.nim"
 include "nimqml/private/nimqmltypes.nim"
-include "nimqml/private/qmetaobject.nim"
 include "nimqml/private/qvariant.nim"
+include "nimqml/private/lambdainvoker.nim"
+include "nimqml/private/qmetaobjectconnection.nim"
+include "nimqml/private/qmetaobject.nim"
 include "nimqml/private/qobject.nim"
 include "nimqml/private/qqmlapplicationengine.nim"
 include "nimqml/private/qcoreapplication.nim"
@@ -28,4 +31,4 @@ include "nimqml/private/qabstractlistmodel.nim"
 include "nimqml/private/qabstracttablemodel.nim"
 include "nimqml/private/qresource.nim"
 include "nimqml/private/qdeclarative.nim"
-include "nimqml/private/nimqmlmacros.nim"
+

src/nimqml/private/dotherside.nim

@@ -7,15 +7,15 @@ const dynLibName =
     of "macosx":
       "libDOtherSide.dylib"
     else:
-      "libDOtherSide.so.0.7"
+      "libDOtherSide.so.0.8"
 
 type
   NimQObject = pointer
   NimQAbstractItemModel = pointer
   NimQAbstractListModel = pointer
   NimQAbstractTableModel = pointer
   DosQMetaObject = distinct pointer
-  DosQObject = distinct pointer
+  DosQObject* = distinct pointer
   DosQObjectWrapper = distinct pointer
   DosQVariant = distinct pointer
   DosQQmlContext = distinct pointer
@@ -30,6 +30,7 @@ type
   DosQAbstractItemModel = distinct pointer
   DosQAbstractTableModel = distinct pointer
   DosQAbstractListModel = distinct pointer
+  DosQMetaObjectConnection = distinct pointer
 
   DosParameterDefinition = object
     name: cstring
@@ -106,6 +107,8 @@ type
     canFetchMore: DosCanFetchMoreCallback
     fetchMore: DosFetchMoreCallback
 
+  DosQObjectConnectLambdaCallback = proc(data: pointer, numArguments: cint, arguments: ptr DosQVariantArray) {.cdecl.}
+  DosQMetaObjectInvokeMethodCallback = proc(data: pointer) {.cdecl.}
 
 # Conversion
 proc resetToNil[T](x: var T) = x = nil.pointer.T
@@ -117,6 +120,7 @@ proc isNil(x: DosQUrl): bool = x.pointer.isNil
 proc isNil(x: DosQQuickView): bool = x.pointer.isNil
 proc isNil(x: DosQHashIntByteArray): bool = x.pointer.isNil
 proc isNil(x: DosQModelIndex): bool = x.pointer.isNil
+proc isNil(x: DosQMetaObjectConnection): bool = x.pointer.isNil
 
 # CharArray
 proc dos_chararray_delete(str: cstring) {.cdecl, dynlib: dynLibName, importc.}
@@ -177,8 +181,19 @@ proc dos_qobject_qmetaobject(): DosQMetaObject {.cdecl, dynlib: dynLibName, impo
 proc dos_qobject_create(nimobject: NimQObject, metaObject: DosQMetaObject, dosQObjectCallback: DosQObjectCallBack): DosQObject {.cdecl, dynlib: dynLibName, importc.}
 proc dos_qobject_objectName(qobject: DosQObject): cstring {.cdecl, dynlib: dynLibName, importc.}
 proc dos_qobject_setObjectName(qobject: DosQObject, name: cstring) {.cdecl, dynlib: dynLibName, importc.}
-proc dos_qobject_signal_emit(qobject: DosQObject, signalName: cstring, argumentsCount: cint, arguments: ptr DosQVariantArray) {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_signal_emit(qobject: DosQObject, signalName: cstring, argumentsCount: cint, arguments: ptr DosQVariantArray)  {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_connect_static(sender: DosQObject, senderFunc: cstring, receiver: DosQObject, receiverFunc: cstring, connectionType: cint): DosQMetaObjectConnection {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_connect_lambda_static(sender: DosQObject, senderFunc: cstring, callback: DosQObjectConnectLambdaCallback, data: pointer, connectionType: cint): DosQMetaObjectConnection {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_connect_lambda_with_context_static(sender: DosQObject, senderFunc: cstring, context: DosQObject, callback: DosQObjectConnectLambdaCallback, data: pointer, connectionType: cint): DosQMetaObjectConnection {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_disconnect_static(sender: DosQObject, senderFunc: cstring, receiver: DosQObject, receiverFunc: cstring) {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_disconnect_with_connection_static(connection: DosQMetaObjectConnection) {.cdecl, dynlib: dynLibName, importc.}
 proc dos_qobject_delete(qobject: DosQObject) {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qobject_deleteLater(qobject: DosQObject) {.cdecl, dynlib: dynLibName, importc.}
+proc dos_signal_macro*(name: cstring): cstring {.cdecl, dynlib: dynLibName, importc.}
+proc dos_slot_macro*(name: cstring): cstring {.cdecl, dynlib: dynLibName, importc.}
+
+# QMetaObject::Connection
+proc dos_qmetaobject_connection_delete(connection: DosQMetaObjectConnection) {.cdecl, dynlib: dynLibName, importc.}
 
 # QAbstractItemModel
 proc dos_qabstractitemmodel_qmetaobject(): DosQMetaObject {.cdecl dynlib: dynLibName, importc.}
@@ -190,6 +205,7 @@ proc dos_qmetaobject_create(superclassMetaObject: DosQMetaObject,
                             slotDefinitions: ptr DosSlotDefinitions,
                             propertyDefinitions: ptr DosPropertyDefinitions): DosQMetaObject {.cdecl, dynlib: dynLibName, importc.}
 proc dos_qmetaobject_delete(vptr: DosQMetaObject) {.cdecl, dynlib: dynLibName, importc.}
+proc dos_qmetaobject_invoke_method(context: DosQObject, callback: DosQMetaObjectInvokeMethodCallback, callbackData: pointer, connectionType: cint): bool  {.cdecl, dynlib: dynLibName, importc.}
 
 # QUrl
 proc dos_qurl_create(url: cstring, parsingMode: cint): DosQUrl {.cdecl, dynlib: dynLibName, importc.}

src/nimqml/private/lambdainvoker.nim

@@ -0,0 +1,75 @@
+import locks
+import tables
+
+type
+  LambdaInvokerProc = proc(arguments: seq[QVariant]) {.closure.}
+  LambdaInvoker = ref object
+    id: int
+    lock: Lock
+    lambdas: Table[int, LambdaInvokerProc]
+
+
+proc new(typ: type LambdaInvoker): LambdaInvoker =
+  ## Create the lambda invoker
+  new(result)
+  result.id = 0
+  result.lock.initLock()
+  result.lambdas = initTable[int, LambdaInvokerProc]()
+
+
+proc add(self: LambdaInvoker, l: LambdaInvokerProc): int =
+  ## Add a lambda and return its id
+  self.lock.acquire()
+  result = self.id
+  self.id.inc()
+  self.lambdas[result] = l
+  self.lock.release()
+
+proc add(self: LambdaInvoker, l: proc()): int =
+  let k = proc(args: seq[QVariant]) = l()
+  return self.add(k)
+
+proc add[T0](self: LambdaInvoker, l: proc(t0: T0)): int =
+  let k = proc(args: seq[QVariant]) =
+    if args.len > 0:
+      l(args[0].value(T0))
+    else:
+      echo "Too few arguments during lambda invokation"
+  return self.add(k)
+
+proc add[T0, T1](self: LambdaInvoker, l: proc(t0: T0, t1: T1)): int =
+  let k = proc(args: seq[QVariant]) =
+    if args.len > 1:
+      l(args[0].value(T0), args[1].value(T1))
+    else:
+      echo "Too few arguments during lambda invokation"
+  return self.add(k)
+
+proc add[T0, T1, T2](self: LambdaInvoker, l: proc(t0: T0, t1: T1, t2: T2)): int =
+  let k = proc(args: seq[QVariant]) =
+    if args.len > 2:
+      l(args[0].value(T0), args[1].value(T1), args[2].value(T2))
+    else:
+      echo "Too few arguments during lambda invokation"
+  return self.add(k)
+
+proc get(self: LambdaInvoker, id: int): LambdaInvokerProc =
+  ## Return the lambda with the given id
+  self.lock.acquire()
+  result = self.lambdas.getOrDefault(id)
+  self.lock.release()
+
+proc invoke(self: LambdaInvoker, id: int, arguments: seq[QVariant]) =
+  let l = self.get(id)
+  if l != nil:
+    l(arguments)
+
+let invokerInstance = LambdaInvoker.new()
+  
+proc instance(typ: type LambdaInvoker): LambdaInvoker =
+  result = invokerInstance
+
+proc lambdaCallback(data: pointer, numArguments: cint, arguments: ptr DosQVariantArray) {.cdecl, exportc.} =
+  let id = cast[int](data)
+  let arguments = toQVariantSequence(arguments, numArguments, Ownership.Clone)
+  LambdaInvoker.instance.invoke(id, arguments)