glimmer-cs-gladiator 0.7.2 → 0.8.3

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

@@ -0,0 +1,67 @@
+module Glimmer
+  class Gladiator
+    class FileEditMenu
+      include Glimmer::UI::CustomWidget
+  
+      # Either receives a gladiator instance for menu bar parent or file instance for text editor parent
+      options :gladiator, :file
+  
+      body {
+        menu { |menu_proxy|
+          text '&Edit' unless menu_proxy.swt_menu_item.nil? # unless used on the text editor directly
+
+          menu_item {
+            text '&Undo'
+            # TODO disable if not undoable
+            
+            on_widget_selected {
+              Command.undo(current_file)
+            }
+          }
+          menu_item {
+            text '&Redo'
+            # TODO disable if not redoable
+            
+            on_widget_selected {
+              Command.redo(current_file)
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Cu&t'
+            
+            on_widget_selected {
+              Command.do(current_file, :cut!)
+            }
+          }
+          menu_item {
+            text '&Copy'
+            
+            on_widget_selected {
+              current_file.copy
+            }
+          }
+          menu_item {
+            text '&Paste'
+            
+            on_widget_selected {
+              Command.do(current_file, :paste!)
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Select &All'
+            
+            on_widget_selected {
+              current_file.select_all
+            }
+          }
+        }
+      }
+  
+      def current_file
+        file.nil? ? gladiator.project_dir.selected_child : file
+      end
+    end
+  end
+end

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

@@ -0,0 +1,216 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Glimmer
+  class Gladiator
+    class GladiatorMenuBar
+      include Glimmer::UI::CustomWidget
+  
+      options :gladiator, :editing
+      
+      body {
+        menu_bar {
+          menu {
+            text '&File'
+  
+            menu_item {
+              text 'Open &Scratchpad'
+              accelerator COMMAND_KEY, :shift, :s
+              enabled editing
+              on_widget_selected {
+                project_dir.selected_child_path = ''
+              }
+            }
+            menu_item {
+              text 'Open &Project...'
+              accelerator COMMAND_KEY, :o
+              on_widget_selected {
+                gladiator.open_project
+              }
+            }
+            menu_item(:separator)
+            menu_item {
+              text '&Quit Project'
+              accelerator COMMAND_KEY, :alt, :q
+              on_widget_selected {
+                gladiator.save_config
+                project_dir.selected_child&.write_dirty_content
+                gladiator.body_root.close
+              }
+            }
+          }
+          if editing
+            file_edit_menu(gladiator: gladiator)
+            menu {
+              text '&View'
+              menu {
+                text '&Split Pane'
+                menu { |menu_proxy|
+                  text '&Orientation'
+                  menu_item(:radio) {
+                    text '&Horizontal'
+                    selection bind(gladiator, :split_orientation,
+                                          on_read: ->(o) { gladiator.split_pane? && o == swt(:horizontal) },
+                                          on_write: ->(b) { b.nil? ? nil : (b ? swt(:horizontal) : swt(:vertical)) })
+                  }
+                  menu_item(:radio) {
+                    text '&Vertical'
+                    selection bind(gladiator, :split_orientation,
+                                          on_read: ->(o) { gladiator.split_pane? && o == swt(:vertical) },
+                                          on_write: ->(b) { b.nil? ? nil : (b ? swt(:vertical) : swt(:horizontal)) })
+                  }
+                }
+                menu_item(:check) {
+                  text '&Maximize Pane'
+                  enabled bind(gladiator, :tab_folder2)
+                  accelerator COMMAND_KEY, :shift, :m
+                  selection bind(gladiator, :maximized_pane)
+                }
+                menu_item {
+                  text 'Reset &Panes'
+                  enabled bind(gladiator, :tab_folder2)
+                  accelerator COMMAND_KEY, :shift, :p
+                  on_widget_selected {
+                    if gladiator.tab_folder2
+                      gladiator.maximized_pane = false
+                      gladiator.tab_folder_sash_form.weights = [1, 1]
+                    end
+                  }
+                }
+                menu_item {
+                  text '&Unsplit'
+                  enabled bind(gladiator, :tab_folder2)
+                  accelerator COMMAND_KEY, :shift, :u
+                  on_widget_selected {
+                    if gladiator.tab_folder2
+                      gladiator.maximized_pane = false
+                      gladiator.navigate_to_next_tab_folder if gladiator.current_tab_folder != gladiator.tab_folder2
+                      gladiator.close_all_tabs(gladiator.tab_folder2)
+                      gladiator.split_orientation = nil
+                      gladiator.body_root.pack_same_size
+                    end
+                  }
+                }
+              }
+              menu_item(:check) {
+                text '&Maximize Editor'
+                accelerator COMMAND_KEY, CONTROL_KEY, :m
+                selection bind(gladiator, :maximized_editor)
+              }
+              menu_item {
+                text '&Reset All'
+                accelerator COMMAND_KEY, CONTROL_KEY, :r
+                on_widget_selected {
+                  gladiator.maximized_editor = false
+                  gladiator.file_area_and_editor_area_sash_form.weights = [1, 5]
+                  gladiator.side_bar_sash_form.weights = [1, 1]
+                  unless gladiator.file_lookup_expand_item.swt_expand_item.get_expanded
+                    gladiator.file_lookup_expand_item.swt_expand_item.set_expanded true
+                    gladiator.file_lookup_expand_item.swt_expand_item.height = gladiator.file_lookup_expand_item_height if gladiator.file_lookup_expand_item_height
+                  end
+                  unless gladiator.file_explorer_expand_item.swt_expand_item.get_expanded
+                    gladiator.file_explorer_expand_item.swt_expand_item.set_expanded true
+                    gladiator.file_explorer_expand_item.swt_expand_item.height = gladiator.file_explorer_expand_item_height if gladiator.file_explorer_expand_item_height
+                  end
+                }
+              }
+            }
+            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
+                    Glimmer::Config.logger.error {e.full_message}
+                    error_dialog(message: e.full_message).open
+                  end
+                }
+              }
+            }
+          end
+          menu {
+            text '&Help'
+            menu_item {
+              text '&About'
+              accelerator COMMAND_KEY, :shift, :a
+              on_widget_selected {
+                gladiator.display_about_dialog
+              }
+            }
+          }
+        }
+      }
+      
+      def project_dir
+        gladiator.project_dir
+      end
+      
+      # Method-based error_dialog custom widget
+      def error_dialog(message:)
+        return if message.nil?
+        dialog(gladiator) { |dialog_proxy|
+          row_layout(:vertical) {
+            center true
+          }
+          
+          text 'Error Launching'
+            
+          styled_text(:border, :h_scroll, :v_scroll) {
+            layout_data {
+              width gladiator.bounds.width*0.75
+              height gladiator.bounds.height*0.75
+            }
+            
+            text message
+            editable false
+            caret nil
+          }
+          
+          button {
+            text 'Close'
+            
+            on_widget_selected {
+              dialog_proxy.close
+            }
+          }
+        }
+      end
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,29 @@
+module Glimmer
+  class Gladiator
+    class ProgressShell
+      include Glimmer::UI::CustomShell
+  
+      option :gladiator
+      option :progress_text, default: 'Work In Progress'
+  
+      body {
+        shell(gladiator.body_root, :title) {
+          fill_layout(:vertical) {
+            margin_width 15
+            margin_height 15
+            spacing 5
+          }
+          
+          text 'Gladiator'
+          
+          label(:center) {
+            text progress_text
+            font height: 20
+          }
+#           @progress_bar = progress_bar(:horizontal, :indeterminate)
+        }
+      }
+  
+    end
+  end
+end

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

@@ -39,7 +39,7 @@ module Glimmer
       body {
         composite {
           grid_layout(2, false)
-          layout_data :fill, :fill, true, true
+          
           @line_numbers_text = styled_text(:multi, :border) {
             layout_data(:right, :fill, false, true)
             text ' '*4
@@ -62,7 +62,7 @@ module Glimmer
             }
           }
           
-          @text_proxy = send(text_widget_keyword) { |the_text|
+          @text_proxy = code_text(language: file.language) {
             layout_data :fill, :fill, true, true
             font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
@@ -71,6 +71,9 @@ module Glimmer
             right_margin 5
             bottom_margin 5
             left_margin 5
+            
+            file_edit_menu(file: file)
+
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|
@@ -97,11 +100,6 @@ module Glimmer
         nil
       end
            
-      def text_widget_keyword
-        is_code_file = file.scratchpad? || file.path.end_with?('.rb')
-        is_code_file ? 'code_text' : 'styled_text'
-      end
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
       def text_widget
         @text_proxy.swt_widget
       end
@@ -127,6 +125,7 @@ module Glimmer
           selection_count bind(self, 'file.selection_count')
           caret_position bind(self, 'file.caret_position')
           top_pixel bind(self, 'file.top_pixel')
+          # key_binding swt(:ctrl, :home), ST::TEXT_START # This seems to make the caret disappear on Windows so disabling for now and relying on key event instead
           on_focus_lost {
             file&.write_dirty_content
           }
@@ -137,11 +136,23 @@ module Glimmer
               key_event.doit = !Command.undo(file)
             elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'a'
               key_event.widget.selectAll
-            elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'a'
-              Command.do(file, :start_of_line)
+            elsif (OS.mac? && key_event.keyCode == swt(:home)) || (!OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :ctrl) && key_event.keyCode == swt(:home))
+              file.home
+              key_event.doit = false
+            elsif (OS.mac? && key_event.keyCode == swt(:home)) || (!OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :ctrl) && key_event.keyCode == swt(:end))
+              file.end
               key_event.doit = false
-            elsif !OS.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e'
-              Command.do(file, :end_of_line)
+            elsif !OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :shift) && key_event.keyCode == swt(:home)
+              file.select_to_start_of_line
+              key_event.doit = false
+            elsif !OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :shift) && key_event.keyCode == swt(:end)
+              file.select_to_end_of_line
+              key_event.doit = false
+            elsif (OS.mac? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'a') || (!OS.mac? && key_event.keyCode == swt(:home))
+              file.start_of_line
+              key_event.doit = false
+            elsif (OS.mac? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e') || (!OS.mac? && key_event.keyCode == swt(:end))
+              file.end_of_line
               key_event.doit = false
             elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
               Command.do(file, :comment_line!)
@@ -170,12 +181,6 @@ module Glimmer
             elsif key_event.keyCode == swt(:page_down)
               file.page_down
               key_event.doit = false
-            elsif key_event.keyCode == swt(:home)
-              file.home
-              key_event.doit = false
-            elsif key_event.keyCode == swt(:end)
-              file.end
-              key_event.doit = false
             elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
               Command.do(file, :move_up!)
               key_event.doit = false
@@ -191,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

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.2
+        version: 4.18.4.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.2
+        version: 4.18.4.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -86,6 +86,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.3.9
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  name: warbler
+  type: :development
+  prerelease: false
+  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:
@@ -108,7 +122,9 @@ description: Gladiator (short for Glimmer Editor) is a Glimmer sample project un
   use Glimmer one day.
 email: andy.am@gmail.com
 executables:
+- glimmer-cs-gladiator
 - gladiator
+- gladiator-setup
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -119,22 +135,30 @@ files:
 - README.md
 - VERSION
 - bin/gladiator
-- bin/gladiator_runner.rb
+- bin/gladiator-setup
+- bin/glimmer-cs-gladiator
 - glimmer-cs-gladiator.gemspec
 - images/glimmer-cs-gladiator-logo.png
 - lib/glimmer-cs-gladiator.rb
+- lib/glimmer-cs-gladiator/launch.rb
 - lib/models/glimmer/gladiator/command.rb
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb
+- lib/views/glimmer/gladiator/file_edit_menu.rb
 - lib/views/glimmer/gladiator/file_explorer_tree.rb
 - lib/views/glimmer/gladiator/file_lookup_list.rb
+- lib/views/glimmer/gladiator/gladiator_menu_bar.rb
+- lib/views/glimmer/gladiator/progress_shell.rb
 - lib/views/glimmer/gladiator/text_editor.rb
 homepage: http://github.com/AndyObtiva/glimmer-cs-gladiator
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: |2+
+
+  To make the gladiator command available system-wide (especially with RVM), make sure you run this command with jruby in path: gladiator-setup
+
 rdoc_options: []
 require_paths:
 - lib