glimmer-dsl-swt 4.24.2.0 → 4.24.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e022ad5b5e0334818e996c918fbf384bee80a9e5a628503da14f857842ab7da0
-  data.tar.gz: 86d06e30bbe172f7de677ecbfa9338b5874a9a92ab3d73f67f05dca975fb1500
+  metadata.gz: 774fc1f559ec5f11db66bdb42369c85e7df2a50f9f7f361e293a16c173ca394b
+  data.tar.gz: 5f45c3421a272bd377d3d8cb2457008e5ff2c5533ff3dcd0d25ae540cb549520
 SHA512:
-  metadata.gz: bdc32f76c5467e573db93f650bd8b4eef2dd074c952926f6c92bfaa6798f240be09ae21262e3e062f916f1a86cf1cedd8e7c2f3de4d107a55bcbc950a638b9ae
-  data.tar.gz: '097eb1e61863157609a431e16345ffc73b0d06b7db44311e56ef1ba53d5d1619782f8ee0bc6e34d441d3cbbcb909237801d68b42446d6ca7d1d8ec731f856b80'
+  metadata.gz: 31ad8918c664072c497d08183dfc9662dda92548cd2afe876d962219e364dbb9bde7efa75ea509e03df84fd2f91561d2d753d15d54e1f405502097b3c1036b0b
+  data.tar.gz: 9c14b3e9a70f70c63e95858eec0ee229ed46ff89b1217f715ac93b9388108f70ea9b428da127ad63eee0d356762e1fa7fe07c3481a819e698629703a37f3b735

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 4.24.2.3
+
+- Default `code_text` font name in Mac is changed back to `'Courier'`
+
+## 4.24.2.2
+
+- Upgrade to jruby-9.3.7.0
+- `code_text` can use external Rouge custom themes similar to `ext/rouge/themes/glimmer_dark`. When in Dark Mode, the specified custom theme must have the word 'dark' in its name to avoid forcing the `glimmer_dark` theme instead as per default behavior.
+- Look for 'Monospace' and 'Liberation Mono' fonts on Linux if 'Courier' is not available
+- Fix issue discovered in Red Hat Linux related to ImageExpression getting loaded before others and missing `require 'glimmer/dsl/parent_expression'` statement (issue does not happen in other operating systems that load classes in a different order)
+
+## 4.24.2.1
+
+- Fix mistake of changing all themes to dark themes in Hello, Code Text! (not it works just like before)
+
 ## 4.24.2.0
 
 - Update `code_text` to support Dark Mode with `glimmer_dark` theme, which is applied by default when app is run with OS in dark mode

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.24.2.0
+# [<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.24.2.3
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -21,7 +21,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.2.0 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.2.3 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -306,9 +306,9 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 18 is required / JDK 16 is the minimum except on Mac ARM64 where JDK 17 is the minimum (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
+- JDK 18 is required / JDK 16 is minimum except on Mac ARM64 where JDK 17 is minimum (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
 - [RVM](http://rvm.io) on Mac & Linux (not needed on Windows)
-- JRuby 9.3.6.0 is required (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
+- JRuby 9.3.7.0 is required / JRuby 9.3.6.0 is minimum (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.7.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
 - SWT 4.24 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem). Note that SWT supports ARM64/AARCH64 on Mac and Linux since version 4.20
 - Git (comes with Mac and Linux. Install on Windows: https://git-scm.com/download/win )
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.2.0
+jgem install glimmer-dsl-swt -v 4.24.2.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.24.2.0'
+gem 'glimmer-dsl-swt', '~> 4.24.2.3'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.3
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.3.6.0
+jruby-9.3.7.0

data/VERSION

@@ -1 +1 @@
-4.24.2.0
+4.24.2.3

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -4807,32 +4807,93 @@ You may see another example at the [Hello, Radio Group!](/docs/reference/GLIMMER
 
 ##### Code Text Custom 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.
+`code_text` is a Glimmer built-in custom widget that displays syntax highlighted code (e.g. Ruby/JavaScript/HTML code) for 204 languages (see [options](#code-text-options) for the full list) by automating customizations for the SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget.
 
-It attempts to use a monospace font if available, seeking fonts in the following order:
-1. Consolas
-2. Courier
-3. Any font that contains the word "Mono"
-4. Default system font (if no other font is found)
+To utilize, simply use `code_text` in place of the multi-line `text` and `styled_text` widgets. If you set the `code_text` `text` property value to multi-line code content (e.g. Ruby/JavaScript/HTML code), it automatically styles it with syntax highlighting.
+
+`code_text` attempts to use a monospace font if available, seeking font names in the following order (specified in `Glimmer::SWT::Custom::CodeText::FONT_NAMES_PREFERRED`):
+1. `'Consolas'`
+2. `'Courier'`
+3. `'Monospace'`
+4. `'Liberation Mono'`
+5. First available font that contains the word `mono` (case-insensitive)
+6. Default system font (if no other font in the list is found)
 
 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:
+Dark Mode:
+
+![Glimmer Meta-Sample](/images/glimmer-meta-sample-dark-mode.png)
+
+Code Text Simple Example (default language is Ruby):
 
 ```ruby
-# ...
-@code_text = code_text {
+code_text {
   text bind(SampleDirectory, 'selected_sample.code', read_only: true)
   editable bind(SampleDirectory, 'selected_sample.editable')
 }
-# ...
 ```
 
-To use, simply use `code_text` in place of the `text` or `styled_text` widget. If you set its `text` value to Ruby code, it automatically styles it with syntax highlighting.
+Code Text Specified Language Example:
+
+```ruby
+code_text(language: 'html') {
+  text bind(SampleDirectory, 'selected_sample.code', read_only: true)
+  editable bind(SampleDirectory, 'selected_sample.editable')
+}
+```
+
+Code Text Lines and Margins Example:
+
+```ruby
+code_text(lines: true) {
+  text <=> [SampleDirectory, 'selected_sample.code']
+  editable <= [SampleDirectory, 'selected_sample.editable']
+  left_margin 7
+  right_margin 7
+}
+```
+
+Code Text Customized Lines Width and Background Example:
+
+```ruby
+code_text(lines: {width: 3}) {
+  line_numbers {
+    background Display.system_dark_theme? ? :black : :white
+  }
+  text <=> [SampleDirectory, 'selected_sample.code']
+  editable <= [SampleDirectory, 'selected_sample.editable']
+  left_margin 7
+  right_margin 7
+}
+```
+
+Code Text Customized Root Composite Margins/Spacing Background Example:
 
-###### Options
+```ruby
+code_text(lines: true) {
+  root {
+    grid_layout(2, false) {
+      horizontal_spacing 0
+      margin_left 0
+      margin_right 0
+      margin_top 0
+      margin_bottom 0
+    }
+  }
+  line_numbers {
+    background Display.system_dark_theme? ? :black : :white
+  }
+  text <=> [SampleDirectory, 'selected_sample.code']
+  editable <= [SampleDirectory, 'selected_sample.editable']
+  left_margin 7
+  right_margin 7
+}
+```
+
+###### Code Text Options
 
 **lines**
 (default: `false`)
@@ -4847,10 +4908,12 @@ Keep in mind that if the text grows and required a wider line numbers area, it g
 (default: `'glimmer'`)
 
 Changes syntax color highlighting theme. Can be one of the following:
-- glimmer
-- glimmer_dark (always applied when OS is in dark mode)
-- github
-- pastie
+- `'glimmer'`
+- `'glimmer_dark'` (always applied when OS is in Dark Mode unless you set another custom theme that has the word `dark` in its name, see more details below)
+- `'github'`
+- `'pastie'`
+
+Or you can simply implement a new [Rouge](https://github.com/rouge-ruby/rouge) **custom theme** just like the [github](https://github.com/rouge-ruby/rouge/blob/master/lib/rouge/themes/github.rb) theme or the glimmer theme: [lib/ext/rouge/themes/glimmer.rb](/lib/ext/rouge/themes/glimmer.rb)
 
 **language**
 (default: `'ruby'`)

data/docs/reference/GLIMMER_SAMPLES.md

@@ -810,7 +810,7 @@ Hello, Dialog! Open Dialog
 
 #### Hello, Code Text!
 
-This sample demonstrates the Glimmer Built-In [Code Text Custom Widget](#code-text-custom-widget).
+This sample demonstrates the Glimmer Built-In [Code Text Custom Widget](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#code-text-custom-widget).
 
 Code:
 

data/lib/glimmer/dsl/swt/dialog_expression.rb

@@ -19,9 +19,9 @@
 # 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/static_expression'
-require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 require 'glimmer/swt/dialog_proxy'
 

data/lib/glimmer/dsl/swt/display_expression.rb

@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/display_proxy'
 
 module Glimmer

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/image_proxy'
 require 'glimmer/swt/widget_proxy'
 

data/lib/glimmer/dsl/swt/message_box_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2022 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
@@ -7,10 +7,10 @@
 # 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
@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 require 'glimmer/swt/message_box_proxy'
 require 'glimmer/swt/swt_proxy'
@@ -38,7 +38,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
           potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
-          parent = nil          
+          parent = nil
           if potential_parent.is_a?(Shell)
             args.shift
             parent = potential_parent

data/lib/glimmer/dsl/swt/shell_expression.rb

@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 
 module Glimmer

data/lib/glimmer/swt/custom/code_text.rb

@@ -41,6 +41,7 @@ module Glimmer
         end
         
         REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
+        FONT_NAMES_PREFERRED = ['Consolas', 'Courier', 'Monospace', 'Liberation Mono']
         
         # TODO support auto language detection
               
@@ -126,7 +127,7 @@ module Glimmer
           require 'ext/rouge/themes/glimmer'
           require 'ext/rouge/themes/glimmer_dark'
           @dark_mode = Java::OrgEclipseSwtWidgets::Display.system_dark_theme?
-          self.theme = 'glimmer_dark' if @dark_mode
+          self.theme = 'glimmer_dark' if @dark_mode && !theme.downcase.include?('dark')
           @dark_theme = theme.include?('dark')
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
           select_best_font
@@ -325,8 +326,10 @@ module Glimmer
         
         def select_best_font_name
           all_font_names = display.get_font_list(nil, true).map(&:name)
-          @font_name ||= 'Consolas' if all_font_names.include?('Consolas')
-          @font_name ||= 'Courier' if all_font_names.include?('Courier')
+          @font_name = 'Courier' if OS.mac?
+          FONT_NAMES_PREFERRED.each do |font_name|
+            @font_name ||= font_name if all_font_names.include?(font_name)
+          end
           @font_name ||= all_font_names.find {|font_name| font_name.downcase.include?('mono')}
           @font_name
         end

data/samples/hello/hello_code_text.rb

@@ -87,7 +87,7 @@ class HelloCodeText
           text 'Ruby (glimmer theme)'
           
           # Note: code_text theme is currently ignored in dark mode
-          code_text(language: 'ruby', theme: 'glimmer_dark', lines: true) { # theme is currently ignored in dark mode
+          code_text(language: 'ruby', theme: 'glimmer', lines: true) { # theme is currently ignored in dark mode
             text <=> [self, :ruby_code]
           }
         }
@@ -98,7 +98,7 @@ class HelloCodeText
           text 'JavaScript (pastie theme)'
           
           # Note: code_text theme is currently ignored in dark mode
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer_dark', lines: {width: 2}) {
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
             root {
               grid_layout(2, false) {
                 margin_width 2
@@ -121,7 +121,7 @@ class HelloCodeText
           text 'HTML (github theme)'
           
           # Note: code_text theme is currently ignored in dark mode
-          code_text(language: 'html', theme: 'glimmer_dark') { # default is lines: false
+          code_text(language: 'html', theme: 'github') { # default is lines: false
             text <=> [self, :html_code]
           }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.2.0
+  version: 4.24.2.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement