glimmer-dsl-swt 4.20.2.1 → 4.20.4.2

data/samples/elaborate/tetris/view/block.rb

@@ -31,7 +31,7 @@ class Tetris
       body {
         canvas { |canvas_proxy|
           bevel(size: block_size) {
-            base_color bind(game_playfield[row][column], :color)
+            base_color <= [game_playfield[row][column], :color]
           }
         }
       }

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -45,7 +45,7 @@ class Tetris
           tetris_menu_bar(game: game)
           
           label(:center) {
-            text bind(game, :game_over) {|game_over| game_over ? 'Game Over!' : 'High Scores'}
+            text <= [game, :game_over, on_read: ->(game_over) { game_over ? 'Game Over!' : 'High Scores' }]
             font name: FONT_NAME, height: FONT_TITLE_HEIGHT, style: FONT_TITLE_STYLE
           }
           @high_score_table = table {
@@ -66,13 +66,13 @@ class Tetris
               text 'Level'
             }
             
-            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
+            items <=> [game, :high_scores, read_only_sort: true, column_properties: [:name, :score, :lines, :level]]
           }
           composite {
             row_layout :horizontal
                         
             @play_close_button = button {
-              text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
+              text <= [game, :game_over, on_read: ->(game_over) { game_over ? 'Play Again?' : 'Close'}]
               focus true # initial focus
               
               on_widget_selected {

data/samples/elaborate/tetris/view/score_lane.rb

@@ -55,7 +55,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :score)
+            text <= [game, :score]
             font height: @font_height
           }
           
@@ -66,7 +66,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :lines)
+            text <= [game, :lines]
             font height: @font_height
           }
           
@@ -77,7 +77,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :level)
+            text <= [game, :level]
             font height: @font_height
           }
         }

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -35,7 +35,7 @@ class Tetris
             
             menu_item {
               text '&Start'
-              enabled bind(game, :game_over)
+              enabled <= [game, :game_over]
               accelerator COMMAND_KEY, :s
               
               on_widget_selected {
@@ -45,9 +45,9 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator COMMAND_KEY, :p
-              enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
-              enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
-              selection bind(game, :paused)
+              enabled <= [game, :game_over, on_read: ->(value) { value && !game.show_high_scores }]
+              enabled <= [game, :show_high_scores, on_read: ->(value) { value && !game.game_over }]
+              selection <=> [game, :paused]
             }
             menu_item {
               text '&Restart'
@@ -76,7 +76,7 @@ class Tetris
               menu_item(:check) {
                 text '&Show'
                 accelerator COMMAND_KEY, :shift, :h
-                selection bind(game, :show_high_scores)
+                selection <=> [game, :show_high_scores]
               }
               menu_item {
                 text '&Clear'
@@ -94,24 +94,24 @@ class Tetris
             menu_item(:check) {
               text '&Beeping'
               accelerator COMMAND_KEY, :b
-              selection bind(game, :beeping)
+              selection <=> [game, :beeping]
             }
             menu {
               text 'Up Arrow'
               menu_item(:radio) {
                 text '&Instant Down'
                 accelerator COMMAND_KEY, :shift, :i
-                selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :instant_down_on_up, computed_by: :up_arrow_action]
               }
               menu_item(:radio) {
                 text 'Rotate &Right'
                 accelerator COMMAND_KEY, :shift, :r
-                selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :rotate_right_on_up, computed_by: :up_arrow_action]
               }
               menu_item(:radio) {
                 text 'Rotate &Left'
                 accelerator COMMAND_KEY, :shift, :l
-                selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :rotate_left_on_up, computed_by: :up_arrow_action]
               }
             }
           } # end of menu

data/samples/elaborate/timer.rb

@@ -6,7 +6,7 @@ class Timer
   
   import 'javax.sound.sampled'
 
-  FILE_SOUND_ALARM = File.expand_path(File.join('timer', 'alarm1.wav'), __dir__)
+  FILE_SOUND_ALARM = File.expand_path(File.join('timer', 'sounds', 'alarm1.wav'), __dir__)
   COMMAND_KEY = OS.mac? ? :command : :ctrl
       
   ## Add options like the following to configure CustomShell by outside consumers
@@ -84,7 +84,7 @@ class Timer
         menu_item {
           text '&Start'
           accelerator COMMAND_KEY, 's'
-          enabled bind(self, :countdown, on_read: :!)
+          enabled <= [self, :countdown, on_read: :!]
           
           on_widget_selected {
             start_countdown
@@ -92,7 +92,7 @@ class Timer
         }
         menu_item {
           text 'St&op'
-          enabled bind(self, :countdown)
+          enabled <= [self, :countdown]
           accelerator COMMAND_KEY, 'o'
           
           on_widget_selected {
@@ -148,8 +148,8 @@ class Timer
         text_limit 2
         digits 0
         maximum 59
-        selection bind(self, :min)
-        enabled bind(self, :countdown, on_read: :!)
+        selection <=> [self, :min]
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_default_selected {
           start_countdown
         }
@@ -162,8 +162,8 @@ class Timer
         text_limit 2
         digits 0
         maximum 59
-        selection bind(self, :sec)
-        enabled bind(self, :countdown, on_read: :!)
+        selection <=> [self, :sec]
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_default_selected {
           start_countdown
         }
@@ -179,7 +179,7 @@ class Timer
       }
       @start_button = button {
         text '&Start'
-        enabled bind(self, :countdown, on_read: :!)
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_selected {
           start_countdown
         }
@@ -189,7 +189,7 @@ class Timer
       }
       @stop_button = button {
         text 'St&op'
-        enabled bind(self, :countdown)
+        enabled <= [self, :countdown]
         on_widget_selected {
           stop_countdown
         }

data/samples/elaborate/weather.rb

@@ -29,6 +29,7 @@ class Weather
   
   DEFAULT_FONT_HEIGHT = 30
   DEFAULT_FOREGROUND = :white
+  DEFAULT_BACKGROUND = rgb(135, 176, 235)
   
   attr_accessor :city, :temp, :temp_min, :temp_max, :feels_like, :humidity
   
@@ -54,7 +55,7 @@ class Weather
             
       text 'Glimmer Weather'
       minimum_size 400, 300
-      background rgb(135, 176, 235)
+      background DEFAULT_BACKGROUND
       
       text {
         layout_data(:center, :center, true, true)
@@ -78,7 +79,7 @@ class Weather
             grid_layout 2, false
             
             text temp_unit
-            background :transparent
+            background DEFAULT_BACKGROUND
             
             rectangle(0, 0, [:default, -2], [:default, -2], 15, 15) {
               foreground DEFAULT_FOREGROUND
@@ -128,8 +129,8 @@ class 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
+  rescue => e
+    Glimmer::Config.logger.error "Unable to fetch weather due to error: #{e.full_message}"
   end
   
   def weather_data=(data)
@@ -148,14 +149,17 @@ class Weather
   end
   
   def kelvin_to_celsius(kelvin)
+    return nil if kelvin.nil?
     kelvin - 273.15
   end
   
   def celsius_to_fahrenheit(celsius)
+    return nil if celsius.nil?
     (celsius * 9 / 5 ) + 32
   end
   
   def kelvin_to_fahrenheit(kelvin)
+    return nil if kelvin.nil?
     celsius_to_fahrenheit(kelvin_to_celsius(kelvin))
   end
   

data/samples/hello/hello_c_tab.rb

@@ -44,7 +44,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/usa.png', __dir__)
+          image File.expand_path('images/usa.png', __dir__)
           
           label {
             text 'Hello, World!'
@@ -58,7 +58,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/france.png', __dir__)
+          image File.expand_path('images/france.png', __dir__)
           
           label {
             text 'Bonjour, Univers!'
@@ -72,7 +72,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/mexico.png', __dir__)
+          image File.expand_path('images/mexico.png', __dir__)
           
           label {
             text 'Hola, Mundo!'
@@ -86,7 +86,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/germany.png', __dir__)
+          image File.expand_path('images/germany.png', __dir__)
 
           label {
             text 'Hallo, Welt!'
@@ -100,7 +100,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/italy.png', __dir__)
+          image File.expand_path('images/italy.png', __dir__)
 
           label {
             text 'Ciao, Mondo!'
@@ -114,7 +114,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/netherlands.png', __dir__)
+          image File.expand_path('images/netherlands.png', __dir__)
 
           label {
             text 'Hallo, Wereld!'
@@ -128,7 +128,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/denmark.png', __dir__)
+          image File.expand_path('images/denmark.png', __dir__)
 
           label {
             text 'Hej, Verden!'
@@ -142,7 +142,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/finland.png', __dir__)
+          image File.expand_path('images/finland.png', __dir__)
 
           label {
             text 'Hei, Maailma!'
@@ -156,7 +156,7 @@ class HelloCTab
           foreground :blue
           selection_foreground :dark_blue
           font name: 'Times New Roman', height: 30, style: [:bold, :italic]
-          image File.expand_path('hello_c_tab/norway.png', __dir__)
+          image File.expand_path('images/norway.png', __dir__)
 
           label {
             text 'Hei, Verden!'

data/samples/hello/hello_checkbox_group.rb

@@ -58,7 +58,7 @@ class HelloCheckboxGroup
       }
       
       checkbox_group {
-        selection bind(@person, :activities)
+        selection <=> [@person, :activities]
       }
     
       button {

data/samples/hello/hello_code_text.rb

@@ -85,7 +85,7 @@ class HelloCodeText
           fill_layout
           text 'Ruby (glimmer theme)'
           code_text(language: 'ruby', theme: 'glimmer', lines: true) {
-            text bind(self, :ruby_code)
+            text <=> [self, :ruby_code]
           }
         }
         tab_item {
@@ -101,14 +101,14 @@ class HelloCodeText
             line_numbers {
               background :white
             }
-            text bind(self, :js_code)
+            text <=> [self, :js_code]
           }
         }
         tab_item {
           fill_layout
           text 'HTML (github theme)'
           code_text(language: 'html', theme: 'github') { # default is lines: false
-            text bind(self, :html_code)
+            text <=> [self, :html_code]
           }
         }
       }

data/samples/hello/hello_computed.rb

@@ -21,9 +21,27 @@
 
 require 'glimmer-dsl-swt'
 
-require_relative 'hello_computed/contact'
-
 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
+
   include Glimmer::UI::CustomShell
 
   before_body {

data/samples/hello/hello_cool_bar.rb

@@ -73,7 +73,7 @@ class HelloCoolBar
           }
           # 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_cursor.rb

@@ -51,7 +51,7 @@ class HelloCursor
       }
       radio_group {
         grid_layout 5, true
-        selection bind(self, :selected_cursor)
+        selection <=> [self, :selected_cursor]
       }
     }
   }

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 <= [@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