glimmer-dsl-opal 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f974d9526112e11c32284c5fbcd30e08226aafa3f799c08ccd67deabddf9f0ac
-  data.tar.gz: e77d826d4afb7a359a24f2a87dc49672e7d17e4da265feef11c278403370d468
+  metadata.gz: 3acd64cce93e2c522567f6b10967489a8edb74e19aad32d9b6aef070f8339715
+  data.tar.gz: 78adb831387641339c046839bf8ccd034354881a1a963c0eb7084c4065167c2b
 SHA512:
-  metadata.gz: 9295b9a8da3867580a975a43cc61708d635de4f03d30fae6d07913d9147783c2372fe1fe9f673d0f8bfe20988684579b0aaeaa6fbebcec189c4111bba3b62935
-  data.tar.gz: 5ea143577dc7c59c8c8b5d423f0a17580c71bcbefb29cd200c770e8078ca78cca75f29de4354801b38a2a440365285832f96a48ec50290afbe941b865aa73f14
+  metadata.gz: 340aa792a59e2577c818461ef4ebe88a01b06a8becf19e2f138c8895cdfa691872d227ea9c490f1bb48d14fd6edf3bb2b65aabe8f21bb0982e8fcf4bfdb2d5e1
+  data.tar.gz: c5509de40b089c73879d46aabb4c7440698eda864acd80509e1496b7bb1ca0558b47c399c96d28b295fa9ec088dffdaf7958861f23dcb9b4b24bbb58a798561d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.25.0
+
+- Support `progress_bar` widget without `:vertical` SWT style support
+- Hello, Progress Bar! sample without `:vertical` SWT style
+
 ## 0.24.0
 
 - `widget#print` method

data/README.md

@@ -187,6 +187,8 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Arrow!](#hello-arrow)
       - [Hello, Message Box!](#hello-message-box)
       - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+      - [Hello, Print!](#hello-print)
+      - [Hello, Progress Bar!](#hello-progress-bar)
       - [Hello, Menu Bar!](#hello-menu-bar)
       - [Hello, Dialog!](#hello-dialog)
     - [Elaborate Samples](#elaborate-samples)
@@ -262,7 +264,7 @@ Add the following to `Gemfile`:
 ```
 gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
-gem 'opal-async', '~> 1.2.0'
+gem 'opal-async', '~> 1.3.0'
 gem 'opal-jquery', '~> 0.4.4'
 gem 'glimmer-dsl-opal', '~> 0.24.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
@@ -1833,6 +1835,52 @@ You should see "Hello, Message Box!"
 ![Glimmer DSL for Opal Hello Message Box](images/glimmer-dsl-opal-hello-message-box.png)
 ![Glimmer DSL for Opal Hello Message Box Dialog](images/glimmer-dsl-opal-hello-message-box-dialog.png)
 
+#### Hello, Print!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_print'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Print](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-print.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, Print!"
+
+#### Hello, Progress Bar!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_progress_bar'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Progress Bar](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-progress-bar.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, Progress Bar!"
+
 #### Hello, Pop Up Context Menu!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.24.0
+0.25.0

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

@@ -0,0 +1,126 @@
+# 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 HelloProgressBar
+  include Glimmer::UI::CustomShell
+  
+  class ProgressModel
+    attr_accessor :minimum, :maximum, :selection, :delay
+  end
+        
+  before_body do
+    @progress_model = ProgressModel.new
+    @progress_model.minimum = 0
+    @progress_model.maximum = 100
+    @progress_model.selection = 0
+    @progress_model.delay = 0.01
+  end
+
+  body {
+    shell {
+      grid_layout(4, true)
+      
+      text 'Hello, Progress Bar!'
+      
+      progress_bar(:indeterminate) {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+      }
+      
+      label {
+        text 'Minimum'
+      }
+      
+      label {
+        text 'Maximum'
+      }
+      
+      label {
+        text 'Selection'
+      }
+      
+      label {
+        text 'Delay in Seconds'
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :minimum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :maximum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :selection]
+      }
+        
+      spinner {
+        digits 2
+        minimum 1
+        maximum 200
+        selection <=> [@progress_model, :delay, on_read: ->(v) {v.to_f*100.0}, on_write: ->(v) {v.to_f/100.0}]
+      }
+          
+      progress_bar {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
+      }
+      
+      # :vertical SWT style is unsupported for now
+#       progress_bar(:vertical) {
+#         layout_data(:fill, :center, true, false) {
+#           horizontal_span 4
+#         }
+#         minimum <= [@progress_model, :minimum]
+#         maximum <= [@progress_model, :maximum]
+#         selection <= [@progress_model, :selection]
+#       }
+      
+      button {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        text "Start"
+        
+        on_widget_selected do
+          # if a previous thread is running, then kill first
+          # (killing is not dangerous since it is only a thread about updating progress)
+          @current_thread&.kill
+          @current_thread = Thread.new do
+            @progress_model.selection = @progress_model.minimum
+            (@progress_model.minimum..@progress_model.maximum).to_a.each do |n|
+              @progress_model.selection = n
+              sleep(@progress_model.delay)
+            end
+          end
+        end
+      }
+    }
+  }
+end
+
+HelloProgressBar.launch

data/lib/glimmer/swt/progress_bar_proxy.rb

@@ -0,0 +1,86 @@
+# 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.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ProgressBarProxy < WidgetProxy
+      STYLE = <<~CSS
+        .ui-progressbar.vertical {
+          /* Not Supported */
+          /* transform: rotate(-90deg); */
+        }
+      CSS
+      
+      attr_reader :vertical, :indeterminate, :maximum, :selection
+      attr_accessor :state, :minimum #ignored, only there for API compatibility
+      alias vertical? vertical
+      alias indeterminate? indeterminate
+      
+      def initialize(parent, args, block)
+        @vertical = args.detect { |arg| SWTProxy[arg] == SWTProxy[:vertical] }
+        @indeterminate = args.detect { |arg| SWTProxy[arg] == SWTProxy[:indeterminate] }
+        super(parent, args, block)
+        dom_element.progressbar
+        self.minimum = 0
+        self.selection = false if indeterminate?
+      end
+      
+      def horizontal
+        !vertical
+      end
+      alias horizontal? horizontal
+      
+      def minimum=(value)
+        @minimum = value
+        # re-update maximum and selection since they depend on minimum
+        self.maximum = @maximum if @maximum
+        self.selection = @selection if @selection
+      end
+      
+      def maximum=(value)
+        @maximum = value
+        dom_element.progressbar('option', 'max', @maximum - @minimum)
+      end
+      
+      def selection=(selection_value)
+        @selection = selection_value
+        value = @selection ? (@selection - @minimum) : @selection
+        dom_element.progressbar('option', 'value', value)
+      end
+
+      def element
+        'div'
+      end
+      
+      def dom
+        progress_bar_id = id
+        progress_bar_class = name
+        progress_bar_class += ' vertical' if vertical?
+        progress_bar_class += ' indeterminate' if indeterminate?
+        @dom ||= html {
+          div(id: progress_bar_id, class: progress_bar_class)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1037,6 +1037,7 @@ require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/progress_bar_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/scale_proxy'
 require 'glimmer/swt/scrolled_composite_proxy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - AndyMaleh
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - 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_progress_bar.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
@@ -422,6 +423,7 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/point.rb
+- lib/glimmer/swt/progress_bar_proxy.rb
 - lib/glimmer/swt/property_owner.rb
 - lib/glimmer/swt/radio_proxy.rb
 - lib/glimmer/swt/row_layout_proxy.rb