glimmer-dsl-swt 4.18.4.11 → 4.18.5.0

data/samples/hello/hello_checkbox.rb

@@ -24,10 +24,10 @@ class HelloCheckbox
     attr_accessor :skiing, :snowboarding, :snowmobiling, :snowshoeing
     
     def initialize
-      reset_activities
+      reset_activities!
     end
     
-    def reset_activities
+    def reset_activities!
       self.skiing = false
       self.snowboarding = true
       self.snowmobiling = false
@@ -35,11 +35,13 @@ class HelloCheckbox
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Checkbox!'
       row_layout :vertical
@@ -52,22 +54,22 @@ class HelloCheckbox
       composite {
         checkbox {
           text 'Skiing'
-          selection bind(person, :skiing)
+          selection bind(@person, :skiing)
         }
         
         checkbox {
           text 'Snowboarding'
-          selection bind(person, :snowboarding)
+          selection bind(@person, :snowboarding)
         }
         
         checkbox {
           text 'Snowmobiling'
-          selection bind(person, :snowmobiling)
+          selection bind(@person, :snowmobiling)
         }
         
         checkbox {
           text 'Snowshoeing'
-          selection bind(person, :snowshoeing)
+          selection bind(@person, :snowshoeing)
         }
       }
       
@@ -75,11 +77,11 @@ class HelloCheckbox
         text 'Reset Activities'
         
         on_widget_selected do
-          person.reset_activities
+          @person.reset_activities!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCheckbox.new.launch
+HelloCheckbox.launch

data/samples/hello/hello_checkbox_group.rb

@@ -39,11 +39,13 @@ class HelloCheckboxGroup
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Checkbox Group!'
       row_layout :vertical
@@ -54,18 +56,18 @@ class HelloCheckboxGroup
       }
       
       checkbox_group {
-        selection bind(person, :activities)
+        selection bind(@person, :activities)
       }
     
       button {
         text 'Reset Activities'
         
         on_widget_selected do
-          person.reset_activities
+          @person.reset_activities
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCheckboxGroup.new.launch
+HelloCheckboxGroup.launch

data/samples/hello/hello_combo.rb

@@ -25,39 +25,41 @@ class HelloCombo
   
     def initialize
       self.country_options = ['', 'Canada', 'US', 'Mexico']
-      reset_country
+      reset_country!
     end
   
-    def reset_country
+    def reset_country!
       self.country = 'Canada'
     end
   end
 
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       row_layout(:vertical) {
-        pack false
+        fill true
       }
       
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        selection bind(person, :country) # also binds to country_options by convention
+        selection bind(@person, :country) # also binds to country_options by convention
       }
       
       button {
         text 'Reset Selection'
         
         on_widget_selected do
-          person.reset_country
+          @person.reset_country!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCombo.new.launch
+HelloCombo.launch

data/samples/hello/hello_computed.rb

@@ -22,17 +22,17 @@
 require_relative 'hello_computed/contact'
 
 class HelloComputed
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  end
+  }
 
-  def launch
+  body {
     shell {
       text 'Hello, Computed!'
       
@@ -89,8 +89,8 @@ class HelloComputed
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloComputed.new.launch
+HelloComputed.launch

data/samples/hello/hello_cursor.rb

@@ -24,8 +24,9 @@ class HelloCursor
   
   attr_accessor :selected_cursor
   
+  # This method matches the name of the :selected_cursor property by convention
   def selected_cursor_options
-    org.eclipse.swt.SWT.constants.select {|c| c.to_s.start_with?('CURSOR_')}.map {|c| c.to_s.sub('CURSOR_', '').downcase}
+    Glimmer::SWT::SWTProxy.cursor_options
   end
   
   after_body {

data/samples/hello/hello_custom_shell.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -24,10 +24,11 @@ require 'date'
 # This class declares an `email_shell` custom shell, aka custom window (by convention)
 # Used to view an email message
 class EmailShell
+  # including Glimmer::UI::CustomShell enables declaring as an `email_shell` custom widget Glimmer GUI DSL keyword
   include Glimmer::UI::CustomShell
   
-  # multiple options without default values  
-  options :date, :subject, :from, :message
+  # multiple options without default values
+  options :parent_shell, :date, :subject, :from, :message
   
   # single option with default value
   option :to, default: '"John Irwin" <john.irwin@example.com>'
@@ -38,10 +39,10 @@ class EmailShell
   
   body {
     # pass received swt_style through to shell to customize it (e.g. :dialog_trim for a blocking shell)
-    shell(swt_style) {
+    shell(parent_shell, swt_style) {
       grid_layout(2, false)
       
-      text subject      
+      text subject
 
       label {
         text 'Date:'
@@ -78,7 +79,7 @@ class EmailShell
         }
         
         background :white
-        text message        
+        text message
       }
     }
   }
@@ -86,13 +87,12 @@ class EmailShell
 end
 
 class HelloCustomShell
-  # including Glimmer enables the Glimmer DSL syntax, including auto-discovery of the `email_shell` custom widget
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
   EmailSystem = Struct.new(:emails, keyword_init: true)
   
-  def initialize
+  before_body {
     @email_system = EmailSystem.new(
       emails: [
         Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
@@ -103,9 +103,9 @@ class HelloCustomShell
         Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
       ]
     )
-  end
+  }
   
-  def launch
+  body {
     shell {
       grid_layout
       
@@ -141,15 +141,11 @@ class HelloCustomShell
         
         on_mouse_up { |event|
           email = event.table_item.get_data
-          Thread.new do
-            async_exec {
-              email_shell(date: email.date, subject: email.subject, from: email.from, message: email.message).open
-            }
-          end
+          email_shell(parent_shell: self, date: email.date, subject: email.subject, from: email.from, message: email.message).open
         }
       }
-    }.open
-  end  
+    }
+  }
 end
 
-HelloCustomShell.new.launch
+HelloCustomShell.launch

data/samples/hello/hello_custom_widget.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -42,9 +42,7 @@ class GreetingLabel
     
     Thread.new {
       colors.cycle { |color|
-        async_exec {
-          self.color = color
-        }
+        self.color = color
         sleep(1)
       }
     }

data/samples/hello/hello_date_time.rb

@@ -24,12 +24,14 @@ class HelloDateTime
     attr_accessor :date_of_birth
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
-    
+  before_body {
+    @person = Person.new
+    @person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
+  }
+  
+  body {
     shell {
       row_layout :vertical
       
@@ -42,22 +44,22 @@ class HelloDateTime
       }
       
       date { # alias for date_time(:date)
-        date_time bind(person, :date_of_birth)
+        date_time bind(@person, :date_of_birth)
       }
       
       date_drop_down { # alias for date_time(:date, :drop_down)
-        date_time bind(person, :date_of_birth)
+        date_time bind(@person, :date_of_birth)
       }
       
       time { # alias for date_time(:time)
-        date_time bind(person, :date_of_birth)
+        date_time bind(@person, :date_of_birth)
       }
       
       calendar { # alias for date_time(:calendar)
-        date_time bind(person, :date_of_birth)
+        date_time bind(@person, :date_of_birth)
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloDateTime.new.launch
+HelloDateTime.launch

data/samples/hello/hello_directory_dialog.rb

@@ -20,15 +20,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloDirectoryDialog
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
   attr_accessor :selected_directory
   
-  def initialize
+  before_body {
     @selected_directory = 'Please select a directory.'
-  end
+  }
   
-  def launch
+  body {
     shell {
       minimum_size 400, 0
       grid_layout
@@ -53,8 +53,8 @@ class HelloDirectoryDialog
           self.selected_directory = directory_dialog.open
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloDirectoryDialog.new.launch
+HelloDirectoryDialog.launch

data/samples/hello/hello_expand_bar.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -20,9 +20,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloExpandBar
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
+  body {
     shell {
       grid_layout(1, false) {
         margin_width 0
@@ -103,8 +103,8 @@ class HelloExpandBar
         }
         
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloExpandBar.new.launch
+HelloExpandBar.launch