glimmer-dsl-swt 4.17.8.2 → 4.17.10.2

data/lib/glimmer/swt/widget_listener_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
@@ -40,7 +40,7 @@ module Glimmer
       
       def widget_remove_listener_method
         @widget_add_listener_method.sub('add', 'remove')
-      end      
+      end
       
       def unregister
         # TODO consider renaming to deregister (and in Observer too)

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,10 @@ 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
+          send(attribute_name)
         end
       end
 
@@ -272,6 +281,17 @@ module Glimmer
               }
             end,
           },
+          Java::OrgEclipseSwtWidgets::Table => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                if has_style?(:multi)
+                  observer.call(@swt_widget.getSelection.map(&:get_data))
+                else
+                  observer.call(@swt_widget.getSelection.first&.get_data)
+                end
+              }
+            end,
+          },
           Java::OrgEclipseSwtWidgets::Text => {
             :text => lambda do |observer|
               on_modify_text { |modify_event|
@@ -337,35 +357,34 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :caret_offset => lambda do |observer|
-              on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
-              }
-              on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getCaretOffset) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :selection => lambda do |observer|
-              on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
-              }
-              on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :selection_count => lambda do |observer|
-              on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
-              on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+            end,
+            :selection_range => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :top_index => lambda do |observer|
@@ -408,21 +427,42 @@ 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)
         underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
+        # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
         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
@@ -673,14 +713,17 @@ module Glimmer
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset}},
-            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first) if args.first }},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x}},
+            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first, args.first + @swt_widget.getSelectionCount) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
             setter: {name: 'setSelection', invoker: lambda { |widget, args|
-              caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset
-              @swt_widget.setSelection(caret_position, caret_position + args.first) if args.first
+              if args.first
+                caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x
+                # TODO handle negative length
+                @swt_widget.setSelection(caret_position, caret_position + args.first)
+              end
             }},
           },
         }
@@ -792,6 +835,9 @@ module Glimmer
             end
             cursor_proxy ? cursor_proxy.swt_cursor : value
           end,
+          :enabled => lambda do |value|
+            !!value
+          end,
           :foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)
@@ -841,4 +887,4 @@ module Glimmer
       end
     end
   end
-end
+end

data/samples/elaborate/contact_manager.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/samples/elaborate/meta_sample.rb

@@ -8,7 +8,7 @@ class Sample
   
   def name
     if @name.nil?
-      @name = File.basename(file, '.rb').split('_').map(&:capitalize).join(' ')    
+      @name = File.basename(file, '.rb').split('_').map(&:capitalize).join(' ')
       if @name.start_with?('Hello')
         name_parts = @name.split
         name_parts[0] = name_parts.first + ','
@@ -38,11 +38,11 @@ class SampleDirectory
             select { |file| File.directory?(file) }.
             map { |file| SampleDirectory.new(file) }
         glimmer_gems = Gem.find_latest_files("glimmer-*-*")
-        sample_directories = glimmer_gems.map do |lib| 
+        sample_directories = glimmer_gems.map do |lib|
           File.dirname(File.dirname(lib))
-        end.select do |gem| 
+        end.select do |gem|
           Dir.exist?(File.join(gem, 'samples'))
-        end.map do |gem| 
+        end.map do |gem|
           Dir.glob(File.join(gem, 'samples', '*')).select {|file_or_dir| Dir.exist?(file_or_dir)}
         end.flatten.uniq.reverse
         if Dir.exist?('samples')
@@ -51,14 +51,14 @@ class SampleDirectory
           end
         end
         sample_directories = sample_directories.uniq {|dir| File.basename(dir)}
-        @sample_directories = sample_directories.map { |file| SampleDirectory.new(file) }            
+        @sample_directories = sample_directories.map { |file| SampleDirectory.new(file) }
       end
       @sample_directories
     end
     
     def all_samples
       @all_samples ||= sample_directories.map(&:samples).reduce(:+)
-    end    
+    end
   end
   
   include Glimmer # used for observe syntax
@@ -117,7 +117,7 @@ class MetaSampleApplication
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       
       on_swt_show {
-        SampleDirectory.selected_sample = SampleDirectory.all_samples.first        
+        SampleDirectory.selected_sample = SampleDirectory.all_samples.first
       }
       
       sash_form {
@@ -153,7 +153,7 @@ class MetaSampleApplication
             on_widget_selected {
               SampleDirectory.selected_sample.launch
             }
-          }        
+          }
         }
             
         code_text {
@@ -163,7 +163,7 @@ class MetaSampleApplication
         }
         
         weights 4, 9
-      }            
+      }
     }.open
   end
 end

data/samples/hello/hello_browser.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/samples/hello/hello_checkbox_group.rb

@@ -19,6 +19,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# This sample demonstrates the use of a `checkbox_group` (aka `check_group`) in Glimmer, which provides terser syntax
+# than HelloCheckbox for representing multiple checkbox buttons (`button(:check)`) by relying on data-binding to
+# automatically spawn the `checkbox` widgets (`button(:check)`) based on available options on the model.
 class HelloCheckboxGroup
   class Person
     attr_accessor :activities

data/samples/hello/hello_combo.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
@@ -41,9 +41,9 @@ class HelloCombo
     shell {
       row_layout(:vertical) {
         pack false
-      }        
+      }
       
-      text 'Hello, Combo!'      
+      text 'Hello, Combo!'
       
       combo(:read_only) {
         selection bind(person, :country)

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_group.rb

@@ -43,7 +43,7 @@ class HelloGroup
     person = Person.new
     
     shell {
-      text 'Hello, Radio!'
+      text 'Hello, Group!'
       row_layout :vertical
       
       group {

data/samples/hello/hello_menu_bar.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