Skip to content

Commit

Permalink
Merge branch 'release/1.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
daveray committed Jun 21, 2011
2 parents 3966041 + 912ad36 commit 28fbf94
Show file tree
Hide file tree
Showing 21 changed files with 694 additions and 291 deletions.
4 changes: 2 additions & 2 deletions examples/gaidica/project.clj
@@ -1,5 +1,5 @@
(defproject gaidica "1.0.0-SNAPSHOT"
:description "FIXME: write"
:description "Example Seesaw application"
:dependencies [[org.clojure/clojure "1.2.0"]
[org.clojure/clojure-contrib "1.2.0"]
[seesaw "1.0.3"]])
[seesaw "1.0.7"]])
17 changes: 12 additions & 5 deletions examples/gaidica/src/gaidica/core.clj
Expand Up @@ -12,7 +12,7 @@
(:require [clojure.zip :as zip]
[clojure.xml :as xml]
[clojure.contrib.zip-filter.xml :as zfx])
(:use [seesaw core border table]))
(:use [seesaw core border table mig]))

(native!)

Expand Down Expand Up @@ -81,6 +81,13 @@
{:key :updated :text "Last Updated"}
{:key :image :text "Image"}]]))

(defn set-divider-location [w v]
(if (.isDisplayable w)
(.setDividerLocation w v)
(invoke-later
(set-divider-location w v)))
w)

(defn make-webcam-panel []
(let [webcam-table (make-webcam-table)
image-label (label :text "")]
Expand All @@ -92,9 +99,10 @@
:id :webcam
:border 5
:center
(top-bottom-split
(-> (top-bottom-split
(scrollable webcam-table)
(scrollable image-label)))))
(scrollable image-label))
(set-divider-location 0.5)))))

(defn update-webcams [webcam-panel webcams]
(let [t (select webcam-panel [:#webcam-table])]
Expand Down Expand Up @@ -135,8 +143,7 @@
(defn app []
(frame
:title "Gaidica"
:width 600
:height 600
:size [600 :by 600]
:on-close :exit
:menubar (menubar :items [(menu :text "View" :items [refresh-action])])
:content (border-panel
Expand Down
2 changes: 1 addition & 1 deletion project.clj
@@ -1,4 +1,4 @@
(defproject seesaw "1.0.6"
(defproject seesaw "1.0.7"
:description "A Swing wrapper/DSL for Clojure. You want seesaw.core, FYI. See http://seesaw-clj.org for more info."
:url "http://seesaw-clj.org"
:mailing-list {:name "seesaw-clj"
Expand Down

0 comments on commit 28fbf94

Please sign in to comment.