extend QSELECT / QSEL to work with QML items; revision of property dialog; small revisions;

examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.cpp

@@ -1,5 +1,4 @@
 #include "qml_lisp.h"
-#include <eql_fun.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,9 +105,4 @@ QVariant Lisp::apply(const QJSValue& caller_or_function,
         arguments = function_or_arguments.toVariant().value<QVariantList>(); }
     return qmlApply(caller, function, arguments); }
 
-void PaintedItem::paint(QPainter* painter) {
-    eql_fun("qml:paint",
-            Q_ARG(QQuickPaintedItem*, this),
-            Q_ARG(QPainter*, painter)); }
-
 QT_END_NAMESPACE

examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.h

@@ -3,6 +3,7 @@
 
 #include <QtQml>
 #include <QQuickPaintedItem>
+#include <eql_fun.h>
 
 #ifdef Q_OS_WIN
 #define LIB_EXPORT __declspec(dllexport)
@@ -48,7 +49,10 @@ class PaintedItem : public QQuickPaintedItem {
 public:
     PaintedItem(QQuickItem* parent = 0) : QQuickPaintedItem(parent) {}
 
-    void paint(QPainter*);
+    void paint(QPainter* painter) {
+        eql_fun("qml:paint",
+                Q_ARG(QQuickPaintedItem*, this),
+                Q_ARG(QPainter*, painter)); }
 };
 
 QT_END_NAMESPACE

examples/M-modules/quick/Tic-Tac-Toe/properties.lisp

@@ -10,5 +10,4 @@
   (when (stringp item)
     (setf item (qml:find-quick-item item)))
   (funcall (sym :show :properties)
-           (or item qml:*caller*)
+           (or item qml:*caller*)))
-           t)) ; all instance properties (for QML)

examples/M-modules/quick/item-model/README.txt

@@ -10,3 +10,11 @@ RUN
 ===
 
 Please run it from this directory.
+
+
+HELP
+====
+
+To list all properties of the 'ListView', do:
+
+    (show-properties-dialog (root-item)) ; see "properties.lisp"

examples/M-modules/quick/item-model/lib/qml_lisp.cpp

@@ -1,5 +1,4 @@
 #include "qml_lisp.h"
-#include <eql_fun.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,9 +105,4 @@ QVariant Lisp::apply(const QJSValue& caller_or_function,
         arguments = function_or_arguments.toVariant().value<QVariantList>(); }
     return qmlApply(caller, function, arguments); }
 
-void PaintedItem::paint(QPainter* painter) {
-    eql_fun("qml:paint",
-            Q_ARG(QQuickPaintedItem*, this),
-            Q_ARG(QPainter*, painter)); }
-
 QT_END_NAMESPACE

examples/M-modules/quick/item-model/lib/qml_lisp.h

@@ -3,6 +3,7 @@
 
 #include <QtQml>
 #include <QQuickPaintedItem>
+#include <eql_fun.h>
 
 #ifdef Q_OS_WIN
 #define LIB_EXPORT __declspec(dllexport)
@@ -48,7 +49,10 @@ class PaintedItem : public QQuickPaintedItem {
 public:
     PaintedItem(QQuickItem* parent = 0) : QQuickPaintedItem(parent) {}
 
-    void paint(QPainter*);
+    void paint(QPainter* painter) {
+        eql_fun("qml:paint",
+                Q_ARG(QQuickPaintedItem*, this),
+                Q_ARG(QPainter*, painter)); }
 };
 
 QT_END_NAMESPACE

examples/M-modules/quick/item-model/properties.lisp

@@ -10,5 +10,4 @@
   (when (stringp item)
     (setf item (qml:find-quick-item item)))
   (funcall (sym :show :properties)
-           (or item qml:*caller*)
+           (or item qml:*caller*)))
-           t)) ; all instance properties (for QML)

examples/M-modules/quick/item-model/qml/abstract-model.qml

@@ -2,7 +2,7 @@ import QtQuick 2.0
 import EQL5 1.0
 
 ListView {
-    x: 5; y: 5; width: 200; height: 250
+    width: 200; height: 250
 
     model: myModel
     delegate: Text { text: "animal: <b>" + kind + "</b>, " + size }

examples/M-modules/quick/item-model/qml/list-model.qml

@@ -2,7 +2,7 @@ import QtQuick 2.0
 import EQL5 1.0
 
 ListView {
-    x: 5; y: 5; width: 150; height: 250
+    width: 150; height: 250
 
     model: myModel
     delegate: Rectangle {

examples/M-modules/quick/painted-item/README.txt

@@ -39,4 +39,4 @@ Examples:
 
     (qproperties* (qml:find-quick-item "left"))
 
-    (show-properties-dialog (qml:find-quick-item "left"))
+    (show-properties-dialog "left") ; see "properties.lisp"

examples/M-modules/quick/painted-item/lib/qml_lisp.cpp

@@ -1,5 +1,4 @@
 #include "qml_lisp.h"
-#include <eql_fun.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,9 +105,4 @@ QVariant Lisp::apply(const QJSValue& caller_or_function,
         arguments = function_or_arguments.toVariant().value<QVariantList>(); }
     return qmlApply(caller, function, arguments); }
 
-void PaintedItem::paint(QPainter* painter) {
-    eql_fun("qml:paint",
-            Q_ARG(QQuickPaintedItem*, this),
-            Q_ARG(QPainter*, painter)); }
-
 QT_END_NAMESPACE

examples/M-modules/quick/painted-item/lib/qml_lisp.h

@@ -3,6 +3,7 @@
 
 #include <QtQml>
 #include <QQuickPaintedItem>
+#include <eql_fun.h>
 
 #ifdef Q_OS_WIN
 #define LIB_EXPORT __declspec(dllexport)
@@ -48,7 +49,10 @@ class PaintedItem : public QQuickPaintedItem {
 public:
     PaintedItem(QQuickItem* parent = 0) : QQuickPaintedItem(parent) {}
 
-    void paint(QPainter*);
+    void paint(QPainter* painter) {
+        eql_fun("qml:paint",
+                Q_ARG(QQuickPaintedItem*, this),
+                Q_ARG(QPainter*, painter)); }
 };
 
 QT_END_NAMESPACE

examples/M-modules/quick/painted-item/properties.lisp

@@ -10,5 +10,4 @@
   (when (stringp item)
     (setf item (qml:find-quick-item item)))
   (funcall (sym :show :properties)
-           (or item qml:*caller*)
+           (or item qml:*caller*)))
-           t)) ; all instance properties (for QML)

examples/M-modules/quick/qml-lisp/README.txt

@@ -74,10 +74,12 @@ can't be inspected using QPROPERTIES (only the generic ones).
 
 To list all properties (including user defined ones), use QPROPERTIES* instead.
 
-Example:
+Examples:
 
     (qproperties* (qml:find-quick-item "label"))
 
+    (show-properties-dialog "label") ; see "properties.lisp
+
 
 TIP
 ===

examples/M-modules/quick/qml-lisp/lib/qml_lisp.cpp

@@ -1,5 +1,4 @@
 #include "qml_lisp.h"
-#include <eql_fun.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,9 +105,4 @@ QVariant Lisp::apply(const QJSValue& caller_or_function,
         arguments = function_or_arguments.toVariant().value<QVariantList>(); }
     return qmlApply(caller, function, arguments); }
 
-void PaintedItem::paint(QPainter* painter) {
-    eql_fun("qml:paint",
-            Q_ARG(QQuickPaintedItem*, this),
-            Q_ARG(QPainter*, painter)); }
-
 QT_END_NAMESPACE

examples/M-modules/quick/qml-lisp/lib/qml_lisp.h

@@ -3,6 +3,7 @@
 
 #include <QtQml>
 #include <QQuickPaintedItem>
+#include <eql_fun.h>
 
 #ifdef Q_OS_WIN
 #define LIB_EXPORT __declspec(dllexport)
@@ -48,7 +49,10 @@ class PaintedItem : public QQuickPaintedItem {
 public:
     PaintedItem(QQuickItem* parent = 0) : QQuickPaintedItem(parent) {}
 
-    void paint(QPainter*);
+    void paint(QPainter* painter) {
+        eql_fun("qml:paint",
+                Q_ARG(QQuickPaintedItem*, this),
+                Q_ARG(QPainter*, painter)); }
 };
 
 QT_END_NAMESPACE

examples/M-modules/quick/qml-lisp/properties.lisp

@@ -10,5 +10,4 @@
   (when (stringp item)
     (setf item (qml:find-quick-item item)))
   (funcall (sym :show :properties)
-           (or item qml:*caller*)
+           (or item qml:*caller*)))
-           t)) ; all instance properties (for QML)

examples/M-modules/quick/qml-lisp/qml/example.qml

@@ -9,7 +9,7 @@ Item {
 
         // Please note:
         //
-        // * to call lisp functions, use either Lisp.call() or Lisp.apply();
+        // * to call Lisp functions, use either Lisp.call() or Lisp.apply();
         //   use JS arrays for lists (can be nested);
         //
         // * the only limit to Lisp.call() is the number of arguments (max. 16);
@@ -22,7 +22,7 @@ Item {
         //   Lisp.call() or Lisp.apply(); it can then be accessed in Lisp via qml:*caller*;
 
         // (1) call CL function
-        console.log(Lisp.call("format", false, "~R", 123))
+        console.log(Lisp.call("format", null, "~R", 123))
 
         // (2) call EQL function
         Lisp.call("qmsg", "hello from QML")

gui/properties.lisp

@@ -15,7 +15,8 @@
   *view*
   *depth*
   *label*
-  *instance-properties*)
+  *instance-properties*
+  *select*)
 
 (defvar *font*   (format nil "font-family: ~A; font-size: ~Apt;"
                          #+darwin  "Monaco"      #+darwin  12
@@ -33,7 +34,8 @@
   (! "resize" *main* '(650 500))
   (qset-color *view* |QPalette.Base| "lightyellow")
   (qconnect *depth* "valueChanged(int)" 'update)
-  (qconnect *instance-properties* "toggled(bool)" 'all-instance-properties))
+  (qconnect *instance-properties* "toggled(bool)" 'all-instance-properties)
+  (qconnect *select* "clicked()" 'selected))
   
 (defun update (depth)
   (! "setText" *label*
@@ -51,11 +53,13 @@
     (|setEnabled| w (not checked)))
   (show))
 
-(defun show (&optional object qml)
+(defun selected ()
-  (when qml
+  (qselect (lambda (object) (show (symbol-value (find-symbol (symbol-name :*q*) :qsel))))))
-    (! "setChecked" *instance-properties* t))
+
+(defun show (&optional object)
   (when object
     (setf *object* object)
+    (! "setChecked" *instance-properties* (! "inherits" *object* "QQuickItem")) ; for QML items
     (let ((depth 1)
           (name (qt-object-name *object*)))
       (! "setText" *label* name)

gui/properties.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>466</width>
+    <width>417</width>
-    <height>336</height>
+    <height>357</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -48,11 +48,31 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="instance_properties">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="text">
+     <item>
-      <string>all instance properties (for QML)</string>
+      <widget class="QCheckBox" name="instance_properties">
-     </property>
+       <property name="sizePolicy">
-    </widget>
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>all instance properties (for QML)</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="select">
+       <property name="toolTip">
+        <string>Select QWidget or QQuickItem</string>
+       </property>
+       <property name="text">
+        <string>Select</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>

src/dyn_object.cpp

@@ -88,7 +88,7 @@ void DynObject::clearEventFilters() {
     event_objects.clear(); }
 
 bool DynObject::eventFilter(QObject* object, QEvent* event) {
-    if(event_filters && object->isWidgetType()) {
+    if(event_filters && (object->isWidgetType() || object->isWindowType())) {
         for(int i = 0; i < event_objects.size(); ++i) {
             if(!event_objects.at(i) || (object == event_objects.at(i))) {
                 if(event->type() == event_types.at(i)) {

src/eql.cpp

@@ -7,7 +7,7 @@
 #include <QTimer>
 #include <QStringList>
 
-const char EQL::version[] = "17.2.6"; // Feb 2017
+const char EQL::version[] = "17.2.7"; // Feb 2017
 
 extern "C" void ini_EQL(cl_object);
 

src/lisp/qselect.lisp

@@ -1,7 +1,8 @@
 ;;; copyright (c) Polos Ruetz
 ;;;
-;;; Allows to visually select (mouse click) any (child) widget.
+;;; Allows to visually select (mouse click) any child widget or QML item.
-;;; On selecting, the widget will be highlighted, and qsel:*q* will be set to the latest selected widget. 
+;;; On selecting, the widget/item will be highlighted, and qsel:*q* will be set
+;;; to the latest selected widget/item. 
 
 (defpackage :qselect
   (:nicknames :qsel)
@@ -21,27 +22,33 @@
 
 (in-package :qselect)
 
+(defvar *listen*      nil)
 (defvar *q*           nil)
 (defvar *on-selected* nil)
+(defvar *pos*         nil)
 
-(let ((cross-cursor (qnew "QCursor(Qt::CursorShape)" |Qt.CrossCursor|))
+(let ((cross-cursor (qnew "QCursor(Qt::CursorShape)" |Qt.CrossCursor|)))
-      listen)
   (defun object-selected (object event)
-    (when listen
+    (unless (zerop (qt-object-id object)) ; exclude unknown to EQL
-      (setf listen nil)
+      (when *listen*
-      (setf *q* object)
+        (setf *listen* nil
-      (setf (qt-object-unique object) (! ("toUInt" ("property" "EQL.unique") *q*)))
+              *q*      object
-      (indicate)
+              *pos*    (! "pos" event))
-      (! "restoreOverrideCursor" "QGuiApplication")
+        (setf (qt-object-unique object)
-      (when *on-selected*
+              (! ("toUInt" ("property" "EQL.unique") *q*)))
-        (funcall *on-selected* object))
+        (if  (find (! "className" (! "metaObject" *q*))
-      t)) ; event filter
+                   '("LQuickView" "LQuickWidget") :test 'string=)
+             (indicate*) ; QML items
+             (indicate)) ; QWidgets
+        (! "restoreOverrideCursor" "QGuiApplication")
+        (when *on-selected*
+          (funcall *on-selected* object))
+        t))) ; event filter
   (defun select-mode ()
-    (if (! "topLevelWidgets" "QApplication")
+    (setf *listen* t)
-        (progn
+    (! "setOverrideCursor" "QGuiApplication" cross-cursor)))
-          (setf listen t)
+
-          (! "setOverrideCursor" "QGuiApplication" cross-cursor))
+;; for QWidgets
-        (qmsg (tr "Please create widgets first.")))))
 
 (defun indicate ()
   (let ((object *q*))
@@ -93,3 +100,39 @@
     (qlet ((painter "QPainter(QPixmap*)" dark))
       (! "drawPixmap" painter rect pixmap rect))
     dark))
+
+;; for QML
+
+(defun child (item)
+  (let* ((pos (! "mapFromScene" item *pos*))
+         (child* (! "childAt" item (first pos) (second pos))))
+    (if (qnull child*)
+        item
+        (child child*))))
+
+(defun indicate* ()
+  (let ((root (! "rootObject" *q*)))
+    (indicate-start* *q* (child root))))
+
+(defun indicate-start* (parent child)
+  (setf *q* child)
+  (let ((indicate (qnew "QLabel(QWidget*,Qt::WindowFlags)" nil |Qt.WindowStaysOnTopHint|)))
+    (! "move" indicate (nbutlast (! "frameGeometry" parent) 2))
+    (! "resize" indicate (list (! "width" parent)
+                               (! "height" parent)))
+    (let* ((pix (if (! "isWidgetType" parent)
+                    (! "grab" parent)                                   ; QQuickWidget
+                    (! "fromImage" "QPixmap" (! "grabWindow" parent)))) ; QQuickView
+           (dark (to-dark pix)))
+      (! "setPixmap" indicate (set-highlight* indicate pix dark child)))
+    (qlater (lambda () (! "show" indicate)))
+    (qsingle-shot 500 (lambda () (qdel indicate)))))
+
+(defun highlight* (child)
+  (! "mapRectToScene" child (list 0 0 (! "width" child) (! "height" child))))
+
+(defun set-highlight* (indicate pixmap dark child)
+  (let ((rect (highlight* child)))
+    (qlet ((painter "QPainter(QPixmap*)" dark))
+      (! "drawPixmap" painter rect pixmap rect))
+    dark))