glimmer-dsl-opal 0.9.3 → 0.11.0

data/lib/glimmer-dsl-opal/samples/hello/hello_browser.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_button.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ class HelloButton
       text 'Hello, Button!'
       
       button {
-        text bind(self, :count) {|value| "Click To Increment: #{value}  "}
+        text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
         
         on_widget_selected {
           self.count += 1

data/lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -52,22 +52,22 @@ class HelloCheckbox
       composite {
         checkbox {
           text 'Skiing'
-          selection bind(person, :skiing)
+          selection <=> [person, :skiing]
         }
         
         checkbox {
           text 'Snowboarding'
-          selection bind(person, :snowboarding)
+          selection <=> [person, :snowboarding]
         }
         
         checkbox {
           text 'Snowmobiling'
-          selection bind(person, :snowmobiling)
+          selection <=> [person, :snowmobiling]
         }
         
         checkbox {
           text 'Snowshoeing'
-          selection bind(person, :snowshoeing)
+          selection <=> [person, :snowshoeing]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_combo.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -46,7 +46,7 @@ class HelloCombo
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        selection bind(person, :country)
+        selection <=> [person, :country]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_computed.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -46,7 +46,7 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
-          text bind(@contact, :first_name)
+          text <=> [@contact, :first_name]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -55,7 +55,7 @@ class HelloComputed
         
         label {text '&Last Name: '}
         text {
-          text bind(@contact, :last_name)
+          text <=> [@contact, :last_name]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -64,7 +64,7 @@ class HelloComputed
         
         label {text '&Year of Birth: '}
         text {
-          text bind(@contact, :year_of_birth)
+          text <=> [@contact, :year_of_birth]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -73,7 +73,7 @@ class HelloComputed
         
         label {text 'Name: '}
         label {
-          text bind(@contact, :name, computed_by: [:first_name, :last_name])
+          text <= [@contact, :name, computed_by: [:first_name, :last_name]]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -82,7 +82,7 @@ class HelloComputed
         
         label {text 'Age: '}
         label {
-          text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])
+          text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true

data/lib/glimmer-dsl-opal/samples/hello/hello_computed/contact.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -42,19 +42,19 @@ class HelloDateTime
       }
       
       date { # alias for date_time(:date)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       date_drop_down { # alias for date_time(:date, :drop_down)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       time { # alias for date_time(:time)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       calendar { # alias for date_time(:calendar)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
     }.open
   end

data/lib/glimmer-dsl-opal/samples/hello/hello_dialog.rb

@@ -0,0 +1,78 @@
+# Copyright (c) 2020-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.
+
+include Glimmer
+
+shell {
+  row_layout :vertical
+  
+  text 'Hello, Dialog!'
+  
+  7.times { |n|
+    dialog_number = n + 1
+    
+    button {
+      layout_data {
+        width 200
+        height 50
+      }
+      text "Dialog #{dialog_number}"
+      
+      on_widget_selected {
+        dialog { |dialog_proxy|
+          row_layout(:vertical) {
+            center true
+          }
+          
+          text "Dialog #{dialog_number}"
+          
+          label {
+            text "Given `dialog` is modal, you cannot interact with the main window till the dialog is closed."
+          }
+          composite {
+            row_layout {
+              margin_height 0
+              margin_top 0
+              margin_bottom 0
+            }
+
+            label {
+              text "Unlike `message_box`, `dialog` can contain arbitrary widgets:"
+            }
+            radio {
+              text 'Radio'
+            }
+            checkbox {
+              text 'Checkbox'
+            }
+          }
+          button {
+            text 'Close'
+            
+            on_widget_selected {
+              dialog_proxy.close
+            }
+          }
+        }.open
+      }
+    }
+  }
+}.open

data/lib/glimmer-dsl-opal/samples/hello/hello_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -54,12 +54,12 @@ class HelloGroup
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection <=> [person, :male]
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection <=> [person, :female]
         }
       }
       
@@ -71,22 +71,22 @@ class HelloGroup
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection <=> [person, :child]
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection <=> [person, :teen]
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection <=> [person, :adult]
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection <=> [person, :senior]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -59,7 +59,7 @@ class HelloListMultiSelection
       text 'Hello, List Multi Selection!'
       
       list(:multi) {
-        selection bind(person, :provinces)
+        selection <=> [person, :provinces]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -44,7 +44,7 @@ class HelloListSingleSelection
       text 'Hello, List Single Selection!'
       
       list {
-        selection bind(person, :country)
+        selection <=> [person, :country]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_menu_bar.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_message_box.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_radio.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -56,12 +56,12 @@ class HelloRadio
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection <=> [person, :male]
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection <=> [person, :female]
         }
       }
       
@@ -75,22 +75,22 @@ class HelloRadio
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection <=> [person, :child]
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection <=> [person, :teen]
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection <=> [person, :adult]
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection <=> [person, :senior]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_tab.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_table.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-opal/samples/hello/hello_world.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer-dsl-swt.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -11,10 +11,11 @@ module Glimmer
       include DataBinding::Observable
       include DataBinding::Observer
 
-      def initialize(parent, model_binding, column_properties)
+      def initialize(parent, model_binding, column_properties = nil)
         @last_populated_model_collection = nil
         @table = parent
         @model_binding = model_binding
+#         @column_properties = model_binding.binding_options[:column_attributes] || model_binding.binding_options[:column_properties] || column_properties # TODO
         @column_properties = column_properties
         @table.data = @model_binding
         ##@table.on_widget_disposed do |dispose_event| # doesn't seem needed within Opal