glimmer-dsl-swt 4.18.3.1 → 4.18.4.0

data/VERSION

@@ -1 +1 @@
-4.18.3.1
+4.18.4.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.3.1 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.1"
+  s.version = "4.18.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-01-27"
+  s.date = "2021-02-02"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "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",
@@ -135,12 +136,14 @@ Gem::Specification.new do |s|
     "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",
+    "samples/elaborate/tetris/model/past_game.rb",
     "samples/elaborate/tetris/model/tetromino.rb",
     "samples/elaborate/tetris/view/block.rb",
-    "samples/elaborate/tetris/view/game_over_dialog.rb",
+    "samples/elaborate/tetris/view/high_score_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",
     "samples/elaborate/tetris/view/score_lane.rb",
     "samples/elaborate/tetris/view/tetris_menu_bar.rb",
@@ -155,6 +158,7 @@ Gem::Specification.new do |s|
     "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",
@@ -180,6 +184,7 @@ Gem::Specification.new do |s|
     "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",

data/lib/ext/rouge/themes/glimmer.rb

@@ -0,0 +1,29 @@
+module Rouge
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class Glimmer < Github
+      name 'glimmer'
+      style Comment::Single, fg:      [106,115,125], italic: true # Also, Comments
+      style Keyword::Pseudo, fg:      [:dark_red]
+      style Keyword, fg:     [:blue]
+      style Literal::String::Single, fg:      [106,115,125] # Also, Comments
+      style Literal::String::Double, fg:     [0,92,197]
+      style Literal::String::Escape, fg:      [:red]
+      style Literal::Number::Integer, fg:     [:blue]
+      style Literal::String::Interpol, fg:    [:blue]
+      style Literal::String::Symbol, fg:      [:dark_green]
+      style Literal::String, fg:      [:dark_blue]
+      style Name::Builtin, fg:     [215,58,73]
+      style Name::Class, fg:       [3,47,98]
+      style Name::Namespace, fg: [3,47,98]
+      style Name::Constant, fg:    [0,92,197]
+      style Name::Function, fg:    [:blue]
+      style Name::Variable::Instance, fg:    [227,98,9]
+      style Name, fg:        [111,66,193] #purple
+      style Operator, fg:    [:red]
+      style Punctuation, fg: [:blue]
+      style Text, fg:        [75, 75, 75]
+    end
+  end
+end

data/lib/glimmer-dsl-swt.rb

@@ -34,7 +34,6 @@ require 'glimmer'
 require 'logging'
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
-require 'rouge'
 require 'date'
 require 'facets/string/capitalized'
 require 'facets/hash/symbolize_keys'

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -36,7 +36,9 @@ module Glimmer
       def initialize(parent, model_binding, column_properties)
         @table = parent
         @model_binding = model_binding
+        @read_only_sort = @model_binding.binding_options[:read_only_sort]
         @table.swt_widget.data = @model_binding
+        @table.swt_widget.set_data('table_items_binding', self)
         @column_properties = column_properties
         @table.on_widget_disposed do |dispose_event|
           unregister_all_observables
@@ -50,8 +52,8 @@ module Glimmer
         call
       end
 
-      def call(new_model_collection=nil)
-        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+      def call(new_model_collection=nil, internal_sort: false)
+        new_model_collection = model_binding_evaluated_property = @model_binding.evaluate_property unless internal_sort # this ensures applying converters (e.g. :on_read)
         table_cells = @table.swt_widget.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
         model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
         return if table_cells == model_cells
@@ -61,10 +63,10 @@ module Glimmer
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
-        populate_table(@model_collection, @table, @column_properties)
+        populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
       end
       
-      def populate_table(model_collection, parent, column_properties)
+      def populate_table(model_collection, parent, column_properties, internal_sort: false)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
         parent.swt_widget.items.each(&:dispose)
@@ -78,7 +80,8 @@ module Glimmer
         end
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.swt_widget.setSelection(selected_table_items)
-        parent.sort!
+        sorted_model_collection = parent.sort!(internal_sort: internal_sort)
+        call(sorted_model_collection, internal_sort: true) if @read_only_sort && !internal_sort && !sorted_model_collection.nil?
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
     end

data/lib/glimmer/data_binding/widget_binding.rb

@@ -37,7 +37,7 @@ module Glimmer
         @property = property
         @translator = translator || proc {|value| value} #TODO check on this it doesn't seem used
 
-        if @widget.respond_to?(:dispose)
+        if @widget.respond_to?(:on_widget_disposed)
           @widget.on_widget_disposed do |dispose_event|
             unregister_all_observables
           end
@@ -48,6 +48,10 @@ module Glimmer
         converted_value = translated_value = @translator.call(value)
       
         update_operation = lambda do
+          if @widget.respond_to?(:disposed?) && @widget.disposed?
+            unregister_all_observables
+            return
+          end
           @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
         end
         if Config.auto_sync_exec? && Config.require_sync_exec?
@@ -58,6 +62,10 @@ module Glimmer
       end
       
       def evaluate_property
+        if @widget.respond_to?(:disposed?) && @widget.disposed?
+          unregister_all_observables
+          return
+        end
         @widget.get_attribute(@property)
       end
     end

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -28,13 +28,21 @@ module Glimmer
       # image expression
       # Note: Cannot be a static expression because it clashes with image property expression
       class ImageExpression < Expression
+        include ParentExpression
+        
         def can_interpret?(parent, keyword, *args, &block)
-          keyword.to_s == 'image' and
-            (parent.nil? or !parent.respond_to?('image'))
+          (keyword == 'image') and
+            (parent.nil? or parent.respond_to?('image='))
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ImageProxy.new(*args)
+          args.unshift(parent) unless parent.nil?
+          Glimmer::SWT::ImageProxy.new(*args, &block)
+        end
+
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
         end
       end
     end

data/lib/glimmer/dsl/swt/layout_data_expression.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -33,7 +33,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'layout_data' and
+          super and
             parent.respond_to?(:swt_widget)
         end
   

data/lib/glimmer/dsl/swt/layout_expression.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -23,6 +23,7 @@ require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/layout_proxy'
+require 'glimmer/swt/image_proxy'
 
 module Glimmer
   module DSL
@@ -31,6 +32,7 @@ module Glimmer
         include ParentExpression
   
         include_package 'org.eclipse.swt.widgets'
+        include_package 'org.eclipse.swt.graphics'
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword.to_s.end_with?('_layout') and

data/lib/glimmer/swt/custom/code_text.rb

@@ -7,65 +7,112 @@ module Glimmer
       class CodeText
         include Glimmer::UI::CustomWidget
         
-        SYNTAX_COLOR_MAP = {
-           Builtin:     [215,58,73],
-           Class:       [3,47,98],
-           Constant:    [0,92,197],
-           Double:      [0,92,197],
-           Escape:      [:red],
-           Function:    [:blue],
-           Instance:    [227,98,9],
-           Integer:     [:blue],
-           Interpol:    [:blue],
-           Keyword:     [:blue],
-           Name:        [111,66,193], #purple
-           Operator:    [:red],
-           Pseudo:      [:dark_red],
-           Punctuation: [:blue],
-           Single:      [106,115,125], # Also, Comments
-           Symbol:      [:dark_green],
-           Text:        [75, 75, 75],
-        }
+        class << self
+          def languages
+            require 'rouge'
+            Rouge::Lexer.all.map {|lexer| lexer.tag}.sort
+          end
+          
+          def lexers
+            require 'rouge'
+            Rouge::Lexer.all.sort_by(&:title)
+          end
+        end
+        
+        REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
         
-        # TODO support `option :language`
         # TODO support auto language detection
+        # TODO support end of line via CMD+E and beginning of line via CMD+A
+        # TODO support select all via CMD+A
+              
+        option :language, default: 'ruby'
+        # TODO consider supporting data-binding of language
+        # TODO support switcher of language that automatically updates the lexer
+        # TODO support method for redrawing the syntax highlighting
+        option :theme, default: 'glimmer'
+        option :lines, default: false
       
-        def text=(value)
-          swt_widget&.text = value
-        end
+        alias lines? lines
+        attr_accessor :styled_text_proxy_text, :styled_text_proxy_top_pixel
+        attr_reader :styled_text_proxy, :lines_width
         
-        def text
-          swt_widget&.text
+        def text=(value)
+          @styled_text_proxy&.swt_widget&.text = value
         end
         
-        def syntax_highlighting(text)
-          return [] if text.to_s.strip.empty?
-          @syntax_highlighting ||= {}
-          unless @syntax_highlighting.keys.include?(text)
-            lex = lexer.lex(text).to_a
-            text_size = 0
-            @syntax_highlighting[text] = lex.map do |pair|
-              {token_type: pair.first, token_text: pair.last}
-            end.each do |hash|
-              hash[:token_index] = text_size
-              text_size += hash[:token_text].size
-            end
+        def text(*args, dsl: false, &block)
+          # If dsl: true is passed, operate using Glimmer DSL (which is the default that happens through super method_missing)
+          if dsl
+            super(*args, &block)
+          else
+            @styled_text_proxy&.swt_widget&.text
           end
-          @syntax_highlighting[text]
-        end
-        
-        def lexer
-          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
-          @lexer ||= Rouge::Lexer.find_fancy('ruby')
         end
         
         before_body {
+          require 'rouge'
+          require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
           @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
+          if lines == true
+            @lines_width = 4
+          elsif lines.is_a?(Hash)
+            @lines_width = lines[:width]
+          end
         }
         
         body {
-          styled_text(swt_style) {
+          # TODO enable this once fully implemented
+          if lines
+            composite {
+              grid_layout(2, false)
+              
+              @line_numbers_text = styled_text(:multi, :border) {
+                layout_data(:right, :fill, false, true)
+                text ' '*lines_width.to_i
+                text(bind(self, :styled_text_proxy_text, read_only: true) { |text_value|
+                  line_count = text_value.to_s.split("\n").count
+                  line_count = 1 if line_count == 0
+                  lines_text_size = [line_count.to_s.size, @lines_width].max
+                  if lines_text_size > @lines_width
+                    async_exec { swt_widget.layout }
+                    @lines_width = lines_text_size
+                  end
+                  line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
+                }, dsl: true)
+                top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
+                font name: @font_name, height: OS.mac? ? 15 : 12
+                background color(:widget_background)
+                foreground :dark_blue
+                top_margin 5
+                right_margin 5
+                bottom_margin 5
+                left_margin 5
+                editable false
+                caret nil
+                on_focus_gained {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+                on_key_pressed {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+                on_mouse_up {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+              }
+
+              code_text_widget
+            }
+          else
+            code_text_widget
+          end
+        }
+        
+        def code_text_widget
+          @styled_text_proxy = styled_text(swt_style) {
+            layout_data :fill, :fill, true, true if lines
+            text(bind(self, :styled_text_proxy_text), dsl: true) if lines
+            top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
             font name: @font_name, height: 15
             foreground rgb(75, 75, 75)
             left_margin 5
@@ -73,6 +120,20 @@ module Glimmer
             right_margin 5
             bottom_margin 5
             
+            if lines
+              on_key_pressed { |event|
+                character = event.keyCode.chr rescue nil
+                case [event.stateMask, character]
+                when [(OS.mac? ? swt(:command) : swt(:ctrl)), 'a']
+                  @styled_text_proxy.swt_widget.selectAll
+                when [(swt(:ctrl) unless OS.windows?), 'a']
+                  jump_to_beginning_of_line
+                when [(swt(:ctrl) unless OS.windows?), 'e']
+                  jump_to_end_of_line
+                end
+              }
+            end
+            
             on_modify_text { |event|
               # clear unnecessary syntax highlighting cache on text updates, and do it async to avoid affecting performance
               new_text = event.data
@@ -88,18 +149,75 @@ module Glimmer
             }
                   
             on_line_get_style { |line_style_event|
-              styles = []
-              syntax_highlighting(line_style_event.lineText).to_a.each do |token_hash|
-                start_index = token_hash[:token_index]
-                size = token_hash[:token_text].size
-                token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
-                token_color = color(*token_color).swt_color
-                styles << StyleRange.new(line_style_event.lineOffset + start_index, size, token_color, nil)
+              begin
+                styles = []
+                style_data = nil
+                syntax_highlighting(line_style_event.lineText).to_a.each do |token_hash|
+                  start_index = token_hash[:token_index]
+                  size = token_hash[:token_text].size
+                  style_data = Rouge::Theme.find(theme).new.style_for(token_hash[:token_type])
+                  foreground_color = hex_color_to_swt_color(style_data[:fg], [:black])
+                  background_color = hex_color_to_swt_color(style_data[:bg], [:white])
+                  font_styles = []
+                  font_styles << :bold if style_data[:bold]
+                  font_styles << :italic if style_data[:italic]
+                  font_style = SWTProxy[*font_styles]
+                  styles << StyleRange.new(line_style_event.lineOffset + start_index, size, foreground_color, background_color, font_style)
+                end
+                line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
+              rescue => e
+                Glimmer::Config.logger.error {"Error encountered with style data: #{style_data}"}
+                Glimmer::Config.logger.error {e.message}
+                Glimmer::Config.logger.error {e.full_message}
               end
-              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
             }
           }
-        }
+        end
+        
+        def syntax_highlighting(text)
+          return [] if text.to_s.strip.empty?
+          @syntax_highlighting ||= {}
+          unless @syntax_highlighting.keys.include?(text)
+            lex = lexer.lex(text).to_a
+            text_size = 0
+            @syntax_highlighting[text] = lex.map do |pair|
+              {token_type: pair.first, token_text: pair.last}
+            end.each do |hash|
+              hash[:token_index] = text_size
+              text_size += hash[:token_text].size
+            end
+          end
+          @syntax_highlighting[text]
+        end
+        
+        def lexer
+          require 'rouge'
+          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
+          @lexer ||= Rouge::Lexer.find_fancy(language)
+          @lexer ||= Rouge::Lexer.find_fancy('ruby') # default to Ruby if no lexer is found
+        end
+        
+        def hex_color_to_swt_color(color_data, default_color)
+          color_data = "##{color_data.chars.drop(1).map {|c| c*2}.join}" if color_data.is_a?(String) && color_data.start_with?('#') && color_data&.size == 4
+          color_data = color_data.match(REGEX_COLOR_HEX6).to_a.drop(1).map {|c| "0x#{c}".hex}.to_a if color_data.is_a?(String) && color_data.start_with?('#')
+          color_data = [color_data] unless color_data.nil? || color_data.empty? || color_data.is_a?(Array)
+          color_data = default_color if color_data.nil? || color_data.empty?
+          color(*color_data).swt_color
+        end
+        
+        def jump_to_beginning_of_line
+          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
+          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
+          @styled_text_proxy.swt_widget.setSelection(beginning_of_current_line_offset, beginning_of_current_line_offset)
+        end
+        
+        def jump_to_end_of_line
+          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
+          current_line = @styled_text_proxy.swt_widget.getLine(current_line_index)
+          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
+          new_offset = beginning_of_current_line_offset + current_line.size
+          @styled_text_proxy.swt_widget.setSelection(new_offset, new_offset)
+        end
       end
     end
   end