glimmer-dsl-swt 4.19.0.2 → 4.20.0.4

data/lib/glimmer/data_binding/shine.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -19,26 +19,41 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-## NOTE: Unsupported for now TODO support in the future
-#
-# require File.dirname(__FILE__) + "/glimmer"
-#
-# class Array
-#   include Glimmer
-#
-#   alias original_compare <=>
-#
-#   def <=>(other)
-#     if (self[0].class.name == "WidgetProxy")
-#       content(self[0]) {
-#         if (other.size == 2)
-#           eval("#{self[1]} bind (other[0], other[1])")
-#         elsif (other.size == 3)
-#           eval("#{self[1]} bind (other[0], other[1], other[2])")
-#         end
-#       }
-#     else
-#       original_compare(other)
-#     end
-#   end
-# end
+module Glimmer
+  module DataBinding
+    class Shine
+      include Glimmer
+      
+      def initialize(parent, parent_attribute)
+        @parent = parent
+        @parent_attribute = parent_attribute
+      end
+    
+      alias original_compare <=>
+    
+      def <=>(other)
+        if other.is_a?(Array)
+          @parent.content {
+            send(@parent_attribute, bind(*other))
+          }
+        else  # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
+          original_compare(other)
+        end
+      end
+    
+      def <=(other)
+        if other.is_a?(Array)
+          args_clone = other.clone
+          if args_clone.last.is_a?(Hash)
+            args_clone.last[:read_only] = true
+          else # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
+            args_clone << {read_only: true}
+          end
+          @parent.content {
+            send(@parent_attribute, bind(*args_clone))
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/launcher'
-require Glimmer::Launcher.swt_jar_file
+require ENV['SWT_JAR_FILE_PATH'] || "#{Glimmer::Launcher.swt_jar_file}#{Glimmer::Launcher.special_cpu_architecture_suffix}"
 require 'glimmer/dsl/engine'
 Dir[File.expand_path('../*_expression.rb', __FILE__)].each {|f| require f}
 
@@ -52,6 +52,7 @@ module Glimmer
           image
           multiply
           property
+          shine_data_binding
           block_property
           dialog
           widget

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

@@ -0,0 +1,49 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/widget_binding'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            parent.respond_to?(:set_attribute) and
+            parent.respond_to?(:has_attribute?) and
+            parent.has_attribute?(keyword, *args) and
+            !parent.is_a?(Glimmer::UI::CustomWidget) and
+            !parent.is_a?(Glimmer::UI::CustomShape) and
+            !(parent.respond_to?(:swt_widget) && parent.swt_widget.class == org.eclipse.swt.widgets.Canvas && keyword == 'image')
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

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

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

data/lib/glimmer/launcher.rb

@@ -71,6 +71,12 @@ module Glimmer
       def platform_os
         OPERATING_SYSTEMS_SUPPORTED.detect {|os| OS.send("#{os}?")}
       end
+      
+      def special_cpu_architecture_suffix
+        host_cpu = OS.host_cpu.downcase
+        special = host_cpu.include?('aarch64') || host_cpu.include?('arm')
+        special ? "_aarch64" : ''
+      end
 
       def swt_jar_file
         @swt_jar_file ||= File.expand_path(File.join(__FILE__, '..', '..', '..', 'vendor', 'swt', platform_os, 'swt.jar'))

data/lib/glimmer/rake_task/scaffold.rb

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

data/lib/glimmer/swt/combo_proxy.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Combo
+    #
+    # Follows the Proxy Design Pattern
+    class ComboProxy < WidgetProxy
+      attr_accessor :tool_item_proxy, :swt_tool_item
+    
+      def initialize(*init_args, &block)
+        super
+        self.tool_item_proxy = WidgetProxy.new("tool_item", parent_proxy, [:separator]) if parent_proxy.swt_widget.is_a?(ToolBar)
+        self.swt_tool_item = tool_item_proxy&.swt_widget
+      end
+      
+      def post_add_content
+        if self.tool_item_proxy
+          self.swt_widget.pack
+          self.tool_item_proxy.text = 'filler' # text seems needed (any text works)
+          self.tool_item_proxy.width = swt_widget.size.x
+          self.tool_item_proxy.control = swt_widget
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/code_text.rb

@@ -124,21 +124,15 @@ module Glimmer
               
               @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
                 layout_data(:right, :fill, false, true)
-                top_pixel_before_read = nil
+
                 text bind(self,
                   :styled_text_proxy_text,
                   read_only: true,
                   on_read: lambda { |text_value|
-                    line_count = "#{text_value} ".split("\n").count
-                    line_count = 1 if line_count == 0
-                    lines_text_size = [line_count.to_s.size, @lines_width].max
-                    if lines_text_size > @lines_width
-                      @lines_width = lines_text_size
-                    end
-                    line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
+                    line_numbers_text_from(text_value)
                   },
                   after_read: lambda {
-                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel
+                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel unless styled_text_proxy_top_pixel.nil?
                   }
                 )
                 top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
@@ -151,6 +145,7 @@ module Glimmer
                 left_margin 5
                 editable false
                 caret nil
+                
                 on_focus_gained {
                   @styled_text_proxy&.setFocus
                 }
@@ -173,6 +168,7 @@ module Glimmer
           @styled_text_proxy = styled_text(swt_style) {
 #             custom_widget_property_owner # TODO implement to route properties here without declaring method_missing
             layout_data :fill, :fill, true, true if lines
+            
             text bind(self, :styled_text_proxy_text) if lines
             top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
             font name: @font_name, height: OS.mac? ? 15 : 12
@@ -291,6 +287,14 @@ module Glimmer
           new_offset = beginning_of_current_line_offset + current_line.size
           @styled_text_proxy.setSelection(new_offset, new_offset)
         end
+        
+        def line_numbers_text_from(text_value)
+          line_count = "#{text_value} ".split("\n").count
+          line_count = 1 if line_count == 0
+          lines_text_size = [line_count.to_s.size, @lines_width].max
+          @lines_width = lines_text_size if lines_text_size > @lines_width
+          line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
+        end
       end
     end
   end

data/lib/glimmer/swt/tool_bar_proxy.rb

@@ -0,0 +1,51 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.ToolBarProxy
+    #
+    # Follows the Proxy Design Pattern
+    class ToolBarProxy < WidgetProxy
+      attr_accessor :cool_item_proxy, :swt_cool_item
+    
+      def initialize(*init_args, &block)
+        super
+        self.cool_item_proxy = WidgetProxy.new("cool_item", parent_proxy, []) if parent_proxy.swt_widget.is_a?(CoolBar)
+        self.swt_cool_item = cool_item_proxy&.swt_widget
+      end
+      
+      def post_add_content
+        apply_preferred_size if cool_item_proxy
+      end
+      
+      def apply_preferred_size
+        swt_widget.pack
+        size = swt_widget.size
+        cool_item_proxy.control = swt_widget
+        preferred = swt_cool_item.computeSize(size.x, size.y)
+        swt_cool_item.setPreferredSize(preferred)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

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

data/samples/elaborate/contact_manager.rb

@@ -51,7 +51,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :first_name)
+            text <=> [@contact_manager_presenter, :first_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -64,7 +64,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :last_name)
+            text <=> [@contact_manager_presenter, :last_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -77,7 +77,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :email)
+            text <=> [@contact_manager_presenter, :email]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -118,6 +118,7 @@ class ContactManager
             grab_excess_vertical_space true
             height_hint 200
           }
+          
           table_column {
             text "First Name"
             width 80
@@ -130,8 +131,9 @@ class ContactManager
             text "Email"
             width 200
           }
-          items bind(@contact_manager_presenter, :results),
-          column_properties(:first_name, :last_name, :email)
+          
+          items bind(@contact_manager_presenter, :results), column_properties(:first_name, :last_name, :email)
+          
           on_mouse_up { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
           }

data/samples/elaborate/login.rb

@@ -35,24 +35,19 @@ class LoginPresenter
 
   def status=(status)
     @status = status
-
-    notify_observers("logged_in")
-    notify_observers("logged_out")
   end
   
   def valid?
     !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
   end
 
-  def logged_in
+  def logged_in?
     self.status == "Logged In"
   end
-  alias logged_in? logged_in
 
-  def logged_out
-    !self.logged_in
+  def logged_out?
+    !self.logged_in?
   end
-  alias logged_out? logged_out
 
   def login!
     return unless valid?
@@ -77,13 +72,15 @@ class Login
   body {
     shell {
       text "Login"
+      
       composite {
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
         @user_name_text = text {   # goes in column 2
-          text bind(@presenter, :user_name)
-          enabled bind(@presenter, :logged_out)
+          text <=> [@presenter, :user_name]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -91,28 +88,33 @@ class Login
 
         label { text "Password:" }
         @password_text = text(:password, :border) {
-          text bind(@presenter, :password)
-          enabled bind(@presenter, :logged_out)
+          text <=> [@presenter, :password]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
             @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         label { text "Status:" }
-        label { text bind(@presenter, :status) }
+        label { text <= [@presenter, :status] }
 
         button {
           text "Login"
-          enabled bind(@presenter, :logged_out)
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
-            @presenter.login! if event.keyCode == swt(:cr)
+            if event.keyCode == swt(:cr)
+              @presenter.login!
+            end
           }
         }
 
         button {
           text "Logout"
-          enabled bind(@presenter, :logged_in)
+          enabled <= [@presenter, :logged_in?, computed_by: :status]
+          
           on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)