glimmer-dsl-swt 4.20.4.0 → 4.20.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db094d1b82d81c288c534731f7ea4e43427928f72aee2199d82add75356d382d
-  data.tar.gz: 7e4c4616df9aa65d9850b629d6c710318000b6e6fbcc567891a7bc0ab18aeb54
+  metadata.gz: 8b5a5a713224bb17bff5a0f19e1333a232c71871212e99be452753fe6821e407
+  data.tar.gz: 65c144171a3083704797b01c29b036463b27692461aeb0a11a7698ad24c400a5
 SHA512:
-  metadata.gz: 856fd6405d5b996acc9804123a463ab03894c7b4c417fdbd0ddef2d214fa4f4b00de023d13d62d7107baa18d0d02e847bfe9960459ee7c1003cab487c5fa72a9
-  data.tar.gz: 400bdaea578f97d159c6773f58977b18a3776681c33a714b1a25aa2f66e236d6e1af7111b349ff222d2d8408cfe40148ecabc4459a9d4e6de5d78c93967ca241
+  metadata.gz: 44d93271f4c7504605a23a665cc921bd8c364962f6e992f137c058b0361099593407eee8003ce1aa08cd58e1f36d8302ab3243d34dead3e8718971c25150cca9
+  data.tar.gz: e7921eb7002882585225e4580b02d81f17a471982905263abdaad87482e640edcc686a5ae9be9241dd2b0f9d9f37f0a29cbfc6c7d43e1e1d770c39d60ce7be35

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+### 4.20.5.0
+
+- Relax glimmer-dsl-swt version number when scaffolding custom shape/widget/shell gems. Keep it strict for app development.
+- Explicit support for `tray_item` keyword as nested under `shell`, having `menu` nested under `tray_item`, automating everything relating to using SWT TrayItem (no need to work with the Display System Tray or Menu objects manually).
+- Hello, Tray Item! Sample
+
+### 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.5.0
 ## 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.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.5.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).
 
 **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).
 
@@ -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.5.0
 ```
 
 `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.5.0'
 ```
 
 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.5.0
       
 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.4.0
+4.20.5.0

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)
@@ -51,6 +52,7 @@
     - [Hello, Custom Shape!](#hello-custom-shape)
     - [Hello, Tool Bar!](#hello-tool-bar)
     - [Hello, Cool Bar!](#hello-cool-bar)
+    - [Hello, Tray Item!](#hello-tray-item)
   - [Elaborate Samples](#elaborate-samples)
     - [User Profile](#user-profile)
     - [Login](#login)
@@ -117,6 +119,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.
@@ -919,6 +943,26 @@ Hello, Cool Bar!
 
 ![Hello Cool Bar Reorg3](/images/glimmer-hello-cool-bar-reorg3.png)
 
+#### Hello, Tray Item!
+
+This sample demonstrates the use of `tray_item`, which enables hiding an app (sending to background) and showing again on top of all other apps. It can also show an About Message Box and exit completely if needed.
+
+Code:
+
+[samples/hello/hello_tray_item.rb](/samples/hello/hello_tray_item.rb)
+
+Hello, Tray Item Icon!
+
+![Hello Tray Item Icon](/images/glimmer-hello-tray-item.png)
+
+Hello, Tray Item Icon App!
+
+![Hello Tray Item App](/images/glimmer-hello-tray-item-app.png)
+
+Hello, Tray Item Icon About Message Box!
+
+![Hello Tray Item Åbout](/images/glimmer-hello-tray-item-about.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

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/{samples/hello/hello_computed/contact.rb → lib/glimmer/dsl/swt/tray_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
@@ -19,24 +19,25 @@
 # 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
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/tray_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class TrayExpression < StaticExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          super && parent.is_a?(Glimmer::SWT::DisplayProxy) && args.empty?
+        end
   
-    def age
-      Time.now.year - year_of_birth.to_i
-    rescue
-      0
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TrayProxy.instance
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,48 @@
+# 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/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/tray_proxy'
+require 'glimmer/swt/tray_item_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class TrayItemExpression < StaticExpression
+        include ParentExpression
+        
+        include_package 'org.eclipse.swt.widgets'
+      
+        def can_interpret?(parent, keyword, *args, &block)
+          super and
+            parent.swt_widget.is_a?(Shell) and
+            args.empty?
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TrayItemProxy.new(parent, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/rake_task/scaffold.rb

@@ -106,15 +106,23 @@ module Glimmer
           /vendor/jars/
         MULTI_LINE_STRING
     
-        GEMFILE = <<~MULTI_LINE_STRING
+        GEMFILE_PREFIX = <<~MULTI_LINE_STRING
           # frozen_string_literal: true
           
           source 'https://rubygems.org'
           
           git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
-          
+        MULTI_LINE_STRING
+        GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
+        
           gem 'glimmer-dsl-swt', '~> #{VERSION}'
-          
+        MULTI_LINE_STRING
+        GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
+        
+          gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
+        MULTI_LINE_STRING
+        GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
+        
           group :development do
             gem 'rspec', '~> 3.5.0'
             gem 'juwelier', '2.4.9'
@@ -122,6 +130,8 @@ module Glimmer
             gem 'simplecov', '>= 0'
           end
         MULTI_LINE_STRING
+        APP_GEMFILE = GEMFILE_PREFIX + GEMFILE_APP_MIDFIX + GEMFILE_SUFFIX
+        GEM_GEMFILE = GEMFILE_PREFIX + GEMFILE_GEM_MIDFIX + GEMFILE_SUFFIX
     
         def app(app_name)
           common_app(app_name)
@@ -250,7 +260,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile(custom_shell_name, namespace, gem_name)
           append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
           custom_shell(custom_shell_name, namespace, :gem)
@@ -321,7 +331,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
           custom_widget(custom_widget_name, namespace)
@@ -359,7 +369,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_shape_name, namespace)
           custom_shape(custom_shape_name, namespace)
@@ -418,7 +428,7 @@ module Glimmer
         
         def gemfile(shell_type)
           if shell_type == :desktopify
-            lines = GEMFILE.split("\n")
+            lines = APP_GEMFILE.split("\n")
             require_glimmer_dsl_swt_index = lines.index(lines.detect {|l| l.include?("gem 'glimmer-dsl-swt'") })
             lines[(require_glimmer_dsl_swt_index + 1)..(require_glimmer_dsl_swt_index + 1)] = [
               "",
@@ -428,7 +438,7 @@ module Glimmer
             ]
             lines.join("\n")
           else
-            GEMFILE
+            APP_GEMFILE
           end
         end
     

data/lib/glimmer/swt/menu_proxy.rb

@@ -63,6 +63,9 @@ module Glimmer
           @swt_menu_item.setMenu(swt_widget)
         elsif parent.swt_widget.is_a?(Shell)
           @swt_widget = swt_widget_class.new(parent.swt_widget, style('menu', styles))
+        elsif parent.swt_widget.is_a?(TrayItem)
+          @swt_widget = swt_widget_class.new(parent.shell_proxy.swt_widget, style('menu', styles))
+          parent.menu_proxy = self
         else
           @swt_widget = swt_widget_class.new(parent.swt_widget)
         end
@@ -70,7 +73,18 @@ module Glimmer
         if styles.include?(:bar)
           DisplayProxy.instance.auto_exec { parent.swt_widget.setMenuBar(swt_widget) }
         elsif styles.include?(:pop_up)
-          DisplayProxy.instance.auto_exec { parent.swt_widget.setMenu(swt_widget) }
+          if parent.swt_widget.is_a?(TrayItem)
+            parent.on_widget_selected {
+              self.visible = true
+            }
+            parent.on_menu_detected {
+              self.visible = true
+            }
+          else
+            DisplayProxy.instance.auto_exec {
+              parent.swt_widget.setMenu(swt_widget) unless parent.swt_widget.is_a?(TrayItem)
+            }
+          end
         end
       end
 

data/lib/glimmer/swt/tray_item_proxy.rb

@@ -0,0 +1,44 @@
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/tray_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.TrayItem
+    #
+    # Invoking `#swt_widget` returns the SWT TrayItem object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
+    class TrayItemProxy < Glimmer::SWT::WidgetProxy
+      attr_reader :tray_proxy, :shell_proxy
+      attr_accessor :menu_proxy
+      
+      def initialize(shell_proxy, *args)
+        @shell_proxy = shell_proxy
+        @tray_proxy = Glimmer::SWT::TrayProxy.instance
+        super('tray_item', @tray_proxy, args)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/tray_proxy.rb

@@ -0,0 +1,64 @@
+# 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/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Tray
+    #
+    # Invoking `#swt_widget` returns the SWT Tray object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
+    class TrayProxy
+      class << self
+        def instance
+          @instance ||= new(Glimmer::SWT::DisplayProxy.instance)
+        end
+      end
+      
+      attr_reader :swt_widget
+      
+      def initialize(display_proxy)
+        @swt_widget = display_proxy.getSystemTray
+      end
+      
+      def method_missing(method, *args, &block)
+        @swt_widget.send(method, *args, &block)
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || @swt_widget.respond_to?(method, *args, &block)
+      end
+      
+      def post_initialize_child(child)
+        # No Op
+      end
+
+      # Subclasses may override to perform post add_content work.
+      # Make sure its logic detects if it ran before since it could run multiple times
+      # when adding content multiple times post creation.
+      def post_add_content
+        # No Op
+      end
+    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

data/samples/hello/hello_tray_item.rb

@@ -0,0 +1,135 @@
+# 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 HelloTrayItem
+  include Glimmer::UI::CustomShell
+  
+  # boolean that indicates if application is visible
+  attr_accessor :show_application
+  
+  before_body {
+    # application starts visible
+    @show_application = true
+    # pre-render an icon image using the Canvas Shape DSL
+    @image = image(16, 16) {
+      rectangle(0, 0, 16, 16) {
+        background :black
+      }
+      oval(1, 1, [:default, - 2], [:default, - 2]) {
+        foreground :white
+      }
+      oval(3, 3, [:default, - 6], [:default, - 6]) {
+        foreground :white
+      }
+      oval(5, 5, [:default, - 10], [:default, - 10]) {
+        foreground :white
+      }
+      oval(7, 7, [:default, - 14], [:default, - 14]) {
+        foreground :white
+      }
+    }
+  }
+  
+  body {
+    shell(:shell_trim, :on_top) { # make it always appear on top of everything
+      row_layout(:vertical) {
+        center true
+      }
+      text 'Hello, Tray Item!'
+      
+      on_shell_closed do |event|
+        # do not perform event that closes app when shell is closed
+        event.doit = false
+        # body_root is the root shell
+        body_root.hide
+        self.show_application = false # updates Show Application checkbox menu item indirectly
+      end
+      
+      tray_item {
+        tool_tip_text 'Glimmer'
+        image @image # could use an image path instead
+
+        menu {
+          menu_item {
+            text 'About'
+
+            on_widget_selected do
+              message_box {
+                text 'Glimmer - About'
+                message 'This is a Glimmer DSL for SWT Tray Item'
+              }.open
+            end
+          }
+          menu_item(:separator)
+          menu_item(:check) {
+            text 'Show Application'
+            selection <=> [self, :show_application]
+            
+            on_widget_selected do
+              # body_root is the root shell
+              if body_root.visible?
+                body_root.hide
+              else
+                body_root.show
+              end
+            end
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Exit'
+
+            on_widget_selected {
+              exit(0)
+            }
+          }
+        }
+        
+        # supported tray item listeners (you can try to add actions to them when needed)
+#         on_swt_Show {
+#         }
+#
+#         on_swt_Hide {
+#         }
+#
+#         on_widget_selected {
+#         }
+#
+#         on_menu_detected {
+#         }
+      }
+      
+      label(:center) {
+        text 'This is the application'
+        font height: 30
+      }
+      label {
+        text 'Click on the tray item (circles icon) to open its menu'
+      }
+      label {
+        text 'Uncheck Show Application to hide the app and recheck it to show the app'
+      }
+    }
+  }
+end
+
+HelloTrayItem.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.4.0
+  version: 4.20.5.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +457,8 @@ files:
 - lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/timer_exec_expression.rb
 - lib/glimmer/dsl/swt/transform_expression.rb
+- lib/glimmer/dsl/swt/tray_expression.rb
+- lib/glimmer/dsl/swt/tray_item_expression.rb
 - lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/tree_properties_expression.rb
 - lib/glimmer/dsl/swt/widget_expression.rb
@@ -516,6 +518,8 @@ files:
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/tool_bar_proxy.rb
 - lib/glimmer/swt/transform_proxy.rb
+- lib/glimmer/swt/tray_item_proxy.rb
+- lib/glimmer/swt/tray_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
 - lib/glimmer/swt/widget_proxy.rb
@@ -561,7 +565,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
@@ -569,15 +572,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
@@ -591,7 +585,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
@@ -605,6 +598,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
@@ -625,8 +619,18 @@ files:
 - samples/hello/hello_table/baseball_park.png
 - samples/hello/hello_text.rb
 - samples/hello/hello_tool_bar.rb
+- samples/hello/hello_tray_item.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