glimmer-dsl-swt 4.18.3.1 → 4.18.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d88ee3cdf02d4610332fd450379b43ab5231e0a2e5e9941c746ea7b65bcad00
-  data.tar.gz: db869412b61dd6c45002cd11ebf7cdb046d02b4de9b74769ec8cd90122eafbd9
+  metadata.gz: ed3de759196522f355d23f94734175e7bd1f5957b25637005d2b266f0868cd3d
+  data.tar.gz: 4cf0d426d9ab01d53de2c52246be5521bce14e963b1269568d8ecee6f0d01326
 SHA512:
-  metadata.gz: 520388927363b967965f3afbbafdd753daf3c399547b87e5c60535620b12ffc694b05e14b5176b600fd1dcf7eecb4ee9c00ca41f4cbdda79ad138d2e593c836a
-  data.tar.gz: 5d52780657cac19b47ccec883b163b56fd1823f1701abef6e01e8b9b3109479648999506eb3dea2cb831826ab88eb562faf1c1a961f8d9c85620cfc956da7432
+  metadata.gz: f2a0569e88e07cedbd989aae075e1bf03721f88dc647906e1ce7c16492a59d129f282dd8ce53f535e76027cb402b3ea07a5b56d1ac8d2303dbdc468c1cd17741
+  data.tar.gz: d58989c1839bbe0d15e8fd8a96cdfb917a4c2a2bc9cc0382e2271ef40445b0b891d3ddd06e8f05b361535cfa57915e57e8cbbca0e2d19c2b2425670addfdbfba

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+### 4.18.3.2
+
+- Tetris High Scores
+- Tetris Modify High Score Player Name
+- Tetris Show High Scores (Menu Item + Accelerator)
+- Tetris add a menu item with beep enablement option
+- Tetris Clear High Scores
+- Tetris Add left and right alt (option) buttons as alternative to shift for rotation. Use left ctrl as rotate left. Use a, s, d as left, down, right.
+- Fix issues relating to setting parenthood with custom widgets before building their body (instead of after)
+- Fix issues relating to not respecting arity of passed in table editing callbacks: before_write, after_write, and after_cancel
+
 ### 4.18.3.1
 
 - Provide an auto_sync_exec all data-binding config option to automatically sync_exec GUI calls from other threads instead of requiring users to use sync_exec on model attribute-change logic. Default value to false.
@@ -10,9 +21,9 @@
 - Supporting deregistering Display listeners just like standard listeners via deregister
 - Enhance performance of excluded keyword check
 - Remove CustomWidget support for multiple before_body/after_body blocks instead of one each since it is not needed.
+- Add new :fill_screen style for `shell` to start app filling the screen size (not full screen mode though)
 - Tetris Menu Bar with Game Menu -> Start, Pause, Restart, and Exit
 - Tetris refactor mutation methods to end with bangs
-- Add new :fill_screen style for `shell` to start app filling the screen size (not full screen mode though)
 - Tetris Stop game if user does not play again in the end (instead of closing it)
 - End Tetris Thread loop gracefully if game over is encountered
 - Tetris use more observers instead of callbacks to Game

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.18.3.1
+# [<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.18.3.2
 ## 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)
@@ -241,6 +241,7 @@ If you see anything that needs to be improved, please do not hesitate to contact
     - [Desktop Apps Built with Glimmer DSL for SWT](#desktop-apps-built-with-glimmer-dsl-for-swt)
   - [Table of contents](#table-of-contents)
   - [Background](#background)
+  - [Software Architecture](#software-architecture)
   - [Platform Support](#platform-support)
   - [Pre-requisites](#pre-requisites)
   - [Setup](#setup)
@@ -407,6 +408,38 @@ If you see anything that needs to be improved, please do not hesitate to contact
 
 [Ruby](https://www.ruby-lang.org) is a dynamically-typed object-oriented language, which provides great productivity gains due to its powerful expressive syntax and dynamic nature. While it is proven by the [Ruby](https://www.ruby-lang.org) on Rails framework for web development, it currently lacks a robust platform-independent framework for building desktop applications. Given that Java libraries can now be utilized in Ruby code through JRuby, Eclipse technologies, such as [SWT](https://www.eclipse.org/swt/), JFace, and RCP can help fill the gap of desktop application development with Ruby.
 
+## Software Architecture
+
+There are several requirements for building enterprise-level/consumer-level desktop GUI applications:
+- Cross-Platform Support (Mac, Windows, Linux) without compilation/recompilation
+- OS Native Look & Feel
+- High Performance
+- Productivity
+- Maintainability
+- Extensibility
+- Native Executable Packaging
+- Multi-Threading / Parallel Programming
+- Arbitrary Graphics Painting
+- Audio Support
+
+Glimmer provides cross-platform support that does not require Ruby compilation (like Tk does), thanks to JRuby, a JVM (Java Virtual Machine) faster OS-threaded version of Ruby.
+
+Glimmer leverages SWT (Standard Widget Toolkit), which provides cross-platform widgets that automatically use the native GUI libraries under each operating system, such as Win32 on Windows, Cocoa on Mac, and GTK on Linux.
+
+Furthermore, what is special about SWT regarding "High Performance" is that it does all the GUI painting natively outside of Java, thus producing GUI that runs at maximum performance even in Ruby. As such, you do not need to worry about Ruby dynamic typing getting in the way of GUI performance. It has ZERO effect on it and since SWT supports making asynchronous calls for GUI rendering, you could avoid blocking the GUI completely with any computations happening in Ruby no matter how complex, thus never affecting the responsiveness of GUI of applications while taking full advantage of the productivity benefits of Ruby dynamic typing.
+
+Glimmer takes this further by providing a very programmer friendly DSL (Domain Specific Language) that visually maps lightweight Ruby syntax to the containment hierarchy of GUI widgets (meaning Ruby blocks nested within each other map to GUI widgets nested within each other). This provides maximum productivity and maintainability.
+
+Extensibility has never been simpler in desktop GUI application development than with Glimmer, which provides the ability to support any new custom keywords through custom widgets and custom shells (windows). Basically, you map a keyword by declaring a view class matching its name by convention with a GUI body that simply consists of reusable Glimmer GUI syntax. They can be passive views or smart views with additional logic. This provides the ultimate realization of Object Oriented Programming and micro-level MVC pattern.
+
+Thanks to Java and JRuby, Glimmer apps can be packaged as cross-platform JAR files (with JRuby Warbler) and native executables (with Java Packager) as Mac APP/DMG/PACKAGE or Windows EXE/MSI.
+
+The Java Virtual Machine already supports OS-native threads, so Glimmer apps can have multiple things running in parallel with no problem.
+
+SWT supports Canvas graphics drawing, and Glimmer takes that further by provding a Canvas Shape/Transform/Animation DSL, making it very simple to decorate any existing widgets or add new widgets with a completely custom look and feel if needed for branding or entertainment (gaming) purposes.
+
+Audio is supported via the Java Sound library in a cross-platform approach and video is supported via a Glimmer custom widget, so any Glimmer app can be enhanced with audio and video where needed.
+
 ## Platform Support
 
 Glimmer runs on the following platforms:
@@ -460,7 +493,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.3.1
+jgem install glimmer-dsl-swt -v 4.18.3.2
 
 
 ```
@@ -480,7 +513,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.18.3.1
+gem 'glimmer-dsl-swt', '~> 4.18.3.2
 '
 ```
 
@@ -539,7 +572,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.2
 
 
       
@@ -815,7 +848,7 @@ glimmer run
 
 #### Custom Shell
 
-To scaffold a Glimmer custom shell (full window view) for an existing Glimmer app, run the following command:
+To scaffold a Glimmer [custom shell](#custom-shells) (full window view) for an existing Glimmer app, run the following command:
 
 ```
 glimmer scaffold:customshell[name]
@@ -829,7 +862,7 @@ glimmer scaffold:cs[name]
 
 #### Custom Widget
 
-To scaffold a Glimmer custom widget (part of a view) for an existing Glimmer app, run the following command:
+To scaffold a Glimmer [custom widget](#custom-widgets) (part of a view) for an existing Glimmer app, run the following command:
 
 ```
 glimmer scaffold:customwidget[name]
@@ -843,7 +876,7 @@ glimmer scaffold:cw[name]
 
 #### Custom Shell Gem
 
-Custom shell gems are self-contained Glimmer apps as well as reusable custom shells.
+Custom shell gems are self-contained Glimmer apps as well as reusable [custom shells](#custom-shells).
 They have everything scaffolded Glimmer apps come with in addition to gem content like a [Juwelier](https://rubygems.org/gems/juwelier) Rakefile that can build gemspec and release gems.
 Unlike scaffolded Glimmer apps, custom shell gem content lives under the `lib` directory (not `app`).
 They can be packaged as both a native executable (e.g. Mac DMG/PKG/APP) and a Ruby gem.
@@ -878,7 +911,7 @@ Examples:
 
 #### Custom Widget Gem
 
-To scaffold a Glimmer custom widget gem (part of a view distributed as a Ruby gem), run the following command:
+To scaffold a Glimmer [custom widget](#custom-widgets) gem (part of a view distributed as a Ruby gem), run the following command:
 
 ```
 glimmer scaffold:gem:customwidget[name,namespace]
@@ -904,7 +937,7 @@ Examples:
 
 ### Gem Listing
 
-The `glimmer` command comes with tasks for listing Glimmer related gems to make it easy to find Glimmer Custom Shells, Custom Widgets, and DSLs published by others in the Glimmer community on [rubygems.org](http://www.rubygems.org).
+The `glimmer` command comes with tasks for listing Glimmer related gems to make it easy to find Glimmer [Custom Shells](#custom-shells), [Custom Widgets](#custom-widgets), and DSLs published by others in the Glimmer community on [rubygems.org](http://www.rubygems.org).
 
 #### Listing Custom Shell Gems
 
@@ -1020,7 +1053,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.3.1
+  Swt    glimmer-dsl-swt    4.18.3.2
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -1098,9 +1131,12 @@ bin/girb
 
 Watch out for hands-on examples in this README indicated by "you may copy/paste in [`girb`](#girb-glimmer-irb-command)"
 
-Keep in mind that all samples live under [https://github.com/AndyObtiva/glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt)
+Keep in mind that all samples live under [https://github.com/AndyObtiva/glimmer-dsl-swt/samples](https://github.com/AndyObtiva/glimmer-dsl-swt/samples)
 
-If you need a more GUI interactive option to experiement with Glimmer GUI DSL Syntax, you may try the ["Ugliest Editor Ever"](https://github.com/AndyObtiva/glimmer-cs-gladiator) or just build your own using the [Glimmer DSL for SWT Ruby Gem](https://rubygems.org/gems/glimmer-dsl-swt).
+If you need a more GUI interactive option to experiement with Glimmer GUI DSL Syntax, you may try:
+- [Glimmer Meta-Sample (The Sample of Samples)](#samples): allows launching Glimmer samples and viewing/editing code to learn/experiment too.
+- ["Ugliest Editor Ever"](https://github.com/AndyObtiva/glimmer-cs-gladiator)
+- Just build your own GUI editor using the [Glimmer DSL for SWT Ruby Gem](https://rubygems.org/gems/glimmer-dsl-swt).
 
 ## Glimmer GUI DSL Syntax
 
@@ -3496,6 +3532,8 @@ shell { |app_shell|
 }.open
 ```
 
+If you use a Custom Shell as the top-level app shell, you may invoke the class method `::launch` instead to avoid building an app class yourself or including Glimmer into the top-level namespace (e.g. `Tetris.launch` instead of `include Glimmer; tetris.open`)
+
 You may check out [Hello, Custom Shell!](#hello-custom-shell) for another example.
 
 ### Drag and Drop
@@ -4147,8 +4185,18 @@ end
 
 ### log_excluded_keywords
 
+(default = false)
+
 This just tells Glimmer whether to log excluded keywords or not (at the debug level). It is off by default.
 
+### auto_sync_exec
+
+(default = false)
+
+This automatically uses sync_exec on GUI calls from threads other than the main GUI thread instead of requiring users to manually use sync_exec. Default value to false.
+
+Keep in mind the caveat that it would force redraws on every minor changein the models instead of applying large scope changes all together, thus causing too much drawing/stutter in the GUI. As such, this is a good fit for simpler GUIs, not ones used with highly sophisticated 2D graphics. It may be mitigated in the future by introducing the idea of large-scale observation events that wrap around smaller events. Until then, keep the caveat in mind or just use sync_exec manually as usually done with Java SWT apps.
+
 ## Glimmer Style Guide
 
 - Widgets are declared with underscored lowercase versions of their SWT names minus the SWT package name.
@@ -4227,7 +4275,7 @@ You may edit the code of any sample before launching it by clicking on the "Laun
 Note that if you fail to run any sample through the Glimmer Meta-Sample for whatever reason, you could always run directly by cloning the project, running `bundle`, and then this command (drop the "bin" if you install the glimmer-dsl-swt gem instead):
 
 ```ruby
-bin/glimmer samples/hello/hello_canvas_transform.rb   
+bin/glimmer samples/hello/hello_canvas_transform.rb
 ```
 
 ### Hello Samples
@@ -4812,6 +4860,16 @@ Code:
 
 ![Tetris Game Over](images/glimmer-tetris-game-over.png)
 
+![Tetris High Scores](images/glimmer-tetris-high-score-dialog.png)
+
+![Tetris Game Menu](images/glimmer-tetris-game-menu.png)
+
+![Tetris View Menu](images/glimmer-tetris-view-menu.png)
+
+![Tetris Options Menu](images/glimmer-tetris-options-menu.png)
+
+![Tetris Help Menu](images/glimmer-tetris-help-menu.png)
+
 ### External Samples
 
 #### Glimmer Calculator

data/VERSION

@@ -1 +1 @@
-4.18.3.1
+4.18.3.2

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.3.1 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.1"
+  s.version = "4.18.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-01-27"
+  s.date = "2021-01-28"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -138,9 +138,10 @@ Gem::Specification.new do |s|
     "samples/elaborate/tetris.rb",
     "samples/elaborate/tetris/model/block.rb",
     "samples/elaborate/tetris/model/game.rb",
+    "samples/elaborate/tetris/model/past_game.rb",
     "samples/elaborate/tetris/model/tetromino.rb",
     "samples/elaborate/tetris/view/block.rb",
-    "samples/elaborate/tetris/view/game_over_dialog.rb",
+    "samples/elaborate/tetris/view/high_score_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",
     "samples/elaborate/tetris/view/score_lane.rb",
     "samples/elaborate/tetris/view/tetris_menu_bar.rb",

data/lib/glimmer/swt/shell_proxy.rb

@@ -117,10 +117,12 @@ module Glimmer
       def nested?
         !swt_widget&.parent.nil?
       end
+      alias nested nested?
       
       def disposed?
         swt_widget.isDisposed
       end
+      alias disposed disposed?
 
       def hide
         @swt_widget.setVisible(false)
@@ -129,6 +131,7 @@ module Glimmer
       def visible?
         @swt_widget.isDisposed ? false : @swt_widget.isVisible
       end
+      alias visible visible?
 
       # Setting to true opens/shows shell. Setting to false hides the shell.
       def visible=(visibility)

data/lib/glimmer/swt/table_proxy.rb

@@ -265,6 +265,10 @@ module Glimmer
         end
       end
 
+      def items
+        swt_widget.get_items
+      end
+
       def model_binding
         swt_widget.data
       end
@@ -445,7 +449,6 @@ module Glimmer
       end
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
-        require 'facets/hash/symbolize_keys'
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -467,7 +470,11 @@ module Glimmer
           @cancel_in_progress = true
           @table_editor_widget_proxy&.swt_widget&.dispose
           @table_editor_widget_proxy = nil
-          after_cancel&.call
+          if after_cancel&.arity == 0
+            after_cancel&.call
+          else
+            after_cancel&.call(table_item)
+          end
           @edit_in_progress = false
           @cancel_in_progress = false
           @cancel_edit = nil
@@ -484,14 +491,22 @@ module Glimmer
             if new_value == model.send(model_editing_property)
               @cancel_edit.call
             else
-              before_write&.call
+              if before_write&.arity == 0
+                before_write&.call
+              else
+                before_write&.call(edited_table_item)
+              end
               model.send("#{model_editing_property}=", new_value) # makes table update itself, so must search for selected table item again
               # Table refresh happens here because of model update triggering observers, so must retrieve table item again
               edited_table_item = search { |ti| ti.getData == model }.first
               swt_widget.showItem(edited_table_item)
               @table_editor_widget_proxy&.swt_widget&.dispose
               @table_editor_widget_proxy = nil
-              after_write&.call(edited_table_item)
+              if after_write&.arity == 0
+                after_write&.call
+              else
+                after_write&.call(edited_table_item)
+              end
               @edit_in_progress = false
             end
           end

data/lib/glimmer/ui/custom_shell.rb

@@ -32,6 +32,7 @@ module Glimmer
         
         def launch(*args, &content)
           @launched_custom_shell = send(keyword, *args, &content) if @launched_custom_shell.nil? || @launched_custom_shell.disposed?
+          @launched_custom_shell.swt_widget.set_data('launched', true)
           @launched_custom_shell.open
         end
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -163,6 +163,8 @@ module Glimmer
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
+        @parent = parent
+        @parent_proxy = @parent&.get_data('proxy')
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
@@ -174,9 +176,6 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
         @swt_widget.set_data('custom_widget', self)
-        @parent = parent
-        @parent ||= @swt_widget.parent
-        @parent_proxy ||= @parent&.get_data('proxy')
         execute_hook('after_body')
       end
       
@@ -254,6 +253,10 @@ module Glimmer
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
+      
+      def pack(*args)
+        body_root.pack(*args)
+      end
 
       # TODO see if it is worth it to eliminate duplication of async_exec/sync_exec
       # delegation to DisplayProxy, via a module

data/samples/elaborate/tetris.rb

@@ -25,13 +25,16 @@ require_relative 'tetris/model/game'
 
 require_relative 'tetris/view/playfield'
 require_relative 'tetris/view/score_lane'
-require_relative 'tetris/view/game_over_dialog'
+require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
 
 class Tetris
   include Glimmer::UI::CustomShell
   
   BLOCK_SIZE = 25
+  FONT_NAME = 'Menlo'
+  FONT_TITLE_HEIGHT = 32
+  FONT_TITLE_STYLE = :bold
   
   option :playfield_width, default: Model::Game::PLAYFIELD_WIDTH
   option :playfield_height, default: Model::Game::PLAYFIELD_HEIGHT
@@ -50,32 +53,36 @@ class Tetris
     display {
       @keyboard_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
-        when swt(:arrow_down)
+        when swt(:arrow_down), 's'.bytes.first
           game.down!
-        when swt(:arrow_left)
+        when swt(:arrow_left), 'a'.bytes.first
           game.left!
-        when swt(:arrow_right)
+        when swt(:arrow_right), 'd'.bytes.first
           game.right!
-        when swt(:shift)
+        when swt(:shift), swt(:alt)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when 'd'.bytes.first, swt(:arrow_up)
+        when swt(:arrow_up)
           game.rotate!(:right)
-        when 'a'.bytes.first
+        when swt(:ctrl)
           game.rotate!(:left)
         end
       }
+      
+      # if running in app mode, set the Mac app about dialog (ignored in platforms)
+      @about_observer = on_about {
+        show_about_dialog
+      }
     }
   }
   
   after_body {
     @game_over_observer = observe(@game, :game_over) do |game_over|
       if game_over
-        @game_over_dialog = game_over_dialog(parent_shell: body_root, game: @game) if @game_over_dialog.nil? || @game_over_dialog.disposed?
-        @game_over_dialog.show
+        show_high_score_dialog
       else
         start_moving_tetrominos_down
       end
@@ -92,19 +99,19 @@ class Tetris
         margin_height 0
         horizontal_spacing 0
       }
-      
+
       text 'Glimmer Tetris'
       minimum_size 475, 500
       background :gray
-      
+
       tetris_menu_bar(game: game)
-            
+
       playfield(game_playfield: game.playfield, playfield_width: playfield_width, playfield_height: playfield_height, block_size: BLOCK_SIZE)
-      
+
       score_lane(game: game, block_size: BLOCK_SIZE) {
         layout_data(:fill, :fill, true, true)
       }
-      
+
       on_widget_disposed {
         deregister_observers
       }
@@ -126,11 +133,24 @@ class Tetris
     end
   end
   
+  def show_high_score_dialog
+    return if @high_score_dialog&.visible?
+    @high_score_dialog = high_score_dialog(parent_shell: body_root, game: @game) if @high_score_dialog.nil? || @high_score_dialog.disposed?
+    @high_score_dialog.show
+  end
+  
+  def show_about_dialog
+    message_box {
+      text 'Glimmer Tetris'
+      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nCopyright (c) 2007-2021 Andy Maleh"
+    }.open
+  end
+  
   def deregister_observers
-    @game_over_observer&.deregister
-    @game_over_observer = nil
-    @keyboard_listener&.deregister
-    @keyboard_listener = nil
+    @show_high_scores_observer.deregister
+    @game_over_observer.deregister
+    @keyboard_listener.deregister
+    @about_observer&.deregister
   end
 end
 

data/samples/elaborate/tetris/model/game.rb

@@ -19,8 +19,14 @@
 # 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 'fileutils'
+require 'etc'
+require 'glimmer/data_binding/observer'
+require 'glimmer/config'
+
 require_relative 'block'
 require_relative 'tetromino'
+require_relative 'past_game'
 
 class Tetris
   module Model
@@ -32,13 +38,18 @@ class Tetris
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score
       alias game_over? game_over
       alias paused? paused
+      alias beeping? beeping
+      alias added_high_score? added_high_score
       
       def initialize(playfield_width = PLAYFIELD_WIDTH, playfield_height = PLAYFIELD_HEIGHT)
         @playfield_width = playfield_width
         @playfield_height = playfield_height
+        @high_scores = []
+        @beeping = true
+        load_high_scores!
       end
     
       def configure_beeper(&beeper)
@@ -63,10 +74,51 @@ class Tetris
       end
       alias restart! start!
       
+      def game_over!
+        add_high_score!
+        beep
+        self.game_over = true
+      end
+      
+      def clear_high_scores!
+        high_scores.clear
+      end
+      
+      def add_high_score!
+        self.added_high_score = true
+        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score))
+      end
+      
+      def save_high_scores!
+        high_score_file_content = @high_scores.map {|past_game| past_game.to_a.join("\t") }.join("\n")
+        FileUtils.mkdir_p(tetris_dir)
+        File.write(tetris_high_score_file, high_score_file_content)
+      rescue => e
+        # Fail safely by keeping high scores in memory if unable to access disk
+        Glimmer::Config.logger.error {"Failed to save high scores in: #{tetris_high_score_file}\n#{e.full_message}"}
+      end
+      
+      def load_high_scores!
+        if File.exist?(tetris_high_score_file)
+          self.high_scores = File.read(tetris_high_score_file).split("\n").map {|line| PastGame.new(*line.split("\t")) }
+        end
+      rescue => e
+        # Fail safely by keeping high scores in memory if unable to access disk
+        Glimmer::Config.logger.error {"Failed to load high scores from: #{tetris_high_score_file}\n#{e.full_message}"}
+      end
+      
+      def tetris_dir
+        @tetris_dir ||= File.join(Etc.getpwuid.dir, '.glimmer-tetris')
+      end
+      
+      def tetris_high_score_file
+        File.join(tetris_dir, "high_scores.txt")
+      end
+      
       def down!
         return unless game_in_progress?
         current_tetromino.down!
-        self.game_over = true if current_tetromino.row <= 0 && current_tetromino.stopped?
+        game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
       def right!
@@ -147,7 +199,7 @@ class Tetris
       end
       
       def beep
-        @beeper&.call
+        @beeper&.call if beeping
       end
       
       def reset_tetrominoes

data/samples/elaborate/tetris/{view/game_over_dialog.rb → model/past_game.rb}

@@ -19,50 +19,8 @@
 # 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 'tetris_menu_bar'
-
 class Tetris
-  module View
-    class GameOverDialog
-      include Glimmer::UI::CustomShell
-  
-      options :parent_shell, :game
-      
-      after_body {
-        observe(game, :game_over) do |game_over|
-          hide if !game_over
-        end
-      }
-      
-      body {
-        dialog(parent_shell) {
-          row_layout {
-            type :vertical
-            center true
-          }
-          text 'Tetris'
-          
-          tetris_menu_bar(game: game)
-          
-          label(:center) {
-            text 'Game Over!'
-            font name: 'Menlo', height: 30, style: :bold
-          }
-          label # filler
-          button {
-            text 'Play Again?'
-            
-            on_widget_selected {
-              hide
-              game.restart!
-            }
-          }
-          
-          on_shell_activated {
-            display.beep
-          }
-        }
-      }
-    end
+  module Model
+    PastGame = Struct.new(:name, :score)
   end
 end

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -0,0 +1,114 @@
+# Copyright (c) 2007-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_relative 'tetris_menu_bar'
+
+class Tetris
+  module View
+    class HighScoreDialog
+      include Glimmer::UI::CustomShell
+  
+      options :parent_shell, :game
+      
+      after_body {
+        @game_over_observer = observe(game, :game_over) do |game_over|
+          close if !game_over
+        end
+      }
+      
+      body {
+        dialog(parent_shell) {
+          row_layout {
+            type :vertical
+            center true
+          }
+          text 'Tetris'
+          
+          tetris_menu_bar(game: game)
+          
+          label(:center) {
+            text bind(game, :game_over) {|game_over| game_over ? 'Game Over!' : 'High Scores'}
+            font name: FONT_NAME, height: FONT_TITLE_HEIGHT, style: FONT_TITLE_STYLE
+          }
+          @high_score_table = table {
+            layout_data {
+              height 100
+            }
+            
+            table_column {
+              text 'Name'
+            }
+            table_column {
+              text 'Score'
+            }
+            
+            items bind(game, :high_scores), column_properties(:name, :score)
+          }
+          composite {
+            row_layout :horizontal
+                        
+            button {
+              text 'Clear'
+              
+              on_widget_selected {
+                game.clear_high_scores!
+              }
+            }
+            @play_close_button = button {
+              text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
+              focus true # initial focus
+              
+              on_widget_selected {
+                close
+                game.restart! if game.game_over?
+              }
+            }
+          }
+          
+          on_swt_show {
+            if game.game_over? && game.added_high_score?
+              game.added_high_score = false
+              @high_score_table.edit_table_item(
+                @high_score_table.items.first, # row item
+                0, # column
+                after_write: -> {
+                  game.save_high_scores!
+                  @play_close_button.set_focus
+                },
+                after_cancel: -> {
+                  @play_close_button.set_focus
+                },
+              )
+            end
+          }
+          
+          on_shell_closed {
+            @high_score_table.cancel_edit!
+          }
+          
+          on_widget_disposed {
+            @game_over_observer.deregister
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/tetris/view/score_lane.rb

@@ -30,8 +30,8 @@ class Tetris
       options :block_size, :game
       
       before_body {
-        @font_name = 'Menlo'
-        @font_height = 32
+        @font_name = FONT_NAME
+        @font_height = FONT_TITLE_HEIGHT
       }
   
       body {
@@ -46,13 +46,13 @@ class Tetris
           }
           label(:center) {
             text 'Next'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           playfield(game_playfield: game.preview_playfield, playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
 
           label(:center) {
             text 'Score'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :score)
@@ -63,7 +63,7 @@ class Tetris
           
           label(:center) {
             text 'Lines'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :lines)
@@ -74,7 +74,7 @@ class Tetris
           
           label(:center) {
             text 'Level'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :level)

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -49,7 +49,6 @@ class Tetris
             menu_item {
               text '&Restart'
               accelerator :command, :r
-              enabled bind(game, :game_over, on_read: :!)
               
               on_widget_selected {
                 game.restart!
@@ -64,9 +63,61 @@ class Tetris
                 parent_proxy.close
               }
             }
-          }
+          } # end of menu
+          
+          menu {
+            text '&View'
+            
+            menu {
+              text '&High Scores'
+              menu_item {
+                text '&Show'
+                accelerator :command, :shift, :h
+                
+                on_widget_selected {
+                  parent_custom_shell&.show_high_score_dialog
+                }
+              }
+              menu_item {
+                text '&Clear'
+                accelerator :command, :shift, :c
+                
+                on_widget_selected {
+                  game.clear_high_scores!
+                }
+              }
+            }
+          } # end of menu
+          
+          menu {
+            text '&Options'
+            menu_item(:check) {
+              text '&Beeping'
+              accelerator :command, :b
+              selection bind(game, :beeping)
+            }
+          } # end of menu
+          
+          menu {
+            text '&Help'
+            
+            menu_item {
+              text '&About'
+              accelerator :command, :shift, :a
+              
+              on_widget_selected {
+                parent_custom_shell&.show_about_dialog
+              }
+            }
+          } # end of menu
         }
       }
+      
+      def parent_custom_shell
+        # grab custom shell widget wrapping parent widget proxy (i.e. Tetris) and invoke method on it
+        the_parent_custom_shell = parent_proxy&.get_data('custom_shell')
+        the_parent_custom_shell if the_parent_custom_shell&.visible?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.3.1
+  version: 4.18.3.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -471,9 +471,10 @@ files:
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb
 - samples/elaborate/tetris/model/game.rb
+- samples/elaborate/tetris/model/past_game.rb
 - samples/elaborate/tetris/model/tetromino.rb
 - samples/elaborate/tetris/view/block.rb
-- samples/elaborate/tetris/view/game_over_dialog.rb
+- samples/elaborate/tetris/view/high_score_dialog.rb
 - samples/elaborate/tetris/view/playfield.rb
 - samples/elaborate/tetris/view/score_lane.rb
 - samples/elaborate/tetris/view/tetris_menu_bar.rb