rubygoo 0.0.7 → 0.0.8

data/samples/create_gui.rb

@@ -4,7 +4,7 @@ module CreateGui
 
     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, :icon => icon, :enabled => false
+    button = Button.new "Click Me!", :x=>70, :y=>80, :padding_left=>20, :padding_top=>20, :icon => icon, :enabled => false
     button.on :pressed do |*opts|
       label.set_text(Time.now.to_s)
     end
@@ -34,19 +34,17 @@ module CreateGui
       puts "BOO-YAH"
     end
 
-    modal_button = Button.new "Modal dialogs", :x=>270, :y=>240, :x_pad=>20, :y_pad=>20
+    modal_button = Button.new "Modal dialogs", :x=>270, :y=>240, :padding_left=>20, :padding_top=>20
     modal_button.on :pressed do |*opts|
-      # TODO make some of this stuff relative and/or make Dialog's
-      # constructor take a layout to use
       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)
+      modal.add Label.new("Message Here", :x=>20, :y=>70, :padding_left=>20, :padding_top=>20, :relative=>true)
       resize_me = Button.new "resize", :relative=>true, :x=>170, :y=>180
       resize_me.on :pressed do |*opts|
         modal.resize opts.first
       end
 
-      ok_butt = Button.new("OK", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20,:relative=>true)
+      ok_butt = Button.new("OK", :x=>70, :y=>180, :padding_left=>20, :padding_top=>20,:relative=>true)
       ok_butt.on :pressed do |*opts|
         modal.close
       end
@@ -55,7 +53,7 @@ module CreateGui
       modal.display
     end
 
-    grp = RadioGroup.new :x=>10, :y=>380, :x_pad=>20, :y_pad=>20, :w=> 500, :h=>80
+    grp = RadioGroup.new :x=>10, :y=>380, :padding_left=>20, :padding_top=>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
@@ -63,7 +61,7 @@ module CreateGui
 
     grp.add grp_label, grp_radio_one, grp_radio_two, grp_radio_three
 
-    hide_button = Button.new "Hide the radios!", :x=>170, :y=>330, :x_pad=>10, :y_pad=>10
+    hide_button = Button.new "Hide the radios!", :x=>170, :y=>330, :padding_left=>10, :padding_top=>10
     hide_button.on :pressed do |*opts|
       if grp.visible?
         grp.hide
@@ -79,12 +77,6 @@ module CreateGui
     app.add text_field, label, button, modal_button, grp, hide_button, icon_widget
     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
   end
 end

data/samples/rubygame_app.rb

@@ -4,6 +4,7 @@ $: << './lib'
 $: << File.dirname(__FILE__)
 require 'rubygoo'
 require 'rubygame'
+#require 'create_gui_pretty'
 require 'create_gui'
 include Rubygame
 include Rubygoo

data/test/test_setup.rb

@@ -1,4 +1,5 @@
 $: << File.dirname(__FILE__) + "/../lib"
 $: << File.dirname(__FILE__) + "/../lib/rubygoo"
+require 'rubygems'
 require 'rubygoo'
 include Rubygoo

data/test/widget_spec.rb

@@ -4,16 +4,24 @@ describe Widget do
 
   describe "basic widget behavior" do
     before :each do
-#      @widget = Map.new
+      @widget = Widget.new
     end
 
     it "should merge in defaults for any options not given" do
-      @widget = Widget.new
       for k,v in Widget::DEFAULT_PARAMS
         @widget.instance_variable_get("@#{k}").should == v
       end
     end
 
+    it "should define props methods for each of the default params" do
+      Widget::DEFAULT_PARAMS.keys.each_with_index do |k,i|
+        @widget.should.respond_to? k 
+        @widget.send(k,i)
+        @widget.send(k).should == i
+      end
+    
+    end
+
   end
 
 end

data/themes/default/config.yml

@@ -29,3 +29,5 @@ Rubygoo::TextField:
 Rubygoo::MouseCursor:
   :color: :DarkSlateGray
   :mouse_cursor: cursor.png
+:clicky: # can do theming by id
+  :bg_color: :Violet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygoo
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-06 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.8.3
     version: 
 description: GUI library for use with Gosu or Rubygame
 email: shawn42@gmail.com
@@ -68,14 +68,9 @@ files:
 - README.txt
 - Rakefile
 - TODO
-- docs/Picture 1.png
-- docs/ui/UI.hpp
-- docs/ui/abutton.png
-- docs/ui/background.png
-- docs/ui/button.png
-- docs/ui/moveable.png
-- docs/ui/textbutton.png
 - lib/code_statistics.rb
+- lib/inflections.rb
+- lib/inflector.rb
 - lib/platform.rb
 - lib/rubygoo.rb
 - lib/rubygoo/adapters/adapter_factory.rb
@@ -133,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygoo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Easy to use gui library for Rubygame or Gosu.

data/docs/ui/UI.hpp

@@ -1,425 +0,0 @@
-#ifndef UI_HPP
-#define UI_HPP
-
-#include <boost/function.hpp>
-#include <Gosu/Input.hpp>
-#include <Gosu/Font.hpp>
-#include <Gosu/TextInput.hpp>
-#include <boost/bind.hpp>
-#include <Gosu/Utility.hpp>
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Directories.hpp>
-
-// Comment out these lines if you're using the same thing anyway.
-typedef boost::shared_ptr<Gosu::Image> Image; // Ich brauch einen tollen Namen D:
-typedef std::vector<Image> Animation;
-enum ZOrder {
-	zBackground,
-	zSomething,
-	zOMG, // sorry about this.
-	zUI,
-	zUIButton,
-	zCursor;
-};
-// if you don't, you may want to uncomment these.
-/*
-void loadImage(std::wstring filename, Image &loadTo, Gosu::Graphics& graphics, bool hardBorder) {
-	loadTo.reset(new Gosu::Image(graphics, Gosu::sharedResourcePrefix() + L"media/" + filename, hardBorder));
-}
-
-void loadAnimation(std::wstring filename, Animation &loadTo, Gosu::Graphics& graphics, int width, int height, bool hardBorder) {
-	Gosu::imagesFromTiledBitmap(graphics, Gosu::sharedResourcePrefix() + L"media/" + filename, width, height, hardBorder, loadTo);
-}
-*/
-
-// Change this.
-#define WINDOW_WIDTH 800
-#define WINDOW_HEIGHT 600
-
-/*
-For the best usage you define a "Mother-Widget". Example code:
-
-class GameWindow : public Gosu::Window {
-protected:
-	Widget widgets, *background, *acontainer, *txtbtn;
-public:
-	GameWindow() 
-	: Gosu::Window(WINDOW_WIDTH, WINDOW_HEIGHT, false, 20) {
-		background = new Widget(L"background.png", graphics(), 0, 0, zBackground);
-		widgets->add(background);
-		Button* btn1 = new Button(L"button.png", graphics(), 20, 20, zUIButton);
-		background->add(btn1);
-		btn1->onLeftClick = boost::bind(&GameWindow::explode, this);
-		AdvButton* btn2 = new AdvButton(L"abutton.png", graphics(), 50, 50, 40, 40, zUIButton);
-		widgets->add(btn2);
-		acontainer = new Moveable(L"moveable.png", graphics(), 200, 200, zUI, 120, 40);
-		txtbtn = new AdvTextButton(L"textbutton.png", graphics(), 205, 250, 132, 22, Gosu::defaultFontName(), L"Hello World", true);
-		txtbtn->onLeftClick = boost::bind(&GameWindow::noWorld, this);
-		acontainer->addWidget(txtbtn);
-	}
-	
-	void buttonDown(Gosu::Button btn) {
-		if (btn == Gosu::kbF7) {
-			if (background->isVisible()) background->hide(),
-			else background->show();
-		} else if (btn == Gosu::kbF8) {
-			if (acointainer->isVisible()) acontainer->hide();
-			else acointainer->show();
-		} else if (btn == Gosu::kbF9) {
-			// force txtbtn to show >:[
-			txtbtn->show(true);
-		}
-		widgets.buttonDown(btn, input());
-	}
-	
-	void buttonUp(Gosu::Button btn) {
-		widgets.buttonUp(btn, input());
-	}
-	
-	void update() {
-		widgets.update(input());
-	}
-	
-	void draw() {
-		widgets.draw(input());
-	}
-	
-	void explode() {
-		exit(-42);
-	}
-	
-	void noWorld() {
-		txtbtn->setText(L":((");
-		background->deactivate();
-	}
-};
-
-int main(int argc, char* argv[]) {
-	GameWindow window;
-	window.show();
-}
-*/
-class Widget;
-typedef std::vector<Widget*> Widgets;
-
-enum AdvTxtBtnKeep {
-	tbkNone = -1,
-	tbkNormal = 0,
-	tbkHover = 1,
-	tbkPressed = 2,
-	tbkDisabled = 3
-};
-/**
- * Mutter aller Grafikelemente! Kann abgeleitet werden und funktioniert rekursiv bis ~ewig!
- * X/Y/Z: Selbsterkl�rend
- * Widgets sind eigentlich nicht zum bewegen geeignet.
- * Sie k�nnen zwar verschoben werden (setX, setY: nur dieses; move(ox,oy): rekursiv).
- * widgets k�nnen sich X und Y wiederholen (festlegbar).
- * Sie sind deaktivierbar und versteckbar. Ersters hat keine Funktion in Widget.
-*/
-
-class Widget {
-protected:
-	Widgets widgets, addQueue;
-	Image image;
-	int x, y;
-	ZOrder z;
-	bool active, visible, noAutoShow, locked;
-	WidgetType type;
-public:
-	Widget(int x = 0, int y = 0, ZOrder z = zBackground, bool noAutoShow = false) {
-		this->x = x;
-		this->y = y;
-		this->z = z;
-		active = visible = true;
-		locked = false;
-		this->noAutoShow = noAutoShow;
-		type = wtWidget;
-	}
-
-	Widget(Image& image, int x, int y, ZOrder z, bool noAutoShow = false) {
-		this->image = image;
-		this->x = x;
-		this->y = y;
-		this->z = z;
-		active = visible = true;
-		type = wtWidget;
-		this->noAutoShow = noAutoShow;
-	}
-	
-	Widget(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, bool noAutoShow = false) {
-		loadImage(name, image, graphics);
-		this->x = x;
-		this->y = y;
-		this->z = z;
-		active = visible = true;
-		type = wtWidget;
-		this->noAutoShow = noAutoShow;
-	}
-	// Gosu related
-	virtual void draw(Gosu::Input& input);
-	virtual void update(Gosu::Input& input);
-	virtual void buttonUp(Gosu::Button& btn, Gosu::Input& input); // Redirect call
-	virtual void buttonDown(Gosu::Button& btn, Gosu::Input& input); // Redirect call
-	virtual void move(int vx, int vy); // bewegt um vx/vy; alle untergeordneten auch.
-	int getX() { return x; } 
-	int getY() { return y; }
-	ZOrder getZ() { return z; }
-	virtual Image getImage() { return image; }
-	void setX(int x) { this->x = x; }
-	void setY(int y) { this->y = y; }
-	void setZ(ZOrder z) { this->z = z; }
-	WidgetType getType() { return type; }
-	void addWidget(Widget* widget); // unterwidget hinzuf�gen
-	void remWidget(Widget* widget); // unterwidget l�schen
-	// (De-)aktivieren
-	void activate();
-	void deactivate();
-	bool isActive() { return active; }
-	// verstecken/anzeigen
-	void hide();
-	void show(bool force = false); // force: erzwinge anzeigen. hat nur mit noAutoShow effekt.
-	bool isVisible() { return visible; }
-	virtual ~Widget();
-};
-
-/**
-* Movable. Sie (und alles untergeordnete) verschiebt sich. Lustige Sache.
-* 
-*/
-class Moveable : public Widget {
-	int omx, omy, wdt, hgt, twdt, thgt;
-	bool moving;
-public:
-	static std::vector<Moveable*> moveables;
-	boost::function<void(Moveable*)> onTitleLeftClick, onTitleRightClick;
-	Moveable(Image& image, int x, int y, ZOrder z, int titleWidth, int titleHeight)
-	:	Widget(image, x, y, z) {
-		moving = false;
-		omx = omy = 0;
-		wdt = image->width();
-		hgt = image->height();
-		twdt = titleWidth;
-		thgt = titleHeight;
-		type = wtMoveable;
-		Moveable::moveables.push_back(this);
-	}
-
-	Moveable(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, int titleWidth, int titleHeight)
-	 :Widget(name, graphics, x, y, z) {
-		moving = false;
-		omx = omy = 0;
-		wdt = image->width();
-		hgt = image->height();
-		twdt = titleWidth;
-		thgt = titleHeight;
-		type = wtMoveable;
-		Moveable::moveables.push_back(this);
-	}
-
-	void update(Gosu::Input& input);
-	void buttonDown(Gosu::Button& btn, Gosu::Input& input);
-	void buttonUp(Gosu::Button& btn, Gosu::Input& input);
-	void move(int vx, int vy);
-};
-
-/**
- * Primitiver Button der nur f�r Mausklicks zust�ndig ist.
- * 2 calls: onLeftClick, onRightClick. Param jeweils Button* btn
-*/
-class Button : public Widget {
-protected:
-	int width, height;
-	bool focus;
-	Button* next;
-public:
-	static Button* btnFocus;
-	boost::function<void (Button*)> onRightClick, onLeftClick;
-
-	Button(int x = 0, int y = 0, ZOrder z = zBackground, bool noAutoShow = false)
-	: Widget(x, y, z, noAutoShow) {
-		width = height = 0;
-		focus = false;
-		next = NULL;
-		type = wtButton;
-	}
-
-	Button(Image& image, int x, int y, ZOrder z, bool noAutoShow = false)
-	: Widget(image, x, y, z, noAutoShow) {
-		width = image->width();
-		height = image->height();
-		focus = false;
-		next = NULL;
-		type = wtButton;
-	}
-
-	Button(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, bool noAutoShow = false)
-	: Widget(name, graphics, x, y, z, noAutoShow) {
-		loadImage(name, image, graphics);
-		width = image->width();
-		height = image->height();
-		focus = false;
-		next = NULL;
-		type = wtButton;
-	}
-
-	virtual void update(Gosu::Input& input);
-	virtual void buttonUp(Gosu::Button& btn, Gosu::Input& input);
-	static	void buttonUpAll(Gosu::Button& btn, Gosu::Input& input);
-	virtual void setFocus(bool woot) { focus = woot; }
-	virtual void setNextFocus(Button* toFocus) { next = toFocus; }
-	virtual void onFocus(Button* from, Gosu::Input& input);
-	virtual void onDefocus(Button* from, Gosu::Input& input);
-};
-
-/**
-* Textbutton: Dynamischer erzeugte Buttons
-*/
-
-class TextButton : public Button {
-protected:
-	Gosu::Font* font;
-	std::wstring text;
-public:
-	TextButton(Image& image, int x, int y, ZOrder z, Gosu::Graphics& graphics, std::wstring fontName, std::wstring text, bool noAutoShow = false)
-		: Button(image, x, y, z, noAutoShow) {
-			font = new Gosu::Font(graphics, fontName, image->height()-5);
-			this->text = text;
-	}
-
-	TextButton(Image& image, int x, int y, ZOrder z, Gosu::Font* font, std::wstring text, bool noAutoShow = false)
-		: Button(image, x, y, z, noAutoShow) {
-			this->font = font;
-			this->text = text;
-	}
-
-	TextButton(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, std::wstring fontName, std::wstring text, bool noAutoShow = false)
-		: Button(name, graphics, x, y, z, noAutoShow) {
-			font = new Gosu::Font(graphics, fontName, image->height()-5);
-			this->text = text;
-	}
-	
-	TextButton(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, Gosu::Font* font, std::wstring text, bool noAutoShow = false)
-		: Button(name, graphics, x, y, z, noAutoShow) {
-			this->font = font;
-			this->text = text;
-	}
-
-	TextButton(int x, int y, ZOrder z, Gosu::Graphics& graphics, std::wstring fontname, std::wstring text, int height, bool noAutoShow = false)
-		: Button(x, y, z, noAutoShow) {
-			font = new Gosu::Font(graphics, fontname, height-5);
-			this->text = text;
-	}
-
-	TextButton(int x, int y, ZOrder z, Gosu::Font* font, std::wstring text, bool noAutoShow = false)
-		: Button(x, y, z, noAutoShow) {
-		this->font = font;
-		this->text = text;
-	}
-
-	std::wstring getText() { return text; }
-	Gosu::Font* getFont() { return font; }
-	void setText(std::wstring newText) { text = newText; }
-
-	void draw(Gosu::Input& input);
-};
-
-/**
-* Input Klasse. Abgeleitet von Button f�r width/height Zeug + FOKUS!
-*/
-
-class Input : public Button {
-protected:
-	Gosu::TextInput textInput;
-	Gosu::Font font;
-public:
-	Input(Image& image, int x, int y, ZOrder z, Gosu::Graphics& graphics, std::wstring fontName)
-		: Button(image, x, y, z), font(graphics, fontName, image->height()-5) {
-		type = wtInput;
-	}
-
-	Input(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, std::wstring fontName)
-	: Button(name, graphics, x, y, z), font(graphics, fontName, image->height()-5) {
-		type = wtInput;
-	}
-	void buttonUp(Gosu::Button& btn, Gosu::Input& input);
-	virtual void draw(Gosu::Input& input);
-	std::string text() { return Gosu::narrow(textInput.text()); }
-	void reset() { textInput.setText(L""); }
-	void onFocus(Button* from, Gosu::Input& input);
-	void onDefocus(Button* from, Gosu::Input& input);
-protected:
-	void ThereCanBeOnlyOne(Gosu::Input& input);
-};
-/**
- * AdvButtons sind 4-tile-ige Buttons.
- * die Reihenfolge dabei ist:
- * - Normal
- * - onHover
- * - onClick
- * - disabled
- * Sie sind/sollten nicht weiter vererbt werden weil draw() das nicht weitergibt.
- * wozu auch. mit 2 advbuttons arbeiten ist h�sslich.
-*/
-class AdvButton : public Button {
-	Animation* animation;
-public:
-	AdvButton(Animation* animation, int x, int y, ZOrder z, bool noAutoShow = false)
-	: Button(x, y, z, noAutoShow) { 
-		this->animation = animation;
-		width = animation->at(0)->width();
-		height = animation->at(0)->height();
-		assert(animation->size() == 4);
-		type = wtAdvButton;
-	}
-
-	AdvButton(std::wstring name, Gosu::Graphics& graphics, int x, int y, int width, int height, ZOrder z, bool noAutoShow = false)
-	: Button(x, y, z, noAutoShow) {
-		animation = new Animation();
-		loadAnimation(name, *animation, graphics, width, height);
-		assert(animation->size() == 4);
-		this->width = width;
-		this->height = height;
-		type = wtAdvButton;
-	}
-	virtual void draw(Gosu::Input& input);
-	Image getImage() { return animation->at(0); }
-	Animation* getAnimation() { return animation; }
-};
-
-/**
-* AdvButton + TextButton
-* 
-*/
-
-class AdvTextButton : public TextButton {
-protected:
-	Animation* animation;
-	AdvTxtBtnKeep keepState;
-public:
-	AdvTextButton(std::wstring name, Gosu::Graphics& graphics, int x, int y, ZOrder z, int width, int height, std::wstring fontname, std::wstring text, bool noAutoShow = false)
-		:TextButton(x, y, z, graphics, fontname, text, height, noAutoShow)
-	{
-			animation = new Animation();
-			loadAnimation(name, *animation, graphics, width, height);
-			keepState = tbkNone;
-			this->width = width;
-			this->height = height;
-	}
-
-	AdvTextButton(Animation* animation, int x, int y, ZOrder z, Gosu::Font* font, std::wstring text, bool noAutoShow = false)
-		:TextButton(x, y, z, font, text, noAutoShow) {
-			this->animation = animation;
-			keepState = tbkNone;
-			this->width = animation->at(0)->width();
-			this->height = animation->at(0)->height();
-	}
-
-	Image getImage() { return animation->at(0); }
-	void draw(Gosu::Input& input);
-	Animation* getAnimation() { return animation; }
-	AdvTxtBtnKeep getKeepState() { return keepState; }
-	void setKeepState(AdvTxtBtnKeep keep) { keepState = keep; }
-};
-#endif
-