glimmer-dsl-swt 4.17.10.8 → 4.18.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86e6ce8dc5b52db4661c0cb5aa9d9bce7e0cc644408ae1536aed5d2ea25d0cd
-  data.tar.gz: ccdbb42c7bebc81a2a73235ee80ef53ce6607810152ea66b6336e33490a8e83a
+  metadata.gz: 50e5a8d642ce0d66a1451ab28c2029388aa1b38f2e930b01259ac5a09fa528a6
+  data.tar.gz: 280f7949f24aa626a97658fd0eaff2715bdc5538d4ab2220b08375050653adf3
 SHA512:
-  metadata.gz: 7d1e3ee58b861a453d79cca264749bcfc17f0efd4e490864aadec61a4b4269ad033cc49fbf291ccf8b9840ed54813130e8620a557d1f15c3c6c25883276ee6cb
-  data.tar.gz: 7fb220ed34798e701839cf118e1a7df1ebf5492b938570a8ee7dd0ad6a0a624808f52fe74ac30d221f58e6269ff708dd6d71098b0251c3470d16fa2a5c472323
+  metadata.gz: 95a750f50e8564ba0adbfe955234323b329f3760c72c8853dadb9b160444428794e91d78484c182efd4615fe806e2de711d21fbf81824c72cc1a9625d93a5bbe
+  data.tar.gz: '069fda16d1b6d399b35f11c7d32e68f3b3749e3cab7d79aef9a52b4583e885ebf55a53beeb68c66bcc47b27ce31f7d325189f8b24c8189d1da0e5fc2a2321903'

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+### 4.18.0.0
+
+- Upgrade to SWT v4.18
+- Upgrade to JRuby v9.2.14.0
+- Apply all WidgetProxy property converters upon normal setting of properties too (not just in DSL) (like `some_widget.background = color_symbol`)
+- Update Hello, Menu Bar! sample to show accelerators on menu items
+- Have the `swt` keyword (SWTProxy) support accepting a string character (to build an accelerator style)
+- Make accelerator property accept symbols and character directly (without swt)
+- Write meta-sample changes to user directory to avoid permission issues
+- Zero margin_left, margin_right, margin_top, margin_bottom in layouts given that margin_width and margin_height are set by default
+- Prevent editing/launching meta-sample from Glimmer Meta-Sample
+- Fix enablement on `menu` (as opposed to menu_item, where it works)
+- Fix issue relating to background image scaling on resize of widget
+
 ### 4.17.10.8
 
 - Support editing sample code in the Glimmer Meta-Sample to enable experimentation and learning

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.17.10.8
+# [<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.18.0.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)
@@ -17,7 +17,7 @@
 
 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.
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) versions 4.17.x.y come with [SWT 4.17](https://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/), which was released on September 2, 2020.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) versions 4.18.x.y come with [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020.
 
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in<br />JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do)
@@ -416,13 +416,13 @@ https://www.eclipse.org/swt/faq.php
 ## Pre-requisites
 
 - JDK 8u241 (1.8.0_241) (find at https://www.oracle.com/java/technologies/javase/javase8u211-later-archive-downloads.html)
-- JRuby 9.2.13.0 (supporting Ruby 2.5.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux or find at [https://www.jruby.org/download](https://www.jruby.org/download) for Windows)
-- SWT 4.17 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem)
+- JRuby 9.2.14.0 (supporting Ruby 2.5.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux or find at [https://www.jruby.org/download](https://www.jruby.org/download) for Windows)
+- SWT 4.18 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem)
 
 To obtain JRuby through [RVM](http://rvm.io), you may run:
 
 ```bash
-rvm install jruby-9.2.13.0
+rvm install jruby-9.2.14.0
 ```
 
 Glimmer might still work on other versions of Java, JRuby and SWT, but there are no guarantees, so it is best to stick to the pre-requisites outlined above.
@@ -449,7 +449,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.10.8
+jgem install glimmer-dsl-swt -v 4.18.0.0
 
 ```
 
@@ -468,7 +468,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.17'
+gem 'glimmer-dsl-swt', '~> 4.18.0.0'
 ```
 
 And, then run:
@@ -526,7 +526,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.17.10.8
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.0.0
 
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
@@ -1004,7 +1004,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.8.0     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.17.10.8
+  Swt    glimmer-dsl-swt    4.18.0.0
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML
@@ -3635,7 +3635,7 @@ This brings up the [Glimmer Meta-Sample (The Sample of Samples)](samples/elabora
 
 ![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
 
-You may edit the code of any sample before launching it via the "Launch" button. This helps you learn by experiementing with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button.
+You may edit the code of any sample before launching it by clicking on the "Launch" button. This helps you learn by experimenting with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button.
 
 ### Hello Samples
 

data/VERSION

@@ -1 +1 @@
-4.17.10.8
+4.18.0.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.10.8 ruby lib
+# stub: glimmer-dsl-swt 4.18.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.10.8"
+  s.version = "4.18.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-12-17"
+  s.date = "2020-12-19"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -166,32 +166,51 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AndyObtiva/glimmer-dsl-swt".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.5.3".freeze)
-  s.rubygems_version = "3.1.4".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "Glimmer DSL for SWT".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
-    s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
-    s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
-    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
-    s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
-    s.add_runtime_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
-    s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
-    s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
-    s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
-    s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.26.0", "< 4.0.0"])
-    s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
-    s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
-    s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
-    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
-    s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
+      s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
+      s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
+      s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
+      s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
+      s.add_runtime_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
+      s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
+      s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
+      s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+      s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
+      s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.26.0", "< 4.0.0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
+      s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
+      s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+      s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+    else
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
+      s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
+      s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
+      s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
+      s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
+      s.add_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
+      s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
+      s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
+      s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+      s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
+      s.add_dependency(%q<rouge>.freeze, [">= 3.26.0", "< 4.0.0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
+      s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
+      s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
+      s.add_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+      s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+    end
   else
     s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])

data/lib/glimmer-dsl-swt.rb

@@ -36,6 +36,7 @@ require 'nested_inherited_jruby_include_package'
 require 'super_module'
 require 'rouge'
 require 'date'
+require 'facets/string/capitalized'
 
 # Internal requires
 require 'ext/glimmer/config'

data/lib/glimmer/swt/image_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 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
@@ -54,9 +54,9 @@ module Glimmer
         @args = @args.first if @args.size == 1 && @args.first.is_a?(Array)
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
-          @image_data = @swt_image.image_data
+          @original_image_data = @image_data = @swt_image.image_data
         elsif @file_path
-          @image_data = ImageData.new(input_stream || @file_path)
+          @original_image_data = @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
           width = options[:width]
           height = options[:height]
@@ -65,8 +65,8 @@ module Glimmer
           scale_to(width, height) unless width.nil? || height.nil?
         else
           @swt_image = Image.new(*@args)
-          @image_data = @swt_image.image_data
-        end        
+          @original_image_data = @image_data = @swt_image.image_data
+        end
       end
       
       def input_stream
@@ -77,12 +77,13 @@ module Glimmer
           file_input_stream = object.java_class.resource_as_stream(file_path)
         else
           file_input_stream = java.io.FileInputStream.new(@file_path)
-        end      
+        end
         java.io.BufferedInputStream.new(file_input_stream) if file_input_stream
       end
 
       def scale_to(width, height)
-        scaled_image_data = image_data.scaledTo(width, height)
+        return if @image_data.width == width && @image_data.height == height
+        scaled_image_data = @original_image_data.scaledTo(width, height)
         device = swt_image.device
         swt_image.dispose
         @swt_image = Image.new(device, scaled_image_data)
@@ -99,7 +100,7 @@ module Glimmer
       
       def respond_to?(method, *args, &block)
         super || swt_image.respond_to?(method, *args, &block)
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 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
@@ -68,6 +68,10 @@ module Glimmer
         @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
         @swt_layout.marginWidth = 15 if @swt_layout.respond_to?(:marginWidth)
         @swt_layout.marginHeight = 15 if @swt_layout.respond_to?(:marginHeight)
+        @swt_layout.marginTop = 0 if @swt_layout.respond_to?(:marginTop)
+        @swt_layout.marginRight = 0 if @swt_layout.respond_to?(:marginRight)
+        @swt_layout.marginBottom = 0 if @swt_layout.respond_to?(:marginBottom)
+        @swt_layout.marginLeft = 0 if @swt_layout.respond_to?(:marginLeft)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -75,7 +75,7 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        if attribute_name.to_s == "text"
+        if ['text', 'enabled'].include?(attribute_name.to_s)
           true
         else
           super(attribute_name, *args)
@@ -83,24 +83,29 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
-        attribute_name
-        if attribute_name.to_s == "text"
+        if normalized_attribute(attribute_name) == 'text'
           text_value = args[0]
           @swt_menu_item.setText text_value
+        elsif normalized_attribute(attribute_name) == 'enabled'
+          value = args[0]
+          @swt_menu_item.setEnabled value
         else
           super(attribute_name, *args)
         end
       end
 
       def get_attribute(attribute_name)
-        if attribute_name.to_s == "text"
+        if normalized_attribute(attribute_name) == 'text'
           @swt_menu_item.getText
+        elsif normalized_attribute(attribute_name) == 'enabled'
+          @swt_menu_item.getEnabled
         else
           super(attribute_name)
         end
       end
       
       def can_handle_observation_request?(observation_request, super_only: false)
+        observation_request = observation_request.to_s
         super_result = super(observation_request)
         if observation_request.start_with?('on_') && !super_result && !super_only
           return menu_item_proxy.can_handle_observation_request?(observation_request)

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -28,7 +28,7 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class SashFormProxy < WidgetProxy
       def post_add_content
-        swt_widget.setWeights(@weights) unless @weights.nil?
+        self.weights = @weights unless @weights.nil?
       end
       
       def set_attribute(attribute_name, *args)

data/lib/glimmer/swt/style_constantizable.rb

@@ -89,11 +89,15 @@ module Glimmer
             negative ? ~bit_value : bit_value
           rescue => e
 #             Glimmer::Config.logger.debug {e.full_message}
-            bit_value = extra_styles[swt_constant_symbol]
-            if bit_value
-              negative ? ~bit_value : bit_value
+            if symbol.to_s.size == 1 # accelerator key
+              symbol.to_s.bytes.first
             else
-              symbol
+              bit_value = extra_styles[swt_constant_symbol]
+              if bit_value
+                negative ? ~bit_value : bit_value
+              else
+                symbol
+              end
             end
           end
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -202,7 +202,22 @@ module Glimmer
         end
       end
 
+      def has_attribute_getter?(attribute_getter_name, *args)
+        attribute_getter_name = attribute_getter_name.to_s.underscore
+        return false unless !attribute_getter_name.end_with?('=') && !attribute_getter_name.start_with?('set_')
+        args.empty? && swt_widget.respond_to?(attribute_getter_name)
+      end
+      
+      def has_attribute_setter?(attribute_setter_name, *args)
+        attribute_setter_name = attribute_setter_name.to_s
+        underscored_attribute_setter_name = attribute_setter_name.underscore
+        return false unless attribute_setter_name.end_with?('=') || (attribute_setter_name.start_with?('set_') && !args.empty?)
+        attribute_name = underscored_attribute_setter_name.sub(/^set_/, '').sub(/=$/, '')
+        has_attribute?(attribute_name, *args)
+      end
+      
       def has_attribute?(attribute_name, *args)
+        # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
@@ -214,11 +229,13 @@ module Glimmer
       def set_attribute(attribute_name, *args)
         # TODO Think about widget subclasses overriding set_attribute to add more attributes vs adding as Ruby attributes directly
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
+        apply_property_type_converters(normalized_attribute(attribute_name), args)
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
         elsif @swt_widget.respond_to?(attribute_setter(attribute_name))
-          apply_property_type_converters(attribute_name, args)
           @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+        elsif @swt_widget.respond_to?(ruby_attribute_setter(attribute_name))
+          @swt_widget.send(ruby_attribute_setter(attribute_name), args)
         else
           send(ruby_attribute_setter(attribute_name), args)
         end
@@ -234,6 +251,12 @@ module Glimmer
           end
         elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
           @swt_widget.send(attribute_getter(attribute_name))
+        elsif @swt_widget.respond_to?(ruby_attribute_getter(attribute_name))
+          @swt_widget.send(ruby_attribute_getter(attribute_name))
+        elsif @swt_widget.respond_to?(attribute_name)
+          @swt_widget.send(attribute_name)
+        elsif respond_to?(ruby_attribute_getter(attribute_name))
+          send(ruby_attribute_getter(attribute_name))
         else
           send(attribute_name)
         end
@@ -608,11 +631,16 @@ module Glimmer
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)
           handle_observation_request(method, &block)
+        elsif has_attribute_setter?(method, *args)
+          set_attribute(method, *args)
+        elsif has_attribute_getter?(method, *args)
+          get_attribute(method, *args)
         else
           swt_widget.send(method, *args, &block)
         end
       rescue => e
-        Glimmer::Config.logger.debug {"Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+        Glimmer::Config.logger.debug { "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}" }
+        Glimmer::Config.logger.debug { e.full_message }
         super
         # TODO consider get_attribute too
       end
@@ -640,16 +668,26 @@ module Glimmer
       end
 
       def ruby_attribute_setter(attribute_name)
-        "#{attribute_name}="
+        "#{normalized_attribute(attribute_name)}="
       end
 
       def attribute_setter(attribute_name)
-        "set#{attribute_name.to_s.camelcase(:upper)}"
+        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
       end
 
       def attribute_getter(attribute_name)
-        "get#{attribute_name.to_s.camelcase(:upper)}"
+        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
       end
+      
+      def normalized_attribute(attribute_name)
+        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
+        attribute_name = attribute_name.underscore unless attribute_name.downcase?
+        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
+        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
+        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
+        attribute_name
+      end
+      alias ruby_attribute_getter normalized_attribute
 
       # TODO refactor following methods to eliminate duplication
       # perhaps consider relying on raising an exception to avoid checking first
@@ -800,11 +838,14 @@ module Glimmer
         end
         # TODO consider detecting type on widget method and automatically invoking right converter (e.g. :to_s for String, :to_i for Integer)
         @property_type_converters ||= {
-          alignment: -> (*value) {
+          accelerator: lambda { |*value|
+            SWTProxy[*value]
+          },
+          alignment: lambda { |*value|
             SWTProxy[*value]
           },
-          :background => color_converter,
-          :background_image => lambda do |*value|
+          background: color_converter,
+          background_image: lambda do |*value|
             image_proxy = ImageProxy.create(*value)
             
             if image_proxy&.file_path&.end_with?('.gif')
@@ -845,7 +886,7 @@ module Glimmer
             
             image_proxy&.swt_image
           end,
-          :cursor => lambda do |value|
+          cursor: lambda do |value|
             cursor_proxy = nil
             if value.is_a?(CursorProxy)
               cursor_proxy = value
@@ -857,9 +898,9 @@ module Glimmer
           :enabled => lambda do |value|
             !!value
           end,
-          :foreground => color_converter,
-          :link_foreground => color_converter,
-          :font => lambda do |value|
+          foreground: color_converter,
+          link_foreground: color_converter,
+          font: lambda do |value|
             if value.is_a?(Hash)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
@@ -867,21 +908,21 @@ module Glimmer
               value
             end
           end,
-          :image => lambda do |*value|
+          image: lambda do |*value|
             ImageProxy.create(*value).swt_image
           end,
-          :images => lambda do |array|
+          images: lambda do |array|
             array.to_a.map do |value|
               ImageProxy.create(value).swt_image
             end.to_java(Image)
           end,
-          :items => lambda do |value|
+          items: lambda do |value|
             value.to_java :string
           end,
-          :text => lambda do |value|
+          text: lambda do |value|
             value.to_s
           end,
-          :transfer => lambda do |value|
+          transfer: lambda do |value|
             value = value.first if value.is_a?(Array) && value.size == 1 && value.first.is_a?(Array)
             transfer_object_extrapolator = lambda do |transfer_name|
               transfer_type = "#{transfer_name.to_s.camelcase(:upper)}Transfer".to_sym
@@ -900,9 +941,12 @@ module Glimmer
             result = result.to_java(Transfer) unless result.is_a?(ArrayJavaProxy)
             result
           end,
-          :visible => lambda do |value|
+          visible: lambda do |value|
             !!value
           end,
+          weights: lambda do |value|
+            value.to_java(:int)
+          end,
         }
       end
     end

data/samples/elaborate/meta_sample.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'etc'
 
 class Sample
   include Glimmer::DataBinding::ObservableModel
@@ -33,23 +34,29 @@ class Sample
     notify_observers('code')
   end
   
+  def editable
+    File.basename(file) != 'meta_sample.rb'
+  end
+  alias launchable editable
+  
   def launch(modified_code)
-    modified_file = File.join(File.dirname(file), ".#{File.basename(file)}")
+    parent_directory = File.basename(File.dirname(file))
+    modified_file_parent_directory = File.join(Etc.getpwuid.dir, '.glimmer', 'samples', parent_directory)
+    launch_file = modified_file = File.join(modified_file_parent_directory, File.basename(file))
     begin
+      FileUtils.mkdir_p(modified_file_parent_directory)
+      FileUtils.cp_r(file, modified_file_parent_directory)
+      FileUtils.cp_r(file.sub(/\.rb/, ''), modified_file_parent_directory) if File.exist?(file.sub(/\.rb/, ''))
       File.write(modified_file, modified_code)
-      begin
-        load(modified_file)
-      rescue StandardError, SyntaxError => launch_error
-        message_box {
-          text 'Error Launching'
-          message launch_error.full_message
-        }.open
-      end
-    rescue
-      load(file) # load original file if failed to write changes
-    ensure
-      FileUtils.rm_rf(modified_file)
+    rescue => e
+      puts 'Error writing sample modifications. Launching original sample.'
+      puts e.full_message
+      launch_file = file # load original file if failed to write changes
     end
+    load(launch_file)
+  ensure
+    FileUtils.rm_rf(modified_file)
+    FileUtils.rm_rf(modified_file.sub(/\.rb/, ''))
   end
 end
 
@@ -149,7 +156,10 @@ class MetaSampleApplication
       
       sash_form {
         composite {
-          grid_layout 1, false
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
             
           expand_bar {
             layout_data(:fill, :fill, true, true)
@@ -180,13 +190,24 @@ class MetaSampleApplication
             button {
               text 'Launch'
               font height: 30
+              enabled bind(SampleDirectory, 'selected_sample.launchable')
+              
               on_widget_selected {
-                SampleDirectory.selected_sample.launch(@code_text.text)
+                begin
+                  SampleDirectory.selected_sample.launch(@code_text.text)
+                rescue StandardError, SyntaxError => launch_error
+                  message_box {
+                    text 'Error Launching'
+                    message launch_error.full_message
+                  }.open
+                end
               }
             }
             button {
               text 'Reset'
               font height: 30
+              enabled bind(SampleDirectory, 'selected_sample.editable')
+              
               on_widget_selected {
                 SampleDirectory.selected_sample.reset_code!
               }
@@ -196,6 +217,7 @@ class MetaSampleApplication
             
         @code_text = code_text {
           text bind(SampleDirectory, 'selected_sample.code', read_only: true)
+          editable bind(SampleDirectory, 'selected_sample.editable')
         }
         
         weights 4, 9

data/samples/hello/hello_menu_bar.rb

@@ -21,50 +21,52 @@
 
 include Glimmer
 
-shell { |shell_proxy|
+COLORS = [:white, :red, :yellow, :green, :blue, :magenta, :gray, :black]
+
+shell {
+  grid_layout {
+    margin_width 0
+    margin_height 0
+  }
+  
   text 'Hello, Menu Bar!'
-  grid_layout
-  label(:center) {
-    font height: 16
-    text 'Check Out The File Menu and History Menu in The Menu Bar Above!'
+  
+  @label = label(:center) {
+    font height: 50
+    text 'Check Out The Menu Bar Above!'
   }
+  
   menu_bar {
     menu {
       text '&File'
       menu_item {
-        text 'E&xit'
-        on_widget_selected {
-          exit(0)
-        }
-      }
-      menu_item(0) {
         text '&New'
+        accelerator :command, :N
+        
         on_widget_selected {
-          message_box(shell_proxy) {
-            text 'New File'
-            message 'New File Contents'
+          message_box {
+            text 'New'
+            message 'New file created.'
           }.open
         }
       }
-      menu(1) {
-        text '&Options'
-        menu_item(:radio) {
-          text 'Option 1'
-        }
-        menu_item(:separator)
-        menu_item(:check) {
-          text 'Option 3'
+      menu_item {
+        text '&Open...'
+        accelerator :command, :O
+        
+        on_widget_selected {
+          message_box {
+            text 'Open'
+            message 'Opening File...'
+          }.open
         }
       }
-    }
-    menu {
-      text '&History'
       menu {
-        text '&Recent'
+        text 'Open &Recent'
         menu_item {
           text 'File 1'
           on_widget_selected {
-            message_box(shell_proxy) {
+            message_box {
               text 'File 1'
               message 'File 1 Contents'
             }.open
@@ -73,13 +75,167 @@ shell { |shell_proxy|
         menu_item {
           text 'File 2'
           on_widget_selected {
-            message_box(shell_proxy) {
+            message_box {
               text 'File 2'
               message 'File 2 Contents'
             }.open
           }
         }
       }
+      menu_item(:separator)
+      menu_item {
+        text 'E&xit'
+        
+        on_widget_selected {
+          exit(0)
+        }
+      }
+    }
+    menu {
+      text '&Edit'
+      menu_item {
+        text 'Cut'
+        accelerator :command, :X
+      }
+      menu_item {
+        text 'Copy'
+        accelerator :command, :C
+      }
+      menu_item {
+        text 'Paste'
+        accelerator :command, :V
+      }
+    }
+    menu {
+      text '&Options'
+      
+      menu_item(:radio) {
+        text '&Enabled'
+        
+        on_widget_selected {
+          @select_one_menu.enabled = true
+          @select_multiple_menu.enabled = true
+        }
+      }
+      @select_one_menu = menu {
+        text '&Select One'
+        enabled false
+        
+        menu_item(:radio) {
+          text 'Option 1'
+        }
+        menu_item(:radio) {
+          text 'Option 2'
+        }
+        menu_item(:radio) {
+          text 'Option 3'
+        }
+      }
+      @select_multiple_menu = menu {
+        text '&Select Multiple'
+        enabled false
+        
+        menu_item(:check) {
+          text 'Option 4'
+        }
+        menu_item(:check) {
+          text 'Option 5'
+        }
+        menu_item(:check) {
+          text 'Option 6'
+        }
+      }
+    }
+    menu {
+      text '&Format'
+      menu {
+        text '&Background Color'
+        COLORS.each { |color_style|
+          menu_item(:radio) {
+            text color_style.to_s.split('_').map(&:capitalize).join(' ')
+            
+            on_widget_selected {
+              @label.background = color_style
+            }
+          }
+        }
+      }
+      menu {
+        text 'Foreground &Color'
+        COLORS.each { |color_style|
+          menu_item(:radio) {
+            text color_style.to_s.split('_').map(&:capitalize).join(' ')
+            
+            on_widget_selected {
+              @label.foreground = color_style
+            }
+          }
+        }
+      }
+    }
+    menu {
+      text '&View'
+      menu_item(:radio) {
+        text 'Small'
+        
+        on_widget_selected {
+          @label.font = {height: 25}
+          @label.parent.pack
+        }
+      }
+      menu_item(:radio) {
+        text 'Medium'
+        selection true
+        
+        on_widget_selected {
+          @label.font = {height: 50}
+          @label.parent.pack
+        }
+      }
+      menu_item(:radio) {
+        text 'Large'
+        
+        on_widget_selected {
+          @label.font = {height: 75}
+          @label.parent.pack
+        }
+      }
+    }
+    menu {
+      text '&Help'
+      menu_item {
+        text '&Manual'
+        accelerator :command, :shift, :M
+        
+        on_widget_selected {
+          message_box {
+            text 'Manual'
+            message 'Manual Contents'
+          }.open
+        }
+      }
+      menu_item {
+        text '&Tutorial'
+        accelerator :command, :shift, :T
+        
+        on_widget_selected {
+          message_box {
+            text 'Tutorial'
+            message 'Tutorial Contents'
+          }.open
+        }
+      }
+      menu_item(:separator)
+      menu_item {
+        text '&Report an Issue...'
+        
+        on_widget_selected {
+          message_box {
+            text 'Report an Issue'
+            message 'Reporting an issue...'
+          }.open
+        }
+      }
     }
   }
 }.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.10.8
+  version: 4.18.0.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.6
   name: glimmer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -34,8 +34,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: super_module
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,8 +54,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: nested_inherited_jruby_include_package
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,8 +74,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: puts_debuggerer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,8 +94,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: rake-tui
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,8 +111,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
   name: git-glimmer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -128,8 +128,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
   name: logging
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,8 +148,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: os
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,8 +168,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 14.0.0
   name: rake
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,8 +188,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
   name: text-table
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,8 +208,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
   name: rouge
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,8 +228,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
   name: juwelier
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,8 +248,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
   name: warbler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -265,8 +265,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec-mocks
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -279,8 +279,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -293,8 +293,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.23
   name: coveralls
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -307,8 +307,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.16.1
   name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -321,8 +321,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
   name: simplecov-lcov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -499,7 +499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for SWT