glimmer-dsl-swt 4.20.13.6 → 4.20.13.10

data/samples/hello/hello_checkbox.rb

@@ -39,9 +39,9 @@ class HelloCheckbox
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_checkbox_group.rb

@@ -43,9 +43,9 @@ class HelloCheckboxGroup
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_code_text.rb

@@ -26,7 +26,7 @@ class HelloCodeText
   
   attr_accessor :ruby_code, :js_code, :html_code
   
-  before_body {
+  before_body do
     self.ruby_code = <<~RUBY
       greeting = 'Hello, World!'
       
@@ -73,7 +73,7 @@ class HelloCodeText
         </body>
       </html>
     HTML
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_color_dialog.rb

@@ -26,9 +26,9 @@ class HelloColorDialog
   
   attr_accessor :selected_color
   
-  before_body {
+  before_body do
     self.selected_color = :black
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_combo.rb

@@ -37,9 +37,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_computed.rb

@@ -44,13 +44,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -66,51 +66,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch

data/samples/hello/hello_cool_bar.rb

@@ -30,9 +30,9 @@ class HelloCoolBar
     (10..30).to_a.map(&:to_s)
   end
   
-  before_body {
+  before_body do
     self.font_size = '30'
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_cursor.rb

@@ -31,11 +31,11 @@ class HelloCursor
     Glimmer::SWT::SWTProxy.cursor_options
   end
   
-  after_body {
+  after_body do
     observe(self, :selected_cursor) {
       body_root.cursor = selected_cursor
     }
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_custom_shape.rb

@@ -27,12 +27,12 @@ class StickFigure
   
   options :x, :y, :width, :height
   
-  before_body {
+  before_body do
     @head_width = width*0.2
     @head_height = height*0.2
     @trunk_height = height*0.4
     @extremity_length = height*0.4
-  }
+  end
   
   body {
     shape(x + @head_width/2.0 + @extremity_length, y) {

data/samples/hello/hello_custom_shell.rb

@@ -34,9 +34,9 @@ class EmailShell
   # single option with default value
   option :to, default: '"John Irwin" <john.irwin@example.com>'
   
-  before_body {
+  before_body do
     @swt_style |= swt(:shell_trim, :modeless)
-  }
+  end
   
   body {
     # pass received swt_style through to shell to customize it (e.g. :dialog_trim for a blocking shell)

data/samples/hello/hello_custom_widget.rb

@@ -34,12 +34,12 @@ class GreetingLabel
   # internal attribute (not a custom widget option)
   attr_accessor :color
   
-  before_body {
+  before_body do
     @font = {height: 24, style: :bold}
     @color = :black
-  }
+  end
   
-  after_body {
+  after_body do
     return if colors.nil?
     
     Thread.new {
@@ -48,7 +48,7 @@ class GreetingLabel
         sleep(1)
       }
     }
-  }
+  end
   
   body {
     # pass received swt_style through to label to customize (e.g. :center to center text)

data/samples/hello/hello_date_time.rb

@@ -28,10 +28,10 @@ class HelloDateTime
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
     @person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_directory_dialog.rb

@@ -26,9 +26,9 @@ class HelloDirectoryDialog
   
   attr_accessor :selected_directory
   
-  before_body {
+  before_body do
     @selected_directory = 'Please select a directory.'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_file_dialog.rb

@@ -26,9 +26,9 @@ class HelloFileDialog
   
   attr_accessor :selected_file
   
-  before_body {
+  before_body do
     @selected_file = 'Please select a file.'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_font_dialog.rb

@@ -26,9 +26,9 @@ class HelloFontDialog
   
   attr_accessor :selected_font_data
   
-  before_body {
+  before_body do
     @selected_font_data = FontData.new('Times New Roman', 40, swt(:bold))
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_group.rb

@@ -41,9 +41,9 @@ class HelloGroup
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_list_multi_selection.rb

@@ -52,9 +52,9 @@ class HelloListMultiSelection
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_list_single_selection.rb

@@ -37,9 +37,9 @@ class HelloListSingleSelection
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_progress_bar.rb

@@ -28,13 +28,13 @@ class HelloProgressBar
     attr_accessor :minimum, :maximum, :selection, :delay
   end
         
-  before_body {
+  before_body do
     @progress_model = ProgressModel.new
     @progress_model.minimum = 0
     @progress_model.maximum = 100
     @progress_model.selection = 0
     @progress_model.delay = 0.01
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_radio.rb

@@ -41,9 +41,9 @@ class HelloRadio
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_radio_group.rb

@@ -48,9 +48,9 @@ class HelloRadioGroup
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_scale.rb

@@ -26,9 +26,9 @@ class HelloScale
   
   attr_accessor :value
   
-  before_body {
+  before_body do
     @value = 50
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_spinner.rb

@@ -28,10 +28,10 @@ class HelloSpinner
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
     @person.donation = 500 # in cents
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_table.rb

@@ -183,9 +183,9 @@ class HelloTable
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     Display.app_name = 'Hello, Table!'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_text.rb

@@ -5,7 +5,7 @@ class HelloText
   
   attr_accessor :default, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
   
-  before_body {
+  before_body do
     self.default = 'default is :border style'
     self.center = 'centered'
     self.left = 'left-aligned'
@@ -15,7 +15,7 @@ class HelloText
     self.read_only = 'Telephone area code is 555'
     self.wrap = 'wraps if text content is too long like this example'
     self.multi = "multi-line enables hitting enter,\nbut does not wrap by default"
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_tool_bar.rb

@@ -30,9 +30,9 @@ class HelloToolBar
     (10..30).to_a.map(&:to_s)
   end
   
-  before_body {
+  before_body do
     self.font_size = '30'
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_tray_item.rb

@@ -27,7 +27,7 @@ class HelloTrayItem
   # boolean that indicates if application is visible
   attr_accessor :show_application
   
-  before_body {
+  before_body do
     # application starts visible
     @show_application = true
     # pre-render an icon image using the Canvas Shape DSL
@@ -48,7 +48,7 @@ class HelloTrayItem
         foreground :white
       }
     }
-  }
+  end
   
   body {
     shell(:shell_trim, :on_top) { # make it always appear on top of everything