glimmer-dsl-swt 4.20.1.0 → 4.20.4.1

data/samples/hello/hello_custom_shell.rb

@@ -88,12 +88,10 @@ class EmailShell
 end
 
 class HelloCustomShell
-  include Glimmer::UI::CustomShell
-  
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
   EmailSystem = Struct.new(:emails, keyword_init: true)
   
-  before_body {
+  def initialize
     @email_system = EmailSystem.new(
       emails: [
         Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
@@ -104,10 +102,10 @@ class HelloCustomShell
         Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
       ]
     )
-  }
+  end
   
-  body {
-    shell {
+  def launch
+    shell { |shell_proxy|
       grid_layout
       
       text 'Hello, Custom Shell!'
@@ -138,15 +136,23 @@ class HelloCustomShell
           width 360
         }
         
-        items bind(@email_system, :emails), column_properties(:date, :subject, :from)
+        items <=> [@email_system, :emails, column_properties: [:date, :subject, :from]]
         
         on_mouse_up { |event|
           email = event.table_item.get_data
-          email_shell(parent_shell: self, date: email.date, subject: email.subject, from: email.from, message: email.message).open
+          
+          # open a custom email shell
+          email_shell(
+            parent_shell: shell_proxy,
+            date: email.date,
+            subject: email.subject,
+            from: email.from,
+            message: email.message
+          ).open
         }
       }
-    }
-  }
+    }.open
+  end
 end
 
-HelloCustomShell.launch
+HelloCustomShell.new.launch

data/samples/hello/hello_directory_dialog.rb

@@ -44,7 +44,7 @@ class HelloDirectoryDialog
       
       label {
         layout_data :fill, :center, true, false
-        text bind(self, :selected_directory)
+        text <= [self, :selected_directory]
         font height: 14
       }
       

data/samples/hello/hello_radio_group.rb

@@ -64,7 +64,7 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(@person, :gender)
+        selection <=> [@person, :gender]
       }
             
       label {
@@ -74,7 +74,7 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(@person, :age_group)
+        selection <=> [@person, :age_group]
       }
       
       button {

data/samples/hello/hello_table.rb

@@ -210,7 +210,7 @@ class HelloTable
         font height: 14
       }
       
-      table { |table_proxy|
+      table(:editable) { |table_proxy|
         layout_data :fill, :fill, true, true
       
         table_column {

data/samples/hello/hello_tool_bar.rb

@@ -71,7 +71,7 @@ class HelloToolBar
         }
         # a combo can be nested in a tool_bar (it auto-generates a tool_item for itself behind the scenes)
         combo {
-          selection bind(self, :font_size)
+          selection <=> [self, :font_size]
         }
       }
   

data/samples/hello/hello_tree.rb

@@ -314,8 +314,8 @@ class HelloTree
             margin_height 5
           }
           @tree = tree {
-            items bind(Employee, :ceo), tree_properties(children: :subordinates, text: :to_s)
-            selection bind(Employee, :selected_employee)
+            items <= [Employee, :ceo, tree_properties: {children: :subordinates, text: :to_s}]
+            selection <=> [Employee, :selected_employee]
           }
         }
         
@@ -329,7 +329,7 @@ class HelloTree
           }
           text {
             layout_data(:fill, :center, true, false)
-            text bind(Employee, "selected_employee.first_name")
+            text <=> [Employee, "selected_employee.first_name"]
             font height: 16
           }
                   
@@ -340,7 +340,7 @@ class HelloTree
           }
           text {
             layout_data(:fill, :center, true, false)
-            text bind(Employee, "selected_employee.last_name")
+            text <=> [Employee, "selected_employee.last_name"]
             font height: 16
           }
                   
@@ -351,7 +351,7 @@ class HelloTree
           }
           combo {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.position")
+            selection <=> [Employee, "selected_employee.position"]
             font height: 16
           }
                   
@@ -373,7 +373,7 @@ class HelloTree
             spinner {
               maximum 999_999
               minimum 0
-              selection bind(Employee, "selected_employee.salary")
+              selection <=> [Employee, "selected_employee.salary"]
               font height: 16
             }
           }
@@ -385,7 +385,7 @@ class HelloTree
           }
           combo(:read_only) {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.health_insurance")
+            selection <=> [Employee, "selected_employee.health_insurance"]
             font height: 16
           }
                                                   
@@ -396,7 +396,7 @@ class HelloTree
           }
           combo(:read_only) {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.desk_location")
+            selection <=> [Employee, "selected_employee.desk_location"]
             font height: 16
           }
               
@@ -414,7 +414,7 @@ class HelloTree
             spinner {
               maximum 100
               minimum 0
-              selection bind(Employee, "selected_employee.sales_bonus_percentage")
+              selection <=> [Employee, "selected_employee.sales_bonus_percentage"]
               font height: 16
             }
             label {
@@ -441,7 +441,7 @@ class HelloTree
             spinner {
               maximum 999_999
               minimum 0
-              selection bind(Employee, "selected_employee.merit_bonus")
+              selection <=> [Employee, "selected_employee.merit_bonus"]
               font height: 16
             }
           }
@@ -467,7 +467,7 @@ class HelloTree
                 maximum 999_999_00
                 minimum 0
                 increment 100
-                selection bind(Employee, "selected_employee.#{attribute}", on_read: ->(v) {v.to_f * 100}, on_write: ->(v) {v.to_f / 100})
+                selection <=> [Employee, "selected_employee.#{attribute}", on_read: ->(v) {v.to_f * 100}, on_write: ->(v) {v.to_f / 100}]
                 font height: 16
               }
             }

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.1.0
+  version: 4.20.4.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.0
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -104,6 +104,46 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: jruby-win32ole
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -198,26 +238,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: jruby-win32ole
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -390,7 +410,6 @@ files:
 - lib/glimmer/Rakefile
 - lib/glimmer/data_binding/list_selection_binding.rb
 - lib/glimmer/data_binding/observable_widget.rb
-- lib/glimmer/data_binding/shine.rb
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/data_binding/tree_items_binding.rb
 - lib/glimmer/data_binding/widget_binding.rb
@@ -572,7 +591,6 @@ files:
 - samples/hello/hello_combo.rb
 - samples/hello/hello_composite.rb
 - samples/hello/hello_computed.rb
-- samples/hello/hello_computed/contact.rb
 - samples/hello/hello_cool_bar.rb
 - samples/hello/hello_cursor.rb
 - samples/hello/hello_custom_shape.rb

data/lib/glimmer/data_binding/shine.rb

@@ -1,61 +0,0 @@
-# Copyright (c) 2007-2021 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.
-
-module Glimmer
-  module DataBinding
-    class Shine
-      include Glimmer
-      
-      def initialize(parent, parent_attribute)
-        @parent = parent
-        @parent_attribute = parent_attribute
-      end
-    
-      alias original_compare <=>
-    
-      def <=>(other)
-        if other.is_a?(Array)
-          args_clone = other.clone
-          @parent.editable = true if @parent.is_a?(Glimmer::SWT::TableProxy) # TODO consider a polymorphic way to perform this
-          @parent.content {
-            send(@parent_attribute, bind(*args_clone))
-          }
-        else  # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
-          original_compare(other)
-        end
-      end
-    
-      def <=(other)
-        if other.is_a?(Array)
-          args_clone = other.clone
-          if args_clone.last.is_a?(Hash)
-            args_clone.last[:read_only] = true
-          else # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
-            args_clone << {read_only: true}
-          end
-          @parent.content {
-            send(@parent_attribute, bind(*args_clone))
-          }
-        end
-      end
-    end
-  end
-end

data/samples/hello/hello_computed/contact.rb

@@ -1,42 +0,0 @@
-# Copyright (c) 2007-2021 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 HelloComputed
-  class Contact
-    attr_accessor :first_name, :last_name, :year_of_birth
-  
-    def initialize(attribute_map)
-      @first_name = attribute_map[:first_name]
-      @last_name = attribute_map[:last_name]
-      @year_of_birth = attribute_map[:year_of_birth]
-    end
-  
-    def name
-      "#{last_name}, #{first_name}"
-    end
-  
-    def age
-      Time.now.year - year_of_birth.to_i
-    rescue
-      0
-    end
-  end
-end