rubygoo 0.0.6 → 0.0.7

data/History.txt

@@ -25,3 +25,15 @@
   * small rendering bugs fixed
   * added relative positioning of widgets
   * added RadioButton and RadioGroup
+
+=== 0.0.7 / 2008-12-6
+
+* Getting closer to a 1.0 release
+  * added none options in themes
+  * added Icon widget
+  * cleaned up internals
+  * added show/hide and enable/disable to widgets
+  * added :label option to checkboxes
+  * added mouse_enter/exit events and hover states for button/checkboxes
+  * new color theme from nedric
+  * bug fixes

data/Manifest.txt

@@ -3,9 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 TODO
-docs/.DS_Store
 docs/Picture 1.png
-docs/ui/.DS_Store
 docs/ui/UI.hpp
 docs/ui/abutton.png
 docs/ui/background.png
@@ -28,6 +26,7 @@ lib/rubygoo/css_colors.rb
 lib/rubygoo/dialog.rb
 lib/rubygoo/goo_color.rb
 lib/rubygoo/goo_event.rb
+lib/rubygoo/icon.rb
 lib/rubygoo/label.rb
 lib/rubygoo/mouse_cursor.rb
 lib/rubygoo/radio_button.rb

data/README.txt

@@ -16,114 +16,114 @@ Rubygoo is a theme-able gui framework for use with rubygame and soon gosu. It ha
 * modal dialogs
 
 == SYNOPSIS:
-require 'rubygems'
-$: << './lib'
-$: << File.dirname(__FILE__)
-require 'rubygoo'
-require 'rubygame'
-require 'create_gui'
-include Rubygame
-include Rubygoo
 
-if $0 == __FILE__
+  require 'rubygems'
+  $: << './lib'
+  $: << File.dirname(__FILE__)
+  require 'rubygoo'
+  require 'rubygame'
+  include Rubygame
+  include Rubygoo
 
-  screen = Screen.new [600,480]
-  screen.show_cursor = false
+  if $0 == __FILE__
 
-  factory = AdapterFactory.new
-  render_adapter = factory.renderer_for :rubygame, screen
-  icon = Surface.load File.dirname(__FILE__) + "/icon.png"
+    screen = Screen.new [600,480]
+    screen.show_cursor = false
 
-  app = App.new :renderer => renderer
+    factory = AdapterFactory.new
+    render_adapter = factory.renderer_for :rubygame, screen
+    icon = Surface.load File.dirname(__FILE__) + "/icon.png"
 
-  label = Label.new "click the button to set the time", :x=>20, :y=>30
+    app = App.new :renderer => render_adapter
 
-  button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20, :icon => icon
-  button.on :pressed do |*opts|
-    label.set_text(Time.now.to_s)
-  end
+    label = Label.new "click the button to set the time", :x=>20, :y=>30
 
-  check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
-  check.on :checked do
-    label.set_text("CHECKED [#{check.checked?}]")
-  end
+    button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20, :icon => icon
+    button.on :pressed do |*opts|
+      label.set_text(Time.now.to_s)
+    end
 
-  text_field = TextField.new "initial text", :x => 70, :y => 170, :max_length => 20, :min_length => 6
+    check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
+    check.on :checked do
+      label.set_text("CHECKED [#{check.checked?}]")
+    end
 
-  text_field.on_key K_RETURN, K_KP_ENTER do |evt|
-    puts "BOO-YAH"
-  end
+    text_field = TextField.new "initial text", :x => 70, :y => 170, :max_length => 20, :min_length => 6
 
-  modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
-  modal_button.on :pressed do |*opts|
-    modal = Dialog.new :modal => app, :x=>60, :y=>110, :w=>250, :h=>250
+    text_field.on_key K_RETURN, K_KP_ENTER do |evt|
+      puts "BOO-YAH"
+    end
 
-    modal.add Label.new("Message Here", :x=>20, :y=>70, :x_pad=>20, :y_pad=>20, :relative=>true)
+    modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
+    modal_button.on :pressed do |*opts|
+      modal = Dialog.new :modal => app, :x=>60, :y=>110, :w=>250, :h=>250
 
-    ok_butt = Button.new("OK", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20,:relative=>true)
-    ok_butt.on :pressed do |*opts|
-      app.remove_modal(modal)
-    end
-    modal.add ok_butt
+      modal.add Label.new("Message Here", :x=>20, :y=>70, :x_pad=>20, :y_pad=>20, :relative=>true)
 
-    modal.show
-  end
+      ok_butt = Button.new("OK", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20,:relative=>true)
+      ok_butt.on :pressed do |*opts|
+        app.remove_modal(modal)
+      end
+      modal.add ok_butt
+
+      modal.display
+    end
 
-  grp = RadioGroup.new :x=>10, :y=>380, :x_pad=>20, :y_pad=>20, :w=> 500, :h=>80
-  grp_label = Label.new "RadioGroups are fun!", :x=>40, :y=>10, :w=>20, :h=>20, :relative=>true
-  grp_radio_one = RadioButton.new :x=>40, :y=>40, :w=>20, :h=>20, :relative=>true
-  grp_radio_two = RadioButton.new :x=>90, :y=>40, :w=>20, :h=>20, :relative=>true
-  grp_radio_three = RadioButton.new :x=>140, :y=>40, :w=>20, :h=>20, :relative=>true
-
-  grp.add grp_label, grp_radio_one, grp_radio_two, grp_radio_three
-
-  # implicit tab ordering based on order of addition, can
-  # specify if you want on widget creation
-
-  # can add many or one at a time
-  app.add text_field, label, button, modal_button, grp
-  app.add check
-
-  #  pulldown = Pulldown.new {:x=>70, :y=>80}
-  #  pulldown.on :changed do |*opts|
-  #    label.set_text(opts.first)
-  #  end
-  #
-  #  app.add pulldown
-
-  app_adapter = factory.app_for :rubygame, app
-  
-  # rubygame standard stuff below here
-  queue = EventQueue.new
-  queue.ignore = [
-    ActiveEvent, JoyAxisEvent, JoyBallEvent, JoyDownEvent,
-    JoyHatEvent, JoyUpEvent, ResizeEvent 
-  ]
-  clock = Clock.new
-  clock.target_framerate = 20
-
-  catch(:rubygame_quit) do
-    loop do
-      queue.each do |event|
-        case event
-        when KeyDownEvent
-          case event.key
-          when K_ESCAPE
+    grp = RadioGroup.new :x=>10, :y=>380, :x_pad=>20, :y_pad=>20, :w=> 500, :h=>80
+    grp_label = Label.new "RadioGroups are fun!", :x=>40, :y=>10, :w=>20, :h=>20, :relative=>true
+    grp_radio_one = RadioButton.new :x=>40, :y=>40, :w=>20, :h=>20, :relative=>true
+    grp_radio_two = RadioButton.new :x=>90, :y=>40, :w=>20, :h=>20, :relative=>true
+    grp_radio_three = RadioButton.new :x=>140, :y=>40, :w=>20, :h=>20, :relative=>true
+
+    grp.add grp_label, grp_radio_one, grp_radio_two, grp_radio_three
+
+    # implicit tab ordering based on order of addition, can
+    # specify if you want on widget creation
+
+    # can add many or one at a time
+    app.add text_field, label, button, modal_button, grp
+    app.add check
+
+    #  pulldown = Pulldown.new {:x=>70, :y=>80}
+    #  pulldown.on :changed do |*opts|
+    #    label.set_text(opts.first)
+    #  end
+    #
+    #  app.add pulldown
+
+    app_adapter = factory.app_for :rubygame, app
+    
+    # rubygame standard stuff below here
+    queue = EventQueue.new
+    queue.ignore = [
+      ActiveEvent, JoyAxisEvent, JoyBallEvent, JoyDownEvent,
+      JoyHatEvent, JoyUpEvent, ResizeEvent 
+    ]
+    clock = Clock.new
+    clock.target_framerate = 20
+
+    catch(:rubygame_quit) do
+      loop do
+        queue.each do |event|
+          case event
+          when KeyDownEvent
+            case event.key
+            when K_ESCAPE
+              throw :rubygame_quit
+            end
+          when QuitEvent
             throw :rubygame_quit
           end
-        when QuitEvent
-          throw :rubygame_quit
+
+          # pass on our events to the GUI
+          app_adapter.on_event event
         end
 
-        # pass on our events to the GUI
-        app_adapter.on_event event
+        app_adapter.update clock.tick
+        app_adapter.draw render_adapter
       end
-
-      app_adapter.update clock.tick
-      app_adapter.draw render_adapter
     end
   end
-end
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -4,16 +4,16 @@ require 'rubygems'
 require 'hoe'
 
 module Rubygoo
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end
 Hoe.new('rubygoo', Rubygoo::VERSION) do |p|
   p.developer('Shawn Anderson', 'shawn42@gmail.com')
   p.author = "Shawn Anderson"
   p.description = "GUI library for use with Gosu or Rubygame"
-  p.email = 'boss@topfunky.com'
-  p.summary = "Beautiful graphs for one or multiple datasets."
+  p.email = 'shawn42@gmail.com'
+  p.summary = "Easy to use gui library for Rubygame or Gosu."
   p.url = "http://rubygoo.googlecode.com"
-  p.changes = p.paragraphs_of('History.txt', 6..7).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 8..8).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root
   p.extra_deps << ['constructor']
   p.extra_deps << ['publisher']

data/TODO

@@ -1,8 +1,10 @@
 TODO
+ - enabled?/disabled? effect on tabbing?
+ - add show/hide effect on tabbing?
+ - tool tips
+
  - KEYTOASCII in gosu adapter
  - image icons for buttons
    - create GooImage for agnostic access to image sizes, have renderer handle loading of images?
- - double-check the tab focus stuff on modal dialogs (tab focus of containers?)
-   - can still tab through other widgets when modal dialog is up
  - make clicking on a component focus it
- - add more listener types (when mouse_enter, mouse_leave, mouse_click, focus, key_pressed...)
+ - add key-call backs (alt-h, shift-L, ESC)

data/lib/rubygoo/app.rb

@@ -1,8 +1,13 @@
+require 'publisher'
+
 module Rubygoo
   class App < Container
+    extend Publisher
+
+    can_fire :evented
 
     DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes"),:mouse_cursor => true}
-    attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer, :tab_groups
+    attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer, :tab_groups, :mouse
 
     def initialize(opts={})
       merged_opts = DEFAULT_PARAMS.merge opts
@@ -39,8 +44,8 @@ module Rubygoo
 
     def draw(screen)
       @renderer.start_drawing
-      super @renderer
-      @mouse.draw @renderer if @mouse_cursor
+      _draw @renderer
+      @mouse._draw @renderer if @mouse
       @renderer.finish_drawing
     end
 
@@ -65,9 +70,10 @@ module Rubygoo
     end
 
     def on_event(event)
+      fire :evented, event
       case event.event_type
       when :key_released
-        modal_keyboard_call :key_released, event
+        modal_keyboard_call :_key_released, event
       when :key_pressed
         case event.data[:key]
         when K_TAB
@@ -77,10 +83,10 @@ module Rubygoo
             focus_forward
           end
         else
-          modal_keyboard_call :key_pressed, event
+          modal_keyboard_call :_key_pressed, event
         end
       when :mouse_down
-        modal_mouse_call :mouse_down, event
+        modal_mouse_call :_mouse_down, event
         # TODO: I know this is simplistic and doesn't account for which button
         # is being pressed/released
         @mouse_start_x = event.data[:x]
@@ -89,9 +95,11 @@ module Rubygoo
         x = event.data[:x]
         y = event.data[:y]
         if @mouse_start_x == x and @mouse_start_y == y
-          modal_mouse_call :mouse_up, event
+          modal_mouse_call :_mouse_up, event
         else
-          modal_mouse_call :mouse_drag, event
+          event.data[:start_x] = @mouse_start_x
+          event.data[:start_y] = @mouse_start_y
+          modal_mouse_call :_mouse_drag, event
         end
         @mouse_start_x = nil
         @mouse_start_y = nil
@@ -99,11 +107,13 @@ module Rubygoo
         x = event.data[:x]
         y = event.data[:y]
         if @mouse_start_x
-          modal_mouse_call :mouse_dragging, event
+          event.data[:start_x] = @mouse_start_x
+          event.data[:start_y] = @mouse_start_y
+          modal_mouse_call :_mouse_dragging, event
         else
-          modal_mouse_call :mouse_motion, event
+          modal_mouse_call :_mouse_motion, event
         end
-        @mouse.mouse_motion event if @mouse_cursor
+        @mouse._mouse_motion event if @mouse
       end
     end
 
@@ -128,8 +138,8 @@ module Rubygoo
     # distribute our mouse events to our modals first
     def modal_mouse_call(meth, event)
       if @modal_widgets.empty?
-        @widgets.each do |w|
-          w.send meth, event if w.contains? [event.data[:x],event.data[:y]] 
+        @widgets.select{|w|w.enabled? and (w.contains? event.data[:x],event.data[:y] or meth == :_mouse_motion) }.each do |w|
+          w.send meth, event 
         end
       else
         @modal_widgets.last.send meth, event
@@ -139,13 +149,18 @@ module Rubygoo
     # distribute our keyboard events to our modals first
     def modal_keyboard_call(meth, event)
       if @modal_widgets.empty?
-        @widgets.each do |w|
-          w.send meth, event if w.focussed?
+        @widgets.select{|w|w.enabled? and w.focussed?}.each do |w|
+          w.send meth, event 
         end
       else
         @modal_widgets.last.send meth, event
       end
     end
 
+    def update(time)
+      _update(time)
+    end
+      
+
   end
 end

data/lib/rubygoo/button.rb

@@ -11,13 +11,18 @@ module Rubygoo
 
     def added()
       font = theme_property :font
-      @font_size = theme_property :font_size
+      @font_size = @opts[:font_size]
+      @font_size ||= theme_property :font_size 
       @color = theme_property :color
       @bg_color = theme_property :bg_color
       @border_color = theme_property :border_color
       @focus_color = theme_property :focus_color
+      @hover_color = theme_property :hover_color
+      @disabled_color = theme_property :disabled_color
+
       @font_file = File.join(@app.theme_dir,font)
       @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color
+
       @w = @rendered_text.width+2*@x_pad
       @h = @rendered_text.height+2*@y_pad
       @x = @x - @x_pad
@@ -59,6 +64,15 @@ module Rubygoo
       if @border_color
         adapter.draw_box x1, y1, x2, y2, @border_color
       end
+
+      if mouse_over? and @hover_color
+        adapter.fill x1, y1, x2, y2, @hover_color
+      end
+
+      if @disabled_color and !enabled?
+        adapter.fill x1, y1, x2, y2, @disabled_color
+      end
+
       if @icon
         # TODO center icon
         ix = x1#+((x2-x1)-@icon.w)

data/lib/rubygoo/check_box.rb

@@ -1,20 +1,45 @@
+require 'label'
 module Rubygoo
   class CheckBox < Widget
     attr_accessor :checked
     can_fire :checked
+    DEFAULT_PARAMS = {:align=>:right}
     def initialize(opts={})
+      opts = DEFAULT_PARAMS.merge opts
       super opts
+      @checked = opts[:checked]
+
+      # only supports label on the right
+      # TODO maybe I should do this in added
+      @label_text = opts[:label]
+      @label_alignment = opts[:align]
     end
 
     def added()
-      @checked = false
       @color = theme_property :color
       @bg_color = theme_property :bg_color
       @border_color = theme_property :border_color
       @focus_color = theme_property :focus_color
       @checked_color = theme_property :checked_color
+      @hover_color = theme_property :hover_color
 
       @rect = Rect.new [@x-@x_pad,@y-@y_pad,@w+2*@x_pad,@h+2*@y_pad]
+      unless @label_text.nil? or @label_text.empty?
+        @label = Label.new @label_text, :x=>0,:y=>0, :relative=>@relative, :visible=>false
+        @parent.add @label
+
+        case @label_alignment
+        when :right
+          lx = @x+2*@x_pad+@w
+          ly = @y
+        when :left
+          ly = @y
+          lx = @x-2*@x_pad-@label.w
+        end
+        @label.x = lx
+        @label.y = ly
+        @label.show
+      end
     end
 
     def checked?()
@@ -77,6 +102,10 @@ module Rubygoo
         adapter.fill cx1, cy1, cx2, cy2, @checked_color
       end
 
+      if mouse_over? and @hover_color
+        adapter.fill x1, y1, x2, y2, @hover_color
+      end
+
       if @border_color
         adapter.draw_box x1, y1, x2, y2, @border_color
       end

data/lib/rubygoo/container.rb

@@ -1,7 +1,5 @@
-require 'publisher'
 module Rubygoo
   class Container < Widget
-    extend Publisher
     attr_accessor :widgets, :bg_color, :rect, :queued_widgets
 
     def initialize(opts={})
@@ -64,7 +62,7 @@ module Rubygoo
     end
 
     # draw ourself and our children
-    def draw(adapter)
+    def _draw(adapter)
       # any container specific code here (border_colors?)
       if @bg_color
         if app == self
@@ -77,61 +75,68 @@ module Rubygoo
           adapter.fill x1, y1, x2, y2, @bg_color
         end
       end
+      draw adapter unless app == self
 
       # draw kiddies 
-      @widgets.each do |w|
-        w.draw adapter
+      @widgets.select{|w|w.visible?}.each do |w|
+        w._draw adapter
       end
     end
 
     # called when there is a mouse motion
-    def mouse_motion(event)
-      @widgets.each do |w|
-        w.mouse_motion event #if w.contains? [event.data[:x],event.data[:y]] 
+    def _mouse_motion(event)
+      mouse_motion event
+      @widgets.select{|w|w.enabled?}.each do |w|
+        w._mouse_motion event
       end
     end
 
     # called when there is a mouse click
-    def mouse_down(event)
-      @widgets.each do |w|
-        w.mouse_down event if w.contains? [event.data[:x],event.data[:y]] 
+    def _mouse_down(event)
+      mouse_down event
+      @widgets.select{|w|w.enabled? and w.contains? event.data[:x],event.data[:y] }.each do |w|
+        w._mouse_down event
       end
     end
 
     # called when there is a mouse release
-    def mouse_up(event)
-      @widgets.each do |w|
-        w.mouse_up event if w.contains? [event.data[:x],event.data[:y]] 
+    def _mouse_up(event)
+      mouse_up event
+      @widgets.select{|w| w.contains? event.data[:x],event.data[:y] and w.enabled?}.each do |w|
+        w._mouse_up event 
       end
     end
 
     # called when there is a mouse release after dragging
-    def mouse_drag(event)
-      @widgets.each do |w|
-        w.mouse_drag event if w.contains? [event.data[:x],event.data[:y]] 
+    def _mouse_drag(event)
+      mouse_drag event
+      @widgets.select{|w| w.contains? event.data[:x],event.data[:y] and w.enabled?}.each do |w|
+        w._mouse_drag event
       end
     end
 
     # pass on the key press to our widgets
-    def key_pressed(event)
-      @widgets.each do |w|
-        w.key_pressed event if w.focussed?
+    def _key_pressed(event)
+      key_pressed event
+      @widgets.select{|w| w.enabled? and w.focussed?}.each do |w|
+        w._key_pressed event
       end
     end
 
     # pass on the key release to our widgets
-    def key_released(event)
-      @widgets.each do |w|
-        w.key_released event if w.focussed?
+    def _key_released(event)
+      key_released event
+      @widgets.select{|w| w.enabled? and w.focussed?}.each do |w|
+        w._key_released event 
       end
     end
 
-
     # called each update cycle with the amount of time that has passed.  useful
     # for animations, etc
-    def update(time)
-      @widgets.each do |w|
-        w.update time
+    def _update(time)
+      update time unless app == self
+      @widgets.select{|w|w.enabled?}.each do |w|
+        w._update time
       end
     end
 

data/lib/rubygoo/css_colors.rb

@@ -1,7 +1,7 @@
 
 module Rubygoo
   # colors from: http://www.w3schools.com/css/css_colornames.asp
-  CSS_COLORS = {
+  new_colors = {
     :AliceBlue => [240,248,255,255],
     :AntiqueWhite => [250,235,215,255],
     :Aqua => [0,255,255,255],
@@ -150,4 +150,5 @@ module Rubygoo
     :Yellow => [255,255,0],
     :YellowGreen => [154,205,50,255]
   }
+  COLORS.merge! new_colors
 end

data/lib/rubygoo/dialog.rb

@@ -1,9 +1,8 @@
 module Rubygoo
   class Dialog < Container
 
-    def initialize(opts, &close_callback)
+    def initialize(opts)
       super opts
-      @close_callback = close_callback if block_given?
       @modal_target = opts[:modal]
     end
     
@@ -15,8 +14,6 @@ module Rubygoo
 
       @border_color = theme_property :border_color
       @focus_color = theme_property :focus_color
-
-      @rect = Rect.new [@x-@x_pad,@y-@y_pad,@w+2*@x_pad,@h+2*@y_pad]
     end
 
     def modal?()
@@ -25,10 +22,15 @@ module Rubygoo
 
     # show the dialog by adding it to the @modal_target and
     # intercepting all of its events
-    def show()
+    def display()
       @modal_target.add_modal self
     end
 
+    # close this modal dialog
+    def close()
+      @modal_target.remove_modal self
+    end
+
   end
 end
 

data/lib/rubygoo/goo_color.rb

@@ -1,5 +1,7 @@
-require 'css_colors'
 module Rubygoo
+  COLORS = {} unless const_defined? 'COLORS'
+  require 'css_colors'
+
   # is an rbga color
   class GooColor
     attr_accessor :r,:g,:b,:a
@@ -7,10 +9,11 @@ module Rubygoo
     @r,@g,@b,@a = r,g,b,a 
     end
 
-    def self.css_color(sym, alpha=nil)
-      color = CSS_COLORS[sym]
-      a = alpha.nil? ? color[3] : alpha
-      GooColor.new color[0], color[1], color[2], a 
+    def self.color(color, alpha=nil)
+      c = COLORS[color]
+      c ||= [0,0,0,255]
+      c[3] = alpha if alpha
+      GooColor.new *c
     end
   end
 end