glimmer-cs-gladiator 0.5.0 → 0.6.0

data/lib/views/glimmer/gladiator.rb

@@ -23,7 +23,7 @@ module Glimmer
       attr_accessor :drag_and_drop
       attr_accessor :drag
     end
-
+    
     ## Add options like the following to configure CustomShell by outside consumers
     #
     # options :title, :background_color
@@ -35,16 +35,33 @@ 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
     #
     #
     before_body {
-      Thread.new {
-        project_dir #pre-initialize directory
-      }
+      # TODO consider doing loading project files after displaying the GUI instead of holding it up before
+      project_dir #pre-initialize directory
       at_exit do
         project_dir.selected_child&.write_raw_dirty_content
       end
@@ -59,6 +76,7 @@ module Glimmer
         }
       end
 
+      @default_foreground = :dark_blue
       @split_orientation = swt(:horizontal)
       @config_file_path = ::File.join(project_dir.path, '.gladiator')
       @config = {}
@@ -92,7 +110,10 @@ module Glimmer
             @current_tab_folder.content {
               @current_tab_item = tab_item { |the_tab_item|
                 text selected_file.name
-                fill_layout :horizontal
+                fill_layout(:horizontal) {
+                 margin_width 0
+                 margin_height 0
+                }
                 @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file)
                 @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
                 @current_text_editor.text_proxy.content {
@@ -117,6 +138,9 @@ 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)
@@ -146,10 +170,12 @@ 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]
@@ -181,7 +207,7 @@ module Glimmer
                 begin
                   project_dir.selected_child_path = ''
                 rescue => e
-                  pd e
+                  puts e.full_message
                 end
               }
             }
@@ -199,11 +225,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) })
               }
             }
           }
@@ -232,126 +262,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
-              }
-              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
-                }
-              }
+            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_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
-                }
-              }
-              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)
+            
+            @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
+              }      
+              
+              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
                   }
                 }
-                menu_item(:separator)
-                menu_item {
-                  text 'Delete'
-                  on_widget_selected {
-                    tree_item = @file_tree.swt_widget.getSelection.first
-                    delete_tree_item(tree_item)
+              
+                @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
                   }
-                }
-                menu_item {
-                  text 'Refresh'
-                  on_widget_selected {
-                    project_dir.refresh
+                  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
                   }
-                }
-                menu_item {
-                  text 'Rename'
-                  on_widget_selected {
-                    rename_selected_tree_item
+                  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
+                    }
                   }
                 }
-                menu_item {
-                  text 'New Directory'
-                  on_widget_selected {
-                    add_new_directory_to_selected_tree_item
+              }
+              
+              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_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
+                }      
+                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 'New File'
-                  on_widget_selected {
-                    add_new_file_to_selected_tree_item
+                  menu {
+                    @open_menu_item = menu_item {
+                      text 'Open'
+                      on_widget_selected {
+                        project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
+                      }
+                    }
+                    menu_item(:separator)
+                    menu_item {
+                      text 'Delete'
+                      on_widget_selected {
+                        tree_item = @file_tree.swt_widget.getSelection.first
+                        delete_tree_item(tree_item)
+                      }
+                    }
+                    menu_item {
+                      text 'Refresh'
+                      on_widget_selected {
+                        project_dir.refresh
+                      }
+                    }
+                    menu_item {
+                      text 'Rename'
+                      on_widget_selected {
+                        rename_selected_tree_item
+                      }
+                    }
+                    menu_item {
+                      text 'New Directory'
+                      on_widget_selected {
+                        add_new_directory_to_selected_tree_item
+                      }
+                    }
+                    menu_item {
+                      text 'New File'
+                      on_widget_selected {
+                        add_new_file_to_selected_tree_item
+                      }
+                    }
+                  }
+                  on_swt_menudetect { |event|
+                    path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
+                    @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
+                  }
+                  on_mouse_up {
+                    if Gladiator.drag_and_drop
+                      Gladiator.drag_and_drop = false
+                    else
+                      project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
+                      @current_text_editor&.text_widget&.setFocus
+                    end
+                  }
+                  on_key_pressed { |key_event|
+                    if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+                      project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
+                      @current_text_editor&.text_widget&.setFocus
+                    end
+                  }
+                  on_paint_control {
+                    root_item = @file_tree.swt_widget.getItems.first
+                    if root_item && !root_item.getExpanded
+                      root_item.setExpanded(true)
+                    end
                   }
                 }
               }
-              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
@@ -361,117 +480,220 @@ 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
+          
+          @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
 
-            label {
-              text 'File:'
-            }
-
-            @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
+                          
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Caret Position:'
+                foreground @default_foreground
               }
-              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(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.caret_position')
+                foreground @default_foreground
+                font stat_font
               }
-              on_verify_text { |event|
-                event.doit = !event.text.match(/^\d*$/).to_a.empty?
+              
+              # row 2
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Line:'
+                foreground @default_foreground
               }
-            }
-            label
-
-            # row 3
-
-            label {
-              text 'Find:'
-            }
-            @find_text = text {
-              layout_data(:fill, :center, true, false) {
-                minimum_width 400
+              @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?
+                }
               }
-              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
+              label # filler
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Line Position:'
+                foreground @default_foreground
               }
-            }
-            composite {
-              row_layout
-              button(:check) {
-                selection bind(project_dir, 'selected_child.case_sensitive')
+              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'
+                }
+              }
+              
               label {
-                text 'Case-sensitive'
+                layout_data(:left, :center, false, false)
+                text 'Selection Count:'
+                foreground @default_foreground
               }
-            }
-
-            # row 4
-
-            label {
-              text 'Replace:'
-            }
-            @replace_text = text {
-              layout_data(:fill, :fill, true, false) {
-                minimum_width 300
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.selection_count')
+                foreground @default_foreground
+                font stat_font
               }
-              text bind(project_dir, 'selected_child.replace_text')
-              on_focus_gained {
-                project_dir.selected_child&.ensure_find_next
+              
+              # row 4
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Replace:'
+                foreground @default_foreground
               }
-              on_key_pressed { |key_event|
-                if key_event.keyCode == swt(:cr)
-                  if project_dir.selected_child
-                    Command.do(project_dir.selected_child, :replace_next!)
+              @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
-                end
+                }
+              }
+              label # filler
+              label {
+                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
               }
             }
-            label
+            
+            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
+              }
+            }              
+          
+            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
+              }
+            }              
+          
           }
+          
           @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)
@@ -518,20 +740,59 @@ 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
+            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 {
+          Gladiator.drag = false
+          project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths1.to_a.include?(@config[:selected_child_path])
+          project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+          project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+        }
+        async_exec {
+          open_file_paths2.to_a.each do |file_path|
+            async_exec {
+              Gladiator.drag = true
+              project_dir.selected_child_path = file_path
+            }
+          end
+          # TODO replace the next line with one that selects the visible tab
+          async_exec {
+            Gladiator.drag = true
+            project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths2.to_a.include?(@config[:selected_child_path])
+            project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+            project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+          }
+          async_exec {
+            Gladiator.drag = false
+            @progress_bar_shell.close
+            @progress_bar_shell = nil
+            @loaded_config = true
+          }
+        }
       else
         @loaded_config = true
       end
@@ -547,6 +808,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,
@@ -582,8 +844,12 @@ module Glimmer
       end
     end
 
+    def find_tab_item(file_path)
+      @current_tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == file_path }
+    end
+
     def selected_tab_item
-      @current_tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == project_dir.selected_child&.path }
+      find_tab_item(project_dir.selected_child&.path)
     end
 
     def other_tab_items
@@ -609,25 +875,28 @@ 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
-#       if file.is_a?(::File)
-        # close tab
-#       end
     rescue => e
       puts e.full_message
     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 add_new_directory_to_selected_tree_item
       project_dir.pause_refresh
       tree_item = @file_tree.swt_widget.getSelection.first
@@ -642,7 +911,7 @@ module Glimmer
       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, true)
+      rename_tree_item(new_tree_item)
     end
 
     def add_new_file_to_selected_tree_item
@@ -662,14 +931,40 @@ module Glimmer
       rename_tree_item(new_tree_item, true)
     end
 
-    def rename_tree_item(tree_item, open_afterwards = false)
+    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
-          # TODO rename file in tab title
-          project_dir.selected_child_path = file_path if open_afterwards
+          file.name
+          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
           project_dir.resume_refresh
         },
         after_cancel: -> {
@@ -686,8 +981,8 @@ module Glimmer
     
     def open_project
       selected_directory = directory_dialog.open
-      @progress_bar_shell = shell(body_root) {
-        text 'Opening Project'
+      @progress_bar_shell = shell(body_root, :title) {
+        text 'Gladiator'
         fill_layout(:vertical) {
           margin_width 15
           margin_height 15
@@ -699,19 +994,16 @@ 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
     
@@ -758,7 +1050,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
@@ -833,4 +1125,4 @@ module Glimmer
       end
     end
   end
-end
+end