glimmer-dsl-tk 0.0.59 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c20e8d681d57d11f540136ad94fd26a4f7ab51a5663eba95599dd5fa1589fe
-  data.tar.gz: 6f70dd20a48487e0c73135790b24e38f8080fa376cda20f1da2c8db83cb78d4c
+  metadata.gz: 9c0553115fdb0b7a912c59f6feda8b475e76c546fc2db32984037e7bbc8db204
+  data.tar.gz: 450c7795ef8adafe88db9fbfdf78691933f79b06f1f4b1e899f5ddacac3da567
 SHA512:
-  metadata.gz: 97fc2a77f286aec0cef3f0733aa1642415a0cf5ae420ea7713344b4b9f0de676d96fbb40b6cdba8d5a3338f8340a6b94ef3e6497043b86cd154258d66e320616
-  data.tar.gz: d48746949f04d68643d6493cab85c04bc7951da0fcbced1c7f13ab9a968d3bab6e452b8c804b2b012ab6b662c8092e87c0bea4386a214b2ccd494a94e46b6299
+  metadata.gz: 256d0e2d25fd50791b979cf92ba9dad8dedf77941e6e6394f1474f41f20a035bb601f6cc2af3b2bab8ed0b3acf11825d041a3d65d5d8941da85e6fc563c7c23b
+  data.tar.gz: b122dd08e9a6b2ec400ecf49c15d0be69fcc3c4e4fbe4de9c427dc0b1a085cae6ab8c95deca79272f28ecb21479477a6792ae434544c64013ebfe8cc4b8b49de

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.60
+
+- Update Hello, Built-in Dialog! with more options for customizing dialogs
+- Support setting colors as rgb colors via `r, g, b` (e.g. `foreground 210, 48, 110`)
+- Accept hex color strings not starting with `#` (e.g. `background 'f828d7'`)
+
 ## 0.0.59
 
 - Auto-Default to `validate 'key'` on an `entry` when defining `validatecommand {}`, `on('validate') {}`, `invalidcommand {}`, `on('invalid') {}`

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.59
+# [<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.60
 ## Ruby Tk Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -195,7 +195,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '0.0.59'
+gem 'glimmer-dsl-tk', '0.0.60'
 ```
 
 And, then run:
@@ -309,14 +309,14 @@ keyword(args) | attributes | event bindings & callbacks
 ------------- | ---------- | ---------
 `button` | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `default` (`'active', 'normal'`) | `command {}`
 `checkbutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `onvalue` (default: `1`), `offvalue` (default: `0`) | `command {}`
-`choose_color(options = nil)` | None | None
-`choose_directory(options = nil)` | None | None
-`choose_font(options = nil) {|font| ... }` | None | None
+`choose_color(parent: nil, initialcolor: 'white', title: 'Colors')` | None | None
+`choose_directory(parent: nil)` | None | None
+`choose_font(family: nil, size: nil, weight: nil) {|font| ... }` | None | None
 `combobox` | `state`, `text` | `'ComboboxSelected'`
 `entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'` (alias: `'changed'`), `validatecommand {}`, `invalidcommand {}`
-`get_multiple_open_file(options = nil)` | None | None
-`get_open_file(options = nil)` | None | None
-`get_save_file(options = nil)` | None | None
+`get_multiple_open_file(parent: nil, title: '')` | None | None
+`get_open_file(parent: nil, title: '')` | None | None
+`get_save_file(parent: nil, title: '')` | None | None
 `spinbox` | `text`, `from`, `to`, `increment`, `format`, [more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `command {}`, `'increment'`, `'decrement'`
 `frame(text: nil)` | `width`, `height`, `borderwidth`, `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`) | None
 `label` | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `font` (`'default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip'`), `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`), `justify` (`'left', 'center', 'right'`), `foreground`, `background` | None
@@ -343,6 +343,8 @@ Options for `get_open_file` and `get_multiple_open_file` include:
 #### Common Attributes
 
 - `grid`: `Hash` of `:row`, `:column`, `:padx`, `:pady`, `:sticky` (`'e', 'w', 'n', 's'` or any combination of direction letters)
+- `foreground`: [Built-in Color](https://tcl.tk/man/tcl8.6/TkCmd/colors.htm) (e.g. `'AliceBlue'`) or Hex color (e.g. `'#ffd807'`)
+- `background`: [Built-in Color](https://tcl.tk/man/tcl8.6/TkCmd/colors.htm) (e.g. `'AliceBlue'`) or Hex color (e.g. `'#ffd807'`)
 
 #### Common Event Bindings
 

data/VERSION

@@ -1 +1 @@
-0.0.59
+0.0.60

data/lib/glimmer/tk/widget_proxy.rb

@@ -192,6 +192,7 @@ module Glimmer
 
       def set_attribute(attribute, *args)
         begin
+          args = normalize_attribute_arguments(attribute, args)
           widget_custom_attribute = widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute.to_s]
           if respond_to?(attribute_setter(attribute), super_only: true)
             send(attribute_setter(attribute), *args)
@@ -308,6 +309,30 @@ module Glimmer
         @tk.style = style
       end
       
+      def normalize_attribute_arguments(attribute, args)
+        attribute_argument_normalizers[attribute]&.call(args) || args
+      end
+      
+      def attribute_argument_normalizers
+        color_normalizer = lambda do |args|
+          if args.size > 1 || args.first.is_a?(Numeric)
+            rgb = args
+            rgb = rgb.map(&:to_s).map(&:to_i)
+            rgb = 3.times.map { |n| rgb[n] || 0}
+            hex = rgb.map { |color| color.to_s(16).ljust(2, '0') }.join
+            ["##{hex}"]
+          elsif args.size == 1 && args.first.is_a?(String) && !args.first.start_with?('#')
+            ["##{args.first}"]
+          else
+            args
+          end
+        end
+        @attribute_argument_normalizers ||= {
+          'background' => color_normalizer,
+          'foreground' => color_normalizer,
+        }
+      end
+      
       def widget_custom_attribute_mapping
         # TODO consider extracting to modules/subclasses
         @widget_custom_attribute_mapping ||= {
@@ -534,10 +559,12 @@ module Glimmer
 
       def method_missing(method, *args, &block)
         method = method.to_s
+        attribute_name = method.sub(/=$/, '')
+        args = normalize_attribute_arguments(attribute_name, args)
         if args.empty? && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method]) || has_state?(method) || has_attributes_attribute?(method))
           get_attribute(method)
         elsif method.end_with?('=') && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')]) || has_state?(method) || has_attributes_attribute?(method))
-          set_attribute(method.sub(/=$/, ''), *args)
+          set_attribute(attribute_name, *args)
         else
           tk.send(method, *args, &block)
         end

data/samples/hello/hello_built_in_dialog.rb

@@ -31,21 +31,47 @@ root { |w|
   y 150
   
   frame {
-    %w[get_open_file get_multiple_open_file get_save_file choose_directory choose_color].each do |dialog|
+    %w[get_open_file get_multiple_open_file get_save_file choose_directory].each do |dialog|
+      dialog_name = dialog.split('_').map(&:capitalize).join(' ')
       button {
-        text dialog.split('_').map(&:capitalize).join(' ')
+        text dialog_name
         
         on('command') do
-          result = send(dialog, parent: w)
+          # parent is optional.
+          # It is recommended to set parent to display dialog on top of.
+          #
+          # title is optional (defaults to blank).
+          # It is not supported by choose_directory (its title is always blank).
+          result = send(dialog, parent: w, title: dialog_name)
+          # Uniformly handle both a singular result (e.g. from get_open_file)
+          # and an array of results (e.g. from get_multiple_open_file)
           @result_label.text = [result].flatten.join("\n")
         end
       }
     end
     
+    button {
+      text 'Choose Color'
+      
+      on('command') do
+        # parent is optional.
+        # It is recommended to set parent to display dialog on top of.
+        #
+        # title is optional (defaults to 'Colors').
+        #
+        # initialcolor is optional (defaults to 'white').
+        # It can be a built-in color (e.g. 'AliceBlue') or hex (e.g. '#FFFF00')
+        # Full list of built-in colors is at: https://tcl.tk/man/tcl8.6/TkCmd/colors.htm
+        chosen_color = choose_color(parent: w, title: 'Choose Color', initialcolor: '#FFFF00')
+        @result_label.text = chosen_color
+      end
+    }
+    
     button {
       text 'Choose Font'
       
       on('command') do
+        # Initial family, size, and weight are optional.
         choose_font(family: 'Courier New', size: '30', weight: 'bold') do |chosen_font|
           @result_label.text = chosen_font
         end

data/samples/hello/hello_label.rb

@@ -80,8 +80,13 @@ class HelloLabel
             anchor 'center'
             justify 'center' # other options are: 'left' and 'right'
             font 'caption' # other options are: 'default', 'text', 'fixed', 'menu', 'heading', 'small_caption', 'icon', 'tooltip'
-            foreground 'blue'
             relief 'sunken' # other options are: 'flat' (default), 'raised', 'solid', 'ridge', 'groove'
+            foreground 38, 20, 138 # RGB (Red Green Blue) color
+            
+            # Other supported color arguments:
+            # foreground 'blue' # built-in color alternative from https://tcl.tk/man/tcl8.6/TkCmd/colors.htm
+            # foreground '#ff0000' # hex color
+            # foreground 'ff0000' # hex color missing the # prefix
           }
         }
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-21 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -170,8 +170,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library) - Ruby
-  DSL for Tcl/Tk with bidirectional/unidirectional data-binding support.
+description: Glimmer DSL for Tk (Ruby Tk Desktop Development GUI Library) - Ruby DSL
+  for Tcl/Tk with bidirectional/unidirectional data-binding support.
 email: andy.am@gmail.com
 executables:
 - girb