glimmer-dsl-swt 4.23.1.2 → 4.23.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9f704c72e3667bd413ba1209b17a6edfb110daaacba4b6ed17106afc3b9712
-  data.tar.gz: c9c68f2a0dce76782ea222753a9a18fb29dc5c7c8fd3fe0b31f65f1fd8ddd71e
+  metadata.gz: 1e7fdea386552ea2e886daa0e3af525b3cd61f010c15cec8f0e0b284589fe623
+  data.tar.gz: 628664b99898f420c6dbaff3cfd169d488ae5820a58f810a5c00f59145b322a2
 SHA512:
-  metadata.gz: fccd43c31d1afa0dfb783ead575b62b36f47d5431d078c018393995315290ee63092ad348fe710a2b04aca8112e25d3d26324cd44126702747eb875009dcc052
-  data.tar.gz: 2cebe2ef5735e9d55c9c49909e3ce02ea914b56a8dd49df134863b4feea5fec2f069a4997133e85f6bc77a89428ae178357bae9a95a9cb864a46183d5eac0103
+  metadata.gz: 49bd76ed70c1376a1a845206663660fcfb89278f4ea8d3c2da3c033d2c8402a694e1bc07f1ec23312465ad90d15aaebbcc2de0888d797b5b62e28feb8770803a
+  data.tar.gz: ebc7b0e9ac9e5374c63a33d10e1a54fec57aa59117e1c130c8e9ca8a60d3f2bcf2ec72f6fe20f9c4c22305509fd24ae0d0dcc80542bd0f7a75457be2a095f30a

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 4.23.1.5
+
+- Refactor/Improve the Hello, Cursor! sample
+- Add Hello, Cursor! video tutorial to Glimmer Meta-Sample
+
+## 4.23.1.4
+
+- Improve convenience by making `sash_form` accept `orientation` with SWT style symbols directly (`:horizontal` directly instead of `swt(:horizontal)`)
+- Improve convenience by making `sash_form` accept `maximized_control` as Glimmer DSL for SWT widget proxy instead of low-level SWT widget (`@label` instead of `@label.swt_widget`)
+- Update Hello, Sash Form! to add Sash Color and simplify with new `sash_form` improvements
+
+## 4.23.1.3
+
+- Update initial tab folder width in Weather sample
+- Add Help menu to scaffolded apps/gems with About menu item that used to be in the scaffolded File menu
+- Fix names of icons generated for custom shell gems to get them picked up by the `glimmer package` command
+- Fix issue with shell not packing layout correctly on initial open (might be caused by the latest version of SWT under certain scenarios)
+- Fix setting of Display app_name and app_version in scaffolded apps and custom shells
+
 ## 4.23.1.2
 
 - Add Hello, Pop Up Context Menu! video tutorial to Glimmer Meta-Sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.23.1.2
+# [<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.23.1.5
 ## 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)
@@ -19,9 +19,9 @@ 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.23.1.2 includes [SWT 4.23](https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/), which was released on March 8, 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.23.1.5 includes [SWT 4.23](https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/), which was released on March 8, 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.
+**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).
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
@@ -333,7 +333,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.23.1.2
+jgem install glimmer-dsl-swt -v 4.23.1.5
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -361,7 +361,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.23.1.2'
+gem 'glimmer-dsl-swt', '~> 4.23.1.5'
 ```
 
 And, then run:
@@ -384,7 +384,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.23.1.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.23.1.5
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.23.1.2
+4.23.1.5

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -938,12 +938,10 @@ shell {
 
 The system tray allows showing icons for various apps that need to stay on for extended periods of time and provide quick access.
 
-In Glimmer DSL for SWT, generating tray items is automated via the `tray_item` keyword, which can be nested under `shell` and then have a child `menu` underneath that pops up when the user clicks on its icon in the system tray.
+In Glimmer DSL for SWT, generating tray items is automated via the `tray_item` keyword, which can be nested under `shell` and then have a child `menu` underneath that pops up when the user clicks on its icon in the system tray. It is recommended that the related shell is declared with the `:on_top` style (in addition to the default style `:shell_trim`) to ensure it opens above all apps when shown.
 
 Note that if you would like to display notifications, you can use the [Nebula Notifier custom widget](https://github.com/AndyObtiva/glimmer-cw-nebula#notifier). Alternatively, you can look into the [Two Slices](https://github.com/sshtools/two-slices) Java library.
 
-Note how the shell was declared with the `:on_top` style (in addition to the default, which is `:shell_trim`) to ensure it opens above all apps when the "Show Application" menu item is selected.
-
 Example code:
 
 ```ruby
@@ -1044,6 +1042,10 @@ It can be customized with the `weights` attribute by setting initial weights to
 
 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)
 
+You can customize the color of the sash by setting the `background` attribute.
+
+Also, you can customize the `sash_width` (`Integer`) and `orientation` properties (`swt(:horizontal)` or `swt(:vertical)`).
+
 Example (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 
 ```ruby
@@ -3606,7 +3608,7 @@ Learn more at the [Hello, Tree!](/docs/reference/GLIMMER_SAMPLES.md#hello-tree)
 
 #### DateTime
 
-`date_time` represents the SWT DateTime widget.
+`date_time` represents the SWT [DateTime](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/DateTime.html) widget.
 
 Glimmer s the following alias keywords for it for convenience:
 - `date`: `date_time(:date)`
@@ -3615,15 +3617,15 @@ Glimmer s the following alias keywords for it for convenience:
 - `calendar`: `date_time(:calendar)`
 
 You can data-bind any of these properties:
-- `date_time bind(model, :property)`: produces a Ruby DateTime object
-- `date bind(model, :property)`: produces a Ruby Date object
-- `time bind(model, :property)`: produces a Ruby Time object
-- `year bind(model, :property)`: produces an integer
-- `month bind(model, :property)`: produces an integer
-- `day bind(model, :property)`: produces an integer
-- `hours bind(model, :property)`: produces an integer
-- `minutes bind(model, :property)`: produces an integer
-- `seconds bind(model, :property)`: produces an integer
+- `date_time <=> [model, :property]`: produces a Ruby DateTime object
+- `date <=> [model, :property]`: produces a Ruby Date object
+- `time <=> [model, :property]`: produces a Ruby Time object
+- `year <=> [model, :property]`: produces an integer
+- `month <=> [model, :property]`: produces an integer
+- `day <=> [model, :property]`: produces an integer
+- `hours <=> [model, :property]`: produces an integer
+- `minutes <=> [model, :property]`: produces an integer
+- `seconds <=> [model, :property]`: produces an integer
 
 Learn more at the [Hello, Date Time!](/docs/reference/GLIMMER_SAMPLES.md#hello-date-time) sample.
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -84,6 +84,7 @@
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
+    - [Contact Manager App](#contact-manager-app)
 - [License](#license)
 
 ## Samples
@@ -682,7 +683,7 @@ Hello, Print!
 
 #### Hello, Date Time!
 
-This sample demonstrates the use of [date_time](#datetime) widget keywords in Glimmer: `date`, `date_drop_down`, `time`, and `calendar`
+This sample demonstrates the use of [date_time](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#datetime) widget keywords in Glimmer: `date`, `date_drop_down`, `time`, and `calendar`
 
 Code:
 
@@ -1429,6 +1430,12 @@ Gladiator is a good demonstration of:
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-timer/master/glimmer-timer-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-timer)
 
+#### Contact Manager App
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/contact_manager/master/icons/linux/Contact%20Manager.png" height=40 /> Contact Manager](https://github.com/AndyObtiva/contact_manager) is an enhanced version of the included Contact Manager elaborate sample, which demonstrates how to connect to a [SQLite database](https://www.sqlite.org/index.html) with [ActiveRecord](https://rubygems.org/gems/activerecord) and how to implement a [Master-Detail Interface](https://en.wikipedia.org/wiki/Master%E2%80%93detail_interface) following the [Model-View-Presenter Pattern](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93presenter). This version can also be packaged as a native executable (DMG/MSI/DEB/RPM).
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/contact_manager/master/screenshots/contact-manager.gif" /> ](https://github.com/AndyObtiva/contact_manager)
+
 ## License
 
 [MIT](LICENSE.txt)

data/lib/glimmer/rake_task/scaffold.rb

@@ -280,17 +280,17 @@ module Glimmer
           write 'spec/spec_helper.rb', spec_helper_file
     
           mkdir_p 'icons/windows'
-          icon_file = "icons/windows/#{human_name(custom_shell_name)}.ico"
+          icon_file = "icons/windows/#{human_name(gem_name)}.ico"
           cp File.expand_path('../../../../icons/scaffold_app.ico', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
             
           mkdir_p 'icons/macosx'
-          icon_file = "icons/macosx/#{human_name(custom_shell_name)}.icns"
+          icon_file = "icons/macosx/#{human_name(gem_name)}.icns"
           cp File.expand_path('../../../../icons/scaffold_app.icns', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
           mkdir_p 'icons/linux'
-          icon_file = "icons/linux/#{human_name(custom_shell_name)}.png"
+          icon_file = "icons/linux/#{human_name(gem_name)}.png"
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
@@ -445,9 +445,13 @@ module Glimmer
             end
             
             class #{class_name(app_name)}
+              include Glimmer
+              
               APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
               LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
+              Display.app_name = '#{human_name(app_name)}'
+              Display.app_version = VERSION
             end
     
             require '#{file_name(app_name)}/view/app_view'
@@ -574,6 +578,8 @@ module Glimmer
       APP_ROOT = File.expand_path('../../../..', __FILE__)
       VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
       LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
+      Display.app_name = '#{human_name(custom_shell_name)}'
+      Display.app_version = VERSION
           
             MULTI_LINE_STRING
           end
@@ -594,8 +600,6 @@ module Glimmer
           if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
       before_body do
-        Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
-        Display.app_version = VERSION
         @display = display {
           on_about do
             display_about_dialog
@@ -630,8 +634,8 @@ module Glimmer
         shell#{'(:fill_screen)' if shell_type == :desktopify} {
           # Replace example content below with custom shell content
           minimum_size #{shell_type == :desktopify ? '768, 432' : '420, 240'}
-          image File.join(APP_ROOT, 'icons', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?
-          image File.join(APP_ROOT, 'icons', 'linux', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.png") unless OS.windows?
+          image File.join(APP_ROOT, 'icons', 'windows', "#{human_name(current_dir_name)}.ico") if OS.windows?
+          image File.join(APP_ROOT, 'icons', 'linux', "#{human_name(current_dir_name)}.png") unless OS.windows?
           text "#{human_name(namespace)}#{' - ' + human_name(custom_shell_name) if shell_type != :desktopify}"
         
           MULTI_LINE_STRING
@@ -661,18 +665,21 @@ module Glimmer
               text '&File'
               
               menu_item {
-                text '&About...'
+                text '&Preferences...'
                 
                 on_widget_selected do
-                  display_about_dialog
+                  #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
                 end
               }
+            }
+            menu {
+              text '&Help'
               
               menu_item {
-                text '&Preferences...'
+                text '&About...'
                 
                 on_widget_selected do
-                  #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
+                  display_about_dialog
                 end
               }
             }

data/lib/glimmer/swt/shell_proxy.rb

@@ -121,7 +121,8 @@ module Glimmer
             @swt_widget.setVisible(true)
           else
             @opened_before = true
-            @swt_widget.pack
+            @swt_widget.layout(true, true)
+            @swt_widget.pack(true)
             center_within_display
             @swt_widget.open
           end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1141,6 +1141,14 @@ module Glimmer
           items: lambda do |value|
             value.to_java :string
           end,
+          maximized_control: lambda do |value|
+            value = (value.respond_to?(:swt_widget) ? value.swt_widget : value) if swt_widget.is_a?(SashForm)
+            value
+          end,
+          orientation: lambda do |value|
+            value = SWTProxy[value] if swt_widget.is_a?(SashForm)
+            value
+          end,
           selection: lambda do |value|
             value = value.to_f if swt_widget.is_a?(Spinner)
             value

data/samples/elaborate/meta_sample/tutorials.yml

@@ -14,3 +14,6 @@ Hello, Tree!: M-ZOFyzbEKo
 Hello, Table!: 3zyyXq7WJwc
 Hello, Pop Up Context Menu!: kupwWSZdsQE
 Hello, Menu Bar!: 3RRVFIfA_UM
+Weather: rC6x6aj1MdA
+Hello, Date Time!: MpXbPEMUrns
+Hello, Sash Form!: F7j2TTpbX6s

data/samples/elaborate/meta_sample.rb

@@ -48,7 +48,7 @@ class Sample
     end
     
     def tutorials
-      if remote_tutorials && !remote_tutorials.empty? && remote_tutorials != local_tutorials
+      if remote_tutorials && !remote_tutorials.empty? && remote_tutorials.size >= local_tutorials.size
         remote_tutorials
       else
         local_tutorials

data/samples/elaborate/weather.rb

@@ -72,7 +72,9 @@ class Weather
       }
             
       tab_folder {
-        layout_data(:center, :center, true, true)
+        layout_data(:center, :center, true, true) {
+          width_hint 250
+        }
         
         ['℃', '℉'].each do |temp_unit|
           tab_item {

data/samples/hello/hello_cursor.rb

@@ -23,27 +23,25 @@ require 'glimmer-dsl-swt'
 
 class HelloCursor
   include Glimmer::UI::CustomShell
-  
+
   attr_accessor :selected_cursor
-  
+
   # This method matches the name of the :selected_cursor property by convention
   def selected_cursor_options
     Glimmer::SWT::SWTProxy.cursor_options
   end
-  
-  after_body do
-    observe(self, :selected_cursor) {
-      body_root.cursor = selected_cursor
-    }
+
+  before_body do
+    self.selected_cursor = :arrow
   end
-  
+
   body {
     shell {
       grid_layout
-      
+
       text 'Hello, Cursor!'
-      cursor :wait
-      
+      cursor <= [self, :selected_cursor]
+
       label {
         text 'Please select a cursor style and see it change the mouse cursor (varies per platform):'
         font style: :bold

data/samples/hello/hello_sash_form.rb

@@ -22,22 +22,15 @@
 require 'glimmer-dsl-swt'
 
 class SashFormPresenter
-  include Glimmer
-  
-  attr_accessor :sash_width, :orientation, :orientation_style
+  attr_accessor :sash_width, :sash_color, :orientation
   
   def initialize
-    @sash_width = 10
-    self.orientation = 'horizontal'
+    self.sash_width = 10
+    self.orientation = :horizontal
   end
   
   def orientation_options
-    ['horizontal', 'vertical']
-  end
-  
-  def orientation=(value)
-    @orientation = value
-    self.orientation_style = swt(@orientation)
+    [:horizontal, :vertical]
   end
 end
 
@@ -55,7 +48,8 @@ shell {
       height_hint 200
     }
     sash_width <=> [@presenter, :sash_width]
-    orientation <=> [@presenter, :orientation_style]
+    background <=> [@presenter, :sash_color]
+    orientation <=> [@presenter, :orientation]
     weights 1, 2
     
     @green_label = label {
@@ -90,6 +84,20 @@ shell {
       font height: 16
     }
     
+    label {
+      layout_data(:right, :center, true, false)
+      text 'Sash Color:'
+      font height: 16
+    }
+    button {
+      layout_data :fill, :center, true, false
+      text "Choose Color..."
+      
+      on_widget_selected do
+        @presenter.sash_color = color_dialog.open
+      end
+    }
+    
     label {
       layout_data(:right, :center, true, false)
       text 'Orientation:'
@@ -110,7 +118,7 @@ shell {
       font height: 16
       
       on_widget_selected do
-        @sash_form.maximized_control = @green_label.swt_widget
+        @sash_form.maximized_control = @green_label
       end
     }
     button {
@@ -120,7 +128,7 @@ shell {
       font height: 16
       
       on_widget_selected do
-        @sash_form.maximized_control = @red_label.swt_widget
+        @sash_form.maximized_control = @red_label
       end
     }
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.23.1.2
+  version: 4.23.1.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement