glimmer-dsl-swt 4.22.2.4 → 4.22.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8861fe71a1b90e50066bb3a91bbfb8de450ebfb8cfe93e63a52c3ef737ce3d7
-  data.tar.gz: d72ca16aa028f0b7ab0b91294b5c2e7627ab9f3014afd9764ad7b1b58369abb6
+  metadata.gz: 1ddae7932813d7434f6ea1013668ca03d899eae9dc6a0aacece9139f1172f98a
+  data.tar.gz: dcf0088e2b10c5861f5833c6962c3f253e043f82e7d304fdd35b3a923241c5ee
 SHA512:
-  metadata.gz: d81c567963f645563679a704791f5b739b1cbe9b5a04ad65d9b12bebfe52a442c131ae8933af5aabb141e31631ad0e525c25fa639c49c0f5567e7acf9cc946b0
-  data.tar.gz: 5883f1ad7759e1e752bc22bac9bb722a0a3748aba73efd1a7b992aee137d13ed120c60748d2f9c3738cd5ccb462ee695ae90079ac13d9d910d2e01acde82b38d
+  metadata.gz: fd84fc1cebaf9e93eff102853f27198cc3bfb4bd5cdad95c63a26a73a05e9331caf54c430883e14f41e8e58688d5e889d9ad0c9758da59341b98f60ec59a4330
+  data.tar.gz: 99021203e9835c9204c248f6bffd333f48cf99dccc3ad5b6a223bb2db61217ff364110948b46da7999e9c3c1b0b8f452040270daf12e18f1d79f4b48b3a84808

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 4.22.2.5
+
+- Update all samples to match the [GLIMMER_STYLE_GUIDE.md](/docs/reference/GLIMMER_STYLE_GUIDE.md)
+- Update scaffolding code to match the [GLIMMER_STYLE_GUIDE.md](/docs/reference/GLIMMER_STYLE_GUIDE.md)
+
 ## 4.22.2.4
 
 - Address the warning regarding using Ruby singletons on Java objects (shows up when running `glimmer samples`)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.22.2.4
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.22.2.5
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -17,16 +17,16 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.4 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.5 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword.
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
-**[Glimmer](https://rubygems.org/gems/glimmer) DSL Comparison Table:**
+**[Glimmer](https://github.com/AndyObtiva/glimmer) DSL Comparison Table:**
 DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
 ----|-----------|---------|------------------|------|------|--------
-[Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](https://github.com/AndyObtiva/glimmer-dsl-swt) | Mac / Windows / Linux | Yes | Yes (Canvas Shape DSL) | Very Mature / Scaffolding / Native Executable Packaging / Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint | Java / JRuby 
+[Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](https://github.com/AndyObtiva/glimmer-dsl-swt) | Mac / Windows / Linux | Yes | Yes (Canvas Shape DSL) | Very Mature / Scaffolding / Native Executable Packaging / Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint | Java / JRuby
 [Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)](https://github.com/AndyObtiva/glimmer-dsl-opal) | All Web Browsers | No | Yes (Canvas Shape DSL) | Simpler than All JavaScript Technologies / Auto-Webify Desktop Apps | Setup Process / Only Rails 5 Support for Now | Rails
 [Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-libui) | Mac / Windows / Linux | Yes | Yes (Area API) | Fast Startup Time / Light Memory Footprint | LibUI is an Incomplete Mid-Alpha Only | None Other Than MRI Ruby
 [Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-tk) | Mac / Windows / Linux | Some Native-Themed Widgets (Not Truly Native) | Yes (Canvas) | Fast Startup Time / Light Memory Footprint | Widgets Do Not Look Truly Native, Espcially on Linux | ActiveTcl / MRI Ruby
@@ -331,7 +331,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.22.2.4
+jgem install glimmer-dsl-swt -v 4.22.2.5
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -359,7 +359,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.22.2.4'
+gem 'glimmer-dsl-swt', '~> 4.22.2.5'
 ```
 
 And, then run:
@@ -382,7 +382,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.5
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -552,6 +552,14 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 [Befunge 98 GUI](https://github.com/AndyObtiva/befunge98/tree/gui)
 
+### Glimmer Metronome
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome)
+
+### Glimmer Wordle
+
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Glimmer Wordle - Word Game](https://github.com/AndyObtiva/glimmer_wordle)
+
 ## Packaging & Distribution
 
 Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single command:

data/VERSION

@@ -1 +1 @@
-4.22.2.4
+4.22.2.5

data/docs/reference/GLIMMER_COMMAND.md

@@ -10,6 +10,8 @@ glimmer
 
 On Mac and Linux, it additionally brings up a TUI (Text-based User Interface) for interactive navigation and execution of Glimmer tasks (courtesy of [rake-tui](https://github.com/AndyObtiva/rake-tui)).
 
+(note that in ARM64 machines, the TUI does not seem to work at the moment, so simply use glimmer commands directly without the TUI until this is fixed)
+
 On Windows, it simply lists the available Glimmer tasks at the end (courtsey of [rake](https://github.com/ruby/rake)).
 
 If you are new to Glimmer, you may read the Basic Usage section and skip the rest until you have gone through [Girb (Glimmer irb) Command](#girb-glimmer-irb-command), [Glimmer GUI DSL Syntax](#glimmer-gui-dsl-syntax), and [Samples](#samples).
@@ -107,7 +109,7 @@ glimmer samples/hello/hello_world.rb samples/hello/hello_tab.rb
 
 Launches samples/hello/hello_world.rb and samples/hello_tab.rb at the same time, each in a separate JRuby thread.
 
-Note: under Zsh (Z Shell), glimmer can only be used in its advanced TUI mode (e.g. `glimmer` and then selecting a task) not the primitive rake task mode (e.g. `glimmer scaffold[app]`)
+Note: under Zsh (Z Shell), glimmer can only be used in its advanced \ mode (e.g. `glimmer` and then selecting a task) not the primitive rake task mode (e.g. `glimmer scaffold[app]`)
 
 ### Glimmer Samples
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -85,7 +85,6 @@
     - [Gladiator](#gladiator)
     - [Timer](#timer)
     - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
-    - [Glimmer Metronome](#glimmer-metronome)
 - [License](#license)
 
 ## Samples
@@ -1336,6 +1335,8 @@ This sample demonstrates a Metronome that accepts a beat count and bpm rate, tic
 
 It takes advantage of the Canvas Shape DSL, data-binding, and the Java Sound library. It employs a hybrid approach of relying on standard widget layouts (grid layout) and canvas shape x,y placement.
 
+An external more full-fledged version exists too as [Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome).
+
 Code:
 
 [samples/elaborate/metronome.rb](/samples/elaborate/metronome.rb)
@@ -1429,14 +1430,6 @@ This is a souped up version of the Klondike Solitaire elaborate sample, which is
 
 ![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
 
-#### Glimmer Metronome
-
-This is an external enhanced version of [Metronome](#metronome) that can be packaged as an independent native executable.
-
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome)
-
-![Metronome](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.png)
-
 ## License
 
 [MIT](LICENSE.txt)

data/lib/glimmer/launcher.rb

@@ -72,10 +72,13 @@ module Glimmer
         OPERATING_SYSTEMS_SUPPORTED.detect {|os| OS.send("#{os}?")}
       end
       
-      def special_cpu_architecture_suffix
+      def is_arm64?
         host_cpu = OS.host_cpu.downcase
-        special = host_cpu.include?('aarch64') || host_cpu.include?('arm')
-        special ? "_aarch64" : ''
+        host_cpu.include?('aarch64') || host_cpu.include?('arm')
+      end
+      
+      def special_cpu_architecture_suffix
+        is_arm64? ? "_aarch64" : ''
       end
 
       def swt_jar_file
@@ -187,7 +190,7 @@ module Glimmer
     end
     
     def display_tasks
-      if OS.windows?
+      if OS.windows? || Launcher.is_arm64?
         require 'rake'
         Rake::TaskManager.record_task_metadata = true
         require_relative 'rake_task'

data/lib/glimmer/rake_task/scaffold.rb

@@ -597,12 +597,13 @@ module Glimmer
         Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
         Display.app_version = VERSION
         @display = display {
-          on_about {
+          on_about do
             display_about_dialog
-          }
-          on_preferences {
+          end
+          
+          on_preferences do
             #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-          }
+          end
         }
       end
             MULTI_LINE_STRING
@@ -658,17 +659,21 @@ module Glimmer
           menu_bar {
             menu {
               text '&File'
+              
               menu_item {
                 text '&About...'
-                on_widget_selected {
+                
+                on_widget_selected do
                   display_about_dialog
-                }
+                end
               }
+              
               menu_item {
                 text '&Preferences...'
-                on_widget_selected {
+                
+                on_widget_selected do
                   #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-                }
+                end
               }
             }
           }
@@ -697,31 +702,37 @@ module Glimmer
             custom_shell_file_content += <<-MULTI_LINE_STRING
       def display_preferences_dialog
         dialog(swt_widget) {
-          text 'Preferences'
           grid_layout {
             margin_height 5
             margin_width 5
           }
+          
+          text 'Preferences'
+          
           group {
             row_layout {
               type :vertical
               spacing 10
             }
+            
             text 'Greeting'
             font style: :bold
+            
             [
               'Hello, World!',
               'Howdy, Partner!'
             ].each do |greeting_text|
               button(:radio) {
-                text greeting_text
-                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
                 layout_data {
                   width 160
                 }
-                on_widget_selected { |event|
+                
+                text greeting_text
+                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
+                
+                on_widget_selected do |event|
                   self.greeting = event.widget.getText
-                }
+                end
               }
             end
           }
@@ -823,6 +834,7 @@ end
             background background_color
             cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*0.65 - size_width*0.66, 0 - size_height*0.33, size_width/2 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
           }
+          
           path {
             background background_color
             cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*1.35 - size_width*0.66, 0 - size_height*0.33, size_width*1.5 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33

data/samples/elaborate/calculator.rb

@@ -21,14 +21,14 @@ class Calculator
     Display.setAppName('Glimmer Calculator')
     
     display {
-      on_swt_keydown { |key_event|
+      on_swt_keydown do |key_event|
         char = key_event.character.chr rescue nil
         @presenter.press(char)
-      }
+      end
       
-      on_about {
+      on_about do
         display_about_dialog
-      }
+      end
     }
   end
 
@@ -59,16 +59,16 @@ class Calculator
       operation_button('÷')
       operation_button('×')
       operation_button('−')
-      (7..9).each { |number|
+      (7..9).each do |number|
         number_button(number)
-      }
+      end
       operation_button('+', font: BUTTON_FONT_BIG, vertical_span: 2)
-      (4..6).each { |number|
+      (4..6).each do |number|
         number_button(number)
-      }
-      (1..3).each { |number|
+      end
+      (1..3).each do |number|
         number_button(number)
-      }
+      end
       command_button('=', font: BUTTON_FONT_BIG, vertical_span: 2)
       number_button(0, horizontal_span: 2)
       operation_button('.')
@@ -98,9 +98,9 @@ class Calculator
         vertical_span options[:vertical_span]
       }
       
-      on_widget_selected {
+      on_widget_selected do
         @presenter.press(command)
-      }
+      end
     }
   end
 

data/samples/elaborate/contact_manager.rb

@@ -40,6 +40,7 @@ class ContactManager
             margin_width 0
             margin_height 0
           }
+          
           layout_data :fill, :center, true, false
           text 'Lookup Contacts'
           font height: 24
@@ -52,9 +53,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :first_name]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           label {
@@ -65,9 +67,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :last_name]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           label {
@@ -78,9 +81,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :email]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           composite {
@@ -94,18 +98,26 @@ class ContactManager
             
             button {
               text "&Find"
-              on_widget_selected { @contact_manager_presenter.find }
-              on_key_pressed {|key_event|
+              
+              on_widget_selected do
+                @contact_manager_presenter.find
+              end
+              
+              on_key_pressed do |key_event|
                 @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-              }
+              end
             }
             
             button {
               text "&List All"
-              on_widget_selected { @contact_manager_presenter.list }
-              on_key_pressed {|key_event|
+              
+              on_widget_selected do
+                @contact_manager_presenter.list
+              end
+              
+              on_key_pressed do |key_event|
                 @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
-              }
+              end
             }
           }
         }
@@ -134,9 +146,9 @@ class ContactManager
           
           items <=> [@contact_manager_presenter, :results, column_properties: [:first_name, :last_name, :email]]
           
-          on_mouse_up { |event|
+          on_mouse_up do |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
-          }
+          end
         }
       }
     }

data/samples/elaborate/game_of_life.rb

@@ -50,9 +50,9 @@ class GameOfLife
             rectangle(column_index*CELL_WIDTH, row_index*CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT) {
               background <= [@grid.cell_rows[row_index][column_index], "alive", on_read: ->(a) {a ? :black : :white}]
               
-              on_mouse_down {
+              on_mouse_down do
                 @grid.cell_rows[row_index][column_index].toggle_aliveness!
-              }
+              end
             }
           end
         end
@@ -67,26 +67,26 @@ class GameOfLife
           text 'Step'
           enabled <= [@grid, :playing, on_read: :! ]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.step!
-          }
+          end
         }
         
         button {
           text 'Clear'
           enabled <= [@grid, :playing, on_read: :! ]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.clear!
-          }
+          end
         }
                 
         button {
           text <= [@grid, :playing, on_read: ->(p) { p ? 'Stop' : 'Play' }]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.toggle_playback!
-          }
+          end
         }
   
         label {

data/samples/elaborate/klondike_solitaire/view/action_panel.rb

@@ -19,9 +19,9 @@ class KlondikeSolitaire
             
             text 'Restart Game'
             
-            on_widget_selected {
+            on_widget_selected do
               game.restart!
-            }
+            end
           }
         }
       }

data/samples/elaborate/klondike_solitaire/view/klondike_solitaire_menu_bar.rb

@@ -7,12 +7,13 @@ class KlondikeSolitaire
       
       before_body do
         @display = display {
-          on_about {
+          on_about do
             display_about_dialog
-          }
-          on_preferences {
+          end
+          
+          on_preferences do
             display_about_dialog
-          }
+          end
         }
       end
   
@@ -20,30 +21,34 @@ class KlondikeSolitaire
         menu_bar {
           menu {
             text '&Game'
+            
             menu_item {
               text '&Restart'
               accelerator (OS.mac? ? :command : :ctrl), :r
               
-              on_widget_selected {
+              on_widget_selected do
                 game.restart!
-              }
+              end
             }
+            
             menu_item {
               text 'E&xit'
               accelerator :alt, :f4
               
-              on_widget_selected {
+              on_widget_selected do
                 exit(0)
-              }
+              end
             }
           }
           menu {
             text '&Help'
+            
             menu_item {
               text '&About...'
-              on_widget_selected {
+              
+              on_widget_selected do
                 display_about_dialog
-              }
+              end
             }
           }
         }

data/samples/elaborate/login.rb

@@ -81,9 +81,9 @@ class Login
           text <=> [@presenter, :user_name]
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_key_pressed { |event|
+          on_key_pressed do |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
-          }
+          end
         }
 
         label { text "Password:" }
@@ -91,9 +91,9 @@ class Login
           text <=> [@presenter, :password]
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_key_pressed { |event|
+          on_key_pressed do |event|
             @presenter.login! if event.keyCode == swt(:cr)
-          }
+          end
         }
 
         label { text "Status:" }
@@ -103,25 +103,31 @@ class Login
           text "Login"
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_widget_selected { @presenter.login! }
-          on_key_pressed { |event|
+          on_widget_selected do
+            @presenter.login!
+          end
+          
+          on_key_pressed do |event|
             if event.keyCode == swt(:cr)
               @presenter.login!
             end
-          }
+          end
         }
 
         button {
           text "Logout"
           enabled <= [@presenter, :logged_in?, computed_by: :status]
           
-          on_widget_selected { @presenter.logout! }
-          on_key_pressed { |event|
+          on_widget_selected do
+            @presenter.logout!
+          end
+          
+          on_key_pressed do |event|
             if event.keyCode == swt(:cr)
               @presenter.logout!
               @user_name_text.set_focus
             end
-          }
+          end
         }
       }
     }