glimmer-cs-gladiator 0.7.0 → 0.8.1

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

@@ -0,0 +1,31 @@
+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'
+          
+          gladiator_menu_bar(gladiator: gladiator, editing: true)
+          
+          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

@@ -1,3 +1,24 @@
+# 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 TextEditor
@@ -7,6 +28,10 @@ module Glimmer
 
       attr_reader :text_proxy
       
+      before_body {
+        @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
+      }
+      
       after_body {
         load_content
       }
@@ -14,11 +39,11 @@ 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
-            font name: 'Consolas', height: OS.mac? ? 15 : 12
+            font name: @font_name, height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground :dark_blue
             top_margin 5
@@ -37,9 +62,9 @@ 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: 'Consolas', height: OS.mac? ? 15 : 12
+            font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             focus true
             top_margin 5
@@ -72,11 +97,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
@@ -102,6 +122,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
           }
@@ -112,11 +133,17 @@ 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.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e'
-              Command.do(file, :end_of_line)
+            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.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!)
@@ -145,12 +172,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

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.0
+        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.0
+        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,9 +122,12 @@ 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:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -119,20 +136,29 @@ 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_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

data/bin/gladiator_runner.rb

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