glimmer-dsl-tk 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6969620ced6ade48e45e36bd48909bfe282a412e2f57d8a201f398082c6836
-  data.tar.gz: d8d4bc858b5fdf7399b10d71922a2e12aaf1cbf0b4c8c0db4bf78416e025a5d0
+  metadata.gz: 40c011bf31bc0b5d5691abc8930f93b7fe33c77b8cb77f1f0bf439cd3344d9d7
+  data.tar.gz: 65af004b131e750be35b4bab6b11316c012e49dbbcc3509171c40abcdc4b809f
 SHA512:
-  metadata.gz: 35a7d92e7f5b9098a9dcd50a5045447237bd66b89dfdd9f5ea10d45201b050a66b7b272266f275645552980a043cda9b59b6b96f591521a7da326fce4ff60524
-  data.tar.gz: c866f8e9a51d4dd291900ebb0c3b506f5a8d0975d1df779474ebf0997114d4384f5a9d2610e868a3196c1ba1b93cfeb98311d41f4e2b35b1582c64cee2b9dc71
+  metadata.gz: b53ed25b7f36d71a8db9dfde148589b95efd88b5ba881b9da1ce011024f13eb90d6b7b4c536fe0302774fe5bf71645e457eb694adceba7f94238d7cc24e3a26c
+  data.tar.gz: 11b7ada873371764ec7e255e2ab070863eaad8deec1f54da0246fa7e5e7ed3af3b53ef1fb11954a2d572502353b9b1ed43e6cf557d43cf9517f6fb0047da60b0

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.0.39
+
+- Add Language and Language Name menus to Hello, Menu Bar! sample
+- Update Hello, Button! sample to indicate compound option value on image text buttons
+- Support Mac `menu_item(:about, label: ) { on('command') {} }`
+- Support Mac `menu_item(:preferences) { on('command') {} }`
+- Support Mac `menu_item(:help) { on('command') {} }`
+- Support Mac `menu_item(:quit) { on('command') {} }`
+- Support Mac/X11 `'Help'` menu
+- Support Mac `'Window'` menu
+- Support Windows `'System'` menu
+
+
 ## 0.0.38
 
 - Hello, Menu Bar! sample

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.38
+# [<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.39
 ## 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)
@@ -171,7 +171,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.38'
+gem 'glimmer-dsl-tk', '~> 0.0.39'
 ```
 
 And, then run:
@@ -296,7 +296,7 @@ keyword(args) | attributes | event bindings & callbacks
 `list` | `selectmode`, `selection` | None
 `message_box(type: , message: , detail: , title: , icon: , default: , parent: )` | None | None
 `menu(label: nil) (label is nil if nested under root/toplevel for menu bar)` | None | None
-`menu_item(style = :command, label: , underline: )` (style also can be `:radiobutton`, `:checkbutton`, or `:separator`) | `state`, `accelerator`, `selection` & `variable` (if `:radiobutton` or `:checkbutton`) | `command`
+`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'`
@@ -3122,12 +3122,20 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar.png)
 
+![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-application.png)
+
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-file.png)
 
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-edit.png)
 
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-options.png)
 
+![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-language.png)
+
+![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-language-name.png)
+
+![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-window.png)
+
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-format.png)
 
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-view.png)
@@ -3152,9 +3160,9 @@ https://github.com/ancorgs/y3network-ruby-ui
 
 This is a Graphical User Interface for the famous [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
 
-https://github.com/AndyObtiva/cryptopunks-gui
+https://github.com/cryptopunksnotdead/cryptopunks-gui
 
-![CryptoPunks GUI Screenshot](https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/screenshots/cryptopunks-gui-screenshot.png)
+![CryptoPunks GUI Screenshot](https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks-gui/master/screenshots/cryptopunks-gui-screenshot.png)
 
 ### Circule
 

data/VERSION

@@ -1 +1 @@
-0.0.38
+0.0.39

data/lib/glimmer/tk/menu_item_proxy.rb

@@ -45,7 +45,7 @@ module Glimmer
     
       def accelerator=(value)
         @accelerator = value
-        @parent_proxy.tk.entryconfigure @options[:label], accelerator: value
+        configure_menu_item_attribute(accelerator: value)
         root_parent_proxy.bind(accelerator_event) do |event|
           @command_block&.call(event)
         end
@@ -64,16 +64,38 @@ module Glimmer
       
       def state=(value)
         @state = value
-        @parent_proxy.tk.entryconfigure @options[:label], :state => value
+        configure_menu_item_attribute(state: value)
       end
       
       def state
         @state
       end
       
+      def label
+        @options[:label]
+      end
+      
+      def image=(*args)
+        @image = image_argument(args)
+        configure_menu_item_attribute(image: @image)
+      end
+      
+      def image
+        @image
+      end
+      
+      def compound=(value)
+        @compound = value
+        configure_menu_item_attribute(compound: @compound)
+      end
+      
+      def compound
+        @compound
+      end
+      
       def command_block=(proc)
         @command_block = proc
-        @parent_proxy.tk.entryconfigure @options[:label], command: @command_block
+        configure_menu_item_attribute(command: @command_block)
       end
       
       def handle_listener(listener_name, &listener)
@@ -101,6 +123,22 @@ module Glimmer
         @args.first == :separator
       end
       
+      def about?
+        @args.first == :about
+      end
+      
+      def preferences?
+        @args.first == :preferences
+      end
+      
+      def help?
+        @args.first == :help
+      end
+      
+      def quit?
+        @args.first == :quit
+      end
+      
       def variable(auto_create: true)
         if @variable.nil? && auto_create
           sibling_variable = sibling_radio_menu_items.map {|mi| mi.variable(auto_create: false)}.compact.first
@@ -113,15 +151,27 @@ module Glimmer
       
       def selection=(value)
         if value
-          variable.value = @options[:label]
-          # TODO handle image case where there is no label
+          variable.value = label
         elsif checkbutton?
-          variable.value = '__unchecked__'
+          variable.value = ''
         end
       end
       
       def selection
-        variable.value == @options[:label]
+        variable.value == label
+      end
+      
+      # configures menu item attribute through parent menu
+      def configure_menu_item_attribute(attribute_value_hash)
+        if preferences? && attribute_value_hash[:command]
+          ::Tk.ip_eval("proc ::tk::mac::ShowPreferences {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+        elsif help? && attribute_value_hash[:command]
+          ::Tk.ip_eval("proc ::tk::mac::ShowHelp {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+        elsif quit? && attribute_value_hash[:command]
+          ::Tk.ip_eval("proc ::tk::mac::Quit {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+        else
+          @parent_proxy.tk.entryconfigure label, attribute_value_hash
+        end
       end
       
       private
@@ -133,10 +183,18 @@ module Glimmer
       def build_widget
         @args.prepend(:command) if @args.first.is_a?(Hash)
         @args.append({}) if !@args.last.is_a?(Hash)
-        @args.last.merge!(variable: variable, value: @options[:label]) if radiobutton? || checkbutton?
+        @args.last.merge!(variable: variable, value: label) if radiobutton? || checkbutton?
         case @parent_proxy
         when MenuProxy
-          @parent_proxy.tk.add(*@args)
+          if @parent_proxy.application?
+            if OS.mac?
+              if about?
+                @parent_proxy.tk.add :command, :label => label
+              end
+            end
+          else
+            @parent_proxy.tk.add(*@args) unless help?
+          end
         end
       end
     end

data/lib/glimmer/tk/menu_proxy.rb

@@ -31,16 +31,56 @@ module Glimmer
         super
       end
       
-      private
-      
-      def build_widget
-        tk_widget_class = self.class.tk_widget_class_for(@keyword)
-        @tk = tk_widget_class.new(@parent_proxy.tk)
+      def post_add_content
         case @parent_proxy
         when ToplevelProxy
           @parent_proxy.tk['menu'] = @tk
-        when MenuProxy
-          @parent_proxy.tk.add(:cascade, {menu: @tk}.merge(@options))
+        end
+      end
+      
+      def label
+        @options[:label]
+      end
+      
+      def help?
+        label == 'Help'
+      end
+      
+      def window?
+        label == 'Window'
+      end
+      
+      def system?
+        label == 'System'
+      end
+      
+      def application?
+        @args.first == :application
+      end
+      
+      private
+      
+      def build_widget
+        if application?
+          if OS.mac?
+            @tk = ::TkSysMenu_Apple.new(@parent_proxy.tk)
+            @parent_proxy.tk.add :cascade, :menu => @tk
+          end
+        else
+          if @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && (OS.mac? || OS.linux?) && help?
+            @tk = ::TkSysMenu_Help.new(@parent_proxy.tk)
+          elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.mac? && window?
+            @tk = ::Tk::TkSysMenu_Window.new(@parent_proxy.tk)
+          elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.windows? && system?
+            @tk = ::TkSysMenu_System.new(@parent_proxy.tk)
+          else
+            tk_widget_class = self.class.tk_widget_class_for(@keyword)
+            @tk = tk_widget_class.new(@parent_proxy.tk)
+          end
+          case @parent_proxy
+          when MenuProxy
+            @parent_proxy.tk.add(:cascade, {menu: @tk}.merge(@options))
+          end
         end
       end
     end

data/lib/glimmer-dsl-tk.rb

@@ -37,10 +37,18 @@ require 'delegate'
 # require 'ext/glimmer/config'
 # require 'ext/glimmer'
 require 'glimmer/dsl/tk/dsl'
+
 Glimmer::Config.loop_max_count = -1
+
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
   result = false
   result ||= method == 'load_iseq'
 end
+
 ::TkOption.add '*tearOff', 0
+
+class ::Tk::TkSysMenu_Window < Tk::Menu
+  include Tk::SystemMenu
+  SYSMENU_NAME = 'window'
+end

data/samples/hello/hello_button.rb

@@ -81,7 +81,7 @@ class HelloButton
         ['center', 'top', 'bottom', 'left', 'right'].each do |compound_option|
           button {
             image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
-            text 'Text Image Button'
+            text "#{compound_option.capitalize} Image"
             compound compound_option
             
             command {

data/samples/hello/hello_menu_bar.rb

@@ -38,6 +38,36 @@ root { |r|
   }
   
   menu {
+    if OS.mac?
+      menu(:application) {
+        menu_item(:about, label: 'About My Application') {
+          accelerator 'Command+A'
+          
+          on('command') do
+            message_box(parent: r, title: 'About', message: 'About my application.')
+          end
+        }
+        
+        menu_item(:preferences) {
+          on('command') do
+            message_box(parent: r, title: 'Preferences', message: 'Preferences of my application.')
+          end
+        }
+        
+        # If not defined, application simply quits upon selecting Quit menu item
+        menu_item(:quit) {
+          on('command') do
+            message_box(parent: r, title: 'Quit', message: 'Quitting my application...')
+            exit(0)
+          end
+        }
+      }
+    end
+    
+    if OS.windows?
+      menu(label: 'System')
+    end
+    
     menu(label: 'File', underline: 0) {
       menu_item(label: 'New', underline: 0) {
         accelerator 'Command+N'
@@ -46,6 +76,7 @@ root { |r|
           message_box(parent: r, title: 'New', message: 'New file created.')
         end
       }
+      
       menu_item(label: 'Open...', underline: 0) {
         accelerator 'Command+O'
 
@@ -53,36 +84,44 @@ root { |r|
           message_box(parent: r, title: 'Open', message: 'Opening File...')
         end
       }
+      
       menu(label: 'Open Recent', underline: 5) {
         menu_item(label: 'File 1') {
           on('command') do
             message_box(parent: r, title: 'File 1', message: 'File 1 Contents')
           end
         }
+        
         menu_item(label: 'File 2') {
           on('command') do
             message_box(parent: r, title: 'File 2', message: 'File 2 Contents')
           end
         }
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Exit', underline: 1) {
         on('command') do
           exit(0)
         end
       }
     }
+    
     menu(label: 'Edit', underline: 0) {
       menu_item(label: 'Cut', underline: 2) {
         accelerator 'Command+X'
       }
+      
       menu_item(label: 'Copy', underline: 0) {
         accelerator 'Command+C'
       }
+      
       menu_item(label: 'Paste', underline: 0) {
         accelerator 'Command+V'
       }
     }
+    
     menu(label: 'Options', underline: 0) {
       menu_item(:checkbutton, label: 'Enabled', underline: 0) {
         on('command') do
@@ -90,6 +129,7 @@ root { |r|
           @select_multiple_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
         end
       }
+      
       @select_one_menu = menu(label: 'Select One', underline: 0) {
         menu_item(:radiobutton, label: 'Option 1') {
           state 'disabled'
@@ -101,6 +141,7 @@ root { |r|
           state 'disabled'
         }
       }
+      
       @select_multiple_menu = menu(label: 'Select Multiple', underline: 0) {
         menu_item(:checkbutton, label: 'Option 4') {
           state 'disabled'
@@ -113,6 +154,26 @@ root { |r|
         }
       }
     }
+    
+    menu(label: 'Language', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+        }
+      end
+    }
+    
+    menu(label: 'Language Name', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+          compound 'left'
+        }
+      end
+    }
+    
     menu(label: 'Format', underline: 0) {
       menu(label: 'Background Color', underline: 0) {
         COLORS.each { |color_style|
@@ -123,6 +184,7 @@ root { |r|
           }
         }
       }
+      
       menu(label: 'Foreground Color', underline: 11) {
         COLORS.each { |color_style|
           menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
@@ -133,6 +195,7 @@ root { |r|
         }
       }
     }
+    
     menu(label: 'View', underline: 0) {
       menu_item(:radiobutton, label: 'Small', underline: 0) {
         accelerator 'Command+S'
@@ -141,6 +204,7 @@ root { |r|
           @label.font = {size: 25}
         end
       }
+      
       menu_item(:radiobutton, label: 'Medium', underline: 0) {
         accelerator 'Command+M'
         selection true
@@ -149,6 +213,7 @@ root { |r|
           @label.font = {size: 50}
         end
       }
+      
       menu_item(:radiobutton, label: 'Large', underline: 0) {
         accelerator 'Command+L'
         
@@ -157,7 +222,16 @@ root { |r|
         end
       }
     }
+    
+    menu(label: 'Window', underline: 0)
+    
     menu(label: 'Help', underline: 0) {
+      menu_item(:help) {
+        on('command') do
+          message_box(parent: r, title: 'Help', message: 'Help for my application.')
+        end
+      }
+      
       menu_item(label: 'Manual', underline: 0) {
         accelerator 'Command+Shift+M'
 
@@ -165,6 +239,7 @@ root { |r|
           message_box(parent: r, title: 'Manual', message: 'Manual Contents')
         end
       }
+      
       menu_item(label: 'Tutorial', underline: 0) {
         accelerator 'Command+Shift+T'
 
@@ -172,7 +247,9 @@ root { |r|
           message_box(parent: r, title: 'Tutorial', message: 'Tutorial Contents')
         end
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Report an Issue...', underline: 0) {
         on('command') do
           message_box(parent: r, title: 'Report an Issue', message: 'Reporting an issue...')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer