glimmer-dsl-tk 0.0.38 → 0.0.42

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])}}") if OS.mac?
+        elsif help? && attribute_value_hash[:command]
+          ::Tk.ip_eval("proc ::tk::mac::ShowHelp {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}") if OS.mac?
+        elsif quit? && attribute_value_hash[:command]
+          ::Tk.ip_eval("proc ::tk::mac::Quit {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}") if OS.mac?
+        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,57 @@ 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)
+          # Windows system menu does not seem to work
+#           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/tk/radiobutton_proxy.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
-require 'glimmer/tk/commandable'
 
 module Glimmer
   module Tk
@@ -28,8 +27,6 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class RadiobuttonProxy < WidgetProxy
-      include Commandable
-      
       def sibling_radio_buttons
         @parent_proxy.children.select {|child| child.is_a?(RadiobuttonProxy) && child != self}
       end

data/lib/glimmer/tk/scrollbar_frame_proxy.rb

@@ -0,0 +1,133 @@
+# 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/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Scrolledframe (#scrolledframe_tk attribute)
+    # Nested widgets go into the child site (#tk attribute or @scrolledframe_tk.child_site)
+    class ScrollbarFrameProxy < WidgetProxy
+      attr_reader :original_parent_proxy, :container_frame_proxy, :canvas_proxy, :yscrollbar_proxy, :xscrollbar_proxy
+      
+      def post_add_content
+        @tk.bind('Configure') {
+          @canvas_proxy.tk.scrollregion(@canvas_proxy.tk.bbox("all"))
+        }
+        @canvas_proxy.tk.yscrollcommand {|*args| @yscrollbar_proxy&.set(*args)}
+        @canvas_proxy.tk.xscrollcommand {|*args| @xscrollbar_proxy&.set(*args)}
+      end
+      
+      def has_attribute?(attribute, *args)
+        case attribute.to_s
+        when 'yscrollbar', 'xscrollbar'
+          true
+        else
+          container_frame_proxy.has_attribute?(attribute, *args)
+        end
+      end
+      
+      def set_attribute(attribute, *args)
+        case attribute.to_s
+        when 'yscrollbar'
+          @yscrollbar = args.first
+          if @yscrollbar == true
+            build_yscrollbar unless @yscrollbar_proxy
+          elsif @yscrollbar.is_a?(Glimmer::Tk::WidgetProxy)
+            @yscrollbar_proxy.destroy
+            build_yscrollbar(@yscrollbar)
+          else
+            @yscrollbar_proxy.destroy
+            @yscrollbar_proxy = nil
+          end
+        when 'xscrollbar'
+          @xscrollbar = args.first
+          if @xscrollbar == true
+            build_xscrollbar unless @xscrollbar_proxy
+          elsif @xscrollbar.is_a?(Glimmer::Tk::WidgetProxy)
+            @xscrollbar_proxy.destroy
+            build_xscrollbar(@xscrollbar)
+          else
+            @xscrollbar_proxy.destroy
+            @xscrollbar_proxy = nil
+          end
+        else
+          container_frame_proxy.set_attribute(attribute, *args)
+        end
+      end
+      
+      def get_attribute(attribute, *args)
+        case attribute.to_s
+        when 'show_yscrollbar'
+          @yscrollbar
+        when 'show_xscrollbar'
+          @xscrollbar
+        else
+          container_frame_proxy.get_attribute(attribute, *args)
+        end
+      end
+      
+      private
+      
+      def griddable_parent_proxy
+        @original_parent_proxy
+      end
+      
+      def griddable_proxy
+        @container_frame_proxy
+      end
+
+      def build_widget
+        @original_parent_proxy = @parent_proxy
+        @container_frame_proxy = WidgetProxy.new('frame', @parent_proxy, @args)
+        @parent_proxy = @canvas_proxy = WidgetProxy.new('canvas', @container_frame_proxy, [{width: 300, height: 300}])
+        @canvas_proxy.grid(row: 0, column: 0, row_weight: 1, column_weight: 1)
+        build_yscrollbar
+        build_xscrollbar
+        tk_widget_class = self.class.tk_widget_class_for('frame')
+        @tk = tk_widget_class.new(@canvas_proxy.tk, *args)
+        TkcWindow.new(@canvas_proxy.tk, 0, 0, :anchor => "nw", :window => @tk)
+      end
+      
+      def build_yscrollbar(scrollbar_widget_proxy = nil)
+        @yscrollbar_proxy = scrollbar_widget_proxy || WidgetProxy.new('scrollbar', @container_frame_proxy, [])
+        @yscrollbar_proxy.orient = 'vertical'
+        @yscrollbar_proxy.grid(row: 0, column: 1) unless scrollbar_widget_proxy
+        @yscrollbar_proxy.command {|*args| @canvas_proxy.tk.yview(*args)}
+      end
+      
+      def build_xscrollbar(scrollbar_widget_proxy = nil)
+        @xscrollbar_proxy = scrollbar_widget_proxy || WidgetProxy.new('scrollbar', @container_frame_proxy, [])
+        @xscrollbar_proxy.orient = 'horizontal'
+        @xscrollbar_proxy.grid(row: 1, column: 0, column_span: 2, row_weight: 0) unless scrollbar_widget_proxy
+        @xscrollbar_proxy.command {|*args| @canvas_proxy.tk.xview(*args)}
+      end
+      
+      def initialize_defaults
+        options = {}
+        options[:sticky] = 'nsew'
+        options[:column_weight] = 1 if @original_parent_proxy.children.count == 1
+        options[:row_weight] = 1 if @original_parent_proxy.children.count == 1
+        grid(options)
+      end
+    end
+  end
+end

data/lib/glimmer/tk/widget_proxy.rb

@@ -46,10 +46,13 @@ module Glimmer
         # This supports widgets in and out of basic Tk
         def tk_widget_class_for(underscored_widget_name)
           tk_widget_class_basename = underscored_widget_name.camelcase(:upper)
+          # TODO consider exposing this via Glimmer::Config
           potential_tk_widget_class_names = [
             "::Tk::Tile::#{tk_widget_class_basename}",
-            "::Tk::#{tk_widget_class_basename}",
+            "::Tk::BWidget::#{tk_widget_class_basename}",
+            "::Tk::Iwidgets::#{tk_widget_class_basename}",
             "::Tk#{tk_widget_class_basename}",
+            "::Tk::#{tk_widget_class_basename}",
             "::Glimmer::Tk::#{tk_widget_class_basename}Proxy",
           ]
           tk_widget_class = nil
@@ -79,7 +82,7 @@ module Glimmer
         @block = block
         build_widget
         # a common widget initializer
-        @parent_proxy.post_initialize_child(self)
+        @parent_proxy&.post_initialize_child(self)
         initialize_defaults
         post_add_content if @block.nil?
       end
@@ -124,6 +127,7 @@ module Glimmer
       end
 
       def tk_widget_has_attribute_setter?(attribute)
+        return true if @tk.respond_to?(attribute) && attribute != 'focus' # TODO configure exceptions via constant if needed
         result = nil
         begin
           # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now
@@ -249,7 +253,6 @@ module Glimmer
       
       def grid(options = {})
         options = options.stringify_keys
-        index_in_parent = @parent_proxy&.children&.index(self)
         options['rowspan'] = options.delete('row_span') if options.keys.include?('row_span')
         options['columnspan'] = options.delete('column_span') if options.keys.include?('column_span')
         options['rowweight'] = options.delete('row_weight') if options.keys.include?('row_weight')
@@ -262,13 +265,14 @@ module Glimmer
         options['columnminsize'] = options.delete('minwidth') if options.keys.include?('minwidth')
         options['columnminsize'] = options.delete('min_width') if options.keys.include?('min_width')
         options['columnminsize'] = options['rowminsize'] = options.delete('minsize')  if options.keys.include?('minsize')
+        index_in_parent = griddable_parent_proxy&.children&.index(griddable_proxy)
         if index_in_parent
-          TkGrid.rowconfigure(@parent_proxy.tk, index_in_parent, 'weight'=> options.delete('rowweight')) if options.keys.include?('rowweight')
-          TkGrid.rowconfigure(@parent_proxy.tk, index_in_parent, 'minsize'=> options.delete('rowminsize')) if options.keys.include?('rowminsize')
-          TkGrid.columnconfigure(@parent_proxy.tk, index_in_parent, 'weight'=> options.delete('columnweight')) if options.keys.include?('columnweight')
-          TkGrid.columnconfigure(@parent_proxy.tk, index_in_parent, 'minsize'=> options.delete('columnminsize')) if options.keys.include?('columnminsize')
+          TkGrid.rowconfigure(griddable_parent_proxy.tk, index_in_parent, 'weight'=> options.delete('rowweight')) if options.keys.include?('rowweight')
+          TkGrid.rowconfigure(griddable_parent_proxy.tk, index_in_parent, 'minsize'=> options.delete('rowminsize')) if options.keys.include?('rowminsize')
+          TkGrid.columnconfigure(griddable_parent_proxy.tk, index_in_parent, 'weight'=> options.delete('columnweight')) if options.keys.include?('columnweight')
+          TkGrid.columnconfigure(griddable_parent_proxy.tk, index_in_parent, 'minsize'=> options.delete('columnminsize')) if options.keys.include?('columnminsize')
         end
-        @tk.grid(options)
+        griddable_proxy&.tk&.grid(options)
       end
       
       def font=(value)
@@ -380,6 +384,7 @@ module Glimmer
               if observer.is_a?(Glimmer::DataBinding::ModelBinding)
                 model = observer.model
                 options_model_property = observer.property_name + '_options'
+                # TODO perform data-binding to values too
                 @tk.values = model.send(options_model_property) if model.respond_to?(options_model_property)
               end
               @tk.bind('<ComboboxSelected>') {
@@ -450,6 +455,7 @@ module Glimmer
       
       def handle_listener(listener_name, &listener)
         listener_name = listener_name.to_s
+        # TODO return a listener registration object that has a deregister method
         if listener_name == 'destroy'
           # 'destroy' is a more reliable alternative listener binding to '<Destroy>'
           @on_destroy_procs ||= []
@@ -457,22 +463,26 @@ module Glimmer
           @on_destroy_procs << listener
           @tk.bind('<Destroy>', listener)
           parent_proxy.handle_listener(listener_name, &listener) if parent_proxy
-          # TODO return a listener registration object that has a deregister method
         else
           @listeners ||= {}
           begin
             @listeners[listener_name] ||= []
-            @tk.bind(listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
+            if @tk.respond_to?(listener_name)
+              @tk.send(listener_name) { |*args| @listeners[listener_name].each {|l| l.call(*args)} } if @listeners[listener_name].empty?
+            else
+              @tk.bind(listener_name) { |*args| @listeners[listener_name].each {|l| l.call(*args)} } if @listeners[listener_name].empty?
+            end
             @listeners[listener_name] << listener
           rescue => e
             @listeners.delete(listener_name)
-            Glimmer::Config.logger.debug {"Unable to bind to #{listener_name} .. attempting to surround with <>"}
+            Glimmer::Config.logger.debug {"Unable to bind to #{listener_name} .. attempting to surround with <> ..."}
             Glimmer::Config.logger.debug {e.full_message}
-            listener_name = "<#{listener_name}" if !listener_name.start_with?('<')
-            listener_name = "#{listener_name}>" if !listener_name.end_with?('>')
-            @listeners[listener_name] ||= []
-            @tk.bind(listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
-            @listeners[listener_name] << listener
+            new_listener_name = listener_name
+            new_listener_name = "<#{new_listener_name}" if !new_listener_name.start_with?('<')
+            new_listener_name = "#{new_listener_name}>" if !new_listener_name.end_with?('>')
+            @listeners[new_listener_name] ||= []
+            @tk.bind(new_listener_name) { |*args| @listeners[new_listener_name].each {|l| l.call(*args)} } if @listeners[new_listener_name].empty?
+            @listeners[new_listener_name] << listener
           end
         end
       end
@@ -506,6 +516,16 @@ module Glimmer
       
       private
       
+      # The griddable parent widget proxy to apply grid to (is different from @tk in composite widgets like notebook or scrolledframe)
+      def griddable_parent_proxy
+        @parent_proxy
+      end
+      
+      # The griddable widget proxy to apply grid to (is different from @tk in composite widgets like notebook or scrolledframe)
+      def griddable_proxy
+        self
+      end
+      
       def build_widget
         tk_widget_class = self.class.tk_widget_class_for(@keyword)
         @tk = tk_widget_class.new(@parent_proxy.tk, *args)

data/lib/glimmer-dsl-tk.rb

@@ -27,6 +27,8 @@ require 'glimmer'
 require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'
 require 'tk'
+#require 'tkextlib/bwidget' # does not work on Windows
+#require 'tkextlib/iwidgets' # does not work on Windows
 require 'os'
 require 'facets/hash/symbolize_keys'
 require 'facets/string/underscore'
@@ -37,10 +39,20 @@ 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
+
+Tk::Tile::Style.theme_use 'alt' if OS.linux?
+
 ::TkOption.add '*tearOff', 0
+
+class ::Tk::TkSysMenu_Window < Tk::Menu
+  include Tk::SystemMenu
+  SYSMENU_NAME = 'window'
+end

data/samples/elaborate/meta_sample.rb

@@ -130,6 +130,16 @@ class MetaSample
         grid row: 0, column: 1, column_weight: 1
         value File.read(file_path_for(selected_sample))
       }
+      
+      @yscrollbar = scrollbar {
+        grid row: 0, column: 2
+      }
+      @code_text.yscrollbar @yscrollbar
+      
+      @xscrollbar = scrollbar {
+        grid row: 1, column: 1, column_span: 2
+      }
+      @code_text.xscrollbar @xscrollbar
     }
     @root.open
   end

data/samples/hello/hello_button.rb

@@ -47,7 +47,7 @@ class HelloButton
           default 'active'
           focus true
           
-          command {
+          on('command') {
             self.count += 1
           }
         }
@@ -64,7 +64,7 @@ class HelloButton
         button {
           image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
           
-          command {
+          on('command') {
             message_box(title: 'Image Button', message: 'Image Button Clicked!')
           }
         }
@@ -81,10 +81,10 @@ 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 {
+            on('command') {
               message_box(title: 'Text Image Button', message: 'Text Image Button Clicked!', detail: "(#{compound_option})")
             }
           }

data/samples/hello/hello_checkbutton.rb

@@ -1,4 +1,4 @@
-`# Copyright (c) 2020-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