glimmer-dsl-swt 4.18.3.2 → 4.18.4.1

data/samples/elaborate/tetris/view/playfield.rb

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        canvas {
+        composite {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -43,7 +43,8 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator :command, :p
-              enabled bind(game, :game_over, on_read: :!)
+              enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
+              enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
               selection bind(game, :paused)
             }
             menu_item {
@@ -70,13 +71,10 @@ class Tetris
             
             menu {
               text '&High Scores'
-              menu_item {
+              menu_item(:check) {
                 text '&Show'
                 accelerator :command, :shift, :h
-                
-                on_widget_selected {
-                  parent_custom_shell&.show_high_score_dialog
-                }
+                selection bind(game, :show_high_scores)
               }
               menu_item {
                 text '&Clear'
@@ -96,6 +94,24 @@ class Tetris
               accelerator :command, :b
               selection bind(game, :beeping)
             }
+            menu {
+              text 'Up Arrow'
+              menu_item(:radio) {
+                text '&Instant Down'
+                accelerator :command, :shift, :i
+                selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Right'
+                accelerator :command, :shift, :r
+                selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Left'
+                accelerator :command, :shift, :l
+                selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
+              }
+            }
           } # end of menu
           
           menu {

data/samples/hello/hello_canvas.rb

@@ -22,22 +22,22 @@
 include Glimmer
 
 shell {
-  text 'Hello, Canvas!'
+  text 'Hello, Canvas Image Icon!'
   minimum_size 320, 400
 
   canvas {
     background :yellow
-    rectangle(0, 0, 220, 400, fill: true) {
+    rectangle(0, 0, 220, 400) {
       background :red
     }
-    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
+    rectangle(50, 20, 300, 150, 30, 50) {
       background :magenta
     }
-    rectangle(150, 200, 100, 70, true, gradient: true) {
+    rectangle(150, 200, 100, 70, true) {
       background :dark_magenta
       foreground :yellow
     }
-    rectangle(50, 200, 30, 70, false, gradient: true) {
+    rectangle(50, 200, 30, 70, false) {
       background :magenta
       foreground :dark_blue
     }
@@ -49,13 +49,14 @@ shell {
       foreground :dark_magenta
       font name: 'Courier', height: 30
     }
-    oval(110, 310, 100, 100, fill: true) {
-      background rgb(128, 138, 248)
+    oval(110, 310, 100, 100) {
+      # patterns provide a differnet way to make gradients
+      background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
     }
-    arc(210, 210, 100, 100, 30, -77, fill: true) {
+    arc(210, 210, 100, 100, 30, -77) {
       background :red
     }
-    polygon(250, 210, 260, 170, 270, 210, 290, 230, fill: true) {
+    polygon(250, 210, 260, 170, 270, 210, 290, 230) {
       background :dark_yellow
     }
     polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)

data/samples/hello/hello_canvas_animation.rb

@@ -35,7 +35,7 @@ shell {
         oval(0, 0, 400, 400) { # x, y, width, height
           foreground :black # sets oval background color
         }
-        arc(0, 0, 400, 400, -1.4*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
+        arc(0, 0, 400, 400, -1.4*index%360, 10) {  # x, y, width, height, start angle, arc angle
           background rgb(200, 200, 50) # sets arc background color
         }
       }
@@ -51,13 +51,13 @@ shell {
       frame { |index, color| # frame block loops indefinitely (unless frame_count or cycle_count is set to an integer)
         outside_color = colors[index % 2]
         inside_color = colors[(index + 1) % 2]
-        
+
         background outside_color # sets canvas background color
-        
-        rectangle(0, 0, 200, 200, fill: true) {
+
+        rectangle(0, 0, 200, 200) {
           background inside_color # sets rectangle background color
         }
-        rectangle(200, 200, 200, 200, fill: true) {
+        rectangle(200, 200, 200, 200) {
           background inside_color # sets rectangle background color
         }
       }

data/samples/hello/hello_code_text.rb

@@ -0,0 +1,104 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+include Glimmer
+
+shell {
+  minimum_size 640, 480
+  text 'Hello, Code Text!'
+  
+  tab_folder {
+    tab_item {
+      fill_layout
+      text 'Ruby (glimmer theme)'
+      code_text(language: 'ruby', theme: 'glimmer', lines: true) {
+        text <<~CODE
+          greeting = 'Hello, World!'
+          
+          include Glimmer
+          
+          shell {
+            text 'Glimmer'
+            
+            label {
+              text greeting
+              font height: 30, style: :bold
+            }
+          }.open
+        CODE
+      }
+    }
+    tab_item {
+      fill_layout
+      text 'JavaScript (pastie theme)'
+      # No border (SWT styles are passed explicitly)
+      code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+        # With lines, the custom widget has a root composite, which can be configured separately
+        root {
+          grid_layout(2, false) {
+            margin_width 2
+          }
+          background :white
+        }
+        # With lines, the line numbers widget can be configured separately
+        line_numbers {
+          background :white
+        }
+        text <<~CODE
+          function greet(greeting) {
+            alert(greeting);
+          }
+          
+          var greetingString = 'Hello, World!';
+          
+          greet(greetingString);
+          
+          var moreGreetings = ['Howdy!', 'Aloha!', 'Hey!']
+          
+          for(var greeting of moreGreetings) {
+            greet(greeting)
+          }
+        CODE
+      }
+    }
+    tab_item {
+      fill_layout
+      text 'HTML (github theme)'
+      code_text(language: 'html', theme: 'github') {
+        text <<~CODE
+          <html>
+            <body>
+              <section class="accordion">
+                <form method="post" id="name">
+                  <label for="name">
+                    Name
+                  </label>
+                  <input name="name" type="text" />
+                  <input type="submit" />
+                </form>
+              </section>
+            </body>
+          </html>
+        CODE
+      }
+    }
+  }
+}.open

data/samples/hello/hello_table.rb

@@ -186,18 +186,20 @@ class HelloTable
       grid_layout
       
       text 'Hello, Table!'
+      background_image File.expand_path('hello_table/baseball_park.png', __dir__)
       
       label {
         layout_data :center, :center, true, false
         
-        text 'Baseball Playoff Schedule'
-        font height: 30, style: :bold
+        text 'BASEBALL PLAYOFF SCHEDULE'
+        foreground rgb(94, 107, 103)
+        font name: 'Optima', height: 38, style: :bold
       }
       
       combo(:read_only) {
         layout_data :center, :center, true, false
         selection bind(BaseballGame, :playoff_type)
-        font height: 16
+        font height: 14
       }
       
       table(:editable) { |table_proxy|
@@ -262,7 +264,7 @@ class HelloTable
       button {
         text 'Book Selected Game'
         layout_data :center, :center, true, false
-        font height: 16
+        font height: 14
         enabled bind(BaseballGame, :selected_game)
         
         on_widget_selected {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.3.2
+  version: 4.18.4.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -367,6 +367,7 @@ files:
 - icons/scaffold_app.png
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
+- lib/ext/rouge/themes/glimmer.rb
 - lib/glimmer-dsl-swt.rb
 - lib/glimmer/Rakefile
 - lib/glimmer/data_binding/list_selection_binding.rb
@@ -468,6 +469,7 @@ files:
 - samples/elaborate/contact_manager/contact_repository.rb
 - samples/elaborate/login.rb
 - samples/elaborate/meta_sample.rb
+- samples/elaborate/meta_sample/meta_sample_logo.png
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb
 - samples/elaborate/tetris/model/game.rb
@@ -489,6 +491,7 @@ files:
 - samples/hello/hello_canvas_transform.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
+- samples/hello/hello_code_text.rb
 - samples/hello/hello_combo.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb
@@ -514,6 +517,7 @@ files:
 - samples/hello/hello_styled_text.rb
 - samples/hello/hello_tab.rb
 - samples/hello/hello_table.rb
+- samples/hello/hello_table/baseball_park.png
 - samples/hello/hello_world.rb
 - vendor/swt/linux/swt.jar
 - vendor/swt/mac/swt.jar