glimmer-dsl-swt 4.17.2.4 → 4.17.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790b2acf622313d3b41027169575662d7eea029bf1fc30555ed1198e6f0d291a
-  data.tar.gz: 8d6f48a5eb0a8e3d1469292a8c697acd4106c17bf567188f75ae8929ec3165e1
+  metadata.gz: a2111fbe2df8040f64a319e5e62b15982cdc4749a6cd0c548b97f2b37f01b276
+  data.tar.gz: 283eb8a7a8faedde6ab6224ebe06fda3fca7cdff44ec99b32baca35da9df7d04
 SHA512:
-  metadata.gz: d41b1753d14ae5905b157e2fedd75679b8bcf627e5a7ef4277dbf5340ce1fde97b1badea9fe6ff644351c0b43918c4b085e90967ccbfe4cfc17f3d1e5deddcbd
-  data.tar.gz: cf2e38dc4254d96b38a0e6c2ed3b414e74df29771e2a3a6f7af4bae5a1c1a36d796eac6b627de3f0b99ffd833ea1089e47bcade4b994fc4e09b0efade7e620c1
+  metadata.gz: 2cb656a29e5d9da0759b295bc5dba9f1a174e8a83a1ffa2921c4b5efb6fd10542f0a46e475807cbd884c7f14270afa0983b5e49b392f97e9ddd41a6a4ecbbf30
+  data.tar.gz: 9283a302b3aaa99f5ec50f0d0996b951bb72ce0309ae9ca978429621d81f14c4005251286229d3555f31754c0e9a727db2f15f9245fab28f902ef1456e1fa07e

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Change Log
 
+### 4.17.5.0
+
+- Support auto-scaling by aspect ratio of width and height (write specs)
+- Support SWT ExpandBar via expand_bar keyword
+- Hello, Expand Bar! Sample
+- Hello, Styled Text! Sample
+- Use expand_bar in Glimmer Meta-Sample
+
+### 4.17.4.2
+
+- Support StyledText data-binding of caret_offset, selection_count, selection, top_index, and top_pixel, useful for code_text
+- Support `width, height` hash options for ImageProxy and image properties on widgets
+- Default SWT styles for tool_bar (:border) and tool_item (:push)
+
+### 4.17.4.1
+
+- Optimize code_text line style listener algorithm or avoid setting code_text style via listener for performance reasons
+- Optimize code_text syntax highlighting by not lexing except when content changes (e.g. during scrolling, do not lex)
+
+### 4.17.4.0
+
+- Glimmer sample app to launch samples (sample of samples meta-sample)
+- Syntax Color Highlighting in meta-sample
+- Make sash_form weights accept splat array elements (not wrapped in [])
+- Make sash_form weights not get set till the closing of the sash_form (to allow putting it above content instead of below as originally required by SWT)
+- Replace dependency on tty-markdown gem with dependency on rouge gem instead
+- Remove rake tasks `sample:list`, `sample:code` and `sample:run`
+- Add rake task `samples` to point to the new Glimmer Meta-Sample
+- Have meta-sample load samples from gems
+
+### 4.17.3.0
+
+- `glimmer scaffold:desktopify[appname,website]` Mac
+- `glimmer scaffold:desktopify[appname,website]` Windows
+- `glimmer scaffold:desktopify[appname,website]` Linux (have scaffolding include the glimmer-cw-browser-chromium gem in scaffolded app on Linux)
+- Remove the native packaging from Linux scaffolding since it is not officially supported
+- Add gem packaging as part of scaffolding on Linux
+- Launch the app at the end of scaffolding in Linux
+- Provide a `glimmer package:gem` task
+- Add support for scaffolding "app/scaffolded_app/launch" and "lib/namespace/custom_shell/launch" to enable launching SWT apps in Glimmer DSL for Opal without changing a line of code
+- Add a binary executable shell in "app" mode (just like "custom shell gem" mode)
+- Have glimmer packaging check the Java version and give a warning if an unsupported version is used.
+
+
 ### 4.17.2.4
 
 - New `glimmer run` glimmer command task.

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.17.2.4
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.17.5.0
 ## JRuby Desktop Development GUI Library
 [![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)
@@ -10,7 +10,7 @@
 
 (The Original Glimmer Library Since 2007. Beware of Imitators!)
 
-[**Glimmer**](https://rubygems.org/gems/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://rubygems.org/gems/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#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. To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
+[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#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. To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
 
 [Glimmer receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer](https://rubygems.org/gems/glimmer) with your Ruby desktop GUI development needs. Please make [Glimmer](https://rubygems.org/gems/glimmer) even better by providing feedback and [contributing](#contributing) when possible.
 
@@ -40,9 +40,10 @@ shell {
 }.open
 ```
 
-Run:
+Run via `glimmer samples` or directly:
+
 ```
-glimmer sample:run[hello_world]
+glimmer samples/hello/hello_world.rb
 ```
 
 Glimmer app:
@@ -85,10 +86,10 @@ Glimmer code (from [samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObt
 # ...
 ```
 
-Run:
+Run via `glimmer samples` or directly:
 
 ```
-glimmer sample:run[tic_tac_toe]
+glimmer samples/elaborate/tic_tac_toe.rb
 ```
 
 Glimmer app:
@@ -210,10 +211,10 @@ Glimmer code (from [samples/elaborate/contact_manager.rb](https://github.com/And
 # ...
 ```
 
-Run:
+Run via `glimmer samples` or directly:
 
 ```
-glimmer sample:run[contact_manager]
+glimmer samples/elaborate/contact_manager.rb
 ```
 
 Glimmer App:
@@ -248,12 +249,10 @@ Glimmer App:
   - [Glimmer Command](#glimmer-command)
     - [Basic Usage](#basic-usage)
     - [Advanced Usage](#advanced-usage)
-    - [Sample List/Run/Code](#sample-listruncode)
-      - [Sample List](#sample-list)
-      - [Sample Run](#sample-run)
-      - [Sample Code](#sample-code)
+    - [Glimmer Samples](#glimmer-samples)
     - [Scaffolding](#scaffolding)
       - [App](#app)
+      - [Desktopify](#desktopify)
       - [Custom Shell](#custom-shell)
       - [Custom Widget](#custom-widget)
       - [Custom Shell Gem](#custom-shell-gem)
@@ -283,6 +282,7 @@ Glimmer App:
       - [Color](#color)
       - [Font](#font)
     - [Image](#image)
+      - [Image Options](#image-options)
     - [Cursor](#cursor)
     - [Layouts](#layouts)
     - [Layout Data](#layout-data)
@@ -309,7 +309,9 @@ Glimmer App:
       - [Multi-DSL Support](#multi-dsl-support)
       - [Application Menu Items (About/Preferences)](#application-menu-items-aboutpreferences)
       - [App Name and Version](#app-name-and-version)
+      - [Code Text Widget](#code-text-widget)
       - [Video Widget](#video-widget)
+      - [Sash Form Widget](#sash-form-widget)
       - [Browser Widget](#browser-widget)
   - [Glimmer Configuration](#glimmer-configuration)
     - [logger](#logger)
@@ -338,6 +340,9 @@ Glimmer App:
       - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
       - [Hello, Custom Widget!](#hello-custom-widget)
       - [Hello, Custom Shell!](#hello-custom-shell)
+      - [Hello, Sash Form!](#hello-sash-form)
+      - [Hello, Styled Text!](#hello-styled-text)
+      - [Hello, Expand Bar!](#hello-expand-bar)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -373,7 +378,7 @@ Glimmer App:
   - [Contributors](#contributors)
   - [Hire Me](#hire-me)
   - [License](#license)
-
+  
 ## Background
 
 Ruby 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 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, JFace, and RCP can help fill the gap of desktop application development with Ruby.
@@ -431,7 +436,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.2.4
+jgem install glimmer-dsl-swt -v 4.17.5.0
 ```
 
 Note: 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.
@@ -490,17 +495,18 @@ glimmer application.rb
 Runs a Glimmer application using JRuby, automatically preloading
 the glimmer ruby gem and SWT jar dependency.
 
-Example:
+Run Glimmer samples with:
+
 ```
-glimmer sample:run[hello_world]
+glimmer samples
 ```
-This runs the Glimmer "Hello, World!" sample.
+This brings up the [Glimmer Meta-Sample (The Sample of Samples)](#samples)
 
-If you cloned this project locally, you may run `bin/glimmer` instead.
+If you cloned this project locally instead of installing the gem, run `bin/glimmer` instead.
 
 Example:
 ```
-bin/glimmer sample:run[hello_world]
+bin/glimmer samples
 ```
 
 ### Advanced Usage
@@ -508,7 +514,7 @@ bin/glimmer sample:run[hello_world]
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.2.4
+Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.5.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -542,9 +548,7 @@ Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and
   glimmer package:lock_jars                                  # Lock JARs
   glimmer package:native[type]                               # Generate Native files
   glimmer run[app_path]                                      # Runs Glimmer app or custom shell gem in the current directory, unless app_path is specified, then runs it instead (app_path is optional)  
-  glimmer sample:code[name]                                  # Outputs code for a Glimmer internal sample [included in gem] (name is required)
-  glimmer sample:list[query]                                 # Lists Glimmer internal samples [included in gem]. Filters by query if specified (query is optional)
-  glimmer sample:run[name]                                   # Runs a Glimmer internal sample [included in gem]. If no name is supplied, it runs all samples
+  glimmer samples                                            # Brings up the Glimmer Meta-Sample app to allow browsing, running, and viewing code of Glimmer samples
   glimmer scaffold[app_name]                                 # Scaffold Glimmer application directory structure to build a new app
   glimmer scaffold:customshell[name,namespace]               # Scaffold Glimmer::UI::CustomShell subclass (full window view) under app/views (namespace is optional) [alt: scaffold:cs]
   glimmer scaffold:customwidget[name,namespace]              # Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cw]
@@ -566,333 +570,17 @@ glimmer samples/hello/hello_world.rb samples/hello/hello_tab.rb
 
 Launches samples/hello/hello_world.rb and samples/hello_tab.rb at the same time, each in a separate JRuby thread.
 
-### Sample List/Run/Code
-
-#### Sample List
+### Glimmer Samples
 
 You can list available Glimmer samples by running:
 
 ```
-glimmer sample:list
-```
-
-This should output the following (providing the name of each sample, description, and command to run the sample and view its code):
-
-```
-$ glimmer sample:list
-
-  Glimmer Hello Samples:
-                                                                                                               
-             Name                       Description                                 Run                        
-                                                                                                               
-  hello_browser                 Hello Browser                 glimmer sample:run[hello_browser]                
-  hello_combo                   Hello Combo                   glimmer sample:run[hello_combo]                  
-  hello_computed                Hello Computed                glimmer sample:run[hello_computed]               
-  hello_drag_and_drop           Hello Drag And Drop           glimmer sample:run[hello_drag_and_drop]          
-  hello_list_multi_selection    Hello List Multi Selection    glimmer sample:run[hello_list_multi_selection]   
-  hello_list_single_selection   Hello List Single Selection   glimmer sample:run[hello_list_single_selection]  
-  hello_menu_bar                Hello Menu Bar                glimmer sample:run[hello_menu_bar]               
-  hello_message_box             Hello Message Box             glimmer sample:run[hello_message_box]            
-  hello_pop_up_context_menu     Hello Pop Up Context Menu     glimmer sample:run[hello_pop_up_context_menu]    
-  hello_tab                     Hello Tab                     glimmer sample:run[hello_tab]                    
-  hello_world                   Hello World                   glimmer sample:run[hello_world]                  
-                                                                                                               
-
-  Glimmer Elaborate Samples:
-                                                                           
-       Name           Description                     Run                  
-                                                                           
-  contact_manager   Contact Manager   glimmer sample:run[contact_manager]  
-  login             Login             glimmer sample:run[login]            
-  tic_tac_toe       Tic Tac Toe       glimmer sample:run[tic_tac_toe]                                                   
-  user_profile      User Profile      glimmer sample:run[user_profile]                                                   
-```
-
-#### Sample Run
-
-A sample may be run via `glimmer sample:run[name]`. This also outputs the sample code so that you could take a look at it and compare to the GUI that launches. 
-
-If the sample name is left empty (e.g. `glimmer sample:run`), then all samples are run.
-
-Example:
-
-```
-glimmer sample:run[hello_tab]
-```
-
-This will run the hello_tab sample and output its code:
-
-```
-$ glimmer sample:run[hello_tab] 
-
-# /Users/User/.rvm/gems/jruby-9.2.13.0@glimmerapp/gems/glimmer-dsl-swt-4.17.2.4/samples/hello/hello_tab.rb
-
-class HelloTab
-  include Glimmer
-  def launch
-    shell {
-      text "Hello, Tab!"
-      tab_folder {
-        tab_item {
-          text "English"
-          label {
-            text "Hello, World!"
-          }
-        }
-        tab_item {
-          text "French"
-          label {
-            text "Bonjour, Univers!"
-          }
-        }
-      }
-    }.open
-  end
-end
-
-HelloTab.new.launch
-
-# # #
-```
-
-![Hello Tab English](images/glimmer-hello-tab-english.png)
-
-#### Sample Code
-
-You may output any sample code via this command: `glimmer sample:code[name]`
-
-This is very similar to the sample run command, except the name is required.
-
-It will not only output the main sample file, but any required supporting files as well.
-
-Example:
-
+glimmer samples
 ```
-$ glimmer sample:code[tic_tac_toe] 
-
-# /Users/User/.rvm/gems/jruby-9.2.13.0@glimmerapp/gems/glimmer-dsl-swt-4.17.2.4/samples/elaborate/tic_tac_toe.rb
 
-require_relative "tic_tac_toe/board"
-
-class TicTacToe
-  include Glimmer
+This brings up the [Glimmer Meta-Sample (The Sample of Samples)](#samples):
 
-  def initialize
-    @tic_tac_toe_board = Board.new
-    @shell = shell {
-      text "Tic-Tac-Toe"
-      minimum_size 150, 178
-      composite {
-        grid_layout 3, true
-        (1..3).each { |row|
-          (1..3).each { |column|
-            button {
-              layout_data :fill, :fill, true, true
-              text        bind(@tic_tac_toe_board[row, column], :sign)
-              enabled     bind(@tic_tac_toe_board[row, column], :empty)
-              font        style: :bold, height: 20
-              on_widget_selected {
-                @tic_tac_toe_board.mark(row, column)
-              }
-            }
-          }
-        }
-      }
-    }
-    observe(@tic_tac_toe_board, :game_status) { |game_status|
-      display_win_message if game_status == Board::WIN
-      display_draw_message if game_status == Board::DRAW
-    }
-  end
-
-  def display_win_message
-    display_game_over_message("Player #{@tic_tac_toe_board.winning_sign} has won!")
-  end
-
-  def display_draw_message
-    display_game_over_message("Draw!")
-  end
-
-  def display_game_over_message(message_text)
-    message_box(@shell) {
-      text 'Game Over'
-      message message_text
-    }.open
-    @tic_tac_toe_board.reset
-  end
-
-  def open
-    @shell.open
-  end
-end
-
-TicTacToe.new.open
-
-# # #
-
-
-# /Users/User/.rvm/gems/jruby-9.2.13.0@glimmerapp/gems/glimmer-dsl-swt-4.17.2.4/samples/elaborate/tic_tac_toe/cell.rb
-
-class TicTacToe
-  class Cell
-    EMPTY = ""
-    attr_accessor :sign, :empty
-  
-    def initialize
-      reset
-    end
-  
-    def mark(sign)
-      self.sign = sign
-    end
-  
-    def reset
-      self.sign = EMPTY
-    end
-  
-    def sign=(sign_symbol)
-      @sign = sign_symbol
-      self.empty = sign == EMPTY
-    end
-  
-    def marked
-      !empty
-    end
-  end
-end
-
-# # #
-
-
-# /Users/User/.rvm/gems/jruby-9.2.13.0@glimmerapp/gems/glimmer-dsl-swt-4.17.2.4/samples/elaborate/tic_tac_toe/board.rb
-
-require_relative 'cell'
-
-class TicTacToe
-  class Board
-    DRAW = :draw
-    IN_PROGRESS = :in_progress
-    WIN = :win
-    attr :winning_sign
-    attr_accessor :game_status
-  
-    def initialize
-      @sign_state_machine = {nil => "X", "X" => "O", "O" => "X"}
-      build_grid
-      @winning_sign = Cell::EMPTY
-      @game_status = IN_PROGRESS
-    end
-  
-    #row and column numbers are 1-based
-    def mark(row, column)
-      self[row, column].mark(current_sign)
-      game_over? #updates winning sign
-    end
-  
-    def current_sign
-      @current_sign = @sign_state_machine[@current_sign]
-    end
-  
-    def [](row, column)
-      @grid[row-1][column-1]
-    end
-  
-    def game_over?
-       win? or draw?
-    end
-  
-    def win?
-      win = (row_win? or column_win? or diagonal_win?)
-      self.game_status=WIN if win
-      win
-    end
-  
-    def reset
-      (1..3).each do |row|
-        (1..3).each do |column|
-          self[row, column].reset
-        end
-      end
-      @winning_sign = Cell::EMPTY
-      @current_sign = nil
-      self.game_status=IN_PROGRESS
-    end
-  
-    private
-  
-    def build_grid
-      @grid = []
-      3.times do |row_index| #0-based
-        @grid << []
-        3.times { @grid[row_index] << Cell.new }
-      end
-    end
-  
-    def row_win?
-      (1..3).each do |row|
-        if row_has_same_sign(row)
-          @winning_sign = self[row, 1].sign
-          return true
-        end
-      end
-      false
-    end
-  
-    def column_win?
-      (1..3).each do |column|
-        if column_has_same_sign(column)
-          @winning_sign = self[1, column].sign
-          return true
-        end
-      end
-      false
-    end
-  
-    #needs refactoring if we ever decide to make the board size dynamic
-    def diagonal_win?
-      if (self[1, 1].sign == self[2, 2].sign) and (self[2, 2].sign == self[3, 3].sign) and self[1, 1].marked
-        @winning_sign = self[1, 1].sign
-        return true
-      end
-      if (self[3, 1].sign == self[2, 2].sign) and (self[2, 2].sign == self[1, 3].sign) and self[3, 1].marked
-        @winning_sign = self[3, 1].sign
-        return true
-      end
-      false
-    end
-  
-    def draw?
-      @board_full = true
-      3.times do |x|
-        3.times do |y|
-          @board_full = false if self[x, y].empty
-        end
-      end
-      self.game_status = DRAW if @board_full
-      @board_full
-    end
-  
-    def row_has_same_sign(number)
-      row_sign = self[number, 1].sign
-      [2, 3].each do |column|
-        return false unless row_sign == (self[number, column].sign)
-      end
-      true if self[number, 1].marked
-    end
-  
-    def column_has_same_sign(number)
-      column_sign = self[1, number].sign
-      [2, 3].each do |row|
-        return false unless column_sign == (self[row, number].sign)
-      end
-      true if self[1, number].marked
-    end
-  
-  end
-end
-
-# # #
-```
+![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
 
 ### Scaffolding
 
@@ -913,7 +601,7 @@ letting Glimmer scaffolding take care of initial app file structure concerns, su
 - Icon (under `package/{platform}/{App Name}.{icon_extension}` for `macosx` .icns, `windows` .ico, and `linux` .png)
 - Bin file for starting application (`bin/{app_name}.rb`)
 
-NOTE: You need to have your Git `user.name` and `github.user` configured before scaffolding since Glimmer uses Juwelier, which relies on them in creating a Git repo for your Glimmer app.
+You need to have your Git `user.name` and `github.user` configured before scaffolding since Glimmer uses Juwelier, which relies on them in creating a Git repo for your Glimmer app.
 
 #### App
 
@@ -925,7 +613,7 @@ To scaffold a Glimmer app from scratch, run the following command:
 glimmer scaffold[AppName]
 ```
 
-This will generate an advanced "Hello, World!" app, package it as a Mac native file (DMG/PKG/APP), and launch it all in one fell swoop.
+This will generate an advanced "Hello, World!" app, package it as a Mac DMG/PKG/APP, Windows APP, or Linux GEM, and launch it all in one fell swoop.
 
 Suppose you run:
 
@@ -937,18 +625,18 @@ You should see output like the following:
 
 ```
 $ glimmer scaffold[greeter]
-	create	.gitignore
-	create	Rakefile
-	create	Gemfile
-	create	LICENSE.txt
-	create	README.rdoc
-	create	.document
-	create	lib
-	create	lib/greeter.rb
-	create	spec
-	create	spec/spec_helper.rb
-	create	spec/greeter_spec.rb
-	create	.rspec
+  create  .gitignore
+  create  Rakefile
+  create  Gemfile
+  create  LICENSE.txt
+  create  README.rdoc
+  create  .document
+  create  lib
+  create  lib/greeter.rb
+  create  spec
+  create  spec/spec_helper.rb
+  create  spec/greeter_spec.rb
+  create  .rspec
 Juwelier has prepared your gem in ./greeter
 Created greeter/.gitignore
 Created greeter/.ruby-version
@@ -1001,6 +689,101 @@ or:
 glimmer bin/greeter
 ```
 
+#### Desktopify
+
+This scaffolding mode enables you to desktopify a web app. Glimmer Scaffolding basically wraps the website with a [Browser Widget](#browser-widget).
+
+The desktopify app is similar to the standard scaffolded app. It can be extended and the [browser may even be instrumented](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html).
+
+The app even remembers your cookies if you log into the website, close the app, and reopen again.
+
+Note that on Linux, the default SWT browser, which runs on webkit, does not support HTML5 Video out of the box. If you need video support, open `Gemfile` after scaffolding and enable the line that has the `glimmer-cw-browser-chromium` gem then replace the `browser` in "app/views/snowboard_utah/app_view.rb" with `browser(:chromium)`
+
+Before you start, make sure you are in a JRuby environment with Glimmer gem installed as per "Direct Install" pre-requisites. 
+
+To scaffold a Glimmer desktopify app from scratch, run the following command:
+
+```
+glimmer scaffold:desktopify[app_name,website]
+```
+
+This will generate a Glimmer app, package it as a Mac DMG/PKG/APP, Windows APP, or Linux GEM, and launch it all in one fell swoop.
+
+Suppose you run:
+
+```
+glimmer scaffold:desktopify[snowboard_utah,https://www.brightonresort.com]
+```
+
+You should see output like the following:
+
+```
+$ glimmer scaffold:desktopify[snowboard_utah,https://www.brightonresort.com]
+Fetching kamelcase-0.0.2.gem
+Fetching github_api-0.19.0.gem
+Fetching highline-2.0.3.gem
+Fetching juwelier-2.4.9.gem
+Fetching hashie-3.6.0.gem
+Fetching nokogiri-1.10.10-java.gem
+Fetching semver2-3.4.2.gem
+Successfully installed semver2-3.4.2
+Successfully installed kamelcase-0.0.2
+Successfully installed highline-2.0.3
+Successfully installed hashie-3.6.0
+Successfully installed github_api-0.19.0
+Successfully installed nokogiri-1.10.10-java
+Successfully installed juwelier-2.4.9
+7 gems installed
+  create  .gitignore
+  create  Rakefile
+  create  Gemfile
+  create  LICENSE.txt
+  create  README.markdown
+  create  .document
+  create  lib
+  create  lib/snowboard_utah.rb
+  create  .rspec
+Juwelier has prepared your gem in ./snowboard_utah
+Created snowboard_utah/.gitignore
+Created snowboard_utah/.ruby-version
+Created snowboard_utah/.ruby-gemset
+Created snowboard_utah/VERSION
+Created snowboard_utah/LICENSE.txt
+Created snowboard_utah/Gemfile
+Created snowboard_utah/Rakefile
+Created snowboard_utah/app/snowboard_utah.rb
+Created snowboard_utah/app/views/snowboard_utah/app_view.rb
+Created snowboard_utah/package/windows/Snowboard Utah.ico
+Created snowboard_utah/package/macosx/Snowboard Utah.icns
+Created snowboard_utah/package/linux/Snowboard Utah.png
+Created snowboard_utah/bin/snowboard_utah
+...
+```
+
+Eventually, it will launch a desktopified version of "https://www.brightonresort.com" having the title of ("Snowboard Utah").
+
+Desktopified App on Mac
+
+![Glimmer Scaffold App](images/glimmer-scaffolding-desktopify.png)
+
+It also comes with a boilerplate About dialog.
+
+![Glimmer Scaffold App About](images/glimmer-scaffolding-desktopify-about.png)
+
+Desktopified App on Windows
+
+![Glimmer Scaffold App](images/glimmer-scaffolding-desktopify-windows.png)
+
+Desktopified App on Linux
+
+![Glimmer Scaffold App](images/glimmer-scaffolding-desktopify-linux.png)
+
+In order to run the app after making changes, you must run the `glimmer run`. It automatically detects the generated run script under the `bin` directory and uses it as an argument.
+
+```
+glimmer run
+```
+
 #### Custom Shell
 
 To scaffold a Glimmer custom shell (full window view) for an existing Glimmer app, run the following command:
@@ -1207,9 +990,9 @@ Output:
   Name         Gem          Version    Author          Description       
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS    
-  Opal   glimmer-dsl-opal   0.3.0     AndyMaleh    Glimmer DSL for Opal   
-  Swt    glimmer-dsl-swt    4.17.2.4  AndyMaleh    Glimmer DSL for SWT    
-  Tk     glimmer-dsl-tk     0.0.5     AndyMaleh    Glimmer DSL for Tk     
+  Opal   glimmer-dsl-opal   0.4.0     AndyMaleh    Glimmer DSL for Opal   
+  Swt    glimmer-dsl-swt    4.17.5.0  AndyMaleh    Glimmer DSL for SWT    
+  Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk     
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML                                                                         
 ```
 
@@ -2000,10 +1783,27 @@ The `image` keyword creates an instance of [org.eclipse.swt.graphics.Image](http
 
 It is a graphics `Image` object (not a widget), but is used used in setting the `image` property on `label` and `background_image` on `composite` (and subclasses)
 
-Glimmer recently included **EXPERIMENTAL** gif animation support for the `background_image` property on `composite' since SWT does not support animation by default.
+Glimmer recently included **EXPERIMENTAL** gif animation support for the `background_image` property on `composite' since SWT does not support animation by default. On Windows, it only works inside composites nested under standard shells, not ones that have the SWT styles :on_top or :no_trim
 
 Learn more about images in general at this SWT Image guide: https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html
 
+#### Image Options
+
+Options may be passed in a hash at the end of `image` arguments:
+
+- `width`: width of image
+- `height`: height of image
+
+If only the width or height alone are specified, the other is calculated while maintaining the image aspect ratio.
+
+Example:
+
+```
+label {
+  image 'someimage.png', width: 400, height: 300
+}
+```
+
 ### Cursor
 
 SWT widget `cursor` property represents the mouse cursor you see on the screen when you hover over that widget.
@@ -2727,7 +2527,7 @@ Custom widgets are brand new Glimmer DSL keywords that represent aggregates of e
 
 You can find out about [published Glimmer Custom Widgets](https://github.com/AndyObtiva/glimmer-dsl-swt#gem-listing) by running the `glimmer list:gems:customwidget` command
 
-Glimmer supports two ways of creating custom widgets with minimal code:
+Glimmer supports three ways of creating custom widgets with minimal code:
 1. Method-based Custom Widgets (for single-view-internal reuse): Extract a method containing Glimmer DSL widget syntax. Useful for quickly eliminating redundant code within a single view.
 2. Class-based Custom Widgets (for multiple-view-external reuse): Create a class that includes the `Glimmer::UI::CustomWidget` module and Glimmer DSL widget syntax in a `body {}` block. This will automatically extend Glimmer's DSL syntax with an underscored lowercase keyword matching the class name by convention. Useful in making a custom widget available in many views.
 
@@ -3273,6 +3073,28 @@ shell(:no_resize) {
 
 Also, you may invoke `Display.setAppVersion('1.0.0')` if needed for OS app version identification reasons during development, replacing `'1.0.0'` with your application version.
 
+#### Code Text Widget
+
+`code_text` is a Glimmer built-in custom widget that displays syntax highlighted Ruby code in a customized SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget.
+
+It is used in the [Glimmer Meta-Sample (The Sample of Samples)](#samples):
+
+![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
+
+Glimmer Meta-Sample Code Example:
+
+```ruby
+# ...
+code_text {
+  text bind(SampleDirectory, 'selected_sample.content')
+  editable false
+  caret nil
+}
+# ...
+```
+
+To use, simply use `code_text` in place of `text` or `styled_text` widget. If you set its `text` value to Ruby code, it automatically styles it with syntax highlighting.
+
 #### Video Widget
 
 [![Video Widget](images/glimmer-video-widget.png)](https://github.com/AndyObtiva/glimmer-cw-video)
@@ -3281,6 +3103,41 @@ Glimmer supports a [video custom widget](https://github.com/AndyObtiva/glimmer-c
 
 You may obtain via `glimmer-cw-video` gem.
 
+#### Sash Form Widget
+
+`sash_form` is an SWT built-in custom widget that provides a resizable sash that splits a window area into two or more panes.
+
+It can be customized with the `weights` attribute by setting initial weights to size the panes at first display.
+
+One noteworthy thing about the Glimmer implementation is that, unlike behavior in SWT, it allows declaring `weights` before the content of the `sash_form`, thus providing more natural and convenient syntax (Glimmer automatically takes care of sending that declaration to SWT at the end of declaring `sash_form` content as per the SWT requirements)
+
+Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
+
+```ruby
+shell {
+  text 'Sash Form Example'
+  sash_form {
+    label {
+      text '(resize >>)'
+      background :dark_green
+      foreground :white
+      font height: 20
+    }
+    label {
+      text '(<< resize)'
+      background :red
+      foreground :white
+      font height: 20
+    }
+    weights 1, 2
+  }
+}.open
+```
+
+You may check out a more full-fledged example in [Hello, Sash Form!](#hello-sash-form)
+
+![Hello Sash Form](images/glimmer-hello-sash-form.png)
+
 #### Browser Widget
 
 ![Hello Browser](images/glimmer-hello-browser.png)
@@ -3569,12 +3426,16 @@ https://www.eclipse.org/nebula/
 
 Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer` gem first and then use the `glimmer` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`).
 
-If you cloned the project and followed [CONTRIBUTING.md](CONTRIBUTING.md) instructions, you may run all samples in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) at once via `samples/launch` command:
+You may run any sample via this command:
 
 ```
-samples/launch
+glimmer samples
 ```
 
+This brings up the [Glimmer Meta-Sample (The Sample of Samples)](samples/elaborate/meta_sample.rb)
+
+![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
+
 ### Hello Samples
 
 For hello-type simple samples, check the following.
@@ -3585,12 +3446,6 @@ Code:
 
 [samples/hello/hello_world.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_world.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_world]
-```
-
 ![Hello World](images/glimmer-hello-world.png)
 
 #### Hello, Tab!
@@ -3599,12 +3454,6 @@ Code:
 
 [samples/hello/hello_tab.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_tab.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_tab]
-```
-
 ![Hello Tab English](images/glimmer-hello-tab-english.png)
 ![Hello Tab French](images/glimmer-hello-tab-french.png)
 
@@ -3616,12 +3465,6 @@ Code:
 
 [samples/hello/hello_combo.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_combo.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_combo]
-```
-
 ![Hello Combo](images/glimmer-hello-combo.png)
 ![Hello Combo Expanded](images/glimmer-hello-combo-expanded.png)
 
@@ -3633,12 +3476,6 @@ Code:
 
 [samples/hello/hello_list_single_selection.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_list_single_selection.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_list_single_selection]
-```
-
 ![Hello List Single Selection](images/glimmer-hello-list-single-selection.png)
 
 #### Hello, List Multi Selection!
@@ -3649,12 +3486,6 @@ Code:
 
 [samples/hello/hello_list_multi_selection.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_list_multi_selection.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_list_multi_selection]
-```
-
 ![Hello List Multi Selection](images/glimmer-hello-list-multi-selection.png)
 
 #### Hello, Computed!
@@ -3665,12 +3496,6 @@ Code:
 
 [samples/hello/hello_computed.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_computed.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_computed]
-```
-
 ![Hello Browser](images/glimmer-hello-computed.png)
 
 #### Hello, Message Box!
@@ -3681,12 +3506,6 @@ Code:
 
 [samples/hello/hello_message_box.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_message_box.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_message_box]
-```
-
 ![Hello Message Box](images/glimmer-hello-message-box.png)
 ![Hello Message Box Dialog](images/glimmer-hello-message-box-dialog.png)
 
@@ -3698,12 +3517,6 @@ Code:
 
 [samples/hello/hello_browser.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_browser.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_browser]
-```
-
 ![Hello Browser](images/glimmer-hello-browser.png)
 
 #### Hello, Drag and Drop!
@@ -3714,12 +3527,6 @@ Code:
 
 [samples/hello/hello_drag_and_drop.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_drag_and_drop.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_drag_and_drop]
-```
-
 ![Hello Drag and Drop](images/glimmer-hello-drag-and-drop.gif)
 
 #### Hello, Menu Bar!
@@ -3730,12 +3537,6 @@ Code:
 
 [samples/hello/hello_menu_bar.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_menu_bar.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_menu_bar]
-```
-
 ![Hello Menu Bar](images/glimmer-hello-menu-bar.png)
 ![Hello Menu Bar File Menu](images/glimmer-hello-menu-bar-file-menu.png)
 ![Hello Menu Bar History Menu](images/glimmer-hello-menu-bar-history-menu.png)
@@ -3748,12 +3549,6 @@ Code:
 
 [samples/hello/hello_pop_up_context_menu.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_pop_up_context_menu.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_pop_up_context_menu]
-```
-
 ![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)
 
@@ -3765,12 +3560,6 @@ Code:
 
 [samples/hello/hello_custom_widget.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_custom_widget.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_custom_widget]
-```
-
 ![Hello Custom Widget](images/glimmer-hello-custom-widget.gif)
 
 #### Hello, Custom Shell!
@@ -3781,17 +3570,79 @@ Code:
 
 [samples/hello/hello_custom_shell.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_custom_shell.rb)
 
-Run:
-
-```
-glimmer sample:run[hello_custom_shell]
-```
-
 ![Hello Custom Shell](images/glimmer-hello-custom-shell.png)
 ![Hello Custom Shell Email1](images/glimmer-hello-custom-shell-email1.png)
 ![Hello Custom Shell Email2](images/glimmer-hello-custom-shell-email2.png)
 ![Hello Custom Shell Email3](images/glimmer-hello-custom-shell-email3.png)
 
+#### Hello, Sash Form!
+
+This sample demonstrates the use of a `sash_form` in Glimmer.
+
+Code:
+
+[samples/hello/hello_sash_form.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_sash_form.rb)
+
+Hello, Sash Form! Horizontal Orientation
+
+![Hello Sash Form](images/glimmer-hello-sash-form.png)
+
+Hello, Sash Form! Resized
+
+![Hello Sash Form Resized](images/glimmer-hello-sash-form-resized.png)
+
+Hello, Sash Form! Sash Width Changed
+
+![Hello Sash Form Sash Width Changed](images/glimmer-hello-sash-form-sash-width-changed.png)
+
+Hello, Sash Form! Vertical Orientation
+
+![Hello Sash Form Vertical](images/glimmer-hello-sash-form-vertical.png)
+
+Hello, Sash Form! Green Label Maximized
+
+![Hello Sash Form Green Maximized](images/glimmer-hello-sash-form-green-maximized.png)
+
+Hello, Sash Form! Red Label Maximized
+
+![Hello Sash Form Red Maximized](images/glimmer-hello-sash-form-red-maximized.png)
+
+#### Hello, Styled Text!
+
+This sample demonstrates the use of a `styled_text` in Glimmer.
+
+Code:
+
+[samples/hello/hello_styled_text.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_styled_text.rb)
+
+Hello, Styled Text!
+
+![Hello Styled Text](images/glimmer-hello-styled-text.png)
+
+#### Hello, Expand Bar!
+
+This sample demonstrates the use of a `expand_bar` and `expand_item` in Glimmer.
+
+Code:
+
+[samples/hello/hello_expand_bar.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_expand_bar.rb)
+
+Hello, Expand Bar! All Expanded
+
+![Hello Expand Bar All Expanded](images/glimmer-hello-expand-bar-all-expanded.png)
+
+Hello, Expand Bar! Productivity Expanded
+
+![Hello Expand Bar Productivity Expanded](images/glimmer-hello-expand-bar-productivity-expanded.png)
+
+Hello, Expand Bar! Tools Expanded
+
+![Hello Expand Bar Tools Expanded](images/glimmer-hello-expand-bar-tools-expanded.png)
+
+Hello, Expand Bar! Reading Expanded
+
+![Hello Expand Bar Reading Expanded](images/glimmer-hello-expand-bar-reading-expanded.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:
@@ -3806,12 +3657,6 @@ Code:
 
 [samples/elaborate/user_profile.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/user_profile.rb)
 
-Run:
-
-```
-glimmer sample:run[user_profile]
-```
-
 ![User Profile](images/glimmer-user-profile.png)
 
 #### Login
@@ -3822,12 +3667,6 @@ Code:
 
 [samples/elaborate/login.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/login.rb)
 
-Run:
-
-```
-glimmer sample:run[login]
-```
-
 ![Login](images/glimmer-login.png)
 ![Login Filled In](images/glimmer-login-filled-in.png)
 ![Login Logged In](images/glimmer-login-logged-in.png)
@@ -3842,12 +3681,6 @@ Code:
 
 [samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/tic_tac_toe.rb)
 
-Run:
-
-```
-glimmer sample:run[tic_tac_toe]
-```
-
 ![Tic Tac Toe](images/glimmer-tic-tac-toe.png)
 ![Tic Tac Toe In Progress](images/glimmer-tic-tac-toe-in-progress.png)
 ![Tic Tac Toe Game Over](images/glimmer-tic-tac-toe-game-over.png)
@@ -3860,12 +3693,6 @@ Code:
 
 [samples/elaborate/contact_manager.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/contact_manager.rb)
 
-Run:
-
-```
-glimmer sample:run[contact_manager]
-```
-
 Contact Manager
 
 ![Contact Manager](images/glimmer-contact-manager.png)
@@ -3937,7 +3764,7 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 ## Packaging & Distribution
 
-Note: this section mostly applies to Mac and Windows. On Linux, the Glimmer [Custom Shell Gem](#custom-shell-gem) approach provides a [Gem Packaged Shell Script](#custom-shell-gem) (e.g. `calculator` command becomes available after installing the [glimmer-cs-calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) gem)
+Note: this section mostly applies to Mac and Windows. On Linux, you can just run `glimmer package:gem` and after installing the gem, you get an executable matching the name of the app/custom-shell-gem you are building (e.g. `calculator` command becomes available after installing the [glimmer-cs-calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) gem)
 
 Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single `glimmer package` command: