glimmer-dsl-swt 4.18.5.0 → 4.18.5.1

data/samples/hello/hello_canvas.rb

@@ -19,87 +19,150 @@
 # 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
-
-image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
-
-shell {
-  text 'Hello, Canvas!'
-  minimum_size 320, 400
-
-  @canvas = canvas {
-    background :yellow
-    rectangle(0, 0, 220, 400) {
-      transform {
-      }
-      background :red
-    }
-    rectangle(50, 20, 300, 150, 30, 50) {
-      background :magenta
-    }
-    rectangle(150, 200, 100, 70, true) {
-      background :dark_magenta
-      foreground :yellow
-    }
-    rectangle(50, 200, 30, 70, false) {
-      background :magenta
-      foreground :dark_blue
-    }
-    rectangle(205, 50, 88, 96) {
-      foreground :yellow
-    }
-    text('Picasso', 60, 80) {
-      background :yellow
-      foreground :dark_magenta
-      font name: 'Courier', height: 30
-    }
-    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) {
-      background :red
-    }
-    polygon(250, 210, 260, 170, 270, 210, 290, 230) {
-      background :dark_yellow
-    }
-    polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
-    3.times { |n|
-      line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
-        foreground :yellow
-      }
-    }
-    10.times {|n|
-      point(220 + n*5, 100 + n*5) {
-        foreground :yellow
-      }
-    }
-    image(image_object, 205, 55)
+class HelloCanvas
+  include Glimmer::UI::CustomShell
   
-    on_mouse_down { |mouse_event|
-      @drag_detected = false
-      @canvas.cursor = :hand
-      @shape_to_move = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
-    }
-    
-    on_drag_detected { |drag_detect_event|
-      @drag_detected = true
-      @drag_current_x = drag_detect_event.x
-      @drag_current_y = drag_detect_event.y
-    }
-    
-    on_mouse_move { |mouse_event|
-      if @drag_detected
-        @shape_to_move&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
-        @drag_current_x = mouse_event.x
-        @drag_current_y = mouse_event.y
-      end
-    }
+  attr_accessor :selected_shape
+  
+  before_body {
+    @image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
+  }
+  
+  body {
+    shell {
+      text 'Hello, Canvas!'
+      minimum_size 320, 400
     
-    on_mouse_up { |mouse_event|
-      @canvas.cursor = :arrow
-      @drag_detected = false
-      @shape_to_move = nil
+      @canvas = canvas {
+        background :yellow
+        rectangle(0, 0, 220, 400) {
+          transform {
+          }
+          background :red
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          background :magenta
+        }
+        rectangle(150, 200, 100, 70, true) {
+          background :dark_magenta
+          foreground :yellow
+        }
+        rectangle(50, 200, 30, 70, false) {
+          background :magenta
+          foreground :dark_blue
+        }
+        rectangle(205, 50, 88, 96) {
+          foreground :yellow
+        }
+        text('Picasso', 60, 80) {
+          background :yellow
+          foreground :dark_magenta
+          font name: 'Courier', height: 30
+        }
+        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) {
+          background :red
+        }
+        polygon(250, 210, 260, 170, 270, 210, 290, 230) {
+          background :dark_yellow
+        }
+        polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
+        3.times { |n|
+          line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
+            foreground :yellow
+          }
+        }
+        10.times {|n|
+          point(220 + n*5, 100 + n*5) {
+            foreground :yellow
+          }
+        }
+        image(@image_object, 205, 55)
+      
+        menu {
+          menu_item {
+            text 'Change Background Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background) && shape.background }
+            on_widget_selected {
+              @selected_shape&.background = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 1...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[5] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 2...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[6] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Change Foreground Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:foreground) && shape.foreground }
+            on_widget_selected {
+              @selected_shape&.foreground = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+        }
+      
+        on_mouse_down { |mouse_event|
+          @drag_detected = false
+          @canvas.cursor = :hand
+          self.selected_shape = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
+        }
+        
+        on_drag_detected { |drag_detect_event|
+          @drag_detected = true
+          @drag_current_x = drag_detect_event.x
+          @drag_current_y = drag_detect_event.y
+        }
+        
+        on_mouse_move { |mouse_event|
+          if @drag_detected
+            @selected_shape&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
+            @drag_current_x = mouse_event.x
+            @drag_current_y = mouse_event.y
+          end
+        }
+        
+        on_menu_detected { |menu_detect_event|
+          @menu_detected = true
+        }
+        
+        on_mouse_up { |mouse_event|
+          @canvas.cursor = :arrow
+          @drag_detected = false
+          if @menu_detected
+            @menu_detected = nil
+          else
+            self.selected_shape = nil
+          end
+        }
+      }
     }
   }
-}.open
+end
+
+HelloCanvas.launch
+        

data/{lib/glimmer/dsl/swt/directory_dialog_expression.rb → samples/hello/hello_color_dialog.rb}

@@ -19,30 +19,48 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/dsl/top_level_expression'
-require 'glimmer/swt/directory_dialog_proxy'
-
-module Glimmer
-  module DSL
-    module SWT
-      class DirectoryDialogExpression < StaticExpression
-        include TopLevelExpression
-        include ParentExpression
-        
-        include_package 'org.eclipse.swt.widgets'
-
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'directory_dialog' and
-            (parent.nil? or parent.is_a?(Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
-        end
+class HelloColorDialog
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :selected_color
   
-        def interpret(parent, keyword, *args, &block)
-          args = [parent] + args unless parent.nil?
-          Glimmer::SWT::DirectoryDialogProxy.send(:new, *args)
-        end
-      end
-    end
-  end
+  before_body {
+    self.selected_color = :black
+  }
+  
+  body {
+    shell {
+      minimum_size 220, 0
+      grid_layout
+      
+      text 'Hello, Color Dialog!'
+      
+      label {
+        layout_data :center, :center, true, false
+        text 'Selected Color:'
+        font height: 14, style: :bold
+      }
+      
+      canvas(:border) {
+        layout_data :center, :center, true, false
+        background bind(self, :selected_color)
+        
+        on_mouse_up {
+          self.selected_color = color_dialog.open
+        }
+      }
+      
+      button {
+        layout_data :center, :center, true, false
+        text "Choose Color..."
+        
+        on_widget_selected {
+          self.selected_color = color_dialog.open
+        }
+      }
+      
+    }
+  }
 end
+
+HelloColorDialog.launch

data/samples/hello/hello_font_dialog.rb

@@ -0,0 +1,82 @@
+# 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.
+
+class HelloFontDialog
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :selected_font_data
+  
+  before_body {
+    @selected_font_data = FontData.new('Times New Roman', 40, swt(:bold))
+  }
+  
+  body {
+    shell {
+      grid_layout {
+        margin_width 15
+        margin_width 15
+      }
+      minimum_size 400, 0
+      
+      text 'Hello, Font Dialog!'
+      
+      label {
+        text 'Selected Font:'
+        font height: 14, style: :bold
+      }
+      
+      label(:center) {
+        layout_data(:fill, :center, true, true) {
+          vertical_indent 15
+          height_hint 200
+        }
+        background :white
+        font bind(self, 'selected_font_data')
+        text bind(self, 'selected_font_data') {|font_data|
+          style = case font_data.style
+          when swt(:normal)
+            'Normal'
+          when swt(:italic)
+            'Italic'
+          when swt(:bold)
+            'Bold'
+          when swt(:bold, :italic)
+            'Bold Italic'
+          end
+          "#{font_data.name}\n#{font_data.height}\n#{style}"
+        }
+      }
+      
+      button {
+        text "Choose Font..."
+        
+        on_widget_selected {
+          self.selected_font_data = font_dialog {
+            font_list [@selected_font_data]
+          }.open
+        }
+      }
+      
+    }
+  }
+end
+
+HelloFontDialog.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.5.0
+  version: 4.18.5.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -388,13 +388,11 @@ files:
 - lib/glimmer/dsl/swt/custom_widget_expression.rb
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
-- lib/glimmer/dsl/swt/directory_dialog_expression.rb
 - lib/glimmer/dsl/swt/display_expression.rb
 - lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
 - lib/glimmer/dsl/swt/expand_item_expression.rb
-- lib/glimmer/dsl/swt/file_dialog_expression.rb
 - lib/glimmer/dsl/swt/font_expression.rb
 - lib/glimmer/dsl/swt/image_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
@@ -446,11 +444,10 @@ files:
 - lib/glimmer/swt/custom/shape/rectangle.rb
 - lib/glimmer/swt/custom/shape/text.rb
 - lib/glimmer/swt/date_time_proxy.rb
-- lib/glimmer/swt/directory_dialog_proxy.rb
+- lib/glimmer/swt/dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/expand_item_proxy.rb
-- lib/glimmer/swt/file_dialog_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
 - lib/glimmer/swt/image_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
@@ -459,6 +456,7 @@ files:
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
 - lib/glimmer/swt/properties.rb
+- lib/glimmer/swt/proxy_properties.rb
 - lib/glimmer/swt/sash_form_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
@@ -505,6 +503,7 @@ files:
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_code_text.rb
+- samples/hello/hello_color_dialog.rb
 - samples/hello/hello_combo.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb
@@ -517,6 +516,7 @@ files:
 - samples/hello/hello_drag_and_drop.rb
 - samples/hello/hello_expand_bar.rb
 - samples/hello/hello_file_dialog.rb
+- samples/hello/hello_font_dialog.rb
 - samples/hello/hello_group.rb
 - samples/hello/hello_link.rb
 - samples/hello/hello_list_multi_selection.rb