glimmer-dsl-swt 4.19.0.2 → 4.20.0.4

data/samples/elaborate/mandelbrot_fractal.rb

@@ -180,7 +180,7 @@ class MandelbrotFractal
   body {
     shell(:no_resize) {
       grid_layout
-      text bind(self, :mandelbrot_shell_title)
+      text <= [self, :mandelbrot_shell_title]
       minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
             
@@ -194,7 +194,7 @@ class MandelbrotFractal
 
         minimum 0
         maximum Mandelbrot::PROGRESS_MAX
-        selection bind(Mandelbrot, :progress)
+        selection <= [Mandelbrot, :progress]
       }
           
       @scrolled_composite = scrolled_composite {

data/samples/elaborate/metronome.rb

@@ -83,7 +83,7 @@ class Metronome
       spinner {
         minimum 1
         maximum 64
-        selection bind(self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome})
+        selection <=> [self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome}]
         font height: 30
       }
       
@@ -95,7 +95,7 @@ class Metronome
       spinner {
         minimum 30
         maximum 1000
-        selection bind(self, 'rhythm.bpm')
+        selection <=> [self, 'rhythm.bpm']
         font height: 30
       }
       
@@ -122,7 +122,7 @@ class Metronome
             height_hint 50
           }
           rectangle(0, 0, :default, :default, 36, 36) {
-            background bind(self, "rhythm.beats[#{n}].on") {|on| on ? :red : :yellow}
+            background <= [self, "rhythm.beats[#{n}].on", on_read: ->(on) { on ? :red : :yellow}]
           }
         }
       }

data/samples/elaborate/tetris/model/game.rb

@@ -33,8 +33,6 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
-#       PLAYFIELD_WIDTH = 5
-#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -201,7 +199,6 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
-#         99999
       end
       
       def beep

data/samples/elaborate/tic_tac_toe.rb

@@ -47,8 +47,8 @@ class TicTacToe
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
-              text        bind(@tic_tac_toe_board[row, column], :sign)
-              enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              text        <= [@tic_tac_toe_board[row, column], :sign]
+              enabled     <= [@tic_tac_toe_board[row, column], :empty]
               font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)

data/samples/elaborate/weather.rb

@@ -0,0 +1,164 @@
+# 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 'net/http'
+require 'json'
+require 'facets/string/titlecase'
+require 'glimmer-dsl-swt'
+
+class Weather
+  include Glimmer::UI::CustomShell
+  
+  DEFAULT_FONT_HEIGHT = 30
+  DEFAULT_FOREGROUND = :white
+  
+  attr_accessor :city, :temp, :temp_min, :temp_max, :feels_like, :humidity
+  
+  before_body {
+    @weather_mutex = Mutex.new
+    self.city = 'Montreal, QC, CA'
+    fetch_weather!
+  }
+  
+  after_body {
+    Thread.new do
+      loop do
+        sleep(10)
+        break if body_root.disposed?
+        fetch_weather!
+      end
+    end
+  }
+  
+  body {
+    shell(:no_resize) {
+      grid_layout
+            
+      text 'Glimmer Weather'
+      minimum_size 400, 300
+      background rgb(135, 176, 235)
+      
+      text {
+        layout_data(:center, :center, true, true)
+        
+        text <=> [self, :city]
+        
+        on_key_pressed {|event|
+          if event.keyCode == swt(:cr) # carriage return
+            Thread.new do
+              fetch_weather!
+            end
+          end
+        }
+      }
+            
+      tab_folder {
+        layout_data(:center, :center, true, true)
+        
+        ['℃', '℉'].each do |temp_unit|
+          tab_item {
+            grid_layout 2, false
+            
+            text temp_unit
+            background :transparent
+            
+            rectangle(0, 0, [:default, -2], [:default, -2], 15, 15) {
+              foreground DEFAULT_FOREGROUND
+            }
+      
+            %w[temp temp_min temp_max feels_like].each do |field_name|
+              temp_field(field_name, temp_unit)
+            end
+            
+            humidity_field
+          }
+        end
+      }
+    }
+  }
+  
+  def temp_field(field_name, temp_unit)
+    name_label(field_name)
+    label {
+      layout_data(:fill, :center, true, false)
+      text <= [self, field_name, on_read: ->(t) { "#{kelvin_to_temp_unit(t, temp_unit).to_f.round}°" }]
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def humidity_field
+    name_label('humidity')
+    label {
+      layout_data(:fill, :center, true, false)
+      text <= [self, 'humidity', on_read: ->(h) { "#{h.to_f.round}%" }]
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def name_label(field_name)
+    label {
+      layout_data :fill, :center, false, false
+      text field_name.titlecase
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def fetch_weather!
+    @weather_mutex.synchronize do
+      self.weather_data = JSON.parse(Net::HTTP.get('api.openweathermap.org', "/data/2.5/weather?q=#{city}&appid=1d16d70a9aec3570b5cbd27e6b421330"))
+    end
+  rescue
+    # No Op
+  end
+  
+  def weather_data=(data)
+    @weather_data = data
+    main_data = data['main']
+    # temps come back in Kelvin
+    self.temp = main_data['temp']
+    self.temp_min = main_data['temp_min']
+    self.temp_max = main_data['temp_max']
+    self.feels_like = main_data['feels_like']
+    self.humidity = main_data['humidity']
+  end
+  
+  def kelvin_to_temp_unit(kelvin, temp_unit)
+    temp_unit == '℃' ? kelvin_to_celsius(kelvin) : kelvin_to_fahrenheit(kelvin)
+  end
+  
+  def kelvin_to_celsius(kelvin)
+    kelvin - 273.15
+  end
+  
+  def celsius_to_fahrenheit(celsius)
+    (celsius * 9 / 5 ) + 32
+  end
+  
+  def kelvin_to_fahrenheit(kelvin)
+    celsius_to_fahrenheit(kelvin_to_celsius(kelvin))
+  end
+  
+end
+
+Weather.launch

data/samples/hello/hello_button.rb

@@ -35,7 +35,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/samples/hello/hello_c_combo.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer-dsl-swt'
 
+# This is a sample for the c_combo widget, a more customizable version of combo
 class HelloCCombo
   class Person
     attr_accessor :country, :country_options
@@ -50,7 +51,7 @@ class HelloCCombo
       text 'Hello, C Combo!'
       
       c_combo(:read_only) {
-        selection bind(@person, :country) # also binds to country_options by convention
+        selection <=> [@person, :country] # also binds to country_options by convention
         font height: 45 # unlike `combo`, `c_combo` changes height when setting the font height
       }
       

data/samples/hello/hello_c_tab.rb

@@ -23,6 +23,7 @@
 
 require 'glimmer-dsl-swt'
 
+# This is a sample for the Custom Tab widgets (c_tab_folder & c_tab_item), which are more customizable versions of tab_folder and tab_item.
 class HelloCTab
   include Glimmer::UI::CustomShell
   

data/samples/hello/hello_canvas.rb

@@ -59,7 +59,7 @@ class HelloCanvas
           rectangle([:default, -70], :default, :default, [:default, 1]) {
             foreground :cyan
             text {
-              string bind(self, :artist)
+              string <=> [self, :artist]
               x :default, 1 # add 1 pixel to default x (shape centered within parent horizontally)
               y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
               background :yellow
@@ -105,7 +105,7 @@ class HelloCanvas
         menu {
           menu_item {
             text 'Change Background Color...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background) && shape.background }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background) && shape.background }]
             on_widget_selected {
               @selected_shape&.background = color_dialog.open
               self.selected_shape = nil
@@ -113,7 +113,7 @@ class HelloCanvas
           }
           menu_item {
             text 'Change Background Pattern Color 1...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
             on_widget_selected {
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
@@ -125,7 +125,7 @@ class HelloCanvas
           }
           menu_item {
             text 'Change Background Pattern Color 2...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
             on_widget_selected {
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
@@ -138,7 +138,7 @@ class HelloCanvas
           menu_item(:separator)
           menu_item {
             text 'Change Foreground Color...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:foreground) && shape.foreground }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:foreground) && shape.foreground }]
             on_widget_selected {
               @selected_shape&.foreground = color_dialog.open
               self.selected_shape = nil

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -46,7 +46,7 @@ class HelloAnimationDataBinding
           digits 3
           minimum 1
           maximum 100
-          selection bind(self, :delay_time, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f})
+          selection <=> [self, :delay_time, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f}]
         }
         animation {
           every bind(self, :delay_time)

data/samples/hello/hello_canvas_data_binding.rb

@@ -81,7 +81,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_WIDTH
             increment 3
-            selection bind(self, :x1_value)
+            selection <=> [self, :x1_value]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -89,7 +89,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_HEIGHT
             increment 3
-            selection bind(self, :y1_value)
+            selection <=> [self, :y1_value]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -109,7 +109,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_WIDTH
             increment 3
-            selection bind(self, :x2_value)
+            selection <=> [self, :x2_value]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -117,7 +117,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_HEIGHT
             increment 3
-            selection bind(self, :y2_value)
+            selection <=> [self, :y2_value]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -143,7 +143,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_red)
+            selection <=> [self, :foreground_red]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -151,7 +151,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_green)
+            selection <=> [self, :foreground_green]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -159,7 +159,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_blue)
+            selection <=> [self, :foreground_blue]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -178,13 +178,13 @@ class HelloCanvasDataBinding
               horizontal_span 3
             }
             maximum 255
-            selection bind(self, :line_width_value)
+            selection <=> [self, :line_width_value]
           }
           combo(:read_only) {
             layout_data(:fill, :center, false, false) {
               horizontal_span 3
             }
-            selection bind(self, :line_style_value)
+            selection <=> [self, :line_style_value]
           }
           canvas {
             layout_data(:center, :center, false, false) {
@@ -195,13 +195,13 @@ class HelloCanvasDataBinding
             background :white
             
             line {
-              x1 bind(self, :x1_value)
-              y1 bind(self, :y1_value)
-              x2 bind(self, :x2_value)
-              y2 bind(self, :y2_value)
-              foreground bind(self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue])
-              line_width bind(self, :line_width_value)
-              line_style bind(self, :line_style_value)
+              x1 <=> [self, :x1_value]
+              y1 <=> [self, :y1_value]
+              x2 <=> [self, :x2_value]
+              y2 <=> [self, :y2_value]
+              foreground <=> [self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue]]
+              line_width <=> [self, :line_width_value]
+              line_style <=> [self, :line_style_value]
             }
           }
         }

data/samples/hello/hello_checkbox.rb

@@ -56,22 +56,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]
         }
       }