glimmer-dsl-swt 4.19.0.2 → 4.20.0.4

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

@@ -0,0 +1,71 @@
+# 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 'glimmer-dsl-swt'
+
+class HelloComposite
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      # shell (which is a composite) has fill_layout(:horizontal) by default with no margins
+      # we override below
+      fill_layout(:vertical)
+      text 'Hello, Composite!'
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        # it has grid_layout(1, false) as its default layout
+        label {
+          text "Field is above its text widget"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, true
+        
+        label {
+          text "Field has equal width to its text widget's"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, false
+        
+        label {
+          text "Field has inequal width"
+        }
+        
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+    }
+  
+  }
+end
+
+HelloComposite.launch

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

@@ -0,0 +1,147 @@
+# 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 'glimmer-dsl-swt'
+
+class HelloCoolBar
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :operation, :font_size
+  
+  def font_size_options
+    (10..30).to_a.map(&:to_s)
+  end
+  
+  before_body {
+    self.font_size = '10'
+  }
+
+  body {
+    shell {
+      fill_layout(:vertical) {
+        margin_width 0
+        margin_height 0
+      }
+      
+      text 'Hello, Cool Bar!'
+      
+      cool_bar { # optionally takes a :flat style and/or :vertical style if you need vertical layout
+        tool_bar {
+          tool_item {
+            image cut_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Cut'
+            end
+          }
+          tool_item {
+            image copy_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Copy'
+            end
+          }
+          tool_item {
+            image paste_image # alternatively you can pass an image file path
+            
+            on_widget_selected do
+              self.operation = 'Paste'
+            end
+          }
+        }
+        tool_bar {
+          tool_item {
+            text 'Font Size'
+          }
+          # 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)
+          }
+        }
+      }
+      
+  
+      label {
+        font height: 30
+        text bind(self, :operation)
+        text bind(self, :font_size)
+      }
+    }
+  }
+  
+  def cut_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        line(20, 2, 9, 15) {
+          line_width 2
+        }
+        line(5, 2, 16, 15) {
+          line_width 2
+        }
+        oval(2, 15, 8, 8) {
+          line_width 2
+        }
+        oval(16, 15, 8, 8) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def copy_image
+    # building image on the fly with Canvas Shape DSL
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
+          line_width 2
+        }
+        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
+          line_width 2
+        }
+      }
+    }
+  end
+  
+  def paste_image
+    image(25, 25) {
+      rectangle(0, 0, 25, 25) {
+        background_pattern 0, 0, 0, 25, :white, :gray
+        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
+          line_width 2
+        }
+        line(7, 8, 18, 8) {
+          line_width 2
+        }
+        line(7, 13, 18, 13) {
+          line_width 2
+        }
+        line(7, 18, 18, 18) {
+          line_width 2
+        }
+      }
+    }
+  end
+end
+
+HelloCoolBar.launch

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 {