glimmer-dsl-opal 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25cb50adf580107747fab7e5e98f1eb5d93bbf91e0a460d8ed1a3bc671bde84
-  data.tar.gz: 12c5551fc10de17736f0186e10582e4fdbb2ec08176e33813d1cc2b77fedc523
+  metadata.gz: 97154ebca855643dd407d82d30a6d7e127814fe5365bec2020a9f5ac14a20fbf
+  data.tar.gz: bc7dc89a573bff5406666a6b59ecf8cfc623493f6f680190ce42655236f79dec
 SHA512:
-  metadata.gz: 1f9940b3b91abb63277fddbb9186996ab5433e512f58981516bdcb24e40504c23c2960a22182fd498a255937478f0dab6e9eb5e2d499200036c619abe7724445
-  data.tar.gz: 10608c56db367b7dea3a0a2c8b55b747eef1a2407c23ee3b88208255fc488462f4e0b6fafb3b7c741d382956ce06982b6913f870d71623f74aa7f236323f0991
+  metadata.gz: 65032ea2c5274c6d4b168225d321dbeb586084d7af987cd06fdc8f5cd9f640b7d1aabb5bb46de18c18b7e36116b337dacb39cfd48ac7a98afbd18a2c6cd666ef
+  data.tar.gz: 2d663340cc508c4a7c20b4dfd7878ef52c2084868921610d07a2765b9a62e28902b1f2b4c4959f8b18e5ccbe7efe9152d848b588a795a9cfea9f1b9a7c281e6e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 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

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.22.1 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.23.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)
@@ -166,6 +166,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [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)
@@ -263,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.22.1'
+gem 'glimmer-dsl-opal', '~> 0.23.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -691,6 +692,56 @@ 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`

data/VERSION

@@ -1 +1 @@
-0.22.1
+0.23.0

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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - AndyMaleh
@@ -301,6 +301,7 @@ files:
 - 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