glimmer-dsl-swt 4.17.9.0 → 4.17.10.4

data/lib/glimmer/data_binding/tree_items_binding.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
@@ -69,7 +69,7 @@ module Glimmer
         old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
         old_tree_items.each do |tree_item|
           tree_item.getData('observer_registrations').each(&:unregister)
-        end        
+        end
         parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
@@ -85,9 +85,9 @@ module Glimmer
           array + [observe(model_tree_node, key_value_pair.last)]
         end
         
-        tree_item.setData('observer_registrations', observer_registrations)
-        tree_item.setData(model_tree_node)
-        tree_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
+        tree_item.set_data('observer_registrations', observer_registrations)
+        tree_item.set_data(model_tree_node)
+        tree_item.text = (model_tree_node && model_tree_node.send(tree_properties[:text])).to_s
         [model_tree_node && model_tree_node.send(tree_properties[:children])].flatten.to_a.compact.each do |child|
           populate_tree_node(child, tree_item, tree_properties)
         end

data/lib/glimmer/dsl/swt/table_items_data_binding_expression.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/launcher.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
@@ -31,12 +31,12 @@ module Glimmer
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
     TEXT_USAGE = <<~MULTI_LINE_STRING
-      Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
+      Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
       Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
-      Runs Glimmer applications and tasks.    
+      Runs Glimmer applications and tasks.
     
-      When applications are specified, they are run using JRuby, 
+      When applications are specified, they are run using JRuby,
       automatically preloading the glimmer Ruby gem and SWT jar dependency.
     
       Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
@@ -112,7 +112,7 @@ module Glimmer
       def launch(application, jruby_options: [], env_vars: {}, glimmer_options: {})
         jruby_options_string = jruby_options.join(' ') + ' ' if jruby_options.any?
         env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
-        env_vars_string = env_vars.map do |k,v| 
+        env_vars_string = env_vars.map do |k,v|
           if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
             "set #{k}=#{v} && "
           else
@@ -224,8 +224,8 @@ module Glimmer
           task_name = task.name_with_args.sub('glimmer:', '')
           line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
           bound = TTY::Screen.width - 6
-          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
-        end    
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."
+        end
       end
     end
 

data/lib/glimmer/swt/shell_proxy.rb

@@ -88,18 +88,26 @@ module Glimmer
 
       # Opens shell and starts SWT's UI thread event loop
       def open
+        open_only
+        start_event_loop unless nested?
+      end
+      alias show open
+      
+      # Opens without starting the event loop.
+      def open_only
         if @opened_before
           @swt_widget.setVisible(true)
-          # notify_observers('visible')
         else
           @opened_before = true
           @swt_widget.pack
           center
           @swt_widget.open
-          start_event_loop
         end
       end
-      alias show open
+      
+      def nested?
+        !parent.nil?
+      end
 
       def hide
         @swt_widget.setVisible(false)
@@ -113,6 +121,10 @@ module Glimmer
       def visible=(visibility)
         visibility ? show : hide
       end
+      
+      def include_focus_control?
+        DisplayProxy.instance.focus_control&.shell == swt_widget
+      end
 
       def pack
         @swt_widget.pack
@@ -169,6 +181,9 @@ module Glimmer
           super
         end
       end
+      
     end
+    
   end
+  
 end

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/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

@@ -20,6 +20,7 @@
 # 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
@@ -34,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
       
@@ -42,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|
@@ -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,
@@ -211,36 +269,16 @@ 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?
-          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)
-            new_sort_property += selected_additional_sort_properties
-          else
-            new_sort_property += additional_sort_properties
-          end
-        end
-        
-        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @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_type = nil
-        if table_column_proxy.sort_by_block
-          @sort_by_block = table_column_proxy.sort_by_block
-        elsif table_column_proxy.sort_block
-          @sort_block = table_column_proxy.sort_block
-        else
-          detect_sort_type
-        end
-        sort
+      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
@@ -259,24 +297,63 @@ module Glimmer
         end
       end
       
-      def additional_sort_properties=(args)
-        @additional_sort_properties = args unless args.empty?
+      def column_sort_properties
+        column_properties.zip(table_column_proxies.map(&:sort_property)).map do |pair|
+          [pair.compact.last].flatten.compact
+        end
       end
       
-      def editor=(args)
-        @editor = args
+      # 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)
+            new_sort_property += selected_additional_sort_properties
+          else
+            new_sort_property += additional_sort_properties
+          end
+        end
+        
+        @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].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
+          @sort_by_block = table_column_proxy.sort_by_block
+        elsif table_column_proxy&.sort_block
+          @sort_block = table_column_proxy.sort_block
+        else
+          detect_sort_type
+        end
+                
+        sort!
       end
       
-      def cells_for(model)
-        column_properties.map {|property| model.send(property)}
+      def initial_sort!
+        sort_by_column!
       end
       
-      def cells
-        column_count = @table.column_properties.size
-        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+      def additional_sort_properties=(args)
+        @additional_sort_properties = args unless args.empty?
       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
@@ -305,6 +382,19 @@ module Glimmer
         model_binding.call(sorted_array)
       end
       
+      def editor=(args)
+        @editor = args
+      end
+      
+      def cells_for(model)
+        column_properties.map {|property| model.send(property)}
+      end
+      
+      def cells
+        column_count = @table.column_properties.size
+        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+      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
@@ -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