glimmer 0.7.6 → 0.8.2

data/lib/glimmer/swt/display_proxy.rb

@@ -16,6 +16,8 @@ module Glimmer
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
 
+      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+
       class << self
         # Returns singleton instance
         def instance(*args)
@@ -52,6 +54,9 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           SWTProxy.has_constant?(constant_name)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          OBSERVED_MENU_ITEMS.include?(event_name)
         else
           false
         end
@@ -61,6 +66,15 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           add_swt_event_listener(constant_name, &block)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          if OBSERVED_MENU_ITEMS.include?(event_name)
+            if OS.mac?
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              menu_item.addListener(SWTProxy[:Selection], &block)
+            end
+          end
         end
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -79,6 +79,23 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def can_handle_observation_request?(observation_request, super_only: false)
+        super_result = super(observation_request)
+        if observation_request.start_with?('on_') && !super_result && !super_only
+          return menu_item_proxy.can_handle_observation_request?(observation_request)
+        else
+          super_result
+        end
+      end
+      
+      def handle_observation_request(observation_request, &block)
+        if can_handle_observation_request?(observation_request, super_only: true)
+          super
+        else
+          menu_item_proxy.handle_observation_request(observation_request, &block)
+        end
+      end      
     end
   end
 end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -0,0 +1,48 @@
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/shell_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Shell
+    #
+    # Follows the Proxy Design Pattern
+    class MessageBoxProxy
+      include_package 'org.eclipse.swt.widgets'
+      
+      attr_reader :swt_widget
+      
+      def initialize(parent, style)
+        parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
+        @swt_widget = MessageBox.new(parent, style)
+      end
+      
+      def open
+        @swt_widget.open
+      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)
+        "set#{attribute_name.to_s.camelcase(:upper)}"
+      end
+
+      def attribute_getter(attribute_name)
+        "get#{attribute_name.to_s.camelcase(:upper)}"
+      end
+      
+      def has_attribute?(attribute_name, *args)
+        @swt_widget.respond_to?(attribute_setter(attribute_name), args)
+      end
+
+      def set_attribute(attribute_name, *args)
+        @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+      end
+
+      def get_attribute(attribute_name)
+        @swt_widget.send(attribute_getter(attribute_name))
+      end      
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -14,7 +14,6 @@ module Glimmer
 
       WIDTH_MIN = 130
       HEIGHT_MIN = 0
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
       attr_reader :opened_before
       alias opened_before? opened_before
@@ -103,13 +102,20 @@ module Glimmer
 
       def pack_same_size
         bounds = @swt_widget.getBounds
-        width = @swt_widget.getBounds.width
-        height = @swt_widget.getBounds.height
-        x = @swt_widget.getBounds.x
-        y = @swt_widget.getBounds.y
-        @swt_widget.pack
-        @swt_widget.setSize(width, height)
-        @swt_widget.setLocation(x, y)
+        if OS.mac?
+          @swt_widget.pack
+          @swt_widget.setBounds(bounds)
+        elsif OS.windows? || OS::Underlying.windows?
+          minimum_size = @swt_widget.getMinimumSize
+          @swt_widget.setMinimumSize(bounds.width, bounds.height)
+          listener = on_control_resized { @swt_widget.setBounds(bounds) }
+          @swt_widget.pack
+          @swt_widget.removeControlListener(listener.swt_listener)
+          @swt_widget.setMinimumSize(minimum_size)
+        elsif OS.linux?          
+          @swt_widget.layout(true, true)
+          @swt_widget.setBounds(bounds)
+        end
       end
 
       def content(&block)
@@ -128,30 +134,6 @@ module Glimmer
         end
       end
 
-      def can_handle_observation_request?(observation_request)
-        result = false
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          result = OBSERVED_MENU_ITEMS.include?(event_name)
-        end
-        result || super
-      end
-
-      def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          if OBSERVED_MENU_ITEMS.include?(event_name)
-            if OS.mac?
-              system_menu = DisplayProxy.instance.swt_display.getSystemMenu
-              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-              menu_item.addListener(SWTProxy[:Selection], &block)
-            end
-          else
-            super
-          end
-        end
-      end
-
       def add_observer(observer, property_name)
         case property_name.to_s
         when 'visible?' #TODO see if you must handle non-? version and/or move elsewhere

data/lib/glimmer/swt/table_proxy.rb

@@ -0,0 +1,150 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TableProxy < Glimmer::SWT::WidgetProxy
+      include Glimmer
+      
+      module TableListenerEvent        
+        def table_item
+          table_item_and_column_index[:table_item]
+        end
+        
+        def column_index
+          table_item_and_column_index[:column_index]
+        end     
+        
+        private
+        
+        def table_item_and_column_index
+          @table_item_and_column_index ||= find_table_item_and_column_index
+        end
+        
+        def find_table_item_and_column_index
+          {}.tap do |result|
+            if respond_to?(:x) && respond_to?(:y)
+              result[:table_item] = widget.getItems.detect do |ti|
+                result[:column_index] = widget.getColumnCount.times.to_a.detect do |ci|
+                  ti.getBounds(ci).contains(x, y)
+                end
+              end
+            end
+          end
+        end   
+      end
+      
+      attr_reader :table_editor, :table_editor_text_proxy
+      attr_accessor :column_properties
+      
+      def initialize(underscored_widget_name, parent, args)
+        super
+        @table_editor = TableEditor.new(swt_widget)
+        @table_editor.horizontalAlignment = SWTProxy[:left]
+        @table_editor.grabHorizontal = true
+        @table_editor.minimumHeight = 20
+      end
+    
+      # Performs a search for table items matching block condition
+      # If no condition block is passed, returns all table items
+      # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed
+      def search(&condition)
+        swt_widget.getItems.select {|item| condition.nil? || condition.call(item)}.to_java(TableItem)
+      end
+      
+      # Returns all table items including descendants
+      def all_table_items
+        search
+      end
+
+      def widget_property_listener_installers
+        super.merge({
+          Java::OrgEclipseSwtWidgets::Table => {
+            selection: lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },        
+        })
+      end
+      
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_table_item(column_index, before_write: nil, after_write: nil, after_cancel: nil)
+        edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+      end
+            
+      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+        return if table_item.nil?
+        content {
+          @table_editor_text_proxy = text {
+            focus true
+            text table_item.getText(column_index)
+            action_taken = false
+            cancel = lambda {
+              @table_editor_text_proxy.swt_widget.dispose
+              @table_editor_text_proxy = nil
+              after_cancel&.call
+              @edit_in_progress = false
+            }
+            action = lambda { |event|
+              if !action_taken && !@edit_in_progress
+                action_taken = true
+                @edit_in_progress = true
+                new_text = @table_editor_text_proxy.swt_widget.getText
+                if new_text == table_item.getText(column_index)
+                  cancel.call
+                else
+                  before_write&.call
+                  table_item.setText(column_index, new_text)
+                  model = table_item.getData
+                  model.send("#{column_properties[column_index]}=", new_text) # makes table update itself, so must search for selected table item again
+                  edited_table_item = search { |ti| ti.getData == model }.first
+                  swt_widget.showItem(edited_table_item)
+                  @table_editor_text_proxy.swt_widget.dispose
+                  @table_editor_text_proxy = nil
+                  after_write&.call(edited_table_item)
+                  @edit_in_progress = false
+                end
+              end
+            }
+            on_focus_lost(&action)
+            on_key_pressed { |key_event|
+              if key_event.keyCode == swt(:cr)
+                action.call(key_event)
+              elsif key_event.keyCode == swt(:esc)
+                cancel.call
+              end
+            }
+          }
+          @table_editor_text_proxy.swt_widget.selectAll
+        }
+        @table_editor.setEditor(@table_editor_text_proxy.swt_widget, table_item, column_index)
+      end
+      
+      def add_listener(underscored_listener_name, &block)
+        enhanced_block = lambda do |event|
+          event.extend(TableListenerEvent)
+          block.call(event)
+        end
+        super(underscored_listener_name, &enhanced_block)
+      end
+            
+      private
+
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            if value.is_a?(Array)
+              search {|ti| value.include?(ti.getData) }
+            else
+              search {|ti| ti.getData == value}
+            end
+          end,
+        })
+      end
+    end
+  end
+end

data/lib/glimmer/swt/tree_proxy.rb

@@ -95,7 +95,7 @@ module Glimmer
           }
           @tree_editor_text_proxy.swt_widget.selectAll
         }
-        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item);      
+        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item)
       end
       
       private

data/lib/glimmer/ui/custom_widget.rb

@@ -70,7 +70,7 @@ module Glimmer
           @custom_widget_namespaces = Set[Object, Glimmer::UI]
         end
 
-        # Allows defining convenience option readers for an array of option names
+        # Allows defining convenience option accessors for an array of option names
         # Example: `options :color1, :color2` defines `#color1` and `#color2`
         # where they return the instance values `options[:color1]` and `options[:color2]`
         # respectively.
@@ -83,23 +83,26 @@ module Glimmer
           else
             new_options = new_options.reduce({}) {|new_options_hash, new_option| new_options_hash.merge(new_option => nil)}
             @options = options.merge(new_options)
-            def_option_attr_readers(new_options)
+            def_option_attr_accessors(new_options)
           end
         end
 
-        def option(new_option, new_option_default = nil)
+        def option(new_option, default: nil)
           new_option = new_option.to_s.to_sym
-          new_options = {new_option => new_option_default}
+          new_options = {new_option => default}
           @options = options.merge(new_options)
-          def_option_attr_readers(new_options)
+          def_option_attr_accessors(new_options)
         end
 
-        def def_option_attr_readers(new_options)
+        def def_option_attr_accessors(new_options)
           new_options.each do |option, default|
             class_eval <<-end_eval, __FILE__, __LINE__
               def #{option}
                 options[:#{option}]
               end
+              def #{option}=(option_value)
+                self.options[:#{option}] = option_value
+              end
             end_eval
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -150,34 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  name: coveralls
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  name: simplecov
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -192,7 +164,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: Desktop Development Library for Ruby
+description: "Ruby Desktop Development GUI Library (JRuby on SWT). \n\nChanges: \n\
+  - `message_box` DSL keyword\n- Table single/multi selection databinding\n- Table\
+  \ cell editing databinding\n- Enhance table listener events with table_item and\
+  \ column_index methods\n- Fix `Glimmer::SWT::ShellProxy#pack_same_size` for Linux\n"
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -244,6 +219,7 @@ files:
 - lib/glimmer/dsl/swt/combo_selection_data_binding_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
 - lib/glimmer/dsl/swt/display_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
@@ -252,6 +228,7 @@ files:
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/menu_bar_expression.rb
 - lib/glimmer/dsl/swt/menu_expression.rb
+- lib/glimmer/dsl/swt/message_box_expression.rb
 - lib/glimmer/dsl/swt/observe_expression.rb
 - lib/glimmer/dsl/swt/property_expression.rb
 - lib/glimmer/dsl/swt/rgb_expression.rb
@@ -286,10 +263,12 @@ files:
 - lib/glimmer/swt/layout_data_proxy.rb
 - lib/glimmer/swt/layout_proxy.rb
 - lib/glimmer/swt/menu_proxy.rb
+- lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
 - lib/glimmer/swt/widget_proxy.rb
@@ -326,5 +305,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop Development Library for Ruby
+summary: Ruby Desktop Development GUI Library
 test_files: []