glimmer-cs-gladiator 0.8.1 → 0.9.2

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

@@ -1,64 +1,63 @@
-# 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)
+          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 {
@@ -49,7 +49,7 @@ module Glimmer
             menu_item(:separator)
             menu_item {
               text '&Quit Project'
-              accelerator COMMAND_KEY, :alt, :q
+              accelerator :alt, :f4
               on_widget_selected {
                 gladiator.save_config
                 project_dir.selected_child&.write_dirty_content
@@ -58,6 +58,7 @@ module Glimmer
             }
           }
           if editing
+            file_edit_menu(gladiator: gladiator)
             menu {
               text '&View'
               menu {
@@ -154,12 +155,8 @@ module Glimmer
                   begin
                     project_dir.selected_child.run
                   rescue Exception => e
-                    dialog {
-                      text 'Run - Ruby - Error Encountered!'
-                      label {
-                        text e.full_message
-                      }
-                    }.open
+                    Glimmer::Config.logger.error {e.full_message}
+                    error_dialog(message: e.full_message).open
                   end
                 }
               }
@@ -182,6 +179,36 @@ module Glimmer
         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

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

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

@@ -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|
@@ -139,6 +142,12 @@ module Glimmer
             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? && 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
@@ -187,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