glimmer-dsl-swt 4.18.7.6 → 4.20.0.0

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]
         }
       }
       

data/samples/hello/hello_code_text.rb

@@ -83,47 +83,14 @@ class HelloCodeText
       tab_folder {
         tab_item {
           fill_layout
-          text 'Ruby (glimmer)'
+          text 'Ruby (glimmer theme)'
           code_text(language: 'ruby', theme: 'glimmer', lines: true) {
             text bind(self, :ruby_code)
           }
         }
         tab_item {
           fill_layout
-          text 'Ruby (pastie)'
-          code_text(language: 'ruby', theme: 'pastie', lines: {width: 2}) {
-            text bind(self, :ruby_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'Ruby (github)'
-          code_text(language: 'ruby', theme: 'github', lines: false) {
-            text bind(self, :ruby_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'JavaScript (glimmer)'
-          # No border (SWT styles are passed explicitly)
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer', lines: true) {
-            # With lines, the custom widget has a root composite, which can be configured separately
-            root {
-              grid_layout(2, false) {
-                margin_width 2
-              }
-              background :white
-            }
-            # With lines, the line numbers widget can be configured separately
-            line_numbers {
-              background :white
-            }
-            text bind(self, :js_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'JavaScript (pastie)'
+          text 'JavaScript (pastie theme)'
           code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
             root {
               grid_layout(2, false) {
@@ -139,28 +106,7 @@ class HelloCodeText
         }
         tab_item {
           fill_layout
-          text 'JavaScript (github)'
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'github') { # default is lines: false
-            text bind(self, :js_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (glimmer)'
-          code_text(language: 'html', theme: 'glimmer', lines: true) {
-            text bind(self, :html_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (pastie)'
-          code_text(language: 'html', theme: 'pastie', lines: {width: 2}) {
-            text bind(self, :html_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (github)'
+          text 'HTML (github theme)'
           code_text(language: 'html', theme: 'github') { # default is lines: false
             text bind(self, :html_code)
           }

data/samples/hello/hello_color_dialog.rb

@@ -45,7 +45,7 @@ class HelloColorDialog
       
       canvas(:border) {
         layout_data :center, :center, true, false
-        background bind(self, :selected_color)
+        background <=> [self, :selected_color]
         
         on_mouse_up {
           self.selected_color = color_dialog.open

data/samples/hello/hello_combo.rb

@@ -50,7 +50,7 @@ class HelloCombo
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        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_computed.rb

@@ -48,7 +48,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
@@ -57,7 +57,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
@@ -66,7 +66,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
@@ -75,7 +75,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
@@ -84,7 +84,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/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 {