glimmer-cs-calculator 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1181ebd61993301957b214666f187c7ecf1be2aea7bb288aa6abb67ddc664225
-  data.tar.gz: 170e6809beb9a4b6dca428a8cd83f9772d496e54ab1a8a92a15982704ffcfa14
+  metadata.gz: 897141c9ef84b60521fb95588fc994824e573fb3a75f60f964df9f46fb586409
+  data.tar.gz: '008c1d1874d3cfcb3c0dc281f678ce84b2b0ce188c6889db18594e54c7761791'
 SHA512:
-  metadata.gz: 38d88bed477197cfd91b52eeac642ae31ccecdcf56df7324f1e6bbd009c15db28038486df02921ddbdcb36cf0f3858799b09dee26691c601995283e5a131c7f8
-  data.tar.gz: 7680cbdd1555d5db2e55a2724807ad7812ca943a879bd873115150bf342d4e5d88b0845ac5dbf8ff4ac2e1d2273bc777336b0e12322c6143da73b8a207ae5aac
+  metadata.gz: 17eb51f99d846c5b4711ae8d828099eec41cff6efa2447f8eda36ea26d7e3068379ffd39cf2402950f06eec043baeeb531ee80afef57e22eb21b79ddfe2dbd2f
+  data.tar.gz: aa0e0237a9831a6d9cb98a903f8f08a819f9a0813ba1f8dcd49dd53417b265c392f99e24a75b92816b18d2b9da6afa4b67688e3275176871b13a29de6c410811

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Change Log
+
+## 1.1.2
+
+- Official Opal (Web) support via [Glimmer DSL for Opal](https://github.com/AndyObtiva/glimmer-dsl-opal)
+
+## 1.1.1
+
+- Official Windows support
+- Official Linux support
+- Refactorings, extracting method-based custom widgets
+
+## 1.1.0
+
+- Upgrade support for glimmer-dsl-swt to 4.17.2.0 up to 5.0.0.0
+
+## 1.0.2
+
+- Relaxed dependency on glimmer-dsl-swt (>= 0.1.1 < 2.0.0) / updated logo / used new Glimmer `message_box` keyword syntax
+
+## 1.0.1
+
+- Upgraded to glimmer-dsl-swt v0.1.1 / added delete/backspace shortcut for AC / fixed issues with pressing operations without any number
+
+## 1.0.0
+
+- Initial calculator implementation

data/README.md

@@ -1,20 +1,47 @@
-# <img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" width="60" /> Calculator - Glimmer Custom Shell
+# <img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=85 /> Glimmer Calculator
+## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-calculator.svg)](http://badge.fury.io/rb/glimmer-cs-calculator)
 
+Glimmer Calculator on Mac
+
 ![Calculator](glimmer-cs-calculator-screenshot.png)
 
-Calculator sample desktop GUI application built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development Library).
+Glimmer Calculator on Windows
+
+![Calculator](glimmer-cs-calculator-screenshot-windows.png)
+
+Glimmer Calculator on Linux
+
+![Calculator](glimmer-cs-calculator-screenshot-linux.png)
+
+Glimmer Calculator on [Opal](https://github.com/AndyObtiva/glimmer-dsl-opal) (Web)
+
+![Calculator](glimmer-cs-calculator-screenshot-opal.png)
+
+Glimmer Calculator is a sample desktop GUI application built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
+
+Architectural Pattern is MVP (Model View Presenter) thanks to [Glimmer data-binding](https://github.com/AndyObtiva/glimmer-dsl-swt#data-binding) support.
+
+Glimmer Calculator was developed test-first following TDD (Test Driven Development) after [Glimmer Scaffolding](https://github.com/AndyObtiva/glimmer-dsl-swt#scaffolding). 
 
-It is developed test-first following TDD (Test Driven Development). 
 Design Patterns discovered in the process were Presenter/Facade and Command Pattern.
 
-Follows the MVP architectural pattern (Model View Presenter) thanks to [Glimmer data-binding](https://github.com/AndyObtiva/glimmer#data-binding) support.
+Here are the calculator commands under the [models directory](lib/models/glimmer/calculator):
+
+![Calculator Commands](glimmer-cs-calculator-command-pattern.png)
+
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.1 DMG for Mac](https://www.dropbox.com/s/2wbyy0z0w875n39/Glimmer%20Calculator-1.1.1.dmg?dl=1)
+
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.1 MSI for Windows](https://www.dropbox.com/s/e8b586s2xgjn9bg/Glimmer%20Calculator-1.1.1.msi?dl=1)
+
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.2 GEM for Linux](#setup-instructions)
 
 ## Platforms
 
-- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer#packaging--distribution) for the Mac. ([Download Here<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" width="30" />](https://www.dropbox.com/s/tdgwt2vfxfh13ro/Glimmer%20Calculator-1.0.0.dmg?dl=1))
-- Linux: Not tested/packaged for Linux, but should work by following setup instructions below.
-- Windows: Not tested/packaged for Windows, but should work by following setup instructions below.
+- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer-dsl-swt#packaging--distribution) for Mac. ([Download Here](https://www.dropbox.com/s/2wbyy0z0w875n39/Glimmer%20Calculator-1.1.1.dmg?dl=1))
+- Windows: Tested and [packaged](https://github.com/AndyObtiva/glimmer-dsl-swt#packaging--distribution) for Windows. ([Download Here](https://www.dropbox.com/s/e8b586s2xgjn9bg/Glimmer%20Calculator-1.1.1.msi?dl=1))
+- Linux: Tested and [packaged](http://rubygems.org/gems/glimmer-cs-calculator) for Linux (Follow [setup instructions](#setup-instructions) to install [gem](http://rubygems.org/gems/glimmer-cs-calculator) and run `calculator` command)
+- Opal (Web): Tested with [Glimmer DSL for Opal](https://github.com/AndyObtiva/glimmer-dsl-opal)
 
 ## Development Environment Pre-requisites
 
@@ -43,7 +70,7 @@ To reuse Calculator as a Glimmer Custom Shell inside another Glimmer application
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-calculator', '1.0.0'
+gem 'glimmer-cs-calculator', '1.1.2'
 ```
 
 Run:
@@ -54,6 +81,14 @@ jruby -S bundle
 
 And, then instantiate the Calculator custom shell in your Glimmer application via the `calculator` Glimmer DSL keyword.
 
+## Feature Suggestions
+
+[TODO.md](TODO.md)
+
+## Change Log
+
+[CHANGELOG.md](CHANGELOG.md)
+
 ## Contributing to glimmer-cs-calculator
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -66,5 +101,12 @@ And, then instantiate the Calculator custom shell in your Glimmer application vi
 
 ## Copyright
 
-Copyright (c) 2020 Andy Maleh. See LICENSE.txt for
-further details.
+[MIT](https://opensource.org/licenses/MIT)
+
+Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
+
+--
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library)
+
+Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.2

data/bin/calculator

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require 'glimmer/launcher'
 

data/bin/glimmer-cs-calculator

@@ -1,7 +1 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/glimmer-cs-calculator'
-
-include Glimmer
-
-calculator.open
+require_relative '../lib/glimmer-cs-calculator/launch'

data/glimmer-cs-calculator.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: glimmer-cs-calculator 1.1.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "glimmer-cs-calculator".freeze
+  s.version = "1.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Andy Maleh".freeze]
+  s.date = "2020-10-15"
+  s.description = "Calculator - Glimmer Custom Shell".freeze
+  s.email = "andy.am@gmail.com".freeze
+  s.executables = ["glimmer-cs-calculator".freeze, "calculator".freeze]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    "CHANGELOG.md",
+    "LICENSE.txt",
+    "README.md",
+    "VERSION",
+    "bin/calculator",
+    "bin/glimmer-cs-calculator",
+    "glimmer-cs-calculator.gemspec",
+    "lib/glimmer-cs-calculator.rb",
+    "lib/glimmer-cs-calculator/launch.rb",
+    "lib/models/glimmer/calculator/command.rb",
+    "lib/models/glimmer/calculator/command/all_clear.rb",
+    "lib/models/glimmer/calculator/command/equals.rb",
+    "lib/models/glimmer/calculator/command/number.rb",
+    "lib/models/glimmer/calculator/command/operation.rb",
+    "lib/models/glimmer/calculator/command/operation/add.rb",
+    "lib/models/glimmer/calculator/command/operation/divide.rb",
+    "lib/models/glimmer/calculator/command/operation/multiply.rb",
+    "lib/models/glimmer/calculator/command/operation/subtract.rb",
+    "lib/models/glimmer/calculator/command/point.rb",
+    "lib/models/glimmer/calculator/presenter.rb",
+    "lib/views/glimmer/calculator.rb",
+    "package/macosx/Glimmer Calculator.icns",
+    "package/windows/Glimmer Calculator.ico"
+  ]
+  s.homepage = "http://github.com/AndyObtiva/glimmer-cs-calculator".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.4".freeze
+  s.summary = "Calculator - Glimmer Custom Shell".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<easily_typable>.freeze, ["~> 1.0.2"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<glimmer-cs-gladiator>.freeze, [">= 0.3.0"])
+  else
+    s.add_dependency(%q<easily_typable>.freeze, ["~> 1.0.2"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<glimmer-cs-gladiator>.freeze, [">= 0.3.0"])
+  end
+end
+

data/lib/glimmer-cs-calculator.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
-require 'glimmer'
+require 'glimmer-dsl-swt'
+require 'bigdecimal'
 require 'views/glimmer/calculator'

data/lib/glimmer-cs-calculator/launch.rb

@@ -0,0 +1,5 @@
+require_relative '../glimmer-cs-calculator'
+
+include Glimmer
+ 
+calculator.open

data/lib/models/glimmer/calculator/command.rb

@@ -86,4 +86,14 @@ module Glimmer
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), 'command', '**', '*.rb')].each {|f| require(f)}
+# Dir[File.join(File.dirname(__FILE__), 'command', '**', '*.rb')].each {|f| require(f)}
+
+require 'models/glimmer/calculator/command/all_clear'
+require 'models/glimmer/calculator/command/equals'
+require 'models/glimmer/calculator/command/number'
+require 'models/glimmer/calculator/command/operation'
+require 'models/glimmer/calculator/command/point'
+require 'models/glimmer/calculator/command/operation/add'
+require 'models/glimmer/calculator/command/operation/divide'
+require 'models/glimmer/calculator/command/operation/multiply'
+require 'models/glimmer/calculator/command/operation/subtract'

data/lib/models/glimmer/calculator/command/all_clear.rb

@@ -2,7 +2,7 @@ module Glimmer
   class Calculator
     class Command
       class AllClear < Command
-        keywords 'AC', 'c', 'C', 27.chr
+        keywords 'AC', 'c', 'C', 8.chr, 27.chr, 127.chr
 
         def execute
           self.result = '0'

data/lib/models/glimmer/calculator/command/equals.rb

@@ -5,11 +5,11 @@ module Glimmer
         keywords '=', "\r"
 
         def execute
-          if operation
+          if number1 && number2 && operation
             self.result = operation.calculate.to_s
             self.number1 = self.result
           else
-            self.result = last_result
+            self.result = last_result || '0'
           end
         end
       end

data/lib/models/glimmer/calculator/command/operation.rb

@@ -2,9 +2,24 @@ module Glimmer
   class Calculator
     class Command
       class Operation < Command
-        # Calculate operation result using number1 and number2 attributes
+        def execute          
+          if number1 && number2 && operation && !last_command.equals?
+            self.result = operation.calculate.to_s            
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+            self.operation = self
+          end
+        end
+        
         def calculate
-          raise 'Not implemented! A subclass must implement to calculate operation using number1 and number2 attributes'
+          calculation_result = BigDecimal.new(number1.to_s).send(operation_method, BigDecimal.new(number2.to_s)).to_f
+          calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+        end
+        
+        # Subclasses must implement to indicate operation method on number (e.g. :+ for addition)
+        def operation_method
+          raise 'Not implemented!'
         end
       end
     end

data/lib/models/glimmer/calculator/command/operation/add.rb

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Add < Operation
           keyword '+'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 + number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :+
           end
         end
       end

data/lib/models/glimmer/calculator/command/operation/divide.rb

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Divide < Operation
           keywords '÷', '/'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 / number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result #TODO consider moving this to result= method in Command
+          def operation_method
+            :/
           end
         end
       end

data/lib/models/glimmer/calculator/command/operation/multiply.rb

@@ -5,19 +5,8 @@ module Glimmer
         class Multiply < Operation
           keywords '×', '*'
 
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
-          
-          def calculate
-            calculation_result = number1 * number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :*
           end
         end
       end

data/lib/models/glimmer/calculator/command/operation/subtract.rb

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Subtract < Operation
           keywords '−', '-'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 - number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :-
           end
         end
       end

data/lib/models/glimmer/calculator/presenter.rb

@@ -3,15 +3,23 @@ require 'models/glimmer/calculator/command'
 module Glimmer
   class Calculator
     class Presenter
+      FORMATTER = {
+        nil   => '0',
+        'NaN' => 'Not a number'
+      }
+    
       attr_accessor :result
       
       def initialize
         self.result = '0'
       end
-  
+      
       def press(button)
         command = Command.for(button)
-        self.result = command.result if command
+        if command
+          new_result = command.result
+          self.result = FORMATTER[new_result] || new_result
+        end
       end
     end
   end

data/lib/views/glimmer/calculator.rb

@@ -6,6 +6,7 @@ module Glimmer
   class Calculator
     include Glimmer::UI::CustomShell
 
+    APP_ROOT = File.expand_path('../../../..', __FILE__)
     VERSION = File.read(File.expand_path(File.join('..', '..', '..', '..', 'VERSION'), __FILE__))
     LICENSE = File.read(File.expand_path(File.join('..', '..', '..', '..', 'LICENSE.txt'), __FILE__))
 
@@ -25,7 +26,14 @@ module Glimmer
       @button_font_big = {height: 28}
       Display.setAppName('Glimmer Calculator')
       @display = display {
-        on_event_keydown { |key_event|
+        on_about {
+          display_about_dialog
+        }
+        on_preferences {
+        # No need for preferences. Just display about dialog.
+          display_about_dialog
+        }
+        on_swt_keydown { |key_event|
           char = key_event.character.chr rescue nil
           @presenter.press(char)
         }
@@ -43,17 +51,10 @@ module Glimmer
     #
     body {
       shell {
-        # Replace example content below with custom shell content
-        minimum_size 320, 240
+        minimum_size (OS.mac? ? 320 : (OS.windows? ? 390 : 520)), 240
+        image File.join(APP_ROOT, 'package', 'windows', "Glimmer Calculator.ico") if OS.windows?
         text "Glimmer - Calculator"
         grid_layout 4, true
-        on_about {
-          display_about_dialog
-        }
-        on_preferences {
-          # No need for preferences. Just display about dialog.
-          display_about_dialog
-        }
         # Setting styled_text to multi in order for alignment options to activate
         styled_text(:multi, :wrap, :border) {
           text bind(@presenter, :result)
@@ -66,192 +67,60 @@ module Glimmer
           editable false
           caret nil
         }
-        button {
-          text 'AC'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('AC')
-          }
-        }
-        button {
-          text '÷'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('/')
-          }
-        }
-        button {
-          text '×'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('*')
-          }
-        }
-        button {
-          text '−'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('-')
-          }
-        }
-        button {
-          text '7'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('7')
-          }
-        }
-        button {
-          text '8'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('8')
-          }
-        }
-        button {
-          text '9'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('9')
-          }
-        }
-        button {
-          text '+'
-          font @button_font_big
-          
-          layout_data(:fill, :fill, true, true) {          
-            vertical_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('+')
-          }
-        }
-        button {
-          text '4'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('4')
-          }
-        }
-        button {
-          text '5'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('5')
-          }
-        }
-        button {
-          text '6'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('6')
-          }
-        }
-        button {
-          text '1'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('1')
-          }
-        }
-        button {
-          text '2'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('2')
-          }
-        }
-        button {
-          text '3'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('3')
-          }
-        }
-        button {
-          text '='
-          font @button_font_big
-          
-          layout_data(:fill, :fill, true, true) {          
-            vertical_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('=')
-          }
-        }
-        button {
-          text '0'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true) {          
-            horizontal_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('0')
-          }
-        }
-        button {
-          text '.'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('.')
-          }
-        }
+        command_button('AC')
+        operation_button('÷')
+        operation_button('×')
+        operation_button('−')
+        (7..9).each { |number|
+          number_button(number)
+        }
+        operation_button('+', font: @button_font_big, vertical_span: 2)
+        (4..6).each { |number|
+          number_button(number)
+        }        
+        (1..3).each { |number|
+          number_button(number)
+        }        
+        command_button('=', font: @button_font_big, vertical_span: 2)
+        number_button(0, horizontal_span: 2)
+        operation_button('.')
       }
     }
+    
+    def number_button(number, options = {})
+      command_button(number, options)
+    end
+    
+    def operation_button(operation, options = {})
+      command_button(operation, options.merge(font: @button_font_operation))
+    end
+    
+    def command_button(command, options = {})
+      command = command.to_s
+      options[:font] ||= @button_font
+      options[:horizontal_span] ||= 1
+      options[:vertical_span] ||= 1
+      
+      button { |proxy|
+        text command
+        font options[:font]
+        
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span options[:horizontal_span]
+          vertical_span options[:vertical_span]
+        }
+        
+        on_widget_selected {
+          @presenter.press(command)
+        }
+      }    
+    end
 
     def display_about_dialog
-      message_box = MessageBox.new(swt_widget)
-      message_box.setText("About")
-      message = "Glimmer - Calculator #{VERSION}\n"
-      message += LICENSE
-      message_box.setMessage(message)
-      message_box.open
+      message_box(body_root) {
+        text 'About'
+        message "Glimmer - Calculator #{VERSION}\n#{LICENSE}"
+      }.open
     end
 
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.7
-  name: glimmer
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -31,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
   name: easily_typable
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -69,60 +55,64 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: simplecov
-  type: :development
+        version: 2.0.5
+  name: warbler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
-  name: glimmer-cs-gladiator
-  type: :development
+        version: '0'
+  name: simplecov
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
-  name: puts_debuggerer
-  type: :development
+        version: 0.3.0
+  name: glimmer-cs-gladiator
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.3.0
 description: Calculator - Glimmer Custom Shell
 email: andy.am@gmail.com
 executables:
+- glimmer-cs-calculator
 - calculator
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - VERSION
 - bin/calculator
 - bin/glimmer-cs-calculator
+- glimmer-cs-calculator.gemspec
 - lib/glimmer-cs-calculator.rb
+- lib/glimmer-cs-calculator/launch.rb
 - lib/models/glimmer/calculator/command.rb
 - lib/models/glimmer/calculator/command/all_clear.rb
 - lib/models/glimmer/calculator/command/equals.rb
@@ -135,6 +125,8 @@ files:
 - lib/models/glimmer/calculator/command/point.rb
 - lib/models/glimmer/calculator/presenter.rb
 - lib/views/glimmer/calculator.rb
+- package/macosx/Glimmer Calculator.icns
+- package/windows/Glimmer Calculator.ico
 homepage: http://github.com/AndyObtiva/glimmer-cs-calculator
 licenses:
 - MIT
@@ -154,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Calculator - Glimmer Custom Shell