glimmer-dsl-swt 4.20.13.17 → 4.20.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc6c92bf35a9a28f26f3a34a735f5e900f294b70ffcd7ee7dc3ff9cd4a6b360
-  data.tar.gz: 900a03b90b78756a42a8407438ab380a2e856194ee1346651780049bc678bced
+  metadata.gz: 3563ef87997628bd87b78de0900279aefcde38f911e2be4a786dfd8a48d5c2f7
+  data.tar.gz: aab8501a3e614bafa0cf6e9cbae5b326dd0d9acdeb201a41799734f7d322bbae
 SHA512:
-  metadata.gz: d5cd116baea369efa9131cf6ee45b44b40e6ac7c4e1a5a79f6572b4d69f61885edd291c38b2b83b5cdbdabbb17d660559025891649bbb580acff4d30bdae1758
-  data.tar.gz: 99c8aa855ec1a72923c7c9725a92f81bd5d5c5c568b7defc9a02ac3bcfc26fa82c6233cc0832ec578400b2131c13a679d8a0e04a0ec10ff37aaca1bc44d41086
+  metadata.gz: 660347ec9199923ab6b12021b5bc920b83cacc67f76f50f883ace45b5cb3fb2523638a513b45e33bcea250fdd69376d508db26de69534662dfdcd6e5dd524a30
+  data.tar.gz: 4f490bd3cf9035acf624e83dfd0a071385796d4cebcacb205bdd9c3113f96d7f7ca9c0e625ffaed96c8a17fa4d78b04153eb6d0bc1ef7fc269c29334bd679f52

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+### 4.20.14.1
+
+- Upgrade to Glimmer 2.1.1
+- Correct Hello, Slider! sample class name
+
+### 4.20.14.0
+
+- Extract ObserveExpression into Glimmer
+- Upgrade to Glimmer 2.1.0
+
+### 4.20.13.18
+
+- Change `arrow` widget default SWT style to include `:down`
+- Hello, Arrow! sample
+
 ### 4.20.13.17
 
 - Hello, Slider! sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.13.17
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.14.2
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.17 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.14.2 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -321,7 +321,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.17
+jgem install glimmer-dsl-swt -v 4.20.14.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -349,7 +349,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.20.13.17'
+gem 'glimmer-dsl-swt', '~> 4.20.14.2'
 ```
 
 And, then run:
@@ -370,7 +370,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.17
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.14.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.13.17
+4.20.14.2

data/docs/reference/GLIMMER_SAMPLES.md

@@ -14,11 +14,13 @@
     - [Hello, List Single Selection!](#hello-list-single-selection)
     - [Hello, List Multi Selection!](#hello-list-multi-selection)
     - [Hello, Computed!](#hello-computed)
+    - [Hello, Toggle!](#hello-toggle)
     - [Hello, Message Box!](#hello-message-box)
     - [Hello, Browser!](#hello-browser)
     - [Hello, Drag and Drop!](#hello-drag-and-drop)
     - [Hello, Menu Bar!](#hello-menu-bar)
     - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+    - [Hello, Arrow!](#hello-arrow)
     - [Hello, Custom Widget!](#hello-custom-widget)
     - [Hello, Custom Shell!](#hello-custom-shell)
     - [Hello, Sash Form!](#hello-sash-form)
@@ -33,6 +35,7 @@
     - [Hello, File Dialog!](#hello-file-dialog)
     - [Hello, Date Time!](#hello-date-time)
     - [Hello, Scale!](#hello-scale)
+    - [Hello, Slider!](#hello-slider)
     - [Hello, Spinner!](#hello-spinner)
     - [Hello, Table!](#hello-table)
     - [Hello, Link!](#hello-link)
@@ -313,6 +316,30 @@ Code:
 
 ![Hello Browser](/images/glimmer-hello-computed.png)
 
+#### Hello, Toggle!
+
+This sample demonstrates the use of `toggle` button (aka `button(:toggle)`)
+
+Code:
+
+[samples/hello/hello_toggle.rb](/samples/hello/hello_toggle.rb)
+
+![Hello Toggle](/images/glimmer-hello-toggle.png)
+
+![Hello Toggle Red](/images/glimmer-hello-toggle-red.png)
+
+![Hello Toggle Green](/images/glimmer-hello-toggle-green.png)
+
+![Hello Toggle Blue](/images/glimmer-hello-toggle-blue.png)
+
+![Hello Toggle Red Green](/images/glimmer-hello-toggle-red-green.png)
+
+![Hello Toggle Red Blue](/images/glimmer-hello-toggle-red-blue.png)
+
+![Hello Toggle Green Blue](/images/glimmer-hello-toggle-green-blue.png)
+
+![Hello Toggle Red Green Blue](/images/glimmer-hello-toggle-red-green-blue.png)
+
 #### Hello, Message Box!
 
 This sample demonstrates a `message_box` dialog.
@@ -399,6 +426,20 @@ Code:
 ![Hello Pop Up Context Menu](/images/glimmer-hello-pop-up-context-menu.png)
 ![Hello Pop Up Context Menu Popped Up](/images/glimmer-hello-pop-up-context-menu-popped-up.png)
 
+#### Hello, Arrow!
+
+This sample demonstrates `arrow` button (aka `button(:arrow)`).
+
+Code:
+
+[samples/hello/hello_arrow.rb](/samples/hello/hello_arrow.rb)
+
+![Hello Arrow](/images/glimmer-hello-arrow.png)
+
+![Hello Arrow Menu](/images/glimmer-hello-arrow-menu.png)
+
+![Hello Arrow Item Selected](/images/glimmer-hello-arrow-item-selected.png)
+
 #### Hello, Custom Widget!
 
 This sample demonstrates the use of a custom widget in Glimmer.
@@ -614,6 +655,18 @@ Hello, Scale!
 
 ![Hello Scale](/images/glimmer-hello-scale.png)
 
+#### Hello, Slider!
+
+This sample demonstrates the use of `slider` widget in Glimmer
+
+Code:
+
+[samples/hello/hello_slider.rb](/samples/hello/hello_slider.rb)
+
+Hello, Slider!
+
+![Hello Slider](/images/glimmer-hello-slider.png)
+
 #### Hello, Spinner!
 
 This sample demonstrates the use of `spinner` widget in Glimmer

data/lib/glimmer/dsl/swt/bind_expression.rb

@@ -21,7 +21,6 @@
 
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/bind_expression'
-require 'glimmer/data_binding/model_binding'
 
 module Glimmer
   module DSL

data/lib/glimmer/dsl/swt/observe_expression.rb

@@ -21,8 +21,7 @@
 
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
-require 'glimmer/data_binding/observer'
-require 'glimmer/data_binding/model_binding'
+require 'glimmer/dsl/observe_expression'
 require 'glimmer/ui/custom_widget'
 
 module Glimmer
@@ -30,23 +29,10 @@ module Glimmer
     module SWT
       class ObserveExpression < StaticExpression
         include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
 
-        REGEX_NESTED_OR_INDEXED_PROPERTY = /([^\[]+)(\[[^\]]+\])?/
-  
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'observe' and
-            block_given? and
-            (args.size == 2) and
-            textual?(args[1])
-        end
-  
         def interpret(parent, keyword, *args, &block)
-          observer = DataBinding::Observer.proc(&block)
-          if args[1].to_s.match(REGEX_NESTED_OR_INDEXED_PROPERTY)
-            observer_registration = observer.observe(DataBinding::ModelBinding.new(args[0], args[1]))
-          else
-            observer_registration = observer.observe(args[0], args[1])
-          end
+          observer_registration = super
           Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(observer_registration)
           observer_registration
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -48,7 +48,7 @@ module Glimmer
       include Custom::Drawable
 
       DEFAULT_STYLES = {
-        'arrow'               => [:arrow],
+        'arrow'               => [:arrow, :down],
         'button'              => [:push],
         'canvas'              => ([:double_buffered] unless OS.mac?),
         'ccombo'              => [:border],

data/samples/hello/hello_arrow.rb

@@ -0,0 +1,67 @@
+# 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'
+
+include Glimmer
+
+shell {
+  row_layout(:vertical) {
+    fill true
+    center true
+  }
+  
+  text 'Hello, Arrow!'
+  
+  label(:center) {
+    text 'Click the arrow to get a menu.'
+  }
+  
+  arrow { # can be customized by passing `:arrow` SWT style + `:left`, `:right`, `:up`, or `:down` (default)
+    menu {
+      menu_item {
+        text 'Item &1'
+        
+        on_widget_selected do
+          message_box {
+            text 'Item 1'
+            message 'Item 1 selected!'
+          }.open
+        end
+      }
+      menu_item {
+        text 'Item &2'
+        
+        on_widget_selected do
+          message_box {
+            text 'Item 2'
+            message 'Item 2 selected!'
+          }.open
+        end
+      }
+    }
+    
+    on_widget_selected do |event|
+      event.widget.menu.visible = true
+    end
+  }
+    
+}.open

data/samples/hello/hello_slider.rb

@@ -21,7 +21,7 @@
 
 require 'glimmer-dsl-swt'
 
-class HelloScale
+class HelloSlider
   include Glimmer::UI::CustomShell
   
   attr_accessor :value
@@ -55,4 +55,4 @@ class HelloScale
   }
 end
 
-HelloScale.launch
+HelloSlider.launch

data/samples/hello/hello_toggle.rb

@@ -0,0 +1,91 @@
+# 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 HelloToggle
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :red, :green, :blue, :final_color_text, :final_color
+  
+  after_body do
+    observe(self, :red) do
+      update_final_color!
+    end
+    
+    observe(self, :green) do
+      update_final_color!
+    end
+    
+    observe(self, :blue) do
+      update_final_color!
+    end
+  end
+  
+  body {
+    shell {
+      grid_layout 3, true
+       
+      text 'Hello, Toggle!'
+       
+      toggle {
+        layout_data :fill, :center, true, false
+        text 'Red'
+        
+        selection <=> [self, :red]
+      }
+
+      toggle {
+        layout_data :fill, :center, true, false
+        text 'Green'
+        
+        selection <=> [self, :green]
+      }
+
+      toggle {
+        layout_data :fill, :center, true, false
+        text 'Blue'
+        
+        selection <=> [self, :blue]
+      }
+      
+      label(:center) {
+        layout_data {
+          horizontal_span 3
+          horizontal_alignment :fill
+          grab_excess_horizontal_space true
+          height_hint 20
+        }
+        
+        text <= [self, :final_color_text]
+        background <= [self, :final_color]
+      }
+    }
+  }
+  
+  def update_final_color!
+    final_color_symbols = [:red, :green, :blue].map {|color| send(color) ? color : nil}.compact
+    self.final_color_text = final_color_symbols.map {|color_symbol| color_symbol.to_s.capitalize}.join(' + ')
+    self.final_color = final_color_symbols.map {|color_symbol| color(color_symbol)}.reduce {|output_color, color| rgb(output_color.red + color.red, output_color.green + color.green, output_color.blue + color.blue) }
+  end
+end
+
+HelloToggle.launch

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.17
+  version: 4.20.14.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -605,6 +605,7 @@ files:
 - samples/elaborate/timer/sounds/alarm1.wav
 - samples/elaborate/user_profile.rb
 - samples/elaborate/weather.rb
+- samples/hello/hello_arrow.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_button.rb
 - samples/hello/hello_c_combo.rb
@@ -659,6 +660,7 @@ files:
 - samples/hello/hello_table.rb
 - samples/hello/hello_table/baseball_park.png
 - samples/hello/hello_text.rb
+- samples/hello/hello_toggle.rb
 - samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tray_item.rb
 - samples/hello/hello_tree.rb