glimmer-dsl-swt 4.17.9.0 → 4.17.10.0

data/lib/glimmer/swt/table_proxy.rb

@@ -132,6 +132,69 @@ module Glimmer
                 }
               end,
             },
+            date: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                date(*args) {
+                  date_time 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
+                  }
+                }
+              end,
+            },
+            date_drop_down: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                date_drop_down(*args) {
+                  date_time 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
+                  }
+                }
+              end,
+            },
+            time: {
+              widget_value_property: :date_time,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                time(*args) {
+                  date_time 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
+                  }
+                }
+              end,
+            },
             radio: {
               widget_value_property: :selection,
               editor_gui: lambda do |args, model, property, table_proxy|
@@ -174,11 +237,6 @@ module Glimmer
                       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,
@@ -187,7 +245,7 @@ module Glimmer
         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, :editable
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable, :initial_sort_property
       attr_accessor :column_properties
       alias editable? editable
       
@@ -211,10 +269,49 @@ module Glimmer
         swt_widget.data
       end
       
-      def sort_by_column(table_column_proxy)
-        index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget)
-        new_sort_property = table_column_proxy.sort_property || [column_properties[index]]
-        if new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
+      def sort_block=(comparator)
+        @sort_block = comparator
+      end
+      
+      def sort_by_block=(property_picker)
+        @sort_by_block = property_picker
+      end
+      
+      def sort_property=(new_sort_property)
+        @sort_property = [new_sort_property].flatten.compact
+      end
+      
+      def detect_sort_type
+        @sort_type = sort_property.size.times.map { String }
+        array = model_binding.evaluate_property
+        sort_property.each_with_index do |a_sort_property, i|
+          values = array.map { |object| object.send(a_sort_property) }
+          value_classes = values.map(&:class).uniq
+          if value_classes.size == 1
+            @sort_type[i] = value_classes.first
+          elsif value_classes.include?(Integer)
+            @sort_type[i] = Integer
+          elsif value_classes.include?(Float)
+            @sort_type[i] = Float
+          end
+        end
+      end
+      
+      def column_sort_properties
+        column_properties.zip(table_column_proxies.map(&:sort_property)).map do |pair|
+          [pair.compact.last].flatten.compact
+        end
+      end
+      
+      # Sorts by specified TableColumnProxy object. If nil, it uses the table default sort instead.
+      def sort_by_column!(table_column_proxy=nil)
+        index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget) unless table_column_proxy.nil?
+        new_sort_property = table_column_proxy.nil? ? @sort_property : table_column_proxy.sort_property || [column_properties[index]]
+        return if table_column_proxy.nil? && new_sort_property.nil? && @sort_block.nil? && @sort_by_block.nil?
+        if new_sort_property && table_column_proxy.nil? && new_sort_property.size == 1 && (index = column_sort_properties.index(new_sort_property))
+          table_column_proxy = table_column_proxies[index]
+        end
+        if new_sort_property && new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
           selected_additional_sort_properties = additional_sort_properties.clone
           if selected_additional_sort_properties.include?(new_sort_property.first)
             selected_additional_sort_properties.delete(new_sort_property.first)
@@ -224,39 +321,32 @@ module Glimmer
           end
         end
         
-        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending
+        @sort_direction = @sort_direction.nil? || @sort_property.first != new_sort_property.first || @sort_direction == :descending ? :ascending : :descending
         swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
         
-        @sort_property = new_sort_property
-        swt_widget.sort_column = table_column_proxy.swt_widget
-        
-        @sort_by_block = nil
-        @sort_block = nil
+        @sort_property = [new_sort_property].flatten.compact
+        table_column_index = column_properties.index(new_sort_property.to_s.to_sym)
+        table_column_proxy ||= table_column_proxies[table_column_index] if table_column_index
+        swt_widget.sort_column = table_column_proxy.swt_widget if table_column_proxy
+                
+        if table_column_proxy
+          @sort_by_block = nil
+          @sort_block = nil
+        end
         @sort_type = nil
-        if table_column_proxy.sort_by_block
+        if table_column_proxy&.sort_by_block
           @sort_by_block = table_column_proxy.sort_by_block
-        elsif table_column_proxy.sort_block
+        elsif table_column_proxy&.sort_block
           @sort_block = table_column_proxy.sort_block
         else
           detect_sort_type
         end
-        sort
+                
+        sort!
       end
       
-      def detect_sort_type
-        @sort_type = sort_property.size.times.map { String }
-        array = model_binding.evaluate_property
-        sort_property.each_with_index do |a_sort_property, i|
-          values = array.map { |object| object.send(a_sort_property) }
-          value_classes = values.map(&:class).uniq
-          if value_classes.size == 1
-            @sort_type[i] = value_classes.first
-          elsif value_classes.include?(Integer)
-            @sort_type[i] = Integer
-          elsif value_classes.include?(Float)
-            @sort_type[i] = Float
-          end
-        end
+      def initial_sort!
+        sort_by_column!
       end
       
       def additional_sort_properties=(args)
@@ -276,7 +366,7 @@ module Glimmer
         swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
       end
       
-      def sort
+      def sort!
         return unless sort_property && (sort_type || sort_block || sort_by_block)
         array = model_binding.evaluate_property
         array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
@@ -317,22 +407,16 @@ module Glimmer
         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 post_initialize_child(table_column_proxy)
         table_column_proxies << table_column_proxy
       end
       
+      def post_add_content
+        return if @initially_sorted
+        initial_sort!
+        @initially_sorted = true
+      end
+      
       def table_column_proxies
         @table_column_proxies ||= []
       end
@@ -365,7 +449,8 @@ module Glimmer
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
-        @cancel_edit&.call if @edit_mode
+        cancel_edit!
+        return unless table_column_proxies[column_index].editable?
         action_taken = false
         @edit_mode = true
         
@@ -390,7 +475,7 @@ module Glimmer
         end
         
         @finish_edit = lambda do |event=nil|
-          new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
+          new_value = @table_editor_widget_proxy&.send(widget_value_property)
           if table_item.isDisposed
             @cancel_edit.call
           elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress

data/lib/glimmer/swt/widget_proxy.rb

@@ -234,7 +234,6 @@ module Glimmer
         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
@@ -282,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|
@@ -447,6 +457,7 @@ module Glimmer
         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)
           swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
           if swt_widget_class.nil?
@@ -822,6 +833,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)

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_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_radio_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 `radio_group` in Glimmer, which provides terser syntax
+# than HelloRadio for representing multiple radio buttons by relying on data-binding to
+# automatically spawn the `radio` widgets based on available options on the model.
 class HelloRadioGroup
   class Person
     attr_accessor :gender, :age_group

data/samples/hello/hello_sash_form.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_spinner.rb

@@ -0,0 +1,69 @@
+# 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 HelloSpinner
+  class Person
+    attr_accessor :donation
+  end
+  
+  include Glimmer
+  
+  def initialize
+    @person = Person.new
+    @person.donation = 500
+  end
+  
+  def launch
+    shell {
+      grid_layout
+      
+      text 'Hello, Spinner!'
+      
+      label {
+        text 'Please select the amount you would like to donate to the poor:'
+      }
+      
+      composite {
+        grid_layout 3, false
+        
+        label {
+          text 'Amount:'
+          font style: :bold
+        }
+        
+        label {
+          text '$'
+        }
+        
+        spinner {
+          digits 2 # digits after the decimal point
+          minimum 500 # minimum value (including digits after the decimal point)
+          maximum 15000 # maximum value (including digits after the decimal point)
+          increment 500 # increment on up and down (including digits after the decimal point)
+          page_increment 5000 # page increment on page up and page down (including digits after the decimal point)
+          selection bind(@person, :donation) # selection must be set last if other properties are configured to ensure value is within bounds
+        }
+      }
+    }.open
+  end
+end
+
+HelloSpinner.new.launch