glimmer-dsl-swt 4.20.2.1 → 4.20.4.2

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

@@ -0,0 +1,194 @@
+# 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.
+
+require 'glimmer-dsl-swt'
+
+class HelloGroup
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Label!'
+    
+      tab_folder {
+        tab_item {
+          text 'left-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:left) { # :left is default in English, so it is unnecessary
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'center-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:center) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'right-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:right) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'images'
+          
+          grid_layout 2, true
+          
+          ['denmark', 'finland', 'norway'].each do |image_name|
+            label {
+              layout_data :fill, :center, true, false
+              image File.expand_path("images/#{image_name}.png", __dir__)
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'background images'
+          
+          grid_layout 2, true
+          
+          ['italy', 'france', 'mexico'].each do |image_name|
+            label {
+              layout_data :center, :center, true, false
+              background_image File.expand_path("images/#{image_name}.png", __dir__)
+              text image_name.capitalize
+              font height: 26, style: :bold
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'horizontal separator'
+          
+          grid_layout 2, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label(:separator, :horizontal) {
+            layout_data(:fill, :center, true, false) {
+              horizontal_span 2
+            }
+          }
+                    
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+        }
+        
+        tab_item {
+          text 'vertical separator'
+          
+          grid_layout 3, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          label(:separator, :vertical) {
+            layout_data(:center, :center, false, false) {
+              vertical_span 3
+            }
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 3"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 3"
+          }
+        }
+        
+      }
+      
+    }
+    
+  }
+end
+
+HelloGroup.launch

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]
         }
       }
   

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.2.1
+  version: 4.20.4.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-07-15 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
@@ -542,7 +561,6 @@ files:
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb
 - samples/elaborate/timer.rb
-- samples/elaborate/timer/alarm1.wav
 - samples/elaborate/timer/sounds/alarm1.wav
 - samples/elaborate/user_profile.rb
 - samples/elaborate/weather.rb
@@ -550,15 +568,6 @@ files:
 - samples/hello/hello_button.rb
 - samples/hello/hello_c_combo.rb
 - samples/hello/hello_c_tab.rb
-- samples/hello/hello_c_tab/denmark.png
-- samples/hello/hello_c_tab/finland.png
-- samples/hello/hello_c_tab/france.png
-- samples/hello/hello_c_tab/germany.png
-- samples/hello/hello_c_tab/italy.png
-- samples/hello/hello_c_tab/mexico.png
-- samples/hello/hello_c_tab/netherlands.png
-- samples/hello/hello_c_tab/norway.png
-- samples/hello/hello_c_tab/usa.png
 - samples/hello/hello_canvas.rb
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_animation_data_binding.rb
@@ -572,7 +581,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
@@ -586,6 +594,7 @@ files:
 - samples/hello/hello_file_dialog.rb
 - samples/hello/hello_font_dialog.rb
 - samples/hello/hello_group.rb
+- samples/hello/hello_label.rb
 - samples/hello/hello_layout.rb
 - samples/hello/hello_link.rb
 - samples/hello/hello_list_multi_selection.rb
@@ -608,6 +617,15 @@ files:
 - samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb
+- samples/hello/images/denmark.png
+- samples/hello/images/finland.png
+- samples/hello/images/france.png
+- samples/hello/images/germany.png
+- samples/hello/images/italy.png
+- samples/hello/images/mexico.png
+- samples/hello/images/netherlands.png
+- samples/hello/images/norway.png
+- samples/hello/images/usa.png
 - sounds/metronome-down.wav
 - sounds/metronome-up.wav
 - vendor/swt/linux/swt.jar

data/lib/glimmer/data_binding/shine.rb

@@ -1,63 +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
-          # remove read_only from table to allow automatic sorting (but it remains non-editable)
-          args_clone.last[:read_only] = false if @parent.is_a?(Glimmer::SWT::TableProxy) # TODO consider a polymorphic way to perform this
-          @parent.content {
-            send(@parent_attribute, bind(*args_clone))
-          }
-        end
-      end
-    end
-  end
-end