glimmer-cs-gladiator 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9a2287522769ac69c26758b818fa5a6f6bc67f9dac12b51133f67d3f2fc4fa
-  data.tar.gz: c9904337e408dcd98ae08fd29a68612a1a02e43bff4b60b076d296849b807f81
+  metadata.gz: 3c07882b7fc3a12df1d64f02148ac6d018c1edd45fdea10c6d5285bdd55df137
+  data.tar.gz: fdacfe1e7f81879c96f0d746cc1e62ec66e6a202a934dae2f9bb7c1027f91a95
 SHA512:
-  metadata.gz: 9437901ac67de9d73faea8c23e75b375144ba09c134e5434aeb1d1a70f320c3265fc0859076b036064d34974d3f819272a660ee8630bf95f151c9ea636d2f33d
-  data.tar.gz: e02c401d726608a8f6ffbceeb98670bed11d8db002ecc4aebf38f77863842e709bac7cb3739aa4061f52abb7c8bd2259c55333ec1a1b57d6bbf9ef3c3390ee76
+  metadata.gz: 42e38a486000c47409ecefd8f120950e856abd9163a3131b8733e65f9bbb337437ed660374c363ccded21db8c4491c158922be6e5510b2af2a8ed2b3e5aa96f1
+  data.tar.gz: 36fcaddd1f4d6766f53fb19bd26aaeeaf5e2f86164e6244620f3d5cc5e9067bf48b2172005c850d408d1dc7a80c43dabbe5e9f59c6be53664de4f312d78de844

data/README.md

@@ -1,4 +1,4 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.6.0 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.6.2 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
@@ -36,7 +36,7 @@ Gladiator currently supports the following text editing features (including keyb
 ### File Lookup List Filter
 
 - Collapsable file lookup list filter (CMD+R)
-- Semi-fuzzy filtering by ignoring slashes, underscores, and dots to ease lookup 
+- Semi-fuzzy filtering by ignoring slashes, underscores, and dots to ease lookup
 
 ### Navigation Area
 
@@ -70,7 +70,7 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Pre-requisites
 
-- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library): '>= 4.17.2.0', '< 5.0.0.0' (dependency included in Ruby gem).
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Framework): '>= 4.17.2.0', '< 5.0.0.0' (dependency included in Ruby gem).
 - [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
 - [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
 
@@ -136,7 +136,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.6.0'
+gem 'glimmer-cs-gladiator', '~> 0.6.2'
 ```
 
 Run:
@@ -200,6 +200,6 @@ Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further detail
 
 --
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library)
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Framework)
 
-Gladiator icon 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>
+Gladiator icon 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>

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/models/glimmer/gladiator/file.rb

@@ -36,10 +36,7 @@ module Glimmer
             the_dirty_content.split("\n") # test that it is not a binary file (crashes to rescue block otherwise)
             self.dirty_content = the_dirty_content
             observe(self, :caret_position) do |new_caret_position|
-              new_line_number = line_index_for_caret_position(caret_position) + 1
-              current_line_number = line_number
-              self.line_number = new_line_number unless current_line_number && current_line_number == new_line_number
-              self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
+              update_line_number_from_caret_position(new_caret_position)
             end
             observe(self, :line_number) do |new_line_number|
               line_index = line_number - 1
@@ -55,6 +52,16 @@ module Glimmer
         end
       end
       
+      def update_line_number_from_caret_position(new_caret_position)
+        new_line_number = line_index_for_caret_position(caret_position) + 1
+        current_line_number = line_number
+        unless (current_line_number && current_line_number == new_line_number)
+          self.line_number = new_line_number
+          # TODO check if the following line is needed
+          self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
+        end
+      end
+      
       def path=(the_path)
         @path = the_path
         generate_display_path
@@ -134,6 +141,7 @@ module Glimmer
       
       def change_content!(value)
         self.dirty_content = value
+        update_line_number_from_caret_position(caret_position)
       end
 
       def start_command
@@ -527,7 +535,7 @@ module Glimmer
       def line_index_for_caret_position(caret_position)
         dirty_content[0...caret_position.to_i].count("\n")
       end
-
+      
       def caret_position_for_line_index(line_index)
         cp = lines[0...line_index].join("\n").size
         cp += 1 if line_index > 0

data/lib/views/glimmer/gladiator.rb

@@ -22,6 +22,7 @@ module Glimmer
     class << self
       attr_accessor :drag_and_drop
       attr_accessor :drag
+      attr_accessor :startup
     end
     
     ## Add options like the following to configure CustomShell by outside consumers
@@ -88,7 +89,7 @@ module Glimmer
     #
     after_body {
       observe(project_dir, 'children') do
-        select_tree_item unless @rename_in_progress
+        select_tree_item unless @rename_in_progress || Gladiator.startup
       end
       observe(project_dir, 'selected_child') do |selected_file|
         if selected_file
@@ -99,12 +100,12 @@ module Glimmer
               @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
             }
           end
-          select_tree_item unless @rename_in_progress
+          select_tree_item unless @rename_in_progress || Gladiator.startup
           found_tab_item = selected_tab_item
           if found_tab_item
             @current_tab_folder.swt_widget.setSelection(found_tab_item)
             @current_tab_item = found_tab_item.getData('proxy')
-            @current_text_editor = found_tab_item.getData('text_editor')
+            @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
             @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
           elsif selected_file
             @current_tab_folder.content {
@@ -114,19 +115,25 @@ module Glimmer
                  margin_width 0
                  margin_height 0
                 }
-                @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file)
-                @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                @current_text_editor.text_proxy.content {
-                  on_focus_gained {
-                    tab_folder = the_text_editor.swt_widget.getParent.getParent
-                    @current_tab_folder = tab_folder.getData('proxy')
-                    @current_tab_item = the_tab_item
-                    @current_text_editor = the_text_editor
-                    @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                    @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-                    project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
+                tab_folder = nil
+                the_text_editor = nil
+                the_tab_item.content {
+                  @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file)
+                  @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+                  the_tab_item.swt_tab_item.setData('text_editor', @current_text_editor)
+                  @current_text_editor.text_proxy.content {
+                    on_focus_gained {
+                      tab_folder = the_text_editor.swt_widget.getParent.getParent
+                      @current_tab_folder = tab_folder.getData('proxy')
+                      @current_tab_item = the_tab_item
+                      @current_text_editor = the_text_editor
+                      @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+                      @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
+                      project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
+                    }
                   }
                 }
+                
                 on_swt_show {
                   @current_tab_item = the_tab_item
                   @current_text_editor = the_text_editor
@@ -144,7 +151,6 @@ module Glimmer
               }
               @current_tab_item.swt_tab_item.setData('file_path', selected_file.path)
               @current_tab_item.swt_tab_item.setData('file', selected_file)
-              @current_tab_item.swt_tab_item.setData('text_editor', @current_text_editor)
               @current_tab_item.swt_tab_item.setData('proxy', @current_tab_item)
             }
             @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
@@ -181,8 +187,19 @@ module Glimmer
           swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]
           @loaded_config = true
         }
-        on_swt_close {
+        on_shell_closed {
+          save_config
           project_dir.selected_child&.write_dirty_content
+          if @tab_folder2
+            current_tab_folder.swt_widget.getItems.each do |tab_item|
+              tab_item.getData('proxy')&.dispose
+            end
+            close_tab_folder
+          end
+          current_tab_folder.swt_widget.getItems.each do |tab_item|
+            tab_item.getData('proxy')&.dispose
+          end
+          body_root.close unless current_tab_folder.swt_widget.getItems.empty?
         }
         on_widget_disposed {
           project_dir.selected_child&.write_dirty_content
@@ -763,37 +780,55 @@ module Glimmer
         open_file_paths1.to_a.each do |file_path|
           async_exec {
             Gladiator.drag = false
+            Gladiator.startup = file_path != open_file_paths1.to_a[-1]
             project_dir.selected_child_path = file_path
           }
         end
         # TODO replace the next line with one that selects the visible tab
         async_exec {
-          Gladiator.drag = false
-          project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths1.to_a.include?(@config[:selected_child_path])
-          project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-          project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+          # TODO check why this is not working
+          if open_file_paths1.to_a.include?(@config[:selected_child_path])
+            Gladiator.drag = false
+            Gladiator.startup = false
+            project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
+            project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+            project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+          end
         }
         async_exec {
           open_file_paths2.to_a.each do |file_path|
             async_exec {
               Gladiator.drag = true
+              Gladiator.startup = file_path != open_file_paths2.to_a[-1]
               project_dir.selected_child_path = file_path
             }
           end
           # TODO replace the next line with one that selects the visible tab
           async_exec {
-            Gladiator.drag = true
-            project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths2.to_a.include?(@config[:selected_child_path])
-            project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-            project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+            # TODO check why this is not working
+            if open_file_paths2.to_a.include?(@config[:selected_child_path])
+              Gladiator.drag = true
+              Gladiator.startup = false
+              project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
+              project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+              project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+            end
           }
           async_exec {
             Gladiator.drag = false
-            @progress_bar_shell.close
+            @progress_bar_shell&.close
             @progress_bar_shell = nil
             @loaded_config = true
           }
         }
+        async_exec {
+          Thread.new {
+            all_files = open_file_paths1.to_a + open_file_paths2.to_a
+            all_files.each do |file|
+              project_dir.find_child_file(file)&.dirty_content
+            end
+          }
+        }
       else
         @loaded_config = true
       end
@@ -982,6 +1017,7 @@ module Glimmer
     
     def open_project
       selected_directory = directory_dialog.open
+      return if selected_directory.nil?
       @progress_bar_shell = shell(body_root, :title) {
         text 'Gladiator'
         fill_layout(:vertical) {
@@ -1010,11 +1046,18 @@ module Glimmer
     
     def handle_display_shortcut(key_event)
       if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-        if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
-          find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
-        end
-        find_text.swt_widget.selectAll
-        find_text.swt_widget.setFocus
+        @navigation_expand_item.swt_expand_item.set_expanded true
+        @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+        async_exec {
+          body_root.pack_same_size
+        }
+        async_exec {
+          if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
+            find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
+          end
+          find_text.swt_widget.selectAll
+          find_text.swt_widget.setFocus
+        }
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
         Clipboard.copy(project_dir.selected_child.path)
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'
@@ -1110,12 +1153,34 @@ module Glimmer
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'g'
         project_dir.selected_child.find_next
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'l'
-        line_number_text.swt_widget.selectAll
-        line_number_text.swt_widget.setFocus
+        unless @navigation_expand_item.swt_expand_item.get_expanded
+          @navigation_expand_item.swt_expand_item.set_expanded true
+          @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+          async_exec {
+            body_root.pack_same_size
+          }
+          async_exec {
+            line_number_text.swt_widget.selectAll
+            line_number_text.swt_widget.setFocus
+          }
+        else
+          line_number_text.swt_widget.selectAll
+          line_number_text.swt_widget.setFocus
+        end
       elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'r'
+        unless @file_lookup_expand_item.swt_expand_item.get_expanded
+          @file_lookup_expand_item.swt_expand_item.set_expanded true
+          @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_item_height if @file_lookup_expand_item_height
+          @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]
+        end
         filter_text.swt_widget.selectAll
         filter_text.swt_widget.setFocus
       elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 't'
+        unless @file_explorer_expand_item.swt_expand_item.get_expanded
+          @file_explorer_expand_item.swt_expand_item.set_expanded true
+          @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_item_height if @file_explorer_expand_item_height
+          @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]
+        end
         select_tree_item unless rename_in_progress
         file_tree.swt_widget.setFocus
       elsif key_event.keyCode == swt(:esc)

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -5,60 +5,43 @@ module Glimmer
 
       options :file, :project_dir
 
-      attr_reader :text_proxy, :text_widget
+      attr_reader :text_proxy
       
-      before_body {
-        @is_code_file = file.scratchpad? || file.path.end_with?('.rb')
-        @text_widget = @is_code_file ? 'code_text' : 'styled_text'
-      }
-
       after_body {
-        @text_widget = @text.swt_widget
-        @text_proxy = @text
+        load_content
       }
       
       body {
         composite {
-          grid_layout(2, false) 
-          # TODO troubleshoot why adding margin height 0 causes gladiator to start resizing window smaller than necessary upon launch of Gladiator
-#           {
-#             margin_height 0
-#           }
-          
+          grid_layout(2, false)
           layout_data :fill, :fill, true, true
           @line_numbers_text = styled_text(:multi, :border) {
             layout_data(:right, :fill, false, true)
-            
+            text ' '*4
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground :dark_blue
-            text bind(self, 'file.line_numbers_content')
-            top_pixel bind(self, 'file.top_pixel', read_only: true)
             top_margin 5
             right_margin 5
             bottom_margin 5
             left_margin 5
             editable false
             on_focus_gained {
-              @text&.swt_widget.setFocus
+              @text_proxy&.swt_widget.setFocus
             }
             on_key_pressed {
-              @text&.swt_widget.setFocus
+              @text_proxy&.swt_widget.setFocus
             }
             on_mouse_up {
-              @text&.swt_widget.setFocus
+              @text_proxy&.swt_widget.setFocus
             }
           }
           
-          @text = send(@text_widget) {
+          @text_proxy = send(text_widget_keyword) { |the_text|
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
-            text bind(self, 'file.content')
             focus true
-            selection_count bind(self, 'file.selection_count')
-            caret_position bind(self, 'file.caret_position')
-            top_pixel bind(self, 'file.top_pixel')
             top_margin 5
             right_margin 5
             bottom_margin 5
@@ -76,76 +59,8 @@ module Glimmer
               }
             }
             
-            on_focus_lost {
-              file&.write_dirty_content
-            }
-            on_verify_key { |key_event|
-              if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')
-                key_event.doit = !Command.redo(file)
-              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'r'
-                project_dir.selected_child.run
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
-                key_event.doit = !Command.undo(file)
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'a'
-                key_event.widget.selectAll
-              elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'a'
-                Command.do(file, :start_of_line)
-                key_event.doit = false
-              elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e'
-                Command.do(file, :end_of_line)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
-                Command.do(file, :comment_line!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
-                Command.do(file, :kill_line!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
-                Command.do(file, :duplicate_line!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
-                Command.do(file, :outdent!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
-                Command.do(file, :indent!)
-                key_event.doit = false
-              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
-                Command.do(file, :prefix_new_line!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
-                Command.do(file, :insert_new_line!)
-                key_event.doit = false
-              elsif key_event.keyCode == swt(:page_up)
-                file.page_up
-                key_event.doit = false
-              elsif key_event.keyCode == swt(:page_down)
-                file.page_down
-                key_event.doit = false
-              elsif key_event.keyCode == swt(:home)
-                file.home
-                key_event.doit = false
-              elsif key_event.keyCode == swt(:end)
-                file.end
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
-                Command.do(file, :move_up!)
-                key_event.doit = false
-              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
-                Command.do(file, :move_down!)
-                key_event.doit = false
-              end
-            }
-            on_verify_text { |verify_event|
-              # TODO convert these into File commands to support Undo/Redo
-              case verify_event.text
-              when "\n"
-                if file.selection_count.to_i == 0
-                  verify_event.text += file.current_line_indentation
-                end
-              when "\t"
-                Command.do(file, :indent!)
-                verify_event.doit = false
-              end
+            on_focus_gained {
+              load_content
             }
           }
         }
@@ -156,8 +71,114 @@ module Glimmer
       rescue => e
         nil
       end
-                                                                                                                                                                                                                                                                                                      
+           
+      def text_widget_keyword
+        is_code_file = file.scratchpad? || file.path.end_with?('.rb')
+        is_code_file ? 'code_text' : 'styled_text'
+      end
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
+      def text_widget
+        @text_proxy.swt_widget
+      end
+      
+      def load_content
+        if !@initialized && !Gladiator.startup
+          load_line_numbers_text_content
+          load_text_content
+          @initialized = true
+        end
+      end
+      
+      def load_line_numbers_text_content
+        @line_numbers_text.content {
+          text bind(self, 'file.line_numbers_content')
+          top_pixel bind(self, 'file.top_pixel', read_only: true)
+        }
+      end
+  
+      def load_text_content
+        @text_proxy.content {
+          text bind(self, 'file.content')
+          selection_count bind(self, 'file.selection_count')
+          caret_position bind(self, 'file.caret_position')
+          top_pixel bind(self, 'file.top_pixel')
+          on_focus_lost {
+            file&.write_dirty_content
+          }
+          on_verify_key { |key_event|
+            if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')
+              key_event.doit = !Command.redo(file)
+            elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'r'
+              project_dir.selected_child.run
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
+              key_event.doit = !Command.undo(file)
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'a'
+              key_event.widget.selectAll
+            elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'a'
+              Command.do(file, :start_of_line)
+              key_event.doit = false
+            elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e'
+              Command.do(file, :end_of_line)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
+              Command.do(file, :comment_line!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
+              Command.do(file, :kill_line!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
+              Command.do(file, :duplicate_line!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
+              Command.do(file, :outdent!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
+              Command.do(file, :indent!)
+              key_event.doit = false
+            elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
+              Command.do(file, :prefix_new_line!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+              Command.do(file, :insert_new_line!)
+              key_event.doit = false
+            elsif key_event.keyCode == swt(:page_up)
+              file.page_up
+              key_event.doit = false
+            elsif key_event.keyCode == swt(:page_down)
+              file.page_down
+              key_event.doit = false
+            elsif key_event.keyCode == swt(:home)
+              file.home
+              key_event.doit = false
+            elsif key_event.keyCode == swt(:end)
+              file.end
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
+              Command.do(file, :move_up!)
+              key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
+              Command.do(file, :move_down!)
+              key_event.doit = false
+            end
+          }
+          on_verify_text { |verify_event|
+            # TODO convert these into File commands to support Undo/Redo
+            case verify_event.text
+            when "\n"
+              if file.selection_count.to_i == 0
+                verify_event.text += file.current_line_indentation
+              end
+            when "\t"
+              Command.do(file, :indent!)
+              verify_event.doit = false
+            end
+          }
+        }
+      end
+      
     end
+    
   end
+  
 end
                                               

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement