glimmer-dsl-swt 4.22.0.0 → 4.22.2.0

data/samples/elaborate/quarto/view/selected_piece_area.rb

@@ -0,0 +1,69 @@
+# 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 'piece'
+
+class Quarto
+  module View
+    class SelectedPieceArea
+      include Glimmer::UI::CustomShape
+      
+      options :game
+      option :location_x, default: 0
+      option :location_y, default: 0
+      
+      attr_reader :selected_piece
+      
+      body {
+        rectangle(location_x, location_y, PIECES_AREA_WIDTH, SELECTED_PIECE_AREA_HEIGHT) {
+          background COLOR_WOOD
+          
+          rectangle(0, 0, :max, :max, round: true) { # border
+            foreground :black
+            line_width 2
+          }
+          
+          text('Selected Piece', 15, 10) {
+            font height: 18, style: :bold
+          }
+          
+          on_drop do |drop_event|
+            dragged_piece = drop_event.dragged_shape
+            if dragged_piece.parent.get_data('custom_shape').is_a?(AvailablePiecesArea)
+              model = dragged_piece.get_data('custom_shape').model
+              dragged_piece.dispose
+              body_root.content {
+                @selected_piece = piece(game: game, model: model, location_x: 15, location_y: 15 + 25)
+              }
+              game.select_piece(model)
+            else
+              drop_event.doit = false
+            end
+          end
+        }
+      }
+      
+      def reset_selected_piece
+        @selected_piece&.dispose
+      end
+    end
+  end
+end

data/samples/elaborate/quarto.rb

@@ -0,0 +1,188 @@
+# 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 'yaml'
+
+require_relative 'quarto/model/game'
+require_relative 'quarto/view/board'
+require_relative 'quarto/view/available_pieces_area'
+require_relative 'quarto/view/selected_piece_area'
+require_relative 'quarto/view/message_box_panel'
+
+class Quarto
+  include Glimmer::UI::CustomShell
+  
+  BOARD_DIAMETER = 430
+  PIECES_AREA_WIDTH = 252
+  AVAILABLE_PIECES_AREA_HEIGHT = 295
+  SELECTED_PIECE_AREA_HEIGHT = 124
+  CELL_DIAMETER = 68
+  CELL_LINE_WIDTH = 5
+  CELL_MARGIN = 7
+  SHELL_MARGIN = 15
+  AREA_MARGIN = 10
+  ROW_COUNT = 4
+  COLUMN_COUNT = 4
+  COLOR_WOOD = rgb(239, 196, 156)
+  COLOR_AREA = rgb(206, 188, 170)
+  COLOR_LIGHT_WOOD = rgb(254, 187, 120)
+  COLOR_DARK_WOOD = rgb(204, 108, 58)
+  FILE_QUARTO_CONFIG = File.join(Dir.home, '.quarto')
+  
+  before_body do
+    load_quarto_config
+    @game = Model::Game.new
+    
+    observe(@game, :current_move) do |new_move|
+      perform_current_move
+    end
+    
+    observe(@game, :over) do |game_over_status|
+      if game_over_status
+        game_over_message = "Game Over! "
+        game_over_message += @game.winner_player_number.nil? ? "Draw!" : "Player #{@game.winner_player_number} wins!"
+        body_root.content {
+          @open_message_box_panel&.close
+          @open_message_box_panel = message_box_panel(
+            message: game_over_message,
+            background_color: COLOR_LIGHT_WOOD,
+            text_font: {height: 16}
+          ) {
+            on_closed do
+              restart_game
+            end
+          }
+        }
+      end
+    end
+  end
+  
+  after_body do
+    perform_current_move
+  end
+  
+  body {
+    shell(:shell_trim, (:double_buffered unless OS.mac?)) {
+      text 'Glimmer Quarto'
+      minimum_size BOARD_DIAMETER + AREA_MARGIN + PIECES_AREA_WIDTH + SHELL_MARGIN*2 + (OS.linux? ? 52 : (OS.windows? ? 16 : 0)), BOARD_DIAMETER + 24 + SHELL_MARGIN*2 + (OS.linux? ? 96 : (OS.windows? ? 32 : 0))
+      maximum_size BOARD_DIAMETER + AREA_MARGIN + PIECES_AREA_WIDTH + SHELL_MARGIN*2 + (OS.linux? ? 52 : (OS.windows? ? 16 : 0)), BOARD_DIAMETER + 24 + SHELL_MARGIN*2 + (OS.linux? ? 96 : (OS.windows? ? 32 : 0))
+      background COLOR_WOOD
+      
+      quarto_menu_bar
+      
+      @board = board(game: @game, location_x: SHELL_MARGIN, location_y: SHELL_MARGIN)
+  
+      @available_pieces_area = available_pieces_area(game: @game, location_x: SHELL_MARGIN + BOARD_DIAMETER + AREA_MARGIN, location_y: SHELL_MARGIN)
+      @selected_piece_area = selected_piece_area(game: @game, location_x: SHELL_MARGIN + BOARD_DIAMETER + AREA_MARGIN, location_y: SHELL_MARGIN + AVAILABLE_PIECES_AREA_HEIGHT + AREA_MARGIN)
+    }
+  }
+  
+  def quarto_menu_bar
+    menu_bar {
+      menu {
+        text 'Game'
+        
+        menu_item {
+          text 'Restart'
+          
+          on_widget_selected do
+            restart_game
+          end
+        }
+        
+        menu_item {
+          text 'Exit'
+          
+          on_widget_selected do
+            exit(0)
+          end
+        }
+      }
+      menu {
+        text 'Help'
+        
+        menu_item(:check) {
+          text 'Help Pop-Ups Enabled'
+          selection <=> [self, :help_pop_ups_enabled]
+        }
+      }
+    }
+  end
+  
+  def help_pop_ups_enabled
+    @quarto_config[:help_pop_ups_enabled]
+  end
+  alias help_pop_ups_enabled? help_pop_ups_enabled
+  
+  def help_pop_ups_enabled=(new_value)
+    @quarto_config[:help_pop_ups_enabled] = new_value
+    save_quarto_config
+  end
+  
+  def load_quarto_config
+    @quarto_config = YAML.load(File.read(FILE_QUARTO_CONFIG)) rescue {}
+    @quarto_config[:help_pop_ups_enabled] = true if @quarto_config[:help_pop_ups_enabled].nil?
+    @quarto_config
+  end
+  
+  def save_quarto_config
+    File.write(FILE_QUARTO_CONFIG, YAML.dump(@quarto_config))
+  rescue => e
+    puts "Unable to save quarto config file to: #{@quarto_config}"
+  end
+  
+  def perform_current_move
+    verbiage = nil
+    case @game.current_move
+    when :select_piece
+      @available_pieces_area.pieces.each {|piece| piece.drag_source = true}
+      verbiage = "Player #{@game.current_player_number} must drag a piece to the Selected Piece\narea for the other player to place on the board!"
+    when :place_piece
+      @available_pieces_area.pieces.each {|piece| piece.drag_source = false}
+      @selected_piece_area.selected_piece.drag_source = true
+      verbiage = "Player #{@game.current_player_number} must drag the selected piece to the board\nin order to place it!"
+    end
+    body_root.text = "Glimmer Quarto | Player #{@game.current_player_number} #{@game.current_move.to_s.split('_').map(&:capitalize).join(' ')}"
+    if help_pop_ups_enabled?
+      async_exec do
+        body_root.content {
+          @open_message_box_panel&.close
+          @open_message_box_panel = message_box_panel(
+            message: verbiage,
+            background_color: COLOR_LIGHT_WOOD,
+            text_font: {height: 16}
+          )
+        }
+        body_root.redraw
+      end
+    end
+  end
+  
+  def restart_game
+    @available_pieces_area.reset_pieces
+    @selected_piece_area.reset_selected_piece
+    @board.reset_cells
+    @game.restart
+  end
+end
+
+Quarto.launch

data/samples/hello/hello_canvas_data_binding.rb

@@ -195,13 +195,13 @@ class HelloCanvasDataBinding
             background :white
             
             line {
-              x1 <=> [self, :x1_value]
-              y1 <=> [self, :y1_value]
-              x2 <=> [self, :x2_value]
-              y2 <=> [self, :y2_value]
-              foreground <=> [self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue]]
-              line_width <=> [self, :line_width_value]
-              line_style <=> [self, :line_style_value]
+              x1 <= [self, :x1_value]
+              y1 <= [self, :y1_value]
+              x2 <= [self, :x2_value]
+              y2 <= [self, :y2_value]
+              foreground <= [self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue]]
+              line_width <= [self, :line_width_value]
+              line_style <= [self, :line_style_value]
             }
           }
         }

data/samples/hello/hello_custom_widget.rb

@@ -32,11 +32,24 @@ class GreetingLabel
   option :greeting, default: 'Hello'
   
   # internal attribute (not a custom widget option)
-  attr_accessor :color
+  attr_accessor :label_color
+  
+  def can_handle_observation_request?(event, &block)
+    event.to_s == 'on_color_changed' || super
+  end
+  
+  def handle_observation_request(event, &block)
+    if event.to_s == 'on_color_changed'
+      @color_changed_handlers ||= []
+      @color_changed_handlers << block
+    else
+      super
+    end
+  end
   
   before_body do
     @font = {height: 24, style: :bold}
-    @color = :black
+    @label_color = :black
   end
   
   after_body do
@@ -44,7 +57,8 @@ class GreetingLabel
     
     Thread.new {
       colors.cycle { |color|
-        self.color = color
+        self.label_color = color
+        @color_changed_handlers&.each {|handler| handler.call(color)}
         sleep(1)
       }
     }
@@ -55,7 +69,7 @@ class GreetingLabel
     label(swt_style) {
       text "#{greeting}, #{name}!"
       font @font
-      foreground <=> [self, :color]
+      foreground <=> [self, :label_color]
     }
   }
   
@@ -82,5 +96,9 @@ shell {
   }
   
   # the colors option cycles between colors for the label foreground every second
-  greeting_label(:center, name: 'Mary', greeting: 'Aloha', colors: [:red, :dark_green, :blue])
+  greeting_label(:center, name: 'Mary', greeting: 'Aloha', colors: [:red, :dark_green, :blue]) {
+    on_color_changed do |color|
+      puts "Label color changed: #{color}"
+    end
+  }
 }.open

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.22.0.0
+  version: 4.22.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.5
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -144,26 +144,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logging
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -364,21 +344,22 @@ dependencies:
         version: 0.7.0
 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, MSI/EXE files on Windows, and DEB/RPM files on Linux.
-  Glimmer was the first Ruby gem to bring SWT (Standard Widget Toolkit) to Ruby, thanks
-  to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf speaker.
+  JVM version of Ruby. It includes SWT 4.22 (released November 24, 2021). 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, MSI/EXE
+  files on Windows, and DEB/RPM files on Linux. Glimmer was the first Ruby gem to
+  bring SWT (Standard Widget Toolkit) to Ruby, thanks to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf
+  speaker.
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -404,7 +385,6 @@ files:
 - bin/girb_runner.rb
 - bin/glimmer
 - bin/glimmer-setup
-- bin/glimmer_runner.rb
 - docs/reference/GLIMMER_COMMAND.md
 - docs/reference/GLIMMER_CONFIGURATION.md
 - docs/reference/GLIMMER_GIRB.md
@@ -522,6 +502,7 @@ files:
 - lib/glimmer/swt/proxy_properties.rb
 - lib/glimmer/swt/sash_form_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
+- lib/glimmer/swt/shape_listener_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/styled_text_proxy.rb
@@ -591,6 +572,7 @@ files:
 - samples/elaborate/klondike_solitaire/view/empty_playing_card.rb
 - samples/elaborate/klondike_solitaire/view/foundation_pile.rb
 - samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb
+- samples/elaborate/klondike_solitaire/view/klondike_solitaire_menu_bar.rb
 - samples/elaborate/klondike_solitaire/view/playing_card.rb
 - samples/elaborate/klondike_solitaire/view/tableau.rb
 - samples/elaborate/login.rb
@@ -601,6 +583,19 @@ files:
 - samples/elaborate/parking/model/parking_floor.rb
 - samples/elaborate/parking/model/parking_presenter.rb
 - samples/elaborate/parking/model/parking_spot.rb
+- samples/elaborate/quarto.rb
+- samples/elaborate/quarto/model/game.rb
+- samples/elaborate/quarto/model/piece.rb
+- samples/elaborate/quarto/model/piece/cube.rb
+- samples/elaborate/quarto/model/piece/cylinder.rb
+- samples/elaborate/quarto/view/available_pieces_area.rb
+- samples/elaborate/quarto/view/board.rb
+- samples/elaborate/quarto/view/cell.rb
+- samples/elaborate/quarto/view/cube.rb
+- samples/elaborate/quarto/view/cylinder.rb
+- samples/elaborate/quarto/view/message_box_panel.rb
+- samples/elaborate/quarto/view/piece.rb
+- samples/elaborate/quarto/view/selected_piece_area.rb
 - samples/elaborate/stock_ticker.rb
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb

data/bin/glimmer_runner.rb

@@ -1,4 +0,0 @@
-require_relative '../lib/glimmer-dsl-swt'
-require_relative '../lib/glimmer/launcher'
-
-Glimmer::Launcher.new(ARGV).launch