glimmer-cs-gladiator 0.8.2 → 0.9.3

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

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module Glimmer
   class Gladiator
     class ProgressShell
@@ -15,6 +36,7 @@ module Glimmer
           }
           
           text 'Gladiator'
+          image ICON
           
           label(:center) {
             text progress_text

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -196,6 +196,8 @@ module Glimmer
               if file.selection_count.to_i == 0
                 verify_event.text += file.current_line_indentation
               end
+              # TODO implement this to borrowed line of code from Glimmer Meta-Sample
+#               verify_event.text += ' '*2 if line.strip.end_with?('{') || line.strip.match(/do[ ]+([|][^|]+[|])?$/) || line.start_with?('class') || line.start_with?('module') || line.strip.start_with?('def')
             when "\t"
               Command.do(file, :indent!)
               verify_event.doit = false

data/lib/views/glimmer/gladiator.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -96,11 +96,12 @@ module Glimmer
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
     #
-    before_body {
+    before_body do
+      @@quitting = false
       # TODO consider doing loading project files after displaying the GUI instead of holding it up before
-      project_dir #pre-initialize directory
-      TOPLEVEL_BINDING.receiver.send(:at_exit) do
-        project_dir.selected_child&.write_raw_dirty_content
+      project_dir unless app_mode? #pre-initialize directory
+      TOPLEVEL_BINDING.receiver.send(:trap, "SIGINT") do |signal|
+        quit
       end
       Display.setAppName('Gladiator')
       Display.setAppVersion(VERSION)
@@ -108,20 +109,12 @@ module Glimmer
       unless defined?(@@display)
         @@display = display {
           # TODO look into why a weird java dialog comes up on about (maybe a non-issue once packaged)
-          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|
+          on_about { display_about_dialog }
+          on_quit { quit }
+          on_swt_keydown do |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
-          }
+            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
         }
       end
 
@@ -132,124 +125,128 @@ module Glimmer
         @config = {}
         load_config_ignore_paths
       end
-    }
+    end
 
     ## Uncomment after_body block to setup observers for widgets in body
     #
-    after_body {
-      observe(project_dir, 'children') do
-        @file_explorer_tree.select_tree_item unless Gladiator.startup
-      end
-      observe(project_dir, 'selected_child') do |selected_file|
-        if selected_file
-          if Gladiator.drag && !@tab_folder2
-            self.tab_folder1 = current_tab_folder
-            @tab_folder_sash_form.content {
-              self.current_tab_folder = self.tab_folder2 = text_editor_group_tab_folder
-              @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
-            }
-            body_root.pack_same_size
-          end
+    after_body do
+      unless app_mode?
+        observe(project_dir, 'children') do
           @file_explorer_tree.select_tree_item unless Gladiator.startup
-          found_tab_item = selected_tab_item
-          if found_tab_item
-            @current_tab_folder.swt_widget.setSelection(found_tab_item)
-            @current_tab_item = found_tab_item.getData('proxy')
-            @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
-            @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-          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
+        end
+        observe(project_dir, 'selected_child') do |selected_file|
+          if selected_file
+            if Gladiator.drag && !@tab_folder2
+              self.tab_folder1 = current_tab_folder
+              @tab_folder_sash_form.content {
+                self.current_tab_folder = self.tab_folder2 = text_editor_group_tab_folder
+                @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
+              }
+              body_root.pack_same_size
+            end
+            @file_explorer_tree.select_tree_item unless Gladiator.startup
+            found_tab_item = selected_tab_item
+            if found_tab_item
+              @current_tab_folder.swt_widget.setSelection(found_tab_item)
+              @current_tab_item = found_tab_item.getData('proxy')
+              @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
+              @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+            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
                     }
-                    @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')
+                    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 do
+                      @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?
+                    end
+                    
+                    on_widget_disposed do
+                      project_dir.selected_child&.write_dirty_content
+                      tab_item_file = the_tab_item.swt_tab_item.get_data('file')
+                      tab_item_file.close if !@@quitting && (@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})
+                    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&.load_content
-                    @current_text_editor&.text_widget&.setFocus
-                    save_config unless selected_file.nil?
-                  }
-                  on_widget_disposed {
-                    project_dir.selected_child&.write_dirty_content
-                    tab_item_file = the_tab_item.swt_tab_item.get_data('file')
-                    tab_item_file.close unless [@tab_folder1, @tab_folder2].compact.map(&:items).flatten(1).detect {|ti| ti.get_data('file') == tab_item_file}
-                  }
+                  @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
-            rescue => e
-              Glimmer::Config.logger.error {e.full_message}
+                @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
-          @current_text_editor&.text_widget&.setFocus
         end
-      end
-      observe(self, 'maximized_pane') do
-        if tab_folder2
-          @tab_folder_sash_form.maximized_control = (current_tab_folder.swt_widget if maximized_pane?)
+        observe(self, 'maximized_pane') do
+          if tab_folder2
+            @tab_folder_sash_form.maximized_control = (current_tab_folder.swt_widget if maximized_pane?)
+          end
         end
-      end
-      observe(self, 'maximized_editor') do
-        @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
-        if !maximized_editor?
-          expand_navigation_expand_bar_height
-        else
-          collapse_navigation_expand_bar_height
+        observe(self, 'maximized_editor') do
+          @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
+          if !maximized_editor?
+            expand_navigation_expand_bar_height
+          else
+            collapse_navigation_expand_bar_height
+          end
+          @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
+          body_root.pack_same_size
+          async_exec { body_root.pack_same_size }
         end
-        @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
-        body_root.pack_same_size
-        async_exec { body_root.pack_same_size }
-      end
-      observe(project_dir, 'selected_child') do
-        save_config
-      end
-      observe(project_dir, 'selected_child.caret_position') do
-        save_config
-      end
-      observe(project_dir, 'selected_child.top_pixel') do
-        save_config
+        observe(project_dir, 'selected_child') do
+          save_config
+        end
+        observe(project_dir, 'selected_child.caret_position') do
+          save_config
+        end
+        observe(project_dir, 'selected_child.top_pixel') do
+          save_config
+        end
+        load_config
       end
-      load_config unless app_mode?
-    }
+    end
 
     ## Add widget content inside custom shell body
     ## Top-most widget must be a shell or another custom shell
     #
     body {
       if app_mode?
-        shell {
+        @@app_mode_shell = shell {
           text 'Gladiator'
           minimum_size 250, 250
           image ICON
@@ -284,6 +281,8 @@ module Glimmer
           
           on_shell_closed {
             project_dir.selected_child&.write_dirty_content
+            save_config
+            @paused_save_config = true
             if @tab_folder2
               current_tab_folder.swt_widget.getItems.each do |tab_item|
                 tab_item.getData('proxy')&.dispose
@@ -293,10 +292,10 @@ module Glimmer
             current_tab_folder.swt_widget.getItems.each do |tab_item|
               tab_item.getData('proxy')&.dispose
             end
+            gladiator_shells = display.shells.select {|s| s.get_data('custom_shell')&.is_a?(Glimmer::Gladiator)}
+            project_dir.close unless @@quitting
             body_root.close unless current_tab_folder.swt_widget.getItems.empty?
-          }
-          on_widget_disposed {
-            project_dir.selected_child&.write_dirty_content
+            async_exec { @@app_mode_shell.show } if defined?(@@app_mode_shell) && gladiator_shells.count <= 2
           }
           on_control_resized {
             save_config
@@ -306,6 +305,7 @@ module Glimmer
           }
           on_shell_deactivated {
             project_dir.selected_child&.write_dirty_content
+            save_config
           }
   
           # Menu Bar
@@ -690,7 +690,7 @@ module Glimmer
             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')
+            event_data = tab_item&.getData('file_path')
           }
           on_drag_set_data { |event|
             event.data = event_data
@@ -763,28 +763,28 @@ module Glimmer
               project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
             end
           }
-          async_exec {
+          async_exec do
             Gladiator.drag = false
             @progress_shell&.close
             @progress_shell = nil
             @loaded_config = true
-          }
+          end
         }
-        async_exec {
+        async_exec do
           Thread.new {
             all_files = open_file_paths1.to_a + open_file_paths2.to_a
             all_files.each do |file|
               project_dir.find_child_file(file)&.dirty_content
             end
           }
-        }
+        end
       else
         @loaded_config = true
       end
     end
 
     def save_config
-      return if !@loaded_config || body_root&.disposed?
+      return if !@loaded_config || body_root&.disposed? || @paused_save_config
       child = project_dir.selected_child
       return if child.nil?
       tab_folder1 = @tab_folder1 || @current_tab_folder
@@ -915,14 +915,23 @@ module Glimmer
       async_exec {
         @progress_shell.open
       }
-      async_exec {
+      async_exec do
         gladiator(project_dir_path: selected_directory) {
           on_swt_show {
-            body_root.close if app_mode?
+            @@app_mode_shell.hide if app_mode?
             @progress_shell.close
             @progress_shell = nil
           }
         }.open if selected_directory
+      end
+    end
+    
+    def quit
+      @@quitting = true
+      display.shells.each { |shell|
+        gladiator = shell.get_data('custom_shell')
+        gladiator.project_dir.selected_child&.write_dirty_content unless app_mode?
+        shell.get_data('proxy').close
       }
     end
     

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.18.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.0
+        version: 4.20.16.0
   name: glimmer-dsl-swt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.18.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.0
+        version: 4.20.16.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
   name: filewatcher
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.5
   name: clipboard
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -93,13 +87,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.5
   name: warbler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 9.2.19.0
+  name: jruby-jars
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 9.2.19.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -107,8 +115,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,7 +135,6 @@ executables:
 - gladiator-setup
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -174,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.6
 signing_key:
 specification_version: 4
 summary: Gladiator (Glimmer Editor) - Glimmer Custom Shell - Text Editor Built in