glimmer-dsl-swt 4.20.15.2 → 4.21.0.0

data/samples/hello/hello_canvas.rb

@@ -33,12 +33,12 @@ class HelloCanvas
   end
   
   after_body do
-    Thread.new {
+    Thread.new do
       'Picasso'.chars.each do |character|
         sleep(1)
         self.artist += character
       end
-    }
+    end
   end
   
   body {
@@ -48,6 +48,7 @@ class HelloCanvas
     
       @canvas = canvas {
         background :yellow
+        
         rectangle(0, 0, 220, 400) {
           background rgb(255, 0, 0)
         }
@@ -59,7 +60,7 @@ class HelloCanvas
           rectangle([:default, -70], :default, :default, [:default, 1]) {
             foreground :cyan
             text {
-              string <=> [self, :artist]
+              string <= [self, :artist]
               x :default, 1 # add 1 pixel to default x (shape centered within parent horizontally)
               y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
               background :yellow
@@ -69,16 +70,16 @@ class HelloCanvas
           }
           rectangle(155, 30) { # width and height are assumed to be the default (calculated from children)
             foreground :yellow
-            3.times { |n|
+            3.times do |n|
               line(45, 70 + n*10, 65 + n*10, 30 + n*10) {
                 foreground :yellow
               }
-            }
-            10.times {|n|
+            end
+            10.times do |n|
               point(15 + n*5, 50 + n*5) {
                 foreground :yellow
               }
-            }
+            end
             polyline(45, 60, 55, 20, 65, 60, 85, 80, 45, 60)
             image(@image_object, 0, 5)
           }
@@ -106,71 +107,71 @@ class HelloCanvas
           menu_item {
             text 'Change Background Color...'
             enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background) && shape.background }]
-            on_widget_selected {
+            on_widget_selected do
               @selected_shape&.background = color_dialog.open
               self.selected_shape = nil
-            }
+            end
           }
           menu_item {
             text 'Change Background Pattern Color 1...'
             enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
-            on_widget_selected {
+            on_widget_selected do
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
                 background_pattern_args[5] = color_dialog.open
                 @selected_shape.background_pattern = background_pattern_args
                 self.selected_shape = nil
               end
-            }
+            end
           }
           menu_item {
             text 'Change Background Pattern Color 2...'
             enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
-            on_widget_selected {
+            on_widget_selected do
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
                 background_pattern_args[6] = color_dialog.open
                 @selected_shape.background_pattern = background_pattern_args
                 self.selected_shape = nil
               end
-            }
+            end
           }
           menu_item(:separator)
           menu_item {
             text 'Change Foreground Color...'
             enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:foreground) && shape.foreground }]
-            on_widget_selected {
+            on_widget_selected do
               @selected_shape&.foreground = color_dialog.open
               self.selected_shape = nil
-            }
+            end
           }
         }
       
-        on_mouse_down { |mouse_event|
+        on_mouse_down do |mouse_event|
           @drag_detected = false
           @canvas.cursor = :hand
           self.selected_shape = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
-        }
+        end
         
-        on_drag_detected { |drag_detect_event|
+        on_drag_detected do |drag_detect_event|
           @drag_detected = true
           @drag_current_x = drag_detect_event.x
           @drag_current_y = drag_detect_event.y
-        }
+        end
         
-        on_mouse_move { |mouse_event|
+        on_mouse_move do |mouse_event|
           if @drag_detected
             @selected_shape&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
             @drag_current_x = mouse_event.x
             @drag_current_y = mouse_event.y
           end
-        }
+        end
         
-        on_menu_detected { |menu_detect_event|
+        on_menu_detected do |menu_detect_event|
           @menu_detected = true
-        }
+        end
         
-        on_mouse_up { |mouse_event|
+        on_mouse_up do |mouse_event|
           @canvas.cursor = :arrow
           @drag_detected = false
           if @menu_detected
@@ -178,7 +179,7 @@ class HelloCanvas
           else
             self.selected_shape = nil
           end
-        }
+        end
       }
     }
   }

data/samples/hello/hello_canvas_path.rb

@@ -37,10 +37,10 @@ shell {
     text 'Regenerate'
     enabled false
     
-    on_widget_selected {
+    on_widget_selected do
       @regenerate = true
       @button.enabled = false
-    }
+    end
   }
   canvas {
     layout_data :fill, :fill, true, true
@@ -71,10 +71,10 @@ shell {
     }
   }
   
-  on_swt_show {
+  on_swt_show do
     @regenerate = true
-    @thread = Thread.new {
-      loop {
+    @thread = Thread.new do
+      loop do
         if @regenerate
           @regenerate = false
           @path1.clear
@@ -107,14 +107,14 @@ shell {
           @button.enabled = true
         end
         sleep(0.1)
-      }
+      end
             
-    }
+    end
     
-  }
+  end
   
-  on_widget_disposed {
+  on_widget_disposed do
     @thread.kill # safe to kill since data is in memory only
-  }
+  end
   
 }.open

data/samples/hello/hello_progress_bar.rb

@@ -107,18 +107,18 @@ class HelloProgressBar
         }
         text "Start"
         
-        on_widget_selected {
+        on_widget_selected do
           # if a previous thread is running, then kill first
           # (killing is not dangerous since it is only a thread about updating progress)
           @current_thread&.kill
-          @current_thread = Thread.new {
+          @current_thread = Thread.new do
             @progress_model.selection = @progress_model.minimum
             (@progress_model.minimum..@progress_model.maximum).to_a.each do |n|
               @progress_model.selection = n
               sleep(@progress_model.delay)
             end
-          }
-        }
+          end
+        end
       }
     }
   }

data/samples/hello/hello_sash_form.rb

@@ -109,9 +109,9 @@ shell {
       foreground :dark_green
       font height: 16
       
-      on_widget_selected {
+      on_widget_selected do
         @sash_form.maximized_control = @green_label.swt_widget
-      }
+      end
     }
     button {
       layout_data(:fill, :center, true, false)
@@ -119,9 +119,9 @@ shell {
       foreground :red
       font height: 16
       
-      on_widget_selected {
+      on_widget_selected do
         @sash_form.maximized_control = @red_label.swt_widget
-      }
+      end
     }
     
     button {
@@ -131,9 +131,9 @@ shell {
       text 'Maximize None'
       font height: 16
       
-      on_widget_selected {
+      on_widget_selected do
         @sash_form.maximized_control = nil
-      }
+      end
     }
   }
 }.open

data/samples/hello/hello_text.rb

@@ -1,12 +1,34 @@
+# Copyright (c) 2007-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.
+
 require 'glimmer-dsl-swt'
 
 class HelloText
   include Glimmer::UI::CustomShell
   
-  attr_accessor :default, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
+  attr_accessor :default, :no_border, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
   
   before_body do
     self.default = 'default is :border style'
+    self.no_border = 'no border'
     self.center = 'centered'
     self.left = 'left-aligned'
     self.right = 'right-aligned'
@@ -32,6 +54,14 @@ class HelloText
         text <=> [self, :default]
       }
       
+      label {
+        text 'text(:none)'
+      }
+      text(:none) { # no border
+        layout_data :fill, :center, true, false
+        text <=> [self, :no_border]
+      }
+      
       label {
         text 'text(:center, :border)'
       }
@@ -69,7 +99,7 @@ class HelloText
       }
       text(:read_only, :border) {
         layout_data :fill, :center, true, false
-        text <=> [self, :read_only]
+        text <= [self, :read_only]
       }
       
       label {

data/samples/hello/hello_tray_item.rb

@@ -105,17 +105,17 @@ class HelloTrayItem
         }
         
         # supported tray item listeners (you can try to add actions to them when needed)
-#         on_swt_Show {
-#         }
+#         on_swt_Show do
+#         end
 #
-#         on_swt_Hide {
-#         }
+#         on_swt_Hide do
+#         end
 #
-#         on_widget_selected {
-#         }
+#         on_widget_selected do
+#         end
 #
-#         on_menu_detected {
-#         }
+#         on_menu_detected do
+#         end
       }
       
       label(:center) {

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.15.2
+  version: 4.21.0.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.5
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -238,6 +238,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  name: psych
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -362,10 +376,10 @@ description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a
   started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets.
   Glimmer also includes native-executable packaging support, sorely lacking in other
   libraries, thus enabling the delivery of desktop apps written in Ruby as truly native
-  DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged
-  Shell Scripts on Linux. Glimmer was the first Ruby gem to bring SWT (Standard Widget
-  Toolkit) to Ruby, thanks to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf
-  speaker and expert.
+  DMG/PKG/APP files on the Mac, MSI/EXE files on Windows, and Gem Packaged Shell Scripts
+  on Linux. Glimmer was the first Ruby gem to bring SWT (Standard Widget Toolkit)
+  to Ruby, thanks to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf speaker
+  and expert.
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -712,7 +726,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)