glimmer-dsl-swt 4.20.0.4 → 4.20.3.0

data/samples/elaborate/user_profile.rb

@@ -23,7 +23,9 @@ require 'glimmer-dsl-swt'
 
 include Glimmer
 
-shell {
+# A version of this was featured in a dzone article as an intro to Glimmer syntax:
+# https://dzone.com/articles/an-introduction-glimmer
+shell { |shell_proxy|
   text "User Profile"
 
   composite {
@@ -72,7 +74,7 @@ shell {
     button {
       text "close"
       layout_data :left, :center, true, true
-      on_widget_selected { exit(0) }
+      on_widget_selected { shell_proxy.close }
     }
   }
 }.open

data/samples/elaborate/weather.rb

@@ -19,10 +19,10 @@
 # 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'
 require 'net/http'
 require 'json'
 require 'facets/string/titlecase'
-require 'glimmer-dsl-swt'
 
 class Weather
   include Glimmer::UI::CustomShell

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -49,7 +49,7 @@ class HelloAnimationDataBinding
           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)
+          every <= [self, :delay_time]
           
           frame { |index|
             background rgb(index%100, index%100 + 100, index%55 + 200)

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

@@ -31,7 +31,7 @@ class HelloCoolBar
   end
   
   before_body {
-    self.font_size = '10'
+    self.font_size = '30'
   }
 
   body {
@@ -73,16 +73,16 @@ 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]
           }
         }
       }
       
   
       label {
-        font height: 30
-        text bind(self, :operation)
-        text bind(self, :font_size)
+        font <= [self, :font_size, on_read: ->(size) { {height: size.to_i} }]
+        text <= [self, :operation]
+        text <= [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

@@ -138,7 +138,7 @@ 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

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

@@ -206,7 +206,7 @@ class HelloTable
       
       combo(:read_only) {
         layout_data :center, :center, true, false
-        selection bind(BaseballGame, :playoff_type)
+        selection <=> [BaseballGame, :playoff_type]
         font height: 14
       }
       
@@ -247,10 +247,10 @@ class HelloTable
         }
         
         # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-        items bind(BaseballGame, :schedule), column_properties(:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion)
+        items <=> [BaseballGame, :schedule, column_properties: [:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion]]
         
         # Data-bind table selection
-        selection bind(BaseballGame, :selected_game)
+        selection <=> [BaseballGame, :selected_game]
         
         # Default initial sort property
         sort_property :date
@@ -273,7 +273,7 @@ class HelloTable
         text 'Book Selected Game'
         layout_data :center, :center, true, false
         font height: 14
-        enabled bind(BaseballGame, :selected_game)
+        enabled <= [BaseballGame, :selected_game]
         
         on_widget_selected {
           book_selected_game

data/samples/hello/hello_text.rb

@@ -0,0 +1,120 @@
+require 'glimmer-dsl-swt'
+
+class HelloText
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :default, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
+  
+  before_body {
+    self.default = 'default is :border style'
+    self.center = 'centered'
+    self.left = 'left-aligned'
+    self.right = 'right-aligned'
+    self.password = 'password'
+    self.telephone = '555-555-5555'
+    self.read_only = 'Telephone area code is 555'
+    self.wrap = 'wraps if text content is too long like this example'
+    self.multi = "multi-line enables hitting enter,\nbut does not wrap by default"
+  }
+  
+  body {
+    shell {
+      grid_layout 2, false
+      
+      text 'Hello, Text!'
+      minimum_size 350, 100
+      
+      label {
+        text 'text'
+      }
+      text { # includes :border style by default
+        layout_data :fill, :center, true, false
+        text <=> [self, :default]
+      }
+      
+      label {
+        text 'text(:center, :border)'
+      }
+      text(:center, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :center]
+      }
+      
+      label {
+        text 'text(:left, :border)'
+      }
+      text(:left, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :left]
+      }
+      
+      label {
+        text 'text(:right, :border)'
+      }
+      text(:right, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :right]
+      }
+      
+      label {
+        text 'text(:password, :border)'
+      }
+      text(:password, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :password]
+      }
+      
+      label {
+        text 'text(:read_only, :border)'
+      }
+      text(:read_only, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :read_only]
+      }
+      
+      label {
+        text 'text with event handlers'
+      }
+      text {
+        layout_data :fill, :center, true, false
+        text <=> [self, :telephone]
+        
+        # this event kicks in just after the user typed and before modifying the text attribute value
+        on_verify_text do |verify_event|
+          new_text = verify_event.widget.text.clone
+          new_text[verify_event.start...verify_event.end] = verify_event.text
+          verify_event.doit = telephone?(new_text)
+        end
+        
+        # this event kicks in just after the text widget is verified and modified
+        on_modify_text do |modify_event|
+          self.read_only = "Telephone area code is #{modify_event.widget.text.gsub(/[^0-9]/, '')[0...3]}"
+        end
+      }
+      
+      label {
+        text 'text(:wrap, :border)'
+      }
+      text(:wrap, :border) {
+        layout_data(:fill, :center, true, false) {
+          width_hint 100
+        }
+        text <=> [self, :wrap]
+      }
+      
+      label {
+        text 'text(:multi, :border)'
+      }
+      text(:multi, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :multi]
+      }
+    }
+  }
+  
+  def telephone?(text)
+    !!text.match(/^\d{0,3}[-.\/]?\d{0,3}[-.\/]?\d{0,4}$/)
+  end
+end
+
+HelloText.launch

data/samples/hello/hello_tool_bar.rb

@@ -31,7 +31,7 @@ class HelloToolBar
   end
   
   before_body {
-    self.font_size = '10'
+    self.font_size = '30'
   }
 
   body {
@@ -71,14 +71,14 @@ 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]
         }
       }
   
       label {
-        font height: 30
-        text bind(self, :operation)
-        text bind(self, :font_size)
+        font <= [self, :font_size, on_read: ->(size) { {height: size.to_i} }]
+        text <= [self, :operation]
+        text <= [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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.0.4
+  version: 4.20.3.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -505,6 +505,19 @@ files:
 - lib/glimmer/ui/custom_shell.rb
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/util/proc_tracker.rb
+- samples/elaborate/calculator.rb
+- samples/elaborate/calculator/model/command.rb
+- samples/elaborate/calculator/model/command/all_clear.rb
+- samples/elaborate/calculator/model/command/command_history.rb
+- samples/elaborate/calculator/model/command/equals.rb
+- samples/elaborate/calculator/model/command/number.rb
+- samples/elaborate/calculator/model/command/operation.rb
+- samples/elaborate/calculator/model/command/operation/add.rb
+- samples/elaborate/calculator/model/command/operation/divide.rb
+- samples/elaborate/calculator/model/command/operation/multiply.rb
+- samples/elaborate/calculator/model/command/operation/subtract.rb
+- samples/elaborate/calculator/model/command/point.rb
+- samples/elaborate/calculator/model/presenter.rb
 - samples/elaborate/contact_manager.rb
 - samples/elaborate/contact_manager/contact.rb
 - samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -528,6 +541,9 @@ files:
 - samples/elaborate/tic_tac_toe.rb
 - 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
 - samples/hello/hello_browser.rb
@@ -588,6 +604,7 @@ files:
 - samples/hello/hello_tab.rb
 - samples/hello/hello_table.rb
 - samples/hello/hello_table/baseball_park.png
+- samples/hello/hello_text.rb
 - samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb