glimmer-dsl-swt 4.22.2.4 → 4.23.0.0

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
       }
     }
   }

data/samples/hello/hello_font_dialog.rb

@@ -70,11 +70,11 @@ class HelloFontDialog
       button {
         text "Choose Font..."
         
-        on_widget_selected {
+        on_widget_selected do
           self.selected_font_data = font_dialog {
             font_list [@selected_font_data]
           }.open
-        }
+        end
       }
       
     }

data/samples/hello/hello_link.rb

@@ -47,11 +47,12 @@ class HelloLink
           Just keep clicking <a href="all links">links</a> to find out!
         MULTI_LINE_STRING
             
-        on_widget_selected { |selection_event|
+        on_widget_selected do |selection_event|
           # This retrieves the clicked link href (or contained text if no href is set)
           @selected_link = selection_event.text
-        }
-        on_mouse_up { |mouse_event|
+        end
+        
+        on_mouse_up do |mouse_event|
           unless @selected_link.nil?
             @help_shell.close unless @help_shell.nil? || @help_shell.disposed?
             @help_shell = shell(:no_trim) {
@@ -79,7 +80,7 @@ class HelloLink
             }
             @help_shell.open
           end
-        }
+        end
       }
     }
   }

data/samples/hello/hello_list_multi_selection.rb

@@ -69,7 +69,9 @@ class HelloListMultiSelection
       button {
         text 'Reset Selections To Default Values'
         
-        on_widget_selected { @person.reset_provinces! }
+        on_widget_selected do
+          @person.reset_provinces!
+        end
       }
     }
   }

data/samples/hello/hello_list_single_selection.rb

@@ -54,7 +54,9 @@ class HelloListSingleSelection
       button {
         text 'Reset Selection To Default Value'
         
-        on_widget_selected { @person.reset_country! }
+        on_widget_selected do
+          @person.reset_country!
+        end
       }
     }
   }

data/samples/hello/hello_menu_bar.rb

@@ -45,52 +45,52 @@ shell {
         text '&New'
         accelerator :command, :N
         
-        on_widget_selected {
+        on_widget_selected do
           message_box {
             text 'New'
             message 'New file created.'
           }.open
-        }
+        end
       }
       menu_item {
         text '&Open...'
         accelerator :command, :O
         
-        on_widget_selected {
+        on_widget_selected do
           message_box {
             text 'Open'
             message 'Opening File...'
           }.open
-        }
+        end
       }
       menu {
         text 'Open &Recent'
         menu_item {
           text 'File 1'
-          on_widget_selected {
+          on_widget_selected do
             message_box {
               text 'File 1'
               message 'File 1 Contents'
             }.open
-          }
+          end
         }
         menu_item {
           text 'File 2'
-          on_widget_selected {
+          on_widget_selected do
             message_box {
               text 'File 2'
               message 'File 2 Contents'
             }.open
-          }
+          end
         }
       }
       menu_item(:separator)
       menu_item {
         text 'E&xit'
         
-        on_widget_selected {
+        on_widget_selected do
           exit(0)
-        }
+        end
       }
     }
     menu {
@@ -114,10 +114,10 @@ shell {
       menu_item(:radio) {
         text '&Enabled'
         
-        on_widget_selected {
+        on_widget_selected do
           @select_one_menu.enabled = true
           @select_multiple_menu.enabled = true
-        }
+        end
       }
       @select_one_menu = menu {
         text '&Select One'
@@ -156,9 +156,9 @@ shell {
           menu_item(:radio) {
             text color_style.to_s.split('_').map(&:capitalize).join(' ')
             
-            on_widget_selected {
+            on_widget_selected do
               @label.background = color_style
-            }
+            end
           }
         }
       }
@@ -168,9 +168,9 @@ shell {
           menu_item(:radio) {
             text color_style.to_s.split('_').map(&:capitalize).join(' ')
             
-            on_widget_selected {
+            on_widget_selected do
               @label.foreground = color_style
-            }
+            end
           }
         }
       }
@@ -180,27 +180,27 @@ shell {
       menu_item(:radio) {
         text 'Small'
         
-        on_widget_selected {
+        on_widget_selected do
           @label.font = {height: 25}
           @label.parent.pack
-        }
+        end
       }
       menu_item(:radio) {
         text 'Medium'
         selection true
         
-        on_widget_selected {
+        on_widget_selected do
           @label.font = {height: 50}
           @label.parent.pack
-        }
+        end
       }
       menu_item(:radio) {
         text 'Large'
         
-        on_widget_selected {
+        on_widget_selected do
           @label.font = {height: 75}
           @label.parent.pack
-        }
+        end
       }
     }
     menu {
@@ -209,34 +209,34 @@ shell {
         text '&Manual'
         accelerator :command, :shift, :M
         
-        on_widget_selected {
+        on_widget_selected do
           message_box {
             text 'Manual'
             message 'Manual Contents'
           }.open
-        }
+        end
       }
       menu_item {
         text '&Tutorial'
         accelerator :command, :shift, :T
         
-        on_widget_selected {
+        on_widget_selected do
           message_box {
             text 'Tutorial'
             message 'Tutorial Contents'
           }.open
-        }
+        end
       }
       menu_item(:separator)
       menu_item {
         text '&Report an Issue...'
         
-        on_widget_selected {
+        on_widget_selected do
           message_box {
             text 'Report an Issue'
             message 'Reporting an issue...'
           }.open
-        }
+        end
       }
     }
   }

data/samples/hello/hello_message_box.rb

@@ -29,11 +29,11 @@ shell {
   button {
     text 'Please Click To Win a Surprise'
     
-    on_widget_selected {
+    on_widget_selected do
       message_box {
         text 'Surprise'
         message "Congratulations!\n\nYou won $1,000,000!"
       }.open
-    }
+    end
   }
 }.open