glimmer-dsl-opal 0.12.0 → 0.16.0

data/lib/glimmer-dsl-opal/samples/hello/hello_combo.rb

@@ -19,45 +19,47 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :country, :country_options
-
-  def initialize
-    self.country_options = ['', 'Canada', 'US', 'Mexico']
-    reset_country
-  end
-
-  def reset_country
-    self.country = 'Canada'
+class HelloCombo
+  class Person
+    attr_accessor :country, :country_options
+  
+    def initialize
+      self.country_options = ['', 'Canada', 'US', 'Mexico']
+      reset_country!
+    end
+  
+    def reset_country!
+      self.country = 'Canada'
+    end
   end
-end
 
-class HelloCombo
-  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 <=> [person, :country]
+        selection <=> [@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/lib/glimmer-dsl-opal/samples/hello/hello_computed.rb

@@ -19,20 +19,38 @@
 # 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_relative 'hello_computed/contact'
-
 class HelloComputed
-  include Glimmer
+  class Contact
+    attr_accessor :first_name, :last_name, :year_of_birth
+  
+    def initialize(attribute_map)
+      @first_name = attribute_map[:first_name]
+      @last_name = attribute_map[:last_name]
+      @year_of_birth = attribute_map[:year_of_birth]
+    end
+  
+    def name
+      "#{last_name}, #{first_name}"
+    end
+  
+    def age
+      Time.now.year - year_of_birth.to_i
+    rescue
+      0
+    end
+  end
+
+  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 +107,8 @@ class HelloComputed
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloComputed.new.launch
+HelloComputed.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb

@@ -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
+  options :parent_shell, :date, :subject, :from, :message
   
   # single option with default value
   option :to, default: '"John Irwin" <john.irwin@example.com>'
@@ -38,7 +39,7 @@ 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
@@ -73,7 +74,7 @@ class EmailShell
 
       label {
         layout_data(:fill, :fill, true, true) {
-          horizontal_span 2 #TODO implement
+          horizontal_span 2
           vertical_indent 10
         }
         
@@ -86,9 +87,8 @@ class EmailShell
 end
 
 class HelloCustomShell
-  # including Glimmer enables the Glimmer DSL syntax, including auto-discovery of the `email_shell` custom widget
   include Glimmer
-  
+
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
   EmailSystem = Struct.new(:emails, keyword_init: true)
   
@@ -106,7 +106,7 @@ class HelloCustomShell
   end
   
   def launch
-    shell {
+    shell { |shell_proxy|
       grid_layout
       
       text 'Hello, Custom Shell!'
@@ -141,11 +141,15 @@ 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
+          
+          # open a custom email shell
+          email_shell(
+            parent_shell: shell_proxy,
+            date: email.date,
+            subject: email.subject,
+            from: email.from,
+            message: email.message
+          ).open
         }
       }
     }.open

data/lib/glimmer-dsl-opal/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/lib/glimmer-dsl-opal/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 <=> [person, :male]
+          selection <=> [@person, :male]
         }
         
         radio {
           text 'Female'
-          selection <=> [person, :female]
+          selection <=> [@person, :female]
         }
       }
       
@@ -75,22 +77,22 @@ class HelloRadio
         
         radio {
           text 'Child'
-          selection <=> [person, :child]
+          selection <=> [@person, :child]
         }
         
         radio {
           text 'Teen'
-          selection <=> [person, :teen]
+          selection <=> [@person, :teen]
         }
         
         radio {
           text 'Adult'
-          selection <=> [person, :adult]
+          selection <=> [@person, :adult]
         }
         
         radio {
           text 'Senior'
-          selection <=> [person, :senior]
+          selection <=> [@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/lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb

@@ -19,12 +19,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# This sample demonstrates the use of a `radio_group` in Glimmer, which provides terser syntax
+# than HelloRadio for representing multiple radio buttons by relying on data-binding to
+# automatically spawn the `radio` widgets based on available options on the model.
 class HelloRadioGroup
   class Person
     attr_accessor :gender, :age_group
     
     def initialize
-      reset
+      reset!
     end
     
     def gender_options
@@ -35,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
@@ -57,7 +62,7 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(person, :gender)
+        selection <=> [@person, :gender]
       }
             
       label {
@@ -67,18 +72,18 @@ class HelloRadioGroup
       
       radio_group {
         row_layout :horizontal
-        selection bind(person, :age_group)
+        selection <=> [@person, :age_group]
       }
       
       button {
         text 'Reset'
         
         on_widget_selected do
-          person.reset
+          @person.reset!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloRadioGroup.new.launch
+HelloRadioGroup.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_table.rb

@@ -179,25 +179,33 @@ class HelloTable
     end
   end
 
-  include Glimmer
-    
-  def launch
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    Display.app_name = 'Hello, Table!'
+  }
+  
+  body {
     shell {
       grid_layout
       
       text 'Hello, Table!'
+      background_image File.expand_path('hello_table/baseball_park.png', __dir__)
+      image File.expand_path('hello_table/baseball_park.png', __dir__)
       
       label {
         layout_data :center, :center, true, false
         
-        text 'Baseball Playoff Schedule'
-        font height: 30, style: :bold
+        text 'BASEBALL PLAYOFF SCHEDULE'
+        background :transparent if OS.windows?
+        foreground rgb(94, 107, 103)
+        font name: 'Optima', height: 38, style: :bold
       }
       
       combo(:read_only) {
         layout_data :center, :center, true, false
-        selection bind(BaseballGame, :playoff_type)
-        font height: 16
+        selection <=> [BaseballGame, :playoff_type]
+        font height: 14
       }
       
       table(:editable) { |table_proxy|
@@ -248,29 +256,29 @@ class HelloTable
         # Sort by these additional properties after handling sort by the column the user clicked
         additional_sort_properties :date, :time, :home_team, :away_team, :ballpark, :promotion
         
-#         menu {
-#           menu_item {
-#             text 'Book'
-#
-#             on_widget_selected {
-#               book_selected_game
-#             }
-#           }
-#         }
+        menu {
+          menu_item {
+            text 'Book'
+            
+            on_widget_selected {
+              book_selected_game
+            }
+          }
+        }
       }
       
       button {
         text 'Book Selected Game'
         layout_data :center, :center, true, false
-        font height: 16
-        enabled bind(BaseballGame, :selected_game)
+        font height: 14
+        enabled <= [BaseballGame, :selected_game]
         
         on_widget_selected {
           book_selected_game
         }
       }
-    }.open
-  end
+    }
+  }
   
   def book_selected_game
     message_box {
@@ -280,4 +288,4 @@ class HelloTable
   end
 end
 
-HelloTable.new.launch
+HelloTable.launch