rubygoo 0.0.5 → 0.0.6

data/History.txt

@@ -17,3 +17,11 @@
 
 * Minor API tweaks
   * fixing gem deps
+
+=== 0.0.6 / 2008-11-13
+
+* Getting closer to a 1.0 release
+  * Better TextField support for Gosu
+  * small rendering bugs fixed
+  * added relative positioning of widgets
+  * added RadioButton and RadioGroup

data/Manifest.txt

@@ -30,10 +30,19 @@ lib/rubygoo/goo_color.rb
 lib/rubygoo/goo_event.rb
 lib/rubygoo/label.rb
 lib/rubygoo/mouse_cursor.rb
+lib/rubygoo/radio_button.rb
+lib/rubygoo/radio_group.rb
 lib/rubygoo/rect.rb
+lib/rubygoo/tab_group.rb
 lib/rubygoo/text_field.rb
 lib/rubygoo/widget.rb
+samples/create_gui.rb
 samples/gosu_app.rb
+samples/icon.png
 samples/rubygame_app.rb
+test/app_spec.rb
+test/test_rubygoo.rb
+test/test_setup.rb
+test/widget_spec.rb
 themes/default/Vera.ttf
 themes/default/config.yml

data/README.txt

@@ -10,19 +10,35 @@ Rubygoo is a theme-able gui framework for use with rubygame and soon gosu. It ha
 
 * theme-able gui widgets
 * named css colors
-* works with rubygame, gosu support on its way
-* containers, labels, buttons, checkboxes
+* works with rubygame and gosu
+* containers, labels, buttons, checkboxes, radio buttons, radio groups
 * tabbing focus of widgets
 * modal dialogs
 
 == SYNOPSIS:
+require 'rubygems'
+$: << './lib'
+$: << File.dirname(__FILE__)
+require 'rubygoo'
+require 'rubygame'
+require 'create_gui'
+include Rubygame
+include Rubygoo
+
+if $0 == __FILE__
+
+  screen = Screen.new [600,480]
+  screen.show_cursor = false
+
+  factory = AdapterFactory.new
+  render_adapter = factory.renderer_for :rubygame, screen
+  icon = Surface.load File.dirname(__FILE__) + "/icon.png"
 
-def build_gui(renderer)
   app = App.new :renderer => renderer
 
   label = Label.new "click the button to set the time", :x=>20, :y=>30
 
-  button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20
+  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
@@ -32,45 +48,88 @@ def build_gui(renderer)
     label.set_text("CHECKED [#{check.checked?}]")
   end
 
-  text_field = TextField.new "initial text", :x => 70, :y => 170
+  text_field = TextField.new "initial text", :x => 70, :y => 170, :max_length => 20, :min_length => 6
 
   text_field.on_key K_RETURN, K_KP_ENTER do |evt|
     puts "BOO-YAH"
   end
-  
+
+  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
+
+    modal.add Label.new("Message Here", :x=>20, :y=>70, :x_pad=>20, :y_pad=>20, :relative=>true)
+
+    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.show
+  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
+  app.add text_field, label, button, modal_button, grp
   app.add check
-end
-
-screen = Screen.new [600,480]
 
-factory = AdapterFactory.new
-render_adapter = factory.renderer_for :rubygame, screen
-app = create_gui(render_adapter)
-app_adapter = factory.app_for :rubygame, app
+  #  pulldown = Pulldown.new {:x=>70, :y=>80}
+  #  pulldown.on :changed do |*opts|
+  #    label.set_text(opts.first)
+  #  end
+  #
+  #  app.add pulldown
 
-# <standard rubygame setup stuff here>
-
-# rubygame loop do ..
-
-  # each event in our queue do ..
-    # pass on our events to the GUI
-    app_adapter.on_event event
+  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
+
+        # pass on our events to the GUI
+        app_adapter.on_event event
+      end
+
+      app_adapter.update clock.tick
+      app_adapter.draw render_adapter
+    end
   end
-
-  app_adapter.update clock.tick
-  app_adapter.draw render_adapter
 end
 
 == REQUIREMENTS:
 
 * publisher gem
 * constructor gem
-* rubygame gem (for now)
+* rubygame gem or gosu
 
 == INSTALL:
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 
 module Rubygoo
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end
 Hoe.new('rubygoo', Rubygoo::VERSION) do |p|
   p.developer('Shawn Anderson', 'shawn42@gmail.com')
@@ -13,10 +13,11 @@ Hoe.new('rubygoo', Rubygoo::VERSION) do |p|
   p.email = 'boss@topfunky.com'
   p.summary = "Beautiful graphs for one or multiple datasets."
   p.url = "http://rubygoo.googlecode.com"
-  p.changes = p.paragraphs_of('History.txt', 0..2).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 6..7).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root
   p.extra_deps << ['constructor']
   p.extra_deps << ['publisher']
+  p.extra_deps << ['rspec']
 end
 
 # run rubygame_app
@@ -35,4 +36,37 @@ task :stats do
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end
 
+begin
+  require 'spec/rake/spectask'
+
+  desc "Run all specs (tests)"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList['test/*_spec.rb']
+    t.spec_opts = ["--format", "specdoc"]
+  end
+
+  rule(/spec:.+/) do |t|
+    name = t.name.gsub("spec:","")
+
+    path = File.join( File.dirname(__FILE__),'test','%s_spec.rb'%name )
+
+    if File.exist? path
+      Spec::Rake::SpecTask.new(name) do |t|
+      t.spec_files = [path]
+    end
+
+    puts "\nRunning spec/%s_spec.rb"%[name]
+      Rake::Task[name].invoke
+    else
+      puts "File does not exist: %s"%path
+    end
+  end
+
+rescue LoadError
+  task :spec do 
+    puts "ERROR: RSpec is not installed?"
+  end
+end
+
+
 # vim: syntax=Ruby

data/TODO

@@ -1,7 +1,8 @@
 TODO
- - make mouse cursor injectable
+ - 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...)
- - image icons for buttons
-
- - double-check the tab focus stuff on modal dialogs