glimmer-cs-gladiator 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a4c55757f8f11ff94253067439895f7e1c0a1a1ebb3aaaf6d9d1d068ea82eb
-  data.tar.gz: d09c688ba5042f0be4489347c6937780b5e06e815d8879499f30c73857a27969
+  metadata.gz: 55dd5d14035a4d76ce686365ba16ab6a49c8f1fcbef2298d171fdeea2b2777b8
+  data.tar.gz: 65e5240faa47773332187063daa9500441ecc2a8a6b117aee646f4bf47162588
 SHA512:
-  metadata.gz: 6b3d619fbf4ad18ce233d86bfa6fcd902b3865e0177fac7021392354f72a07f0c93c47e70cb066a0e21c4358592f13b2f24dd66123d15c66eb971f6e2941ce57
-  data.tar.gz: fa59fa6baab0ef8b35ff6864692739f98a6f515cc63a61320cb12c92141c810364570e880e923e657401e1c56a533d98abbcc89fb609ad02126a9da39ed05e5f
+  metadata.gz: 77ba3e5e51fc0b9a815ee753c1fbfe839714217a56259dd6a12b6646b08df28a33ecdf5c87dbe169e62fdfd4063d799378fcc7781c46623451ba2d6ac6055fbd
+  data.tar.gz: 20f95fcdaf04f39d4ce979e30846ab2442ac37d416830d63cc95413dd89942c426c36fbc98f2d6328f97e1717f08243cfa5dcb38cea79b0e89873315c4878f39

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.7.2
+
+- Fallback font ("Courier") for text editor when "Consolas" is not available
+- Refactor Gladiator Custom Shell to extract more Glimmer Custom Widgets from it like FileLookupList and FileExplorerTree
+- Upgrade to glimmer-dsl-swt v4.18.0.2
+
 ## 0.7.1
 
 - Update View -> Reset All to also reset the File Lookup/File Explorer Sash Width and the Navigation Bar (expanding it)

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.7.1 - [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.7.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)
 
@@ -150,7 +150,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.7.1'
+gem 'glimmer-cs-gladiator', '>= 0.7.2'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/glimmer-cs-gladiator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.7.1 ruby lib
+# stub: glimmer-cs-gladiator 0.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-01-15"
+  s.date = "2021-01-17"
   s.description = "Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development. It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator is also a personal tool for shaping an editor exactly the way I like. I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["gladiator".freeze]
@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
     "lib/models/glimmer/gladiator/dir.rb",
     "lib/models/glimmer/gladiator/file.rb",
     "lib/views/glimmer/gladiator.rb",
+    "lib/views/glimmer/gladiator/file_explorer_tree.rb",
+    "lib/views/glimmer/gladiator/file_lookup_list.rb",
     "lib/views/glimmer/gladiator/text_editor.rb"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer-cs-gladiator".freeze
@@ -44,14 +46,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.0", "< 5.0.0.0"])
+      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
       s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
       s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.0", "< 5.0.0.0"])
+      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
       s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
       s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
       s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
@@ -59,7 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.0", "< 5.0.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
     s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
     s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])

data/lib/views/glimmer/gladiator.rb

@@ -1,3 +1,24 @@
+# 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 'fileutils'
 require 'os'
 
@@ -6,6 +27,8 @@ require 'models/glimmer/gladiator/file'
 require 'models/glimmer/gladiator/command'
 
 require 'views/glimmer/gladiator/text_editor'
+require 'views/glimmer/gladiator/file_lookup_list'
+require 'views/glimmer/gladiator/file_explorer_tree'
 
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
@@ -57,7 +80,7 @@ module Glimmer
       pane_count && pane_count > 1
     end
     
-    attr_reader :find_text, :filter_text, :rename_in_progress, :line_number_text, :file_tree, :split_orientation
+    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation
     attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor, :tab_folder1, :tab_folder2, :maximized_pane, :maximized_editor
     alias maximized_pane? maximized_pane
     alias maximized_editor? maximized_editor
@@ -102,7 +125,7 @@ module Glimmer
     #
     after_body {
       observe(project_dir, 'children') do
-        select_tree_item unless @rename_in_progress || Gladiator.startup
+        @file_explorer_tree.select_tree_item unless Gladiator.startup
       end
       observe(project_dir, 'selected_child') do |selected_file|
         if selected_file
@@ -114,7 +137,7 @@ module Glimmer
             }
             body_root.pack_same_size
           end
-          select_tree_item unless @rename_in_progress || Gladiator.startup
+          @file_explorer_tree.select_tree_item unless Gladiator.startup
           found_tab_item = selected_tab_item
           if found_tab_item
             @current_tab_folder.swt_widget.setSelection(found_tab_item)
@@ -442,28 +465,8 @@ module Glimmer
                     }
                   }
                 
-                  @file_lookup_list = list(:border, :h_scroll, :v_scroll) {
+                  @file_lookup_list = file_lookup_list(gladiator: self, foreground_color: @default_foreground) {
                     layout_data :fill, :fill, true, true
-                    #visible bind(self, 'project_dir.filter') {|f| !!f}
-                    selection bind(project_dir, :filtered_path)
-                    foreground @default_foreground
-                    on_mouse_up {
-                      project_dir.selected_child_path = @file_lookup_list.swt_widget.getSelection.first
-                    }
-                    on_key_pressed { |key_event|
-                      if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                        project_dir.selected_child_path = @file_lookup_list.swt_widget.getSelection.first
-                        @current_text_editor&.text_widget&.setFocus
-                      end
-                    }
-                    drag_source(DND::DROP_COPY) {
-                      transfer [TextTransfer.getInstance].to_java(Transfer)
-                      on_drag_set_data { |event|
-                        Gladiator.drag = true
-                        list = event.widget.getControl
-                        event.data = list.getSelection.first
-                      }
-                    }
                   }
                 }
                 
@@ -503,84 +506,8 @@ module Glimmer
                   text 'File Explorer'
                   height display.bounds.height
                   
-                  @file_tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
+                  @file_explorer_tree = file_explorer_tree(gladiator: self, foreground_color: @default_foreground) {
                     layout_data :fill, :fill, true, true
-                    #visible bind(self, 'project_dir.filter') {|f| !f}
-                    items bind(self, :project_dir), tree_properties(children: :children, text: :name)
-                    foreground @default_foreground
-                    drag_source(DND::DROP_COPY) {
-                      transfer [TextTransfer.getInstance].to_java(Transfer)
-                      on_drag_set_data { |event|
-                        Gladiator.drag = true
-                        tree = event.widget.getControl
-                        tree_item = tree.getSelection.first
-                        event.data = tree_item.getData.path
-                      }
-                    }
-                    menu {
-                      @open_menu_item = menu_item {
-                        text 'Open'
-                        on_widget_selected {
-                          project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
-                        }
-                      }
-                      menu_item(:separator)
-                      menu_item {
-                        text 'Delete'
-                        on_widget_selected {
-                          tree_item = @file_tree.swt_widget.getSelection.first
-                          delete_tree_item(tree_item)
-                        }
-                      }
-                      menu_item {
-                        text 'Refresh'
-                        on_widget_selected {
-                          project_dir.refresh
-                        }
-                      }
-                      menu_item {
-                        text 'Rename'
-                        on_widget_selected {
-                          rename_selected_tree_item
-                        }
-                      }
-                      menu_item {
-                        text 'New Directory'
-                        on_widget_selected {
-                          add_new_directory_to_selected_tree_item
-                        }
-                      }
-                      menu_item {
-                        text 'New File'
-                        on_widget_selected {
-                          add_new_file_to_selected_tree_item
-                        }
-                      }
-                    }
-                    on_swt_menudetect { |event|
-                      path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
-                      @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
-                    }
-                    on_mouse_up {
-                      if Gladiator.drag_and_drop
-                        Gladiator.drag_and_drop = false
-                      else
-                        project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
-                        @current_text_editor&.text_widget&.setFocus
-                      end
-                    }
-                    on_key_pressed { |key_event|
-                      if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                        project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
-                        @current_text_editor&.text_widget&.setFocus
-                      end
-                    }
-                    on_paint_control {
-                      root_item = @file_tree.swt_widget.getItems.first
-                      if root_item && !root_item.getExpanded
-                        root_item.setExpanded(true)
-                      end
-                    }
                   }
                 }
                 
@@ -602,13 +529,7 @@ module Glimmer
               }
   
             }
-  
-            # TODO see if you could replace some of this with Glimmer DSL/API syntax
-            @file_tree_editor = TreeEditor.new(@file_tree.swt_widget);
-            @file_tree_editor.horizontalAlignment = swt(:left);
-            @file_tree_editor.grabHorizontal = true;
-            @file_tree_editor.minimumHeight = 20;
-  
+    
           }
           
           @editor_area_composite = composite {
@@ -1058,125 +979,6 @@ module Glimmer
       async_exec { body_root.pack_same_size }
     end
 
-    def extract_tree_item_path(tree_item)
-      return if tree_item.nil?
-      if tree_item.getParentItem
-        ::File.join(extract_tree_item_path(tree_item.getParentItem), tree_item.getText)
-      else
-        project_dir.path
-      end
-    end
-
-    def select_tree_item
-      return unless project_dir.selected_child&.name
-      tree_items_to_select = @file_tree.depth_first_search { |ti| ti.getData.path == project_dir.selected_child.path }
-      @file_tree.swt_widget.setSelection(tree_items_to_select)
-    end
-
-    def delete_tree_item(tree_item)
-      return if tree_item.nil?
-      file = tree_item.getData
-      parent_path = ::File.dirname(file.path)
-      if file.is_a?(Gladiator::Dir)
-        file_paths = file.all_children.select {|f| f.is_a?(Gladiator::File)}.map(&:path)
-        file.remove_all_observers
-      else
-        file_paths = [file.path]
-      end
-      file_paths.each do |file_path|
-        found_tab_item = find_tab_item(file_path)
-        if found_tab_item
-          project_dir.selected_child_path_history.delete(found_tab_item.getData('file_path'))
-          found_tab_item.getData('proxy')&.dispose
-        end
-      end
-      file.delete! # TODO consider supporting command undo/redo
-      project_dir.refresh(async: false)
-      parent_tree_item = @file_tree.depth_first_search {|ti| ti.getData.path == parent_path}.first
-      @file_tree.swt_widget.showItem(parent_tree_item)
-      parent_tree_item.setExpanded(true)
-    rescue => e
-      puts e.full_message
-    end
-
-    def add_new_directory_to_selected_tree_item
-      project_dir.pause_refresh
-      tree_item = @file_tree.swt_widget.getSelection.first
-      directory_path = extract_tree_item_path(tree_item)
-      return if directory_path.nil?
-      if !::Dir.exist?(directory_path)
-        tree_item = tree_item.getParentItem
-        directory_path = ::File.dirname(directory_path)
-      end
-      new_directory_path = ::File.expand_path(::File.join(directory_path, 'new_directory'))
-      FileUtils.mkdir_p(new_directory_path)
-      project_dir.refresh(async: false, force: true)
-      new_tree_item = @file_tree.depth_first_search {|ti| ti.getData.path == new_directory_path}.first
-      @file_tree.swt_widget.showItem(new_tree_item)
-      rename_tree_item(new_tree_item)
-    end
-
-    def add_new_file_to_selected_tree_item
-      project_dir.pause_refresh
-      tree_item = @file_tree.swt_widget.getSelection.first
-      directory_path = extract_tree_item_path(tree_item)
-      if !::Dir.exist?(directory_path)
-        tree_item = tree_item.getParentItem
-        directory_path = ::File.dirname(directory_path)
-      end
-      new_file_path = ::File.expand_path(::File.join(directory_path, 'new_file'))
-      FileUtils.touch(new_file_path)
-      # TODO look into refreshing only the parent directory to avoid slowdown
-      project_dir.refresh(async: false, force: true)
-      new_tree_item = @file_tree.depth_first_search {|ti| ti.getData.path == new_file_path}.first
-      @file_tree.swt_widget.showItem(new_tree_item)
-      rename_tree_item(new_tree_item, true)
-    end
-
-    def rename_selected_tree_item
-      project_dir.pause_refresh
-      tree_item = @file_tree.swt_widget.getSelection.first
-      rename_tree_item(tree_item)
-    end
-
-    def rename_tree_item(tree_item, new_file = false)
-      original_file = tree_item.getData
-      current_file = project_dir.selected_child_path == original_file.path
-      found_tab_item = find_tab_item(original_file.path)
-      found_text_editor = found_tab_item&.getData('text_editor')
-      @file_tree.edit_tree_item(
-        tree_item,
-        after_write: -> (edited_tree_item) {
-          file = edited_tree_item.getData
-          file_path = file.path
-          file.name
-          if ::File.file?(file_path)
-            if new_file
-              project_dir.selected_child_path = file_path
-            else
-              found_text_editor&.file = file
-              found_tab_item&.setData('file', file)
-              found_tab_item&.setData('file_path', file.path)
-              found_tab_item&.setText(file.name)
-              body_root.pack_same_size
-              if current_file
-                project_dir.selected_child_path = file_path
-              else
-                selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
-              end
-              async_exec {
-                @file_tree.swt_widget.showItem(edited_tree_item)
-              }
-            end
-          end
-          project_dir.resume_refresh
-        },
-        after_cancel: -> {
-          project_dir.resume_refresh
-        }
-      )
-    end
-
     def extract_char(event)
       event.keyCode.chr
     rescue => e
@@ -1360,8 +1162,8 @@ module Glimmer
           @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
+        @file_explorer_tree.select_tree_item
+        @file_explorer_tree.swt_widget.setFocus
       elsif key_event.keyCode == swt(:esc)
         if current_text_editor
           project_dir.selected_child_path = current_text_editor.file.path

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

@@ -0,0 +1,244 @@
+# 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.
+
+module Glimmer
+  class Gladiator
+    class FileExplorerTree
+      include Glimmer::UI::CustomWidget
+  
+      options :gladiator, :foreground_color
+      
+      body {
+        tree {
+          #visible bind(self, 'project_dir.filter') {|f| !f}
+          items bind(self, :project_dir), tree_properties(children: :children, text: :name)
+          foreground foreground_color
+          drag_source(:drop_copy) {
+            transfer :text
+            on_drag_set_data { |event|
+              Gladiator.drag = true
+              tree = event.widget.getControl
+              tree_item = tree.getSelection.first
+              event.data = tree_item.getData.path
+            }
+          }
+          
+          menu {
+            @open_menu_item = menu_item {
+              text 'Open'
+              on_widget_selected {
+                project_dir.selected_child_path = extract_tree_item_path(swt_widget.getSelection.first)
+              }
+            }
+            menu_item(:separator)
+            menu_item {
+              text 'Delete'
+              on_widget_selected {
+                tree_item = swt_widget.getSelection.first
+                delete_tree_item(tree_item)
+              }
+            }
+            menu_item {
+              text 'Refresh'
+              on_widget_selected {
+                project_dir.refresh
+              }
+            }
+            menu_item {
+              text 'Rename'
+              on_widget_selected {
+                rename_selected_tree_item
+              }
+            }
+            menu_item {
+              text 'New Directory'
+              on_widget_selected {
+                add_new_directory_to_selected_tree_item
+              }
+            }
+            menu_item {
+              text 'New File'
+              on_widget_selected {
+                add_new_file_to_selected_tree_item
+              }
+            }
+          }
+          
+          on_swt_menudetect { |event|
+            path = extract_tree_item_path(swt_widget.getSelection.first)
+            @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
+          }
+          on_mouse_up {
+            if Gladiator.drag_and_drop
+              Gladiator.drag_and_drop = false
+            else
+              project_dir.selected_child_path = extract_tree_item_path(swt_widget.getSelection&.first)
+              gladiator.current_text_editor&.text_widget&.setFocus
+            end
+          }
+          on_key_pressed { |key_event|
+            if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+              project_dir.selected_child_path = extract_tree_item_path(swt_widget.getSelection&.first)
+              gladiator.current_text_editor&.text_widget&.setFocus
+            end
+          }
+          on_paint_control {
+            root_item = swt_widget.getItems.first
+            if root_item && !root_item.getExpanded
+              root_item.setExpanded(true)
+            end
+          }
+          
+        }
+      }
+      
+      def project_dir
+        gladiator.project_dir
+      end
+      
+      def current_text_editor
+        gladiator.current_text_editor
+      end
+        
+      def extract_tree_item_path(tree_item)
+        return if tree_item.nil?
+        if tree_item.getParentItem
+          ::File.join(extract_tree_item_path(tree_item.getParentItem), tree_item.getText)
+        else
+          project_dir.path
+        end
+      end
+  
+      def select_tree_item
+        return unless project_dir.selected_child&.name
+        tree_items_to_select = body_root.depth_first_search { |ti| ti.getData.path == project_dir.selected_child.path }
+        swt_widget.setSelection(tree_items_to_select)
+      end
+  
+      def delete_tree_item(tree_item)
+        return if tree_item.nil?
+        file = tree_item.getData
+        parent_path = ::File.dirname(file.path)
+        if file.is_a?(Gladiator::Dir)
+          file_paths = file.all_children.select {|f| f.is_a?(Gladiator::File)}.map(&:path)
+          file.remove_all_observers
+        else
+          file_paths = [file.path]
+        end
+        file_paths.each do |file_path|
+          found_tab_item = gladiator.find_tab_item(file_path)
+          if found_tab_item
+            project_dir.selected_child_path_history.delete(found_tab_item.getData('file_path'))
+            found_tab_item.getData('proxy')&.dispose
+          end
+        end
+        file.delete! # TODO consider supporting command undo/redo
+        project_dir.refresh(async: false)
+        parent_tree_item = body_root.depth_first_search {|ti| ti.getData.path == parent_path}.first
+        swt_widget.showItem(parent_tree_item)
+        parent_tree_item.setExpanded(true)
+      rescue => e
+        puts e.full_message
+      end
+  
+      def add_new_directory_to_selected_tree_item
+        project_dir.pause_refresh
+        tree_item = swt_widget.getSelection.first
+        directory_path = extract_tree_item_path(tree_item)
+        return if directory_path.nil?
+        if !::Dir.exist?(directory_path)
+          tree_item = tree_item.getParentItem
+          directory_path = ::File.dirname(directory_path)
+        end
+        new_directory_path = ::File.expand_path(::File.join(directory_path, 'new_directory'))
+        FileUtils.mkdir_p(new_directory_path)
+        project_dir.refresh(async: false, force: true)
+        new_tree_item = body_root.depth_first_search {|ti| ti.getData.path == new_directory_path}.first
+        swt_widget.showItem(new_tree_item)
+        rename_tree_item(new_tree_item)
+      end
+  
+      def add_new_file_to_selected_tree_item
+        project_dir.pause_refresh
+        tree_item = swt_widget.getSelection.first
+        directory_path = extract_tree_item_path(tree_item)
+        if !::Dir.exist?(directory_path)
+          tree_item = tree_item.getParentItem
+          directory_path = ::File.dirname(directory_path)
+        end
+        new_file_path = ::File.expand_path(::File.join(directory_path, 'new_file'))
+        FileUtils.touch(new_file_path)
+        # TODO look into refreshing only the parent directory to avoid slowdown
+        project_dir.refresh(async: false, force: true)
+        new_tree_item = body_root.depth_first_search {|ti| ti.getData.path == new_file_path}.first
+        swt_widget.showItem(new_tree_item)
+        rename_tree_item(new_tree_item, true)
+      end
+  
+      def rename_selected_tree_item
+        project_dir.pause_refresh
+        tree_item = swt_widget.getSelection.first
+        rename_tree_item(tree_item)
+      end
+  
+      def rename_tree_item(tree_item, new_file = false)
+        original_file = tree_item.getData
+        current_file = project_dir.selected_child_path == original_file.path
+        found_tab_item = gladiator.find_tab_item(original_file.path)
+        found_text_editor = found_tab_item&.getData('text_editor')
+        body_root.edit_tree_item(
+          tree_item,
+          after_write: -> (edited_tree_item) {
+            file = edited_tree_item.getData
+            file_path = file.path
+            file.name
+            if ::File.file?(file_path)
+              if new_file
+                project_dir.selected_child_path = file_path
+              else
+                found_text_editor&.file = file
+                found_tab_item&.setData('file', file)
+                found_tab_item&.setData('file_path', file.path)
+                found_tab_item&.setText(file.name)
+                body_root.pack_same_size
+                if current_file
+                  project_dir.selected_child_path = file_path
+                else
+                  selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
+                end
+                async_exec {
+                  swt_widget.showItem(edited_tree_item)
+                }
+              end
+            end
+            project_dir.resume_refresh
+          },
+          after_cancel: -> {
+            project_dir.resume_refresh
+          }
+        )
+      end
+  
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,64 @@
+# 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.
+
+module Glimmer
+  class Gladiator
+    class FileLookupList
+      include Glimmer::UI::CustomWidget
+  
+      options :gladiator, :foreground_color
+  
+      body {
+        list(:border, :h_scroll, :v_scroll) {
+          selection bind(project_dir, :filtered_path)
+#           visible bind(project_dir, 'filter') {|f| pd swt_widget&.get_shell&.get_data('proxy'); swt_widget&.get_shell&.get_data('proxy')&.pack_same_size; !!f}
+          foreground foreground_color
+          on_mouse_up {
+            project_dir.selected_child_path = swt_widget.getSelection.first
+          }
+          on_key_pressed { |key_event|
+            if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+              project_dir.selected_child_path = swt_widget.getSelection.first
+              current_text_editor&.text_widget&.setFocus
+            end
+          }
+          drag_source(DND::DROP_COPY) {
+            transfer :text
+            on_drag_set_data { |event|
+              Gladiator.drag = true
+              list = event.widget.getControl
+              event.data = list.getSelection.first
+            }
+          }
+        }
+      }
+      
+      def project_dir
+        gladiator.project_dir
+      end
+      
+      def current_text_editor
+        gladiator.current_text_editor
+      end
+  
+    end
+  end
+end

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

@@ -1,3 +1,24 @@
+# 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.
+
 module Glimmer
   class Gladiator
     class TextEditor
@@ -7,6 +28,10 @@ module Glimmer
 
       attr_reader :text_proxy
       
+      before_body {
+        @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
+      }
+      
       after_body {
         load_content
       }
@@ -18,7 +43,7 @@ module Glimmer
           @line_numbers_text = styled_text(:multi, :border) {
             layout_data(:right, :fill, false, true)
             text ' '*4
-            font name: 'Consolas', height: OS.mac? ? 15 : 12
+            font name: @font_name, height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground :dark_blue
             top_margin 5
@@ -39,7 +64,7 @@ module Glimmer
           
           @text_proxy = send(text_widget_keyword) { |the_text|
             layout_data :fill, :fill, true, true
-            font name: 'Consolas', height: OS.mac? ? 15 : 12
+            font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             focus true
             top_margin 5

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.0
+        version: 4.18.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.0
+        version: 4.18.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -127,6 +127,8 @@ files:
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb
+- lib/views/glimmer/gladiator/file_explorer_tree.rb
+- lib/views/glimmer/gladiator/file_lookup_list.rb
 - lib/views/glimmer/gladiator/text_editor.rb
 homepage: http://github.com/AndyObtiva/glimmer-cs-gladiator
 licenses: