glimmer-dsl-opal 0.21.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dbe9f418aaf69cea9d11235337a4915e0545e0fcded7591f5b8e04c7195721d
-  data.tar.gz: dabf17fe41390a4ea6d5f4d88d71c27782eaf0ef96948f67845d9d8ab8bdbc0a
+  metadata.gz: f974d9526112e11c32284c5fbcd30e08226aafa3f799c08ccd67deabddf9f0ac
+  data.tar.gz: e77d826d4afb7a359a24f2a87dc49672e7d17e4da265feef11c278403370d468
 SHA512:
-  metadata.gz: 0f84635205c0f8a86575fee0c1b72760052bb3722467196d067f469111f923d4195264ab4563bf3b5e37155d51e061d7d1f35f2b43acd77ca4d922ceabba4255
-  data.tar.gz: 6f6f984e402e801fe336448ab7997ac2dacb40d1fe2a05c35ae4a937394325b48de250c98e4cf6fde8313b3f6d73d88eab180520b889bdd9f146828565baf1af
+  metadata.gz: 9295b9a8da3867580a975a43cc61708d635de4f03d30fae6d07913d9147783c2372fe1fe9f673d0f8bfe20988684579b0aaeaa6fbebcec189c4111bba3b62935
+  data.tar.gz: 5ea143577dc7c59c8c8b5d423f0a17580c71bcbefb29cd200c770e8078ca78cca75f29de4354801b38a2a440365285832f96a48ec50290afbe941b865aa73f14

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 0.24.0
+
+- `widget#print` method
+- Hello, Print! sample
+
+## 0.23.0
+
+- Hello, Label! sample
+- Support `label` `:separator` SWT style along with `:horizontal` or `:vertical`
+- Support `label` `image` attribute
+
+## 0.22.1
+
+- User Profile elaborate sample
+
+## 0.22.0
+
+- Support widget `cursor` attribute
+- Hello, Cursor! sample
+
 ## 0.21.0
 
 - Support `scale` widget

data/README.md

@@ -143,7 +143,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.21.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.24.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -165,6 +165,8 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Combo!](#hello-combo)
       - [Hello, Composite!](#hello-composite)
       - [Hello, Computed!](#hello-computed)
+      - [Hello, Cursor!](#hello-cursor)
+      - [Hello, Label!](#hello-label)
       - [Hello, Layout!](#hello-layout)
       - [Hello, List Single Selection!](#hello-list-single-selection)
       - [Hello, List Multi Selection!](#hello-list-multi-selection)
@@ -189,8 +191,9 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Dialog!](#hello-dialog)
     - [Elaborate Samples](#elaborate-samples)
       - [Login](#login)
-      - [Tic Tac Toe](#tic-tac-toe)
       - [Contact Manager](#contact-manager)
+      - [Tic Tac Toe](#tic-tac-toe)
+      - [User Profile](#user-profile)
       - [Weather](#weather)
     - [External Samples](#external-samples)
       - [Glimmer Calculator](#glimmer-calculator)
@@ -261,7 +264,7 @@ gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.21.0'
+gem 'glimmer-dsl-opal', '~> 0.24.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -469,9 +472,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {
@@ -575,13 +578,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -597,51 +600,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch
@@ -663,6 +658,82 @@ You should see "Hello, Computed!"
 
 ![Glimmer DSL for Opal Hello Computed](images/glimmer-dsl-opal-hello-computed.png)
 
+#### Hello, Cursor!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_cursor'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Cursor](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-cursor.gif)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Cursor!"
+
+![Glimmer DSL for Opal Hello Cursor](images/glimmer-dsl-opal-hello-cursor.gif)
+
+#### Hello, Label!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_label'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-left-aligned.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-center-aligned.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-right-aligned.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-images.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-background_images.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-horizontal-separator.png)
+
+![Glimmer DSL for SWT Hello Label](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-label-vertical-separator.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Label!"
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-left-aligned.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-center-aligned.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-right-aligned.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-images.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-background_images.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-horizontal-separator.png)
+
+![Glimmer DSL for Opal Hello Label](images/glimmer-dsl-opal-hello-label-vertical-separator.png)
+
 #### Hello, Layout!
 
 Add the following require statement to `app/assets/javascripts/application.rb`
@@ -2400,36 +2471,6 @@ You should see "Login" dialog
 ![Glimmer DSL for Opal Login Filled In](images/glimmer-dsl-opal-login-filled-in.png)
 ![Glimmer DSL for Opal Login Logged In](images/glimmer-dsl-opal-login-logged-in.png)
 
-#### Tic Tac Toe
-
-Add the following require statement to `app/assets/javascripts/application.rb`
-
-```ruby
-require 'glimmer-dsl-opal/samples/elaborate/tic_tac_toe'
-```
-
-```ruby
-Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
-
-![Glimmer DSL for SWT Tic Tac Toe](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe.png)
-![Glimmer DSL for SWT Tic Tac Toe In Progress](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-in-progress.png)
-![Glimmer DSL for SWT Tic Tac Toe Game Over](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-game-over.png)
-
-Glimmer app on the web (using `glimmer-dsl-opal` gem):
-
-Start the Rails server:
-```
-rails s
-```
-
-Visit `http://localhost:3000`
-
-You should see "Tic Tac Toe"
-
-![Glimmer DSL for Opal Tic Tac Toe](images/glimmer-dsl-opal-tic-tac-toe.png)
-![Glimmer DSL for Opal Tic Tac Toe In Progress](images/glimmer-dsl-opal-tic-tac-toe-in-progress.png)
-![Glimmer DSL for Opal Tic Tac Toe Game Over](images/glimmer-dsl-opal-tic-tac-toe-game-over.png)
-
 #### Contact Manager
 
 Add the following require statement to `app/assets/javascripts/application.rb`
@@ -2469,7 +2510,7 @@ rails s
 
 Visit `http://localhost:3000`
 
-You should see "Tic Tac Toe"
+You should see "Contact Manager"
 
 Glimmer DSL for Opal Contact Manager
 
@@ -2491,6 +2532,62 @@ Glimmer DSL for Opal Contact Manager Edit Done
 
 ![Glimmer DSL for Opal Contact Manager Edit Done](images/glimmer-dsl-opal-contact-manager-edit-done.png)
 
+#### Tic Tac Toe
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/elaborate/tic_tac_toe'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Tic Tac Toe](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe.png)
+![Glimmer DSL for SWT Tic Tac Toe In Progress](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-in-progress.png)
+![Glimmer DSL for SWT Tic Tac Toe Game Over](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-tic-tac-toe-game-over.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Tic Tac Toe"
+
+![Glimmer DSL for Opal Tic Tac Toe](images/glimmer-dsl-opal-tic-tac-toe.png)
+![Glimmer DSL for Opal Tic Tac Toe In Progress](images/glimmer-dsl-opal-tic-tac-toe-in-progress.png)
+![Glimmer DSL for Opal Tic Tac Toe Game Over](images/glimmer-dsl-opal-tic-tac-toe-game-over.png)
+
+#### User Profile
+
+Code: [lib/glimmer-dsl-opal/samples/elaborate/user_profile](lib/glimmer-dsl-opal/samples/elaborate/user_profile.rb)
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/elaborate/user_profile'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![User Profile](https://github.com/AMaleh/glimmer-dsl-swt/raw/master/images/glimmer-user-profile.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "User Profile"
+
+![Opal User Profile](/images/glimmer-dsl-opal-user-profile.png)
+
 #### Weather
 
 Code: [lib/glimmer-dsl-opal/samples/elaborate/weather](lib/glimmer-dsl-opal/samples/elaborate/weather.rb)

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.24.0

data/lib/glimmer-dsl-opal/samples/elaborate/user_profile.rb

@@ -0,0 +1,78 @@
+# Copyright (c) 2020-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.
+
+include Glimmer
+
+# A version of this was featured in a dzone article as an intro to Glimmer syntax:
+# https://dzone.com/articles/an-introduction-glimmer
+shell { |shell_proxy|
+  text "User Profile"
+
+  composite {
+    grid_layout 2, false
+
+    group {
+      text "Name"
+      grid_layout 2, false
+      layout_data :fill, :fill, true, true
+      label {text "First"}; text {text "Bullet"}
+      label {text "Last"}; text {text "Tooth"}
+    }
+
+    group {
+      layout_data :fill, :fill, true, true
+      text "Gender"
+      radio {text "Male"; selection true}
+      radio {text "Female"}
+    }
+
+    group {
+      layout_data :fill, :fill, true, true
+      text "Role"
+      check {text "Student"; selection true}
+      check {text "Employee"; selection true}
+    }
+
+    group {
+      text "Experience"
+      row_layout
+      layout_data :fill, :fill, true, true
+      spinner {selection 5}; label {text "years"}
+    }
+
+    button {
+      text "save"
+      layout_data :right, :center, true, true
+      on_widget_selected {
+        message_box {
+          text 'Profile Saved!'
+          message 'User profile has been saved!'
+        }.open
+      }
+    }
+
+    button {
+      text "close"
+      layout_data :left, :center, true, true
+      on_widget_selected { shell_proxy.close }
+    }
+  }
+}.open

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

@@ -35,9 +35,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

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

@@ -42,13 +42,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -64,51 +64,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch

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

@@ -0,0 +1,58 @@
+# Copyright (c) 2020-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.
+
+class HelloCursor
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :selected_cursor
+  
+  # This method matches the name of the :selected_cursor property by convention
+  def selected_cursor_options
+    Glimmer::SWT::SWTProxy.cursor_options
+  end
+  
+  after_body do
+    observe(self, :selected_cursor) {
+      body_root.cursor = selected_cursor
+    }
+  end
+  
+  body {
+    shell {
+      grid_layout
+      
+      text 'Hello, Cursor!'
+      cursor :wait
+      
+      label {
+        text 'Please select a cursor style and see it change the mouse cursor (varies per platform):'
+        font style: :bold
+        cursor :no
+      }
+      radio_group {
+        grid_layout 5, true
+        selection <=> [self, :selected_cursor]
+      }
+    }
+  }
+end
+
+HelloCursor.launch

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

@@ -0,0 +1,192 @@
+# Copyright (c) 2020-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.
+
+class HelloLabel
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Label!'
+    
+      tab_folder {
+        tab_item {
+          text 'left-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:left) { # :left is default in English, so it is unnecessary
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'center-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:center) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'right-aligned'
+          
+          grid_layout 2, true
+          
+          1.upto(3) do |n|
+            label(:right) {
+              layout_data :fill, :center, true, false
+              text "Field #{n}"
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{n}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'images'
+          
+          grid_layout 2, true
+          
+          ['denmark', 'finland', 'norway'].each do |image_name|
+            label {
+              layout_data :center, :center, true, false
+              image File.expand_path("images/#{image_name}.png", __dir__)
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'background images'
+          
+          grid_layout 2, true
+          
+          ['italy', 'france', 'mexico'].each do |image_name|
+            label {
+              layout_data :center, :center, true, false
+              background_image File.expand_path("images/#{image_name}.png", __dir__)
+              text image_name.capitalize
+              font height: 26, style: :bold
+            }
+            text {
+              layout_data :fill, :center, true, false
+              text "Enter Field #{image_name.capitalize}"
+            }
+          end
+        }
+        
+        tab_item {
+          text 'horizontal separator'
+          
+          grid_layout 2, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label(:separator, :horizontal) {
+            layout_data(:fill, :center, true, false) {
+              horizontal_span 2
+            }
+          }
+                    
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+        }
+        
+        tab_item {
+          text 'vertical separator'
+          
+          grid_layout 3, true
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 1"
+          }
+          label(:separator, :vertical) {
+            layout_data(:center, :center, false, false) {
+              vertical_span 3
+            }
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 1"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 2"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 2"
+          }
+
+          label {
+            layout_data :fill, :center, true, false
+            text "Field 3"
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text "Enter Field 3"
+          }
+        }
+        
+      }
+      
+    }
+    
+  }
+end
+
+HelloLabel.launch

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

@@ -0,0 +1,58 @@
+# Copyright (c) 2020-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.
+
+class HelloPrint
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Print!'
+      @composite = composite {
+        row_layout(:vertical) {
+          fill true
+          center true
+        }
+        
+        label(:center) {
+          text "Whatever you see inside the app composite\nwill get printed when clicking the Print button."
+          font height: 16
+        }
+         
+        button {
+          text 'Print'
+          
+          on_widget_selected do
+            # Unlike the SWT version, Opal's print always prints the entire window no matter what widget
+            # the print method is invoked from
+            unless @composite.print
+              message_box {
+                text 'Unable To Print'
+                message 'Sorry! Printing is not supported on this platform!'
+              }.open
+            end
+          end
+        }
+      }
+    }
+  }
+end
+
+HelloPrint.launch

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -28,7 +28,7 @@ module Glimmer
       attr_accessor :closeable
       
       def initialize(parent, args, block)
-        @closeable = args.detect { |arg| SWTProxy[:close] == SWTProxy[arg] }
+        @closeable = args.detect { |arg| SWTProxy[arg] == SWTProxy[:close] }
         super(parent, args, block)
         # TODO attach listener if :close style is set
         close_dom_element.on('click') { dispose }

data/lib/glimmer/swt/label_proxy.rb

@@ -25,43 +25,39 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class LabelProxy < WidgetProxy
-      attr_reader :text, :background_image, :image
+      attr_reader :text, :background_image, :image, :separator, :vertical
+      alias separator? separator
+      alias vertical? vertical
       
       def initialize(parent, args, block)
+        @separator = args.detect { |arg| SWTProxy[arg] == SWTProxy[:separator] }
+        @vertical = args.detect { |arg| SWTProxy[arg] == SWTProxy[:vertical] }
         super(parent, args, block)
       end
+      
+      def horizontal
+        !vertical
+      end
+      alias horizontal? horizontal
 
       def text=(value)
         @text = value
-        dom_element.html(html_text) # TODO deal with issue of handling lines and escaping at the same time
+        dom_element.html(html_text) unless @image
       end
       
       def html_text
         text && CGI.escape_html(text).gsub("\n", '<br />')
       end
       
-#       def background_image=(*image_options)
-        # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
-        # TODO finish implementation
-#         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
-#         dom_element.css('background-image', @background_image.image_data.dom_element.src)
-#       end
-      
-      def image=(*image_options)
-        # TODO finish implementation
-#         @image = Glimmer::SWT::ImageProxy.create(*image_options)
-#         dom_element.css('background-image', @image.image_data.dom_element.src)
-      end
-      
-      # background image
-      def background_image
-        @background_image
+      def image=(value)
+        @image = value
+        dom_element.html("<img src='#{@image}' />")
       end
       
       # background image is stretched by default
       def background_image=(value)
         @background_image = value
-        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-image', "url(#{@background_image})")
         dom_element.css('background-repeat', 'no-repeat')
         dom_element.css('background-size', 'cover')
       end
@@ -88,8 +84,11 @@ module Glimmer
       def dom
         label_id = id
         label_class = name
+        label_style = "text-align: #{alignment}; "
+        label_style += "border-top: 1px solid rgb(207, 207, 207); " if separator? && horizontal?
+        label_style += "border-right: 1px solid rgb(207, 207, 207); height: 100%; " if separator? && vertical?
         @dom ||= html {
-          label(id: label_id, class: label_class, style: "text-align: #{alignment};") {
+          label(id: label_id, class: label_class, style: label_style) {
             html_text
           }
         }.to_s

data/lib/glimmer/swt/shell_proxy.rb

@@ -37,6 +37,9 @@ module Glimmer
           height: 100%;
           margin: 0;
         }
+        * {
+          cursor: inherit;
+        }
         .shell {
           height: 100%;
           margin: 0;

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020-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
@@ -27,8 +27,8 @@ module Glimmer
     # Proxy for org.eclipse.swt.SWT
     #
     # Follows the Proxy Design Pattern
-    class SWTProxy            
-      include StyleConstantizable      
+    class SWTProxy
+      include StyleConstantizable
 
       class << self
         def constant_source_class
@@ -42,12 +42,16 @@ module Glimmer
         def extra_styles
           EXTRA_STYLES
         end
+        
+        def cursor_options
+          [:wait, :sizenwse, :appstarting, :no, :sizenesw, :sizeall, :help, :sizee, :sizewe, :sizen, :sizes, :sizew, :cross, :sizese, :ibeam, :arrow, :sizesw, :uparrow, :hand, :sizenw, :sizene, :sizens]
+        end
       end
       
       EXTRA_STYLES = {
         NO_RESIZE: self[:shell_trim, :resize!, :max!],
         NO_SORT: -7,
-      }            
+      }
     end
   end
 end

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,7 +31,32 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      SWT_CURSOR_TO_CSS_CURSOR_MAP = {
+        wait: 'wait',
+        sizenwse: 'nwse-resize',
+        appstarting: 'progress',
+        no: 'no-drop',
+        sizenesw: 'nesw-resize',
+        sizeall: 'all-scroll',
+        help: 'help',
+        sizee: 'e-resize',
+        sizewe: 'ew-resize',
+        sizen: 'n-resize',
+        sizes: 's-resize',
+        sizew: 'w-resize',
+        cross: 'crosshair',
+        sizese: 'se-resize',
+        ibeam: 'text',
+        arrow: 'default',
+        sizesw: 'sw-resize',
+        uparrow: 'alias',
+        hand: 'grab',
+        sizenw: 'nw-resize',
+        sizene: 'ne-resize',
+        sizens: 'ns-resize',
+      }
+      
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered, :cursor
       attr_accessor :menu, :menu_requested, :menu_x, :menu_y
       alias isDisposed disposed?
       alias is_disposed disposed?
@@ -216,6 +241,11 @@ module Glimmer
       def dialog_ancestor
         parents.detect {|p| p.is_a?(DialogProxy)}
       end
+      
+      def print
+        `window.print()`
+        true
+      end
 
       def enabled=(value)
         @enabled = value
@@ -242,6 +272,11 @@ module Glimmer
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def cursor=(value)
+        @cursor = value
+        dom_element.css('cursor', css_cursor)
+      end
+      
       def focus=(value)
         @focus = value
         dom_element.focus # TODO consider if a delay or async_exec is needed here
@@ -968,6 +1003,12 @@ module Glimmer
         }
       end
       
+      private
+      
+      def css_cursor
+        SWT_CURSOR_TO_CSS_CURSOR_MAP[@cursor]
+      end
+      
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.24.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -283,6 +283,7 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/board.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/cell.rb
+- lib/glimmer-dsl-opal/samples/elaborate/user_profile.rb
 - lib/glimmer-dsl-opal/samples/elaborate/weather.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_arrow.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
@@ -294,17 +295,20 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_composite.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_cursor.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_dialog.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_group.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_label.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_layout.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_menu_bar.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_message_box.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_print.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_radio.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_scale.rb