glimmer-dsl-swt 4.20.13.14 → 4.20.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e7f58c70a78eb8867dd0116be71fb75a3a369deeb7f5676c673dde098304d55
-  data.tar.gz: '078a62bf56f74b1e156ef520d39c37e15b2324367bd813d0dd6a2a3f66e52e2d'
+  metadata.gz: 41658f842e145c053d12a6b5b07d93607523a2400092aa2fe0d1017d2683fa93
+  data.tar.gz: c5fc77baf99b69ebe8f06f7550feed02a47adcb2417cca0e205be0182f4a22c6
 SHA512:
-  metadata.gz: 4bb4fc88a86497ce00a50735ee2c189d9fdfb1698e8fa568e1ddad2565809d40e8602bf309fd29efc933481fe3f7d142c50ba80ee7d571dd2eb7c6d0e4dba405
-  data.tar.gz: c43f3edbc949886f21029c429229b73b4f5c08a89af9f7ad42a02539de8a8bc842eff606ccd090609fe05802cc9685499390bd1997f813be714e730ba2f8f801
+  metadata.gz: bd12243a6229d64c56dc1a7fd18717b50f02e873d3d3e3c0088e6c95f86791d2f0f719efc4f02769097eceaa3e0c791044c2e0ec85d1d85ee6ec3f6edc4b612d
+  data.tar.gz: f25ea6a7597d29aa16d095b886ce6d0a5d367a4523c9fadd726c093f7f5ec7d2e4aed18f9666d9871b3b5403c0250502e8c6178545166ceedd10c5c663d2a1c5

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+### 4.20.14.0
+
+- Change `arrow` widget default SWT style to include `:down`
+- Hello, Arrow! sample
+
+### 4.20.13.17
+
+- Hello, Slider! sample
+
+### 4.20.13.16
+
+- Fix issue with setting app name (via `Display.app_name=`) when app is not packaged (always gets set to Glimmer)
+- Fix Hello, Custom Shell! sample
+
+### 4.20.13.15
+
+- Battleship elaborate sample
+
 ### 4.20.13.14
 
 - Connect 4 elaborate sample

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.20.13.14
+# [<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.20.14.0
 ## 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)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.14 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.14.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -199,11 +199,6 @@ Glimmer app:
 
 [![Math Bowling App Screenshot](https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/Math-Bowling-Screenshot.png)](https://github.com/AndyObtiva/MathBowling)
 
-**Note:** I offer Glimmer DSL for SWT as a free and open-source [Ruby Gem](https://rubygems.org/gems/glimmer-dsl-swt) that represents my interests in Ruby Programming, Desktop GUI application development with SWT, Object Oriented Design, Design Patterns, and Software Architecture.
-Additionally, I am sharing my professional experience and expertise in Eclipse SWT given that I am an [EclipseCon](http://andymaleh.blogspot.com/2007/03/eclipsecon-2007-day-3.html)/[EclipseWorld](http://andymaleh.blogspot.com/2008/11/eclipseworld-2008-highlights.html) presenter and have built professional applications in SWT/JFace/RCP for Obtiva and the Pampered Chef in the past. This is also done in the hopes that it would indirectly bring me work in a field I am extremely passionate about.
-That said, please keep in mind that I myself am learning topics in Software Engineering too everyday, including newer editions of SWT and JRuby, which seem to pop up every quarter.
-If you see anything that needs to be improved, please do not hesitate to contact me on [Gitter](https://gitter.im/AndyObtiva/glimmer) or submit [Issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues)/[Pull-Requests](https://github.com/AndyObtiva/glimmer-dsl-swt/pulls).
-
 ## Table of contents
 
 - [Glimmer (JRuby Desktop Development GUI Framework)](#jruby-desktop-development-gui-framework)
@@ -326,7 +321,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.14
+jgem install glimmer-dsl-swt -v 4.20.14.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +349,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.20.13.14'
+gem 'glimmer-dsl-swt', '~> 4.20.14.0'
 ```
 
 And, then run:
@@ -375,7 +370,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.14
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.14.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.13.14
+4.20.13.18

data/docs/reference/GLIMMER_SAMPLES.md

@@ -19,6 +19,7 @@
     - [Hello, Drag and Drop!](#hello-drag-and-drop)
     - [Hello, Menu Bar!](#hello-menu-bar)
     - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+    - [Hello, Arrow!](#hello-arrow)
     - [Hello, Custom Widget!](#hello-custom-widget)
     - [Hello, Custom Shell!](#hello-custom-shell)
     - [Hello, Sash Form!](#hello-sash-form)
@@ -33,6 +34,7 @@
     - [Hello, File Dialog!](#hello-file-dialog)
     - [Hello, Date Time!](#hello-date-time)
     - [Hello, Scale!](#hello-scale)
+    - [Hello, Slider!](#hello-slider)
     - [Hello, Spinner!](#hello-spinner)
     - [Hello, Table!](#hello-table)
     - [Hello, Link!](#hello-link)
@@ -65,6 +67,7 @@
     - [Game of Life](#game-of-life)
     - [Glimmer Tetris](#glimmer-tetris)
     - [Klondike Solitaire](#klondike-solitaire)
+    - [Battleship](#battleship)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
     - [Parking](#parking)
     - [Stock Ticker](#stock-ticker)
@@ -74,6 +77,7 @@
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
+    - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
 - [License](#license)
 
 ## Samples
@@ -397,6 +401,20 @@ Code:
 ![Hello Pop Up Context Menu](/images/glimmer-hello-pop-up-context-menu.png)
 ![Hello Pop Up Context Menu Popped Up](/images/glimmer-hello-pop-up-context-menu-popped-up.png)
 
+#### Hello, Arrow!
+
+This sample demonstrates `arrow` button (aka `button(:arrow)`).
+
+Code:
+
+[samples/hello/hello_arrow.rb](/samples/hello/hello_arrow.rb)
+
+![Hello Arrow](/images/glimmer-hello-arrow.png)
+
+![Hello Arrow Menu](/images/glimmer-hello-arrow-menu.png)
+
+![Hello Arrow Item Selected](/images/glimmer-hello-arrow-item-selected.png)
+
 #### Hello, Custom Widget!
 
 This sample demonstrates the use of a custom widget in Glimmer.
@@ -612,6 +630,18 @@ Hello, Scale!
 
 ![Hello Scale](/images/glimmer-hello-scale.png)
 
+#### Hello, Slider!
+
+This sample demonstrates the use of `slider` widget in Glimmer
+
+Code:
+
+[samples/hello/hello_slider.rb](/samples/hello/hello_slider.rb)
+
+Hello, Slider!
+
+![Hello Slider](/images/glimmer-hello-slider.png)
+
 #### Hello, Spinner!
 
 This sample demonstrates the use of `spinner` widget in Glimmer
@@ -1066,7 +1096,7 @@ Connect 4 - Dropped Coin
 
 ![Connect 4 Dropped Coin](/images/glimmer-connect4-dropped-coin.png)
 
-Connect 4 - Player 1 Wins
+Connect 4 - Player 1 Wins (keeps the coin about to drop visual cue)
 
 ![Connect 4 Player 1 Wins](/images/glimmer-connect4-player1-wins.png)
 
@@ -1142,7 +1172,7 @@ Code:
 
 #### Klondike Solitaire
 
-This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and drag & drop.
+This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and canvas shape drag & drop.
 
 Code:
 
@@ -1152,6 +1182,26 @@ Code:
 
 ![Klondike Solitaire Played](/images/glimmer-klondike-solitaire-played.png)
 
+Check out a souped up large-card-size packaged version of the game in the [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire) external sample.
+
+#### Battleship
+
+This sample demonstrates how to build an interactive board game with A.I., MVC architecture, hybrid canvas widget/shape approach, custom-widgets, data-binding, observers, and widget drag & drop.
+
+Code:
+
+[samples/elaborate/battleship.rb](/samples/elaborate/battleship.rb)
+
+![Battleship](/images/glimmer-battleship.png)
+
+![Battleship Placement](/images/glimmer-battleship-placement.png)
+
+![Battleship Ready for Battle](/images/glimmer-battleship-ready-for-battle.png)
+
+![Battleship Won](/images/glimmer-battleship-won.png)
+
+![Battleship Game Over](/images/glimmer-battleship-game-over.png)
+
 #### Mandelbrot Fractal
 
 This sample demonstrates how to render canvas graphics with multi-threaded processing taking advantage of all CPU cores and doing background processing of images.
@@ -1275,6 +1325,14 @@ Gladiator is a good demonstration of:
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-timer/master/glimmer-timer-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-timer)
 
+#### Glimmer Klondike Solitaire
+
+This is a souped up version of the Klondike Solitaire elaborate sample, which is built as an external application to enable packaging as a native executable installer. Enjoy!
+
+[<img alt="Glimmer Klondike Solitaire Icon" src="https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/package/linux/Glimmer%20Klondike%20Solitaire.png" height=40 /> Glimmer Klondike Solitaire](https://github.com/AndyObtiva/glimmer_klondike_solitaire)
+
+![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
+
 ## License
 
 [MIT](LICENSE.txt)

data/lib/glimmer/swt/display_proxy.rb

@@ -200,12 +200,14 @@ module Glimmer
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
-            system_menu = swt_display.getSystemMenu
-            menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-            listener = ConcreteListener.new(&block)
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
-            Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
-            display_mac_event_registration
+            auto_exec do
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              listener = ConcreteListener.new(&block)
+              display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
+              Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+              display_mac_event_registration
+            end
           end
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -48,7 +48,7 @@ module Glimmer
       include Custom::Drawable
 
       DEFAULT_STYLES = {
-        'arrow'               => [:arrow],
+        'arrow'               => [:arrow, :down],
         'button'              => [:push],
         'canvas'              => ([:double_buffered] unless OS.mac?),
         'ccombo'              => [:border],

data/lib/glimmer/ui/custom_shell.rb

@@ -30,8 +30,8 @@ module Glimmer
       
       class << self
         def launch(*args, &content)
+          launched_custom_shell = send(keyword, *args, &content)
           auto_exec do
-            launched_custom_shell = send(keyword, *args, &content)
             launched_custom_shell.swt_widget.set_data('launched', true)
             launched_custom_shell.open
           end

data/lib/glimmer/ui/custom_widget.rb

@@ -176,16 +176,16 @@ module Glimmer
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content
-        execute_hook('before_body')
+        auto_exec { execute_hook('before_body') }
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
-        @body_root = instance_exec(&body_block)
+        @body_root = auto_exec { instance_exec(&body_block) }
         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
         auto_exec do
           @swt_widget.set_data('custom_widget', self)
         end
-        execute_hook('after_body')
+        auto_exec { execute_hook('after_body') }
         auto_exec do
           @dispose_listener_registration = @body_root.on_widget_disposed do
             observer_registrations.compact.each(&:deregister)

data/samples/elaborate/battleship.rb

@@ -0,0 +1,79 @@
+# 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 'glimmer-dsl-swt'
+require 'facets/string/titlecase'
+require 'facets/string/underscore'
+
+require_relative 'battleship/model/game'
+
+require_relative 'battleship/view/grid'
+require_relative 'battleship/view/ship_collection'
+require_relative 'battleship/view/action_panel'
+
+class Battleship
+  include Glimmer::UI::CustomShell
+
+  COLOR_WATER = rgb(156, 211, 219)
+  COLOR_SHIP = :dark_gray
+  
+  before_body do
+    @game = Model::Game.new
+  end
+    
+  after_body do
+    observe(@game, :over) do |game_over_value|
+      if game_over_value
+        game_over_message = if game_over_value == :you
+          "Game over!\nYou Won!"
+        else
+          "Game over!\nYou Lost!"
+        end
+        
+        message_box {
+          text 'Game Over!'
+          message game_over_message
+        }.open
+      end
+    end
+  end
+  
+  body {
+    shell(:no_resize) {
+      grid_layout(2, false) {
+        horizontal_spacing 15
+        vertical_spacing 15
+      }
+      
+      text 'Glimmer Battleship'
+
+      @enemy_grid = grid(game: @game, player: :enemy)
+      @enemy_ship_collection = ship_collection(game: @game, player: :enemy)
+      
+      @player_grid = grid(game: @game, player: :you)
+      @player_ship_collection = ship_collection(game: @game, player: :you)
+
+      action_panel(game: @game)
+    }
+  }
+end
+
+Battleship.launch

data/samples/elaborate/battleship/model/cell.rb

@@ -0,0 +1,84 @@
+# 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.
+
+class Battleship
+  module Model
+    class Cell
+      attr_reader :grid, :row_index, :column_index
+      attr_accessor :hit, :ship, :ship_index
+      alias hit? hit
+            
+      def initialize(grid, row_index, column_index)
+        @grid = grid
+        @row_index = row_index
+        @column_index = column_index
+      end
+      
+      def reset!
+        self.hit = nil
+        self.ship = nil
+        self.ship_index = nil
+      end
+      
+      # Places ship horizontally so that its top left cell is self,
+      # automatically figuring out the rest of the cells
+      def place_ship!(ship)
+        begin
+          old_ship_top_left_cell = ship.top_left_cell
+          old_ship_orientation = ship.orientation
+          ship.top_left_cell = self
+          if old_ship_top_left_cell
+            ship.cells(old_ship_orientation).each(&:reset!)
+            ship.length.times do |index|
+              if ship.orientation == :horizontal
+                old_cell = grid.cell_rows[old_ship_top_left_cell.row_index][old_ship_top_left_cell.column_index + index]
+              else
+                old_cell = grid.cell_rows[old_ship_top_left_cell.row_index + index][old_ship_top_left_cell.column_index]
+              end
+              old_cell.reset!
+            end
+          end
+          ship.length.times do |index|
+            if ship.orientation == :horizontal
+              cell = grid.cell_rows[row_index][column_index + index]
+            else
+              cell = grid.cell_rows[row_index + index][column_index]
+            end
+            cell.ship = ship
+            cell.ship_index = index
+          end
+        rescue => e
+          Glimmer::Config.logger.debug(e.full_message)
+        end
+      end
+      
+      def hit=(value)
+        @hit = value
+        ship&.sunk = true if ship&.all_cells_hit?
+        grid.game.over = grid.game.opposite_player(grid.player) if grid.game.started? && grid.game.ship_collections[grid.player].ships.values.map(&:sunk).all?
+      end
+      
+      def to_s
+        "#{(Grid::ROW_ALPHABETS[row_index])}#{(column_index + 1)}"
+      end
+    end
+  end
+end