glimmer-dsl-swt 4.17.8.3 → 4.17.10.3

data/lib/glimmer/swt/styled_text_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
@@ -27,17 +27,12 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class StyledTextProxy < WidgetProxy
-      def set_attribute(attribute_name, *args)
-        if attribute_name.to_s == 'selection'
-          if args.first
-            async_exec { @swt_widget.setCaretOffset(args.first.x) }
-            async_exec { @swt_widget.setSelection(args.first) }
-          end
-        else
-          super(attribute_name, *args)
-        end
+      def initialize(*args)
+        super
+        on_modify_text { |event|
+          @last_modify_text = text
+        }
       end
-      
     end
   end
 end

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

@@ -39,6 +39,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TabItemProxy < WidgetProxy
+      ATTRIBUTES = %w[text image]
       include_package 'org.eclipse.swt.widgets'
 
       attr_reader :widget_proxy, :swt_tab_item
@@ -51,7 +52,7 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        if attribute_name.to_s == "text"
+        if ATTRIBUTES.include?(attribute_name.to_s)
           true
         else
           super(attribute_name, *args)
@@ -63,6 +64,8 @@ module Glimmer
         if attribute_name.to_s == "text"
           text_value = args[0]
           @swt_tab_item.setText text_value
+        elsif attribute_name.to_s == "image"
+          widget_proxy.set_attribute('image', *args)
         else
           super(attribute_name, *args)
         end
@@ -71,6 +74,8 @@ module Glimmer
       def get_attribute(attribute_name)
         if attribute_name.to_s == "text"
           @swt_tab_item.getText
+        elsif attribute_name.to_s == "image"
+          widget_proxy.get_attribute('image')
         else
           super(attribute_name)
         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
@@ -20,10 +20,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_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
@@ -32,7 +35,7 @@ module Glimmer
         @no_sort = args.delete(:no_sort)
         super
         on_widget_selected do |event|
-          parent.sort_by_column(self)
+          parent.sort_by_column!(self)
         end unless no_sort?
       end
       
@@ -40,10 +43,15 @@ module Glimmer
         @sort_property = args unless args.empty?
       end
       
+      # Sets editor (e.g. combo)
       def editor=(args)
         @editor = args
       end
       
+      def editable?
+        !@editor&.include?(:none)
+      end
+      
     end
   end
 end

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|
@@ -155,30 +218,100 @@ 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
+                  }
+                }
+                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, :initial_sort_property
       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
         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)
@@ -188,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)
@@ -240,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
@@ -281,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
@@ -329,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
         
@@ -354,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