RubyGems - glimmer-cs-gladiator - Versions diffs - 0.7.2 → 0.8.3 - Mend

glimmer-cs-gladiator 0.7.2 → 0.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +50 -0
data/README.md +72 -16
data/VERSION +1 -1
data/bin/gladiator +23 -2
data/bin/gladiator-setup +80 -0
data/bin/glimmer-cs-gladiator +22 -0
data/glimmer-cs-gladiator.gemspec +17 -8
data/images/glimmer-cs-gladiator-logo.png +0 -0
data/lib/glimmer-cs-gladiator.rb +1 -0
data/lib/glimmer-cs-gladiator/launch.rb +6 -0
data/lib/models/glimmer/gladiator/command.rb +2 -2
data/lib/models/glimmer/gladiator/dir.rb +10 -5
data/lib/models/glimmer/gladiator/file.rb +133 -8
data/lib/views/glimmer/gladiator.rb +494 -585
data/lib/views/glimmer/gladiator/file_edit_menu.rb +67 -0
data/lib/views/glimmer/gladiator/gladiator_menu_bar.rb +216 -0
data/lib/views/glimmer/gladiator/progress_shell.rb +29 -0
data/lib/views/glimmer/gladiator/text_editor.rb +24 -17
metadata +30 -6
data/bin/gladiator_runner.rb +0 -6

data/images/glimmer-cs-gladiator-logo.png CHANGED Viewed

Binary file

data/lib/glimmer-cs-gladiator.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
+require 'glimmer-dsl-swt'
 require 'filewatcher'
 require 'clipboard'
 require 'puts_debuggerer'

data/lib/glimmer-cs-gladiator/launch.rb ADDED Viewed

@@ -0,0 +1,6 @@
+require_relative '../glimmer-cs-gladiator'
+include Glimmer
+local_dir = ENV['LOCAL_DIR'] || '.'
+gladiator(project_dir_path: local_dir).open

data/lib/models/glimmer/gladiator/command.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module Glimmer
               command_history_for(file).last.next_command = command
             end
             command.do
-            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!
+            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!
           else
             command_history_for(file) << command
           end
@@ -45,7 +45,7 @@ module Glimmer
         end
       end
-      attr_accessor :file, :method, :args, :previous_command, :next_command,
+      attr_accessor :file, :method, :args, :previous_command, :next_command,
                     :file_dirty_content, :file_caret_position, :file_selection_count, :previous_file_dirty_content, :previous_file_caret_position, :previous_file_selection_count
       def initialize(file, method = nil, *args)

data/lib/models/glimmer/gladiator/dir.rb CHANGED Viewed

@@ -5,6 +5,8 @@ module Glimmer
     class Dir
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
+      IGNORE_PATHS = ['.gladiator', '.gladiator-scratchpad', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
@@ -36,7 +38,7 @@ module Glimmer
         end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg']
+        @ignore_paths = IGNORE_PATHS
         self.filtered_path_options = []
       end
@@ -72,8 +74,10 @@ module Glimmer
       def retrieve_children
         @children = ::Dir.glob(::File.join(@path, '*')).reject do |p|
           # TODO make sure to configure ignore_paths in a preferences dialog
-          project_dir.ignore_paths.reduce(false) do |result, ignore_path|
-            result || p.include?(ignore_path)
+          if project_dir == self
+            project_dir.ignore_paths.any? do |ignore_path|
+              p.include?(ignore_path)
+            end
           end
         end.map do |p|
           ::File.file?(p) ? File.new(p, project_dir) : Dir.new(p, project_dir)
@@ -93,7 +97,7 @@ module Glimmer
       def depth_first_search_file(dir, file_path)
         dir.children.each do |child|
           if child.is_a?(File)
-            return child if child.path.include?(file_path)
+            return child if child.path.include?(file_path.to_s)
           else
             result = depth_first_search_file(child, file_path)
             return result unless result.nil?
@@ -173,7 +177,8 @@ module Glimmer
         # scratchpad scenario
         if selected_path.empty? # Scratchpad
           @selected_child&.write_dirty_content
-          return (self.selected_child = File.new)
+          @scratchpad = (self.selected_child = File.new('', project_dir.path)) if @scratchpad.nil? || @scratchpad.closed?
+          return @scratchpad
         end
         full_selected_path = selected_path.include?(project_dir.path) ? selected_path : ::File.join(project_dir.path, selected_path)
         return if ::Dir.exist?(full_selected_path) ||

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

@@ -20,6 +20,69 @@ module Glimmer
         @init = nil
       end
+      def language
+        # TODO consider using Rouge::Lexer.guess_by_filename instead and perhaps guess_by_source when it fails
+        extension = path.split('.').last if path.to_s.include?('.')
+        return 'ruby' if scratchpad?
+        return 'ruby' if path.to_s.end_with?('Gemfile') || path.to_s.end_with?('Rakefile')
+        return 'ruby' if dirty_content.start_with?('#!/usr/bin/env ruby') || dirty_content.start_with?('#!/usr/bin/env jruby')
+        return 'yaml' if path.to_s.end_with?('Gemfile.lock')
+        return 'shell' if extension.nil? && path.to_s.include?('/bin/')
+        case extension
+        # TODO extract case statement to an external config file
+        when 'rb'
+          'ruby'
+        when 'md', 'markdown'
+          'markdown'
+        when 'js', 'es6'
+          'javascript'
+        when 'json'
+          'json'
+        when 'yaml'
+          'yaml'
+        when 'html'
+          'html'
+        when 'h', 'c'
+          'c'
+        when 'hs'
+          'haskell'
+        when 'gradle'
+          'gradle'
+        when 'cpp'
+          'cpp'
+        when 'css'
+          'css'
+        when 'java'
+          'java'
+        when 'jsp'
+          'jsp'
+        when 'plist'
+          'plist'
+        when 'haml'
+          'haml'
+        when 'xml'
+          'xml'
+        when 'ini'
+          'ini'
+        when 'pl'
+          'perl'
+        when 'tcl'
+          'tcl'
+        when 'sass'
+          'sass'
+        when 'scss'
+          'scss'
+        when 'sql'
+          'sql'
+        when 'sh'
+          'shell'
+        when 'vue'
+          'vue'
+        when 'txt', nil
+          'plain_text'
+        end
+      end
       def init_content
         unless @init
           @init = true
@@ -82,7 +145,13 @@ module Glimmer
       end
       def scratchpad?
-        path.to_s.empty?
+        path.to_s.empty? # TODO consider updating to set the .gladiator-scratchpad path directly
+      end
+      def scratchpad_file
+        scratchpad_file = ::File.join(project_dir.path, '.gladiator-scratchpad')
+        ::File.write(scratchpad_file, content)
+        scratchpad_file
       end
       def backup_properties
@@ -141,6 +210,7 @@ module Glimmer
       def change_content!(value)
         self.dirty_content = value
+        format_dirty_content_for_writing!(force: true) if value.to_s.include?("\r\n")
         update_line_number_from_caret_position(caret_position)
       end
@@ -157,12 +227,17 @@ module Glimmer
       end
       def close
+        @closed = true
         stop_filewatcher
         remove_all_observers
         initialize(path, project_dir)
         Command.clear(self)
       end
+      def closed?
+        @closed
+      end
       def read_dirty_content
         path.empty? ? '' : ::File.read(path)
       end
@@ -198,14 +273,15 @@ module Glimmer
         puts e.full_message
       end
-      def format_dirty_content_for_writing!
-        return if @commmand_in_progress
-        # TODO  f ix c ar e t pos it ion after formatting dirty content (diff?)
+      def format_dirty_content_for_writing!(force: false)
+        return if !force && @commmand_in_progress
         new_dirty_content = dirty_content.to_s.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
         new_dirty_content = "#{new_dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"
         if new_dirty_content != self.dirty_content
           @formatting_dirty_content_for_writing = true
+          caret_position_diff = dirty_content.to_s.size - new_dirty_content.size
           self.dirty_content = new_dirty_content
+          self.caret_position = caret_position - caret_position_diff
           @formatting_dirty_content_for_writing = false
         end
       end
@@ -456,21 +532,70 @@ module Glimmer
       end
       def home
-        self.selection_count = 0
         self.line_number = 1
+        self.selection_count = 0
       end
       def end
-        self.selection_count = 0
         self.line_number = lines.size
+        self.selection_count = 0
       end
       def start_of_line
         self.caret_position = caret_position_for_line_index(self.line_number - 1)
+        self.selection_count = 0
       end
       def end_of_line
         self.caret_position = caret_position_for_line_index(self.line_number) - 1
+        self.selection_count = 0
+      end
+      def select_to_start_of_line
+        old_caret_position = caret_position
+        self.caret_position = caret_position_for_line_index(self.line_number - 1)
+        self.selection_count = old_caret_position - caret_position
+      end
+      def select_to_end_of_line
+        self.caret_position = selection_count == 0 ? caret_position : caret_position + selection_count
+        self.selection_count = (caret_position_for_line_index(self.line_number) - 1) - caret_position
+      end
+      def delete!
+        new_dirty_content = dirty_content
+        new_dirty_content[caret_position...(caret_position + selection_count)] = ''
+        old_caret_position = caret_position
+        self.dirty_content = new_dirty_content
+        self.caret_position = old_caret_position
+      end
+      def cut!
+        Clipboard.copy(selected_text)
+        delete!
+      end
+      def copy
+        Clipboard.copy(selected_text)
+      end
+      def paste!
+        new_dirty_content = dirty_content
+        pasted_text = Clipboard.paste
+        new_dirty_content[caret_position...(caret_position + selection_count)] = pasted_text
+        old_caret_position = caret_position
+        self.dirty_content = new_dirty_content
+        self.caret_position = old_caret_position + pasted_text.to_s.size
+        self.selection_count = 0
+      end
+      def select_all
+        self.caret_position = 0
+        self.selection_count = dirty_content.to_s.size
+      end
+      def selected_text
+        dirty_content.to_s[caret_position, selection_count]
       end
       def move_up!
@@ -513,13 +638,13 @@ module Glimmer
       def run
         if scratchpad?
-          eval content
+          load scratchpad_file
         else
           write_dirty_content
           load path
         end
       end
       def lines
         need_padding = dirty_content.to_s.end_with?("\n")
         splittable_content = need_padding ? "#{dirty_content} " : dirty_content

data/lib/views/glimmer/gladiator.rb CHANGED Viewed

@@ -29,6 +29,9 @@ 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'
+require 'views/glimmer/gladiator/file_edit_menu'
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
@@ -41,6 +44,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'))
@@ -58,6 +62,11 @@ module Glimmer
     # option :height, 240
     option :project_dir_path
+    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
     def project_dir
       @project_dir ||= Dir.new(project_dir_path)
     end
@@ -80,10 +89,9 @@ module Glimmer
       pane_count && pane_count > 1
     end
-    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation
-    attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor, :tab_folder1, :tab_folder2, :maximized_pane, :maximized_editor
-    alias maximized_pane? maximized_pane
-    alias maximized_editor? maximized_editor
+    def app_mode?
+      project_dir_path == '.' && ENV['APP_MODE'].to_s == 'true' || !::Dir.glob(::File.join(project_dir_path, 'glimmer-cs-gladiator.jar')).empty?
+    end
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
@@ -95,6 +103,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 {
@@ -102,23 +111,27 @@ module Glimmer
           on_about {
             display_about_dialog
           }
+          on_quit {
+            display.swt_display.shells.each { |shell|
+              gladiator = shell.get_data('custom_shell')
+              gladiator.project_dir.selected_child&.write_dirty_content
+              shell.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
+            focused_gladiator.handle_display_shortcut(key_event) if !focused_gladiator.nil? && focused_gladiator.is_a?(Glimmer::Gladiator) && key_event.widget.shell == focused_gladiator&.swt_widget
           }
         }
       end
       @default_foreground = :dark_blue
       @split_orientation = swt(:horizontal)
-      @config_file_path = ::File.join(project_dir.path, '.gladiator')
-      @config = {}
-      load_config_ignore_paths
-#       project_dir.all_children # pre-caches children
+      unless app_mode?
+        @config_file_path = ::File.join(project_dir.path, '.gladiator')
+        @config = {}
+        load_config_ignore_paths
+      end
     }
     ## Uncomment after_body block to setup observers for widgets in body
@@ -132,7 +145,7 @@ module Glimmer
           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
@@ -144,54 +157,63 @@ module Glimmer
             @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')
+                    if (@tab_folder1 != @current_tab_folder && !@tab_folder1&.items&.detect {|ti| ti.get_data('file') == tab_item_file}) || (@tab_folder2 != @current_tab_folder && !@tab_folder2&.items&.detect {|ti| ti.get_data('file') == tab_item_file})
+                      tab_item_file.close
+                    end
+                  }
                 }
-                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
+              Glimmer::Config.logger.error {e.full_message}
+            end
           end
           @current_text_editor&.text_widget&.setFocus
         end
@@ -221,546 +243,463 @@ module Glimmer
       observe(project_dir, 'selected_child.top_pixel') do
         save_config
       end
-      load_config
+      load_config unless app_mode?
     }
     ## Add widget content inside custom shell body
     ## 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 app_mode?
+        shell {
+          text 'Gladiator'
+          minimum_size 250, 250
+          image ICON
+          gladiator_menu_bar(gladiator: self, editing: false)
+          button {
+            text 'Open Project...'
+            on_widget_selected {
+              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]
-                @side_bar_sash_form.weights = [1, 1]
-              }
-            }
+          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
                     }
                   }
-                  @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
                   }
-                }
-                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_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_swt_Resize(&resize_expand_items)
-                @file_explorer_expand_item = expand_item {
-                  grid_layout {
-                    margin_width 0
-                    margin_height 0
+                @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
                   }
-                  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_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_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_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]
+                  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
+              }
             }
-            @navigation_expand_bar = expand_bar {
-              layout_data :fill, :top, true, false
-              font height: 17, style: :bold
-              foreground @default_foreground
+            @editor_area_composite = composite {
+              grid_layout(1, false) {
+                margin_width 0
+                margin_height 0
+              }
-              @navigation_expand_item = expand_item {
-                text 'Navigation'
-                height 115
-                grid_layout(5, false) {
-                  margin_right 5
+              @navigation_expand_bar = expand_bar {
+                layout_data(:fill, :top, true, false) {
+                  minimum_width 480
                 }
+                font height: 17, style: :bold
+                foreground @default_foreground
-                stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
-                # row 1
+                @navigation_expand_item = expand_item {
+                  text 'Navigation'
+                  height 115
-                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
+                  grid_layout(5, false) {
+                    margin_right 5
                   }
-                  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
+                  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)
+                    }
                   }
-                }
-                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
+                  label {
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Caret Position:'
+                    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
+                  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
                   }
-                  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 # 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
+                  @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 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')
-                  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 # filler
+                  label {
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Line Position:'
+                    foreground @default_foreground
                   }
-                }
-                composite {
-                  layout_data(:left, :center, true, false)
-                  row_layout {
-                    margin_width 0
-                    margin_height 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
                   }
-                  button(:check) {
-                    selection bind(project_dir, 'selected_child.case_sensitive')
+                  # row 3
+                  label {
+                    layout_data(:left, :center, false, false)
+                    text 'Find:'
+                    foreground @default_foreground
+                  }
+                  @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
                     }
                   }
+                  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 {
-                    text 'Case-sensitive'
+                    layout_data(:left, :center, false, false) {
+                      minimum_width 100
+                    }
+                    text 'Selection Count:'
                     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
+                  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
                   }
-                  text bind(project_dir, 'selected_child.replace_text')
-                  foreground @default_foreground
-                  font stat_font
-                  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) {
+                      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)
+                        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) {
+                      minimum_width 100
+                    }
+                    text 'Top Pixel:'
+                    foreground @default_foreground
+                  }
+                  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_height
               }
-            }
-            @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')
           }
-        } # end of sash form
+          on_drag_set_data { |event|
+            event.data = event_data
+          }
+        }
       }
-    }
+    end
     def load_config_ignore_paths
       # TODO eliminate duplication with load_config
@@ -770,8 +709,6 @@ module Glimmer
         @config = YAML.load(config_yaml)
         project_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
         project_dir.ignore_paths ||= ['packages', 'tmp']
-      else
-        @loaded_config = true
       end
     end
@@ -785,22 +722,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|
@@ -842,8 +767,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
           }
         }
@@ -861,16 +786,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,
@@ -885,7 +810,7 @@ module Glimmer
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?
     rescue => e
-      puts e.full_message
+      Glimmer::Config.logger.error {e.full_message}
     end
     def navigate_to_next_tab_folder
@@ -988,27 +913,16 @@ 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
+            body_root.close if app_mode?
+            @progress_shell.close
+            @progress_shell = nil
           }
         }.open if selected_directory
       }
@@ -1033,29 +947,22 @@ 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'
@@ -1092,16 +999,18 @@ module Glimmer
 #             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