glimmer-dsl-swt 4.20.3.0 → 4.20.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581c69384ecd98621e42b9c109b26606bd02f971645d560b6a327a2afef193cd
-  data.tar.gz: ff868723057cdcc85357713f63f1bcc449505bb79e28714e1ce95eada387c0e5
+  metadata.gz: 13212fd4b8a440d635d5172b493b979d12a1ec1da94e7ea50c5c55521e4ae80c
+  data.tar.gz: d7c3004d04d20b0c14e8f6f72ac4be6368844e0ecb892962c021414291e3a0d8
 SHA512:
-  metadata.gz: fa48a538274e9a199d9f332d1fec5e3c99d235509673fcf2de5b3c646aa38306a093368adefe5161b81dcc8530b411b5bb1b304700cca4762d655185e5550916
-  data.tar.gz: 1d04d38dcda31ef8c02c015cd558e62dc29ff54ad2e295d548f91633b8b6b6ec5e98dc9ef514c2250e4d90cce1a1764feb3be626af8a843bfb95a07722f2dbc6
+  metadata.gz: 6420272e89fe681bd64d68b4db5dc25ac19a52efd20e00e3a72b840ead51dcb3755396bd1b9e72a6e36b96719348c609c275e2827805809e7ecefdc00727d327
+  data.tar.gz: 40b0acce99bf96c49f5499034271faf126c40b5e8870ff62c9b22bf8f6501448cd7256cf583c30d2928e06572ee02862cae1445feac71427b29ef7d829a09f6c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+### 4.20.4.2
+
+- Hello, Label!
+
+### 4.20.4.1
+
+- Ensure a `table` with `:editable` style loses it if `items <= ...` one-way data-binding (having read_only: true option) was setup.
+- Tweak/refactor/improve samples
+
+### 4.20.4.0
+
+- Extracted Shine data-binding syntax and `BindExpression` to Glimmer 2
+
 ### 4.20.3.0
 
 - Shine data-binding support for `custom widgets`, `custom shells`, and `custom shapes`

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.3.0
+# [<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.4.3
 ## 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,9 +15,9 @@
 [<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.3.0 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 (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.4.3 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 (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 an alpha, so default back to `bind` whenever needed).
+**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).
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
@@ -347,7 +347,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.3.0
+jgem install glimmer-dsl-swt -v 4.20.4.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -375,7 +375,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.3.0'
+gem 'glimmer-dsl-swt', '~> 4.20.4.3'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.3.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.4.3
       
 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.3.0
+4.20.4.3

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -2278,7 +2278,7 @@ Example from [samples/hello/hello_combo.rb](samples/hello_combo.rb) sample (you
 
 #### Shine
 
-**(ALPHA FEATURE)**
+**(BETA FEATURE)**
 
 The new Shine syntax for View/Model Attribute Mapping allows data-binding visually with simple arrow operators in Ruby.
 
@@ -2302,7 +2302,7 @@ text <=> [@contact, :last_name]
 text <= [@contact, :name, computed_by: [:first_name, :last_name]]
 ```
 
-Note that custom widgets and custom shapes are not supported by Shine syntax for data-binding yet, so continue to use `bind` with them for the time being.
+Given that Shine is new, if you encounter any issues, you can use `bind` instead.
 
 Check out [sample code](/samples) for more examples of Shine syntax in action, such as [Hello, Computed!](/docs/reference/GLIMMER_SAMPLES.md#hello-computed).
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -2,6 +2,7 @@
   - [Hello Samples](#hello-samples)
     - [Hello, World!](#hello-world)
     - [Hello, Button!](#hello-button)
+    - [Hello, Label!](#hello-label)
     - [Hello, Text!](#hello-text)
     - [Hello, Composite!](#hello-composite)
     - [Hello, Layout!](#hello-layout)
@@ -117,6 +118,28 @@ Hello, Button! Incremented 7 times!
 
 ![Hello Button Incremented](/images/glimmer-hello-button-incremented.png)
 
+#### Hello, Label!
+
+This sample demonstrates the use of the `label` widget in Glimmer.
+
+Code:
+
+[samples/hello/hello_label.rb](/samples/hello/hello_label.rb)
+
+![Hello Label Left Aligned](/images/glimmer-hello-label-left-aligned.png)
+
+![Hello Label Center Aligned](/images/glimmer-hello-label-center-aligned.png)
+
+![Hello Label Right Aligned](/images/glimmer-hello-label-right-aligned.png)
+
+![Hello Label Images](/images/glimmer-hello-label-images.png)
+
+![Hello Label Background Images](/images/glimmer-hello-label-background_images.png)
+
+![Hello Label Horizontal Separator](/images/glimmer-hello-label-horizontal-separator.png)
+
+![Hello Label Vertical Separator](/images/glimmer-hello-label-vertical-separator.png)
+
 #### Hello, Text!
 
 This sample demonstrates the use of the `text` widget in Glimmer, including data-binding (e.g. via the `<=>` operator) and event handling.

data/lib/glimmer-dsl-swt.rb

@@ -30,6 +30,7 @@ if !['', 'false'].include?(ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase)
 end
 require 'java'
 require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
+require 'concurrent-ruby' # ensures glimmer relies on Concurrent data-structure classes (e.g. Concurrent::Array)
 require 'glimmer'
 require 'logging'
 require 'nested_inherited_jruby_include_package'

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -39,6 +39,7 @@ module Glimmer
         @model_binding = model_binding
         @read_only_sort = @model_binding.binding_options[:read_only_sort]
         @column_properties = @model_binding.binding_options[:column_properties] || @model_binding.binding_options[:column_attributes] || column_properties
+        @table.editable = false if @model_binding.binding_options[:read_only]
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties
         else # assume custom widget

data/lib/glimmer/dsl/swt/bind_expression.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
@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/bind_expression'
 require 'glimmer/data_binding/model_binding'
 
 module Glimmer
@@ -30,28 +31,7 @@ module Glimmer
       # DataBindingCommandHandler for text and selection properties on Text and Spinner
       # or TableItemsDataBindingCommandHandler for items in a Table
       class BindExpression < StaticExpression
-        def can_interpret?(parent, keyword, *args, &block)
-          (
-            keyword == 'bind' and
-              (
-                (
-                  (args.size == 2) and
-                    textual?(args[1])
-                ) ||
-                  (
-                    (args.size == 3) and
-                      textual?(args[1]) and
-                      (args[2].is_a?(Hash))
-                  )
-              )
-          )
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          binding_options = args[2] || {}
-          binding_options[:on_read] = binding_options.delete(:on_read) || binding_options.delete('on_read') || block
-          DataBinding::ModelBinding.new(args[0], args[1].to_s, binding_options)
-        end
+        include Glimmer::DSL::BindExpression
       end
     end
   end

data/samples/elaborate/timer.rb

@@ -6,7 +6,7 @@ class Timer
   
   import 'javax.sound.sampled'
 
-  FILE_SOUND_ALARM = File.expand_path(File.join('timer', 'alarm1.wav'), __dir__)
+  FILE_SOUND_ALARM = File.expand_path(File.join('timer', 'sounds', 'alarm1.wav'), __dir__)
   COMMAND_KEY = OS.mac? ? :command : :ctrl
       
   ## Add options like the following to configure CustomShell by outside consumers

data/samples/elaborate/weather.rb

@@ -29,6 +29,7 @@ class Weather
   
   DEFAULT_FONT_HEIGHT = 30
   DEFAULT_FOREGROUND = :white
+  DEFAULT_BACKGROUND = rgb(135, 176, 235)
   
   attr_accessor :city, :temp, :temp_min, :temp_max, :feels_like, :humidity
   
@@ -54,7 +55,7 @@ class Weather
             
       text 'Glimmer Weather'
       minimum_size 400, 300
-      background rgb(135, 176, 235)
+      background DEFAULT_BACKGROUND
       
       text {
         layout_data(:center, :center, true, true)
@@ -78,7 +79,7 @@ class Weather
             grid_layout 2, false
             
             text temp_unit
-            background :transparent
+            background DEFAULT_BACKGROUND
             
             rectangle(0, 0, [:default, -2], [:default, -2], 15, 15) {
               foreground DEFAULT_FOREGROUND
@@ -128,8 +129,8 @@ class Weather
     @weather_mutex.synchronize do
       self.weather_data = JSON.parse(Net::HTTP.get('api.openweathermap.org', "/data/2.5/weather?q=#{city}&appid=1d16d70a9aec3570b5cbd27e6b421330"))
     end
-  rescue
-    # No Op
+  rescue => e
+    Glimmer::Config.logger.error "Unable to fetch weather due to error: #{e.full_message}"
   end
   
   def weather_data=(data)
@@ -148,14 +149,17 @@ class Weather
   end
   
   def kelvin_to_celsius(kelvin)
+    return nil if kelvin.nil?
     kelvin - 273.15
   end
   
   def celsius_to_fahrenheit(celsius)
+    return nil if celsius.nil?
     (celsius * 9 / 5 ) + 32
   end
   
   def kelvin_to_fahrenheit(kelvin)
+    return nil if kelvin.nil?
     celsius_to_fahrenheit(kelvin_to_celsius(kelvin))
   end
   

data/samples/hello/hello_c_tab.rb

@@ -44,7 +44,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/usa.png', __dir__)
+          image File.expand_path('images/usa.png', __dir__)
           
           label {
             text 'Hello, World!'
@@ -58,7 +58,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/france.png', __dir__)
+          image File.expand_path('images/france.png', __dir__)
           
           label {
             text 'Bonjour, Univers!'
@@ -72,7 +72,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/mexico.png', __dir__)
+          image File.expand_path('images/mexico.png', __dir__)
           
           label {
             text 'Hola, Mundo!'
@@ -86,7 +86,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/germany.png', __dir__)
+          image File.expand_path('images/germany.png', __dir__)
 
           label {
             text 'Hallo, Welt!'
@@ -100,7 +100,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/italy.png', __dir__)
+          image File.expand_path('images/italy.png', __dir__)
 
           label {
             text 'Ciao, Mondo!'
@@ -114,7 +114,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/netherlands.png', __dir__)
+          image File.expand_path('images/netherlands.png', __dir__)
 
           label {
             text 'Hallo, Wereld!'
@@ -128,7 +128,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/denmark.png', __dir__)
+          image File.expand_path('images/denmark.png', __dir__)
 
           label {
             text 'Hej, Verden!'
@@ -142,7 +142,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/finland.png', __dir__)
+          image File.expand_path('images/finland.png', __dir__)
 
           label {
             text 'Hei, Maailma!'
@@ -156,7 +156,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/norway.png', __dir__)
+          image File.expand_path('images/norway.png', __dir__)
 
           label {
             text 'Hei, Verden!'

data/samples/hello/hello_computed.rb

@@ -21,9 +21,27 @@
 
 require 'glimmer-dsl-swt'
 
-require_relative 'hello_computed/contact'
-
 class HelloComputed
+  class Contact
+    attr_accessor :first_name, :last_name, :year_of_birth
+  
+    def initialize(attribute_map)
+      @first_name = attribute_map[:first_name]
+      @last_name = attribute_map[:last_name]
+      @year_of_birth = attribute_map[:year_of_birth]
+    end
+  
+    def name
+      "#{last_name}, #{first_name}"
+    end
+  
+    def age
+      Time.now.year - year_of_birth.to_i
+    rescue
+      0
+    end
+  end
+
   include Glimmer::UI::CustomShell
 
   before_body {

data/samples/hello/hello_custom_shell.rb

@@ -88,12 +88,10 @@ class EmailShell
 end
 
 class HelloCustomShell
-  include Glimmer::UI::CustomShell
-  
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
   EmailSystem = Struct.new(:emails, keyword_init: true)
   
-  before_body {
+  def initialize
     @email_system = EmailSystem.new(
       emails: [
         Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
@@ -104,10 +102,10 @@ class HelloCustomShell
         Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
       ]
     )
-  }
+  end
   
-  body {
-    shell {
+  def launch
+    shell { |shell_proxy|
       grid_layout
       
       text 'Hello, Custom Shell!'
@@ -142,11 +140,19 @@ class HelloCustomShell
         
         on_mouse_up { |event|
           email = event.table_item.get_data
-          email_shell(parent_shell: self, date: email.date, subject: email.subject, from: email.from, message: email.message).open
+          
+          # open a custom email shell
+          email_shell(
+            parent_shell: shell_proxy,
+            date: email.date,
+            subject: email.subject,
+            from: email.from,
+            message: email.message
+          ).open
         }
       }
-    }
-  }
+    }.open
+  end
 end
 
-HelloCustomShell.launch
+HelloCustomShell.new.launch

data/samples/hello/hello_label.rb

@@ -0,0 +1,194 @@
+# 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 HelloLabel
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Label!'
+    
+      tab_folder {
+        tab_item {
+          text 'left-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:left) { # :left is default in English, so it is unnecessary
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'center-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:center) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'right-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:right) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'images'
+          
+          grid_layout 2, true
+          
+          ['denmark', 'finland', 'norway'].each do |image_name|
+            label {
+              layout_data :fill, :center, true, false
+              image File.expand_path("images/#{image_name}.png", __dir__)
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'background images'
+          
+          grid_layout 2, true
+          
+          ['italy', 'france', 'mexico'].each do |image_name|
+            label {
+              layout_data :center, :center, true, false
+              background_image File.expand_path("images/#{image_name}.png", __dir__)
+              text image_name.capitalize
+              font height: 26, style: :bold
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'horizontal separator'
+          
+          grid_layout 2, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label(:separator, :horizontal) {
+            layout_data(:fill, :center, true, false) {
+              horizontal_span 2
+            }
+          }
+                    
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+        }
+        
+        tab_item {
+          text 'vertical separator'
+          
+          grid_layout 3, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          label(:separator, :vertical) {
+            layout_data(:center, :center, false, false) {
+              vertical_span 3
+            }
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 3"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 3"
+          }
+        }
+        
+      }
+      
+    }
+    
+  }
+end
+
+HelloLabel.launch

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.3.0
+  version: 4.20.4.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.0
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -104,6 +104,46 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: jruby-win32ole
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -198,26 +238,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: jruby-win32ole
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -390,7 +410,6 @@ files:
 - lib/glimmer/Rakefile
 - lib/glimmer/data_binding/list_selection_binding.rb
 - lib/glimmer/data_binding/observable_widget.rb
-- lib/glimmer/data_binding/shine.rb
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/data_binding/tree_items_binding.rb
 - lib/glimmer/data_binding/widget_binding.rb
@@ -542,7 +561,6 @@ files:
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb
 - samples/elaborate/timer.rb
-- samples/elaborate/timer/alarm1.wav
 - samples/elaborate/timer/sounds/alarm1.wav
 - samples/elaborate/user_profile.rb
 - samples/elaborate/weather.rb
@@ -550,15 +568,6 @@ files:
 - samples/hello/hello_button.rb
 - samples/hello/hello_c_combo.rb
 - samples/hello/hello_c_tab.rb
-- samples/hello/hello_c_tab/denmark.png
-- samples/hello/hello_c_tab/finland.png
-- samples/hello/hello_c_tab/france.png
-- samples/hello/hello_c_tab/germany.png
-- samples/hello/hello_c_tab/italy.png
-- samples/hello/hello_c_tab/mexico.png
-- samples/hello/hello_c_tab/netherlands.png
-- samples/hello/hello_c_tab/norway.png
-- samples/hello/hello_c_tab/usa.png
 - samples/hello/hello_canvas.rb
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_animation_data_binding.rb
@@ -572,7 +581,6 @@ files:
 - samples/hello/hello_combo.rb
 - samples/hello/hello_composite.rb
 - samples/hello/hello_computed.rb
-- samples/hello/hello_computed/contact.rb
 - samples/hello/hello_cool_bar.rb
 - samples/hello/hello_cursor.rb
 - samples/hello/hello_custom_shape.rb
@@ -586,6 +594,7 @@ files:
 - samples/hello/hello_file_dialog.rb
 - samples/hello/hello_font_dialog.rb
 - samples/hello/hello_group.rb
+- samples/hello/hello_label.rb
 - samples/hello/hello_layout.rb
 - samples/hello/hello_link.rb
 - samples/hello/hello_list_multi_selection.rb
@@ -608,6 +617,15 @@ files:
 - samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb
+- samples/hello/images/denmark.png
+- samples/hello/images/finland.png
+- samples/hello/images/france.png
+- samples/hello/images/germany.png
+- samples/hello/images/italy.png
+- samples/hello/images/mexico.png
+- samples/hello/images/netherlands.png
+- samples/hello/images/norway.png
+- samples/hello/images/usa.png
 - sounds/metronome-down.wav
 - sounds/metronome-up.wav
 - vendor/swt/linux/swt.jar

data/lib/glimmer/data_binding/shine.rb

@@ -1,60 +0,0 @@
-# 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 DataBinding
-    class Shine
-      include Glimmer
-      
-      def initialize(parent, parent_attribute)
-        @parent = parent
-        @parent_attribute = parent_attribute
-      end
-    
-      alias original_compare <=>
-    
-      def <=>(other)
-        if other.is_a?(Array)
-          args_clone = other.clone
-          @parent.content {
-            send(@parent_attribute, bind(*args_clone))
-          }
-        else  # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
-          original_compare(other)
-        end
-      end
-    
-      def <=(other)
-        if other.is_a?(Array)
-          args_clone = other.clone
-          if args_clone.last.is_a?(Hash)
-            args_clone.last[:read_only] = true
-          else # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
-            args_clone << {read_only: true}
-          end
-          @parent.content {
-            send(@parent_attribute, bind(*args_clone))
-          }
-        end
-      end
-    end
-  end
-end

data/samples/hello/hello_computed/contact.rb

@@ -1,42 +0,0 @@
-# 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.
-
-class HelloComputed
-  class Contact
-    attr_accessor :first_name, :last_name, :year_of_birth
-  
-    def initialize(attribute_map)
-      @first_name = attribute_map[:first_name]
-      @last_name = attribute_map[:last_name]
-      @year_of_birth = attribute_map[:year_of_birth]
-    end
-  
-    def name
-      "#{last_name}, #{first_name}"
-    end
-  
-    def age
-      Time.now.year - year_of_birth.to_i
-    rescue
-      0
-    end
-  end
-end