glimmer-dsl-swt 4.18.4.11 → 4.18.5.0

data/samples/hello/hello_file_dialog.rb

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

data/samples/hello/hello_group.rb

@@ -24,10 +24,10 @@ class HelloGroup
     attr_accessor :male, :female, :child, :teen, :adult, :senior
     
     def initialize
-      reset
+      reset!
     end
     
-    def reset
+    def reset!
       self.male = nil
       self.female = nil
       self.child = nil
@@ -37,11 +37,13 @@ class HelloGroup
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Group!'
       row_layout :vertical
@@ -54,12 +56,12 @@ class HelloGroup
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection bind(@person, :male)
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection bind(@person, :female)
         }
       }
       
@@ -71,22 +73,22 @@ class HelloGroup
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection bind(@person, :child)
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection bind(@person, :teen)
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection bind(@person, :adult)
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection bind(@person, :senior)
         }
       }
       
@@ -94,11 +96,11 @@ class HelloGroup
         text 'Reset'
         
         on_widget_selected do
-          person.reset
+          @person.reset!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloGroup.new.launch
+HelloGroup.launch

data/samples/hello/hello_list_multi_selection.rb

@@ -40,35 +40,37 @@ class HelloListMultiSelection
         'Saskatchewan',
         'Yukon'
       ]
-      reset_provinces
+      reset_provinces!
     end
   
-    def reset_provinces
+    def reset_provinces!
       self.provinces = ['Quebec', 'Manitoba', 'Alberta']
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       grid_layout
       
       text 'Hello, List Multi Selection!'
       
       list(:multi) {
-        selection bind(person, :provinces) # also binds to provinces_options by convention
+        selection bind(@person, :provinces) # also binds to provinces_options by convention
       }
       
       button {
         text 'Reset Selections To Default Values'
         
-        on_widget_selected { person.reset_provinces }
+        on_widget_selected { @person.reset_provinces! }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloListMultiSelection.new.launch
+HelloListMultiSelection.launch

data/samples/hello/hello_list_single_selection.rb

@@ -25,35 +25,37 @@ class HelloListSingleSelection
   
     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 {
       grid_layout
       
       text 'Hello, List Single Selection!'
       
       list {
-        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 To Default Value'
         
-        on_widget_selected { person.reset_country }
+        on_widget_selected { @person.reset_country! }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloListSingleSelection.new.launch
+HelloListSingleSelection.launch

data/samples/hello/hello_progress_bar.rb

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloProgressBar
-  include Glimmer::UI::CustomWindow
+  include Glimmer::UI::CustomShell
   
   class ProgressModel
     attr_accessor :minimum, :maximum, :selection, :delay
@@ -110,13 +110,9 @@ class HelloProgressBar
           # (killing is not dangerous since it is only a thread about updating progress)
           @current_thread&.kill
           @current_thread = Thread.new {
-            # GUI updates must happen in sync_exec calls.
-            # Alternatively, add `sync_exec: true` to all the updated property `bind(...)` statements above
-            sync_exec { @progress_model.selection = @progress_model.minimum }
+            @progress_model.selection = @progress_model.minimum
             (@progress_model.minimum..@progress_model.maximum).to_a.each do |n|
-              sync_exec {
-                @progress_model.selection = n
-              }
+              @progress_model.selection = n
               sleep(@progress_model.delay)
             end
           }

data/samples/hello/hello_radio.rb

@@ -24,10 +24,10 @@ class HelloRadio
     attr_accessor :male, :female, :child, :teen, :adult, :senior
     
     def initialize
-      reset
+      reset!
     end
     
-    def reset
+    def reset!
       self.male = nil
       self.female = nil
       self.child = nil
@@ -37,11 +37,13 @@ class HelloRadio
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Radio!'
       row_layout :vertical
@@ -56,12 +58,12 @@ class HelloRadio
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection bind(@person, :male)
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection bind(@person, :female)
         }
       }
       
@@ -75,22 +77,22 @@ class HelloRadio
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection bind(@person, :child)
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection bind(@person, :teen)
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection bind(@person, :adult)
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection bind(@person, :senior)
         }
       }
       
@@ -98,11 +100,11 @@ class HelloRadio
         text 'Reset'
         
         on_widget_selected do
-          person.reset
+          @person.reset!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloRadio.new.launch
+HelloRadio.launch

data/samples/hello/hello_radio_group.rb

@@ -27,7 +27,7 @@ class HelloRadioGroup
     attr_accessor :gender, :age_group
     
     def initialize
-      reset
+      reset!
     end
     
     def gender_options
@@ -38,17 +38,19 @@ class HelloRadioGroup
       ['Child', 'Teen', 'Adult', 'Senior']
     end
     
-    def reset
+    def reset!
       self.gender = nil
       self.age_group = 'Adult'
     end
   end
 
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Radio Group!'
       row_layout :vertical
@@ -60,7 +62,7 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(person, :gender)
+        selection bind(@person, :gender)
       }
             
       label {
@@ -70,18 +72,18 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(person, :age_group)
+        selection bind(@person, :age_group)
       }
       
       button {
         text 'Reset'
         
         on_widget_selected do
-          person.reset
+          @person.reset!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloRadioGroup.new.launch
+HelloRadioGroup.launch

data/samples/hello/hello_spinner.rb

@@ -24,14 +24,14 @@ class HelloSpinner
     attr_accessor :donation
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def initialize
+  before_body {
     @person = Person.new
     @person.donation = 500
-  end
+  }
   
-  def launch
+  body {
     shell {
       grid_layout
       
@@ -62,8 +62,8 @@ class HelloSpinner
           selection bind(@person, :donation) # selection must be set last if other properties are configured to ensure value is within bounds
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloSpinner.new.launch
+HelloSpinner.launch

data/samples/hello/hello_tab.rb

@@ -20,9 +20,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloTab
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
+  body {
     shell {
       text 'Hello, Tab!'
       
@@ -43,8 +43,8 @@ class HelloTab
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloTab.new.launch
+HelloTab.launch