glimmer-cs-gladiator 0.7.0 → 0.8.1

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,10 @@ 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'
+require 'views/glimmer/gladiator/gladiator_menu_bar'
+require 'views/glimmer/gladiator/progress_shell'
 
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
@@ -18,6 +43,7 @@ module Glimmer
     APP_ROOT = ::File.expand_path('../../../..', __FILE__)
     # TODO make sure COMMAND_KEY doesn't clash on Linux/Windows for CMD+CTRL shortcuts
     COMMAND_KEY = OS.mac? ? :command : :ctrl
+    CONTROL_KEY = OS.mac? ? :ctrl : :alt
     VERSION = ::File.read(::File.join(APP_ROOT, 'VERSION')).to_s.strip
     LICENSE = ::File.read(::File.join(APP_ROOT, 'LICENSE.txt')).to_s.strip
     ICON = ::File.expand_path(::File.join(APP_ROOT, 'images', 'glimmer-cs-gladiator-logo.png'))
@@ -57,7 +83,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, :tab_folder_sash_form, :side_bar_sash_form, :file_area_and_editor_area_sash_form, :file_explorer_expand_item, :file_explorer_expand_item, :file_lookup_expand_item, :file_explorer_expand_item, :file_lookup_expand_item_height, :file_explorer_expand_item_height
     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
@@ -72,6 +98,7 @@ module Glimmer
         project_dir.selected_child&.write_raw_dirty_content
       end
       Display.setAppName('Gladiator')
+      Display.setAppVersion(VERSION)
       # make sure the display events are only hooked once if multiple gladiators are created
       unless defined?(@@display)
         @@display = display {
@@ -79,12 +106,15 @@ module Glimmer
           on_about {
             display_about_dialog
           }
+          on_quit {
+            project_dir.selected_child&.write_dirty_content
+            display.swt_display.shells.each(&:close)
+          }
           on_swt_keydown { |key_event|
             focused_gladiator = display.focus_control.shell&.get_data('custom_shell')
             focused_gladiator.handle_display_shortcut(key_event) if !focused_gladiator.nil? && key_event.widget.shell == focused_gladiator&.swt_widget
           }
           on_swt_Close {
-            save_config
             project_dir.selected_child&.write_dirty_content
           }
         }
@@ -102,73 +132,80 @@ 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
           if Gladiator.drag && !@tab_folder2
             self.tab_folder1 = current_tab_folder
             @tab_folder_sash_form.content {
-              self.current_tab_folder = self.tab_folder2 = tab_folder {}
+              self.current_tab_folder = self.tab_folder2 = text_editor_group_tab_folder
               @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
             }
             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)
             @current_tab_item = found_tab_item.getData('proxy')
             @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 {
-              @current_tab_item = tab_item { |the_tab_item|
-                text selected_file.name
-                fill_layout(:horizontal) {
-                 margin_width 0
-                 margin_height 0
-                }
-                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
-                      self.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')
+          else
+            begin
+              @current_tab_folder.content {
+                @current_tab_item = tab_item { |the_tab_item|
+                  text selected_file.name
+                  fill_layout(:horizontal) {
+                   margin_width 0
+                   margin_height 0
+                  }
+                  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) {
+                      layout_data :fill, :fill, true, true
+                    }
+                    @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
+                        self.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
+                    self.current_tab_folder = @current_tab_item.swt_widget.getParent.getData('proxy')
+                    @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 = selected_file
+                    @current_text_editor&.load_content
+                    @current_text_editor&.text_widget&.setFocus
+                    save_config unless selected_file.nil?
+                  }
+                  on_widget_disposed {
+                    project_dir.selected_child&.write_dirty_content
+                    tab_item_file = the_tab_item.swt_tab_item.get_data('file')
+                    tab_item_file.close unless [@tab_folder1, @tab_folder2].compact.map(&:items).flatten(1).detect {|ti| ti.get_data('file') == tab_item_file}
+                  }
                 }
-                
-                on_swt_show {
-                  @current_tab_item = the_tab_item
-                  @current_text_editor = the_text_editor
-                  self.current_tab_folder = @current_tab_item.swt_widget.getParent.getData('proxy')
-                  @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 = selected_file
-                  @current_text_editor&.text_widget&.setFocus
-                }
-                on_widget_disposed {
-                  project_dir.selected_child&.write_dirty_content
-                  tab_item_file = the_tab_item.swt_tab_item.get_data('file')
-                  tab_item_file.close unless [@tab_folder1, @tab_folder2].compact.map(&:items).flatten(1).detect {|ti| ti.get_data('file') == tab_item_file}
-                }
+                @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('proxy', @current_tab_item)
               }
-              @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('proxy', @current_tab_item)
-            }
-            @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-            body_root.pack_same_size
+              @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
+              body_root.pack_same_size
+            rescue => e
+              puts e.full_message
+            end
           end
           @current_text_editor&.text_widget&.setFocus
         end
@@ -180,8 +217,14 @@ module Glimmer
       end
       observe(self, 'maximized_editor') do
         @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
+        if !maximized_editor?
+          expand_navigation_expand_bar_height
+        else
+          collapse_navigation_expand_bar_height
+        end
         @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
         body_root.pack_same_size
+        async_exec { body_root.pack_same_size }
       end
       observe(project_dir, 'selected_child') do
         save_config
@@ -199,640 +242,449 @@ module Glimmer
     ## Top-most widget must be a shell or another custom shell
     #
     body {
-      shell {
-        text "Gladiator - #{::File.expand_path(project_dir.path)}"
-        minimum_size 520, 250
-        size 1440, 900
-        image ICON
-        
-        on_swt_show {
-          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
-          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]
-          @loaded_config = true
+      if !::Dir.glob(::File.join(project_dir_path, 'glimmer-cs-gladiator.jar')).empty?
+        shell(:no_trim, :no_background) {
+          gladiator_menu_bar(gladiator: self, editing: false)
+          
+          on_swt_show {
+            open_project
+          }
         }
-        
-        on_shell_closed {
-          save_config
-          project_dir.selected_child&.write_dirty_content
-          if @tab_folder2
+      else
+        shell {
+          text "Gladiator - #{::File.expand_path(project_dir.path)}"
+          minimum_size 590, 250
+          image ICON
+          
+          on_swt_show {
+            unless @shell_visible
+              if @config[:shell_width] && @config[:shell_height]
+                swt_widget.set_size(@config[:shell_width], @config[:shell_height])
+              else
+                swt_widget.set_size(display.bounds.width, display.bounds.height)
+              end
+            end
+            swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]
+            @loaded_config = true
+            @shell_visible = true
+          }
+          
+          on_shell_closed {
+            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
-            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
-        }
-        on_control_resized {
-          save_config
-        }
-        on_control_moved {
-          save_config
-        }
-        on_shell_deactivated {
-          project_dir.selected_child&.write_dirty_content
-        }
-
-        if OS.mac?
-          display.swt_display.system_menu.items.find {|mi| mi.id == swt(:id_quit)}.add_selection_listener {
-            save_config
-            project_dir.selected_child&.write_dirty_content
-            display.swt_display.shells.each(&:close)
+            body_root.close unless current_tab_folder.swt_widget.getItems.empty?
           }
-        end
-
-        menu_bar {
-          menu {
-            text '&File'
-
-            menu_item {
-              text 'New &Scratchpad'
-              accelerator COMMAND_KEY, :shift, :s
-              on_widget_selected {
-                project_dir.selected_child_path = ''
-              }
-            }
-            menu_item {
-              text 'Open &Project...'
-              accelerator COMMAND_KEY, :o
-              on_widget_selected {
-                open_project
-              }
-            }
-            menu_item(:separator)
-            menu_item {
-              text '&Quit Project'
-              accelerator COMMAND_KEY, :alt, :q
-              on_widget_selected {
-                save_config
-                project_dir.selected_child&.write_dirty_content
-                body_root.close
-              }
-            }
+          on_widget_disposed {
+            project_dir.selected_child&.write_dirty_content
           }
-          menu {
-            text '&View'
-            menu {
-              text '&Split Pane'
-              menu { |menu_proxy|
-                text '&Orientation'
-                menu_item(:radio) {
-                  text '&Horizontal'
-                  selection bind(self, :split_orientation,
-                                        on_read: ->(o) { split_pane? && o == swt(:horizontal) },
-                                        on_write: ->(b) { b.nil? ? nil : (b ? swt(:horizontal) : swt(:vertical)) })
-                }
-                menu_item(:radio) {
-                  text '&Vertical'
-                  selection bind(self, :split_orientation,
-                                        on_read: ->(o) { split_pane? && o == swt(:vertical) },
-                                        on_write: ->(b) { b.nil? ? nil : (b ? swt(:vertical) : swt(:horizontal)) })
-                }
-              }
-              menu_item(:check) {
-                text '&Maximize Pane'
-                enabled bind(self, :tab_folder2)
-                accelerator COMMAND_KEY, :shift, :m
-                selection bind(self, :maximized_pane)
-              }
-              menu_item {
-                text 'Reset &Panes'
-                enabled bind(self, :tab_folder2)
-                accelerator COMMAND_KEY, :shift, :p
-                on_widget_selected {
-                  if tab_folder2
-                    self.maximized_pane = false
-                    @tab_folder_sash_form.weights = [1, 1]
-                  end
-                }
-              }
-              menu_item {
-                text '&Unsplit'
-                enabled bind(self, :tab_folder2)
-                accelerator COMMAND_KEY, :shift, :u
-                on_widget_selected {
-                  if tab_folder2
-                    self.maximized_pane = false
-                    navigate_to_next_tab_folder if current_tab_folder != tab_folder2
-                    close_all_tabs(tab_folder2)
-                    self.split_orientation = nil
-                    body_root.pack_same_size
-                  end
-                }
-              }
-            }
-            menu_item(:check) {
-              text '&Maximize Editor'
-              accelerator COMMAND_KEY, :ctrl, :m
-              selection bind(self, :maximized_editor)
-            }
-            menu_item {
-              text '&Reset All'
-              accelerator COMMAND_KEY, :ctrl, :r
-              on_widget_selected {
-                self.maximized_editor = false
-                @file_area_and_editor_area_sash_form.weights = [1, 5]
-              }
-            }
+          on_control_resized {
+            save_config
           }
-          menu {
-            text '&Run'
-#             menu_item {
-#               text 'Launch Glimmer &App'
-#               on_widget_selected {
-#                 parent_path = project_dir.path
-##                 current_directory_name = ::File.basename(parent_path)
-##                 assumed_shell_script = ::File.join(parent_path, 'bin', current_directory_name)
-##                 assumed_shell_script = ::Dir.glob(::File.join(parent_path, 'bin', '*')).detect {|f| ::File.file?(f) && !::File.read(f).include?('#!/usr/bin/env')} if !::File.exist?(assumed_shell_script)
-##                 load assumed_shell_script
-#                 FileUtils.cd(parent_path) do
-#                   system 'glimmer run'
-#                 end
-#               }
-#             }
-            menu_item {
-              text '&Ruby'
-              accelerator COMMAND_KEY, :shift, :r
-              on_widget_selected {
-                begin
-                  project_dir.selected_child.run
-                rescue Exception => e
-                  dialog {
-                    text 'Run - Ruby - Error Encountered!'
-                    label {
-                      text e.full_message
-                    }
-                  }.open
-                end
-              }
-            }
+          on_control_moved {
+            save_config
           }
-          menu {
-            text '&Help'
-            menu_item {
-              text '&About'
-              accelerator COMMAND_KEY, :shift, :a
-              on_widget_selected {
-                display_about_dialog
-              }
-            }
+          on_shell_deactivated {
+            project_dir.selected_child&.write_dirty_content
           }
-        }
-        
-        @file_area_and_editor_area_sash_form = sash_form(:horizontal) {
-          weights 1, 5
-
-          composite {
-            grid_layout(1, false) {
-              margin_width 0
-              margin_height 0
-            }
-            
-            @side_bar_sash_form = sash_form(:vertical) {
-              layout_data(:fill, :fill, true, true)
-              sash_width 4
-              
-              resize_expand_items = lambda { |event=nil|
-                @file_lookup_expand_item&.swt_expand_item&.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
-                @file_explorer_expand_item&.swt_expand_item&.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
+  
+          # Menu Bar
+          gladiator_menu_bar(gladiator: self, editing: true)
+          
+          @file_area_and_editor_area_sash_form = sash_form(:horizontal) {
+            weights 1, 5
+  
+            composite {
+              grid_layout(1, false) {
+                margin_width 0
+                margin_height 0
               }
               
-              @file_lookup_expand_bar = expand_bar {
-                layout_data :fill, :fill, true, true
-                font height: 17, style: :bold
-                foreground @default_foreground
+              @side_bar_sash_form = sash_form(:vertical) {
+                layout_data(:fill, :fill, true, true)
+                sash_width 4
                 
-                on_swt_show {
-                  @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
+                resize_expand_items = lambda { |event=nil|
+                  @file_lookup_expand_item&.swt_expand_item&.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
+                  @file_explorer_expand_item&.swt_expand_item&.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
                 }
                 
-                on_swt_Resize(&resize_expand_items)
-                
-                @file_lookup_expand_item = expand_item {
-                  grid_layout {
-                    margin_width 0
-                    margin_height 0
+                @file_lookup_expand_bar = expand_bar {
+                  layout_data :fill, :fill, true, true
+                  font height: 17, style: :bold
+                  foreground @default_foreground
+                  
+                  on_swt_show {
+                    @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
                   }
-                  text 'File Lookup'
-                  height display.bounds.height
                   
-                  @filter_text = text {
-                    layout_data :fill, :center, true, false
-                    text bind(project_dir, 'filter')
-                    on_key_pressed { |key_event|
-                      if key_event.keyCode == swt(:tab) ||
-                          key_event.keyCode == swt(:cr) ||
-                          key_event.keyCode == swt(:arrow_up) ||
-                          key_event.keyCode == swt(:arrow_down)
-                        @file_lookup_list.swt_widget.select(0) if @file_lookup_list.swt_widget.getSelectionIndex() == -1
-                        @file_lookup_list.swt_widget.setFocus
-                      end
+                  on_swt_Resize(&resize_expand_items)
+                  
+                  @file_lookup_expand_item = expand_item {
+                    grid_layout {
+                      margin_width 0
+                      margin_height 0
+                    }
+                    text 'File Lookup'
+                    height display.bounds.height
+                    
+                    @filter_text = text {
+                      layout_data :fill, :center, true, false
+                      text bind(project_dir, 'filter')
+                      on_key_pressed { |key_event|
+                        if key_event.keyCode == swt(:tab) ||
+                            key_event.keyCode == swt(:cr) ||
+                            key_event.keyCode == swt(:arrow_up) ||
+                            key_event.keyCode == swt(:arrow_down)
+                          @file_lookup_list.swt_widget.select(0) if @file_lookup_list.swt_widget.getSelectionIndex() == -1
+                          @file_lookup_list.swt_widget.setFocus
+                        end
+                      }
                     }
+                  
+                    @file_lookup_list = file_lookup_list(gladiator: self, foreground_color: @default_foreground) {
+                      layout_data :fill, :fill, true, true
+                    }
+                  }
+                  
+                  on_item_collapsed { |event|
+                    if @file_explorer_expand_item.swt_expand_item.get_expanded
+                      @file_lookup_expand_item_height = @file_lookup_expand_item.swt_expand_item.height
+                      @file_lookup_expand_item.swt_expand_item.height = 0
+                      @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
+                      @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
+                      @side_bar_sash_form.weights = [@file_lookup_expand_item.swt_expand_item.header_height, @file_lookup_expand_bar_height + @file_explorer_expand_bar_height - @file_lookup_expand_item.swt_expand_item.header_height]
+                    end
                   }
                 
-                  @file_lookup_list = list(:border, :h_scroll, :v_scroll) {
-                    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
+                  on_item_expanded {
+                    @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]
+                  }
+                  
+                }
+                
+                @file_explorer_expand_bar = expand_bar {
+                  layout_data :fill, :fill, true, true
+                  font height: 17, style: :bold
+                  foreground @default_foreground
+                  
+                  on_swt_show {
+                    @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
+                  }
+                  
+                  on_swt_Resize(&resize_expand_items)
+                              
+                  @file_explorer_expand_item = expand_item {
+                    grid_layout {
+                      margin_width 0
+                      margin_height 0
                     }
-                    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
-                      }
+                    text 'File Explorer'
+                    height display.bounds.height
+                    
+                    @file_explorer_tree = file_explorer_tree(gladiator: self, foreground_color: @default_foreground) {
+                      layout_data :fill, :fill, true, true
                     }
                   }
-                }
+                  
+                  on_item_collapsed { |event|
+                    if @file_lookup_expand_item.swt_expand_item.get_expanded
+                      @file_explorer_expand_item_height = @file_explorer_expand_item.swt_expand_item.height
+                      @file_explorer_expand_item.swt_expand_item.height = 0
+                      @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
+                      @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
+                      @side_bar_sash_form.weights = [@file_explorer_expand_bar_height + @file_explorer_expand_bar_height - @file_explorer_expand_item.swt_expand_item.header_height, @file_explorer_expand_item.swt_expand_item.header_height]
+                    end
+                  }
                 
-                on_item_collapsed { |event|
-                  if @file_explorer_expand_item.swt_expand_item.get_expanded
-                    @file_lookup_expand_item_height = @file_lookup_expand_item.swt_expand_item.height
-                    @file_lookup_expand_item.swt_expand_item.height = 0
-                    @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
-                    @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
-                    @side_bar_sash_form.weights = [@file_lookup_expand_item.swt_expand_item.header_height, @file_lookup_expand_bar_height + @file_explorer_expand_bar_height - @file_lookup_expand_item.swt_expand_item.header_height]
-                  end
-                }
-              
-                on_item_expanded {
-                  @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]
+                  on_item_expanded {
+                    @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]
+                  }
+                  
                 }
-                
+    
+              }
+      
+            }
+            
+            @editor_area_composite = composite {
+              grid_layout(1, false) {
+                margin_width 0
+                margin_height 0
               }
               
-              @file_explorer_expand_bar = expand_bar {
-                layout_data :fill, :fill, true, true
+              @navigation_expand_bar = expand_bar {
+                layout_data(:fill, :top, true, false) {
+                  minimum_width 480
+                }
                 font height: 17, style: :bold
                 foreground @default_foreground
                 
-                on_swt_show {
-                  @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
-                }
-                
-                on_swt_Resize(&resize_expand_items)
-                            
-                @file_explorer_expand_item = expand_item {
-                  grid_layout {
-                    margin_width 0
-                    margin_height 0
+                @navigation_expand_item = expand_item {
+                  text 'Navigation'
+                  height 115
+    
+                  grid_layout(5, false) {
+                    margin_right 5
                   }
-                  text 'File Explorer'
-                  height display.bounds.height
                   
-                  @file_tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-                    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)
+                  stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
+      
+                  # row 1
+      
+                  label {
+                    layout_data(:left, :center, false, false)
+                    text 'File:'
                     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
-                      }
+                  }
+      
+                  @file_path_label = styled_text(:none) {
+                    layout_data(:fill, :center, true, false) {
+                      horizontal_span 2
                     }
-                    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
-                        }
-                      }
+                    background color(:widget_background)
+                    foreground @default_foreground
+                    editable false
+                    caret nil
+                    text bind(project_dir, 'selected_child.path')
+                    on_mouse_up {
+                      @file_path_label.swt_widget.selectAll
                     }
-                    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_focus_lost {
+                      @file_path_label.swt_widget.setSelection(0, 0)
                     }
-                    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
+                  }
+                              
+                  label {
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Caret Position:'
+                    foreground @default_foreground
+                  }
+                  label(:right) {
+                    layout_data(:fill, :center, true, false) {
+                      minimum_width 50
+                    }
+                    text bind(project_dir, 'selected_child.caret_position')
+                    foreground @default_foreground
+                    font stat_font
+                  }
+                  
+                  # row 2
+      
+                  label {
+                    layout_data(:left, :center, false, false)
+                    text 'Line:'
+                    foreground @default_foreground
+                  }
+                  @line_number_text = text {
+                    layout_data(:fill, :center, true, false) {
+                      width_hint 400
+                      minimum_width 100
                     }
+                    text bind(project_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
+                    foreground @default_foreground
+                    font stat_font
                     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)
+                      if key_event.keyCode == swt(:cr)
                         @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
+                    on_verify_text { |event|
+                      event.doit = !event.text.match(/^\d*$/).to_a.empty?
                     }
                   }
-                }
-                
-                on_item_collapsed { |event|
-                  if @file_lookup_expand_item.swt_expand_item.get_expanded
-                    @file_explorer_expand_item_height = @file_explorer_expand_item.swt_expand_item.height
-                    @file_explorer_expand_item.swt_expand_item.height = 0
-                    @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
-                    @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
-                    @side_bar_sash_form.weights = [@file_explorer_expand_bar_height + @file_explorer_expand_bar_height - @file_explorer_expand_item.swt_expand_item.header_height, @file_explorer_expand_item.swt_expand_item.header_height]
-                  end
-                }
-              
-                on_item_expanded {
-                  @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]
-                }
-                
-              }
-  
-            }
-  
-            # 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 {
-            grid_layout(1, false) {
-              margin_width 0
-              margin_height 0
-            }
-            
-            @navigation_expand_bar = expand_bar {
-              layout_data :fill, :top, true, false
-              font height: 17, style: :bold
-              foreground @default_foreground
-              
-              @navigation_expand_item = expand_item {
-                text 'Navigation'
-                height 115
-  
-                grid_layout(5, false) {
-                  margin_right 5
-                }
-                              
-                stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
-    
-                # row 1
-    
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'File:'
-                  foreground @default_foreground
-                }
-    
-                @file_path_label = styled_text(:none) {
-                  layout_data(:fill, :center, true, false) {
-                    horizontal_span 2
-                  }
-                  background color(:widget_background)
-                  foreground @default_foreground
-                  editable false
-                  caret nil
-                  text bind(project_dir, 'selected_child.path')
-                  on_mouse_up {
-                    @file_path_label.swt_widget.selectAll
+                  label # filler
+      
+                  label {
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Line Position:'
+                    foreground @default_foreground
                   }
-                  on_focus_lost {
-                    @file_path_label.swt_widget.setSelection(0, 0)
+                  label(:right) {
+                    layout_data(:fill, :center, true, false) {
+                      minimum_width 50
+                    }
+                    text bind(project_dir, 'selected_child.line_position')
+                    foreground @default_foreground
+                    font stat_font
                   }
-                }
-                            
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Caret Position:'
-                  foreground @default_foreground
-                }
-                label(:right) {
-                  layout_data(:fill, :center, true, false)
-                  text bind(project_dir, 'selected_child.caret_position')
-                  foreground @default_foreground
-                  font stat_font
-                }
-                
-                # row 2
-    
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Line:'
-                  foreground @default_foreground
-                }
-                @line_number_text = text {
-                  layout_data(:fill, :center, true, false) {
-                    minimum_width 400
+      
+                  # row 3
+      
+                  label {
+                    layout_data(:left, :center, false, false)
+                    text 'Find:'
+                    foreground @default_foreground
                   }
-                  text bind(project_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
-                  foreground @default_foreground
-                  font stat_font
-                  on_key_pressed { |key_event|
-                    if key_event.keyCode == swt(:cr)
-                      @current_text_editor&.text_widget&.setFocus
-                    end
+                  @find_text = text {
+                    layout_data(:fill, :center, true, false) {
+                      width_hint 400
+                      minimum_width 100
+                    }
+                    text bind(project_dir, 'selected_child.find_text')
+                    foreground @default_foreground
+                    font stat_font
+                    on_key_pressed { |key_event|
+                      if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                        project_dir.selected_child.case_sensitive = !project_dir.selected_child.case_sensitive
+                        project_dir.selected_child&.find_next
+                      end
+                      if key_event.keyCode == swt(:cr)
+                        project_dir.selected_child&.find_next
+                      end
+                    }
                   }
-                  on_verify_text { |event|
-                    event.doit = !event.text.match(/^\d*$/).to_a.empty?
+                  composite {
+                    layout_data(:left, :center, true, false) {
+                      minimum_width 120
+                    }
+                    row_layout {
+                      margin_width 0
+                      margin_height 0
+                    }
+                    button(:check) {
+                      selection bind(project_dir, 'selected_child.case_sensitive')
+                      on_key_pressed { |key_event|
+                        if key_event.keyCode == swt(:cr)
+                          project_dir.selected_child&.find_next
+                        end
+                      }
+                    }
+                    label {
+                      text 'Case-sensitive'
+                      foreground @default_foreground
+                    }
                   }
-                }
-                label # filler
-    
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Line Position:'
-                  foreground @default_foreground
-                }
-                label(:right) {
-                  layout_data(:fill, :center, true, false)
-                  text bind(project_dir, 'selected_child.line_position')
-                  foreground @default_foreground
-                  font stat_font
-                }
-    
-                # row 3
-    
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Find:'
-                  foreground @default_foreground
-                }
-                @find_text = text {
-                  layout_data(:fill, :center, true, false) {
-                    minimum_width 400
+                  
+                  label {
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Selection Count:'
+                    foreground @default_foreground
                   }
-                  text bind(project_dir, 'selected_child.find_text')
-                  foreground @default_foreground
-                  font stat_font
-                  on_key_pressed { |key_event|
-                    if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
-                      project_dir.selected_child.case_sensitive = !project_dir.selected_child.case_sensitive
-                      project_dir.selected_child&.find_next
-                    end
-                    if key_event.keyCode == swt(:cr)
-                      project_dir.selected_child&.find_next
-                    end
+                  label(:right) {
+                    layout_data(:fill, :center, true, false) {
+                      minimum_width 50
+                    }
+                    text bind(project_dir, 'selected_child.selection_count')
+                    foreground @default_foreground
+                    font stat_font
                   }
-                }
-                composite {
-                  layout_data(:left, :center, true, false)
-                  row_layout {
-                    margin_width 0
-                    margin_height 0
+                  
+                  # row 4
+      
+                  label {
+                    layout_data(:left, :center, false, false)
+                    text 'Replace:'
+                    foreground @default_foreground
                   }
-                  button(:check) {
-                    selection bind(project_dir, 'selected_child.case_sensitive')
+                  @replace_text = text {
+                    layout_data(:fill, :center, true, false) {
+                      width_hint 400
+                      minimum_width 100
+                    }
+                    text bind(project_dir, 'selected_child.replace_text')
+                    foreground @default_foreground
+                    font stat_font
+                    on_focus_gained {
+                      project_dir.selected_child&.ensure_find_next
+                    }
                     on_key_pressed { |key_event|
                       if key_event.keyCode == swt(:cr)
-                        project_dir.selected_child&.find_next
+                        if project_dir.selected_child
+                          Command.do(project_dir.selected_child, :replace_next!)
+                        end
                       end
                     }
                   }
+                  label # filler
                   label {
-                    text 'Case-sensitive'
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Top Pixel:'
                     foreground @default_foreground
                   }
-                }
-                
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Selection Count:'
-                  foreground @default_foreground
-                }
-                label(:right) {
-                  layout_data(:fill, :center, true, false)
-                  text bind(project_dir, 'selected_child.selection_count')
-                  foreground @default_foreground
-                  font stat_font
-                }
-                
-                # row 4
-    
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Replace:'
-                  foreground @default_foreground
-                }
-                @replace_text = text {
-                  layout_data(:fill, :center, true, false) {
-                    minimum_width 400
-                  }
-                  text bind(project_dir, 'selected_child.replace_text')
-                  foreground @default_foreground
-                  font stat_font
-                  on_focus_gained {
-                    project_dir.selected_child&.ensure_find_next
-                  }
-                  on_key_pressed { |key_event|
-                    if key_event.keyCode == swt(:cr)
-                      if project_dir.selected_child
-                        Command.do(project_dir.selected_child, :replace_next!)
-                      end
-                    end
+                  label(:right) {
+                    layout_data(:fill, :center, true, false) {
+                      minimum_width 50
+                    }
+                    text bind(project_dir, 'selected_child.top_pixel')
+                    foreground @default_foreground
+                    font stat_font
                   }
                 }
-                label # filler
-                label {
-                  layout_data(:left, :center, false, false)
-                  text 'Top Pixel:'
-                  foreground @default_foreground
+                
+                on_item_collapsed {
+                  collapse_navigation_expand_bar_height
                 }
-                label(:right) {
-                  layout_data(:fill, :center, true, false)
-                  text bind(project_dir, 'selected_child.top_pixel')
-                  foreground @default_foreground
-                  font stat_font
+              
+                on_item_expanded {
+                  expand_navigation_expand_bar_height
                 }
-              }
               
-              on_item_collapsed {
-                collapse_navigation_expand_bar_height
               }
-            
-              on_item_expanded {
-                expand_navigation_expand_bar
-              }
-            
-            }
-            
-            @tab_folder_sash_form = sash_form {
-              layout_data(:fill, :fill, true, true) {
-                width_hint 768
-                height_hint 576
-                minimum_width 768
-                minimum_height 576
-              }
-              orientation bind(self, :split_orientation) {|value| async_exec { body_root.pack_same_size}; value}
-              self.current_tab_folder = self.tab_folder1 = tab_folder {
-                drag_source(DND::DROP_COPY) {
-                  transfer [TextTransfer.getInstance].to_java(Transfer)
-                  event_data = nil
-                  on_drag_start {|event|
-                    Gladiator.drag = true
-                    tab_folder = event.widget.getControl
-                    tab_item = tab_folder.getItem(Point.new(event.x, event.y))
-                    event_data = tab_item.getData('file_path')
-                  }
-                  on_drag_set_data { |event|
-                    event.data = event_data
-                  }
+              
+              @tab_folder_sash_form = sash_form {
+                layout_data(:fill, :fill, true, true) {
+                  width_hint 768
+                  height_hint 576
+                  minimum_width 168
+                  minimum_height 176
                 }
+                orientation bind(self, :split_orientation) {|value| async_exec { body_root.pack_same_size}; value}
+                self.current_tab_folder = self.tab_folder1 = text_editor_group_tab_folder
+                @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder) # TODO see if we could get rid of this as it seems redundant
               }
-              @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
             }
+          } # end of sash form
+        }
+      end
+    }
+
+    def text_editor_group_tab_folder
+      tab_folder { |tab_folder_proxy|
+        on_widget_selected {
+          self.current_tab_folder = tab_folder_proxy
+          selected_file = @current_tab_item&.swt_tab_item&.getData('file')
+          if selected_file
+            project_dir.selected_child = selected_file
+            @current_tab_item = @current_tab_folder.swt_widget.getSelection.first.getData('proxy')
+            @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item) #TODO see if we can get rid of this as it seems redundant
+            @current_text_editor = @current_tab_item.swt_tab_item.getData('text_editor')
+            @current_text_editor&.load_content
+            @current_text_editor&.text_widget&.setFocus
+          end
+        }
+        drag_source(DND::DROP_COPY) {
+          transfer [TextTransfer.getInstance].to_java(Transfer)
+          event_data = nil
+          on_drag_start {|event|
+            Gladiator.drag = true
+            tab_folder = event.widget.getControl
+            tab_item = tab_folder.getItem(Point.new(event.x, event.y))
+            event_data = tab_item.getData('file_path')
+          }
+          on_drag_set_data { |event|
+            event.data = event_data
           }
-        } # end of sash form
+        }
       }
-    }
+    end
     
     def load_config_ignore_paths
       # TODO eliminate duplication with load_config
@@ -857,22 +709,10 @@ module Glimmer
         open_file_paths1 = @config[:open_file_paths1] || @config[:open_file_paths]
         open_file_paths2 = @config[:open_file_paths2]
         self.split_orientation = (swt(@config[:split_orientation]) rescue swt(:horizontal)) if @config[:split_orientation]
-        if @progress_bar_shell.nil?
-          @progress_bar_shell = shell(body_root, :title) {
-            text 'Gladiator'
-            fill_layout(:vertical) {
-              margin_width 15
-              margin_height 15
-              spacing 5
-            }
-            label(:center) {
-              text "Opening Last Open Files"
-              font height: 20
-            }
-    #         @progress_bar = progress_bar(:horizontal, :indeterminate)
-          }
+        if @progress_shell.nil?
+          @progress_shell = progress_shell(gladiator: self, progress_text: 'Opening Last Open Files')
           async_exec {
-            @progress_bar_shell.open
+            @progress_shell.open
           }
         end
         open_file_paths1.to_a.each do |file_path|
@@ -914,8 +754,8 @@ module Glimmer
           }
           async_exec {
             Gladiator.drag = false
-            @progress_bar_shell&.close
-            @progress_bar_shell = nil
+            @progress_shell&.close
+            @progress_shell = nil
             @loaded_config = true
           }
         }
@@ -933,16 +773,16 @@ module Glimmer
     end
 
     def save_config
-      return if !@loaded_config || body_root.disposed?
+      return if !@loaded_config || body_root&.disposed?
       child = project_dir.selected_child
       return if child.nil?
       tab_folder1 = @tab_folder1 || @current_tab_folder
       tab_folder2 = @tab_folder2
-      open_file_paths1 = tab_folder1&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
-      open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
+      open_file_paths1 = tab_folder1&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}.reject {|path| path.to_s.strip.empty?}
+      open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}.reject {|path| path.to_s.strip.empty?}
       split_orientation_value = split_orientation == swt(:horizontal) ? 'horizontal' : (split_orientation == swt(:vertical) ? 'vertical' : nil)
       @config = {
-        selected_child_path: child.path,
+        selected_child_path: child.nil? ? open_file_paths1&.first&.path : child.path,
         split_orientation: split_orientation_value,
         caret_position: child.caret_position,
         top_pixel: child.top_pixel,
@@ -1003,7 +843,7 @@ module Glimmer
       end
     end
     
-    def close_tab_folder(closing_tab_folder = nil)
+    def close_tab_folder(closing_tab_folder = nil, single_tab: false)
       closing_tab_folder ||= current_tab_folder
       if @tab_folder2 && !selected_tab_item
         if closing_tab_folder == @tab_folder2
@@ -1021,7 +861,7 @@ module Glimmer
         project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
         @current_text_editor&.text_widget&.setFocus
         async_exec { @current_text_editor&.text_widget&.setFocus }
-      else
+      elsif !single_tab
         self.current_tab_item = self.current_text_editor = project_dir.selected_child = nil
       end
     end
@@ -1042,136 +882,13 @@ module Glimmer
       @navigation_expand_item_height = @navigation_expand_item.swt_expand_item.height if @navigation_expand_item.swt_expand_item.height > 0
       @navigation_expand_item.swt_expand_item.height = 0
       body_root.pack_same_size
-      async_exec {
-        body_root.pack_same_size
-      }
+      async_exec { body_root.pack_same_size }
     end
 
     def expand_navigation_expand_bar_height
-      @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+      @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height || 140
       body_root.pack_same_size
-      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
-        }
-      )
+      async_exec { body_root.pack_same_size }
     end
 
     def extract_char(event)
@@ -1183,27 +900,15 @@ 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) {
-          margin_width 15
-          margin_height 15
-          spacing 5
-        }
-        label(:center) {
-          text "Opening Project: #{::File.basename(selected_directory)}"
-          font height: 20
-        }
-#         @progress_bar = progress_bar(:horizontal, :indeterminate)
-      }
+      @progress_shell = progress_shell(gladiator: self, progress_text: "Opening Project: #{::File.basename(selected_directory)}")
       async_exec {
-        @progress_bar_shell.open
+        @progress_shell.open
       }
       async_exec {
         gladiator(project_dir_path: selected_directory) {
           on_swt_show {
-            @progress_bar_shell.close
-            @progress_bar_shell = nil
+            @progress_shell.close
+            @progress_shell = nil
           }
         }.open if selected_directory
       }
@@ -1228,36 +933,31 @@ module Glimmer
         label {
           layout_data :fill, :fill, true, true
           background :white
-          text "Gladiator v#{VERSION}\n\n#{LICENSE}\n\nGladiator icon made by Freepik from www.flaticon.com"
+          text "Gladiator v#{VERSION} (Beta)\n\n#{LICENSE}\n\nGladiator icon made by Freepik from www.flaticon.com"
         }
       }.open
     end
     
     def handle_display_shortcut(key_event)
       if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-        find_action = lambda do
-          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
-        end
-        if @navigation_expand_item.swt_expand_item.get_expanded
-          find_action.call
-        else
+        if !@navigation_expand_item.swt_expand_item.get_expanded
+          expand_navigation_expand_bar_height
           @navigation_expand_item.swt_expand_item.set_expanded true
-          async_exec {
-            body_root.pack_same_size
-            find_action.call
-          }
         end
+        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'
         project_dir.selected_child.find_previous
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'o'
         self.maximized_pane = false
+        old_split_orientation = self.split_orientation
         self.split_orientation = split_pane? && split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
+        @tab_folder_sash_form.weights = [1, 1] if old_split_orientation.nil?
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'w'
         close_all_tabs
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :alt) && extract_char(key_event) == 'w'
@@ -1269,25 +969,34 @@ module Glimmer
         if selected_tab_item
           project_dir.selected_child_path_history.delete(project_dir.selected_child.path)
           selected_tab_item.getData('proxy')&.dispose
-          close_tab_folder
+          close_tab_folder(single_tab: true)
+#           if self.current_tab_item.nil?
+#             filter_text.swt_widget.selectAll
+#             filter_text.swt_widget.setFocus
+#           else
+#             current_text_editor&.text_widget&.setFocus
+#           end
           if selected_tab_item.nil?
             self.current_tab_item = self.current_text_editor = project_dir.selected_child = nil
             filter_text.swt_widget.selectAll
             filter_text.swt_widget.setFocus
           else
             current_text_editor&.text_widget&.setFocus
+#             async_exec { current_text_editor&.text_widget&.setFocus }
           end
         end
-      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
+      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']' || Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :ctrl) && key_event.keyCode == swt(:page_down)
         current_tab_folder.swt_widget.setSelection((current_tab_folder.swt_widget.getSelectionIndex() + 1) % current_tab_folder.swt_widget.getItemCount) if current_tab_folder.swt_widget.getItemCount > 0
         current_text_editor&.text_widget&.setFocus
-      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == '['
+      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == '[' || Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :ctrl) && key_event.keyCode == swt(:page_up)
         current_tab_folder.swt_widget.setSelection((current_tab_folder.swt_widget.getSelectionIndex() - 1) % current_tab_folder.swt_widget.getItemCount) if current_tab_folder.swt_widget.getItemCount > 0
         current_text_editor&.text_widget&.setFocus
-      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :ctrl) && extract_char(key_event) == ']'
+      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, CONTROL_KEY) && extract_char(key_event) == ']'
         navigate_to_next_tab_folder
-      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :ctrl) && extract_char(key_event) == '['
+        key_event.doit = false
+      elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, CONTROL_KEY) && extract_char(key_event) == '['
         navigate_to_previous_tab_folder
+        key_event.doit = false
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '1'
         current_tab_folder.swt_widget.setSelection(0) if current_tab_folder.swt_widget.getItemCount >= 1
         current_text_editor&.text_widget&.setFocus
@@ -1348,8 +1057,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