glimmer-dsl-swt 4.22.2.4 → 4.22.2.5

data/samples/elaborate/mandelbrot_fractal.rb

@@ -186,10 +186,10 @@ class MandelbrotFractal
       minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
             
-      on_shell_closed {
+      on_shell_closed do
         @thread.kill # should not be dangerous in this case
         puts "Mandelbrot background calculation stopped!"
-      }
+      end
       
       progress_bar {
         layout_data :fill, :center, true, false
@@ -205,27 +205,27 @@ class MandelbrotFractal
           image @mandelbrot_image
           cursor :no
           
-          on_mouse_down {
+          on_mouse_down do
             @drag_detected = false
             @canvas.cursor = :hand
-          }
+          end
           
-          on_drag_detected { |drag_detect_event|
+          on_drag_detected do |drag_detect_event|
             @drag_detected = true
             @drag_start_x = drag_detect_event.x
             @drag_start_y = drag_detect_event.y
-          }
+          end
           
-          on_mouse_move { |mouse_event|
+          on_mouse_move do |mouse_event|
             if @drag_detected
               origin = @scrolled_composite.origin
               new_x = origin.x - (mouse_event.x - @drag_start_x)
               new_y = origin.y - (mouse_event.y - @drag_start_y)
               @scrolled_composite.set_origin(new_x, new_y)
             end
-          }
+          end
           
-          on_mouse_up { |mouse_event|
+          on_mouse_up do |mouse_event|
             if !@drag_detected
               origin = @scrolled_composite.origin
               @location_x = mouse_event.x
@@ -238,7 +238,7 @@ class MandelbrotFractal
             end
             @canvas.cursor = can_zoom_in? ? :cross : :no
             @drag_detected = false
-          }
+          end
           
         }
       }
@@ -251,27 +251,33 @@ class MandelbrotFractal
             text 'Zoom &In'
             accelerator COMMAND, '+'
             
-            on_widget_selected { zoom_in }
+            on_widget_selected do
+              zoom_in
+            end
           }
           
           menu_item {
             text 'Zoom &Out'
             accelerator COMMAND, '-'
             
-            on_widget_selected { zoom_out }
+            on_widget_selected do
+              zoom_out
+            end
           }
           
           menu_item {
             text '&Reset Zoom'
             accelerator COMMAND, '0'
             
-            on_widget_selected { perform_zoom(mandelbrot_zoom: 1.0) }
+            on_widget_selected do
+              perform_zoom(mandelbrot_zoom: 1.0)
+            end
           }
         }
         menu {
           text '&Cores'
           
-          Concurrent.physical_processor_count.times {|n|
+          Concurrent.physical_processor_count.times do |n|
             processor_number = n + 1
             menu_item(:radio) {
               text "&#{processor_number}"
@@ -287,11 +293,11 @@ class MandelbrotFractal
               
               selection true if processor_number == Concurrent.physical_processor_count
               
-              on_widget_selected {
+              on_widget_selected do
                 Mandelbrot.processor_count = processor_number
-              }
+              end
             }
-          }
+          end
         }
         menu {
           text '&Help'
@@ -300,9 +306,9 @@ class MandelbrotFractal
             text '&Instructions'
             accelerator COMMAND, :shift, :i
             
-            on_widget_selected {
+            on_widget_selected do
               display_help_instructions
-            }
+            end
           }
         }
       }
@@ -352,7 +358,7 @@ class MandelbrotFractal
   def color_palette
     if @color_palette.nil?
       @color_palette = [[0, 0, 0]] + 40.times.map { |i| [255 - i*5, 255 - i*5, 55 + i*5] }
-      @color_palette = @color_palette.map {|color_data| rgb(*color_data).swt_color}
+      @color_palette = @color_palette.map { |color_data| rgb(*color_data).swt_color }
     end
     @color_palette
   end

data/samples/elaborate/meta_sample.rb

@@ -253,22 +253,22 @@ class MetaSampleApplication
               font height: 25
               enabled <= [SampleDirectory, 'selected_sample.launchable']
               
-              on_widget_selected {
+              on_widget_selected do
                 begin
                   SampleDirectory.selected_sample.launch(@code_text.text)
                 rescue LoadError, StandardError, SyntaxError => launch_error
                   error_dialog(message: launch_error.full_message).open
                 end
-              }
+              end
             }
             button {
               text 'Reset'
               font height: 25
               enabled <= [SampleDirectory, 'selected_sample.editable']
               
-              on_widget_selected {
+              on_widget_selected do
                 SampleDirectory.selected_sample.reset_code!
-              }
+              end
             }
           }
         }
@@ -319,9 +319,9 @@ class MetaSampleApplication
       button {
         text 'Close'
         
-        on_widget_selected {
+        on_widget_selected do
           dialog_proxy.close
-        }
+        end
       }
     }
   end

data/samples/elaborate/metronome.rb

@@ -101,13 +101,13 @@ class Metronome
       
       @beat_container = beat_container
       
-      on_swt_show {
+      on_swt_show do
         start_metronome
-      }
+      end
       
-      on_widget_disposed {
+      on_widget_disposed do
         stop_metronome
-      }
+      end
     }
   }
   

data/samples/elaborate/stock_ticker.rb

@@ -170,42 +170,42 @@ class StockTicker
                   }
                 end
                 
-                on_mouse_down {
+                on_mouse_down do
                   @drag_detected = false
-                }
+                end
                 
-                on_drag_detected { |drag_detect_event|
+                on_drag_detected do |drag_detect_event|
                   @drag_detected = true
                   @drag_start_x = drag_detect_event.x
                   @drag_start_y = drag_detect_event.y
-                }
+                end
                 
-                on_mouse_move { |mouse_event|
+                on_mouse_move do |mouse_event|
                   if @drag_detected
                     origin = tab[:scrolled_composite].origin
                     new_x = origin.x - (mouse_event.x - @drag_start_x)
                     new_y = origin.y - (mouse_event.y - @drag_start_y)
                     tab[:scrolled_composite].set_origin(new_x, new_y)
                   end
-                }
+                end
                 
-                on_mouse_up { |mouse_event|
+                on_mouse_up do |mouse_event|
                   @drag_detected = false
-                }
+                end
               }
             }
           }
         end
       }
     
-      on_swt_show {
+      on_swt_show do
         Stock.price_min = 25
         Stock.price_max = @tabs.first[:canvas].bounds.height - 6
-      }
+      end
       
-      on_widget_disposed {
+      on_widget_disposed do
         @thread.kill # safe to kill as data is in memory only
-      }
+      end
     }
   }
 end

data/samples/elaborate/tetris.rb

@@ -150,15 +150,15 @@ class Tetris
     icon_size = 8
     icon_pixel_size = icon_block_size * icon_size
     image(icon_pixel_size, icon_pixel_size) {
-      icon_size.times { |row|
-        icon_size.times { |column|
+      icon_size.times do |row|
+        icon_size.times do |column|
           colored = row >= 1 && column.between?(1, 6)
           color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
           x = column * icon_block_size
           y = row * icon_block_size
           bevel(x: x, y: y, base_color: color, size: icon_block_size)
-        }
-      }
+        end
+      end
     }
   end
 

data/samples/elaborate/timer.rb

@@ -24,12 +24,13 @@ class Timer
     Display.setAppName('Glimmer Timer')
     
     @display = display {
-      on_about {
+      on_about do
         display_about_dialog
-      }
-      on_preferences {
+      end
+      
+      on_preferences do
         display_about_dialog
-      }
+      end
     }
 
     @min = 0
@@ -43,7 +44,7 @@ class Timer
       loop do
         sleep(1)
         if @countdown
-          sync_exec {
+          sync_exec do
             @countdown_time = Time.new(1, 1, 1, 0, min, sec)
             @countdown_time -= 1
             self.min = @countdown_time.min
@@ -52,7 +53,7 @@ class Timer
               stop_countdown
               play_countdown_done_sound
             end
-          }
+          end
         end
       end
     end
@@ -85,31 +86,34 @@ class Timer
           accelerator COMMAND_KEY, 's'
           enabled <= [self, :countdown, on_read: :!]
           
-          on_widget_selected {
+          on_widget_selected do
             start_countdown
-          }
+          end
         }
+        
         menu_item {
           text 'St&op'
           enabled <= [self, :countdown]
           accelerator COMMAND_KEY, 'o'
           
-          on_widget_selected {
+          on_widget_selected do
             stop_countdown
-          }
+          end
         }
+        
         unless OS.mac?
           menu_item(:separator)
           menu_item {
             text 'E&xit'
             accelerator :alt, :f4
             
-            on_widget_selected {
+            on_widget_selected do
               exit(0)
-            }
+            end
           }
         end
       }
+      
       menu {
         text '&Help'
                     
@@ -117,9 +121,9 @@ class Timer
           text '&About'
           accelerator COMMAND_KEY, :shift, 'a'
           
-          on_widget_selected {
+          on_widget_selected do
             display_about_dialog
-          }
+          end
         }
       }
     }
@@ -149,9 +153,10 @@ class Timer
         maximum 59
         selection <=> [self, :min]
         enabled <= [self, :countdown, on_read: :!]
-        on_widget_default_selected {
+        
+        on_widget_default_selected do
           start_countdown
-        }
+        end
       }
       label {
         text ':'
@@ -163,9 +168,10 @@ class Timer
         maximum 59
         selection <=> [self, :sec]
         enabled <= [self, :countdown, on_read: :!]
-        on_widget_default_selected {
+        
+        on_widget_default_selected do
           start_countdown
-        }
+        end
       }
     }
   end
@@ -179,22 +185,26 @@ class Timer
       @start_button = button {
         text '&Start'
         enabled <= [self, :countdown, on_read: :!]
-        on_widget_selected {
+        
+        on_widget_selected do
           start_countdown
-        }
-        on_key_pressed { |event|
+        end
+        
+        on_key_pressed do |event|
           start_countdown if event.keyCode == swt(:cr)
-        }
+        end
       }
       @stop_button = button {
         text 'St&op'
         enabled <= [self, :countdown]
-        on_widget_selected {
+        
+        on_widget_selected do
           stop_countdown
-        }
-        on_key_pressed { |event|
+        end
+        
+        on_key_pressed do |event|
           stop_countdown if event.keyCode == swt(:cr)
-        }
+        end
       }
     }
   end

data/samples/elaborate/user_profile.rb

@@ -32,49 +32,88 @@ shell { |shell_proxy|
     grid_layout 2, false
 
     group {
-      text "Name"
       grid_layout 2, false
+      
       layout_data :fill, :fill, true, true
-      label {text "First"}; text {text "Bullet"}
-      label {text "Last"}; text {text "Tooth"}
+      text "Name"
+      
+      label {
+        text "First"
+      }
+      text {
+        text "Bullet"
+      }
+      
+      label {
+        text "Last"
+      }
+      text {
+        text "Tooth"
+      }
     }
 
     group {
       layout_data :fill, :fill, true, true
       text "Gender"
-      radio {text "Male"; selection true}
-      radio {text "Female"}
+      
+      radio {
+        text "Male"
+        selection true
+      }
+      
+      radio {
+        text "Female"
+      }
     }
 
     group {
       layout_data :fill, :fill, true, true
       text "Role"
-      check {text "Student"; selection true}
-      check {text "Employee"; selection true}
+      
+      check {
+        text "Student"
+        selection true
+      }
+      
+      check {
+        text "Employee"
+        selection true
+      }
     }
 
     group {
-      text "Experience"
       row_layout
+      
       layout_data :fill, :fill, true, true
-      spinner {selection 5}; label {text "years"}
+      text "Experience"
+      
+      spinner {
+        selection 5
+      }
+      label {
+        text "years"
+      }
     }
 
     button {
-      text "save"
       layout_data :right, :center, true, true
-      on_widget_selected {
+      text "save"
+      
+      on_widget_selected do
         message_box {
           text 'Profile Saved!'
           message 'User profile has been saved!'
         }.open
-      }
+      end
     }
 
     button {
-      text "close"
       layout_data :left, :center, true, true
-      on_widget_selected { shell_proxy.close }
+      text "close"
+      
+      on_widget_selected do
+        shell_proxy.close
+      end
     }
   }
 }.open

data/samples/elaborate/weather.rb

@@ -62,13 +62,13 @@ class Weather
         
         text <=> [self, :city]
         
-        on_key_pressed {|event|
+        on_key_pressed do |event|
           if event.keyCode == swt(:cr) # carriage return
             Thread.new do
               fetch_weather!
             end
           end
-        }
+        end
       }
             
       tab_folder {

data/samples/hello/hello_button.rb

@@ -27,7 +27,7 @@ class HelloButton
   attr_accessor :count
   
   before_body do
-    @count = 0
+    self.count = 0
   end
   
   body {
@@ -37,9 +37,9 @@ class HelloButton
       button {
         text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
         
-        on_widget_selected {
+        on_widget_selected do
           self.count += 1
-        }
+        end
       }
     }
   }

data/samples/hello/hello_canvas_animation.rb

@@ -123,12 +123,12 @@ class HelloCanvasAnimation
           started        <=> [self, :animation_started]
           finished       <=> [self, :animation_finished]
           
-          frame { |index|
+          frame do |index|
             background rgb(index%100, index%100 + 100, index%55 + 200)
             oval(index*3%300, index*3%300, 20, 20) {
               background :yellow
             }
-          }
+          end
         }
       }
     }

data/samples/hello/hello_color_dialog.rb

@@ -47,18 +47,18 @@ class HelloColorDialog
         layout_data :center, :center, true, false
         background <=> [self, :selected_color]
         
-        on_mouse_up {
+        on_mouse_up do
           self.selected_color = color_dialog.open
-        }
+        end
       }
       
       button {
         layout_data :center, :center, true, false
         text "Choose Color..."
         
-        on_widget_selected {
+        on_widget_selected do
           self.selected_color = color_dialog.open
-        }
+        end
       }
       
     }

data/samples/hello/hello_custom_shell.rb

@@ -140,7 +140,7 @@ class HelloCustomShell
         
         items <=> [@email_system, :emails, column_properties: [:date, :subject, :from]]
         
-        on_mouse_up { |event|
+        on_mouse_up do |event|
           email = event.table_item.get_data
           
           # open a custom email shell
@@ -151,7 +151,7 @@ class HelloCustomShell
             from: email.from,
             message: email.message
           ).open
-        }
+        end
       }
     }.open
   end

data/samples/hello/hello_dialog.rb

@@ -38,7 +38,7 @@ shell { |shell_proxy|
       }
       text "Dialog #{dialog_number}"
       
-      on_widget_selected {
+      on_widget_selected do
         # pass the shell proxy as a parent to make the dialog support hitting the escape button for closing alone without closing app
         dialog(shell_proxy) { |dialog_proxy|
           row_layout(:vertical) {
@@ -70,12 +70,12 @@ shell { |shell_proxy|
           button {
             text 'Close'
             
-            on_widget_selected {
+            on_widget_selected do
               dialog_proxy.close
-            }
+            end
           }
         }.open
-      }
+      end
     }
   }
 }.open

data/samples/hello/hello_directory_dialog.rb

@@ -51,9 +51,9 @@ class HelloDirectoryDialog
       button {
         text "Browse..."
         
-        on_widget_selected {
+        on_widget_selected do
           self.selected_directory = directory_dialog.open
-        }
+        end
       }
     }
   }

data/samples/hello/hello_expand_bar.rb

@@ -96,14 +96,13 @@ class HelloExpandBar
           composite # just filler
         }
         
-        on_item_expanded { |expand_event|
+        on_item_expanded do |expand_event|
           @status_label.text = "#{expand_event.item.text} Expanded!"
-        }
+        end
         
-        on_item_collapsed { |expand_event|
+        on_item_collapsed do |expand_event|
           @status_label.text = "#{expand_event.item.text} Collapsed!"
-        }
-        
+        end
       }
     }
   }

data/samples/hello/hello_file_dialog.rb

@@ -51,9 +51,9 @@ class HelloFileDialog
       button {
         text "Browse..."
         
-        on_widget_selected {
+        on_widget_selected do
           self.selected_file = file_dialog.open
-        }
+        end
       }
     }
   }