glimmer-dsl-tk 0.0.61 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65202d323a2567e112890475495d310877f839c0a064f8f4e17e2564df47b422
-  data.tar.gz: 93515ff8e8ef6ff1e8b3eae4d3f809522110fb9e0e83e4523eaede034cd605d0
+  metadata.gz: b6a4152765e0997cd3d29beec05f16be105a09ae868e49335fb09e81d552e576
+  data.tar.gz: 31c3f1d4ee33b5ab9dec7ccd76d11a6c50cde145cf3a5517401859b0ae16a45a
 SHA512:
-  metadata.gz: a5206b004b6b49c5b29444410b86d978cb787314e25c32f069e2e973b456f164a20c04a295a2cac4bd90d0e5627df5477605daf8cc9439bf883caea4e79485b3
-  data.tar.gz: 9addeadf0b91a2c51a0ac137b550d700a2a621d52ca997d8618ff6d83281be2c030eebe34ca0cf4bd0c122b3fa4b26c9ac8ecf4b1e2b3f46ba7bafad562f1052
+  metadata.gz: 7f4820bb0d35553b16fc9b37bfca7d2abdc463cbd2e958f462b5be5c53e79e7ae3abc918fa2bbc6775d642432b127fa3d26ff72d96195287fecd287e13a50a23
+  data.tar.gz: 6f5b093cd7f834e6d8126142d5f63e66dde7c164b463eee577cd8b177d27784335d3f2df88555ce103c68a29eaed72ab1ec1e608018e8b76655c9704e77c0826

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.62
+
+- `icon_photo` as alias for `iconphoto` attribute on `root` and `toplevel`
+- `initial_color` as alias for `initialcolor` attribute on `choose_color` built-in dialog
+
 ## 0.0.61
 
 - Fix issue with Hello, Entry! breaking after the latest release due to mistakenly converting color `'red'` to `'#red'` by thinking it is hex

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.61
+# [<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.62
 ## 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.61'
+gem 'glimmer-dsl-tk', '0.0.62'
 ```
 
 And, then run:
@@ -309,7 +309,7 @@ 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(parent: nil, initialcolor: 'white', title: 'Colors')` | None | None
+`choose_color(parent: nil, initial_color: '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'`
@@ -328,11 +328,11 @@ keyword(args) | attributes | event bindings & callbacks
 `menu_item(style = :command, label: , underline: )` (style also can be `:radiobutton`, `:checkbutton`, `:separator`, `:about`, `:preferences`, `:quit`, `:help`) | `state`, `accelerator`, `selection` & `variable` (if `:radiobutton` or `:checkbutton`), `image`, `compound` | `command`
 `notebook` | None | None
 `radiobutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `value` (default: `text`) | `command {}`
-`root` | `title`, `iconphoto`, `background`, `alpha`, `escapable`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`, `'OPEN_WINDOW'`
+`root` | `title`, `icon_photo`, `background`, `alpha`, `escapable`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`, `'OPEN_WINDOW'`
 `scrollbar` | `orient` | `command`
 `scrollbar_frame` | `xscrollbar` (Boolean or scrollbar widget proxy), `yscrollbar` (Boolean or scrollbar widget proxy) | None
 `separator` | `orient` (`'horizontal' (default) or 'vertical'`) | None
-`toplevel` | `title`, `iconphoto`, `background`, `alpha`, `escapable`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`
+`toplevel` | `title`, `icon_photo`, `background`, `alpha`, `escapable`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`
 `text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`, `'insert_mark_moved'` (alias: `'insert_mark_move', 'InsertMarkMove', 'InsertMarkMoved'`)
 `x_scrollbar` | `orient` (`'horizontal'`) | `command`
 `y_scrollbar` | `orient` (`'vertical'`) | `command`
@@ -555,7 +555,7 @@ When nesting `frame` under `notebook`, you can pass a `:text` keyword argument t
 
 #### Icon Photo
 
-The `iconphoto` attribute on `root` is set to the Glimmer icon by default if no icon photo is supplied.
+The `icon_photo` attribute (alias for `iconphoto`) on `root` is set to the Glimmer icon by default if no icon photo is supplied.
 
 Otherwise, [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) is smart enough to accept an image path directly (no need to wrap with `TkPhotoImage`)
 
@@ -564,7 +564,7 @@ Example with direct image path (you may copy/paste in [`girb`](#girb-glimmer-irb
 ```ruby
 root {
   title 'Title'
-  iconphoto 'icons/glimmer.png'
+  icon_photo 'icons/glimmer.png'
 }.open
 ```
 
@@ -573,7 +573,7 @@ Example with `TkPhotoImage` object (you may copy/paste in [`girb`](#girb-glimmer
 ```ruby
 root {
   title 'Title'
-  iconphoto TkPhotoImage.new(file: 'icons/glimmer.png')
+  icon_photo TkPhotoImage.new(file: 'icons/glimmer.png')
 }.open
 ```
 
@@ -1535,7 +1535,7 @@ include Glimmer
 
 root { |r|
   title 'Hello, Root!'
-  iconphoto File.expand_path('../../icons/glimmer.png', __dir__)
+  icon_photo File.expand_path('../../icons/glimmer.png', __dir__)
   width 400
   height 200
   x -150

data/VERSION

@@ -1 +1 @@
-0.0.61
+0.0.62

data/lib/glimmer/dsl/tk/built_in_dialog_expression.rb

@@ -38,6 +38,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           if args.first.is_a?(Hash)
             options = args.first.symbolize_keys
+            options[:initialcolor] = options.delete(:initial_color) if options.keys.include?(:initial_color)
             options[:filetypes] = options.delete(:file_types) if options.keys.include?(:file_types)
             options[:filetypes] = options[:filetypes].map { |key, value| "{#{key}} {#{value}}" } if options[:filetypes].is_a?(Hash)
             options[:parent] = options[:parent].tk if options[:parent].is_a?(Glimmer::Tk::RootProxy)

data/lib/glimmer/tk/toplevel_proxy.rb

@@ -48,14 +48,14 @@ module Glimmer
       end
       
       def has_attribute?(attribute, *args)
-        %w[width height x y].include?(attribute.to_s) || super
+        %w[width height x y icon_photo].include?(attribute.to_s) || super
       end
       
       def set_attribute(attribute, *args)
         case attribute.to_s
-        when 'iconphoto'
+        when 'iconphoto', 'icon_photo'
           args[0..-1] = [image_argument(args)]
-          super
+          super('iconphoto', *args)
         when 'resizable'
           if args.size == 1 && !args.first.is_a?(Array)
             self.resizable = [args.first]*2
@@ -67,6 +67,19 @@ module Glimmer
         end
       end
       
+      def get_attribute(attribute)
+        case attribute.to_s
+        when 'icon_photo'
+          super('iconphoto')
+        else
+          super
+        end
+      end
+      
+      def icon_photo
+        iconphoto
+      end
+      
       def width
         geometry.split(REGEX_GEOMETRY)[0].to_i
       end

data/lib/glimmer/tk/widget_proxy.rb

@@ -410,6 +410,10 @@ module Glimmer
               getter: {name: 'text', invoker: lambda { |widget, args| @tk.title }},
               setter: {name: 'text=', invoker: lambda { |widget, args| @tk.title = args.first }},
             },
+            'icon_photo' => {
+              getter: {name: 'icon_photo', invoker: lambda { |widget, args| @tk.iconphoto }},
+              setter: {name: 'icon_photo=', invoker: lambda { |widget, args| @tk.iconphoto = image_argument(args) }},
+            },
           },
         }
       end

data/samples/hello/hello_built_in_dialog.rb

@@ -62,7 +62,7 @@ root { |w|
         # 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')
+        chosen_color = choose_color(parent: w, title: 'Choose Color', initial_color: '#FFFF00')
         @result_label.text = chosen_color
       end
     }

data/samples/hello/hello_root.rb

@@ -25,7 +25,7 @@ include Glimmer
 
 root { |r|
   title 'Hello, Root!'
-  iconphoto File.expand_path('../../icons/glimmer.png', __dir__)
+  icon_photo File.expand_path('../../icons/glimmer.png', __dir__)
   width 400
   height 200
   x -150

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.61
+  version: 0.0.62
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer