glimmer-dsl-swt 4.19.0.2 → 4.20.0.0

data/samples/hello/hello_custom_widget.rb

@@ -55,7 +55,7 @@ class GreetingLabel
     label(swt_style) {
       text "#{greeting}, #{name}!"
       font @font
-      foreground bind(self, :color)
+      foreground <=> [self, :color]
     }
   }
   

data/samples/hello/hello_date_time.rb

@@ -46,19 +46,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]
       }
     }
   }

data/samples/hello/hello_dialog.rb

@@ -23,7 +23,7 @@ require 'glimmer-dsl-swt'
 
 include Glimmer
 
-shell {
+shell { |shell_proxy|
   row_layout :vertical
   
   text 'Hello, Dialog!'
@@ -39,7 +39,8 @@ shell {
       text "Dialog #{dialog_number}"
       
       on_widget_selected {
-        dialog { |dialog_proxy|
+        # pass the shell proxy as a parent to make the dialog support hitting the escape button for closing alone without closing app
+        dialog(shell_proxy) { |dialog_proxy|
           row_layout(:vertical) {
             center true
           }

data/samples/hello/hello_drag_and_drop.rb

@@ -36,7 +36,7 @@ include Glimmer
 shell {
   text 'Hello, Drag and Drop!'
   list {
-    selection bind(@location, :country)
+    selection <=> [@location, :country]
     on_drag_set_data { |event|
       list = event.widget.getControl
       event.data = list.getSelection.first

data/samples/hello/hello_file_dialog.rb

@@ -44,7 +44,7 @@ class HelloFileDialog
       
       label {
         layout_data :fill, :center, true, false
-        text bind(self, :selected_file)
+        text <=> [self, :selected_file]
         font height: 14
       }
       

data/samples/hello/hello_font_dialog.rb

@@ -51,8 +51,8 @@ class HelloFontDialog
           height_hint 200
         }
         background :white
-        font bind(self, 'selected_font_data')
-        text bind(self, 'selected_font_data') {|font_data|
+        font <=> [self, 'selected_font_data']
+        text <=> [self, 'selected_font_data', on_read: ->(font_data) {
           style = case font_data.style
           when swt(:normal)
             'Normal'
@@ -64,7 +64,7 @@ class HelloFontDialog
             'Bold Italic'
           end
           "#{font_data.name}\n#{font_data.height}\n#{style}"
-        }
+        }]
       }
       
       button {

data/samples/hello/hello_group.rb

@@ -58,12 +58,12 @@ class HelloGroup
         
         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 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/samples/hello/hello_link.rb

@@ -21,62 +21,68 @@
 
 require 'glimmer-dsl-swt'
 
-include Glimmer
-
-shell { |main_shell|
-  grid_layout {
-    margin_width 20
-    margin_height 10
-  }
+class HelloLink
+  include Glimmer::UI::CustomShell
   
-  background :white
-  text 'Hello, Link!'
-  
-  @link = link {
-    background :white
-    link_foreground :dark_green
-    font height: 16
-    text <<~MULTI_LINE_STRING
-    
-      You may click on any <a>link</a> to get help.
+  body {
+    shell { |main_shell|
+      grid_layout {
+        margin_width 20
+        margin_height 10
+      }
       
-      How do you know <a href="which-link-href-value">which link</a> you clicked?
+      background :white
+      text 'Hello, Link!'
       
-      Just keep clicking <a href="all links">links</a> to find out!
-    MULTI_LINE_STRING
+      @link = link {
+        background :white
+        link_foreground :dark_green
+        font height: 16
+        text <<~MULTI_LINE_STRING
         
-    on_widget_selected { |selection_event|
-      # This retrieves the clicked link href (or contained text if no href is set)
-      @selected_link = selection_event.text
-    }
-    on_mouse_up { |mouse_event|
-      unless @selected_link.nil?
-        @help_shell.close unless @help_shell.nil? || @help_shell.disposed?
-        @help_shell = shell(:no_trim) {
-          grid_layout {
-            margin_width 10
-            margin_height 10
-          }
+          You may click on any <a>link</a> to get help.
           
-          background :yellow
+          How do you know <a href="which-link-href-value">which link</a> you clicked?
           
-          label {
-            background :yellow
-            text "Did someone ask for help about \"#{@selected_link}\"?\nYou don't really need help. You did it!"
-          }
-          
-          on_swt_show {
-            x = main_shell.location.x + @link.location.x + mouse_event.x
-            y = main_shell.location.y + @link.location.y + mouse_event.y + 20
-            @help_shell.location = Point.new(x, y)
-          }
-          on_focus_lost {
-            @selected_link = nil
-            @help_shell.close
-          }
+          Just keep clicking <a href="all links">links</a> to find out!
+        MULTI_LINE_STRING
+            
+        on_widget_selected { |selection_event|
+          # This retrieves the clicked link href (or contained text if no href is set)
+          @selected_link = selection_event.text
+        }
+        on_mouse_up { |mouse_event|
+          unless @selected_link.nil?
+            @help_shell.close unless @help_shell.nil? || @help_shell.disposed?
+            @help_shell = shell(:no_trim) {
+              grid_layout {
+                margin_width 10
+                margin_height 10
+              }
+              
+              background :yellow
+              
+              label {
+                background :yellow
+                text "Did someone ask for help about \"#{@selected_link}\"?\nYou don't really need help. You did it!"
+              }
+              
+              on_swt_show {
+                x = main_shell.location.x + @link.location.x + mouse_event.x
+                y = main_shell.location.y + @link.location.y + mouse_event.y + 20
+                @help_shell.location = Point.new(x, y)
+              }
+              on_focus_lost {
+                @selected_link = nil
+                @help_shell.close
+              }
+            }
+            @help_shell.open
+          end
         }
-        @help_shell.open
-      end
+      }
     }
   }
-}.open
+end
+
+HelloLink.launch

data/samples/hello/hello_list_multi_selection.rb

@@ -63,7 +63,7 @@ class HelloListMultiSelection
       text 'Hello, List Multi Selection!'
       
       list(:multi) {
-        selection bind(@person, :provinces) # also binds to provinces_options by convention
+        selection <=> [@person, :provinces] # also binds to provinces_options by convention
       }
       
       button {

data/samples/hello/hello_list_single_selection.rb

@@ -48,7 +48,7 @@ class HelloListSingleSelection
       text 'Hello, List Single Selection!'
       
       list {
-        selection bind(@person, :country) # also binds to country_options by convention
+        selection <=> [@person, :country] # also binds to country_options by convention
       }
       
       button {

data/samples/hello/hello_progress_bar.rb

@@ -65,40 +65,40 @@ class HelloProgressBar
       }
       
       spinner {
-        selection bind(@progress_model, :minimum)
+        selection <=> [@progress_model, :minimum]
       }
       
       spinner {
-        selection bind(@progress_model, :maximum)
+        selection <=> [@progress_model, :maximum]
       }
       
       spinner {
-        selection bind(@progress_model, :selection)
+        selection <=> [@progress_model, :selection]
       }
         
       spinner {
         digits 2
         minimum 1
         maximum 200
-        selection bind(@progress_model, :delay, on_read: ->(v) {v.to_f*100.0}, on_write: ->(v) {v.to_f/100.0})
+        selection <=> [@progress_model, :delay, on_read: ->(v) {v.to_f*100.0}, on_write: ->(v) {v.to_f/100.0}]
       }
           
       progress_bar {
         layout_data(:fill, :center, true, false) {
           horizontal_span 4
         }
-        minimum bind(@progress_model, :minimum)
-        maximum bind(@progress_model, :maximum)
-        selection bind(@progress_model, :selection)
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
       }
       
       progress_bar(:vertical) {
         layout_data(:fill, :center, true, false) {
           horizontal_span 4
         }
-        minimum bind(@progress_model, :minimum)
-        maximum bind(@progress_model, :maximum)
-        selection bind(@progress_model, :selection)
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
       }
       
       button {

data/samples/hello/hello_radio.rb

@@ -60,12 +60,12 @@ class HelloRadio
         
         radio {
           text 'Male'
-          selection bind(@person, :male)
+          selection <=> [@person, :male]
         }
         
         radio {
           text 'Female'
-          selection bind(@person, :female)
+          selection <=> [@person, :female]
         }
       }
       
@@ -79,22 +79,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/samples/hello/hello_sash_form.rb

@@ -54,8 +54,8 @@ shell {
     layout_data(:fill, :fill, true, true) {
       height_hint 200
     }
-    sash_width bind(@presenter, :sash_width)
-    orientation bind(@presenter, :orientation_style)
+    sash_width <=> [@presenter, :sash_width]
+    orientation <=> [@presenter, :orientation_style]
     weights 1, 2
     
     @green_label = label {
@@ -86,7 +86,7 @@ shell {
       layout_data(:fill, :center, true, false) {
         width_hint 100
       }
-      selection bind(@presenter, :sash_width)
+      selection <=> [@presenter, :sash_width]
       font height: 16
     }
     
@@ -99,7 +99,7 @@ shell {
       layout_data(:fill, :center, true, false) {
         width_hint 100
       }
-      selection bind(@presenter, :orientation)
+      selection <=> [@presenter, :orientation]
       font height: 16
     }
     

data/samples/hello/hello_spinner.rb

@@ -47,6 +47,9 @@ class HelloSpinner
         grid_layout 3, false
         
         label {
+          layout_data {
+            width_hint 240
+          }
           text 'Amount:'
           font style: :bold
         }
@@ -61,11 +64,12 @@ class HelloSpinner
           maximum 15000 # maximum value (including digits after the decimal point)
           increment 500 # increment on up and down (including digits after the decimal point)
           page_increment 5000 # page increment on page up and page down (including digits after the decimal point)
-          selection bind(@person, :donation) # selection must be set last if other properties are configured to ensure value is within bounds
+          selection <=> [@person, :donation] # selection must be set last if other properties are configured to ensure value is within bounds
         }
         
         label {
-          text bind(@person, :donation) {|value| "Thank you for your donation of $#{"%.2f" % (value.to_f / 100.0)}"}
+          layout_data(:fill, :center, true, false)
+          text <=> [@person, :donation, on_read: ->(value) { "Thank you for your donation of $#{"%.2f" % (value.to_f / 100.0)}"}]
         }
 
       }

data/samples/hello/hello_styled_text.rb

@@ -49,7 +49,7 @@ end
 include Glimmer
 
 @presenter = StyledTextPresenter.new
-@presenter.text = verbiage*8
+@presenter.text = verbiage*4
 @presenter.caret_offset = 0
 @presenter.selection_count = 0
 @presenter.selection = Point.new(0, 0)
@@ -61,19 +61,19 @@ shell {
   composite {
     @styled_text = styled_text {
       layout_data :fill, :fill, true, true
-      text bind(@presenter, :text)
+      text <=> [@presenter, :text]
       left_margin 5
       top_margin 5
       right_margin 5
       bottom_margin 5
       # caret offset scrolls text to view when out of page
-      caret_offset bind(@presenter, :caret_offset)
+      caret_offset <=> [@presenter, :caret_offset]
       # selection_count is not needed if selection is used
-      selection_count bind(@presenter, :selection_count)
+      selection_count <=> [@presenter, :selection_count]
       # selection contains both caret_offset and selection_count, but setting it does not scroll text into view if out of page
-      selection bind(@presenter, :selection)
+      selection <=> [@presenter, :selection]
       # top_pixel indicates vertically what pixel scrolling is at in a long multi-page text document
-      top_pixel bind(@presenter, :top_pixel)
+      top_pixel <=> [@presenter, :top_pixel]
       
       # This demonstrates how to set styles via a listener
       on_line_get_style { |line_style_event|
@@ -109,31 +109,31 @@ shell {
         text 'Caret Offset:'
       }
       text {
-        text bind(@presenter, :caret_offset, on_read: ->(o) {"%04d" % [o] })
+        text <=> [@presenter, :caret_offset, on_read: ->(o) {"%04d" % [o] }]
       }
       label {
         text 'Selection Count:'
       }
       text {
-        text bind(@presenter, :selection_count, on_read: ->(o) {"%04d" % [o] })
+        text <=> [@presenter, :selection_count, on_read: ->(o) {"%04d" % [o] }]
       }
       label {
         text 'Selection Start:'
       }
       text {
-        text bind(@presenter, 'selection.x', on_read: ->(o) {"%04d" % [o] })
+        text <=> [@presenter, 'selection.x', on_read: ->(o) {"%04d" % [o] }]
       }
       label {
         text 'Selection End:'
       }
       text {
-        text bind(@presenter, 'selection.y', on_read: ->(o) {"%04d" % [o] })
+        text <=> [@presenter, 'selection.y', on_read: ->(o) {"%04d" % [o] }]
       }
       label {
         text 'Top Pixel:'
       }
       text {
-        text bind(@presenter, :top_pixel, on_read: ->(o) {"%04d" % [o] })
+        text <=> [@presenter, :top_pixel, on_read: ->(o) {"%04d" % [o] }]
       }
     }
   }