glimmer-dsl-swt 4.22.2.4 → 4.23.0.0

data/samples/elaborate/calculator.rb

@@ -21,14 +21,14 @@ class Calculator
     Display.setAppName('Glimmer Calculator')
     
     display {
-      on_swt_keydown { |key_event|
+      on_swt_keydown do |key_event|
         char = key_event.character.chr rescue nil
         @presenter.press(char)
-      }
+      end
       
-      on_about {
+      on_about do
         display_about_dialog
-      }
+      end
     }
   end
 
@@ -59,16 +59,16 @@ class Calculator
       operation_button('÷')
       operation_button('×')
       operation_button('−')
-      (7..9).each { |number|
+      (7..9).each do |number|
         number_button(number)
-      }
+      end
       operation_button('+', font: BUTTON_FONT_BIG, vertical_span: 2)
-      (4..6).each { |number|
+      (4..6).each do |number|
         number_button(number)
-      }
-      (1..3).each { |number|
+      end
+      (1..3).each do |number|
         number_button(number)
-      }
+      end
       command_button('=', font: BUTTON_FONT_BIG, vertical_span: 2)
       number_button(0, horizontal_span: 2)
       operation_button('.')
@@ -98,9 +98,9 @@ class Calculator
         vertical_span options[:vertical_span]
       }
       
-      on_widget_selected {
+      on_widget_selected do
         @presenter.press(command)
-      }
+      end
     }
   end
 

data/samples/elaborate/contact_manager.rb

@@ -40,6 +40,7 @@ class ContactManager
             margin_width 0
             margin_height 0
           }
+          
           layout_data :fill, :center, true, false
           text 'Lookup Contacts'
           font height: 24
@@ -52,9 +53,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :first_name]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           label {
@@ -65,9 +67,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :last_name]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           label {
@@ -78,9 +81,10 @@ class ContactManager
           text {
             layout_data :fill, :center, true, false
             text <=> [@contact_manager_presenter, :email]
-            on_key_pressed {|key_event|
+            
+            on_key_pressed do |key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
+            end
           }
           
           composite {
@@ -94,18 +98,26 @@ class ContactManager
             
             button {
               text "&Find"
-              on_widget_selected { @contact_manager_presenter.find }
-              on_key_pressed {|key_event|
+              
+              on_widget_selected do
+                @contact_manager_presenter.find
+              end
+              
+              on_key_pressed do |key_event|
                 @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-              }
+              end
             }
             
             button {
               text "&List All"
-              on_widget_selected { @contact_manager_presenter.list }
-              on_key_pressed {|key_event|
+              
+              on_widget_selected do
+                @contact_manager_presenter.list
+              end
+              
+              on_key_pressed do |key_event|
                 @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
-              }
+              end
             }
           }
         }
@@ -134,9 +146,9 @@ class ContactManager
           
           items <=> [@contact_manager_presenter, :results, column_properties: [:first_name, :last_name, :email]]
           
-          on_mouse_up { |event|
+          on_mouse_up do |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
-          }
+          end
         }
       }
     }

data/samples/elaborate/game_of_life.rb

@@ -50,9 +50,9 @@ class GameOfLife
             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}]
               
-              on_mouse_down {
+              on_mouse_down do
                 @grid.cell_rows[row_index][column_index].toggle_aliveness!
-              }
+              end
             }
           end
         end
@@ -67,26 +67,26 @@ class GameOfLife
           text 'Step'
           enabled <= [@grid, :playing, on_read: :! ]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.step!
-          }
+          end
         }
         
         button {
           text 'Clear'
           enabled <= [@grid, :playing, on_read: :! ]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.clear!
-          }
+          end
         }
                 
         button {
           text <= [@grid, :playing, on_read: ->(p) { p ? 'Stop' : 'Play' }]
           
-          on_widget_selected {
+          on_widget_selected do
             @grid.toggle_playback!
-          }
+          end
         }
   
         label {

data/samples/elaborate/klondike_solitaire/view/action_panel.rb

@@ -19,9 +19,9 @@ class KlondikeSolitaire
             
             text 'Restart Game'
             
-            on_widget_selected {
+            on_widget_selected do
               game.restart!
-            }
+            end
           }
         }
       }

data/samples/elaborate/klondike_solitaire/view/klondike_solitaire_menu_bar.rb

@@ -7,12 +7,13 @@ class KlondikeSolitaire
       
       before_body do
         @display = display {
-          on_about {
+          on_about do
             display_about_dialog
-          }
-          on_preferences {
+          end
+          
+          on_preferences do
             display_about_dialog
-          }
+          end
         }
       end
   
@@ -20,30 +21,34 @@ class KlondikeSolitaire
         menu_bar {
           menu {
             text '&Game'
+            
             menu_item {
               text '&Restart'
               accelerator (OS.mac? ? :command : :ctrl), :r
               
-              on_widget_selected {
+              on_widget_selected do
                 game.restart!
-              }
+              end
             }
+            
             menu_item {
               text 'E&xit'
               accelerator :alt, :f4
               
-              on_widget_selected {
+              on_widget_selected do
                 exit(0)
-              }
+              end
             }
           }
           menu {
             text '&Help'
+            
             menu_item {
               text '&About...'
-              on_widget_selected {
+              
+              on_widget_selected do
                 display_about_dialog
-              }
+              end
             }
           }
         }

data/samples/elaborate/login.rb

@@ -81,9 +81,9 @@ class Login
           text <=> [@presenter, :user_name]
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_key_pressed { |event|
+          on_key_pressed do |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
-          }
+          end
         }
 
         label { text "Password:" }
@@ -91,9 +91,9 @@ class Login
           text <=> [@presenter, :password]
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_key_pressed { |event|
+          on_key_pressed do |event|
             @presenter.login! if event.keyCode == swt(:cr)
-          }
+          end
         }
 
         label { text "Status:" }
@@ -103,25 +103,31 @@ class Login
           text "Login"
           enabled <= [@presenter, :logged_out?, computed_by: :status]
           
-          on_widget_selected { @presenter.login! }
-          on_key_pressed { |event|
+          on_widget_selected do
+            @presenter.login!
+          end
+          
+          on_key_pressed do |event|
             if event.keyCode == swt(:cr)
               @presenter.login!
             end
-          }
+          end
         }
 
         button {
           text "Logout"
           enabled <= [@presenter, :logged_in?, computed_by: :status]
           
-          on_widget_selected { @presenter.logout! }
-          on_key_pressed { |event|
+          on_widget_selected do
+            @presenter.logout!
+          end
+          
+          on_key_pressed do |event|
             if event.keyCode == swt(:cr)
               @presenter.logout!
               @user_name_text.set_focus
             end
-          }
+          end
         }
       }
     }

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