glimmer-dsl-swt 0.5.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87bcff5d2b652ab8238bfa4860c5c7710e56155712aafc80dd3f8a4acd6a080c
-  data.tar.gz: 7b4dd240b1af86fa39233dec7b9e1e514245ec35513a1589510d0ab21ffbdf9b
+  metadata.gz: 1d54a8793938853e74eb207e159ce6ab3f856ac57f737a3bd28990f5e52a745d
+  data.tar.gz: a28121a29d1a123b056d121642bf70acd12891c428bdda8602caa2cf7157df35
 SHA512:
-  metadata.gz: 302644cbe7cbfc6c416585ab4c8d6cc38447ea0a3cb98eaf34473d8b0760f03d67eb9f59616ccf6d4e77b7cfc6112432dcdf6d16a5ccb310d90002ab2e39496d
-  data.tar.gz: efac7d222037f8e3434750c514b6afedcef6faefc60911291261387a4f0639ba73fb7d5f152abebfbc0ba6097701c124b83ca0975a0244add554cb58ab720a80
+  metadata.gz: 21a850f6805c1cc2f129bdc91c09c7a8b336ce81640311af63040c8168d535ab68fb91cb53bf0a8421ec38d1daab94b9a835eec209e2685e1702ca3e91b51af8
+  data.tar.gz: 3044e95046bbda195c0ecd736ff30097ab6dadf660093d317d86d92c46f1bdf16dc669f944a9a62b398fa2f27697572290f4df9caffb8825c6b61a8f0ff2fea1

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 0.5.4 (Desktop GUI)
+# [<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 0.6.2 (Desktop GUI)
 [![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)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.2.12.0
+jruby-9.2.13.0

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.2

data/lib/ext/glimmer/config.rb

@@ -105,7 +105,6 @@ end
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
   result = false
-  result ||= method.start_with?('on_swt_') && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
   result ||= method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
   result ||= ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
   result ||= method == 'post_initialize_child'

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

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/cursor_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # cursor expression
+      # Note: Cannot be a static expression because it clashes with cursor property expression
+      class CursorExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'cursor' and
+            (parent.nil? or !parent.respond_to?('cursor')) and
+            args.size == 1 and
+            (args.first.is_a?(Integer) or textual?(args.first))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::CursorProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,9 @@ module Glimmer
           tree_items_data_binding
           table_items_data_binding
           data_binding
+          cursor
+          font
+          image
           property
           block_property
           widget

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

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/font_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # font expression
+      # Note: Cannot be a static expression because it clashes with font property expression
+      class FontExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'font' and     
+            (parent.nil? || !parent.respond_to?('font')) and
+            args.size == 1 and 
+            args.first.is_a?(Hash)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::FontProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/image_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # image expression
+      # Note: Cannot be a static expression because it clashes with image property expression
+      class ImageExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'image' and
+            (parent.nil? or !parent.respond_to?('image'))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::ImageProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -25,6 +25,12 @@ module Glimmer
           end
           widget_class.new(keyword, parent, args)
         end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+        
       end
     end
   end

data/lib/glimmer/launcher.rb

@@ -110,7 +110,7 @@ module Glimmer
           end
           command = "#{env_vars_string} jruby #{jruby_options_string}#{jruby_os_specific_options} #{devmode_require}-r #{the_glimmer_lib} -S #{application}"
           puts command if jruby_options_string.to_s.include?('--debug')
-          system command
+          exec command
         end
       end
     end

data/lib/glimmer/package.rb

@@ -21,7 +21,7 @@ module Glimmer
           system('warble config')
           new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
             if line.include?('config.dirs =')
-              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos vendor)')
+              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app bin config db docs fonts icons images lib package script sounds vendor videos)')
             end
             if line.include?('config.includes =')
               line = line.sub('# ', '').sub(/=[^=\n]+$/, "= FileList['LICENSE.txt', 'VERSION']")
@@ -41,7 +41,15 @@ module Glimmer
         system('warble')      
       end
       
-      def native
+      def lock_jars
+        puts 'Locking JARs with jar-dependencies...'
+        command = "lock_jars --vendor-dir vendor"
+        puts command
+        system command      
+      end
+      
+      def native(native_type=nil)
+        puts "Generating native executable with javapackager..."
         require 'facets/string/titlecase'
         require 'facets/string/underscore'
         project_name = File.basename(File.expand_path('.'))
@@ -51,14 +59,13 @@ module Glimmer
         license = (File.read(license_file).strip if File.exists?(license_file) && File.file?(license_file)) rescue nil
         copyright = license.split("\n").first
         human_name = project_name.underscore.titlecase
-        command = "javapackager -deploy -native -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" -BsystemWide=#{OS.mac?} "
+        command = "javapackager -deploy -native #{native_type} -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" -BsystemWide=#{OS.mac?} "
         command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
         command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
         command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
         command += " -Bcopyright=\"#{copyright}\" " if copyright
         command += " #{javapackager_extra_args} " if javapackager_extra_args
         command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
-        puts "Generating DMG/PKG/APP/JNLP with javapackager..."
         puts command
         system command      
       end

data/lib/glimmer/rake_task.rb

@@ -19,17 +19,24 @@ namespace :glimmer do
       Glimmer::Package.jar
     end
 
-    desc 'Generate Native files (DMG/PKG/APP on the Mac, EXE on Windows, RPM/DEB on Linux)'
-    task :native do
-      Glimmer::Package.native
+    desc 'Lock JARs'
+    task :lock_jars do
+      Glimmer::Package.lock_jars
+    end
+
+    desc 'Generate Native files (DMG/PKG/APP on the Mac, MSI/EXE/IMAGE on Windows, RPM/DEB on Linux) (type is optional)'
+    task :native, [:type] do |t, args|
+      Glimmer::Package.native(args[:type])
     end
   end
 
-  desc 'Package app for distribution (generating config, jar, and native files)'
-  task :package do
+  desc 'Package app for distribution (generating config, jar, and native files) (type is optional)'
+  task :package, [:type] do |t, args|
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    Rake::Task['glimmer:package:native'].execute
+    Rake::Task['glimmer:package:lock_jars'].execute
+    Rake::Task['gemspec:generate'].execute
+    Rake::Task['glimmer:package:native'].execute(args)
   end
 
 

data/lib/glimmer/scaffold.rb

@@ -76,21 +76,7 @@ class Scaffold
       packages      
     MULTI_LINE_STRING
 
-    GEMFILE_APP = <<~MULTI_LINE_STRING
-      # frozen_string_literal: true
-      
-      source 'https://rubygems.org'
-      
-      git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
-      
-      gem 'glimmer-dsl-swt', '~> #{VERSION}'
-      
-      group :test do
-        gem 'rspec'
-      end
-    MULTI_LINE_STRING
-
-    GEMFILE_GEM = <<~MULTI_LINE_STRING
+    GEMFILE = <<~MULTI_LINE_STRING
       # frozen_string_literal: true
       
       source 'https://rubygems.org'
@@ -101,24 +87,12 @@ class Scaffold
       
       group :development do
         gem 'rspec', '~> 3.5.0'
+        gem 'git-glimmer', '1.7.0'
         gem 'jeweler', '2.3.9'
         gem 'simplecov', '>= 0'
       end
     MULTI_LINE_STRING
 
-    RAKEFILE = <<~MULTI_LINE_STRING
-      require 'glimmer/rake_task'
-      
-      ## Use the following configuration if you would like to customize javapackager
-      ## arguments for `glimmer package` command.
-      #
-      # Glimmer::Package.javapackager_extra_args =
-      #   " -BlicenseType=" +
-      #   " -Bmac.CFBundleIdentifier=" +
-      #   " -Bmac.category=" +
-      #   " -Bmac.signing-key-developer-id-app="
-    MULTI_LINE_STRING
-
     RVM_FUNCTION = <<~MULTI_LINE_STRING
       # Load RVM into a shell session *as a function*
       if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -135,21 +109,30 @@ class Scaffold
     MULTI_LINE_STRING
 
     def app(app_name)
-      mkdir app_name
-      cd app_name
+      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
+      gem_name = file_name(app_name)
+      gem_summary = human_name(app_name)
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      cd gem_name
+      rm_rf 'lib'
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', app_name
       write 'VERSION', '1.0.0'
       write 'LICENSE.txt', "Copyright (c) #{Time.now.year} #{app_name}"
-      write 'Gemfile', GEMFILE_APP
-      write 'Rakefile', RAKEFILE
+      write 'Gemfile', GEMFILE
+      write 'Rakefile', gem_rakefile(app_name, nil, gem_name)
       mkdir 'app'
       write "app/#{file_name(app_name)}.rb", app_main_file(app_name)
       mkdir 'app/models'
       mkdir 'app/views'
       custom_shell('AppView', current_dir_name, :app)
-      if OS.mac?
+      if OS::Underlying.windows?
+        mkdir_p 'package/windows'
+        icon_file = "package/windows/#{human_name(app_name)}.ico"
+        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+        puts "Created #{current_dir_name}/#{icon_file}"
+      elsif OS.mac?
         mkdir_p 'package/macosx'
         icon_file = "package/macosx/#{human_name(app_name)}.icns"
         cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
@@ -157,8 +140,15 @@ class Scaffold
       end
       mkdir 'bin'
       write "bin/#{file_name(app_name)}", app_bin_file(app_name)
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-      system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
+      write 'spec/spec_helper.rb', spec_helper_file
+      if OS.windows?
+        system "bundle"
+        system "glimmer package[image]"
+        system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
+        system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app" if OS.mac?
+      end
       # TODO generate rspec test suite
     end
 
@@ -188,13 +178,13 @@ class Scaffold
       else
         namespace = 'glimmer'
       end
-      system "jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
       cd gem_name
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', gem_name
       write 'VERSION', '1.0.0'
-      write 'Gemfile', GEMFILE_GEM      
+      write 'Gemfile', GEMFILE
       write 'Rakefile', gem_rakefile(custom_shell_name, namespace, gem_name)
       append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
       mkdir 'lib/views'
@@ -203,14 +193,26 @@ class Scaffold
       write "bin/#{gem_name}", gem_bin_file(gem_name, custom_shell_name, namespace)
       write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name)
       FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
-      if OS.mac?
+      write 'spec/spec_helper.rb', spec_helper_file
+      if OS::Underlying.windows?
+        mkdir_p 'package/windows'
+        icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
+        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+        puts "Created #{current_dir_name}/#{icon_file}"
+      elsif OS.mac?
         mkdir_p 'package/macosx'
         icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
         cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
         puts "Created #{current_dir_name}/#{icon_file}"
       end
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-      system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app"
+      if OS.windows?
+        system "bundle"
+        system "glimmer package[image]"
+        system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
+        system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+      end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
       puts 'Run `rake` to execute specs.'
@@ -228,19 +230,23 @@ class Scaffold
       else
         namespace = 'glimmer'
       end
-      system "jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
       cd gem_name
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', gem_name
       write 'VERSION', '1.0.0'
-      write 'Gemfile', GEMFILE_GEM      
+      write 'Gemfile', GEMFILE
       write 'Rakefile', gem_rakefile
       write 'spec/spec_helper.rb', spec_helper_file
       append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
       mkdir 'lib/views'
       custom_widget(custom_widget_name, namespace)
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n'"
+      if OS.windows?
+        system "bundle"
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n'"
+      end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
       puts 'Run `rake` to execute specs.'
@@ -355,10 +361,11 @@ class Scaffold
       lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
       gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
       if custom_shell_name
-        lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*.rb', 'bin/**/*']")
+        lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*', 'app/**/*', 'bin/**/*', 'vendor/**/*', 'package/**/*']")
         lines.insert(gem_files_line_index+1, "  gem.executables = ['#{gem_name}', '#{file_name(custom_shell_name)}']")
+        lines.insert(gem_files_line_index+2, "  gem.require_paths = ['vendor', 'lib', 'app']")
       else
-        lines.insert(gem_files_line_index, "  gem.files = Dir['lib/**/*.rb']")
+        lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*']")
       end
       spec_pattern_line_index = lines.index(lines.detect {|l| l.include?('spec.pattern =') })
       lines.insert(spec_pattern_line_index+1, "  spec.ruby_opts = [Glimmer::Launcher.jruby_swt_options]")
@@ -383,7 +390,7 @@ class Scaffold
       content = File.read('spec/spec_helper.rb')
       lines = content.split("\n")
       require_line_index = lines.index(lines.detect {|l| l.include?(current_dir_name) })
-      lines[require_line_index...require_line_index] = [
+      lines[require_line_index..require_line_index] = [
         "require 'bundler/setup'",
         'Bundler.require(:default, :development)',
       ]
@@ -412,9 +419,9 @@ class Scaffold
       
       if shell_type == :gem
         custom_shell_file_content += <<-MULTI_LINE_STRING
-    GEM_ROOT = File.expand_path('../../../..', __FILE__)
-    VERSION = File.read(File.join(GEM_ROOT, 'VERSION'))
-    LICENSE = File.read(File.join(GEM_ROOT, 'LICENSE.txt'))
+    APP_ROOT = File.expand_path('../../../..', __FILE__)
+    VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
+    LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
         
         MULTI_LINE_STRING
       end
@@ -470,6 +477,7 @@ class Scaffold
       shell {
         # Replace example content below with custom shell content
         minimum_size 320, 240
+        image File.join(APP_ROOT, 'package', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?
         text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
         grid_layout
         label(:center) {
@@ -477,6 +485,17 @@ class Scaffold
           font height: 40
           layout_data :fill, :center, true, true
         }
+        menu_bar {
+          menu {
+            text '&File'
+            menu_item {
+              text 'Preferences...'
+              on_widget_selected {
+                display_preferences_dialog
+              }
+            }
+          }
+        }
       }
     }
       MULTI_LINE_STRING

data/lib/glimmer/swt/color_proxy.rb

@@ -5,7 +5,7 @@ module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Color
     #
-    # Invoking `#swt_color` returns the SWT color object wrapped by this proxy
+    # Invoking `#swt_color` returns the SWT Color object wrapped by this proxy
     #
     # Follows the Proxy Design Pattern
     class ColorProxy

data/lib/glimmer/swt/cursor_proxy.rb

@@ -0,0 +1,45 @@
+require 'glimmer/error'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Cursor
+    #
+    # Invoking `#swt_cursor` returns the SWT Cursor object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class CursorProxy
+      CURSOR_STYLES = org.eclipse.swt.SWT.constants.select {|c| c.to_s.downcase.start_with?('cursor_')}.map {|c| c.to_s.downcase.sub('cursor_', '').to_sym}
+      ERROR_INVALID_CURSOR_STYLE = " is an invalid cursor style! Valid values are #{CURSOR_STYLES.map(&:to_s).join(", ")}"
+
+      include_package 'org.eclipse.swt.graphics'
+
+      attr_reader :swt_cursor, :cursor_style
+
+      # Builds a new CursorProxy from passed in cursor SWT style (e.g. :appstarting, :hand, or :help)
+      #
+      # Cursor SWT styles are those that begin with "CURSOR_" prefix
+      #
+      # They are expected to be passed in in short form without the prefix (but would work with the prefix too)
+      def initialize(cursor_style)
+        @cursor_style = cursor_style
+        @cursor_style = SWTProxy.reverse_lookup(@cursor_style).detect { |symbol| symbol.to_s.downcase.start_with?('cursor_') } if cursor_style.is_a?(Integer)
+        @cursor_style = @cursor_style.to_s.downcase
+        @cursor_style = @cursor_style.sub(/^cursor\_/, '') if @cursor_style.start_with?('cursor_')
+        detect_invalid_cursor_style
+        @swt_cursor = DisplayProxy.instance.swt_display.get_system_cursor(SWTProxy[swt_style])
+      end
+      
+      def swt_style
+        @swt_style ||= @cursor_style.upcase.start_with?('CURSOR_') ? @cursor_style : "CURSOR_#{@cursor_style}"
+      end
+
+      private
+
+      def detect_invalid_cursor_style
+        raise Error, cursor_style.to_s + ERROR_INVALID_CURSOR_STYLE unless CURSOR_STYLES.include?(cursor_style.to_s.downcase.to_sym)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/font_proxy.rb

@@ -6,11 +6,10 @@ module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Font
     #
-    # This class is meant to be used with WidgetProxy to manipulate
-    # an SWT widget font.
+    # This class can be optionally used with WidgetProxy to manipulate
+    # an SWT widget font (reusing its FontData but building a new Font)
     #
-    # It is not meant to create new SWT fonts form scratch without
-    # a widget proxy.
+    # Otherwise, if no WidgetProxy is passed to constructor, it builds new FontData
     #
     # Invoking `#swt_font` returns the SWT Font object wrapped by this proxy
     #
@@ -21,7 +20,7 @@ module Glimmer
 
       include_package 'org.eclipse.swt.graphics'
 
-      attr_reader :widget_proxy, :swt_font
+      attr_reader :widget_proxy, :swt_font, :font_properties
 
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
@@ -31,8 +30,9 @@ module Glimmer
       #
       # Style (:style value) can only be one of FontProxy::FONT_STYLES values:
       # that is :normal, :bold, or :italic
-      def initialize(widget_proxy, font_properties)
+      def initialize(widget_proxy = nil, font_properties)
         @widget_proxy = widget_proxy
+        @font_properties = font_properties
         detect_invalid_font_property(font_properties)
         font_properties[:style] = SWTProxy[*font_properties[:style]]
         font_data_args = [:name, :height, :style].map do |font_property_name|
@@ -57,7 +57,7 @@ module Glimmer
       private
 
       def font_datum
-        @font_datum ||= @widget_proxy.swt_widget.getFont.getFontData[0]
+        @font_datum ||= @widget_proxy ? @widget_proxy.swt_widget.getFont.getFontData[0] : FontData.new
       end
 
       def detect_invalid_font_property(font_properties)

data/lib/glimmer/swt/image_proxy.rb

@@ -0,0 +1,56 @@
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Image
+    #
+    # Invoking `#swt_image` returns the SWT Image object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class ImageProxy
+      include_package 'org.eclipse.swt.graphics'
+      
+      attr_reader :file_path, :jar_file_path, :image_data, :swt_image
+
+      # Initializes a proxy for an SWT Image object
+      #
+      # Takes the same args as the SWT Image class
+      # Alternatively, takes a file path string or a uri:classloader file path string (generated by JRuby when invoking `File.expand_path` inside a JAR file)
+      # and returns an image object.
+      def initialize(*args)
+        @args = args
+        @file_path = @args.first if @args.first.is_a?(String) && @args.size == 1        
+        if @file_path
+          if @file_path.start_with?('uri:classloader')
+            @jar_file_path = @file_path
+            @file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
+            object = java.lang.Object.new
+            file_input_stream = object.java_class.resource_as_stream(file_path)
+            buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
+          end
+          @image_data = ImageData.new(buffered_file_input_stream || @file_path)
+          @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+        else
+          @swt_image = Image.new(*@args)
+          @image_data = @swt_image.image_data
+        end        
+      end
+
+      def scale_to(width, height)
+        scaled_image_data = image_data.scaledTo(width, height)
+        device = swt_image.device
+        swt_image.dispose
+        @swt_image = Image.new(device, scaled_image_data)
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_image.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither ImageProxy nor #{swt_image.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_image.respond_to?(method, *args, &block)
+      end      
+    end
+  end
+end

data/lib/glimmer/swt/layout_proxy.rb

@@ -45,6 +45,8 @@ module Glimmer
         @widget_proxy = widget_proxy
         args = SWTProxy.constantify_args(args)
         @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)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
       end
 

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -1,21 +1,16 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
-    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy
-      def initialize(underscored_widget_name, parent, args)
-        unless args.first.is_a?(Numeric)
-          args.unshift(:h_scroll)
-          args.unshift(:v_scroll)
-        end
-        super
-        swt_widget.expand_horizontal = true
-        swt_widget.expand_vertical = true
-      end
-      
+    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy    
       def post_initialize_child(child)
         swt_widget.content = child.swt_widget        
       end
+      
+      def post_add_content
+        swt_widget.set_min_size(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]))
+      end      
     end
   end
 end

data/lib/glimmer/swt/shell_proxy.rb

@@ -130,7 +130,7 @@ module Glimmer
           begin
             @display.sleep unless @display.readAndDispatch
           rescue => e
-            Glimmer::Config.logger.debug {e.full_message}
+            Glimmer::Config.logger.info {e.full_message}
           end
         end
       end

data/lib/glimmer/swt/style_constantizable.rb

@@ -106,7 +106,17 @@ module Glimmer
         def deconstruct(integer)
           constant_source_class.constants.reduce([]) do |found, c|
             constant_value = constant_source_class.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
+            is_found = constant_value.is_a?(Integer) && (integer & constant_value) == integer
+            is_found ? found += [c] : found
+          end
+        end
+
+        # Reverse engineer a style integer into a symbol
+        # Useful for debugging
+        def reverse_lookup(integer)
+          constant_source_class.constants.reduce([]) do |found, c|
+            constant_value = constant_source_class.const_get(c) rescue -1
+            is_found = constant_value.is_a?(Integer) && integer == constant_value
             is_found ? found += [c] : found
           end
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/dnd_proxy'
+require 'glimmer/swt/image_proxy'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -21,21 +22,39 @@ module Glimmer
       include Packages
 
       DEFAULT_STYLES = {
-        "text"        => [:border],
-        "table"       => [:virtual, :border, :full_selection],
-        "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
-        "spinner"     => [:border],
-        "styled_text" => [:border],
-        "list"        => [:border, :v_scroll],
-        "button"      => [:push],
-        "menu_item"   => [:push],
-        "drag_source" => [:drop_copy],
-        "drop_target" => [:drop_copy],
+        "arrow"               => [:arrow],
+        "button"              => [:push],
+        "checkbox"            => [:check],
+        "drag_source"         => [:drop_copy],
+        "drop_target"         => [:drop_copy],
+        "list"                => [:border, :v_scroll],
+        "menu_item"           => [:push],
+        "radio"               => [:radio],
+        "scrolled_composite"  => [:border, :h_scroll, :v_scroll],
+        "spinner"             => [:border],
+        "styled_text"         => [:border],
+        "table"               => [:virtual, :border, :full_selection],
+        "text"                => [:border],
+        "toggle"              => [:toggle],
+        "tree"                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 
       DEFAULT_INITIALIZERS = {
         "composite" => lambda do |composite|
-          composite.setLayout(GridLayout.new)
+          layout = GridLayout.new
+          layout.marginWidth = 15
+          layout.marginHeight = 15
+          composite.layout = layout
+        end,
+        "scrolled_composite" => lambda do |scrolled_composite|
+          scrolled_composite.expand_horizontal = true
+          scrolled_composite.expand_vertical = true
+        end,
+        "shell" => lambda do |shell|
+          layout = FillLayout.new
+          layout.marginWidth = 15
+          layout.marginHeight = 15
+          shell.layout = layout
         end,
         "table" => lambda do |table|
           table.setHeaderVisible(true)
@@ -49,18 +68,19 @@ module Glimmer
         end,
       }
 
-      attr_reader :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
+      attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
 
       # Initializes a new SWT Widget
       #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
       def initialize(underscored_widget_name, parent, args)
+        @parent_proxy = parent
         styles, extra_options = extract_args(underscored_widget_name, args)
         swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
-        @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        @swt_widget = swt_widget_class.new(@parent_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
         @swt_widget.set_data('proxy', self)
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
-        parent.post_initialize_child(self)
+        @parent_proxy.post_initialize_child(self)
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -68,6 +88,11 @@ module Glimmer
         # No Op by default
       end
 
+      # Subclasses may override to perform post add_content work
+      def post_add_content
+        # No Op by default
+      end
+
       def extract_args(underscored_widget_name, args)
         @arg_extractor_mapping ||= {
           'menu_item' => lambda do |args|
@@ -263,6 +288,7 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
+        underscored_widget_name = 'button' if %w[radio checkbox toggle arrow].include?(underscored_widget_name)
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
@@ -590,25 +616,31 @@ module Glimmer
         @property_type_converters ||= {
           :background => color_converter,
           :background_image => lambda do |value|
+            image_proxy = nil
             if value.is_a?(String)
-              if value.start_with?('uri:classloader')
-                value = value.sub(/^uri\:classloader\:/, '')
-                object = java.lang.Object.new
-                value = object.java_class.resource_as_stream(value)
-                value = java.io.BufferedInputStream.new(value)
-              end
-              image_data = ImageData.new(value)
-              # TODO in the future, look into unregistering this listener when no longer needed
+              image_proxy = ImageProxy.new(value)
+            elsif value.is_a?(Array)
+              image_proxy = ImageProxy.new(*value)
+            end
+            if image_proxy
               on_swt_Resize do |resize_event|
-                new_image_data = image_data.scaledTo(@swt_widget.getSize.x, @swt_widget.getSize.y)
-                @swt_widget.getBackgroundImage&.dispose
-                @swt_widget.setBackgroundImage(Image.new(@swt_widget.getDisplay, new_image_data))
+                image_proxy.scale_to(@swt_widget.getSize.x, @swt_widget.getSize.y)
+                @swt_widget.setBackgroundImage(image_proxy.swt_image)
               end
-              Image.new(@swt_widget.getDisplay, image_data)
+              image_proxy.swt_image
             else
               value
             end
           end,
+          :cursor => lambda do |value|
+            cursor_proxy = nil
+            if value.is_a?(CursorProxy)
+              cursor_proxy = value
+            elsif value.is_a?(Symbol) || value.is_a?(String) || value.is_a?(Integer)
+              cursor_proxy = CursorProxy.new(value)
+            end
+            cursor_proxy ? cursor_proxy.swt_cursor : value
+          end,
           :foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)
@@ -620,14 +652,9 @@ module Glimmer
           end,
           :image => lambda do |value|
             if value.is_a?(String)
-              if value.start_with?('uri:classloader')
-                value = value.sub(/^uri\:classloader\:/, '')
-                object = java.lang.Object.new
-                value = object.java_class.resource_as_stream(value)
-                value = java.io.BufferedInputStream.new(value)
-              end
-              image_data = ImageData.new(value)
-              Image.new(@swt_widget.getDisplay, image_data)
+              ImageProxy.new(value).swt_image
+            elsif value.is_a?(Array)
+              ImageProxy.new(*value).swt_image
             else
               value
             end
@@ -635,14 +662,9 @@ module Glimmer
           :images => lambda do |array|
             array.to_a.map do |value|
               if value.is_a?(String)
-                if value.start_with?('uri:classloader')
-                  value = value.sub(/^uri\:classloader\:/, '')
-                  object = java.lang.Object.new
-                  value = object.java_class.resource_as_stream(value)
-                  value = java.io.BufferedInputStream.new(value)
-                end
-                image_data = ImageData.new(value)
-                Image.new(@swt_widget.getDisplay, image_data)
+                ImageProxy.new(value).swt_image
+              elsif value.is_a?(Array)
+                ImageProxy.new(*value).swt_image
               else
                 value
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  name: git-glimmer
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -294,6 +308,7 @@ files:
 - bin/girb_runner.rb
 - bin/glimmer
 - icons/scaffold_app.icns
+- icons/scaffold_app.ico
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
 - lib/glimmer-dsl-swt.rb
@@ -309,6 +324,7 @@ files:
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/cursor_expression.rb
 - lib/glimmer/dsl/swt/custom_widget_expression.rb
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
@@ -316,6 +332,8 @@ files:
 - lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
+- lib/glimmer/dsl/swt/font_expression.rb
+- lib/glimmer/dsl/swt/image_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
 - lib/glimmer/dsl/swt/layout_expression.rb
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
@@ -341,9 +359,11 @@ files:
 - lib/glimmer/rake_task/list.rb
 - lib/glimmer/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
+- lib/glimmer/swt/cursor_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
+- lib/glimmer/swt/image_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
 - lib/glimmer/swt/layout_proxy.rb
 - lib/glimmer/swt/menu_proxy.rb