glimmer-dsl-tk 0.0.13 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd8908007208ff366a6605b4193d5202c3b81994c9a39288f6f8b6f72c3ec95
-  data.tar.gz: 2a4651e42e10d7112d30823414f768d7c5607eaeb3a9e8de5b81af4adc932536
+  metadata.gz: 21a6a1f1d2d85928c9bac3b9fd14ce7d8ca39f1ddec7ad82b8bafa733a0e4caa
+  data.tar.gz: 3d3acdb3c53c63d45a54188e956fedc8fa010dadaa3b3edb697f4b5f23a85126
 SHA512:
-  metadata.gz: dd1c4ccaa1d1ea01b07f627333bac1d2b50f2e4a7eb1abb04f8e267b547fd2874daa62ae244eae86264d0f1c0fec6f3b040325b45343b360b09c1008b2468f1b
-  data.tar.gz: 1b77271bdd9288256625d3528537033adbd07397c3348a29d60434142b56fe3928fa8128a5981815aa94e5f63eee95404d61497c0f93da5cb6ae3fe88be81f99
+  metadata.gz: 2c118bbcd96a99bbd4037e8df41595e7e514e16a0077d895e3b1808d62f7a62062f784b450fbdb299f2e48d59f60dce1e5de6ab08267a55123d4cffd100d494b
+  data.tar.gz: fe21b7c7cc00eb47c9313ea953b4fdce36b8a2bc2aa86de010fd8f68fde9c0487bb86b629263d0fc47ac2b64ce6fcdf2003879fd124607f4ea9c666800093660

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Change Log
 
+## 0.0.17
+
+- Support `label` `anchor` attribute (`'e'`, `'se'`, `'s'`, `'sw'`, `'w'`, `'nw'` or `'center'`)
+- Support `label` `width` attributes
+- Support `label` `image` attribute
+- Support `label` `justify` attribute (`'left', 'center', 'right'`)
+- Support `label` `font` attribute (`'default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip'`)
+- Support `label` `foreground` attribute
+- Support `label` `background` attribute (note that it does not work in Mac 'aqua' theme)
+- Support `label` `compound` attribute
+- Support `label` `relief` attributes (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`)
+
+## 0.0.16
+
+- Support common themed widget state attributes: `active`, `disabled`, `focus`, `pressed`, `selected`, `background`, `readonly`, `alternate`, `invalid`, and `hover`
+- Update Hello, Button! to utilize `focus true` in first button.
+
+## 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,6 +1,7 @@
-# [<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.13
+# [<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.17
 ## 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)
+[![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)
 [![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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-tk/maintainability)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -29,7 +30,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!'
   }
@@ -55,6 +62,52 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [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)
 
+## Table of Contents
+
+- [Glimmer DSL for Tk](#)
+  - [MRI Ruby Desktop Development GUI Library](#mri-ruby-desktop-development-gui-library)
+  - [Pre-requisites](#pre-requisites)
+  - [Setup](#setup)
+    - [Option 1: Install](#option-1-install)
+    - [Option 2: Bundler](#option-2-bundler)
+  - [Girb (Glimmer IRB)](#girb-glimmer-irb)
+  - [Tk Concepts](#tk-concepts)
+  - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
+    - [Supported Widgets](#supported-widgets)
+      - [Common Attributes](#common-attributes)
+      - [Common Themed Widget States](#common-themed-widget-states)
+    - [Smart Defaults and Convensions](#smart-defaults-and-convensions)
+      - [Grid Layout](#grid-layout)
+      - [Label/Button Image](#labelbutton-image)
+      - [Icon Photo](#icon-photo)
+  - [The Grid Geometry Manager](#the-grid-geometry-manager)
+  - [Bidirectional Data-Binding](#bidirectional-data-binding)
+    - [General Property Data-Binding](#general-property-data-binding)
+    - [Combobox Data-Binding](#combobox-data-binding)
+    - [List Single Selection Data-Binding](#list-single-selection-data-binding)
+    - [List Multi Selection Data-Binding](#list-multi-selection-data-binding)
+    - [Entry Data-Binding](#entry-data-binding)
+  - [Command Observer](#command-observer)
+  - [Samples](#samples)
+    - [Hello, World!](#hello-world)
+    - [Hello, Button!](#hello-button)
+    - [Hello, Tab!](#hello-tab)
+    - [Hello, Label!](#hello-label)
+    - [Hello, Message Box!](#hello-message-box)
+    - [Hello, Combobox!](#hello-combobox)
+    - [Hello, List Single Selection!](#hello-list-single-selection)
+    - [Hello, List Multi Selection!](#hello-list-multi-selection)
+    - [Hello, Computed!](#hello-computed)
+  - [Help](#help)
+    - [Issues](#issues)
+    - [Chat](#chat)
+  - [Process](#process)
+  - [Planned Features and Feature Suggestions](#planned-features-and-feature-suggestions)
+  - [Change Log](#change-log)
+  - [Contributing](#contributing)
+  - [Contributors](#contributors)
+  - [License](#license)
+
 ## Pre-requisites
 
 - [Tcl/Tk](https://www.tcl.tk/): Follow the [install instructions](https://tkdocs.com/tutorial/install.html)
@@ -81,7 +134,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.13'
+gem 'glimmer-dsl-tk', '~> 0.0.17'
 ```
 
 And, then run:
@@ -169,12 +222,12 @@ root {
 
 ### Supported Widgets
 
-keyword(args) | attributes | listeners/events
+keyword(args) | attributes | event bindings & callbacks
 ------------- | ---------- | ---------
-`button` | `text` | `command`
+`button` | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `default` (`'active', 'normal'`) | `command`
 `entry` | `width`, `text` | None
-`frame(text: )` | None | None
-`label` | `text` | None
+`frame(text: nil)` | None | 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
 `list` | `selectmode`, `selection` | None
 `message_box(type: , message: , detail: , title: , icon: , default: , parent: )` | None | None
 `notebook` | None | None
@@ -182,7 +235,20 @@ keyword(args) | attributes | listeners/events
 
 #### Common Attributes
 
-- `grid`
+- `grid`: `Hash` of `:row`, `:column`, `:padx`, `:pady`, `:sticky` (`'e', 'w', 'n', 's'` or any combination of direction letters)
+
+#### Common Themed Widget States
+
+- `active?`
+- `disabled?`
+- `focus?`
+- `pressed?`
+- `selected?`
+- `background?`
+- `readonly?`
+- `alternate?`
+- `invalid?`
+- `hover?`
 
 ### Smart Defaults and Convensions
 
@@ -190,6 +256,10 @@ keyword(args) | attributes | listeners/events
 
 `grid` layout is the default on most widgets (which support it).
 
+#### Label/Button Image
+
+Label and Button `image` attribute can accept image path directly as an alternative to `TkPhotoImage` object in addition to key values for automatic processing of image (`subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`)
+
 #### Icon Photo
 
 The `iconphoto` attribute on `root` is set to the Glimmer icon by default if no icon photo is supplied.
@@ -238,6 +308,24 @@ More details can be found in the [Hello, Computed!](#hello-computed) sample belo
 
 Glimmer supports Shine syntax bidirectional data-binding via the `<=>` operator (read-write) and unidirectional data-binding via the `<=` operator (read-only), which takes a model and an attribute (the `bind` keyword may also be used as the old-style of data-binding).
 
+### General Property Data-Binding
+
+Example:
+
+This assumes a `Person` model with a `country` attribute.
+
+```ruby
+  label {
+    text <=> [person, :country]
+  }
+```
+
+That code binds the `textvariable` value of the `label` to the `country` property on the `person` model.
+
+It automatically handles all the Tk plumbing behind the scenes.
+
+More details can be found in the [Hello, Computed!](#hello-computed) sample below.
+
 ### Combobox Data-Binding
 
 Example:
@@ -301,24 +389,6 @@ It automatically handles all the Tk plumbing behind the scenes.
 
 More details can be found in the [Hello, List Multi Selection!](#hello-list-multi-selection) sample below.
 
-### Label Data-Binding
-
-Example:
-
-This assumes a `Person` model with a `country` attribute.
-
-```ruby
-  label {
-    text <=> [person, :country]
-  }
-```
-
-That code binds the `textvariable` value of the `label` to the `country` property on the `person` model.
-
-It automatically handles all the Tk plumbing behind the scenes.
-
-More details can be found in the [Hello, Computed!](#hello-computed) sample below.
-
 ### Entry Data-Binding
 
 Example:
@@ -363,9 +433,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,13 +455,112 @@ 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:
 
 ![glimmer dsl tk screenshot sample hello world](images/glimmer-dsl-tk-screenshot-sample-hello-world.png)
 
+### Hello, Button!
+
+Glimmer code (from [samples/hello/hello_button.rb](samples/hello/hello_button.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+class HelloButton
+  include Glimmer
+  
+  attr_accessor :count
+  
+  def initialize
+    @count = 0
+  end
+  
+  def launch
+    root {
+      title 'Hello, Button!'
+      
+      frame {
+        grid row: 0, column: 0
+        
+        label {
+          grid pady: 15
+          text 'Text Button'
+        }
+        
+        button {
+          text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+          default 'active'
+          focus true
+          
+          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
+end
+
+HelloButton.new.launch
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+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 -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_button.rb
+```
+
+Glimmer app:
+
+![glimmer dsl tk screenshot sample hello button](images/glimmer-dsl-tk-screenshot-sample-hello-button.png)
+
 ### Hello, Tab!
 
 Glimmer code (from [samples/hello/hello_tab.rb](samples/hello/hello_tab.rb)):
@@ -423,7 +596,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_tab'"
 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_tab'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_tab.rb
 ```
 
 Glimmer app:
@@ -431,6 +604,128 @@ Glimmer app:
 ![glimmer dsl tk screenshot sample hello tab English](images/glimmer-dsl-tk-screenshot-sample-hello-tab-english.png)
 ![glimmer dsl tk screenshot sample hello tab French](images/glimmer-dsl-tk-screenshot-sample-hello-tab-french.png)
 
+### Hello, Label!
+
+Glimmer code (from [samples/hello/hello_label.rb](samples/hello/hello_label.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+class HelloLabel
+  include Glimmer
+  
+  LABEL_FONTS = ['default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip']
+  LABEL_RELIEFS = ['flat', 'raised', 'sunken', 'solid', 'ridge', 'groove']
+  
+  def launch
+    root {
+      title 'Hello, Label!'
+      
+      notebook {
+        frame(text: 'left-aligned') {
+          3.times do |n|
+            label {
+              text "Field #{n + 1} / default font / flat relief"
+              width 60
+              anchor 'w'
+            }
+          end
+        }
+        
+        frame(text: 'centered') {
+          9.times do |n|
+            label {
+              text "Field #{n + 1} / fixed font / raised relief"
+              width 80
+              anchor 'center'
+              font 'fixed'
+              relief 'raised'
+            }
+          end
+        }
+        
+        frame(text: 'right-aligned') {
+          9.times do |n|
+            label {
+              text "Field #{n + 1} / small_caption font / ridge relief"
+              width 80
+              anchor 'e'
+              font 'small_caption'
+              relief 'ridge'
+            }
+          end
+        }
+        
+        frame(text: 'justified') {
+          label {
+            text <<~MULTI_LINE_STRING
+              This is a very long paragraph that spans multiple lines. It looks better and
+              is easier to read when justified. In fact, this is how to make it look like a
+              new paper column. That results in professional looking text. Magazines use the
+              same sort of justified text. Word processors also support justified text. In
+              fact, this is how text is made for news papers and magainzes, and then published
+              in paper form and digitally.
+            MULTI_LINE_STRING
+            width 60
+            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'
+          }
+        }
+        
+        frame(text: 'images') {
+          ['denmark', 'finland', 'norway'].each do |image_name|
+            label {
+              image File.expand_path("images/#{image_name}.png", __dir__)
+            }
+          end
+        }
+        
+        frame(text: 'background images') {
+          ['italy', 'france', 'mexico'].each do |image_name|
+            label {
+              text image_name.capitalize
+              image File.expand_path("images/#{image_name}.png", __dir__)
+              compound 'center'
+            }
+          end
+        }
+      }
+    }.open
+  end
+end
+
+HelloLabel.new.launch
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_label'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_label.rb
+```
+
+Glimmer app:
+
+![glimmer dsl tk screenshot sample hello label left aligned](images/glimmer-dsl-tk-screenshot-sample-hello-label-left-aligned.png)
+
+![glimmer dsl tk screenshot sample hello label centered](images/glimmer-dsl-tk-screenshot-sample-hello-label-centered.png)
+
+![glimmer dsl tk screenshot sample hello label right aligned](images/glimmer-dsl-tk-screenshot-sample-hello-label-right-aligned.png)
+
+![glimmer dsl tk screenshot sample hello label justified](images/glimmer-dsl-tk-screenshot-sample-hello-label-justified.png)
+
+![glimmer dsl tk screenshot sample hello label images](images/glimmer-dsl-tk-screenshot-sample-hello-label-images.png)
+
+![glimmer dsl tk screenshot sample hello label background images](images/glimmer-dsl-tk-screenshot-sample-hello-label-background-images.png)
+
 ### Hello, Message Box!
 
 Glimmer code (from [samples/hello/hello_message_box.rb](samples/hello/hello_message_box.rb)):
@@ -510,13 +805,13 @@ root { |r|
 Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_tab'"
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_message_box'"
 ```
 
 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_tab'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_message_box.rb
 ```
 
 Glimmer app:
@@ -557,7 +852,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_combobox'"
 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_combobox'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_combobox.rb
 ```
 
 Glimmer app:
@@ -597,7 +892,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_list_single_selection'"
 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_list_single_selection'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_list_single_selection.rb
 ```
 
 Glimmer app:
@@ -635,7 +930,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_list_multi_selection'"
 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_list_multi_selection'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_list_multi_selection.rb
 ```
 
 Glimmer app:
@@ -715,7 +1010,7 @@ ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_computed'"
 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_computed'"
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_computed.rb
 ```
 
 Glimmer app:

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.17

data/lib/glimmer/tk/label_proxy.rb

@@ -27,14 +27,14 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class LabelProxy < WidgetProxy
-      # TODO specify attribute setters
-#       def tk_widget_has_attribute_setter?(attribute)
-#         if ['anchor', 'justify'].include?(attribute.to_s)
-#           true
-#         else
-#           super
-#         end
-#       end
+      def set_attribute(attribute, *args)
+        if attribute.to_s == 'font'
+          args[0] = "tk_#{args[0]}_font".camelcase(:upper) if (args[0].is_a?(Symbol) || args[0].is_a?(String)) && args[0].to_s == args[0].to_s.downcase
+          super
+        else
+          super
+        end
+      end
     end
   end
 end

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

@@ -117,13 +117,34 @@ module Glimmer
       end
       
       def tk_widget_has_attribute_getter_setter?(attribute)
-        @tk.respond_to?(attribute)
+        begin
+          # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now
+          @tk.send(attribute)
+          true
+        rescue
+          false
+        end
+      end
+      
+      def has_state?(attribute)
+        attribute = attribute.sub(/\?$/, '').sub(/=$/, '')
+        if @tk.respond_to?(:tile_state)
+          begin
+            @tk.tile_instate(attribute)
+            true
+          rescue
+            false
+          end
+        else
+          false
+        end
       end
       
       def has_attribute?(attribute, *args)
-        (widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute.to_s]) ||
-          tk_widget_has_attribute_setter?(attribute) ||
-          tk_widget_has_attribute_getter_setter?(attribute) ||
+        (widget_custom_attribute_mapping[tk.class] and widget_custom_attribute_mapping[tk.class][attribute.to_s]) or
+          tk_widget_has_attribute_setter?(attribute) or
+          tk_widget_has_attribute_getter_setter?(attribute) or
+          has_state?(attribute) or
           respond_to?(attribute_setter(attribute), args)
       end
 
@@ -135,6 +156,13 @@ module Glimmer
           @tk.send(attribute_setter(attribute), *args) unless @tk.send(attribute) == args.first
         elsif tk_widget_has_attribute_getter_setter?(attribute)
           @tk.send(attribute, *args)
+        elsif has_state?(attribute)
+          attribute = attribute.sub(/=$/, '')
+          if !!args.first
+            @tk.tile_state(attribute)
+          else
+            @tk.tile_state("!#{attribute}")
+          end
         else
           send(attribute_setter(attribute), args)
         end
@@ -146,6 +174,8 @@ module Glimmer
           widget_custom_attribute[:getter][:invoker].call(@tk, args)
         elsif tk_widget_has_attribute_getter_setter?(attribute)
           @tk.send(attribute)
+        elsif has_state?(attribute)
+          @tk.tile_instate(attribute.sub(/\?$/, ''))
         else
           send(attribute)
         end
@@ -157,6 +187,12 @@ module Glimmer
       
       def widget_custom_attribute_mapping
         @widget_custom_attribute_mapping ||= {
+          ::Tk::Tile::TButton => {
+            'image' => {
+              getter: {name: 'image', invoker: lambda { |widget, args| @tk.image }},
+              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 }},
@@ -168,6 +204,10 @@ module Glimmer
               getter: {name: 'text', invoker: lambda { |widget, args| @tk.textvariable&.value }},
               setter: {name: 'text=', invoker: lambda { |widget, args| @tk.textvariable&.value = args.first }},
             },
+            'image' => {
+              getter: {name: 'image', invoker: lambda { |widget, args| @tk.image }},
+              setter: {name: 'image=', invoker: lambda { |widget, args| @tk.image = image_argument(args) }},
+            },
           },
           ::Tk::Tile::TEntry => {
             'text' => {
@@ -210,6 +250,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?
@@ -222,9 +278,9 @@ module Glimmer
 
       def method_missing(method, *args, &block)
         method = method.to_s
-        if args.empty? && block.nil? && widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method]
+        if args.empty? && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method]) || has_state?(method))
           get_attribute(method)
-        elsif widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')] && method.end_with?('=') && block.nil?
+        elsif method.end_with?('=') && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')]) || has_state?(method))
           set_attribute(method.sub(/=$/, ''), *args)
         else
           tk.send(method, *args, &block)

data/samples/hello/hello_button.rb

@@ -0,0 +1,97 @@
+# Copyright (c) 2020-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.
+
+require 'glimmer-dsl-tk'
+
+class HelloButton
+  include Glimmer
+  
+  attr_accessor :count
+  
+  def initialize
+    @count = 0
+  end
+  
+  def launch
+    root {
+      title 'Hello, Button!'
+      
+      frame {
+        grid row: 0, column: 0
+        
+        label {
+          grid pady: 15
+          text 'Text Button'
+        }
+        
+        button { |b|
+          text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
+          default 'active'
+          focus true
+          
+          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
+end
+
+HelloButton.new.launch

data/samples/hello/hello_label.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2020-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.
+
+require 'glimmer-dsl-tk'
+
+class HelloLabel
+  include Glimmer
+  
+  LABEL_FONTS = ['default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip']
+  LABEL_RELIEFS = ['flat', 'raised', 'sunken', 'solid', 'ridge', 'groove']
+  
+  def launch
+    root {
+      title 'Hello, Label!'
+      
+      notebook {
+        frame(text: 'left-aligned') {
+          3.times do |n|
+            label {
+              text "Field #{n + 1} / default font / flat relief"
+              width 60
+              anchor 'w'
+            }
+          end
+        }
+        
+        frame(text: 'centered') {
+          9.times do |n|
+            label {
+              text "Field #{n + 1} / fixed font / raised relief"
+              width 80
+              anchor 'center'
+              font 'fixed'
+              relief 'raised'
+            }
+          end
+        }
+        
+        frame(text: 'right-aligned') {
+          9.times do |n|
+            label {
+              text "Field #{n + 1} / small_caption font / ridge relief"
+              width 80
+              anchor 'e'
+              font 'small_caption'
+              relief 'ridge'
+            }
+          end
+        }
+        
+        frame(text: 'justified') {
+          label {
+            text <<~MULTI_LINE_STRING
+              This is a very long paragraph that spans multiple lines. It looks better and
+              is easier to read when justified. In fact, this is how to make it look like a
+              new paper column. That results in professional looking text. Magazines use the
+              same sort of justified text. Word processors also support justified text. In
+              fact, this is how text is made for news papers and magainzes, and then published
+              in paper form and digitally.
+            MULTI_LINE_STRING
+            width 60
+            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'
+          }
+        }
+        
+        frame(text: 'images') {
+          ['denmark', 'finland', 'norway'].each do |image_name|
+            label {
+              image File.expand_path("images/#{image_name}.png", __dir__)
+            }
+          end
+        }
+        
+        frame(text: 'background images') {
+          ['italy', 'france', 'mexico'].each do |image_name|
+            label {
+              text image_name.capitalize
+              image File.expand_path("images/#{image_name}.png", __dir__)
+              compound 'center'
+            }
+          end
+        }
+      }
+    }.open
+  end
+end
+
+HelloLabel.new.launch

data/samples/hello/hello_message_box.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2021 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.17
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -210,14 +210,25 @@ files:
 - lib/glimmer/tk/root_proxy.rb
 - lib/glimmer/tk/treeview_proxy.rb
 - lib/glimmer/tk/widget_proxy.rb
+- samples/hello/hello_button.rb
 - samples/hello/hello_combobox.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb
+- samples/hello/hello_label.rb
 - samples/hello/hello_list_multi_selection.rb
 - samples/hello/hello_list_single_selection.rb
 - samples/hello/hello_message_box.rb
 - samples/hello/hello_tab.rb
 - samples/hello/hello_world.rb
+- samples/hello/images/denmark.png
+- samples/hello/images/finland.png
+- samples/hello/images/france.png
+- samples/hello/images/germany.png
+- samples/hello/images/italy.png
+- samples/hello/images/mexico.png
+- samples/hello/images/netherlands.png
+- samples/hello/images/norway.png
+- samples/hello/images/usa.png
 homepage: http://github.com/AndyObtiva/glimmer-dsl-tk
 licenses:
 - MIT