glimmer-cs-gladiator 0.8.2 → 0.8.3

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

@@ -32,7 +32,7 @@ module Glimmer
             text '&File'
   
             menu_item {
-              text 'New &Scratchpad'
+              text 'Open &Scratchpad'
               accelerator COMMAND_KEY, :shift, :s
               enabled editing
               on_widget_selected {
@@ -191,8 +191,8 @@ module Glimmer
             
           styled_text(:border, :h_scroll, :v_scroll) {
             layout_data {
-              width body_root.bounds.width*0.75
-              height body_root.bounds.height*0.75
+              width gladiator.bounds.width*0.75
+              height gladiator.bounds.height*0.75
             }
             
             text message

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

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,6 @@ executables:
 - gladiator-setup
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files: