glimmer-cs-gladiator 0.8.0 → 0.8.1

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

@@ -1,64 +1,64 @@
-# 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 FileLookupList
-      include Glimmer::UI::CustomWidget
-  
-      options :gladiator, :foreground_color
-  
-      body {
-        list(:border, :h_scroll, :v_scroll) {
-          selection bind(project_dir, :filtered_path)
-#           visible bind(project_dir, 'filter') {|f| pd swt_widget&.get_shell&.get_data('proxy'); swt_widget&.get_shell&.get_data('proxy')&.pack_same_size; !!f}
-          foreground foreground_color
-          on_mouse_up {
-            project_dir.selected_child_path = swt_widget.getSelection.first
-          }
-          on_key_pressed { |key_event|
-            if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-              project_dir.selected_child_path = swt_widget.getSelection.first
-              current_text_editor&.text_widget&.setFocus
-            end
-          }
-          drag_source(DND::DROP_COPY) {
-            transfer :text
-            on_drag_set_data { |event|
-              Gladiator.drag = true
-              list = event.widget.getControl
-              event.data = list.getSelection.first
-            }
-          }
-        }
-      }
-      
-      def project_dir
-        gladiator.project_dir
-      end
-      
-      def current_text_editor
-        gladiator.current_text_editor
-      end
-  
-    end
-  end
-end
+# 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 FileLookupList
+      include Glimmer::UI::CustomWidget
+  
+      options :gladiator, :foreground_color
+  
+      body {
+        list(:border, :h_scroll, :v_scroll) {
+          selection bind(project_dir, :filtered_path)
+#           visible bind(project_dir, 'filter') {|f| pd swt_widget&.get_shell&.get_data('proxy'); swt_widget&.get_shell&.get_data('proxy')&.pack_same_size; !!f}
+          foreground foreground_color
+          on_mouse_up {
+            project_dir.selected_child_path = swt_widget.getSelection.first
+          }
+          on_key_pressed { |key_event|
+            if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+              project_dir.selected_child_path = swt_widget.getSelection.first
+              current_text_editor&.text_widget&.setFocus
+            end
+          }
+          drag_source(DND::DROP_COPY) {
+            transfer :text
+            on_drag_set_data { |event|
+              Gladiator.drag = true
+              list = event.widget.getControl
+              event.data = list.getSelection.first
+            }
+          }
+        }
+      }
+      
+      def project_dir
+        gladiator.project_dir
+      end
+      
+      def current_text_editor
+        gladiator.current_text_editor
+      end
+  
+    end
+  end
+end

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

@@ -111,12 +111,12 @@ module Glimmer
               }
               menu_item(:check) {
                 text '&Maximize Editor'
-                accelerator COMMAND_KEY, :ctrl, :m
+                accelerator COMMAND_KEY, CONTROL_KEY, :m
                 selection bind(gladiator, :maximized_editor)
               }
               menu_item {
                 text '&Reset All'
-                accelerator COMMAND_KEY, :ctrl, :r
+                accelerator COMMAND_KEY, CONTROL_KEY, :r
                 on_widget_selected {
                   gladiator.maximized_editor = false
                   gladiator.file_area_and_editor_area_sash_form.weights = [1, 5]

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

@@ -1,31 +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
+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

@@ -122,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
           }
@@ -132,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.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.windows? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'e'
-              Command.do(file, :end_of_line)
+            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!)
@@ -165,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.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 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.3.5
+        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.3.5
+        version: 4.18.4.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -127,6 +127,7 @@ executables:
 - gladiator-setup
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files: