glimmer-dsl-tk 0.0.32 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f9643bc9497d251b1b17d52734874c954ce8ff085aee06f5a59bb98a79a1af
-  data.tar.gz: 2a1a77e76cfbd54fa463bc8c1ea3cb2e3e175b2996471bb3e80caf588f77f1dc
+  metadata.gz: 808f3c088481b9a8feedbccfcab17a2b37046493141bcce5677871f90e28046e
+  data.tar.gz: 1f433efd48c50a6b95f61cf8bae8617c44d8bbdfe9ee8b68e4c7d0bc868e5028
 SHA512:
-  metadata.gz: 5af953ed2716d179f70b6b844bde3fa67d808406f5796c0cedb06625e04a05945eba0ff00e8f1783603d6f5509b1abb2d31c6e10033bf0caf46e345172abff01
-  data.tar.gz: 6f2316a161c55c14acca0da4e6704908617bdec23058245d74352a3eb118bf26bb3671bfa78065aefd5ca23a985a9acbae547fdea7c571dc0ab103f462527d4d
+  metadata.gz: 9e0e8067624c6493dbd33bd151b885da42e04a443ef702a65abd10578c47ae22fc12f19d114ce2c345aa9bfc57c3332fa90a6ec758b7606ad62a354363b8fa27
+  data.tar.gz: c29b2b44399613bd15df154ee9986807ae121fcef57ff37448014ef36cc825fe6aa80e7ae28cee02d77cbdf15893ff82ea06390ca8e46394ccd6abffdeafb21a

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Change Log
 
+## 0.0.36
+
+- Hello, Toplevel! (Custom Window and Custom Dialog)
+- Support `mac_style` attribute under `toplevel`
+- Support registering multiple general event listeners on widgets (previously, later event listener registrations replaced former ones)
+- Support `escapable true` property under `root` and `toplevel` to close on hitting ESCAPE button
+
+## 0.0.35
+
+- Improved Meta-Sample by utilizing Ruby from `RbConfig.ruby`
+- Improved girb_runner.rb to be more platform independent
+- Fixed `text` widget binding of standard bind events (e.g. `'KeyPress'` or `'ButtonPress'`)
+- Fixed Hello, Text! issue with not being able to bring up Find Dialog once all text is deleted and new text is entered
+- Fixed undo/redo issue
+
+## 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

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.32
+# [<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.36
 ## 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)
@@ -55,8 +55,9 @@ NOTE: Glimmer DSL for Tk is currently in early alpha mode (incomplete). Please h
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
-- [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
+- [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
+- [glimmer-dsl-gtk](https://github.com/AndyObtiva/glimmer-dsl-gtk): Ruby-GNOME Desktop Development GUI Library
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)
 
@@ -83,6 +84,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Notebook Frame](#notebook-frame)
       - [Icon Photo](#icon-photo)
       - [Root Background](#root-background)
+      - [Toplevel Mac Style](#toplevel-mac-style)
       - [Text Defaults](#text-defaults)
   - [The Grid Geometry Manager](#the-grid-geometry-manager)
   - [Data-Binding](#data-binding)
@@ -104,6 +106,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello, Radiobutton!](#hello-radiobutton)
     - [Hello, Frame!](#hello-frame)
     - [Hello, Root!](#hello-root)
+    - [Hello, Toplevel!](#hello-toplevel)
     - [Hello, Notebook!](#hello-notebook)
     - [Hello, Label!](#hello-label)
     - [Hello, Message Box!](#hello-message-box)
@@ -158,7 +161,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.32'
+gem 'glimmer-dsl-tk', '~> 0.0.36'
 ```
 
 And, then run:
@@ -273,7 +276,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
@@ -286,7 +289,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'}`
@@ -349,15 +352,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`
@@ -473,6 +481,20 @@ root {
 
 `root` `background` color attribute is automatically set to `'#ececec'` on the Mac to avoid having a non-native-looking light-colored background.
 
+#### Toplevel Mac Style
+
+Mac has special support for mac styles in Tk `toplevel` via the `mac_style` attribute, which can receive 1 to 2 arguments. `mac_style`'s first argument (`mac_class`) and second argument (`mac_attribute_list`) can be chosen from this page:
+
+https://wiki.tcl-lang.org/page/MacWindowStyle
+
+Behind the scenes, `mac_style` automatically calls out to:
+
+```ruby
+Tk.tk_call("::tk::unsupported::MacWindowStyle", "style", tk_toplevel_widget, mac_class, mac_attribute_list)
+```
+
+More details can be found at the [Hello, Toplevel!](#hello-toplevel) sample.
+
 #### Text Defaults
 
 `text` widget has these defaults:
@@ -1327,7 +1349,7 @@ Glimmer app:
 
 ### Hello, Root!
 
-Glimmer code (from [samples/hello/hello_frame.rb](samples/hello/hello_frame.rb)):
+Glimmer code (from [samples/hello/hello_root.rb](samples/hello/hello_root.rb)):
 
 ```ruby
 require 'glimmer-dsl-tk'
@@ -1379,6 +1401,208 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello root bye](images/glimmer-dsl-tk-screenshot-sample-hello-root-bye.png)
 
+### Hello, Toplevel!
+
+`toplevel` widgets represent windows nested under `root`, which can be modeless (custom windows) or modal (dialogs that take the focus away from the owning window behind them until closed).
+
+Mac has special support for mac styles in Tk `toplevel` via the `mac_style` attribute, which can receive 1 to 2 arguments. `mac_style`'s first argument (`mac_class`) and second argument (`mac_attribute_list`) can be chosen from this page:
+
+https://wiki.tcl-lang.org/page/MacWindowStyle
+
+Glimmer code (from [samples/hello/hello_toplevel.rb](samples/hello/hello_toplevel.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+def toplevel_content
+  frame {
+    label {
+      text "This is a fully custom toplevel, meaning you can add any widgets here!\nYou can press the ESCAPE button on the keyboard to close."
+    }
+    separator
+    checkbutton {
+      text 'This is a checkbutton'
+    }
+    radiobutton {
+      text 'This is a radiobutton'
+    }
+  }
+end
+
+root { |root_window|
+  title 'Hello, Toplevel!'
+  
+  button {
+    text 'Nested Window'
+    
+    on('command') do
+      toplevel(root_window) {
+        title 'Custom Window'
+        escapable true
+        x 150
+        y 180
+        width 500
+        height 200
+        minsize 500, 100
+        maxsize 1000, 300
+          
+        toplevel_content
+      }
+    end
+  }
+  
+  button {
+    text 'Transparent Window'
+    
+    on('command') do
+      toplevel(root_window) {
+        title 'Transparent Window'
+        escapable true
+        alpha 0.85
+        width 250
+        height 100
+        resizable false, false # not resizable horizontally or vertically
+          
+        frame {
+          label {
+            text "This is a transparent window\nYou can hit ESCAPE to close."
+            anchor 'center'
+          }
+        }
+      }
+    end
+  }
+  
+  button {
+    text 'Fullscreen Window'
+    
+    on('command') do
+      toplevel(root_window) {
+        title 'Fullscreen Window'
+        escapable true
+        fullscreen true
+          
+        frame {
+          label {
+            text "This is a fullscreen window\nYou can hit ESCAPE to close."
+            anchor 'center'
+          }
+        }
+      }
+    end
+  }
+  
+  if OS.mac?
+    # Mac has special support for mac styles in Tk `toplevel`
+    # `mac_style` first argument (`mac_class`) and second argument (`mac_attribute_list`) can be chosen from this page: https://wiki.tcl-lang.org/page/MacWindowStyle
+    
+    button {
+      text 'Mac Plain (No-Button-Modeless) Window'
+      
+      on('command') do
+        toplevel(root_window) { |t|
+          title 'Mac Plain (No-Button-Modeless) Window'
+          escapable true
+          mac_style 'plain'
+          
+          toplevel_content
+        }
+      end
+    }
+    
+    button {
+      text 'Mac Floating (Close-Button-Modeless) Window'
+      
+      on('command') do
+        toplevel(root_window) { |t|
+          title 'Mac Floating (Close-Button-Modeless) Window'
+          escapable true
+          mac_style 'floating'
+          
+          toplevel_content
+        }
+      end
+    }
+    
+    button {
+      text 'Mac Document (All-Button-Modeless) Window'
+      
+      on('command') do
+        toplevel(root_window) { |t|
+          title 'Mac Document (All-Button-Modeless) Window'
+          escapable true
+          mac_style 'document'
+          
+          toplevel_content
+        }
+      end
+    }
+    
+    button {
+      text 'Mac Utility (Close-Button-Modal) Dialog'
+      
+      on('command') do
+        toplevel(root_window) { |t|
+          title 'Mac Utility (Close-Button-Modal) Dialog'
+          escapable true
+          mac_style 'utility'
+          
+          toplevel_content
+        }
+      end
+    }
+    
+    button {
+      text 'Mac Utility with Attribute List (All-Button-Modal) Dialog'
+      
+      on('command') do
+        toplevel(root_window) { |t|
+          title 'Mac Utility with Attribute List (All-Button-Modal) Dialog'
+          escapable true
+          mac_style 'utility', 'closeBox collapseBox resizable horizontalZoom verticalZoom sideTitlebar'
+          
+          toplevel_content
+        }
+      end
+    }
+  end
+}.open
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_toplevel'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r ./lib/glimmer-dsl-tk.rb samples/hello/hello_toplevel.rb
+```
+
+Glimmer app:
+
+![glimmer dsl tk screenshot sample hello toplevel 1](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 2](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-custom-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 3](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-transparent-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 4](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-fullscreen-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 5](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-mac-plain-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 6](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-mac-floating-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 7](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-mac-document-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 8](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-mac-utility-window.png)
+
+![glimmer dsl tk screenshot sample hello toplevel 9](images/glimmer-dsl-tk-screenshot-sample-hello-toplevel-mac-utility-with-attribute-list-window.png)
+
 ### Hello, Notebook!
 
 Glimmer code (from [samples/hello/hello_notebook.rb](samples/hello/hello_notebook.rb)):
@@ -1869,7 +2093,7 @@ Glimmer app:
 
 ### Hello, Text!
 
-You may use the META+F shortcut to bring up the Find Dialog.
+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>
 
@@ -1921,7 +2145,7 @@ class HelloText
     MULTI_LINE_STRING
   end
   
-  attr_accessor :document
+  attr_accessor :document, :find_text
       
   attr_accessor :foreground
   
@@ -1947,8 +2171,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
@@ -1956,11 +2188,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 {
@@ -1992,7 +2219,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'}
@@ -2002,7 +2229,7 @@ class HelloText
           end
         }
         
-        button {
+        @italic_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'I'
           style font: {slant: 'italic'}
@@ -2012,7 +2239,7 @@ class HelloText
           end
         }
         
-        button {
+        @underline_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'U'
           style font: {underline: true}
@@ -2021,36 +2248,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
         }
         
@@ -2061,51 +2288,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
         }
         
@@ -2114,12 +2341,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
         }
       }
@@ -2129,8 +2366,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
 

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.36

data/bin/girb_runner.rb

@@ -27,7 +27,7 @@ require_relative '../lib/glimmer-dsl-tk'
 
 include Glimmer
 
-GIRB_RUNNER_EXIT_FILE = "#{Etc.getpwuid.dir}/.girb_runner_exit"
+GIRB_RUNNER_EXIT_FILE = "#{Dir.home}/.girb_runner_exit"
 FileUtils.rm_rf GIRB_RUNNER_EXIT_FILE
 
 @exit_method = method(:exit)

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

@@ -33,7 +33,7 @@ module Glimmer
   
         def can_interpret?(parent, keyword, *args, &block)
           !EXCLUDED_KEYWORDS.include?(keyword) and
-            Glimmer::Tk::WidgetProxy.widget_exists?(keyword)
+            Glimmer::Tk::WidgetProxy.widget_exists?(keyword) and
             (parent.respond_to?(:tk) or args.first.respond_to?(:tk))
         end