glimmer-dsl-tk 0.0.30 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c90a3de5c636e2d9fcce122eaa07691e49842721d356a6266e75ff3f77b15ed
-  data.tar.gz: 82927885f588122a63c984c6acbd13110bc93197a075e8d3ef522bce98162ac9
+  metadata.gz: 69e1f06607f60b2864e78e6e1eb9bfde7cf98f8d8eca2d14f12bf218d781dcb3
+  data.tar.gz: 7c552bb85c6b87eeefe8117b5f3d2df922ff27618f564e6dd37df63b57c17d98
 SHA512:
-  metadata.gz: ba0ba8c92a2294998b6b43ac7397a9f27d499becc7603d8e51823aac0a4f442152208ae316829c019ed5bdb3ee763c8165a7309c3789c3009328a64851aabb27
-  data.tar.gz: b0a1bfe8894b410bbcf5781721fb3a044d0534b5f31260a128f9232db89d331ea7ec1843d288abc1ab16f17f046f3f869739d14c11bf74aa30bb7dbc59f9c551
+  metadata.gz: a6dad9353a12a78f0e8c4a2be45e440c2bebb3e0998957447332d0ab65ec3668eb447395cb32bb8bfa4c6feed3bee991d78b07dbe500c3716e914ed0e51b312c
+  data.tar.gz: 36bfc6aa1b337b33b6c6a658549b603658677ea0e4e1840ec1ef58727bb12c76031d08b22fd50960001c2881819e7ec1a7e672f1c29e57d63797d0ea106531f0

data/CHANGELOG.md

@@ -1,10 +1,40 @@
 # Change Log
 
-## 0.0.30
+## 0.0.34
+
+- When applying a `text` selection format without having a selection, have it apply to current insert mark word
+- Support registering multiple general event listeners on `text` widget (previously, later event listener registrations replaced former ones)
+- Implement `:no_selection_default` option of `:insert_word`, `insert_letter`, or `none` for `text` selection formatting methods (`add_selection_format`, `remove_selection_format`, `toggle_selection_format`, `add_selection_font_format`, `remove_selection_font_format`, `toggle_selection_font_format`)
+- Make sure to only allow `text` undo/redo when there are changes to be undoed/redoed
+- Fix issue with Hello, Text! Find Dialog not coming up with keyboard shortcut (e.g. CMD+F) anymore
+- Fix issue with Hello, Text! whereby after applying background, and foreground to a selection, you cannot apply bold, italic, or underline for the same selection (or font-size or font-family)
+
+## 0.0.33
+
+- Support `text` widget `InsertMarkMoved` listener event to track insert mark movement (or aliases `InsertMarkMove`, `insert_mark_move`, `insert_mark_moved`, all case-insensitive)
+- Support `entry` widget `changed` and `modified` listener event aliases for `change` event
+- Autodiscover format options when moving cursor in `text` widget (auto-derive from applied tags and widget font) and show in top Hello, Text! toolbar comboboxes and buttons
+- Fix issue with encountering error 'NoMethodError: undefined method "size" for' when launching Hello, Text!, performing Select-All (CMD+A or CONTROL+A) and then attempting to Bold all the text.
+- Fix issue in Hello, Text! whereby bolding a small region of text affects the font of the following region of text till the end of the document
+- Fix issue in Hello, Text! where if all text is copied and then pasted multiple times, the `text` widget loses its keyboard/mouse listeners and CMD+F does not work anymore to bring Find dialog
+
+## 0.0.32
+
+- Hello, Text! Find Dialog toolbar button
+- Hello, Text! Find Dialog Windows/Linux CONTROL+F shortcut alternative to Mac CMD+F
+
+## 0.0.31
 
 - Improve Hello, Text! (toolbar buttons: justify left, justify center, justify right)
-- Fixed Hello, Built-in Dialog! Font Dialog issue
+- `on('destroy') {|widget| ...}` support in widgets to better track calls to "destroy" method and `'<Destroy>'` binding event (as opposed to the unreliable tracking of '<Destroy>' alone)
+- Support observing `text` general events (e.g. `'<KeyPress>'`) through `on(event) {}` (was not working before because it required applying a tag, a general `__all__` tag is applied automatically now on full range (`1.0` to `end`))
+- Ensure unregistering observers (like data-binding observers) when destroying a widget
+- Add `Glimmer::Tk::ToplevelProxy` widget proxy support similar to `Glimmer::Tk::RootProxy`
 
+## 0.0.30
+
+- Improve Hello, Text! (toolbar buttons: find dialog)
+- Fixed Hello, Built-in Dialog! Font Dialog issue
 ## 0.0.29
 
 - Hello, Built-in Dialog! (demonstrating all built-in dialogs like get_open_file and choose_color)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.30
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.34
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -120,8 +120,9 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
   - [Applications](#applications)
     - [Glimmer Tk Calculator](#glimmer-tk-calculator)
     - [Y3network Ruby UI](#y3network-ruby-ui)
-    - [Cryptopunks GUI](#cryptopunks-gui)
+    - [CryptoPunks GUI](#cryptopunks-gui)
   - [Process](#process)
+  - [Resources](#resources)
   - [Help](#help)
     - [Issues](#issues)
     - [Chat](#chat)
@@ -157,7 +158,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.30'
+gem 'glimmer-dsl-tk', '~> 0.0.34'
 ```
 
 And, then run:
@@ -199,7 +200,7 @@ The Glimmer GUI DSL follows these simple concepts in mapping from Tk syntax:
 - **Widget Keyword**: Any Tk widget (e.g. `Tk::Tile::Label`) or toplevel window (e.g. `TkRoot`) may be declared by its lower-case underscored name without the namespace (e.g. `label` or `root`). This is called a keyword and is represented in the Glimmer GUI DSL by a Ruby method behind the scenes.
 - **Args**: Any keyword method may optionally take arguments surrounded by parentheses (e.g. a `frame` nested under a `notebook` may receive tab options like `frame(text: 'Users')`, which gets used behind the scenes by Tk code such as `notebook.add tab, text: 'Users'`)
 - **Content/Options Block**: Any keyword may optionally be followed by a Ruby curly-brace block containing nested widgets (content) and attributes (options). Attributes are simply Tk option keywords followed by arguments and no block (e.g. `title 'Hello, World!'` under a `root`)
-- **Event Binding Block**: `on(event) {}` keyword receiving a Tk binding event name (e.g. `KeyPress` or `ComboboxSelected`). No need to surround event by `<>` as [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) takes care of that automatically.
+- **Event Binding Block**: `on(event) {}` keyword receiving a Tk binding event name (e.g. `KeyPress` or `ComboboxSelected`). Surrounding event by `<>` is optional as [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) can take care of that automatically.
 
 Example of an app written in [Tk](https://www.tcl.tk/) imperative syntax:
 
@@ -272,7 +273,7 @@ keyword(args) | attributes | event bindings & callbacks
 `choose_directory(options = nil)` | None | None
 `choose_font(options = nil) {|font| ... }` | None | None
 `combobox` | `state`, `text` | `'ComboboxSelected'`
-`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'`, `validatecommand {}`, `invalidcommand {}`
+`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'` (alias: `'changed'`), `validatecommand {}`, `invalidcommand {}`
 `get_multiple_open_file(options = nil)` | None | None
 `get_open_file(options = nil)` | None | None
 `get_save_file(options = nil)` | None | None
@@ -285,7 +286,7 @@ keyword(args) | attributes | event bindings & callbacks
 `radiobutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `value` (default: `text`) | `command {}`
 `root` | `title`, `iconphoto`, `background`, `alpha`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`, `'OPEN_WINDOW'`
 `separator` | `orient` (`'horizontal' (default) or 'vertical'`) | None
-`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`
+`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`, `'insert_mark_moved'` (alias: `'insert_mark_move', 'InsertMarkMove', 'InsertMarkMoved'`)
 
 Options for `get_open_file` and `get_multiple_open_file` include:
 - `filetypes`: `Hash` of `'Group Name' => '.ext'` entries (e.g. `filetypes: {'PNG Images' => '.png'}`
@@ -348,15 +349,20 @@ The `text` widget is enhanced by [Glimmer DSL for Tk](https://rubygems.org/gems/
 - `add_font_format(region_start, region_end, font_option, value)`
 - `remove_font_format(region_start, region_end, font_option, value)`
 - `toggle_font_format(region_start, region_end, font_option, value)`
-- `add_selection_format(region_start, region_end, option, value)`
-- `remove_selection_format(region_start, region_end, option, value)`
-- `toggle_selection_format(region_start, region_end, option, value)`
-- `add_selection_font_format(region_start, region_end, font_option, value)`
-- `remove_selection_font_format(region_start, region_end, font_option, value)`
-- `toggle_selection_font_format(region_start, region_end, font_option, value)`
+- `add_selection_format(option, value, no_selection_default: :insert_word)`: adds format to selection. If there is no selection, then applies format to current insert mark word.
+- `remove_selection_format(option, value, no_selection_default: :insert_word)`
+- `toggle_selection_format(option, value, no_selection_default: :insert_word)`: toggles format on selection. If there is no selection, then toggles format on current insert mark word.
+- `add_selection_font_format(font_option, value, no_selection_default: :insert_word)`
+- `remove_selection_font_format(font_option, value, no_selection_default: :insert_word)`
+- `toggle_selection_font_format(font_option, value, no_selection_default: :insert_word)`
 - `text#insert_image(text_index, *image_args)`: inserts image into `text` `value` content at `text_index` location (e.g. `'insert'`)
 - `text#get_open_file_to_insert_image(text_index = 'insert')`: opens a file dialog to select one of the available image formats and then inserts image into `text` `value` content
 
+The `:no_selection_default` keyword arg to `*_selection_*` methods determines what region to cover when no explicit selection is set:
+- `:insert_word`: current word for insert mark
+- `:insert_letter`: current letter for insert mark
+- `:none`: no behavior when no selection is in place
+
 Available options:
 
 - `background`
@@ -730,6 +736,7 @@ More details can be found in the [Hello, Button!](#hello-button) sample below.
 ## Gotchas
 
 - Setting `background` attribute on `frame` or `label` does not work in `'aqua'` theme on the Mac (only in `'classic'` theme)
+- `text` widget does not track `KeyPress`/`KeyRelease` events perfectly (installed via `on()` listener keyword). It seems that when all text is deleted, it stops tracking key presses/releases until a number of new lines have been added to `text` `value` attribute
 
 ## Samples
 
@@ -1868,6 +1875,8 @@ Glimmer app:
 
 ### Hello, Text!
 
+You may press META+F to bring up the Find Dialog on the Mac and CONTROL+F to bring it up on Windows/Linux.
+
 Icons used in this sample were made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>
 
 Glimmer code (from [samples/hello/hello_text.rb](samples/hello/hello_text.rb)):
@@ -1918,7 +1927,7 @@ class HelloText
     MULTI_LINE_STRING
   end
   
-  attr_accessor :document
+  attr_accessor :document, :find_text
       
   attr_accessor :foreground
   
@@ -1944,8 +1953,16 @@ class HelloText
     [FONT_SIZE_PROMPT] + (9..64).to_a.map(&:to_s)
   end
   
+  def find
+    text_index = @text.search(/#{find_text}/i, @text.tag_ranges('sel')&.first&.last || @text.index('insert'))
+    unless text_index.to_s.empty?
+      @text.tag_remove('sel', '1.0', 'end')
+      @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
+    end
+  end
+  
   def launch
-    root {
+    @root = root {
       title 'Hello, Text!'
       width 1280
       height 800
@@ -1953,11 +1970,6 @@ class HelloText
       frame {
         grid row: 0, column: 0
         
-        label {
-          grid row: 0, column: 0, columnspan: 17
-          text 'Select a region of text and then apply formatting from the toolbar'
-        }
-        
         column_index = -1
         
         combobox {
@@ -1989,7 +2001,7 @@ class HelloText
           orient 'vertical'
         }
         
-        button {
+        @bold_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'B'
           style font: {weight: 'bold'}
@@ -1999,7 +2011,7 @@ class HelloText
           end
         }
         
-        button {
+        @italic_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'I'
           style font: {slant: 'italic'}
@@ -2009,7 +2021,7 @@ class HelloText
           end
         }
         
-        button {
+        @underline_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'U'
           style font: {underline: true}
@@ -2018,36 +2030,36 @@ class HelloText
             @text.toggle_selection_font_format('underline', true)
           end
         }
-        
+
         separator {
           grid row: 1, column: column_index += 1, column_weight: 0
           orient 'vertical'
         }
         
-        button {
+        @justify_left_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/cut.png", __dir__), subsample: 32
+          image File.expand_path("images/align-left.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_cut
+            @text.add_selection_format('justify', 'left')
           end
         }
         
-        button {
+        @justify_center_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/copy.png", __dir__), subsample: 32
+          image File.expand_path("images/align-center.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_copy
+            @text.add_selection_format('justify', 'center')
           end
         }
         
-        button {
+        @justify_right_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/paste.png", __dir__), subsample: 32
+          image File.expand_path("images/align-right.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_paste
+            @text.add_selection_format('justify', 'right')
           end
         }
         
@@ -2058,51 +2070,51 @@ class HelloText
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-left.png", __dir__), subsample: 32
+          image File.expand_path("images/picture.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'left')
+            @text.get_open_file_to_insert_image
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-center.png", __dir__), subsample: 32
+          image File.expand_path("images/search.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'center')
+            show_find_dialog
           end
         }
         
+        separator {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          orient 'vertical'
+        }
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-right.png", __dir__), subsample: 32
+          image File.expand_path("images/cut.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'right')
+            @text.text_cut
           end
         }
         
-        separator {
-          grid row: 1, column: column_index += 1, column_weight: 0
-          orient 'vertical'
-        }
-        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/undo.png", __dir__), subsample: 32
+          image File.expand_path("images/copy.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_undo
+            @text.text_copy
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          image File.expand_path("images/paste.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_redo
+            @text.text_paste
           end
         }
         
@@ -2111,12 +2123,22 @@ class HelloText
           orient 'vertical'
         }
         
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/picture.png", __dir__), subsample: 32
+          image File.expand_path("images/undo.png", __dir__), subsample: 32
           
           on('command') do
-            @text.get_open_file_to_insert_image
+            @text.edit_undo
+          end
+        }
+        
+        button {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          
+          on('command') do
+            @text.edit_redo
           end
         }
       }
@@ -2126,8 +2148,67 @@ class HelloText
         wrap 'word'
         undo true
         value <=> [self, :document]
+        
+        on('KeyPress') do |event|
+          show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
+        end
+                
+        on('InsertMarkMoved') do
+          self.font_family = @text.applied_font_format_value('family')
+          self.font_size = @text.applied_font_format_value('size')
+          @bold_button.default = @text.applied_font_format_value('weight') == 'bold' ? 'active' : 'normal'
+          @italic_button.default = @text.applied_font_format_value('slant') == 'italic' ? 'active' : 'normal'
+          @underline_button.default = @text.applied_font_format_value('underline') == true ? 'active' : 'normal'
+          self.background = @text.applied_format_value('background')
+          self.foreground = @text.applied_format_value('foreground')
+          @justify_left_button.default = @text.applied_format_value('justify') == 'left' ? 'active' : 'normal'
+          @justify_center_button.default = @text.applied_format_value('justify') == 'center' ? 'active' : 'normal'
+          @justify_right_button.default = @text.applied_format_value('justify') == 'right' ? 'active' : 'normal'
+        end
       }
-    }.open
+    }
+    @root.open
+  end
+  
+  def show_find_dialog
+    toplevel(@root) { |tl|
+      title 'Find'
+      
+      label {
+        text 'Text:'
+      }
+      entry { |e|
+        focus true
+        text <=> [
+          self,
+          :find_text,
+          after_write: lambda do
+            text_index = @text.search(/#{find_text}/i, 'insert')
+            unless text_index.to_s.empty?
+              @text.tag_remove('sel', '1.0', 'end')
+              @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
+            end
+          end
+        ]
+                
+        on('KeyPress') do |event|
+          if event.keysym == 'Return'
+            find
+          elsif event.keysym == 'Escape'
+            tl.grab_release
+            tl.destroy
+          end
+        end
+      }
+      button {
+        text 'Find'
+        default 'active'
+        
+        on('command') do
+          find
+        end
+      }
+    }
   end
 end
 
@@ -2150,6 +2231,8 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello text](images/glimmer-dsl-tk-screenshot-sample-hello-text.png)
 
+![glimmer dsl tk screenshot sample hello text find dialog](images/glimmer-dsl-tk-screenshot-sample-hello-text-find-dialog.png)
+
 ### Hello, Spinbox!
 
 Glimmer code (from [samples/hello/hello_spinbox.rb](samples/hello/hello_spinbox.rb)):
@@ -2624,31 +2707,34 @@ Glimmer app:
 
 https://github.com/ancorgs/glimmer-tk-calculator
 
-https://raw.githubusercontent.com/ancorgs/glimmer-tk-calculator/master/screenshot.png
+![Glimmer Tk Calculator Screenshot](https://raw.githubusercontent.com/ancorgs/glimmer-tk-calculator/master/screenshot.png)
 
 ### Y3network Ruby UI
 
 https://github.com/ancorgs/y3network-ruby-ui
 
-### Cryptopunks GUI
+### CryptoPunks GUI
 
-This is a Graphical User Interface for the famous [Cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
+This is a Graphical User Interface for the famous [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
 
 https://github.com/AndyObtiva/cryptopunks-gui
 
-![Cryptopunks GUI Screenshot](https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/screenshots/cryptopunks-gui-screenshot.png)
+![CryptoPunks GUI Screenshot](https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/screenshots/cryptopunks-gui-screenshot.png)
 
 ## Process
 
 [Glimmer Process](https://github.com/AndyObtiva/glimmer/blob/master/PROCESS.md)
 
+## Resources
+
+- [Tk Tutorial](https://tkdocs.com/tutorial/index.html)
+- [Code Master Blog](https://andymaleh.blogspot.com/search/label/Tk)
+
 ## Help
 
 ### Issues
 
-You may submit [issues](https://github.com/AndyObtiva/glimmer/issues) on [GitHub](https://github.com/AndyObtiva/glimmer/issues).
-
-[Click here to submit an issue.](https://github.com/AndyObtiva/glimmer/issues)
+If you encounter [issues](https://github.com/AndyObtiva/glimmer-dsl-tk/issues) that are not reported, discover missing features that are not mentioned in [TODO.md](TODO.md), or think up better ways to use [Tk](https://www.tcl.tk/) than what is possible with [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk), you may submit an [issue](https://github.com/AndyObtiva/glimmer-dsl-tk/issues/new) or [pull request](https://github.com/AndyObtiva/glimmer-dsl-tk/compare) on [GitHub](https://github.com).
 
 ### Chat
 

data/VERSION

@@ -1 +1 @@
-0.0.30
+0.0.34

data/lib/glimmer/data_binding/tk/one_time_observer.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/data_binding/observer'
+
+module Glimmer
+  module DataBinding
+    module Tk
+      # Decorator for Observer that ensures it is only called once
+      # (subsequent invocations of call method do nothing)
+      module OneTimeObserver
+        def call(value)
+          unless @called
+            super
+            @called = true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/tk/data_binding_expression.rb

@@ -38,12 +38,13 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          parent.class
           model_binding = args[0]
           widget_binding_parameters = [parent, keyword]
           widget_binding = DataBinding::Tk::WidgetBinding.new(*widget_binding_parameters)
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
-          widget_binding.observe(model_binding)
+          registration = widget_binding.observe(model_binding)
+          parent.on('destroy') { registration.deregister }
+
           # TODO simplify this logic and put it where it belongs
           parent.add_observer(model_binding, keyword) if parent.respond_to?(:add_observer, [model_binding, keyword])
           widget_binding.call(model_binding.evaluate_property)

data/lib/glimmer/dsl/tk/widget_expression.rb

@@ -33,11 +33,15 @@ module Glimmer
   
         def can_interpret?(parent, keyword, *args, &block)
           !EXCLUDED_KEYWORDS.include?(keyword) and
-            parent.respond_to?(:tk) and
             Glimmer::Tk::WidgetProxy.widget_exists?(keyword)
+            (parent.respond_to?(:tk) or args.first.respond_to?(:tk))
         end
   
         def interpret(parent, keyword, *args, &block)
+          if keyword == 'toplevel' && args.first.respond_to?(:tk)
+            parent = args.first
+            args[0] = args.first.tk
+          end
           Glimmer::Tk::WidgetProxy.create(keyword, parent, args, &block)
         end
         

data/lib/glimmer/tk/entry_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       
       def handle_listener(listener_name, &listener)
         case listener_name.to_s.downcase
-        when 'change'
+        when 'change', 'changed', 'modified'
           tk.textvariable.trace('write') {
             listener.call(@tk.textvariable)
           }