fixed harmless style-warnings
[cl-gtk2.git] / gtk / gtk.demo.lisp
index 8c52342..98866dc 100644 (file)
@@ -1,5 +1,5 @@
 (defpackage :gtk-demo
-  (:use :cl :gtk :gdk :gobject :anaphora :iter)
+  (:use :cl :gtk :gdk :gobject :iter)
   (:export #:test
            #:test-entry
            #:table-packing
@@ -12,7 +12,6 @@
            #:demo-code-editor
            #:test-treeview-list
            #:test-combo-box
-           #:test-toolbar
            #:test-ui-manager
            #:test-color-button
            #:test-color-selection
            #:test-box-child-property
            #:test-builder
            #:demo-text-editor
-           #:demo-class-browser))
+           #:demo-class-browser
+           #:demo-treeview-tree))
 
 (in-package :gtk-demo)
 
-(defparameter *src-location* (asdf:component-pathname (asdf:find-system :gtk)))
+(defparameter *src-location* (asdf:component-pathname (asdf:find-system :cl-gtk2-gtk)))
 
 (defun test ()
   (within-main-loop
     (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t))
           x y)
       (g-signal-connect window "destroy" (lambda (widget)
-                                           (release widget)
+                                           (declare (ignore widget))
                                            (leave-gtk-main)))
       (g-signal-connect window "motion-notify-event" (lambda (widget event)
-                                                       (release widget)
+                                                       (declare (ignore widget))
                                                        (setf x (event-motion-x event)
                                                              y (event-motion-y event))
                                                        (widget-queue-draw window)))
       (g-signal-connect window "expose-event"
                         (lambda (widget event)
-                          (declare (ignore event))
-                          (release widget)
-                                        ;(print event)
-                          (using* ((gdk-window (widget-window window))
-                                   (gc (gdk-gc-new gdk-window))
-                                   (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
+                          (declare (ignore widget event))
+                          (let* ((gdk-window (widget-window window))
+                                 (gc (gdk-gc-new gdk-window))
+                                 (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
                             (gdk-draw-layout gdk-window gc 0 0 layout)
                             (gdk-gc-set-rgb-fg-color gc (make-color :red 65535 :green 0 :blue 0))
                             (multiple-value-bind (x y) (drawable-get-size gdk-window)
                               (gdk-draw-line gdk-window gc 0 0 x y)))))
       (g-signal-connect window "configure-event"
                         (lambda (widget event)
-                          (declare (ignore event))
-                          (release widget)
+                          (declare (ignore widget event))
                           (widget-queue-draw window)))
       (widget-show window)
       (push :pointer-motion-mask (gdk-window-events (widget-window window))))))
         (box-pack-start box w)
         (container-add w text-view))
       (container-add window box)
-      (g-signal-connect window "destroy" (lambda (widget) (release widget) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (widget) (declare (ignore widget)) (leave-gtk-main)))
       (g-signal-connect window "delete-event" (lambda (widget event)
-                                                (declare (ignore event))
-                                                (release widget)
-                                                (using (dlg (make-instance 'message-dialog :text "Are you sure?" :buttons :yes-no))
+                                                (declare (ignore widget event))
+                                                (let ((dlg (make-instance 'message-dialog
+                                                                          :text "Are you sure?"
+                                                                          :buttons :yes-no)))
                                                   (let ((response (dialog-run dlg)))
                                                     (object-destroy dlg)
                                                     (not (eq :yes response))))))
-      (g-signal-connect button "clicked" (lambda (button) (release button)
-                                                 (setf (text-buffer-text text-buffer)
-                                                       (format nil "~A~%~A" (text-buffer-text text-buffer) (entry-text entry))
-                                                       (entry-text entry) "")))
-      (g-signal-connect button-select "clicked" (lambda (button) (release button)
-                                                        (editable-select-region entry 5 10)))
-      (g-signal-connect button-insert "clicked" (lambda (button) (release button)
-                                                        (editable-insert-text entry "hello" 2)))
+      (g-signal-connect button "clicked" (lambda (button)
+                                           (declare (ignore button))
+                                           (setf (text-buffer-text text-buffer)
+                                                 (format nil "~A~%~A" (text-buffer-text text-buffer) (entry-text entry))
+                                                 (entry-text entry) "")))
+      (g-signal-connect button-select "clicked" (lambda (button)
+                                                  (declare (ignore button))
+                                                  (editable-select-region entry 5 10)))
+      (g-signal-connect button-insert "clicked" (lambda (button)
+                                                  (declare (ignore button))
+                                                  (editable-insert-text entry "hello" 2)))
       (widget-show window))))
 
 (defun table-packing ()
       (table-attach table button-1 0 1 0 1)
       (table-attach table button-2 1 2 0 1)
       (table-attach table button-q 0 2 1 2)
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
-      (g-signal-connect button-q "clicked" (lambda (b) (release b) (object-destroy window)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
+      (g-signal-connect button-q "clicked" (lambda (b) (declare (ignore b)) (object-destroy window)))
       (widget-show window))))
 
 (defun test-pixbuf ()
           (vbox-1 (make-instance 'v-box)))
      (container-add window vbox)
      (box-pack-start vbox (make-instance 'label :text "Placing bg image" :font "Times New Roman Italic 10" :color "#00f" :request-height 40))
-     (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+     (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
      (box-pack-start vbox eventbox)
      (container-add eventbox vbox-1)
      (box-pack-start vbox-1 (make-instance 'label :text "This is the eventbox"))
     (let* ((window (make-instance 'gtk-window :title "Test images"))
            (image (make-instance 'image :icon-name "applications-development" :icon-size 6)))
       (container-add window image)
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (widget-show window))))
 
 (defun test-progress-bar ()
            (button-pulse (make-instance 'button :label "Pulse"))
            (button-set (make-instance 'button :label "Set"))
            (entry (make-instance 'entry)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (container-add window v-box)
       (box-pack-start v-box p-bar)
       (box-pack-start v-box button-pulse)
       (box-pack-start v-box button-set)
       (box-pack-start v-box entry)
-      (g-signal-connect button-pulse "clicked" (lambda (w) (release w) (progress-bar-pulse p-bar)))
-      (g-signal-connect button-set "clicked" (lambda (w) (release w)
-                                                     (setf (progress-bar-fraction p-bar)
-                                                           (coerce (read-from-string (entry-text entry)) 'real))))
+      (g-signal-connect button-pulse "clicked" (lambda (w) (declare (ignore w)) (progress-bar-pulse p-bar)))
+      (g-signal-connect button-set "clicked" (lambda (w)
+                                               (declare (ignore w))
+                                               (setf (progress-bar-fraction p-bar)
+                                                     (coerce (read-from-string (entry-text entry)) 'real))))
       (widget-show window))))
 
 (defun test-status-bar ()
            (entry (make-instance 'entry))
            (icon (make-instance 'status-icon :icon-name "applications-development")))
       (set-status-icon-tooltip icon "An icon from lisp program")
-      (g-signal-connect window "destroy" (lambda (w) (release w)
-                                                 #+ (or) (setf (status-icon-visible icon) nil)
-                                                 (leave-gtk-main)))
-      (g-signal-connect button-push "clicked" (lambda (b) (release b) (status-bar-push status-bar "lisp-prog" (entry-text entry))))
-      (g-signal-connect button-pop "clicked" (lambda (b) (release b) (status-bar-pop status-bar "lisp-prog")))
-      (g-signal-connect icon "activate" (lambda (i) (release i)
-                                                (using (message-dialog (make-instance 'message-dialog :buttons :ok :text "You clicked on icon!"))
-                                                  (dialog-run message-dialog)
-                                                  (object-destroy message-dialog))))
+      (g-signal-connect window "destroy" (lambda (w)
+                                           (declare (ignore w))
+                                           #+ (or) (setf (status-icon-visible icon) nil)
+                                           (leave-gtk-main)))
+      (g-signal-connect button-push "clicked" (lambda (b)
+                                                (declare (ignore b))
+                                                (status-bar-push status-bar "lisp-prog" (entry-text entry))))
+      (g-signal-connect button-pop "clicked" (lambda (b)
+                                               (declare (ignore b))
+                                               (status-bar-pop status-bar "lisp-prog")))
+      (g-signal-connect icon "activate" (lambda (i)
+                                          (declare (ignore i))
+                                          (let ((message-dialog (make-instance 'message-dialog
+                                                                               :buttons :ok
+                                                                               :text "You clicked on icon!")))
+                                            (dialog-run message-dialog)
+                                            (object-destroy message-dialog))))
       (container-add window v-box)
       (box-pack-start v-box h-box :expand nil)
       (box-pack-start h-box entry)
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Testing scale button"))
            (button (make-instance 'scale-button :icons (list "media-seek-backward" "media-seek-forward" "media-playback-stop" "media-playback-start") :adjustment (make-instance 'adjustment :lower -40 :upper 50 :value 20))))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (container-add window button)
       (widget-show window))))
 
            (v (make-instance 'text-view :buffer buffer :wrap-mode :word))
            (box (make-instance 'v-box))
            (scrolled (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (g-signal-connect button "clicked" (lambda (b)
-                                           (release b)
-                                           (using* ((i1 (make-instance 'text-iter))
-                                                    (i2 (make-instance 'text-iter)))
-                                             (multiple-value-bind (i1 i2) (text-buffer-get-selection-bounds buffer)
-                                               (when (and i1 i2)
-                                                 (using* ((i1 i1) (i2 i2)
-                                                          (dialog (make-instance 'message-dialog :buttons :ok)))
-                                                   (setf (message-dialog-text dialog) (format nil "selection: from (~A,~A) to (~A,~A)"
-                                                                                              (text-iter-line i1) (text-iter-line-offset i1)
-                                                                                              (text-iter-line i2) (text-iter-line-offset i2)))
-                                                   (dialog-run dialog)
-                                                   (object-destroy dialog)))))))
+                                           (declare (ignore b))
+                                           (multiple-value-bind (i1 i2) (text-buffer-get-selection-bounds buffer)
+                                             (when (and i1 i2)
+                                               (let* ((i1 i1) (i2 i2)
+                                                      (dialog (make-instance 'message-dialog :buttons :ok)))
+                                                 (setf (message-dialog-text dialog)
+                                                       (format nil "selection: from (~A,~A) to (~A,~A)"
+                                                               (text-iter-line i1) (text-iter-line-offset i1)
+                                                               (text-iter-line i2) (text-iter-line-offset i2)))
+                                                 (dialog-run dialog)
+                                                 (object-destroy dialog))))))
       (g-signal-connect bold-btn "clicked" (Lambda (b)
-                                             (release b)
+                                             (declare (ignore b))
                                              (multiple-value-bind (start end) (text-buffer-get-selection-bounds buffer)
                                                (when (and start end)
-                                                 (using* ((start start) (end end) (tag (text-tag-table-lookup (text-buffer-tag-table buffer) "bold")))
+                                                 (let* ((start start)
+                                                        (end end)
+                                                        (tag (text-tag-table-lookup (text-buffer-tag-table buffer) "bold")))
                                                    (if (text-iter-has-tag start tag)
                                                        (text-buffer-remove-tag buffer tag start end)
                                                        (text-buffer-apply-tag buffer tag start end)))))))
-      (g-signal-connect button-insert "clicked" (lambda (b) (declare (ignore b))
-                                                        (let* ((iter (text-buffer-get-iter-at-mark buffer (text-buffer-get-mark buffer "insert")))
-                                                               (anchor (text-buffer-insert-child-anchor buffer iter))
-                                                               (button (make-instance 'button :label "A button!")))
-                                                          (widget-show button)
-                                                          (text-view-add-child-at-anchor v button anchor))))
+      (g-signal-connect button-insert "clicked" (lambda (b)
+                                                  (declare (ignore b))
+                                                  (let* ((iter (text-buffer-get-iter-at-mark buffer (text-buffer-get-mark buffer "insert")))
+                                                         (anchor (text-buffer-insert-child-anchor buffer iter))
+                                                         (button (make-instance 'button :label "A button!")))
+                                                    (widget-show button)
+                                                    (text-view-add-child-at-anchor v button anchor))))
       (let ((tag (make-instance 'text-tag :name "bold" :weight 700)))
         (text-tag-table-add (text-buffer-tag-table buffer) tag)
         (g-signal-connect tag "event"
                           (lambda (tag object event iter)
                             (declare (ignore tag object iter))
                             (when (eq (event-type event) :button-release)
-                              (using (dlg (make-instance 'message-dialog :text "You clicked on bold text." :buttons :ok))
+                              (let ((dlg (make-instance 'message-dialog :text "You clicked on bold text." :buttons :ok)))
                                 (dialog-run dlg)
                                 (object-destroy dlg))))))
       (container-add window box)
            (scrolled (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic))
            (buffer (make-instance 'text-buffer))
            (view (make-instance 'text-view :buffer buffer)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (container-add window scrolled)
       (container-add scrolled view)
       (widget-show window)
       (g-signal-connect buffer "insert-text" (lambda (buffer location text len)
-                                               (using* ((buffer buffer) (location location))
+                                               (let* ((buffer buffer)
+                                                      (location location))
                                                  (format t "~A~%" (list buffer location text len))))))))
 
 (defstruct tvi title value)
       (store-add-item model (make-tvi :title "Saturday" :value 6))
       (store-add-item model (make-tvi :title "Sunday" :value 7))
       (setf (tree-view-model tv) model (tree-view-tooltip-column tv) 0)
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
-      (gobject:g-signal-connect button "clicked" (lambda (b) (gobject:release b) 
-                                                         (store-add-item model (make-tvi :title (entry-text title-entry)
-                                                                                         :value (or (parse-integer (entry-text value-entry) 
-                                                                                                                   :junk-allowed t)
-                                                                                                    0)))))
+      (gobject:g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
+      (gobject:g-signal-connect button "clicked" (lambda (b)
+                                                   (declare (ignore b))
+                                                   (store-add-item model (make-tvi :title (entry-text title-entry)
+                                                                                   :value (or (parse-integer (entry-text value-entry) 
+                                                                                                             :junk-allowed t)
+                                                                                              0)))))
       (g-signal-connect tv "row-activated" (lambda (tv path column)
-                                             (release* tv path column)
+                                             (declare (ignore tv column))
                                              (format t "You clicked on row ~A~%" (tree-path-indices path))))
       (container-add window v-box)
       (box-pack-start v-box h-box :expand nil)
       (store-add-item model (make-tvi :title "Friday" :value 5))
       (store-add-item model (make-tvi :title "Saturday" :value 6))
       (store-add-item model (make-tvi :title "Sunday" :value 7))
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
-      (gobject:g-signal-connect button "clicked" (lambda (b) (gobject:release b) 
-                                                         (store-add-item model (make-tvi :title (entry-text title-entry)
-                                                                                         :value (or (parse-integer (entry-text value-entry) 
-                                                                                                                   :junk-allowed t)
-                                                                                                    0)))))
+      (gobject:g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
+      (gobject:g-signal-connect button "clicked" (lambda (b)
+                                                   (declare (ignore b))
+                                                   (store-add-item model (make-tvi :title (entry-text title-entry)
+                                                                                   :value (or (parse-integer (entry-text value-entry) 
+                                                                                                             :junk-allowed t)
+                                                                                              0)))))
       (g-signal-connect combo-box "changed" (lambda (c)
                                               (declare (ignore c))
                                               (format t "You clicked on row ~A~%" (combo-box-active combo-box))))
       <separator/>
   </toolbar>
 </ui>")
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
+      (gobject:g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
       (iter (with fn = (lambda (action) (when print-confirmation (format t "Action ~A with name ~A activated~%" action (action-name action)))))
             (with action-group = (make-instance 'action-group :name "Actions"))
             (finally (let ((a (make-instance 'toggle-action :name "print-confirm" :label "Print" :stock-id "gtk-print-report" :active t)))
             (for action = (make-instance 'action :name name :stock-id stock-id))
             (g-signal-connect action "activate" fn)
             (action-group-add-action action-group action))
-      (awhen (ui-manager-widget ui-manager "/toolbar1")
-        (container-add window it))
+      (let ((widget (ui-manager-widget ui-manager "/toolbar1")))
+        (when widget
+          (container-add window widget)))
       (widget-show window))))
 
 (defun test-color-button ()
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Color button" :type :toplevel :window-position :center :width-request 100 :height-request 100))
           (button (make-instance 'color-button :title "Color button")))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
-      (g-signal-connect button "color-set" (lambda (b) (release b) (format t "Chose color ~A~%" (color-button-color button))))
+      (g-signal-connect window "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main)))
+      (g-signal-connect button "color-set" (lambda (b)
+                                             (declare (ignore b))
+                                             (format t "Chose color ~A~%" (color-button-color button))))
       (container-add window button)
       (widget-show window))))
 
       (iter (for i from 0 to 5)
             (for page = (make-instance 'label :label (format nil "Label for page ~A" i)))
             (for tab-label = (make-instance 'label :label (format nil "Tab ~A" i)))
-            (for tab-button = (make-instance 'button :use-stock t :label "gtk-close" :relief :none))
+            (for tab-button = (make-instance 'button
+                                             :image (make-instance 'image :stock "gtk-close" :icon-size 1)
+                                             :relief :none))
+            (g-signal-connect tab-button "clicked"
+                              (let ((page page))
+                                (lambda (button)
+                                  (declare (ignore button))
+                                  (format t "Removing page ~A~%" page)
+                                  (notebook-remove-page notebook page))))
             (for tab-hbox = (make-instance 'h-box))
             (box-pack-start tab-hbox tab-label)
             (box-pack-start tab-hbox tab-button)
 
 (defun demo-text-editor ()
   (within-main-loop
-    (let* ((builder (aprog1 (make-instance 'builder)
-                      (builder-add-from-file it (namestring (merge-pathnames "demo/text-editor.ui" *src-location*)))))
+    (let* ((builder (let ((builder (make-instance 'builder)))
+                      (builder-add-from-file builder (namestring (merge-pathnames "demo/text-editor.ui" *src-location*)))
+                      builder))
            (window (builder-get-object builder "window1"))
            (text-view (builder-get-object builder "textview1"))
            (status-bar (builder-get-object builder "statusbar1"))
                            (display-class-slots class)))))
             (g-signal-connect search-button "clicked" #'on-search-clicked))
           (widget-show window)))))
+
+(defun make-tree-from-sexp (l)
+  (setf l (if (listp l) l (list l)))
+  (let ((node (make-tree-node :item (make-tvi :title (format nil "~S" (first l))
+                                              :value (format nil "~S" (class-of (first l)))))))
+    (iter (for child in (rest l))
+          (tree-node-insert-at node (make-tree-from-sexp child) (length (tree-node-children node))))
+    node))
+
+(defun demo-treeview-tree ()
+  (within-main-loop
+    (let* ((window (make-instance 'gtk-window :type :toplevel :title "Treeview (tree)"))
+           (model (make-instance 'tree-lisp-store))
+           (scroll (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic))
+           (tree-view (make-instance 'tree-view :headers-visible t :width-request 300 :height-request 400 :rules-hint t))
+           (h-box (make-instance 'h-box))
+           (v-box (make-instance 'v-box))
+           (entry (make-instance 'entry))
+           (button (make-instance 'button :label "Display")))
+      (tree-lisp-store-add-column model "gchararray" #'tvi-title)
+      (tree-lisp-store-add-column model "gchararray" #'tvi-value)
+      (tree-node-insert-at (tree-lisp-store-root model)
+                           (make-tree-from-sexp '(lambda (object &rest initargs &key &allow-other-keys)
+                                                  (* 1 2)
+                                                  (- 3 4)))
+                           0)
+      (setf (tree-view-model tree-view) model
+            (tree-view-tooltip-column tree-view) 0)
+      (connect-signal tree-view "row-activated" (lambda (tv path column)
+                                                  (declare (ignore tv column))
+                                                  (format t "You clicked on row ~A~%" (tree-path-indices path))))
+      (connect-signal button "clicked" (lambda (b)
+                                         (declare (ignore b))
+                                         (let ((object (read-from-string (entry-text entry))))
+                                           (tree-node-remove-at (tree-lisp-store-root model) 0)
+                                           (tree-node-insert-at (tree-lisp-store-root model)
+                                                                (make-tree-from-sexp object)
+                                                                0))))
+      (container-add window v-box)
+      (box-pack-start v-box h-box :expand nil)
+      (box-pack-start h-box entry)
+      (box-pack-start h-box button :expand nil)
+      (box-pack-start v-box scroll)
+      (container-add scroll tree-view)
+      (let ((column (make-instance 'tree-view-column :title "Value" :sort-column-id 0))
+            (renderer (make-instance 'cell-renderer-text :text "A text")))
+        (tree-view-column-pack-start column renderer)
+        (tree-view-column-add-attribute column renderer "text" 0)
+        (tree-view-append-column tree-view column)
+        (print (tree-view-column-tree-view column))
+        (print (tree-view-column-cell-renderers column)))
+      (let ((column (make-instance 'tree-view-column :title "Type"))
+            (renderer (make-instance 'cell-renderer-text :text "A text")))
+        (tree-view-column-pack-start column renderer)
+        (tree-view-column-add-attribute column renderer "text" 1)
+        (tree-view-append-column tree-view column)
+        (print (tree-view-column-tree-view column))
+        (print (tree-view-column-cell-renderers column)))
+      (widget-show window))))