glimmer-dsl-swt 4.20.0.1 → 4.20.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40337dd0e70a4d482ee3e06afd736a4f186635d3126ac55df8e410ecbf179eca
-  data.tar.gz: c5a88ac7c6c267331d79cd67fd631966477bb22ea758bc094bf242aa9f314b46
+  metadata.gz: cc02ae10c108569a6bc2eb9d0bbc541fde4e4cb7a45d96239a3d7dbe1e60d372
+  data.tar.gz: 5d8fcdf0a1da65600360459d309f423950726bf81a538c9de5f68c66223c724a
 SHA512:
-  metadata.gz: 57560940de39c939a3928ab74241156597085579bda5895df214e07f6cf85e79e1d0a64a3642bf47834907230bce89000235d54286491defb36930b0dc87b0c3
-  data.tar.gz: 0fd95aa19607c97cf3f207f74e004cd06069bd15afc9b9d9e71388f8cf4f6f208e3ca4c830e4f4419c7a96d8d7e58886e2abf0baf803c0db45420c65526eeb4a
+  metadata.gz: 9250b2d9c29327262c833908681ae0826389489c2a60cb11cef17300ca94675b79a2ae2b9834a7caef1d68ed6583f54c8c4135b0b398937fac625422bab79913
+  data.tar.gz: 34044f13edbc7e0d6c2132d5b894164698373e5823619f1c9ec859a6459d593d14564e72ce3c1510508be07a270bb243342a7f0b29976beb14772acd06f782b6

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Hello, Composite! sample
 - Hello, Layout! sample
+- Removed inclusion of Glimmer module in scaffolded App class since it is no longer needed with relying on SomeCustomShell.launch method
 
 ### 4.20.0.0
 

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.0.1
+# [<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.0.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.0.1 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.0.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 (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 early alpha, so default back to `bind` whenever needed).
 
@@ -341,7 +341,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.0.1
+jgem install glimmer-dsl-swt -v 4.20.0.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -358,7 +358,7 @@ glimmer-setup
 
 This ensures configuring extra required Mac options before using `glimmer` and `girb` commands.
 
-If you are new to Glimmer and would like to continue learning the basics, you may continue to the [Glimmer Command](https://github.com/AndyObtiva/glimmer#glimmer-command) section.
+If you are new to Glimmer and would like to continue learning the basics, you may continue to the [Glimmer Command](#glimmer-command) section.
 
 Otherwise, if you are ready to build a Glimmer app, you can jump to the [Glimmer Scaffolding](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_COMMAND.md#scaffolding) section next.
 
@@ -369,7 +369,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.0.1'
+gem 'glimmer-dsl-swt', '~> 4.20.0.2'
 ```
 
 And, then run:
@@ -390,7 +390,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.0.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.0.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -592,9 +592,9 @@ Learn more by reading the [GPG](https://github.com/AndyObtiva/glimmer/blob/maste
 
 https://www.eclipse.org/swt/docs.php
 
-Here is the SWT API:
+Here is the SWT Javadoc API:
 
-https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/index.html
+https://www.eclipse.org/swt/javadoc.php
 
 Here is a visual list of SWT widgets:
 
@@ -612,22 +612,26 @@ Here is a SWT style bit constant reference:
 
 https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/SWT.html
 
-Here is an SWT Drag and Drop guide:
+Here is an SWT Layout guide:
 
-https://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html
+https://www.eclipse.org/articles/Article-Understanding-Layouts/Understanding-Layouts.htm
 
 Here is an SWT Custom Widget guide:
 
 https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm
 
-Here is an SWT Image guide:
+Here is an SWT Drag and Drop guide:
 
-https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html
+https://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html
 
 Here is an SWT Graphics / Canvas-Drawing guide:
 
 https://www.eclipse.org/articles/Article-SWT-graphics/SWT_graphics.html
 
+Here is an SWT Image guide:
+
+https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html
+
 Here is the Nebula Project (custom widget library) homepage:
 
 https://www.eclipse.org/nebula/

data/VERSION

@@ -1 +1 @@
-4.20.0.1
+4.20.0.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -184,8 +184,9 @@ This screenshot taken from the link above should give a glimpse of how SWT widge
 
 [![SWT Widgets](/images/glimmer-swt-widgets.png)](https://www.eclipse.org/swt/widgets/)
 
-In Glimmer DSL, widgets are declared with lowercase underscored names mirroring their SWT names minus the package name. For example, here are some Glimmer widgets and their SWT counterparts:
+In Glimmer DSL, widgets are declared with lowercase underscored names mirroring their SWT names minus the package name.
 
+For example, here are some Glimmer widgets and their SWT counterparts:
 - `shell` instantiates `org.eclipse.swt.widgets.Shell`
 - `text` instantiates `org.eclipse.swt.widgets.Text`
 - `button` instantiates `org.eclipse.swt.widgets.Button`
@@ -298,7 +299,8 @@ This is not an exaustive list, but should give you a good start in learning Glim
 - `checkbox`: featured in [Hello, Checkbox Group!](GLIMMER_SAMPLES.md#hello-checkbox-group) / [Hello, Checkbox!](GLIMMER_SAMPLES.md#hello-checkbox)
 - `checkbox_group`: featured in [Hello, Checkbox Group!](GLIMMER_SAMPLES.md#hello-checkbox-group)
 - `combo`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Combo!](GLIMMER_SAMPLES.md#hello-combo)
-- `composite`: featured in [Hello, Radio!](GLIMMER_SAMPLES.md#hello-radio) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Hello, Checkbox!](GLIMMER_SAMPLES.md#hello-checkbox) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe) / [Login](GLIMMER_SAMPLES.md#login) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
+- `composite`: featured in [Hello, Composite!](GLIMMER_SAMPLES.md#hello-composite) / [Hello, Radio!](GLIMMER_SAMPLES.md#hello-radio) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Hello, Checkbox!](GLIMMER_SAMPLES.md#hello-checkbox) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe) / [Login](GLIMMER_SAMPLES.md#login) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
+- `cool_bar`: featured in [Hello, Cool Bar!](GLIMMER_SAMPLES.md#hello-cool-bar)
 - `date`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time) / [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe)
 - `date_drop_down`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time)
 - `group`: featured in [Hello, Group!](GLIMMER_SAMPLES.md#hello-group) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
@@ -318,14 +320,16 @@ This is not an exaustive list, but should give you a good start in learning Glim
 - `table_column`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
 - `text`: featured in [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Login](GLIMMER_SAMPLES.md#login) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
 - `time`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time)
+- `tool_bar`: featured in [Hello, Tool Bar!](/docs/reference/GLIMMER_SAMPLES.md#hello-tool-bar)
+- `tool_item`: featured in [Hello, Tool Bar!](/docs/reference/GLIMMER_SAMPLES.md#hello-tool-bar)
 - Glimmer::UI::CustomWidget: ability to define any keyword as a custom widget - featured in [Hello, Custom Widget!](GLIMMER_SAMPLES.md#hello-custom-widget)
 - Glimmer::UI::CustomShell: ability to define any keyword as a custom shell (aka custom window) that opens in a new browser window (tab) automatically unless there is no shell open in the current browser window (tab) - featured in [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell)
 
 **Layouts:**
-- `grid_layout`: featured in [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Pop Up Context Menu!](GLIMMER_SAMPLES.md#hello-pop-up-context-menu) / [Hello, Menu Bar!](GLIMMER_SAMPLES.md#hello-menu-bar) / [Hello, List Single Selection!](GLIMMER_SAMPLES.md#hello-list-single-selection) / [Hello, List Multi Selection!](GLIMMER_SAMPLES.md#hello-list-multi-selection) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager) / [Login](GLIMMER_SAMPLES.md#login) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe)
-- `row_layout`: featured in [Hello, Radio Group!](GLIMMER_SAMPLES.md#hello-radio-group) / [Hello, Radio!](GLIMMER_SAMPLES.md#hello-radio) / [Hello, Group!](GLIMMER_SAMPLES.md#hello-group) / [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time) / [Hello, Combo!](GLIMMER_SAMPLES.md#hello-combo) / [Hello, Checkbox Group!](GLIMMER_SAMPLES.md#hello-checkbox-group) / [Hello, Checkbox!](GLIMMER_SAMPLES.md#hello-checkbox) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
-- `fill_layout`: featured in [Hello, Custom Widget!](GLIMMER_SAMPLES.md#hello-custom-widget)
-- `layout_data`: featured in [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
+- `grid_layout`: featured in [Hello, Layout!](GLIMMER_SAMPLES.md#hello-layout) / [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Pop Up Context Menu!](GLIMMER_SAMPLES.md#hello-pop-up-context-menu) / [Hello, Menu Bar!](GLIMMER_SAMPLES.md#hello-menu-bar) / [Hello, List Single Selection!](GLIMMER_SAMPLES.md#hello-list-single-selection) / [Hello, List Multi Selection!](GLIMMER_SAMPLES.md#hello-list-multi-selection) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager) / [Login](GLIMMER_SAMPLES.md#login) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe)
+- `row_layout`: featured in [Hello, Layout!](GLIMMER_SAMPLES.md#hello-layout) / [Hello, Radio Group!](GLIMMER_SAMPLES.md#hello-radio-group) / [Hello, Radio!](GLIMMER_SAMPLES.md#hello-radio) / [Hello, Group!](GLIMMER_SAMPLES.md#hello-group) / [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time) / [Hello, Combo!](GLIMMER_SAMPLES.md#hello-combo) / [Hello, Checkbox Group!](GLIMMER_SAMPLES.md#hello-checkbox-group) / [Hello, Checkbox!](GLIMMER_SAMPLES.md#hello-checkbox) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
+- `fill_layout`: featured in [Hello, Layout!](GLIMMER_SAMPLES.md#hello-layout) / [Hello, Custom Widget!](GLIMMER_SAMPLES.md#hello-custom-widget)
+- `layout_data`: featured in [Hello, Layout!](GLIMMER_SAMPLES.md#hello-layout) / [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) / [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) / [Hello, Computed!](GLIMMER_SAMPLES.md#hello-computed) / [Tic Tac Toe](GLIMMER_SAMPLES.md#tic-tac-toe) / [Contact Manager](GLIMMER_SAMPLES.md#contact-manager)
 
 **Graphics/Style:**
 - `color`: featured in [Hello, Custom Widget!](GLIMMER_SAMPLES.md#hello-custom-widget) / [Hello, Menu Bar!](GLIMMER_SAMPLES.md#hello-menu-bar)
@@ -1396,7 +1400,6 @@ Also, for a reference, check the SWT API:
 
 https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/index.html
 
-
 ### Canvas Shape DSL
 
 **(ALPHA FEATURE)**

data/docs/reference/GLIMMER_SAMPLES.md

@@ -47,6 +47,8 @@
     - [Hello, Font Dialog!](#hello-font-dialog)
     - [Hello, Shape!](#hello-shape)
     - [Hello, Custom Shape!](#hello-custom-shape)
+    - [Hello, Tool Bar!](#hello-tool-bar)
+    - [Hello, Cool Bar!](#hello-cool-bar)
   - [Elaborate Samples](#elaborate-samples)
     - [User Profile](#user-profile)
     - [Login](#login)
@@ -820,6 +822,44 @@ Hello, Custom Shape!
 
 ![Hello Custom Shape](/images/glimmer-hello-custom-shape.png)
 
+#### Hello, Tool Bar!
+
+This sample demonstrates the use of `tool_bar` & `tool_item` as well as being able to nest `combo` in a `tool_bar`.
+
+Code:
+
+[samples/hello/hello_tool_bar.rb](/samples/hello/hello_tool_bar.rb)
+
+Hello, Tool Bar!
+
+![Hello Tool Bar](/images/glimmer-hello-tool-bar.png)
+
+![Hello Tool Bar Cut](/images/glimmer-hello-tool-bar-cut.png)
+
+![Hello Tool Bar Copy](/images/glimmer-hello-tool-bar-copy.png)
+
+![Hello Tool Bar Paste](/images/glimmer-hello-tool-bar-paste.png)
+
+![Hello Tool Bar Font Size](/images/glimmer-hello-tool-bar-font-size.png)
+
+#### Hello, Cool Bar!
+
+This sample demonstrates the use of `cool_bar` that can contain multiple reorganizable `tool_bar` widgets
+
+Code:
+
+[samples/hello/hello_cool_bar.rb](/samples/hello/hello_cool_bar.rb)
+
+Hello, Cool Bar!
+
+![Hello Cool Bar](/images/glimmer-hello-cool-bar.png)
+
+![Hello Cool Bar Reorg1](/images/glimmer-hello-cool-bar-reorg1.png)
+
+![Hello Cool Bar Reorg2](/images/glimmer-hello-cool-bar-reorg2.png)
+
+![Hello Cool Bar Reorg3](/images/glimmer-hello-cool-bar-reorg3.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

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

@@ -70,3 +70,5 @@ require 'glimmer/swt/sash_form_proxy'
 require 'glimmer/swt/styled_text_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/tab_folder_proxy'
+require 'glimmer/swt/combo_proxy'
+require 'glimmer/swt/tool_bar_proxy'

data/lib/glimmer/rake_task/scaffold.rb

@@ -441,8 +441,6 @@ module Glimmer
             require '#{file_name(app_name)}/view/app_view'
     
             class #{class_name(app_name)}
-              include Glimmer
-            
               APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
               LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))

data/lib/glimmer/swt/combo_proxy.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/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Combo
+    #
+    # Follows the Proxy Design Pattern
+    class ComboProxy < WidgetProxy
+      attr_accessor :tool_item_proxy, :swt_tool_item
+    
+      def initialize(*init_args, &block)
+        super
+        self.tool_item_proxy = WidgetProxy.new("tool_item", parent_proxy, [:separator]) if parent_proxy.swt_widget.is_a?(ToolBar)
+        self.swt_tool_item = tool_item_proxy&.swt_widget
+      end
+      
+      def post_add_content
+        if self.tool_item_proxy
+          self.swt_widget.pack
+          self.tool_item_proxy.text = 'filler' # text seems needed (any text works)
+          self.tool_item_proxy.width = swt_widget.size.x
+          self.tool_item_proxy.control = swt_widget
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/tool_bar_proxy.rb

@@ -0,0 +1,51 @@
+# 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.ToolBarProxy
+    #
+    # Follows the Proxy Design Pattern
+    class ToolBarProxy < WidgetProxy
+      attr_accessor :cool_item_proxy, :swt_cool_item
+    
+      def initialize(*init_args, &block)
+        super
+        self.cool_item_proxy = WidgetProxy.new("cool_item", parent_proxy, []) if parent_proxy.swt_widget.is_a?(CoolBar)
+        self.swt_cool_item = cool_item_proxy&.swt_widget
+      end
+      
+      def post_add_content
+        apply_preferred_size if cool_item_proxy
+      end
+      
+      def apply_preferred_size
+        swt_widget.pack
+        size = swt_widget.size
+        cool_item_proxy.control = swt_widget
+        preferred = swt_cool_item.computeSize(size.x, size.y)
+        swt_cool_item.setPreferredSize(preferred)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1006,6 +1006,12 @@ module Glimmer
           image: lambda do |*value|
             ImageProxy.create(*value).swt_image
           end,
+          disabled_image: lambda do |*value|
+            ImageProxy.create(*value).swt_image
+          end,
+          hot_image: lambda do |*value|
+            ImageProxy.create(*value).swt_image
+          end,
           images: lambda do |array|
             array.to_a.map do |value|
               ImageProxy.create(value).swt_image

data/samples/elaborate/tetris/model/game.rb

@@ -33,8 +33,6 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
-#       PLAYFIELD_WIDTH = 5
-#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -201,7 +199,6 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
-#         99999
       end
       
       def beep

data/samples/hello/hello_cool_bar.rb

@@ -0,0 +1,147 @@
+# 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 HelloCoolBar
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :operation, :font_size
+  
+  def font_size_options
+    (10..30).to_a.map(&:to_s)
+  end
+  
+  before_body {
+    self.font_size = '10'
+  }
+
+  body {
+    shell {
+      fill_layout(:vertical) {
+        margin_width 0
+        margin_height 0
+      }
+      
+      text 'Hello, Cool Bar!'
+      
+      cool_bar { # optionally takes a :flat style and/or :vertical style if you need vertical layout
+        tool_bar {
+          tool_item {
+            image cut_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Cut'
+            end
+          }
+          tool_item {
+            image copy_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Copy'
+            end
+          }
+          tool_item {
+            image paste_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Paste'
+            end
+          }
+        }
+        tool_bar {
+          tool_item {
+            text 'Font Size'
+          }
+          # a combo can be nested in a tool_bar (it auto-generates a tool_item for itself behind the scenes)
+          combo {
+            selection bind(self, :font_size)
+          }
+        }
+      }
+      
+  
+      label {
+        font height: 30
+        text bind(self, :operation)
+        text bind(self, :font_size)
+      }
+    }
+  }
+  
+  def cut_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        line(20, 2, 9, 15) {
+          line_width 2
+        }
+        line(5, 2, 16, 15) {
+          line_width 2
+        }
+        oval(2, 15, 8, 8) {
+          line_width 2
+        }
+        oval(16, 15, 8, 8) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def copy_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
+          line_width 2
+        }
+        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def paste_image
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
+          line_width 2
+        }
+        line(7, 8, 18, 8) {
+          line_width 2
+        }
+        line(7, 13, 18, 13) {
+          line_width 2
+        }
+        line(7, 18, 18, 18) {
+          line_width 2
+        }
+      }
+    }
+  end
+end
+
+HelloCoolBar.launch

data/samples/hello/hello_tool_bar.rb

@@ -0,0 +1,143 @@
+# 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 HelloToolBar
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :operation, :font_size
+  
+  def font_size_options
+    (10..30).to_a.map(&:to_s)
+  end
+  
+  before_body {
+    self.font_size = '10'
+  }
+
+  body {
+    shell {
+      fill_layout(:vertical) {
+        margin_width 0
+        margin_height 0
+      }
+      
+      text 'Hello, Tool Bar!'
+      
+      tool_bar { # optionally takes a :flat style, :wrap style if you need wrapping upon shrinking window, and :vertical style if you need vertical layout
+        tool_item {
+          image cut_image # alternatively you can pass an image file path
+          
+          on_widget_selected do
+            self.operation = 'Cut'
+          end
+        }
+        tool_item {
+          image copy_image # alternatively you can pass an image file path
+          
+          on_widget_selected do
+            self.operation = 'Copy'
+          end
+        }
+        tool_item {
+          image paste_image # alternatively you can pass an image file path
+          
+          on_widget_selected do
+            self.operation = 'Paste'
+          end
+        }
+        tool_item(:separator)
+        tool_item {
+          text 'Font Size'
+        }
+        # a combo can be nested in a tool_bar (it auto-generates a tool_item for itself behind the scenes)
+        combo {
+          selection bind(self, :font_size)
+        }
+      }
+  
+      label {
+        font height: 30
+        text bind(self, :operation)
+        text bind(self, :font_size)
+      }
+    }
+  }
+  
+  def cut_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        line(20, 2, 9, 15) {
+          line_width 2
+        }
+        line(5, 2, 16, 15) {
+          line_width 2
+        }
+        oval(2, 15, 8, 8) {
+          line_width 2
+        }
+        oval(16, 15, 8, 8) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def copy_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
+          line_width 2
+        }
+        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def paste_image
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
+          line_width 2
+        }
+        line(7, 8, 18, 8) {
+          line_width 2
+        }
+        line(7, 13, 18, 13) {
+          line_width 2
+        }
+        line(7, 18, 18, 18) {
+          line_width 2
+        }
+      }
+    }
+  end
+end
+
+HelloToolBar.launch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.0.1
+  version: 4.20.0.2
 platform: ruby
 authors:
 - Andy Maleh
@@ -449,6 +449,7 @@ files:
 - lib/glimmer/rake_task/scaffold.rb
 - lib/glimmer/swt/c_tab_item_proxy.rb
 - lib/glimmer/swt/color_proxy.rb
+- lib/glimmer/swt/combo_proxy.rb
 - lib/glimmer/swt/cursor_proxy.rb
 - lib/glimmer/swt/custom/animation.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
@@ -494,6 +495,7 @@ files:
 - lib/glimmer/swt/tab_item_proxy.rb
 - lib/glimmer/swt/table_column_proxy.rb
 - lib/glimmer/swt/table_proxy.rb
+- lib/glimmer/swt/tool_bar_proxy.rb
 - lib/glimmer/swt/transform_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
@@ -554,6 +556,7 @@ files:
 - 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
 - samples/hello/hello_custom_shell.rb
@@ -583,6 +586,7 @@ files:
 - samples/hello/hello_tab.rb
 - samples/hello/hello_table.rb
 - samples/hello/hello_table/baseball_park.png
+- samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb
 - sounds/metronome-down.wav