diff --git a/examples/X-extras/qimage.lisp b/examples/X-extras/qimage.lisp index 05fc229..3ac1472 100644 --- a/examples/X-extras/qimage.lisp +++ b/examples/X-extras/qimage.lisp @@ -160,7 +160,7 @@ (unless (x:empty-string name) (if (pathname-type name) (let ((*saving* t)) - (|save| (|grabWidget.QPixmap| *display* (|rect| *image*)) + (|save| (|grab| *display* (|rect| *image*)) name)) (progn (qmsg "Please add a file ending.") diff --git a/gui/gui.lisp b/gui/gui.lisp index 16d4194..3c89bea 100644 --- a/gui/gui.lisp +++ b/gui/gui.lisp @@ -173,15 +173,20 @@ (! "setOverrideCursor" "QGuiApplication" cross-cursor))) (defun select-class () - (flet ((set-tab-index (i) + (flet ((find-name (name q-n) + (find name (qobject-names q-n) :test 'string-equal)) + (set-tab-index (i) (! "setCurrentIndex" *qt-tab* i))) - (let ((name (! "text" *search-class*))) - (cond ((find name (qobject-names :q) :test 'string=) + (let* ((name (! "text" *search-class*)) + (q-name (find-name name :q)) + (n-name (unless q-name + (find-name name :n)))) + (cond (q-name (set-tab-index 0) - (change-class-q-object name :super)) - ((find name (qobject-names :n) :test 'string=) + (change-class-q-object q-name :super)) + (n-name (set-tab-index 1) - (change-class-n-object name :super)))))) + (change-class-n-object n-name :super)))))) (defun change-class-q-object (s &optional super) (let ((i (! "findText" *q-names* s))) diff --git a/gui/gui.ui b/gui/gui.ui index ba27e97..036e9fd 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -109,7 +109,7 @@ - 1 + 0