glimmer-dsl-tk 0.0.24 → 0.0.28

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.28

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/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/tk/drag_and_drop_extension.rb

@@ -0,0 +1,112 @@
+require "json"
+
+module Glimmer
+  module Tk
+    class WidgetProxy
+      attr_accessor :on_drag_motion_block
+
+      def drag_source=(value)
+        @drag_source = value
+        if @drag_source
+          make_draggable
+        else
+          make_non_draggable
+        end
+      end
+
+      def on_drag_start_block=(block)
+        @on_drag_start_block = block
+        make_draggable
+      end
+
+      def on_drop_block=(value)
+        @on_drop_block = value
+        self.tk.bind("<DropEvent>", proc { |tk_event|
+          drop_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          @on_drop_block.call(drop_event) if self.tk == drop_event.target
+        })
+        self.tk.bind("<DropCheckEvent>", proc { |tk_event|
+          drop_check_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          drop_check_event.source.event_generate("<DropAcceptedEvent>")
+        })
+      end
+
+      def textvariable_defined?
+        tk_widget_has_attribute_setter?(:textvariable) && !tk.textvariable.nil?
+      end
+
+      def make_draggable
+        drag_event = nil
+        bind("<DropAcceptedEvent>", proc { |event| drag_event.drop_accepted = true })
+        bind("B1-Motion", proc { |tk_event|
+          if drag_event.nil?
+            tooltip = TkToplevel.new(root).overrideredirect(1) #create tooltip window to display dragged data
+            tooltip.geometry("+#{tk_event.x_root + 10}+#{tk_event.y_root - 2}")
+            drag_event = DragAndDropEvent.new(self.tk, nil, tooltip, tk_event.x_root, tk_event.y_root, nil, false)
+            if @drag_source
+              tk_event.widget.configure(:cursor => "hand2")
+              # Default data to drag is text
+              drag_event.data = if textvariable_defined? then tk.textvariable.value elsif has_attribute?(:text) then tk.text end
+              TkLabel.new(tooltip) { text drag_event.data }.pack
+            elsif !@on_drag_start_block.nil?
+              @on_drag_start_block.call(drag_event)
+              TkLabel.new(tooltip) { text drag_event.data }.pack if tooltip.winfo_children().length == 0
+            end
+          else
+            drag_event.x_root, drag_event.y_root = tk_event.x_root, tk_event.y_root
+            drag_event.drop_accepted = false
+            move_over_widget = tk_event.widget.winfo_containing(tk_event.x_root, tk_event.y_root)
+            drag_event.target = move_over_widget
+            move_over_widget.event_generate("<DropCheckEvent>", :data => drag_event.to_json)
+            if @on_drag_motion_block.nil?
+              # Default motion behavior:
+              # 1.Change cursor to show whether text can be dropped.
+              # 2.Move tooltip with dragged data.
+              if drag_event.drop_accepted
+                tk_event.widget.configure(:cursor => "hand1")
+              else
+                tk_event.widget.configure(:cursor => "hand2")
+              end
+              drag_event.tooltip.geometry("+#{tk_event.x_root + 10}+#{tk_event.y_root - 2}")
+            else
+              @on_drag_motion_block.call(drag_event)
+            end
+          end
+        })
+        bind("ButtonRelease-1", proc { |tk_event|
+          if drag_event
+            drag_event.target = tk_event.widget.winfo_containing(tk_event.x_root, tk_event.y_root)
+            drag_event.source.configure(:cursor => "")
+            drag_event.target.event_generate("<DropEvent>", :data => drag_event.to_json)
+            drag_event.tooltip.destroy
+            drag_event = nil
+          end
+        })
+      end
+
+      def make_non_draggable
+        @tk.bind_remove("B1-Motion")
+        @tk.bind_remove("ButtonRelease-1")
+        @tk.bind_remove("<DropAcceptedEvent>")
+      end
+
+      DragAndDropEvent = Struct.new(:source, :target, :tooltip, :x_root, :y_root, :data, :drop_accepted) do
+        def as_json(*)
+          klass = self.class.name
+          {
+            JSON.create_id => klass,
+            "v" => [values[0].object_id, values[1].object_id, values[2].object_id].concat(values.drop 3),
+          }
+        end
+
+        def to_json(*args)
+          as_json.to_json(*args)
+        end
+
+        def self.json_create(object)
+          new(*[ObjectSpace._id2ref(object["v"][0]), ObjectSpace._id2ref(object["v"][1]), ObjectSpace._id2ref(object["v"][2])].concat(object["v"].drop 3))
+        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
@@ -38,6 +39,13 @@ module Glimmer
         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

@@ -29,15 +29,6 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class LabelProxy < WidgetProxy
       include TextVariableOwner
-      
-      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/radiobutton_proxy.rb

@@ -31,7 +31,7 @@ module Glimmer
       include Commandable
       
       def sibling_radio_buttons
-        @parent_proxy.children.select {|child| child.is_a?(RadiobuttonProxy)}
+        @parent_proxy.children.select {|child| child.is_a?(RadiobuttonProxy) && child != self}
       end
       
       private

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