glimmer-dsl-swt 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e33ae73c95946ba7fce0d3dc221cee2ca817968a03bbfe678ff9e0ecfbaf5a65
-  data.tar.gz: c95f41b789e3dee67c94dbf79d6e8367d5ad7a1fb94749e784a8c3b13ef8a4aa
+  metadata.gz: 1b818d6b949f1a1c4388ecad2f9d6f425afbdf0c772a99031c2ea1cf1276dc1c
+  data.tar.gz: 7f9f78326e9a083b170f9606bfb7337963bda57c4648e7f585c435747f77e94a
 SHA512:
-  metadata.gz: c4784a352196f496c4fce136da828352c9c92c2f7092e917f9c47a403bd91964566a2d493680b35f13d240a87dd37830153f3a37ea050ea0d84aa8b02071cfdc
-  data.tar.gz: 9080d1bdc15f375db58fa8719d5c6fb8d2017313fe52ea7e2ad7b4dd042f47daa8bf87edecffa819c6e1596839af619f989335839fa757dd2e645ce6c6e13fdb
+  metadata.gz: e56deeff2d43d47a8e875ed1e32ba54f6cca9398053afdd5351257a2b0da3326384412635cf0c41529e8d961abab5de32d69cc5b6e23e67f1ebec23bb372b174
+  data.tar.gz: 49dc96a0dc0921bac9b0cd048d9e33d1436dffa09b4bcb48704f162a30209c52209b3ca03318c89e7277835e682821ec89fb4f32f9c26218fb8ed1812a340dcb

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.2.4 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.3.0 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)
@@ -10,7 +10,7 @@
 
 You may find full setup/usage instructions at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
 
-Other Glimmer DSL gems:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/glimmer/scaffold.rb

@@ -485,12 +485,10 @@ class Scaffold
         custom_shell_file_content += <<-MULTI_LINE_STRING
 
     def display_about_dialog
-      message_box = MessageBox.new(swt_widget)
-      message_box.setText("About")
-      message = "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\n\n"
-      message += LICENSE
-      message_box.setMessage(message)
-      message_box.open
+      message_box(body_root) {
+        text 'About'
+        message "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\\n\\n\#{LICENSE}"
+      }.open
     end
     
     def display_preferences_dialog

data/lib/glimmer/swt/table_column_proxy.rb

@@ -16,7 +16,7 @@ module Glimmer
       end
       
       def sort_property=(args)
-        @sort_property = args.to_a.first
+        @sort_property = args unless args.empty?
       end
       
     end

data/lib/glimmer/swt/table_proxy.rb

@@ -1,4 +1,4 @@
-require 'glimmer/swt/widget_proxy'
+  require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
@@ -33,7 +33,7 @@ module Glimmer
         end   
       end
       
-      attr_reader :table_editor, :table_editor_text_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block
+      attr_reader :table_editor, :table_editor_text_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -50,9 +50,26 @@ module Glimmer
       
       def sort_by_column(table_column_proxy)
         index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget)
-        new_sort_property = table_column_proxy.sort_property || column_properties[index]
-        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending
+        new_sort_property = table_column_proxy.sort_property || [column_properties[index]]
+        if new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
+          selected_additional_sort_properties = additional_sort_properties.clone
+          if selected_additional_sort_properties.include?(new_sort_property.first)
+            selected_additional_sort_properties.delete(new_sort_property.first)
+            new_sort_property += selected_additional_sort_properties
+          else
+            new_sort_property += additional_sort_properties
+          end
+        end
+        
+        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending        
+        swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+        
         @sort_property = new_sort_property
+        swt_widget.sort_column = table_column_proxy.swt_widget
+        
+        @sort_by_block = nil
+        @sort_block = nil
+        @sort_type = nil
         if table_column_proxy.sort_by_block
           @sort_by_block = table_column_proxy.sort_by_block
         elsif table_column_proxy.sort_block
@@ -64,43 +81,47 @@ module Glimmer
       end
       
       def detect_sort_type
-        @sort_type = String
+        @sort_type = sort_property.size.times.map { String }
         array = model_binding.evaluate_property
-        values = array.map { |object| object.send(sort_property) }
-        value_classes = values.map(&:class).uniq
-        if value_classes.size == 1
-          @sort_type = value_classes.first
-        elsif value_classes.include?(Integer)
-          @sort_type = Integer
-        elsif value_classes.include?(Float)
-          @sort_type = Float
+        sort_property.each_with_index do |a_sort_property, i|
+          values = array.map { |object| object.send(a_sort_property) }
+          value_classes = values.map(&:class).uniq
+          if value_classes.size == 1
+            @sort_type[i] = value_classes.first
+          elsif value_classes.include?(Integer)
+            @sort_type[i] = Integer
+          elsif value_classes.include?(Float)
+            @sort_type[i] = Float
+          end
         end
       end
       
+      def additional_sort_properties=(args)
+        @additional_sort_properties = args unless args.empty?
+      end
+      
       def sort
         return unless sort_property && (sort_type || sort_block || sort_by_block)
         array = model_binding.evaluate_property
         # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
         if sort_block
-          sorted_array = array.sort do |object1, object2|
-            value1 = object1.send(sort_property)
-            value2 = object2.send(sort_property)
-            sort_block.call(value1, value2)
-          end
+          sorted_array = array.sort(&sort_block)
+        elsif sort_by_block
+          sorted_array = array.sort_by(&sort_by_block)          
         else
           sorted_array = array.sort_by do |object|
-            value = object.send(sort_property)
-            # handle nil and difficult to compare types gracefully
-            if sort_by_block
-              value = sort_by_block.call(value)
-            elsif sort_type == Integer
-              value = value.to_i
-            elsif sort_type == Float
-              value = value.to_f
-            elsif sort_type == String
-              value = value.to_s
+            sort_property.each_with_index.map do |a_sort_property, i|
+              value = object.send(a_sort_property)
+              # handle nil and difficult to compare types gracefully
+              if sort_type[i] == Integer
+                value = value.to_i
+              elsif sort_type[i] == Float
+                value = value.to_f
+              elsif sort_type[i] == String
+                value = value.to_s
+              end
+              value
             end
-            value
           end
         end
         sorted_array = sorted_array.reverse if sort_direction == :descending

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement