wx_sugar 0.1.1 → 0.1.2

data/LICENCE

@@ -0,0 +1,20 @@
+WxSugar
+Copyright (c) 2006 Alex Fenton
+
+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.

data/lib/wx_sugar/all.rb

@@ -50,7 +50,14 @@
 # [menu.rb] 
 #  Create and update menus without a mess of system ids
 
+
 %w[ accessors delayed_constructors event_connector itemdata 
     keyword_constructors layout menu wx_classes ].each do | ext_feature |
   require 'wx_sugar/' + ext_feature    
 end 
+
+begin
+  require 'wx_sugar/version'
+rescue LoadError
+  WxSugar::VERSION = ''
+end

data/lib/wx_sugar/event_connector.rb

@@ -12,7 +12,7 @@
 # pass the argument +:click+
 #
 # The parameter +source+ is the widget whose events should be listened
-# for. This might be a particular button. If no +source+ is specified,
+# for. This might be a particular button. If +source+ is set to *nil*,
 # and lots of widgets might generate this kind of event (for example, if
 # you have multiple buttons), it assumes that *ANY* button's clicking
 # should be handled.

data/lib/wx_sugar/layout.rb

@@ -42,9 +42,9 @@
 #  ...
 #  panel = Wx::Panel.new(parent, -1) # create the container
 #  panel.arrange_horizontally(:padding => 4) # specify layout strategy
-#  panel.add( Wx::Checkbox.new(panel, -1, 'item A') ) # add item,
-#  panel.add( Wx::Checkbox.new(panel, -1, 'item B') ) # another,
-#  panel.add( Wx::Checkbox.new(panel, -1, 'item C') ) # and another
+#  panel.add( Wx::CheckBox.new(panel, -1, 'item A') ) # add item,
+#  panel.add( Wx::CheckBox.new(panel, -1, 'item B') ) # another,
+#  panel.add( Wx::CheckBox.new(panel, -1, 'item C') ) # and another
 
 require 'wx_sugar/class_definitions'
 
@@ -96,9 +96,10 @@ module Arranger
       yield(self)
       @current_sizer = superior_sizer
       proportion = layout[:proportion] || 0
+      this_padding = padding || 0
       superior_sizer.add( a_sizer, proportion, 
                           Wx::EXPAND|Wx::ALL|Wx::ADJUST_MINSIZE,
-                         padding)
+                         this_padding)
 
       if layout[:padding]
         @padding = old_padding

data/lib/wx_sugar/version.rb

@@ -0,0 +1,3 @@
+module WxSugar
+  VERSION = '0.1.2'
+end

data/lib/wx_sugar/wx_classes/colour.rb

@@ -0,0 +1,45 @@
+# extensions to Wx::Colour
+class Wx::Colour
+
+  # Create a new Colour from the hex-string +hex_str+, which should be a six-
+  # character colour RGB specification. The hash character '#' may optionally
+  # be prepended to the string, and will be ignored.
+  def self.from_hex(hex_str)
+    unless hex_str =~ /\A#?[0-9A-F]{6}\z/i
+      raise ArgumentError,
+            "Invalid colour string #{hex_str} received, " +
+            "should be six-char hexadecimal RGB"
+    end
+    components = hex_str.scan(/[0-9A-F]{2}/i).map { | x | Integer("0x#{x}") }
+    new(*components)
+  end
+
+  # Returns the colour as a six character hexadecimal string (as used in 
+  # HTML/CSS for example).  
+  def to_hex
+    [ :red, :green, :blue ].inject('') do | hex_str, component |
+      hex_str << sprintf('%02X', send(component) )
+    end
+  end
+
+  # Create a new colour by mixing +self_parts+ of +self+ with
+  # +other_parts+ of other. The new colour is produced by applying the
+  # following averaging formula to the red, green and blue components
+  # of each colour
+  # 
+  #   ( colour_1 * conc_1 ) + ( colour_2 * conc_2 )
+  #         --------------------------
+  #              conc_1 + conc_2
+  #
+  def mix(other, self_parts = 1, other_parts = 1)
+    return self if self_parts.zero? && other_parts.zero?
+    rgb = [ :red, :green, :blue ].map do | component |
+      mix = self.send(component) * self_parts
+      mix += other.send(component) * other_parts 
+      mix = mix.to_f
+      mix /= self_parts + other_parts
+      mix.to_i
+    end
+    Wx::Colour.new(*rgb)
+  end
+end

data/lib/wx_sugar/wx_classes/window.rb

@@ -0,0 +1,14 @@
+# extensions to Wx::Window
+class Wx::Window
+  # Returns the window's current size as a two element array
+  def get_size_xy
+    size = get_size
+    return size.get_width, size.get_height
+  end
+
+  # Returns the window's current position as a two-element array.
+  def get_position_xy
+    pos = get_position
+    return pos.x, pos.y
+  end
+end

data/samples/sugar-sample.rb

@@ -0,0 +1,76 @@
+require 'wx'
+require 'wx_sugar/all'
+
+class MyButton < Wx::Button
+  def on_button()
+    p "clicked my button"
+  end
+end
+
+class SugaryFrame < Wx::Frame
+  def initialize(*args)
+    super
+    # binds evt_close automatically to self#on_close
+    listen(:close)
+
+    arrange_vertically(:padding => 5)
+    # This panel and contents should expand to fit
+    add( Wx::Panel, :proportion => 1 ) do | panel |
+      # a text control
+      panel.background_colour = Wx::Colour.new(200, 150, 100) 
+      panel.add( Wx::TextCtrl[ :value => 'initial value', 
+                               :style => Wx::TE_MULTILINE,
+                               :size  => [200, 300]  ] )
+    end
+
+    # use a nested grid sizer to arrange bottom area
+    arrange_grid( :cols => 2, :rows => 2, :proportion => 0,
+                  :vgap => 2, :minsize => true, :padding => 1 ) do
+      # a custom button subclass
+      add( MyButton[ :label => 'baz' ], :proportion => 1 ) do | button |
+        listen(:button, button, :on_baz_button)
+      end
+
+      # a drop down
+      choices = %w[ nasty nice ]
+      add( Wx::Choice[ :choices => choices ], :padding => 4)
+
+      # another button
+      add( Wx::Button[ :label => 'foo' ] ) do | button |
+        # handle using a method
+        listen(:button, button, :on_foo_button)
+        # handle using a block
+        listen(:button, button) { | e | p "clicked in a block"; e.skip }
+      end
+      add( Wx::TextCtrl[ :value => 'foo' ], :align => 'right' )
+    end
+  end
+
+  def on_close(event)
+    puts "CLOSING"
+    event.skip()
+  end
+
+  def on_button(event)
+    p event
+  end
+
+  def on_foo_button(e)
+    p "FOO"
+    e.skip()
+  end
+
+  # you aren't required to receive the event
+  def on_baz_button()
+    p "baZ"
+  end
+end
+
+class SugaryApp < Wx::App
+  def on_init
+    frame = SugaryFrame.new( nil, :title => "Arranger Application" )
+    frame.show()
+  end
+end
+
+SugaryApp.new.main_loop()

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: wx_sugar
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-09-15
+  version: 0.1.2
+date: 2006-10-19
 summary: Syntax extensions for WxRuby.
 require_paths: 
   - lib
@@ -27,6 +27,7 @@ platform: ruby
 authors: 
   - Alex Fenton
 files: 
+  - lib/wx_sugar
   - lib/wx_sugar/accessors.rb
   - lib/wx_sugar/all.rb
   - lib/wx_sugar/class_definitions.rb
@@ -37,7 +38,13 @@ files:
   - lib/wx_sugar/keyword_constructors.rb
   - lib/wx_sugar/layout.rb
   - lib/wx_sugar/menu.rb
+  - lib/wx_sugar/version.rb
+  - lib/wx_sugar/wx_classes
   - lib/wx_sugar/wx_classes.rb
+  - lib/wx_sugar/wx_classes/colour.rb
+  - lib/wx_sugar/wx_classes/window.rb
+  - samples/sugar-sample.rb
+  - LICENCE
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []