glimmer-dsl-swt 4.24.0.0 → 4.24.1.0

data/docs/reference/GLIMMER_SAMPLES.md

@@ -82,7 +82,6 @@
     - [Snake](#snake)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
-    - [Gladiator](#gladiator)
     - [Timer](#timer)
     - [Contact Manager App](#contact-manager-app)
 - [License](#license)
@@ -863,7 +862,7 @@ Hello, Canvas! Colors Changed
 
 Hello, Canvas! Data-Binding (changing a `text` shape `string` via data-binding changes from another thread)
 
-![Hello Canvas Data Binding](/images/glimmer-hello-canvas-data-binding.gif)
+![Hello Canvas Text Data Binding](/images/glimmer-hello-canvas-text-data-binding.gif)
 
 #### Hello, Canvas Animation!
 
@@ -923,9 +922,7 @@ Code:
 
 Hello, Canvas Data Binding!
 
-![Hello Canvas Data Binding](/images/glimmer-hello-canvas-data-binding.png)
-
-![Hello Canvas Data Binding Line Changed](/images/glimmer-hello-canvas-data-binding-line-changed.png)
+![Hello Canvas Data Binding](/images/glimmer-hello-canvas-data-binding.gif)
 
 #### Hello, Canvas Shape Listeners!
 
@@ -1407,23 +1404,6 @@ Snake
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-calculator/master/glimmer-cs-calculator-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-calculator)
 
-#### Gladiator
-
-[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.png' height=40 /> Gladiator](https://github.com/AndyObtiva/glimmer-cs-gladiator) (short for Glimmer Editor) is a Glimmer sample project under on-going development.
-You may check it out to learn how to build a Glimmer Custom Shell gem.
-
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-gladiator.png" />](https://github.com/AndyObtiva/glimmer-cs-gladiator)
-
-Gladiator is a good demonstration of:
-- MVP Pattern
-- Tree data-binding
-- List data-binding
-- Text selection data-binding
-- Tabs
-- Context menus
-- Custom Shell
-- Custom widget
-
 #### Timer
 
 [<img alt="Glimmer Timer Icon" src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-timer/master/images/glimmer-timer-logo.png" height=40 /> Timer](https://github.com/AndyObtiva/glimmer-cs-timer) is a sample app demonstrating data-binding, multi-threading, and JSound (Java Sound) library integration in a desktop application.

data/lib/glimmer/rake_task/scaffold.rb

@@ -195,16 +195,12 @@ module Glimmer
             system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
           end
           write 'spec/spec_helper.rb', spec_helper_file
-          if OS.windows?
-            system "glimmer package" # TODO handle Windows with batch file
-            system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
+          if OS.mac?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
+          elsif OS.linux?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
-            if OS.mac?
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-            else
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
-            end
+            system "glimmer run"
           end
         end
     
@@ -294,16 +290,12 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          if OS.windows?
-            system "glimmer package" # TODO handle windows properly with batch file
-            system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
+          if OS.mac?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
+          elsif OS.linux?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
-            if OS.mac?
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-            else
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
-            end
+            system "glimmer run"
           end
           puts "Finished creating #{gem_name} Ruby gem."
           puts 'Edit Rakefile to configure gem details.'

data/lib/glimmer/swt/custom/shape/path_segment.rb

@@ -98,6 +98,7 @@ module Glimmer
           
           def add_to_swt_path(swt_path)
             the_path_segment_args = path_segment_args.dup
+            the_path_segment_args = the_path_segment_args.first if the_path_segment_args.size == 1 && the_path_segment_args.first.is_a?(Array)
             if !is_a?(Point) && self.class != Path
               if !previous_point_connected?
                 if the_path_segment_args.count == default_path_segment_arg_count

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

@@ -562,7 +562,8 @@ module Glimmer
         end
         
         def has_attribute?(attribute_name, *args)
-          self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
+          attribute_name == 'data' or
+            self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
             parameter_name?(attribute_name) or
             (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
         end
@@ -577,7 +578,9 @@ module Glimmer
           property_change = nil
           ruby_attribute_getter_name = ruby_attribute_getter(attribute_name)
           ruby_attribute_setter_name = ruby_attribute_setter(attribute_name)
-          if parameter_name?(attribute_name)
+          if attribute_name == 'data'
+            set_data(*args)
+          elsif parameter_name?(attribute_name)
             return if ruby_attribute_getter_name == (args.size == 1 ? args.first : args)
             set_parameter_attribute(ruby_attribute_getter_name, *args)
           elsif (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter_name, super: true))

data/samples/elaborate/game_of_life.rb

@@ -48,7 +48,7 @@ class GameOfLife
         (0...HEIGHT).each do |row_index|
           (0...WIDTH).each do |column_index|
             rectangle(column_index*CELL_WIDTH, row_index*CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT) {
-              background <= [@grid.cell_rows[row_index][column_index], "alive", on_read: ->(a) {a ? :black : :white}]
+              background <= [@grid.cell_rows[row_index][column_index], :alive, on_read: ->(a) {a ? :black : :white}]
               
               on_mouse_down do
                 @grid.cell_rows[row_index][column_index].toggle_aliveness!
@@ -59,7 +59,7 @@ class GameOfLife
               end
 
               on_mouse_move do
-                @grid.cell_rows[row_index][column_index].alive = true if @drag_detected
+                @grid.cell_rows[row_index][column_index].live! if @drag_detected
               end
 
               on_mouse_up do

data/samples/elaborate/meta_sample/tutorials.yml

@@ -19,3 +19,7 @@ Hello, Date Time!: MpXbPEMUrns
 Hello, Sash Form!: F7j2TTpbX6s
 Hello, Cursor!: 4AYlo8n3WFc
 Hello, Tray Item!: VYXgIr5zxMM
+Hello, Drag And Drop!: zJSG5ysow0M
+Hello, Canvas Drag And Drop!: e7taTbRrDAM
+Game Of Life: pDE79YRjOjs
+Hello, Canvas Data Binding!: PQ_Y8e5VeDo