glimmer-dsl-swt 4.19.0.2 → 4.20.0.4

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

@@ -0,0 +1,205 @@
+# 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 HelloShell
+  include Glimmer::UI::CustomShell
+  
+  body {
+    # this is the initial shell that opens. If you close it, you close the app.
+    shell { |root_shell_proxy|
+      row_layout(:vertical)
+      text 'Hello, Shell!'
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Nested Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Nested Shell'
+            
+            label {
+              font height: 20
+              text "Since this shell is nested, \nyou can hit ESC to close"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Independent Shell"
+        
+        on_widget_selected {
+          # build an independent shell, meaning a shell that is independent of its parent
+          shell {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Independent Shell'
+            
+            label {
+              font height: 20
+              text "Since this shell is independent, \nyou cannot close by hitting ESC"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Close-Button Shell"
+        
+        on_widget_selected {
+          shell(:close) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Nested Shell'
+            
+            label {
+              font height: 20
+              text "Shell with close button only\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Minimize-Button Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy, :min) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Minimize-Button Shell'
+            
+            label {
+              font height: 20
+              text "Shell with minimize button only\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Maximize-Button Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy, :max) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Maximize-Button Shell'
+            
+            label {
+              font height: 20
+              text "Shell with maximize button only\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Buttonless Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy, :title) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Buttonless Shell'
+            
+            label {
+              font height: 20
+              text "Buttonless shell (title only)\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "No Trim Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy, :no_trim) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'No Trim Shell'
+            
+            label {
+              font height: 20
+              text "No trim shell, meaning no buttons or title bar.\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+      button {
+        layout_data {
+          width 200
+          height 50
+        }
+        text "Always On Top Shell"
+        
+        on_widget_selected {
+          # build a nested shell, meaning a shell that specifies its parent shell (root_shell_proxy)
+          shell(root_shell_proxy, :on_top) {
+            # shell has fill_layout(:horizontal) by default with no margins
+            text 'Always On Top Shell'
+            
+            label {
+              font height: 20
+              text "Always on top shell.\n(varies per platform)"
+            }
+          }.open
+        }
+      }
+        
+    }
+  
+  }
+end
+
+HelloShell.launch

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

data/samples/hello/hello_tool_bar.rb

@@ -0,0 +1,143 @@
+# 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 HelloToolBar
+  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, Tool Bar!'
+      
+      tool_bar { # optionally takes a :flat style, :wrap style if you need wrapping upon shrinking window, and :vertical style if you need vertical layout
+        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_item(:separator)
+        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
+
+HelloToolBar.launch