glimmer-dsl-swt 4.17.1.0 → 4.17.2.3

data/lib/glimmer/swt/image_proxy.rb

@@ -39,27 +39,38 @@ module Glimmer
       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)
+        options = @args.delete_at(-1) if @args.last.is_a?(Hash)
+        if options&.keys&.include?(:swt_image)
+          @swt_image = options[:swt_image]
+          @image_data = @swt_image.image_data
+        elsif @file_path
+          @image_data = ImageData.new(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 input_stream
+        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)
+        else
+          file_input_stream = java.io.FileInputStream.new(@file_path)
+        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)
         device = swt_image.device
         swt_image.dispose
         @swt_image = Image.new(device, scaled_image_data)
+        @image_data = @swt_image.image_data
+        self
       end
       
       def method_missing(method, *args, &block)

data/lib/glimmer/swt/shell_proxy.rb

@@ -63,6 +63,7 @@ module Glimmer
           @swt_widget.set_data('proxy', self)
           @swt_widget.setLayout(FillLayout.new)
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
+          # TODO make this an option not the default
           on_swt_show do
             Thread.new do      
               sleep(0.25)

data/lib/glimmer/swt/widget_proxy.rb

@@ -23,6 +23,7 @@ require 'glimmer/swt/widget_listener_proxy'
 require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
 
@@ -204,7 +205,7 @@ module Glimmer
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-        elsif @swt_widget.respond_to?(attribute_setter(attribute_name), 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
         else
@@ -678,23 +679,59 @@ 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) {
+            SWTProxy[*value]
+          },
           :background => color_converter,
           :background_image => lambda do |value|
-            image_proxy = nil
-            if value.is_a?(String)
-              image_proxy = ImageProxy.new(value)
+            # TODO push this code to ImageProxy
+            image_proxy = if value.is_a?(String)
+              ImageProxy.new(value)
             elsif value.is_a?(Array)
-              image_proxy = ImageProxy.new(*value)
-            end
-            if image_proxy
-              on_swt_Resize do |resize_event|
-                image_proxy.scale_to(@swt_widget.getSize.x, @swt_widget.getSize.y)
-                @swt_widget.setBackgroundImage(image_proxy.swt_image)
-              end
-              image_proxy.swt_image
+              ImageProxy.new(*value)
+            elsif value.is_a?(Image)
+              ImageProxy.new(swt_image: value)
             else
               value
             end
+            
+            if image_proxy&.file_path&.end_with?('.gif')
+              image = image_proxy.swt_image
+              width = image.get_bounds.width.to_i
+              height = image.get_bounds.height.to_i
+              image_number = 0
+              loader = ImageLoader.new
+              loader.load(image_proxy.input_stream)
+              image.dispose
+              image = org.eclipse.swt.graphics.Image.new(DisplayProxy.instance.swt_display,loader.data[0].scaledTo(width, height))
+              gc = org.eclipse.swt.graphics.GC.new(image)
+              on_paint_control { |event|
+                image_number = (image_number == loader.data.length - 1) ? 0 : image_number + 1
+                next_frame_data = loader.data[image_number]
+                image = org.eclipse.swt.graphics.Image.new(DisplayProxy.instance.swt_display, next_frame_data.scaledTo(width, height))
+                event.gc.drawImage(image, 0, 0, width, height, 0, 0, width, height)
+                image.dispose
+              }
+              Thread.new {
+                last_image_number = -1
+                while last_image_number != image_number
+                  last_image_number = image_number
+                  sync_exec {
+                    redraw
+                  }
+                  delayTime = loader.data[image_number].delayTime.to_f / 100.0
+                  sleep(delayTime)
+                end
+              };
+              image_proxy = nil              
+            else
+              on_swt_Resize do |resize_event|
+                image_proxy.scale_to(@swt_widget.getSize.x, @swt_widget.getSize.y)
+                @swt_widget.setBackgroundImage(image_proxy.swt_image)          
+              end        
+            end            
+            
+            image_proxy&.swt_image
           end,
           :cursor => lambda do |value|
             cursor_proxy = nil
@@ -715,13 +752,16 @@ module Glimmer
             end
           end,
           :image => lambda do |value|
-            if value.is_a?(String)
+            image_proxy = if value.is_a?(String)
               ImageProxy.new(value).swt_image
             elsif value.is_a?(Array)
               ImageProxy.new(*value).swt_image
+            elsif value.is_a?(Image)
+              ImageProxy.new(swt_image: value)
             else
               value
             end
+            image_proxy.swt_image
           end,
           :images => lambda do |array|
             array.to_a.map do |value|

data/lib/glimmer/ui/custom_widget.rb

@@ -211,9 +211,9 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) && 
-          !swt_widget.respond_to?(method_name) &&
-          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') && 
+        respond_to?(method_name) and 
+          !swt_widget&.respond_to?(method_name) and
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and 
           !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
@@ -273,7 +273,10 @@ module Glimmer
 
       def execute_hooks(hook_name)
         self.class.instance_variable_get("@#{hook_name}_blocks")&.each do |hook_block|
-          instance_exec(&hook_block)
+          temp_method_name = "#{hook_name}_block_#{hook_block.hash.abs}_#{(Time.now.to_f * 1_000_000).to_i}"
+          singleton_class.define_method(temp_method_name, &hook_block)
+          send(temp_method_name)
+          singleton_class.send(:remove_method, temp_method_name)
         end
       end
     end

data/lib/glimmer/util/proc_tracker.rb

@@ -19,6 +19,8 @@
 # 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 'delegate'
+
 module Glimmer
   module Util
     class ProcTracker < DelegateClass(Proc)

data/samples/elaborate/contact_manager/contact_repository.rb

@@ -124,105 +124,8 @@ class ContactManager
       Jason
       Emma
       Olivia
-      Ava
-      Isabella
-      Sophia
-      Charlotte
-      Mia
-      Amelia
-      Harper
-      Evelyn
-      Abigail
-      Emily
-      Elizabeth
-      Mila
-      Ella
-      Avery
-      Sofia
-      Camila
-      Aria
-      Scarlett
-      Victoria
-      Madison
-      Luna
-      Grace
-      Chloe
-      Penelope
-      Layla
-      Riley
-      Zoey
-      Nora
-      Lily
-      Eleanor
-      Hannah
-      Lillian
-      Addison
-      Aubrey
-      Ellie
-      Stella
-      Natalie
-      Zoe
-      Leah
-      Hazel
-      Violet
-      Aurora
-      Savannah
-      Audrey
-      Brooklyn
-      Bella
-      Claire
-      Skylar
-      Lucy
-      Paisley
-      Everly
-      Anna
-      Caroline
-      Nova
-      Genesis
-      Emilia
-      Kennedy
-      Samantha
-      Maya
-      Willow
-      Kinsley
-      Naomi
-      Aaliyah
-      Elena
-      Sarah
-      Ariana
-      Allison
-      Gabriella
-      Alice
-      Madelyn
-      Cora
-      Ruby
-      Eva
-      Serenity
-      Autumn
-      Adeline
-      Hailey
-      Gianna
-      Valentina
-      Isla
-      Eliana
-      Quinn
-      Nevaeh
-      Ivy
-      Sadie
-      Piper
-      Lydia
-      Alexa
-      Josephine
-      Emery
-      Julia
-      Delilah
-      Arianna
-      Vivian
-      Kaylee
-      Sophie
-      Brielle
-      Madeline
     ]
+    
     NAMES_LAST = %w[
       Smith
       Johnson
@@ -235,8 +138,9 @@ class ContactManager
       Anderson
       Taylor
     ]
+    
     def initialize(contacts = nil)
-      @contacts = contacts || 1000.times.map do |n|
+      @contacts = contacts || 100.times.map do |n|
         random_first_name_index = (rand*NAMES_FIRST.size).to_i
         random_last_name_index = (rand*NAMES_LAST.size).to_i
         first_name = NAMES_FIRST[random_first_name_index]

data/samples/hello/hello_combo.rb

@@ -23,30 +23,34 @@ class Person
   attr_accessor :country, :country_options
 
   def initialize
-    self.country_options=["", "Canada", "US", "Mexico"]
-    self.country = "Canada"
+    self.country_options = ['', 'Canada', 'US', 'Mexico']
+    reset_country
   end
 
   def reset_country
-    self.country = "Canada"
+    self.country = 'Canada'
   end
 end
 
 class HelloCombo
   include Glimmer
+  
   def launch
     person = Person.new
     
     shell {
-      fill_layout :vertical
-      text 'Hello, Combo!'
+      row_layout(:vertical) {
+        pack false
+      }        
+      
+      text 'Hello, Combo!'      
       
       combo(:read_only) {
         selection bind(person, :country)
       }
       
       button {
-        text "Reset Selection"
+        text 'Reset Selection'
         
         on_widget_selected do
           person.reset_country

data/samples/hello/hello_custom_shell.rb

@@ -0,0 +1,155 @@
+# 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
+# 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 'date'
+
+# This class declares an `email_shell` custom shell, aka custom window (by convention)
+# Used to view an email message
+class EmailShell
+  include Glimmer::UI::CustomShell
+  
+  # multiple options without default values  
+  options :date, :subject, :from, :message
+  
+  # single option with default value
+  option :to, default: '"John Irwin" <john.irwin@example.com>'
+  
+  before_body {
+    @swt_style |= swt(:shell_trim, :modeless)
+  }
+  
+  body {
+    # pass received swt_style through to shell to customize it (e.g. :dialog_trim for a blocking shell)
+    shell(swt_style) {
+      grid_layout(2, false)
+      
+      text subject      
+
+      label {
+        text 'Date:'
+      }
+      label {
+        text date
+      }
+
+      label {
+        text 'From:'
+      }
+      label {
+        text from
+      }
+
+      label {
+        text 'To:'
+      }
+      label {
+        text to
+      }
+
+      label {
+        text 'Subject:'
+      }
+      label {
+        text subject
+      }
+
+      label {
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span 2
+          vertical_indent 10
+        }
+        
+        background :white
+        text message        
+      }
+    }
+  }
+  
+end
+
+class HelloCustomShell
+  # including Glimmer enables the Glimmer DSL syntax, including auto-discovery of the `email_shell` custom widget
+  include Glimmer
+  
+  Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
+  EmailSystem = Struct.new(:emails, keyword_init: true)
+  
+  def initialize
+    @email_system = EmailSystem.new(
+      emails: [
+        Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
+        Email.new(date: DateTime.new(2029, 10, 21, 8, 1, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v100.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 100.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+        Email.new(date: DateTime.new(2029, 10, 19, 16, 58, 0).strftime('%F %I:%M %p'), subject: 'Christmas Party', from: '"Lisa Ferreira" <lisa.ferreira@example.com>', message: "Merry Christmas,\n\nAll office Christmas Party arrangements have been set\n\nMake sure to bring a Secret Santa gift\n\nBest regards,\n\nLisa Ferreira"),
+        Email.new(date: DateTime.new(2029, 10, 16, 9, 43, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v99.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 99.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+        Email.new(date: DateTime.new(2029, 10, 15, 11, 2, 0).strftime('%F %I:%M %p'), subject: '2nd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
+        Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+      ]
+    )
+  end
+  
+  def launch
+    shell {
+      grid_layout
+      
+      text 'Hello, Custom Shell!'
+      
+      label {
+        font height: 24, style: :bold
+        text 'Emails:'
+      }
+      
+      label {
+        font height: 18
+        text 'Click an email to view its message'
+      }
+      
+      table {
+        layout_data :fill, :fill, true, true
+      
+        table_column {
+          text 'Date:'
+          width 180
+        }
+        table_column {
+          text 'Subject:'
+          width 180
+        }
+        table_column {
+          text 'From:'
+          width 360
+        }
+        
+        items bind(@email_system, :emails), column_properties(:date, :subject, :from)
+        
+        on_mouse_up { |event|
+          email = event.table_item.get_data
+          Thread.new do
+            async_exec {
+              email_shell(date: email.date, subject: email.subject, from: email.from, message: email.message).open
+            }
+          end
+        }
+      }
+    }.open
+  end  
+end
+
+HelloCustomShell.new.launch