glimmer-dsl-tk 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 497468a4ac3cef00c77957d6cb216ba1aed9916214e54561e8bff752c5117261
-  data.tar.gz: 3da1ce8af59ea3e03f45b1ab7c218c375fd86a145959657e8251d431bc6d0d90
+  metadata.gz: 12e68b40c6fb5c056f778d8864b88a01adb69ee4c0fe4273cc007a7d8d589cb9
+  data.tar.gz: 16281eeb0be0b1556390c42504f82d879ae6e13f427875215454f8a5d8949706
 SHA512:
-  metadata.gz: f8def1bfc6f2263a3557a0fd6ccdf48b53180a259a63972463341e9afa235610634b4070b3b5b425c7a0205b73d2b22f3f9562cdebb53b3792232723f7a3a0bb
-  data.tar.gz: 7bd54e692f828e9134876bf9b00f3f3d2413235c919673ffe44be294c6890fcf1c2655ab5928a92a3e814049a37bd458e82f5870c0d051c91f0f60f14eebcd6b
+  metadata.gz: 07ec8746537d220b0b768715f29f5796543f497c1054c55796b8a23ae0ac83c4007d545d378b3ac7896893f68a1a2f2d0b11a0bbd002254cddb5369d7d6a5653
+  data.tar.gz: aae794b82923901cd227d899fa914978e168fb8c35ff8433ccda048d7845e346aa9b74b001d91cc7779dcbe588cad46817fac48aa7c3ec3be1332ebf9ce80852

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 0.0.15
+
+- Update Hello, Button! to demo all button attributes
+- Support `button` `image` attribute (accepting image arguments: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule` to automatically process image)
+- Update `root` `iconphoto` support to accept image arguments: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule` to automatically process image
+- Support `button` `compound` attribute (`'center', 'top', 'bottom', 'left', 'right'`)
+- Support `button` `default` attribute (`'active'` or `'normal'`)
+
+## 0.0.14
+
+- Hello, Button!
+
+## 0.0.13
+
+- Hello, Message Box!
+- Support `message_box`
+
 ## 0.0.12
 
 - Upgrade to glimmer 2.3.0

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.14
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.15
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-tk/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-tk?branch=master)
@@ -29,7 +29,13 @@ The trade-off is that while [SWT](https://www.eclipse.org/swt/) provides a pleth
 Glimmer code (from [samples/hello/hello_world.rb](samples/hello/hello_world.rb)):
 
 ```ruby
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
 root {
+  title 'Hello, World!'
+  
   label {
     text 'Hello, World!'
   }
@@ -81,7 +87,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.14'
+gem 'glimmer-dsl-tk', '~> 0.0.15'
 ```
 
 And, then run:
@@ -169,9 +175,9 @@ root {
 
 ### Supported Widgets
 
-keyword(args) | attributes | listeners/events
+keyword(args) | attributes | listeners / events / bindings / callbacks
 ------------- | ---------- | ---------
-`button` | `text` | `command`
+`button` | `text`, `image`, `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `default` (`'active', 'normal'`) | `command`
 `entry` | `width`, `text` | None
 `frame(text: )` | None | None
 `label` | `text` | None
@@ -363,9 +369,13 @@ More details can be found in the [Hello, Combobox!](#hello-combobox) sample belo
 Glimmer code (from [samples/hello/hello_world.rb](samples/hello/hello_world.rb)):
 
 ```ruby
+require 'glimmer-dsl-tk'
+
 include Glimmer
 
 root {
+  title 'Hello, World!'
+  
   label {
     text 'Hello, World!'
   }
@@ -381,7 +391,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_world'"
 Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_world'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_world.rb
 ```
 
 Glimmer app:
@@ -408,12 +418,60 @@ class HelloButton
     root {
       title 'Hello, Button!'
       
-      button {
-        text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+      frame {
+        grid row: 0, column: 0
         
-        command {
-          self.count += 1
+        label {
+          grid pady: 15
+          text 'Text Button'
         }
+        
+        button {
+          text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+          default 'active'
+          
+          command {
+            self.count += 1
+          }
+        }
+      }
+        
+      frame {
+        grid row: 0, column: 1
+        
+        label {
+          grid pady: 15
+          text 'Image Button'
+        }
+        
+        button {
+          image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
+          
+          command {
+            message_box(title: 'Image Button', message: 'Image Button Clicked!')
+          }
+        }
+      }
+      
+      frame {
+        grid row: 0, column: 2
+        
+        label {
+          grid pady: 15
+          text 'Text Image Buttons'
+        }
+        
+        ['center', 'top', 'bottom', 'left', 'right'].each do |compound_option|
+          button {
+            image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
+            text 'Text Image Button'
+            compound compound_option
+            
+            command {
+              message_box(title: 'Text Image Button', message: 'Text Image Button Clicked!', detail: "(#{compound_option})")
+            }
+          }
+        end
       }
     }.open
   end
@@ -431,7 +489,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_button'"
 Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_button'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_button.rb
 ```
 
 Glimmer app:

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/glimmer/tk/root_proxy.rb

@@ -45,9 +45,7 @@ module Glimmer
       
       def set_attribute(attribute, *args)
         if attribute.to_s == 'iconphoto'
-          if args.size == 1 && args.first.is_a?(String)
-            args[0] = ::TkPhotoImage.new(file: args.first)
-          end
+          args[0..-1] = [image_argument(args)]
           super
         else
           super

data/lib/glimmer/tk/widget_proxy.rb

@@ -157,6 +157,12 @@ module Glimmer
       
       def widget_custom_attribute_mapping
         @widget_custom_attribute_mapping ||= {
+          ::Tk::Tile::TButton => {
+            'image' => {
+              getter: {name: 'image', invoker: lambda { |widget, args| @tk.textvariable&.value }},
+              setter: {name: 'image=', invoker: lambda { |widget, args| @tk['image'] = image_argument(args) }},
+            },
+          },
           ::Tk::Tile::TCombobox => {
             'text' => {
               getter: {name: 'text', invoker: lambda { |widget, args| @tk.textvariable&.value }},
@@ -210,6 +216,22 @@ module Glimmer
         }
       end
       
+      def image_argument(args)
+        if args.first.is_a?(::TkPhotoImage)
+          args.first
+        else
+          image_args = {}
+          image_args.merge!(file: args.first.to_s) if args.first.is_a?(String)
+          the_image = ::TkPhotoImage.new(image_args)
+          if args.last.is_a?(Hash)
+            processed_image = ::TkPhotoImage.new
+            processed_image.copy(the_image, args.last)
+            the_image = processed_image
+          end
+          the_image
+        end
+      end
+      
       def add_observer(observer, attribute)
         attribute_listener_installers = @tk.class.ancestors.map {|ancestor| widget_attribute_listener_installers[ancestor]}.compact
         widget_listener_installers = attribute_listener_installers.map{|installer| installer[attribute.to_s]}.compact if !attribute_listener_installers.empty?

data/samples/hello/hello_button.rb

@@ -34,12 +34,60 @@ class HelloButton
     root {
       title 'Hello, Button!'
       
-      button {
-        text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+      frame {
+        grid row: 0, column: 0
         
-        command {
-          self.count += 1
+        label {
+          grid pady: 15
+          text 'Text Button'
         }
+        
+        button {
+          text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+          default 'active'
+          
+          command {
+            self.count += 1
+          }
+        }
+      }
+        
+      frame {
+        grid row: 0, column: 1
+        
+        label {
+          grid pady: 15
+          text 'Image Button'
+        }
+        
+        button {
+          image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
+          
+          command {
+            message_box(title: 'Image Button', message: 'Image Button Clicked!')
+          }
+        }
+      }
+      
+      frame {
+        grid row: 0, column: 2
+        
+        label {
+          grid pady: 15
+          text 'Text Image Buttons'
+        }
+        
+        ['center', 'top', 'bottom', 'left', 'right'].each do |compound_option|
+          button {
+            image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
+            text 'Text Image Button'
+            compound compound_option
+            
+            command {
+              message_box(title: 'Text Image Button', message: 'Text Image Button Clicked!', detail: "(#{compound_option})")
+            }
+          }
+        end
       }
     }.open
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - AndyMaleh