glimmer-cs-gladiator 0.5.2 → 0.6.2

data/lib/views/glimmer/gladiator.rb

@@ -22,6 +22,7 @@ module Glimmer
     class << self
       attr_accessor :drag_and_drop
       attr_accessor :drag
+      attr_accessor :startup
     end
     
     ## Add options like the following to configure CustomShell by outside consumers
@@ -35,8 +36,26 @@ module Glimmer
       @project_dir ||= Dir.new(project_dir_path)
     end
 
-    attr_reader :find_text, :tab_folder1, :tab_folder2, :filter_text, :rename_in_progress, :line_number_text, :file_tree
-    attr_accessor :split_orientation, :current_tab_item, :current_tab_folder, :current_text_editor
+    def split_orientation=(value)
+      @split_orientation = value
+      save_config
+      if @loaded_config && !split_pane?
+        Gladiator.drag = true
+        child_path = project_dir.selected_child_path
+        project_dir.selected_child = nil
+        project_dir.selected_child_path = child_path
+        Gladiator.drag = false
+      end
+      @split_orientation
+    end
+    
+    def split_pane?
+      pane_count = @tab_folder_sash_form&.children&.size
+      pane_count && pane_count > 1
+    end
+
+    attr_reader :find_text, :tab_folder1, :tab_folder2, :filter_text, :rename_in_progress, :line_number_text, :file_tree, :split_orientation
+    attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor
 
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
@@ -58,6 +77,7 @@ module Glimmer
         }
       end
 
+      @default_foreground = :dark_blue
       @split_orientation = swt(:horizontal)
       @config_file_path = ::File.join(project_dir.path, '.gladiator')
       @config = {}
@@ -69,7 +89,7 @@ module Glimmer
     #
     after_body {
       observe(project_dir, 'children') do
-        select_tree_item unless @rename_in_progress
+        select_tree_item unless @rename_in_progress || Gladiator.startup
       end
       observe(project_dir, 'selected_child') do |selected_file|
         if selected_file
@@ -80,31 +100,40 @@ module Glimmer
               @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
             }
           end
-          select_tree_item unless @rename_in_progress
+          select_tree_item unless @rename_in_progress || Gladiator.startup
           found_tab_item = selected_tab_item
           if found_tab_item
             @current_tab_folder.swt_widget.setSelection(found_tab_item)
             @current_tab_item = found_tab_item.getData('proxy')
-            @current_text_editor = found_tab_item.getData('text_editor')
+            @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
             @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
           elsif selected_file
             @current_tab_folder.content {
               @current_tab_item = tab_item { |the_tab_item|
                 text selected_file.name
-                fill_layout :horizontal
-                @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file)
-                @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                @current_text_editor.text_proxy.content {
-                  on_focus_gained {
-                    tab_folder = the_text_editor.swt_widget.getParent.getParent
-                    @current_tab_folder = tab_folder.getData('proxy')
-                    @current_tab_item = the_tab_item
-                    @current_text_editor = the_text_editor
-                    @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                    @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-                    project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
+                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
+                      @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
@@ -116,10 +145,12 @@ module Glimmer
                     @current_text_editor&.text_widget&.setFocus
                   }
                 }
+                on_widget_disposed {
+                  the_tab_item.swt_tab_item.get_data('file').close
+                }
               }
               @current_tab_item.swt_tab_item.setData('file_path', selected_file.path)
               @current_tab_item.swt_tab_item.setData('file', selected_file)
-              @current_tab_item.swt_tab_item.setData('text_editor', @current_text_editor)
               @current_tab_item.swt_tab_item.setData('proxy', @current_tab_item)
             }
             @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
@@ -145,17 +176,30 @@ module Glimmer
     #
     body {
       shell {
+        grid_layout(2, false)
+        
         text "Gladiator - #{::File.expand_path(project_dir.path)}"
         minimum_size 520, 250
         size 1440, 900
-        grid_layout(2, false)
+        
         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
         }
-        on_swt_close {
+        on_shell_closed {
+          save_config
           project_dir.selected_child&.write_dirty_content
+          if @tab_folder2
+            current_tab_folder.swt_widget.getItems.each do |tab_item|
+              tab_item.getData('proxy')&.dispose
+            end
+            close_tab_folder
+          end
+          current_tab_folder.swt_widget.getItems.each do |tab_item|
+            tab_item.getData('proxy')&.dispose
+          end
+          body_root.close unless current_tab_folder.swt_widget.getItems.empty?
         }
         on_widget_disposed {
           project_dir.selected_child&.write_dirty_content
@@ -180,7 +224,7 @@ module Glimmer
                 begin
                   project_dir.selected_child_path = ''
                 rescue => e
-                  pd e
+                  puts e.full_message
                 end
               }
             }
@@ -198,11 +242,15 @@ module Glimmer
               text '&Split'
               menu_item(:radio) {
                 text '&Horizontal'
-                selection bind(self, :split_orientation, on_read: ->(o) { o == swt(:horizontal)}, on_write: ->(b) { b ? swt(:horizontal) : swt(:vertical)})
+                selection bind(self, :split_orientation,
+                                      on_read: ->(o) { split_pane? && o == swt(:horizontal)},
+                                      on_write: ->(b) { b ? swt(:horizontal) : swt(:vertical) })
               }
               menu_item(:radio) {
                 text '&Vertical'
-                selection bind(self, :split_orientation, on_read: ->(o) { o == swt(:vertical)}, on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal)})
+                selection bind(self, :split_orientation,
+                                      on_read: ->(o) { split_pane? && o == swt(:vertical)},
+                                      on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal) })
               }
             }
           }
@@ -231,126 +279,215 @@ module Glimmer
         }
 
         composite {
-          grid_layout 1, false
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
+          
           layout_data(:fill, :fill, false, true) {
             width_hint 300
           }
-          @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)
-                @list.swt_widget.select(0) if @list.swt_widget.getSelectionIndex() == -1
-                @list.swt_widget.setFocus
-              end
-            }
-          }
-          composite {
-            fill_layout(:vertical) {
-              spacing 5
-            }
+          @side_bar_sash_form = sash_form(:vertical) {
             layout_data(:fill, :fill, true, true)
-            @list = list(:border, :h_scroll, :v_scroll) {
-              #visible bind(self, 'project_dir.filter') {|f| !!f}
-              selection bind(project_dir, :filtered_path)
-              on_mouse_up {
-                project_dir.selected_child_path = @list.swt_widget.getSelection.first
-              }
-              on_key_pressed { |key_event|
-                if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                  project_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @current_text_editor&.text_widget&.setFocus
-                end
+            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
+            }
+            
+            @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
               }
-              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
+              
+              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 = 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
+                  }
+                  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
+                    }
+                  }
+                }
+              }
+              
+              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]
               }
+              
             }
-            @file_tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-              #visible bind(self, 'project_dir.filter') {|f| !f}
-              items bind(self, :project_dir), tree_properties(children: :children, text: :name)
-              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_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
               }
-              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)
-                  }
+              
+              on_swt_Resize(&resize_expand_items)
+                          
+              @file_explorer_expand_item = expand_item {
+                grid_layout {
+                  margin_width 0
+                  margin_height 0
                 }
-                menu_item(:separator)
-                menu_item {
-                  text 'Delete'
-                  on_widget_selected {
-                    tree_item = @file_tree.swt_widget.getSelection.first
-                    delete_tree_item(tree_item)
+                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)
+                  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_item {
-                  text 'Refresh'
-                  on_widget_selected {
-                    project_dir.refresh
+                  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
+                      }
+                    }
                   }
-                }
-                menu_item {
-                  text 'Rename'
-                  on_widget_selected {
-                    rename_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
                   }
-                }
-                menu_item {
-                  text 'New Directory'
-                  on_widget_selected {
-                    add_new_directory_to_selected_tree_item
+                  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
                   }
-                }
-                menu_item {
-                  text 'New File'
-                  on_widget_selected {
-                    add_new_file_to_selected_tree_item
+                  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
                   }
                 }
               }
-              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
+              
+              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_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
+            
+              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
@@ -360,117 +497,221 @@ module Glimmer
           @file_tree_editor.minimumHeight = 20;
 
         }
-        @editor_container = composite {
-          grid_layout 1, false
+        
+        composite {
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
           layout_data :fill, :fill, true, true
-          composite {
-            grid_layout 3, false
-
-            # row 1
-
-            label {
-              text 'File:'
-            }
+          
+          @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
 
-            @file_path_label = styled_text(:none) {
-              layout_data(:fill, :fill, true, false) {
-                horizontal_span 2
+              grid_layout(5, false) {
+                margin_right 5
               }
-              background color(:widget_background)
-              editable false
-              caret nil
-              text bind(project_dir, 'selected_child.path')
-              on_mouse_up {
-                @file_path_label.swt_widget.selectAll
+                            
+              stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
+  
+              # row 1
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'File:'
+                foreground @default_foreground
               }
-              on_focus_lost {
-                @file_path_label.swt_widget.setSelection(0, 0)
+  
+              @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
+                }
+                on_focus_lost {
+                  @file_path_label.swt_widget.setSelection(0, 0)
+                }
               }
-            }
-
-            # row 2
-
-            label {
-              text 'Line:'
-            }
-            @line_number_text = text {
-              layout_data(:fill, :fill, true, false) {
-                minimum_width 400
-              }
-              text bind(project_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
-              on_key_pressed { |key_event|
-                if key_event.keyCode == swt(:cr)
-                  @current_text_editor&.text_widget&.setFocus
-                end
+                          
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Caret Position:'
+                foreground @default_foreground
               }
-              on_verify_text { |event|
-                event.doit = !event.text.match(/^\d*$/).to_a.empty?
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.caret_position')
+                foreground @default_foreground
+                font stat_font
               }
-            }
-            label
-
-            # row 3
-
-            label {
-              text 'Find:'
-            }
-            @find_text = text {
-              layout_data(:fill, :center, true, false) {
-                minimum_width 400
-              }
-              text bind(project_dir, 'selected_child.find_text')
-              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
+              
+              # row 2
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Line:'
+                foreground @default_foreground
               }
-            }
-            composite {
-              row_layout
-              button(:check) {
-                selection bind(project_dir, 'selected_child.case_sensitive')
+              @line_number_text = text {
+                layout_data(:fill, :center, true, false) {
+                  minimum_width 400
+                }
+                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
+                }
+                on_verify_text { |event|
+                  event.doit = !event.text.match(/^\d*$/).to_a.empty?
+                }
+              }
+              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
+                }
+                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
                 }
               }
+              composite {
+                layout_data(:left, :center, true, false)
+                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 {
+                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 # filler
               label {
-                text 'Case-sensitive'
+                layout_data(:left, :center, false, false)
+                text 'Top Pixel:'
+                foreground @default_foreground
+              }
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.top_pixel')
+                foreground @default_foreground
+                font stat_font
               }
             }
-
-            # row 4
-
-            label {
-              text 'Replace:'
+            
+            on_item_collapsed {
+              @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
+              async_exec {
+                body_root.pack_same_size
+              }
             }
-            @replace_text = text {
-              layout_data(:fill, :fill, true, false) {
-                minimum_width 300
-              }
-              text bind(project_dir, 'selected_child.replace_text')
-              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
+          
+            on_item_expanded {
+              @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+              async_exec {
+                body_root.pack_same_size
               }
             }
-            label
+          
           }
+          
           @tab_folder_sash_form = sash_form {
             layout_data(:fill, :fill, true, true) {
-              width_hint 640
-              height_hint 480
+              width_hint 768
+              height_hint 576
+              minimum_width 768
+              minimum_height 576
             }
             sash_width 10
             orientation bind(self, :split_orientation)
@@ -517,20 +758,77 @@ module Glimmer
         project_dir.ignore_paths ||= ['packages', 'tmp']
         open_file_paths1 = @config[:open_file_paths1] || @config[:open_file_paths]
         open_file_paths2 = @config[:open_file_paths2]
-        open_file_paths1.to_a.each do |file_path|
-          project_dir.selected_child_path = file_path
+        self.split_orientation = swt(@config[:split_orientation] || :horizontal) rescue swt(:horizontal)
+        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)
+          }
+          async_exec {
+            @progress_bar_shell.open
+          }
         end
-        # TODO replace the next line with one that selects the visible tab
-        project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths1.to_a.include?(@config[:selected_child_path])
-        Gladiator.drag = true
-        open_file_paths2.to_a.each do |file_path|
-          project_dir.selected_child_path = file_path
+        open_file_paths1.to_a.each do |file_path|
+          async_exec {
+            Gladiator.drag = false
+            Gladiator.startup = file_path != open_file_paths1.to_a[-1]
+            project_dir.selected_child_path = file_path
+          }
         end
         # TODO replace the next line with one that selects the visible tab
-        project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths2.to_a.include?(@config[:selected_child_path])
-        Gladiator.drag = false
-        project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-        project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+        async_exec {
+          # TODO check why this is not working
+          if open_file_paths1.to_a.include?(@config[:selected_child_path])
+            Gladiator.drag = false
+            Gladiator.startup = false
+            project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
+            project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+            project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+          end
+        }
+        async_exec {
+          open_file_paths2.to_a.each do |file_path|
+            async_exec {
+              Gladiator.drag = true
+              Gladiator.startup = file_path != open_file_paths2.to_a[-1]
+              project_dir.selected_child_path = file_path
+            }
+          end
+          # TODO replace the next line with one that selects the visible tab
+          async_exec {
+            # TODO check why this is not working
+            if open_file_paths2.to_a.include?(@config[:selected_child_path])
+              Gladiator.drag = true
+              Gladiator.startup = false
+              project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
+              project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+              project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+            end
+          }
+          async_exec {
+            Gladiator.drag = false
+            @progress_bar_shell&.close
+            @progress_bar_shell = nil
+            @loaded_config = true
+          }
+        }
+        async_exec {
+          Thread.new {
+            all_files = open_file_paths1.to_a + open_file_paths2.to_a
+            all_files.each do |file|
+              project_dir.find_child_file(file)&.dirty_content
+            end
+          }
+        }
       else
         @loaded_config = true
       end
@@ -546,6 +844,7 @@ module Glimmer
       open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
       @config = {
         selected_child_path: child.path,
+        split_orientation: split_orientation == swt(:horizontal) ? 'horizontal' : 'vertical',
         caret_position: child.caret_position,
         top_pixel: child.top_pixel,
         shell_width: swt_widget&.getBounds&.width,
@@ -612,17 +911,24 @@ module Glimmer
       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)
-      # TODO close text editor tab
-      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
     rescue => e
       puts e.full_message
     end
@@ -691,6 +997,9 @@ module Glimmer
             else
               selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
             end
+            async_exec {
+              @file_tree.swt_widget.showItem(edited_tree_item)
+            }
           end
           project_dir.resume_refresh
         },
@@ -708,8 +1017,9 @@ module Glimmer
     
     def open_project
       selected_directory = directory_dialog.open
-      @progress_bar_shell = shell(body_root) {
-        text 'Opening Project'
+      return if selected_directory.nil?
+      @progress_bar_shell = shell(body_root, :title) {
+        text 'Gladiator'
         fill_layout(:vertical) {
           margin_width 15
           margin_height 15
@@ -721,29 +1031,33 @@ module Glimmer
         }
 #         @progress_bar = progress_bar(:horizontal, :indeterminate)
       }
-      Thread.new {
-        async_exec {
-          @progress_bar_shell.open
-        }
+      async_exec {
+        @progress_bar_shell.open
       }
-      Thread.new {
-        async_exec {
-          gladiator(project_dir_path: selected_directory) {
-            on_swt_show {
-              @progress_bar_shell.close
-            }
-          }.open if selected_directory
-        }
+      async_exec {
+        gladiator(project_dir_path: selected_directory) {
+          on_swt_show {
+            @progress_bar_shell.close
+            @progress_bar_shell = nil
+          }
+        }.open if selected_directory
       }
     end
     
     def handle_display_shortcut(key_event)
       if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-        if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
-          find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
-        end
-        find_text.swt_widget.selectAll
-        find_text.swt_widget.setFocus
+        @navigation_expand_item.swt_expand_item.set_expanded true
+        @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+        async_exec {
+          body_root.pack_same_size
+        }
+        async_exec {
+          if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
+            find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
+          end
+          find_text.swt_widget.selectAll
+          find_text.swt_widget.setFocus
+        }
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
         Clipboard.copy(project_dir.selected_child.path)
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'
@@ -780,7 +1094,7 @@ module Glimmer
           end
         end
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'o'
-        self.split_orientation = split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
+        self.split_orientation = split_pane? && split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
         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
@@ -839,12 +1153,34 @@ module Glimmer
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'g'
         project_dir.selected_child.find_next
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'l'
-        line_number_text.swt_widget.selectAll
-        line_number_text.swt_widget.setFocus
+        unless @navigation_expand_item.swt_expand_item.get_expanded
+          @navigation_expand_item.swt_expand_item.set_expanded true
+          @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+          async_exec {
+            body_root.pack_same_size
+          }
+          async_exec {
+            line_number_text.swt_widget.selectAll
+            line_number_text.swt_widget.setFocus
+          }
+        else
+          line_number_text.swt_widget.selectAll
+          line_number_text.swt_widget.setFocus
+        end
       elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'r'
+        unless @file_lookup_expand_item.swt_expand_item.get_expanded
+          @file_lookup_expand_item.swt_expand_item.set_expanded true
+          @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_item_height if @file_lookup_expand_item_height
+          @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]
+        end
         filter_text.swt_widget.selectAll
         filter_text.swt_widget.setFocus
       elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 't'
+        unless @file_explorer_expand_item.swt_expand_item.get_expanded
+          @file_explorer_expand_item.swt_expand_item.set_expanded true
+          @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_item_height if @file_explorer_expand_item_height
+          @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]
+        end
         select_tree_item unless rename_in_progress
         file_tree.swt_widget.setFocus
       elsif key_event.keyCode == swt(:esc)