glimmer-dsl-swt 4.17.8.3 → 4.17.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05bc3d6096231cccf821c2aaf5d42a2ef28b23f999d058bc2b2ad2cbf19a1a32
-  data.tar.gz: b10d240123f7e7ccd7994c9493abf5d51062c402e96dc6ddd357f6809645c77a
+  metadata.gz: 3915e615b5248813ee6a9ca415c1be065f9d0ff9192e87a4a410146e0aae6f52
+  data.tar.gz: 98c2fa055457d36b53c840de96bad374dfeaec9fd21e36782090378d4439fffe
 SHA512:
-  metadata.gz: a6b6e9c28482d8dbd6daadb3daab9820a091d961baef5ddd197b9c4198221130487ff44eed35285f5476e9a82c3dc41f89de4652c3375d382a19fb3ef35c6d2b
-  data.tar.gz: 2663c8de064e9bbb6f94ac7703e80bb14bb1c5c7cad9ceab69265c84cbacc4d8ae5a87a5fb41533c3e46ba46bb6f3b897fac5091a1108168d216a183faf4d585
+  metadata.gz: 31978beac188701c12a27dd742452cb62c52b913dd7fd485dc1c4bd19ab52d9dea9a30a84b867691b81ac7ff23adc2cf7874bcb8718ca058526c143158d9f16f
+  data.tar.gz: 2c1e46b47851006dbbf0187e9ba215db83c3e603d058e9fd3e8a1c2476f944c66deae8391b714e918632e7bcf0c59556edccfcc28c726698850d57e331cd0423

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+### 4.17.9.0
+
+- Add table style :editable to hook editing listener on mouse click automatically (instead of manually via on_widget_selected)
+- Support table editing via `spinner` for integer values
+- date_time widget official data-binding support of date_time, date, time, year, month, day, hours, minutes, and seconds
+- date widget alias for date_time(:date)
+- time widget alias for date_time(:time)
+- calendar widget alias for date_time(:calendar)
+- date_drop_down widget alias for date_time(:date, :drop_down)
+- Hello, Date Time! Sample
+
 ### 4.17.8.3
 
 - Hello, Table! Sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.17.8.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.17.9.0
 
 ## JRuby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
@@ -297,6 +297,7 @@ Glimmer App:
       - [List](#list)
       - [Table](#table)
       - [Tree](#tree)
+      - [DateTime](#datetime)
     - [Observer](#observer)
       - [Observing Widgets](#observing-widgets)
       - [Observing Models](#observing-models)
@@ -314,6 +315,8 @@ Glimmer App:
       - [Multi-DSL Support](#multi-dsl-support)
       - [Application Menu Items (About/Preferences)](#application-menu-items-aboutpreferences)
       - [App Name and Version](#app-name-and-version)
+      - [Checkbox Group Widget](#checkbox-group-widget)
+      - [Radio Group Widget](#radio-group-widget)
       - [Code Text Widget](#code-text-widget)
       - [Video Widget](#video-widget)
       - [Sash Form Widget](#sash-form-widget)
@@ -350,11 +353,13 @@ Glimmer App:
       - [Hello, Expand Bar!](#hello-expand-bar)
       - [Hello, Radio!](#hello-radio)
       - [Hello, Radio Group!](#hello-radio-group)
+      - [Hello, Checkbox!](#hello-checkbox)
       - [Hello, Group!](#hello-group)
       - [Hello, Checkbox!](#hello-checkbox)
       - [Hello, Checkbox Group!](#hello-checkbox-group)
       - [Hello, Directory Dialog!](#hello-directory-dialog)
       - [Hello, File Dialog!](#hello-file-dialog)
+      - [Hello, Date Time!](#hello-date-time)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -448,7 +453,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.8.3
+jgem install glimmer-dsl-swt -v 4.17.9.0
 
 ```
 
@@ -525,7 +530,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.8.3
+Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.9.0
 
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
@@ -1003,7 +1008,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.4.0     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.17.8.3
+  Swt    glimmer-dsl-swt    4.17.9.0
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML
@@ -2364,6 +2369,29 @@ This finds the root node. The array is a Java array. This enables easy passing o
 To edit a tree, you must invoke `TreeProxy#edit_selected_tree_item` or `TreeProxy#edit_tree_item`. This automatically leverages the SWT TreeEditor custom class behind the scenes, displaying
 a text widget to the user to change the selected or passed tree item text into something else. It automatically persists the change to `items` data-bound model on ENTER/FOCUS-OUT or cancels on ESC/NO-CHANGE.
 
+#### DateTime
+
+`date_time` represents the SWT DateTime widget.
+
+Glimmer offers the following alias keywords for it for convenience:
+- `date`: `date_time(:date)`
+- `date_drop_down`: `date_time(:date, :drop_down)`
+- `time`: `date_time(:time)`
+- `calendar`: `date_time(:calendar)`
+
+You can data-bind any of these properties:
+- `date_time bind(model, :property)`: produces a Ruby DateTime object
+- `date bind(model, :property)`: produces a Ruby Date object
+- `time bind(model, :property)`: produces a Ruby Time object
+- `year bind(model, :property)`: produces an integer
+- `month bind(model, :property)`: produces an integer
+- `day bind(model, :property)`: produces an integer
+- `hours bind(model, :property)`: produces an integer
+- `minutes bind(model, :property)`: produces an integer
+- `seconds bind(model, :property)`: produces an integer
+
+Learn more at the [Hello, Date Time!](#hello-date-time) sample.
+
 ### Observer
 
 Glimmer comes with `Observer` module, which is used internally for data-binding, but can also be used externally for custom use of the Observer Pattern. It is hidden when observing widgets, and used explicitly when observing models.
@@ -3813,6 +3841,18 @@ Hello, File Dialog! Selected File
 
 ![Hello File Dialog](images/glimmer-hello-file-dialog-selected-file.png)
 
+#### Hello, Date Time!
+
+This sample demonstrates the use of [date_time](#datetime) widget keywords in Glimmer: `date`, `date_drop_down`, `time`, and `calendar`
+
+Code:
+
+[samples/hello/hello_date_time.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_date_time.rb)
+
+Hello, Date Time!
+
+![Hello Date Time](images/glimmer-hello-date-time.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

data/VERSION

@@ -1 +1 @@
-4.17.8.3
+4.17.9.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.8.3 ruby lib
+# stub: glimmer-dsl-swt 4.17.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.8.3"
+  s.version = "4.17.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-11-05"
+  s.date = "2020-11-07"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/custom/checkbox_group.rb",
     "lib/glimmer/swt/custom/code_text.rb",
     "lib/glimmer/swt/custom/radio_group.rb",
+    "lib/glimmer/swt/date_time_proxy.rb",
     "lib/glimmer/swt/directory_dialog_proxy.rb",
     "lib/glimmer/swt/display_proxy.rb",
     "lib/glimmer/swt/dnd_proxy.rb",
@@ -137,6 +138,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_computed/contact.rb",
     "samples/hello/hello_custom_shell.rb",
     "samples/hello/hello_custom_widget.rb",
+    "samples/hello/hello_date_time.rb",
     "samples/hello/hello_directory_dialog.rb",
     "samples/hello/hello_drag_and_drop.rb",
     "samples/hello/hello_expand_bar.rb",

data/lib/glimmer-dsl-swt.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -35,6 +35,7 @@ require 'logging'
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
 require 'rouge'
+require 'date'
 
 # Internal requires
 require 'ext/glimmer/config'

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

@@ -58,3 +58,4 @@ require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/sash_form_proxy'
 require 'glimmer/swt/styled_text_proxy'
+require 'glimmer/swt/date_time_proxy'

data/lib/glimmer/swt/date_time_proxy.rb

@@ -0,0 +1,87 @@
+# 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'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DateTime
+    #
+    # Follows the Proxy Design Pattern
+    class DateTimeProxy < WidgetProxy
+      CUSTOM_ATTRIBUTES = %w[date_time date time month]
+      
+      def date_time
+        DateTime.new(year, month, day, hours, minutes, seconds)
+      end
+      
+      def date_time=(date_time_value)
+        self.time = date_time_value.to_time
+      end
+      
+      def date
+        date_time.to_date
+      end
+      
+      def date=(date_value)
+        self.year = date_value.year
+        self.month = date_value.month
+        self.day = date_value.day
+      end
+      
+      def time
+        date_time.to_time
+      end
+      
+      def time=(time_value)
+        self.date = time_value.to_date
+        self.hours = time_value.hour
+        self.minutes = time_value.min
+        self.seconds = time_value.sec
+      end
+      
+      def month
+        swt_widget.month + 1
+      end
+      
+      def month=(new_value)
+        swt_widget.month = new_value - 1
+      end
+      
+      def set_attribute(attribute_name, *args)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(ruby_attribute_setter(attribute_name), args.first)
+        else
+          super(attribute_name, *args)
+        end
+      end
+ 
+      def get_attribute(attribute_name)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(attribute_name)
+        else
+          super(attribute_name)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/display_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -59,7 +59,7 @@ module Glimmer
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
-      end      
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)
@@ -73,8 +73,8 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        super || 
-          can_handle_observation_request?(method) ||        
+        super ||
+          can_handle_observation_request?(method) ||
           swt_display.respond_to?(method, *args, &block)
       end
 

data/lib/glimmer/swt/dnd_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -26,15 +26,15 @@ module Glimmer
     # Proxy for org.eclipse.swt.dnd.DND
     #
     # Follows the Proxy Design Pattern
-    class DNDProxy            
-      include StyleConstantizable      
+    class DNDProxy
+      include StyleConstantizable
 
       class << self
         JAVA_IMPORT = 'org.eclipse.swt.dnd.DND'
         
         java_import JAVA_IMPORT
         
-        def constant_java_import 
+        def constant_java_import
           JAVA_IMPORT
         end
 
@@ -45,10 +45,6 @@ module Glimmer
         def constant_value_none
           DND::DROP_NONE
         end
-        
-        def extra_styles
-          {}
-        end
       end
     end
   end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -38,7 +38,7 @@ module Glimmer
         if parent.nil?
           @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
         end
-        @swt_widget = MessageBox.new(parent, style)        
+        @swt_widget = MessageBox.new(parent, style)
       end
       
       def open
@@ -49,7 +49,7 @@ module Glimmer
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
-      end            
+      end
       
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
@@ -81,9 +81,9 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        super || 
+        super ||
           swt_widget.respond_to?(method, *args, &block)
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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/swt/style_constantizable.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -43,9 +43,9 @@ module Glimmer
           raise 'Not implemented! Mixer must implement!'
         end
         
-        # hash of extra styles (i.e. new style combinations)
+        # hash of extra composite styles (i.e. style combinations defined under new style names)
         def extra_styles
-          raise 'Not implemented! Mixer must implement!'
+          {}
         end
                 
         def error_message_invalid_style

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -26,15 +26,15 @@ module Glimmer
     # Proxy for org.eclipse.swt.SWT
     #
     # Follows the Proxy Design Pattern
-    class SWTProxy            
-      include StyleConstantizable      
+    class SWTProxy
+      include StyleConstantizable
 
       class << self
         JAVA_IMPORT = 'org.eclipse.swt.SWT'
         
         java_import JAVA_IMPORT
         
-        def constant_java_import 
+        def constant_java_import
           JAVA_IMPORT
         end
 
@@ -53,8 +53,7 @@ module Glimmer
       
       EXTRA_STYLES = {
         NO_RESIZE: self[:shell_trim, :resize!, :max!],
-        NO_SORT: -7,
-      }            
+      }
     end
   end
 end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -23,7 +23,9 @@ require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
-    class TableColumnProxy < Glimmer::SWT::WidgetProxy    
+    # A proxy object representing SWT TableColumn
+    # Accepts a :no_sort custom style to disable sorting on this column
+    class TableColumnProxy < Glimmer::SWT::WidgetProxy
       attr_reader :no_sort, :sort_property, :editor
       alias no_sort? no_sort
       attr_accessor :sort_block, :sort_by_block

data/lib/glimmer/swt/table_proxy.rb

@@ -155,20 +155,56 @@ module Glimmer
                   }
                 }
               end,
-            }
+            },
+            spinner: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                table_editor_widget_proxy = spinner(*args) {
+                  selection model.send(property)
+                  focus true
+                  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
+                  }
+#                   on_widget_selected {
+#                     if !OS.windows? || !first_time || first_time && model.send(property) != table_editor_widget_proxy.swt_widget.text
+#                       table_proxy.finish_edit!
+#                     end
+#                   }
+                }
+                table_editor_widget_proxy
+              end,
+            },
           }
         end
       end
       
-      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable
       attr_accessor :column_properties
+      alias editable? editable
       
       def initialize(underscored_widget_name, parent, args)
+        @editable = 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
       end
 
       def model_binding

data/lib/glimmer/swt/widget_proxy.rb

@@ -63,6 +63,9 @@ module Glimmer
         'tool_bar'            => [:push],
         'tool_item'           => [:push],
         'tree'                => [:virtual, :border, :h_scroll, :v_scroll],
+        'date_drop_down'      => [:date, :drop_down],
+        'time'                => [:time],
+        'calendar'            => [:calendar],
       }
 
       DEFAULT_INITIALIZERS = {
@@ -96,6 +99,10 @@ module Glimmer
         'check'          => 'button',
         'radio'          => 'button',
         'toggle'         => 'button',
+        'date'           => 'date_time',
+        'date_drop_down' => 'date_time',
+        'time'           => 'date_time',
+        'calendar'       => 'date_time',
       }
       
       class << self
@@ -224,8 +231,11 @@ module Glimmer
           else
             @swt_widget.send(widget_custom_attribute[:getter][:name])
           end
-        else
+        elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
           @swt_widget.send(attribute_getter(attribute_name))
+        else
+          pd attribute_name
+          send(attribute_name)
         end
       end
 
@@ -408,12 +418,29 @@ module Glimmer
               }
             end
           },
+          Java::OrgEclipseSwtWidgets::DateTime =>
+            [:year, :month, :day, :hours, :minutes, :seconds, :date_time, :date, :time].reduce({}) do |hash, attribute|
+              hash.merge(
+                attribute => lambda do |observer|
+                  on_widget_selected { |selection_event|
+                    observer.call(get_attribute(attribute))
+                  }
+                end
+              )
+            end,
         }
       end
 
       def self.widget_exists?(underscored_widget_name)
         !!swt_widget_class_for(underscored_widget_name)
       end
+      
+      # Manual entries of SWT widget classes that conflict with Ruby classes
+      def self.swt_widget_class_manual_entries
+        {
+          'date_time' => Java::OrgEclipseSwtWidgets::DateTime
+        }
+      end
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
@@ -421,8 +448,11 @@ module Glimmer
         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)
-          Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
-          return nil
+          swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
+          if swt_widget_class.nil?
+            Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
+            return nil
+          end
         end
         swt_widget_class
       rescue SyntaxError, NameError => e

data/samples/hello/hello_date_time.rb

@@ -0,0 +1,63 @@
+# 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.
+
+class HelloDateTime
+  class Person
+    attr_accessor :date_of_birth
+  end
+  
+  include Glimmer
+  
+  def launch
+    person = Person.new
+    person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
+    
+    shell {
+      row_layout :vertical
+      
+      text 'Hello, Date Time!'
+      minimum_size 180, 180
+      
+      label {
+        text 'Date of Birth'
+        font height: 16, style: :bold
+      }
+      
+      date { # alias for date_time(:date)
+        date_time bind(person, :date_of_birth)
+      }
+      
+      date_drop_down { # alias for date_time(:date, :drop_down)
+        date_time bind(person, :date_of_birth)
+      }
+      
+      time { # alias for date_time(:time)
+        date_time bind(person, :date_of_birth)
+      }
+      
+      calendar { # alias for date_time(:calendar)
+        date_time bind(person, :date_of_birth)
+      }
+    }.open
+  end
+end
+
+HelloDateTime.new.launch

data/samples/hello/hello_table.rb

@@ -24,16 +24,16 @@ class HelloTable
     class << self
       def schedule
         @schedule ||= [
-          new('Chicago Cubs', 'Milwaukee Brewers', Time.new(2037, 10, 6, 12, 0)),
-          new('Chicago Cubs', 'Milwaukee Brewers', Time.new(2037, 10, 7, 12, 0)),
-          new('Milwaukee Brewers', 'Chicago Cubs', Time.new(2037, 10, 8, 12, 0)),
-          new('Milwaukee Brewers', 'Chicago Cubs', Time.new(2037, 10, 9, 12, 0)),
-          new('Milwaukee Brewers', 'Chicago Cubs', Time.new(2037, 10, 10, 12, 0)),
-          new('Chicago White Sox', 'St Louis Cardinals', Time.new(2037, 10, 6, 18, 0)),
-          new('Chicago White Sox', 'St Louis Cardinals', Time.new(2037, 10, 7, 18, 0)),
-          new('St Louis Cardinals', 'Chicago White Sox', Time.new(2037, 10, 8, 18, 0)),
-          new('St Louis Cardinals', 'Chicago White Sox', Time.new(2037, 10, 9, 18, 0)),
-          new('St Louis Cardinals', 'Chicago White Sox', Time.new(2037, 10, 10, 18, 0)),
+          new(Time.new(2037, 10, 6, 12, 0), 'Chicago Cubs', 'Milwaukee Brewers', 5, 7),
+          new(Time.new(2037, 10, 7, 12, 0), 'Chicago Cubs', 'Milwaukee Brewers', 11, 7),
+          new(Time.new(2037, 10, 8, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 2, 3),
+          new(Time.new(2037, 10, 9, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 1, 0),
+          new(Time.new(2037, 10, 10, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 9, 10),
+          new(Time.new(2037, 10, 6, 18, 0), 'Chicago White Sox', 'St Louis Cardinals', 2, 4),
+          new(Time.new(2037, 10, 7, 18, 0), 'Chicago White Sox', 'St Louis Cardinals', 5, 6),
+          new(Time.new(2037, 10, 8, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 0, 7),
+          new(Time.new(2037, 10, 9, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 3, 4),
+          new(Time.new(2037, 10, 10, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 11, 13),
         ]
       end
       
@@ -51,12 +51,14 @@ class HelloTable
       'St Louis Cardinals' => 'Busch Stadium'
     }
     
-    attr_accessor :home_team, :away_team, :date_time, :ballpark
+    attr_accessor :home_team, :away_team, :date_time, :ballpark, :home_team_runs, :away_team_runs
     
-    def initialize(home_team, away_team, date_time)
+    def initialize(date_time, home_team, away_team, home_team_runs, away_team_runs)
+      self.date_time = date_time
       self.home_team = home_team
       self.away_team = away_team
-      self.date_time = date_time
+      self.home_team_runs = home_team_runs
+      self.away_team_runs = away_team_runs
     end
     
     def home_team=(home_team_value)
@@ -90,7 +92,7 @@ class HelloTable
   def launch
     shell {
       text 'Hello, Table!'
-      table { |table_proxy|
+      table(:editable) { |table_proxy|
         table_column {
           text 'Game Date/Time'
           width 150
@@ -102,11 +104,21 @@ class HelloTable
           width 150
           editor :combo, :read_only
         }
+        table_column {
+          text 'Home Team Runs'
+          width 100
+          editor :spinner
+        }
         table_column {
           text 'Away Team'
           width 150
           editor :combo, :read_only
         }
+        table_column {
+          text 'Away Team Runs'
+          width 100
+          editor :spinner
+        }
         table_column {
           text 'Ballpark'
           width 150
@@ -114,14 +126,10 @@ class HelloTable
         }
         
         # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-        items bind(BaseballGame, :schedule), column_properties(:game_date_time, :home_team, :away_team, :ballpark)
+        items bind(BaseballGame, :schedule), column_properties(:game_date_time, :home_team, :home_team_runs, :away_team, :away_team_runs, :ballpark)
         
         # Sort by these additional properties after handling the main column sort the user selected
-        additional_sort_properties :date_time, :home_team, :away_team, :ballpark
-        
-        on_mouse_up { |event|
-          table_proxy.edit_table_item(event.table_item, event.column_index)
-        }
+        additional_sort_properties :date_time, :home_team, :away_team, :ballpark, :home_team_runs, :away_team_runs
       }
     }.open
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.8.3
+  version: 4.17.9.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +392,7 @@ files:
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/code_text.rb
 - lib/glimmer/swt/custom/radio_group.rb
+- lib/glimmer/swt/date_time_proxy.rb
 - lib/glimmer/swt/directory_dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
@@ -437,6 +438,7 @@ files:
 - samples/hello/hello_computed/contact.rb
 - samples/hello/hello_custom_shell.rb
 - samples/hello/hello_custom_widget.rb
+- samples/hello/hello_date_time.rb
 - samples/hello/hello_directory_dialog.rb
 - samples/hello/hello_drag_and_drop.rb
 - samples/hello/hello_expand_bar.rb