glimmer-dsl-swt 0.5.6 → 0.6.4

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

@@ -14,16 +14,22 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
-        parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
-        @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget if parent.nil?
-        @swt_widget = MessageBox.new(parent, style)
+        if parent.nil?
+          @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
+        end
+        @swt_widget = MessageBox.new(parent, style)        
       end
       
       def open
-        @swt_widget.open
-        @temporary_parent&.dispose
+        @swt_widget.open.tap do |result|
+          @temporary_parent&.dispose
+        end
       end
       
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
+      end            
+      
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
       def attribute_setter(attribute_name)
@@ -44,6 +50,18 @@ module Glimmer
 
       def get_attribute(attribute_name)
         @swt_widget.send(attribute_getter(attribute_name))
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || 
+          swt_widget.respond_to?(method, *args, &block)
       end      
     end
   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/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/table_proxy.rb

@@ -85,7 +85,55 @@ module Glimmer
                 }
                 table_editor_widget_proxy
               end,
-            }
+            },
+            checkbox: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                checkbox(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            },
+            radio: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                radio(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            }            
           }      
         end
       end
@@ -276,7 +324,7 @@ module Glimmer
           new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
           if table_item.isDisposed
             @cancel_edit.call
-          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+          elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
             action_taken = true
             @edit_in_progress = true
             if new_value == model.send(model_editing_property)

data/lib/glimmer/swt/widget_proxy.rb

@@ -22,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,19 +67,47 @@ module Glimmer
           group.setLayout(GridLayout.new)
         end,
       }
+      
+      class << self
+        def create(keyword, parent, args)
+          widget_proxy_class(keyword).new(keyword, parent, args)
+        end
+        
+        def widget_proxy_class(keyword)
+          begin
+            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
+            Glimmer::SWT.const_get(class_name)
+          rescue
+            Glimmer::SWT::WidgetProxy
+          end        
+        end
+        
+        def underscored_widget_name(swt_widget)
+          swt_widget.class.name.split(/::|\./).last.underscore        
+        end
+      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)
-        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.set_data('proxy', self)
+      def initialize(*init_args, swt_widget: nil)      
+        if swt_widget.nil?
+          underscored_widget_name, parent, args = init_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_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        else
+          @swt_widget = swt_widget
+          underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
+          parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
+          @parent_proxy = parent_proxy_class.new(swt_widget: swt_widget.parent)
+        end
+        @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
@@ -69,6 +115,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|
@@ -264,6 +315,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)
@@ -607,6 +659,15 @@ module Glimmer
               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)

data/samples/elaborate/contact_manager.rb

@@ -0,0 +1,121 @@
+require_relative "contact_manager/contact_manager_presenter"
+
+class ContactManager
+  include Glimmer
+
+  def initialize
+    @contact_manager_presenter = ContactManagerPresenter.new
+    @contact_manager_presenter.list
+  end
+
+  def launch
+    shell {
+      text "Contact Manager"
+      composite {
+        group {
+          grid_layout(2, false) {
+            margin_width 0
+            margin_height 0
+          }
+          layout_data :fill, :center, true, false
+          text 'Lookup Contacts'
+          font height: 24
+          
+          label {
+            layout_data :right, :center, false, false
+            text "First &Name: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :first_name)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Last Name: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :last_name)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Email: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :email)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          composite {
+            row_layout {
+              margin_width 0
+              margin_height 0
+            }
+            layout_data(:right, :center, false, false) {
+              horizontal_span 2
+            }
+            
+            button {
+              text "&Find"
+              on_widget_selected { @contact_manager_presenter.find }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+              }
+            }
+            
+            button {
+              text "&List All"
+              on_widget_selected { @contact_manager_presenter.list }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
+              }
+            }
+          }
+        }
+
+        table(:multi) { |table_proxy|
+          layout_data {
+            horizontal_alignment :fill
+            vertical_alignment :fill
+            grab_excess_horizontal_space true
+            grab_excess_vertical_space true
+            height_hint 200
+          }
+          table_column {
+            text "First Name"
+            width 80
+          }
+          table_column {
+            text "Last Name"
+            width 80
+          }
+          table_column {
+            text "Email"
+            width 200
+          }
+          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)
+          }
+        }
+      }
+    }.open
+  end
+end
+
+ContactManager.new.launch

data/samples/elaborate/contact_manager/contact.rb

@@ -0,0 +1,11 @@
+class ContactManager
+  class Contact
+    attr_accessor :first_name, :last_name, :email
+  
+    def initialize(attribute_map)
+      @first_name = attribute_map[:first_name]
+      @last_name = attribute_map[:last_name]
+      @email = attribute_map[:email]
+    end
+  end
+end

data/samples/elaborate/contact_manager/contact_manager_presenter.rb

@@ -0,0 +1,26 @@
+require_relative "contact_repository"
+
+class ContactManager
+  class ContactManagerPresenter
+    attr_accessor :results
+    @@contact_attributes = [:first_name, :last_name, :email]
+    @@contact_attributes.each {|attribute_name| attr_accessor attribute_name}
+  
+    def initialize(contact_repository = nil)
+      @contact_repository = contact_repository || ContactRepository.new
+      @results = []
+    end
+  
+    def list
+      self.results = @contact_repository.find({})
+    end
+  
+    def find
+      filter_map = {}
+      @@contact_attributes.each do |attribute_name|
+        filter_map[attribute_name] = self.send(attribute_name) if self.send(attribute_name)
+      end
+      self.results = @contact_repository.find(filter_map)
+    end
+  end
+end