glimmer-dsl-swt 4.20.0.1 → 4.20.1.0

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -7,8 +7,9 @@
 - Widget properties are declared with underscored lowercase versions of the SWT properties
 - Widget property declarations always have arguments and never take a block
 - Widget property arguments are never wrapped inside parentheses
-- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form
+- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget body, before_body, and after_body blocks open their blocks and close them with curly braces.
-- Custom widgets receive additional arguments to SWT style called options. These are passed as the last argument inside the parentheses, a hash of option names pointing to values.
+- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
+- Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

data/lib/glimmer/data_binding/shine.rb

@@ -33,8 +33,10 @@ module Glimmer
     
       def <=>(other)
         if other.is_a?(Array)
+          args_clone = other.clone
+          @parent.editable = true if @parent.is_a?(Glimmer::SWT::TableProxy) # TODO consider a polymorphic way to perform this
           @parent.content {
-            send(@parent_attribute, bind(*other))
+            send(@parent_attribute, bind(*args_clone))
           }
         else  # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
           original_compare(other)

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -34,11 +34,11 @@ module Glimmer
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
 
-      def initialize(parent, model_binding, column_properties)
+      def initialize(parent, model_binding, column_properties = nil)
         @table = parent
         @model_binding = model_binding
         @read_only_sort = @model_binding.binding_options[:read_only_sort]
-        @column_properties = column_properties
+        @column_properties = @model_binding.binding_options[:column_properties] || @model_binding.binding_options[:column_attributes] || column_properties
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties
         else # assume custom widget

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

@@ -29,12 +29,15 @@ module Glimmer
   module DSL
     module SWT
       class ShineDataBindingExpression < Expression
+        include_package 'org.eclipse.swt.widgets'
+        
         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.respond_to?(:set_attribute) and parent.respond_to?(:has_attribute?) and parent.has_attribute?(keyword)) or
+              (parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(Table))
+            ) 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')

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

@@ -35,10 +35,10 @@ module Glimmer
             block.nil? and
             parent.respond_to?(:swt_widget) and
             parent.swt_widget.is_a?(Table) and
-            args.size == 2 and
+            args.size.between?(1, 2) and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_property.is_a?(Array) and
-            args[1].is_a?(Array)
+            (args[1].nil? or args[1].is_a?(Array))
         end
   
         def interpret(parent, keyword, *args, &block)

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/dsl/swt/widget_listener_expression.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

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/display_proxy.rb

@@ -42,7 +42,7 @@ module Glimmer
       
       OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
       
-      class FilterListener
+      class ConcreteListener
         include org.eclipse.swt.widgets.Listener
         
         def initialize(&listener_block)
@@ -194,15 +194,17 @@ module Glimmer
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
-          add_swt_event_filter(constant_name, &block)
+          swt_event_reg = add_swt_event_filter(constant_name, &block)
+          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(swt_event_reg)
+          swt_event_reg
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
             system_menu = swt_display.getSystemMenu
             menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], &block)
-            # TODO enable this code and test on the Mac to ensure automatic cleanup of mac event registrations in custom widgets
-#             Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+            listener = ConcreteListener.new(&block)
+            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
+            Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
             display_mac_event_registration
           end
         end
@@ -210,15 +212,16 @@ module Glimmer
 
       def add_swt_event_filter(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_display.addFilter(event_type, FilterListener.new(&block))
+        swt_listener = ConcreteListener.new(&block)
+        @swt_display.addFilter(event_type, swt_listener)
         #WidgetListenerProxy.new(@swt_display.getListeners(event_type).last)
         WidgetListenerProxy.new(
           swt_display: @swt_display,
           event_type: event_type,
           filter: true,
-          swt_listener: block,
+          swt_listener: swt_listener,
           widget_add_listener_method: 'addFilter',
-          swt_listener_class:  FilterListener,
+          swt_listener_class:  ConcreteListener,
           swt_listener_method: 'handleEvent'
         )
       end

data/lib/glimmer/swt/proxy_properties.rb

@@ -33,6 +33,7 @@ module Glimmer
       # default implementation of attribute setters/getters
       # It tries swt_widget, swt_display, swt_image, and swt_dialog by default.
       def proxy_source_object
+        # TODO the logic here should not be needed if derived with polymorphism. Consider removing.
         if respond_to?(:swt_widget)
           swt_widget
         elsif respond_to?(:swt_display)
@@ -62,7 +63,7 @@ module Glimmer
 
       def has_attribute?(attribute_name, *args)
         Glimmer::SWT::DisplayProxy.instance.auto_exec do
-          proxy_source_object&.respond_to?(attribute_setter(attribute_name), args) ||
+          proxy_source_object&.respond_to?(attribute_setter(attribute_name), args) or
             respond_to?(ruby_attribute_setter(attribute_name), args)
         end
       end

data/lib/glimmer/swt/table_proxy.rb

@@ -250,19 +250,13 @@ module Glimmer
       alias editable? editable
       
       def initialize(underscored_widget_name, parent, args)
-        @editable = args.delete(:editable)
+        editable_style = args.delete(:editable)
         super
         @table_editor = TableEditor.new(swt_widget)
         @table_editor.horizontalAlignment = SWTProxy[:left]
         @table_editor.grabHorizontal = true
         @table_editor.minimumHeight = 20
-        if editable?
-          content {
-            on_mouse_up { |event|
-              edit_table_item(event.table_item, event.column_index)
-            }
-          }
-        end
+        self.editable = editable_style
       end
 
       def items
@@ -283,6 +277,19 @@ module Glimmer
         end
       end
       
+      def editable=(value)
+        @editable = value
+        if @editable
+          content {
+            @editable_on_mouse_up = on_mouse_up { |event|
+              edit_table_item(event.table_item, event.column_index)
+            }
+          }
+        else
+          @editable_on_mouse_up.deregister if @editable_on_mouse_up
+        end
+      end
+      
       def sort_block=(comparator)
         @sort_block = comparator
       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

@@ -765,7 +765,7 @@ module Glimmer
 
       def can_add_listener?(underscored_listener_name)
         auto_exec do
-          !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
+          @swt_widget && !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
         end
       end
 
@@ -838,7 +838,7 @@ module Glimmer
           widget_listener_proxy = nil
           safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
           @swt_widget.addListener(event_type, &safe_block)
-          widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
+          WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
         end
       end
 
@@ -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/lib/glimmer/ui/custom_shell.rb

@@ -31,9 +31,9 @@ module Glimmer
       class << self
         def launch(*args, &content)
           auto_exec do
-            @launched_custom_shell = send(keyword, *args, &content)
-            @launched_custom_shell.swt_widget.set_data('launched', true)
-            @launched_custom_shell.open
+            launched_custom_shell = send(keyword, *args, &content)
+            launched_custom_shell.swt_widget.set_data('launched', true)
+            launched_custom_shell.open
           end
         end
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -186,8 +186,11 @@ module Glimmer
           @swt_widget.set_data('custom_widget', self)
         end
         execute_hook('after_body')
-        @dispose_listener_registration = @body_root.on_widget_disposed do
-          observer_registrations.each(&:deregister)
+        auto_exec do
+          @dispose_listener_registration = @body_root.on_widget_disposed do
+            observer_registrations.compact.each(&:deregister)
+            observer_registrations.clear
+          end
         end
       end
       

data/samples/elaborate/calculator.rb

@@ -0,0 +1,116 @@
+require 'glimmer-dsl-swt'
+require 'bigdecimal'
+
+require_relative 'calculator/model/presenter'
+
+# This sample demonstrates use of MVP (Model-View-Presenter) Architectural Pattern
+# to data-bind View widgets to object-oriented Models taking advantage of design patterns
+# like Command Design Pattern.
+class Calculator
+  include Glimmer::UI::CustomShell
+  
+  BUTTON_FONT = {height: 14}
+  BUTTON_FONT_OPERATION = {height: 18}
+  BUTTON_FONT_BIG = {height: 28}
+
+  attr_reader :presenter
+
+  before_body {
+    @presenter = Model::Presenter.new
+    
+    Display.setAppName('Glimmer Calculator')
+    
+    display {
+      on_swt_keydown { |key_event|
+        char = key_event.character.chr rescue nil
+        @presenter.press(char)
+      }
+      
+      on_about {
+        display_about_dialog
+      }
+    }
+  }
+
+  body {
+    shell {
+      grid_layout 4, true
+      
+      minimum_size (OS.mac? ? 320 : (OS.windows? ? 390 : 520)), 240
+      text "Glimmer Calculator"
+      
+      on_shell_closed do
+        @presenter.purge_command_history
+      end
+      
+      # Setting styled_text to multi in order for alignment options to activate
+      styled_text(:multi, :wrap, :border) {
+        text bind(@presenter, :result)
+        alignment swt(:right)
+        right_margin 5
+        font height: 40
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span 4
+        }
+        editable false
+        caret nil
+      }
+      command_button('AC')
+      operation_button('÷')
+      operation_button('×')
+      operation_button('−')
+      (7..9).each { |number|
+        number_button(number)
+      }
+      operation_button('+', font: BUTTON_FONT_BIG, vertical_span: 2)
+      (4..6).each { |number|
+        number_button(number)
+      }
+      (1..3).each { |number|
+        number_button(number)
+      }
+      command_button('=', font: BUTTON_FONT_BIG, vertical_span: 2)
+      number_button(0, horizontal_span: 2)
+      operation_button('.')
+    }
+  }
+  
+  def number_button(number, options = {})
+    command_button(number, options)
+  end
+  
+  def operation_button(operation, options = {})
+    command_button(operation, options.merge(font: BUTTON_FONT_OPERATION))
+  end
+  
+  def command_button(command, options = {})
+    command = command.to_s
+    options[:font] ||= BUTTON_FONT
+    options[:horizontal_span] ||= 1
+    options[:vertical_span] ||= 1
+    
+    button { |proxy|
+      text command
+      font options[:font]
+      
+      layout_data(:fill, :fill, true, true) {
+        horizontal_span options[:horizontal_span]
+        vertical_span options[:vertical_span]
+      }
+      
+      on_widget_selected {
+        @presenter.press(command)
+      }
+    }
+  end
+
+  def display_about_dialog
+    message_box(body_root) {
+      text 'About'
+      message "Glimmer - Calculator\n\nCopyright (c) 2007-2021 Andy Maleh"
+    }.open
+  end
+
+end
+
+Calculator.launch