glimmer-dsl-tk 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33884eabc43f9c6b019d12a45f75e19212e2969d447f743e29e9db5cf81c615b
-  data.tar.gz: 0f0e3558279a70b03aaaf3e7733125eee5bfb5cce320ea34a6bc838803227755
+  metadata.gz: 69e1f06607f60b2864e78e6e1eb9bfde7cf98f8d8eca2d14f12bf218d781dcb3
+  data.tar.gz: 7c552bb85c6b87eeefe8117b5f3d2df922ff27618f564e6dd37df63b57c17d98
 SHA512:
-  metadata.gz: f9dac142530aa07249e92dc4cc314a028f7652582562031b415eaab33ac5c0a1207ef2d4f7bbe330bf62715d78f71727a3ef9f26eb761e52efdcc03778a39ac7
-  data.tar.gz: 117a6cd4b7fd8472c87b8e4817097d3b6f1c0ff1f765c8fa851b239fff453bbcc2bc7dc69a800d1c9fbee6669b87f821f2d2fa8cef4a407b59c1607c582a0aaf
+  metadata.gz: a6dad9353a12a78f0e8c4a2be45e440c2bebb3e0998957447332d0ab65ec3668eb447395cb32bb8bfa4c6feed3bee991d78b07dbe500c3716e914ed0e51b312c
+  data.tar.gz: 36bfc6aa1b337b33b6c6a658549b603658677ea0e4e1840ec1ef58727bb12c76031d08b22fd50960001c2881819e7ec1a7e672f1c29e57d63797d0ea106531f0

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Change Log
 
+## 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 alises `InsertMarkMove`, `insert_mark_move`, `insert_mark_moved`, all case-insensitive)
+- 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.

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.33
+# [<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)
@@ -158,7 +158,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.33'
+gem 'glimmer-dsl-tk', '~> 0.0.34'
 ```
 
 And, then run:
@@ -349,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`
@@ -731,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
 
@@ -1869,7 +1875,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 +1927,7 @@ class HelloText
     MULTI_LINE_STRING
   end
   
-  attr_accessor :document
+  attr_accessor :document, :find_text
       
   attr_accessor :foreground
   
@@ -1947,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
@@ -1956,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 {
@@ -1992,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'}
@@ -2002,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'}
@@ -2012,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}
@@ -2021,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
         }
         
@@ -2061,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
         }
         
@@ -2114,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
         }
       }
@@ -2129,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
 

data/VERSION

@@ -1 +1 @@
-0.0.33
+0.0.34

data/lib/glimmer/tk/text_proxy.rb

@@ -36,9 +36,11 @@ module Glimmer
         case listener_name.to_s.downcase
         when '<<modified>>', '<modified>', 'modified'
           modified_listener = Proc.new do |*args|
+            @modified_count ||= 0
+            @modified_count += 1
             listener.call(*args)
             apply_all_tag
-            @insert_mark_moved_proc.call
+            @insert_mark_moved_proc&.call
             @tk.modified = false
           end
           @tk.bind('<Modified>', modified_listener)
@@ -49,16 +51,16 @@ module Glimmer
         when 'insertmarkmove', 'insertmarkmoved', 'insert_mark_move', 'insert_mark_moved'
           if @insert_mark_moved_proc.nil?
             handle_listener('KeyPress') do |event|
-              @insert_mark_moved_proc.call
+              @insert_mark_moved_proc&.call
             end
             handle_listener('KeyRelease') do |event|
-              @insert_mark_moved_proc.call
+              @insert_mark_moved_proc&.call
             end
             handle_listener('ButtonPress') do |event|
-              @insert_mark_moved_proc.call
+              @insert_mark_moved_proc&.call
             end
             handle_listener('ButtonRelease') do |event|
-              @insert_mark_moved_proc.call
+              @insert_mark_moved_proc&.call
             end
           end
           @insert_mark = @tk.index('insert')
@@ -72,44 +74,71 @@ module Glimmer
         else
           apply_all_tag
           # TODO make listener pass an event that has a modifiers attribute for easy representation of :shift, :meta, :control, etc... while a letter button is pressed
+          @listeners ||= {}
           begin
-            @tk.tag_bind(ALL_TAG, listener_name, &listener)
+            @listeners[listener_name] ||= []
+            @tk.tag_bind(ALL_TAG, listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
+            @listeners[listener_name] << listener
           rescue => e
+            @listeners.delete(listener_name)
             Glimmer::Config.logger.debug {"Unable to bind to #{listener_name} .. attempting to surround with <>"}
             Glimmer::Config.logger.debug {e.full_message}
             listener_name = "<#{listener_name}" if !listener_name.start_with?('<')
             listener_name = "#{listener_name}>" if !listener_name.end_with?('>')
-            @tk.tag_bind(ALL_TAG, listener_name, &listener)
+            @listeners[listener_name] ||= []
+            @tk.tag_bind(ALL_TAG, listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
+            @listeners[listener_name] << listener
           end
         end
       end
       
-      def add_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| add_format(range_start, range_end, option, value) }
+      def edit_undo
+        @tk.edit_undo if @modified_count.to_i > 2 # <Modified> fires twice the first time, which is equivalent to one change.
       end
       
-      def remove_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_format(range_start, range_end, option, value) }
+      def edit_redo
+        begin
+          @tk.edit_redo
+        rescue => e
+          # No Op
+        end
+      end
+      
+      def add_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| add_format(range_start, range_end, option, value) }
       end
       
-      def toggle_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| toggle_format(range_start, range_end, option, value) }
+      def remove_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| remove_format(range_start, range_end, option, value) }
       end
       
-      def add_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| add_font_format(range_start, range_end, option, value) }
+      def toggle_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| toggle_format(range_start, range_end, option, value) }
       end
       
-      def remove_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_font_format(range_start, range_end, option, value) }
+      def add_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| add_font_format(range_start, range_end, option, value) }
       end
       
-      def toggle_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| toggle_font_format(range_start, range_end, option, value) }
+      def remove_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| remove_font_format(range_start, range_end, option, value) }
       end
       
-      def process_selection_ranges(&processor)
-        @tk.tag_ranges('sel').each do |region|
+      def toggle_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| toggle_font_format(range_start, range_end, option, value) }
+      end
+      
+      def process_selection_ranges(no_selection_default: :insert_word, &processor)
+        regions = @tk.tag_ranges('sel')
+        if regions.empty?
+          case no_selection_default
+          when :insert_word
+            regions = [[@tk.index('insert wordstart'), @tk.index('insert wordend + 1 char')]]
+          when :insert_letter
+            regions = [[@tk.index('insert'), @tk.index('insert + 1 char')]]
+          end
+        end
+        regions.each do |region|
           range_start = region.first
           range_end = region.last
           processor.call(range_start, range_end)
@@ -151,7 +180,7 @@ module Glimmer
             
       def add_format(region_start, region_end, option, value)
         @@tag_number = 0 unless defined?(@@tag_number)
-        tag = "tag#{@@tag_number += 1}"
+        tag = "tag_#{option}_#{@@tag_number += 1}"
         @tk.tag_configure(tag, {option => value})
         @tk.tag_add(tag, region_start, region_end)
         tag
@@ -202,7 +231,7 @@ module Glimmer
       def applied_font_format_tags_and_regions(region_start, region_end)
         lines = value.split("\n")
         tags_and_regions = []
-        all_tag_names = @tk.tag_names - ['sel', ALL_TAG]
+        all_tag_names = (@tk.tag_names - ['sel', ALL_TAG]).select {|tag_name| tag_name.include?('_font_')}
         (region_start.to_i..region_end.to_i).each do |line_number|
           start_character_index = 0
           start_character_index = region_start.to_s.split('.').last.to_i if line_number == region_start.to_i

data/samples/hello/hello_text.rb

@@ -107,11 +107,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 {
@@ -172,36 +167,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
         }
         
@@ -210,53 +205,53 @@ class HelloText
           orient 'vertical'
         }
         
-        @justify_left_button = button {
+        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
         }
         
-        @justify_center_button = button {
+        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
         }
         
-        @justify_right_button = button {
+        separator {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-right.png", __dir__), subsample: 32
-          
-          on('command') do
-            @text.add_selection_format('justify', 'right')
-          end
+          orient 'vertical'
         }
         
-        separator {
+        button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          orient 'vertical'
+          image File.expand_path("images/cut.png", __dir__), subsample: 32
+          
+          on('command') do
+            @text.text_cut
+          end
         }
         
         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
         }
         
@@ -265,21 +260,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/search.png", __dir__), subsample: 32
+          image File.expand_path("images/redo.png", __dir__), subsample: 32
           
           on('command') do
-            show_find_dialog
+            @text.edit_redo
           end
         }
       }
@@ -293,7 +289,7 @@ class HelloText
         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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer