glimmer-dsl-swt 4.19.0.1 → 4.20.0.3

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

@@ -46,6 +46,7 @@ class HelloShape
   }
   
   # method-based custom shape using `shape` keyword as a composite shape containing nested shapes
+  # See HelloCustomShape sample for a class-based custom shape alternative that enables extracting custom shape to a separate class/file
   def stick_figure(x, y, width, height, &block)
     head_width = width*0.2
     head_height = height*0.2

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