glimmer-dsl-swt 4.18.0.2 → 4.18.2.2

data/lib/glimmer/swt/display_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/widget_listener_proxy'
+require 'glimmer/swt/custom/drawable'
 
 module Glimmer
   module SWT
@@ -36,6 +37,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
+      
+      include Custom::Drawable
 
       OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
@@ -53,6 +56,7 @@ module Glimmer
       attr_reader :swt_display
 
       def initialize(*args)
+        Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       end
@@ -60,6 +64,18 @@ module Glimmer
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
       end
+      
+      def async_exec(&block)
+        @swt_display.async_exec(&block)
+      end
+
+      def sync_exec(&block)
+        @swt_display.sync_exec(&block)
+      end
+
+      def timer_exec(&block)
+        @swt_display.timer_exec(&block)
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)

data/lib/glimmer/swt/font_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/swt/properties.rb

@@ -0,0 +1,49 @@
+# 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.
+
+module Glimmer
+  module SWT
+    module Properties
+      def ruby_attribute_setter(attribute_name)
+        "#{normalized_attribute(attribute_name)}="
+      end
+
+      def attribute_setter(attribute_name)
+        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+
+      def attribute_getter(attribute_name)
+        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+      
+      def normalized_attribute(attribute_name)
+        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
+        attribute_name = attribute_name.underscore unless attribute_name.downcase?
+        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
+        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
+        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
+        attribute_name
+      end
+      alias ruby_attribute_getter normalized_attribute
+      
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -64,10 +64,11 @@ module Glimmer
           @swt_widget.setLayout(FillLayout.new)
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
           # TODO make this an option not the default
+          shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
           on_swt_show do
             Thread.new do
               sleep(0.25)
-              async_exec do
+              shell_swt_display.async_exec do
                 @swt_widget.setActive unless @swt_widget.isDisposed
               end
             end

data/lib/glimmer/swt/widget_proxy.rb

@@ -26,6 +26,8 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
+require 'glimmer/swt/properties'
+require 'glimmer/swt/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -42,6 +44,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
+      include Properties
+      include Custom::Drawable
 
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
@@ -667,28 +671,6 @@ module Glimmer
         DEFAULT_STYLES[underscored_widget_name] || [:none]
       end
 
-      def ruby_attribute_setter(attribute_name)
-        "#{normalized_attribute(attribute_name)}="
-      end
-
-      def attribute_setter(attribute_name)
-        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
-      end
-
-      def attribute_getter(attribute_name)
-        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
-      end
-      
-      def normalized_attribute(attribute_name)
-        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
-        attribute_name = attribute_name.underscore unless attribute_name.downcase?
-        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
-        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
-        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
-        attribute_name
-      end
-      alias ruby_attribute_getter normalized_attribute
-
       # TODO refactor following methods to eliminate duplication
       # perhaps consider relying on raising an exception to avoid checking first
       # unless that gives obscure SWT errors

data/samples/elaborate/meta_sample.rb

@@ -150,7 +150,7 @@ class MetaSampleApplication
   end
   
   def launch
-    Display.setAppName('Glimmer Meta-Sample')
+    Display.app_name = 'Glimmer Meta-Sample'
     shell {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'

data/samples/hello/hello_canvas.rb

@@ -0,0 +1,63 @@
+# 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.
+
+include Glimmer
+
+shell {
+  text 'Hello, Canvas!'
+  minimum_size 320, 400
+
+  canvas {
+    background :yellow
+    rectangle(0, 0, 220, 400, fill: true) {
+      background :red
+    }
+    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
+      background :magenta
+    }
+    rectangle(150, 200, 100, 70, true, gradient: true) {
+      background :dark_magenta
+      foreground :yellow
+    }
+    rectangle(50, 200, 30, 70, false, gradient: true) {
+      background :magenta
+      foreground :dark_blue
+    }
+    rectangle(205, 50, 88, 96) {
+      foreground :yellow
+    }
+    text('Picasso', 60, 80) {
+      background :yellow
+      foreground :dark_magenta
+      font name: 'Courier', height: 30
+    }
+    oval(110, 310, 100, 100, fill: true) {
+      background rgb(128, 138, 248)
+    }
+    arc(210, 210, 100, 100, 30, -77, fill: true) {
+      background :red
+    }
+    polygon(250, 210, 260, 170, 270, 210, 290, 230, fill: true) {
+      background :dark_yellow
+    }
+    polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
+  }
+}.open

data/samples/hello/hello_canvas_animation.rb

@@ -0,0 +1,66 @@
+# 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.
+
+include Glimmer
+
+shell {
+  text 'Hello, Canvas Animation!'
+  minimum_size 800, 420
+
+  canvas {
+    animation {
+      every 0.01 # in seconds (one hundredth)
+            
+      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
+        background rgb(index%255, 100, 200) # sets canvas background color
+        
+        oval(0, 0, 400, 400) { # x, y, width, height
+          foreground :black # sets oval background color
+        }
+        arc(0, 0, 400, 400, -1.4*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
+          background rgb(200, 200, 50) # sets arc background color
+        }
+      }
+    }
+  }
+
+  canvas {
+    colors = [:yellow, :red]
+    animation {
+      every 0.25 # in seconds (one quarter)
+      cycle colors # cycles array of colors into the second variable of the frame block below
+
+      frame { |index, color| # frame block loops indefinitely (unless frame_count or cycle_count is set to an integer)
+        outside_color = colors[index % 2]
+        inside_color = colors[(index + 1) % 2]
+        
+        background outside_color # sets canvas background color
+        
+        rectangle(0, 0, 200, 200, fill: true) {
+          background inside_color # sets rectangle background color
+        }
+        rectangle(200, 200, 200, 200, fill: true) {
+          background inside_color # sets rectangle background color
+        }
+      }
+    }
+  }
+}.open

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.0.2
+  version: 4.18.2.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -330,18 +330,20 @@ dependencies:
         version: 0.7.0
 description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI
   cross-platform desktop development library written in JRuby, an OS-threaded faster
-  version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables
-  productive and efficient authoring of desktop application user-interfaces while
-  relying on the robust Eclipse SWT library. Glimmer additionally innovates by having
-  built-in data-binding support, which greatly facilitates synchronizing the GUI with
-  domain models, thus achieving true decoupling of object oriented components and
-  enabling developers to solve business problems (test-first) without worrying about
-  GUI concerns, or alternatively drive development GUI-first, and then write clean
-  business models (test-first) afterwards. To get 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.
+  JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables
+  productive and efficient authoring of desktop application user-interfaces by relying
+  on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in
+  data-binding support, which greatly facilitates synchronizing the GUI with domain
+  models, thus achieving true decoupling of object oriented components and enabling
+  developers to solve business problems (test-first) without worrying about GUI concerns,
+  or alternatively drive development GUI-first, and then write clean business models
+  (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets,
+  but it also supports drawing Canvas Graphics like Shapes and Animations. To get
+  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.
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -373,6 +375,7 @@ files:
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/data_binding/tree_items_binding.rb
 - lib/glimmer/data_binding/widget_binding.rb
+- lib/glimmer/dsl/swt/animation_expression.rb
 - lib/glimmer/dsl/swt/async_exec_expression.rb
 - lib/glimmer/dsl/swt/bind_expression.rb
 - lib/glimmer/dsl/swt/block_property_expression.rb
@@ -404,6 +407,7 @@ files:
 - lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/rgb_expression.rb
 - lib/glimmer/dsl/swt/rgba_expression.rb
+- lib/glimmer/dsl/swt/shape_expression.rb
 - lib/glimmer/dsl/swt/shell_expression.rb
 - lib/glimmer/dsl/swt/swt_expression.rb
 - lib/glimmer/dsl/swt/sync_exec_expression.rb
@@ -420,9 +424,12 @@ files:
 - lib/glimmer/rake_task/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/cursor_proxy.rb
+- lib/glimmer/swt/custom/animation.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/code_text.rb
+- lib/glimmer/swt/custom/drawable.rb
 - lib/glimmer/swt/custom/radio_group.rb
+- lib/glimmer/swt/custom/shape.rb
 - lib/glimmer/swt/date_time_proxy.rb
 - lib/glimmer/swt/directory_dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
@@ -436,6 +443,7 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
+- lib/glimmer/swt/properties.rb
 - lib/glimmer/swt/sash_form_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
@@ -463,6 +471,8 @@ files:
 - samples/elaborate/user_profile.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_button.rb
+- samples/hello/hello_canvas.rb
+- samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_combo.rb