glimmer-dsl-tk 0.0.22 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.26

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

@@ -0,0 +1,39 @@
+# Copyright (c) 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/static_expression'
+require 'glimmer/tk/spinbox_proxy'
+
+module Glimmer
+  module DSL
+    module Tk
+      class FormatExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          super && parent.is_a?(Glimmer::Tk::SpinboxProxy) && args.size == 1 && block.nil?
+        end
+        
+        def interpret(parent, keyword, *args, &block)
+          parent.tk.format(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,10 @@ module Glimmer
     module Tk
       class MessageBoxExpression < StaticExpression
         def interpret(parent, keyword, *args, &block)
-          args.first[:parent] = args.first[:parent].tk if args.first.is_a?(Hash) && args.first[:parent].is_a?(Glimmer::Tk::RootProxy)
+          if args.first.is_a?(Hash)
+            args.first[:parent] = args.first[:parent].tk if args.first[:parent].is_a?(Glimmer::Tk::RootProxy)
+            args.first[:title] = args.first.delete(:text) if args.first.keys.include?(:text)
+          end
           ::Tk::messageBox(*args)
         end
       end

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

@@ -38,7 +38,7 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           args = [parent] + args unless parent.nil?
-          Glimmer::Tk::RootProxy.new(*args)
+          Glimmer::Tk::RootProxy.new(*args, &block)
         end
         
         def add_content(parent, keyword, *args, &block)

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

@@ -52,10 +52,3 @@ module Glimmer
 end
 
 require 'glimmer/tk/widget_proxy'
-require 'glimmer/tk/notebook_proxy'
-require 'glimmer/tk/frame_proxy'
-require 'glimmer/tk/button_proxy'
-require 'glimmer/tk/label_proxy'
-require 'glimmer/tk/list_proxy'
-require 'glimmer/tk/entry_proxy'
-require 'glimmer/tk/treeview_proxy'

data/lib/glimmer/tk/button_proxy.rb

@@ -20,6 +20,7 @@
 # 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
@@ -27,20 +28,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ButtonProxy < WidgetProxy
-      # TODO extract to a module
-      
-      def command_block=(proc)
-        tk.command(proc)
-      end
-      
-      def handle_listener(listener_name, &listener)
-        case listener_name.to_s.downcase
-        when 'command'
-          command(listener)
-        else
-          super
-        end
-      end
+      include Commandable
     end
   end
 end

data/lib/glimmer/tk/checkbutton_proxy.rb

@@ -20,25 +20,17 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/commandable'
+require 'glimmer/tk/variable_owner'
 
 module Glimmer
   module Tk
     # Proxy for Tk::Tile::Checkbutton
     #
     # Follows the Proxy Design Pattern
-    class ChecktbuttonProxy < WidgetProxy
-      def command_block=(proc)
-        tk.command(proc)
-      end
-      
-      def handle_listener(listener_name, &listener)
-        case listener_name.to_s.downcase
-        when 'command'
-          command(listener)
-        else
-          super
-        end
-      end
+    class CheckbuttonProxy < WidgetProxy
+      include Commandable
+      include VariableOwner
     end
   end
 end

data/lib/glimmer/tk/combobox_proxy.rb

@@ -0,0 +1,34 @@
+# 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'
+require 'glimmer/tk/text_variable_owner'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::Combobox
+    #
+    # Follows the Proxy Design Pattern
+    class ComboboxProxy < WidgetProxy
+      include TextVariableOwner
+    end
+  end
+end

data/lib/glimmer/tk/commandable.rb

@@ -0,0 +1,42 @@
+# 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
+    # Represents widgets that can invoke a command
+    module Commandable
+      def command_block=(proc)
+        tk.command(proc)
+      end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'command'
+          command(listener)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/tk/entry_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/text_variable_owner'
 
 module Glimmer
   module Tk
@@ -27,12 +28,31 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class EntryProxy < WidgetProxy
+      include TextVariableOwner
+    
       def validatecommand_block=(proc)
         tk.validatecommand(proc)
       end
+      
       def invalidcommand_block=(proc)
         tk.invalidcommand(proc)
       end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'change'
+          tk.textvariable.trace('write') {
+            listener.call(@tk.textvariable)
+          }
+        when 'validatecommand', 'validate'
+          self.validatecommand_block = listener
+        when 'invalidcommand', 'invalid'
+          self.invalidcommand_block = listener
+        else
+          super
+        end
+      end
+      
     end
   end
 end

data/lib/glimmer/tk/frame_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/notebook_proxy'
 
 module Glimmer
   module Tk
@@ -33,10 +34,18 @@ module Glimmer
         if parent_proxy.is_a?(NotebookProxy)
           @tab_options, args[0] = args[0].to_h.partition {|key, value| NotebookProxy::TAB_OPTIONS.include?(key.to_s)}
           @tab_options = Hash[@tab_options]
+          @tab_options[:text] = @tab_options.delete(:title) if @tab_options.keys.include?(:title)
           args.delete_at(0) if args[0].to_a.empty?
         end
         super
       end
+      
+      private
+      
+      def initialize_defaults
+        super unless @parent_proxy.is_a?(NotebookProxy)
+        self.padding = 15
+      end
     end
   end
 end

data/lib/glimmer/tk/label_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/text_variable_owner'
 
 module Glimmer
   module Tk
@@ -27,10 +28,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class LabelProxy < WidgetProxy
-      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
+      include TextVariableOwner
+      
+      FONTS_PREDEFINED = %w[default text fixed menu heading caption small_caption icon tooltip]
+      
+      def font=(value)
+        if (value.is_a?(Symbol) || value.is_a?(String)) && FONTS_PREDEFINED.include?(value.to_s.downcase)
+          @tk.font = "tk_#{value}_font".camelcase(:upper)
         else
           super
         end

data/lib/glimmer/tk/notebook_proxy.rb

@@ -27,17 +27,12 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class NotebookProxy < WidgetProxy
-      TAB_OPTIONS = ['state', 'sticky', 'padding', 'text', 'image', 'compound', 'underline']
+      TAB_OPTIONS = ['state', 'sticky', 'padding', 'text', 'title', 'image', 'compound', 'underline']
     
-      attr_reader :tab_proxies
-    
-      def initialize(*args)
-        @tab_proxies = []
-        super
-      end
+      alias tab_proxies children
     
       def post_initialize_child(child)
-        @tab_proxies << child
+        super
         @tk.add child.tk, child.tab_options
       end
     end

data/lib/glimmer/tk/radiobutton_proxy.rb

@@ -0,0 +1,46 @@
+# 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'
+require 'glimmer/tk/commandable'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::Radiobutton
+    #
+    # 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
+      
+      private
+      
+      def initialize_defaults
+        super
+        sibling_variable = sibling_radio_buttons.map(&:tk).map(&:variable).compact.first
+        tk.variable = sibling_variable.nil? ? ::TkVariable.new : sibling_variable
+      end
+    end
+  end
+end

data/lib/glimmer/tk/root_proxy.rb

@@ -31,9 +31,11 @@ module Glimmer
       DEFAULT_WIDTH = 190
       DEFAULT_HEIGHT = 95
       
-      def initialize(*args)
+      def initialize(*args, &block)
         @tk = ::TkRoot.new
         @tk.minsize = DEFAULT_WIDTH, DEFAULT_HEIGHT
+        initialize_defaults
+        post_add_content if block.nil?
       end
 
       def post_add_content
@@ -57,16 +59,6 @@ module Glimmer
         when 'iconphoto'
           args[0..-1] = [image_argument(args)]
           super
-        when 'width'
-          @width = args.first.to_i
-          self.geometry = "#{args.first.to_i}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
-        when 'height'
-          @height = args.first.to_i
-          self.geometry = "#{@width || DEFAULT_WIDTH}x#{args.first.to_i}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
-        when 'x'
-          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}#{y_sign}#{abs_y}"
-        when 'y'
-          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}"
         when 'resizable'
           if args.size == 1 && !args.first.is_a?(Array)
             self.resizable = [args.first]*2
@@ -78,52 +70,38 @@ module Glimmer
         end
       end
       
-      def get_attribute(attribute)
-        attribute = attribute.to_s
-        case attribute
-        when 'width'
-          geometry.split(REGEX_GEOMETRY)[0].to_i
-        when 'height'
-          geometry.split(REGEX_GEOMETRY)[1].to_i
-        when 'x'
-          sign_number(x_sign, geometry.split(REGEX_GEOMETRY)[2].to_i)
-        when 'y'
-          sign_number(y_sign, geometry.split(REGEX_GEOMETRY)[3].to_i)
-        else
-          super
-        end
-      end
-      
       def width
-        get_attribute(:width)
+        geometry.split(REGEX_GEOMETRY)[0].to_i
       end
       
       def height
-        get_attribute(:height)
+        geometry.split(REGEX_GEOMETRY)[1].to_i
       end
       
       def x
-        get_attribute(:x)
+        sign_number(x_sign, geometry.split(REGEX_GEOMETRY)[2].to_i)
       end
       
       def y
-        get_attribute(:y)
+        sign_number(y_sign, geometry.split(REGEX_GEOMETRY)[3].to_i)
       end
       
       def width=(value)
-        set_attribute(:width, value)
+        @width = value.to_i
+        self.geometry = "#{value.to_i}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
       end
       
       def height=(value)
-        set_attribute(:height, value)
+        @height = value.to_i
+        self.geometry = "#{@width || DEFAULT_WIDTH}x#{value.to_i}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
       end
       
       def x=(value)
-        set_attribute(:x, value)
+        self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{value.to_i > 0 ? '+' : '-'}#{value.to_i.abs}#{y_sign}#{abs_y}"
       end
       
       def y=(value)
-        set_attribute(:y, value)
+        self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{value.to_i > 0 ? '+' : '-'}#{value.to_i.abs}"
       end
       
       def handle_listener(listener_name, &listener)
@@ -176,6 +154,10 @@ module Glimmer
       def geometry_signs
         geometry.chars.select {|char| char.match(/[+-]/)}
       end
+      
+      def initialize_defaults
+        self.background = '#ececec' if OS.mac?
+      end
     end
   end
 end

data/lib/glimmer/tk/spinbox_proxy.rb

@@ -0,0 +1,52 @@
+# 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'
+require 'glimmer/tk/text_variable_owner'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::TSpinbox
+    #
+    # Follows the Proxy Design Pattern
+    class SpinboxProxy < WidgetProxy
+      include TextVariableOwner
+      
+      def command_block=(proc)
+        tk.command(proc)
+      end
+    
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'command', 'change'
+          command(&listener)
+        when 'increment', '<increment>', '<<increment>>'
+          bind('<Increment>', listener)
+        when 'decrement', '<decrement>', '<<decrement>>'
+          bind('<Decrement>', listener)
+        else
+          super
+        end
+      end
+      
+    end
+  end
+end