saggui-svn — SVN commit logs

[Saggui-svn] SF.net SVN: saggui: [431] trunk

[<sag...@li...>]

Revision: 431
          http://saggui.svn.sourceforge.net/saggui/?rev=431&view=rev
Author:   kazzmir
Date:     2007-05-05 08:18:32 -0700 (Sat, 05 May 2007)

Log Message:
-----------
compile agl and opengl modules. clean up module creation

Modified Paths:
--------------
    trunk/SConstruct
    trunk/modules/agl/src/agl_factory.cpp
    trunk/modules/agl/src/agl_system.cpp

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-05-05 15:10:19 UTC (rev 430)
+++ trunk/SConstruct	2007-05-05 15:18:32 UTC (rev 431)
@@ -54,19 +54,35 @@
 env.StaticLibrary('lib/saggui', map(replacer, findFiles( 'src', isCpp ) ))
 env.ParseHeader('include/saggui/saggui.h', 'cmake/saggui.h.in')
 
-## probably put the below into a function if its generic enough
-allegroEnv = Environment( ENV = os.environ )
-allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
-allegroEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
-allegroEnv.StaticLibrary('lib/saggui-alleg', map(replacer, findFiles('modules/allegro',isCpp)))
-for i in findFiles('modules/allegro/', isH):
-	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)
+def buildModule(directory, name, menv = Environment(ENV = os.environ)):
+	# moduleEnv = Environment( ENV = os.environ )
+	menv.Append( CPPPATH = ['modules/%s/include' % directory,'include'] )
+	menv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
+	menv.StaticLibrary('lib/%s' % name, map(replacer, findFiles('modules/%s' % directory,isCpp)))
+	for i in findFiles('modules/%s/' % directory, isH):
+		menv.Install('include/saggui/%s' % dirname(i.replace('modules/%s' % directory,'').replace('include','%s' % directory)),i)
 
-sdlEnv = Environment( ENV = os.environ )
-sdlEnv.Append( CPPPATH = ['modules/sdl/include','include'] )
-sdlEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
-sdlEnv.StaticLibrary('lib/saggui-sdl', map(replacer, findFiles('modules/sdl',isCpp)))
-for i in findFiles('modules/sdl/', isH):
-	sdlEnv.Install('include/saggui/%s' % dirname(i.replace('modules/sdl','').replace('include','sdl')),i)
+buildModule('allegro','saggui-alleg')
+aglEnv = Environment(ENV = os.environ )
+# aglEnv.Append( CPPPATH = ['modules/opengl','modules/allegro/include'] )
+buildModule('agl','saggui-agl', aglEnv)
+buildModule('sdl','saggui-sdl')
+buildModule('opengl','saggui-opengl')
 
+if False:
+	## probably put the below into a function if its generic enough
+	allegroEnv = Environment( ENV = os.environ )
+	allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
+	allegroEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
+	allegroEnv.StaticLibrary('lib/saggui-alleg', map(replacer, findFiles('modules/allegro',isCpp)))
+	for i in findFiles('modules/allegro/', isH):
+		allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)
 
+	sdlEnv = Environment( ENV = os.environ )
+	sdlEnv.Append( CPPPATH = ['modules/sdl/include','include'] )
+	sdlEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
+	sdlEnv.StaticLibrary('lib/saggui-sdl', map(replacer, findFiles('modules/sdl',isCpp)))
+	for i in findFiles('modules/sdl/', isH):
+		sdlEnv.Install('include/saggui/%s' % dirname(i.replace('modules/sdl','').replace('include','sdl')),i)
+
+

Modified: trunk/modules/agl/src/agl_factory.cpp
===================================================================
--- trunk/modules/agl/src/agl_factory.cpp	2007-05-05 15:10:19 UTC (rev 430)
+++ trunk/modules/agl/src/agl_factory.cpp	2007-05-05 15:18:32 UTC (rev 431)
@@ -40,10 +40,10 @@
 #define AGL_FACTORY_CPP
 
 #include "agl_factory.h"
-#include "al_gfx.h"
+#include "saggui/allegro/al_gfx.h"
 //#include "agl_gfx.h"
-#include "al_mouse.h"
-#include "al_keyinput.h"
+#include "saggui/allegro/al_mouse.h"
+#include "saggui/allegro/al_keyinput.h"
 
 namespace saggui
 {

Modified: trunk/modules/agl/src/agl_system.cpp
===================================================================
--- trunk/modules/agl/src/agl_system.cpp	2007-05-05 15:10:19 UTC (rev 430)
+++ trunk/modules/agl/src/agl_system.cpp	2007-05-05 15:18:32 UTC (rev 431)
@@ -40,9 +40,9 @@
 #define AGL_SYSTEM_CPP
 
 #include "agl_system.h"
-#include "resource_manager.h"
-#include "al_font.h"
-#include "al_gfx.h"
+#include "saggui/resource_manager.h"
+#include "saggui/allegro/al_font.h"
+#include "saggui/allegro/al_gfx.h"
 //#include "agl_gfx.h"
 
 namespace saggui


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [430] trunk/SConstruct

[<sag...@li...>]

Revision: 430
          http://saggui.svn.sourceforge.net/saggui/?rev=430&view=rev
Author:   kazzmir
Date:     2007-05-05 08:10:19 -0700 (Sat, 05 May 2007)

Log Message:
-----------
add warnings for modules too

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-05-05 15:05:12 UTC (rev 429)
+++ trunk/SConstruct	2007-05-05 15:10:19 UTC (rev 430)
@@ -54,16 +54,19 @@
 env.StaticLibrary('lib/saggui', map(replacer, findFiles( 'src', isCpp ) ))
 env.ParseHeader('include/saggui/saggui.h', 'cmake/saggui.h.in')
 
+## probably put the below into a function if its generic enough
 allegroEnv = Environment( ENV = os.environ )
 allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
+allegroEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
 allegroEnv.StaticLibrary('lib/saggui-alleg', map(replacer, findFiles('modules/allegro',isCpp)))
 for i in findFiles('modules/allegro/', isH):
 	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)
 
 sdlEnv = Environment( ENV = os.environ )
 sdlEnv.Append( CPPPATH = ['modules/sdl/include','include'] )
+sdlEnv.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
 sdlEnv.StaticLibrary('lib/saggui-sdl', map(replacer, findFiles('modules/sdl',isCpp)))
 for i in findFiles('modules/sdl/', isH):
-	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/sdl','').replace('include','sdl')),i)
+	sdlEnv.Install('include/saggui/%s' % dirname(i.replace('modules/sdl','').replace('include','sdl')),i)
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [429] trunk

[<sag...@li...>]

Revision: 429
          http://saggui.svn.sourceforge.net/saggui/?rev=429&view=rev
Author:   juvinious
Date:     2007-05-05 08:05:12 -0700 (Sat, 05 May 2007)

Log Message:
-----------
Added two more signals to window and enabled -Woverloaded-virtual in cmakelists.txt

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/include/saggui/window.h
    trunk/src/window.cpp

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-05-05 15:03:13 UTC (rev 428)
+++ trunk/CMakeLists.txt	2007-05-05 15:05:12 UTC (rev 429)
@@ -79,7 +79,7 @@
 option(ENABLE_FREETYPE_FONTS "Enables freetype font support" on)
 
 if(NOT MSVC)
-	set(CXXFLAGS "-O2 -Wall -funroll-loops -fexpensive-optimizations")
+	set(CXXFLAGS "-O2 -Wall -funroll-loops -fexpensive-optimizations -Woverloaded-virtual")
 else(NOT MSVC)
 	set(CXXFLAGS "-O2")
 endif(NOT MSVC)

Modified: trunk/include/saggui/window.h
===================================================================
--- trunk/include/saggui/window.h	2007-05-05 15:03:13 UTC (rev 428)
+++ trunk/include/saggui/window.h	2007-05-05 15:05:12 UTC (rev 429)
@@ -98,7 +98,7 @@
 		    //! Window Location
 		    coord position;
 			
-		    //! \name Signals
+		    //! \name Public Signals
 		    
 		    signal0<> onOpen;
 		    signal0<> onClose;
@@ -180,7 +180,13 @@
 		    
 		    //! Set clickable system
 		    virtual slot setClickSystem(mouseButtons type);
-	    
+		    
+		    //! Signal emitted when connected to a parent
+		    signal1<window *>onParentConnect;
+		    
+		    //! Signal emitted when disconnected to a parent
+		    signal1<window *>onParentDisconnect;
+		    
 	    private:
 		    
 		    //! Window ID

Modified: trunk/src/window.cpp
===================================================================
--- trunk/src/window.cpp	2007-05-05 15:03:13 UTC (rev 428)
+++ trunk/src/window.cpp	2007-05-05 15:05:12 UTC (rev 429)
@@ -173,25 +173,24 @@
 	{
 		parent = p;
 		parent->children.push_back(this);
+		onParentConnect.emit(p);
 	}
 	
 	void window::addChild(window *c)
 	{
 		children.push_back(c);
 		c->parent = this;
+		c->onParentConnect.emit(this);
 		guiManager::fixWindow(c);
 	}
 	
 	void window::removeChild(window *c)
 	{
-		for(unsigned int i=0;i<children.size();++i)
+		std::vector<window*>::iterator temp = std::find(children.begin(),children.end(),c);
+		if(temp!=children.end())
 		{
-			if(children[i]==c)
-			{
-				std::vector<window *>::iterator p = children.begin();
-				p+=i;
-				children.erase(p);
-			}
+			(*temp)->onParentDisconnect.emit(this);
+			children.erase(temp);
 		}
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [428] trunk/SConstruct

[<sag...@li...>]

Revision: 428
          http://saggui.svn.sourceforge.net/saggui/?rev=428&view=rev
Author:   kazzmir
Date:     2007-05-05 08:03:13 -0700 (Sat, 05 May 2007)

Log Message:
-----------
include c files

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-05-05 15:01:47 UTC (rev 427)
+++ trunk/SConstruct	2007-05-05 15:03:13 UTC (rev 428)
@@ -1,7 +1,8 @@
 import os
 
+# cpp or c files
 def isCpp( file ):
-	return '.cpp' in file
+	return '.cpp' in file or '.c' in file
 
 def isH( file ):
 	return '.h' in file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [427] trunk/SConstruct

[<sag...@li...>]

Revision: 427
          http://saggui.svn.sourceforge.net/saggui/?rev=427&view=rev
Author:   kazzmir
Date:     2007-05-05 08:01:47 -0700 (Sat, 05 May 2007)

Log Message:
-----------
compile sdl library

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-05-05 14:57:39 UTC (rev 426)
+++ trunk/SConstruct	2007-05-05 15:01:47 UTC (rev 427)
@@ -58,3 +58,11 @@
 allegroEnv.StaticLibrary('lib/saggui-alleg', map(replacer, findFiles('modules/allegro',isCpp)))
 for i in findFiles('modules/allegro/', isH):
 	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)
+
+sdlEnv = Environment( ENV = os.environ )
+sdlEnv.Append( CPPPATH = ['modules/sdl/include','include'] )
+sdlEnv.StaticLibrary('lib/saggui-sdl', map(replacer, findFiles('modules/sdl',isCpp)))
+for i in findFiles('modules/sdl/', isH):
+	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/sdl','').replace('include','sdl')),i)
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [426] trunk/SConstruct

[<sag...@li...>]

Revision: 426
          http://saggui.svn.sourceforge.net/saggui/?rev=426&view=rev
Author:   kazzmir
Date:     2007-05-05 07:57:39 -0700 (Sat, 05 May 2007)

Log Message:
-----------
add warnings for virtual methods

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-05-03 01:34:24 UTC (rev 425)
+++ trunk/SConstruct	2007-05-05 14:57:39 UTC (rev 426)
@@ -25,7 +25,7 @@
 env.BuildDir('build','src')
 
 env.Append( CPPPATH = 'include' )
-env.Append( CCFLAGS = '-Wall' )
+env.Append( CCFLAGS = ['-Wall', '-Woverloaded-virtual'] )
 
 def parseHeader(target, source, env):
 	import re


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [425] trunk

[<sag...@li...>]

Revision: 425
          http://saggui.svn.sourceforge.net/saggui/?rev=425&view=rev
Author:   kazzmir
Date:     2007-05-02 18:34:24 -0700 (Wed, 02 May 2007)

Log Message:
-----------
add operator== for references and some consts

Modified Paths:
--------------
    trunk/include/saggui/window.h
    trunk/src/window.cpp

Modified: trunk/include/saggui/window.h
===================================================================
--- trunk/include/saggui/window.h	2007-04-30 00:32:23 UTC (rev 424)
+++ trunk/include/saggui/window.h	2007-05-03 01:34:24 UTC (rev 425)
@@ -139,7 +139,7 @@
 		    int childTotal();
 			
 		    //! Return window ID number
-		    int getID();
+		    const int getID() const;
 		    
 		    //! Add style
 		    void setStyle(style *d);
@@ -187,7 +187,8 @@
 		    int ID;
 		    
 		    //! Override == to check ID's between windows
-		    bool operator==(window *w);
+		    bool operator==(const window * const w) const;
+		    bool operator==(const window & w) const;
 		    
 		    //! Recursively check point to topmost parent
 		    bool checkParentPos(const coord & pos);

Modified: trunk/src/window.cpp
===================================================================
--- trunk/src/window.cpp	2007-04-30 00:32:23 UTC (rev 424)
+++ trunk/src/window.cpp	2007-05-03 01:34:24 UTC (rev 425)
@@ -79,12 +79,17 @@
 		// Do some shit
 	}
 	
-	bool window::operator==(window *w)
+	bool window::operator==(const window * const w) const
 	{
 		if(!w)return false;
 		else if(ID==w->ID)return true;
 		return false;
 	}
+
+	bool window::operator==(const window & w) const
+	{
+		return *this == &w;
+	}
 	
 	// Recursively check point to topmost parent
 	bool window::checkParentPos(const coord & pos)
@@ -154,7 +159,7 @@
 		return children;
 	}
 	
-	int window::getID()
+	const int window::getID() const
 	{
 		return ID;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [424] trunk/SConstruct

[<sag...@li...>]

Revision: 424
          http://saggui.svn.sourceforge.net/saggui/?rev=424&view=rev
Author:   kazzmir
Date:     2007-04-29 17:32:23 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
rename alleg module

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-30 00:01:42 UTC (rev 423)
+++ trunk/SConstruct	2007-04-30 00:32:23 UTC (rev 424)
@@ -55,6 +55,6 @@
 
 allegroEnv = Environment( ENV = os.environ )
 allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
-allegroEnv.StaticLibrary('lib/alleg', map(replacer, findFiles('modules/allegro',isCpp)))
+allegroEnv.StaticLibrary('lib/saggui-alleg', map(replacer, findFiles('modules/allegro',isCpp)))
 for i in findFiles('modules/allegro/', isH):
 	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [423] trunk/src/widgets/abstractbutton.cpp

[<sag...@li...>]

Revision: 423
          http://saggui.svn.sourceforge.net/saggui/?rev=423&view=rev
Author:   juvinious
Date:     2007-04-29 17:01:42 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
squashed warnings from abstractbutton

Modified Paths:
--------------
    trunk/src/widgets/abstractbutton.cpp

Modified: trunk/src/widgets/abstractbutton.cpp
===================================================================
--- trunk/src/widgets/abstractbutton.cpp	2007-04-29 23:18:48 UTC (rev 422)
+++ trunk/src/widgets/abstractbutton.cpp	2007-04-30 00:01:42 UTC (rev 423)
@@ -120,6 +120,7 @@
 	
 	bool abstractButton::getAutoRepeat() const
 	{
+		return this->autoRepeat;
 	}
 			
 	void abstractButton::setAutoRepeatDelay(int)
@@ -128,6 +129,7 @@
 	
 	int abstractButton::getAutoRepeatDelay() const
 	{
+		return this->autoRepeatDelay;
 	}
 			
 	void abstractButton::setAutoRepeatInterval(int)
@@ -135,6 +137,7 @@
 	}
 	int abstractButton::getAutoRepeatInterval() const
 	{
+		return this->autoRepeatInterval;
 	}
 			
 	void abstractButton::setAutoExclusive(bool)
@@ -143,6 +146,7 @@
 	
 	bool abstractButton::isAutoExclusive() const
 	{
+		return this->autoExclusive;
 	}
 			
 	void abstractButton::setGroup(buttonGroup *group)
@@ -151,6 +155,8 @@
 	
 	buttonGroup *abstractButton::getGroup() const
 	{
+		if(bGroup)return bGroup;
+		else return 0;
 	}
 	
 	slot abstractButton::animateClick(int msec)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [422] trunk/CHANGELOG

[<sag...@li...>]

Revision: 422
          http://saggui.svn.sourceforge.net/saggui/?rev=422&view=rev
Author:   juvinious
Date:     2007-04-29 16:18:48 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Typo to changelog

Modified Paths:
--------------
    trunk/CHANGELOG

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-04-29 23:16:28 UTC (rev 421)
+++ trunk/CHANGELOG	2007-04-29 23:18:48 UTC (rev 422)
@@ -1,5 +1,5 @@
 0.42
-- Added in two new button type (buttonGroup & abstractButton) classes to improve the existing button and radial widgets and accomodate newer ones
+- Added in two new button type (buttonGroup & abstractButton) classes to improve the existing button and radial widgets and accomodate newer ones (juvinious)
 - Added in scons build SConstruct file (kazzmir)
 - Added doDottedLine and doDottedRectfill for graphics class
 - Modified coord pointInside to accomodate shapes, making hovering over widgets correct now


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [421] trunk

[<sag...@li...>]

Revision: 421
          http://saggui.svn.sourceforge.net/saggui/?rev=421&view=rev
Author:   juvinious
Date:     2007-04-29 16:16:28 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Added in two new widgets to improve existing button & radial widgets as well as accomodate newer button type widgets.

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/cmake/saggui.h.in
    trunk/include/saggui/window.h

Added Paths:
-----------
    trunk/include/saggui/widgets/abstractbutton.h
    trunk/include/saggui/widgets/buttongroup.h
    trunk/src/widgets/abstractbutton.cpp
    trunk/src/widgets/buttongroup.cpp

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-04-29 22:54:05 UTC (rev 420)
+++ trunk/CHANGELOG	2007-04-29 23:16:28 UTC (rev 421)
@@ -1,4 +1,6 @@
-0.40
+0.42
+- Added in two new button type (buttonGroup & abstractButton) classes to improve the existing button and radial widgets and accomodate newer ones
+- Added in scons build SConstruct file (kazzmir)
 - Added doDottedLine and doDottedRectfill for graphics class
 - Modified coord pointInside to accomodate shapes, making hovering over widgets correct now
 - Modified paint signals on window to include shapes for drawing properly

Modified: trunk/cmake/saggui.h.in
===================================================================
--- trunk/cmake/saggui.h.in	2007-04-29 22:54:05 UTC (rev 420)
+++ trunk/cmake/saggui.h.in	2007-04-29 23:16:28 UTC (rev 421)
@@ -82,8 +82,10 @@
 #include "saggui/window.h"
 
 //! Headers for included widgets
+#include "saggui/widgets/abstractbutton.h"
 #include "saggui/widgets/box.h"
 #include "saggui/widgets/button.h"
+#include "saggui/widgets/buttongroup.h"
 #include "saggui/widgets/checkbox.h"
 #include "saggui/widgets/dialog.h"
 #include "saggui/widgets/input_box.h"

Added: trunk/include/saggui/widgets/abstractbutton.h
===================================================================
--- trunk/include/saggui/widgets/abstractbutton.h	                        (rev 0)
+++ trunk/include/saggui/widgets/abstractbutton.h	2007-04-29 23:16:28 UTC (rev 421)
@@ -0,0 +1,132 @@
+/*
+SAGGUI (Simplified Allegro Gaming Graphical User Interface)
+Copyright (c) 2005-2007, Miguel A. Gavidia
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above 
+       copyright notice, this list of conditions and the following
+       disclaimer.
+    * Redistributions in binary form must reproduce the above 
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials 
+       provided with the distribution.
+    * Neither the name of the "SAGGUI" nor the names of its 
+       contributors may be used to endorse or promote products 
+       derived from this software without specific prior written 
+       permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ABSTRACTBUTTON_H
+#define ABSTRACTBUTTON_H
+
+#include "saggui/window.h"
+#include "saggui/graphics.h"
+#include "saggui/mouse_events.h"
+#include "saggui/key_events.h"
+
+namespace saggui
+{
+	//!  abstractButton
+	/*!
+	 * An abstract button representing different types of buttons, radials, etc
+    	*/
+	
+
+	class buttonGroup;
+
+	class SAGGUI_EXPORT abstractButton : public window, mouseEvents, keyEvents
+	{
+		public:
+			explicit abstractButton();
+			virtual ~abstractButton();
+			
+			void setText(const std::string &text);
+			std::string getText() const;
+			
+			void setIcon(graphic *icon);
+			graphic *getIcon() const;
+			
+			coord iconSize() const;
+	
+			void setCheckable(bool);
+			bool isCheckable() const;
+			
+			bool isChecked() const;
+			
+			void setDown(bool);
+			bool isDown() const;
+			
+			void setAutoRepeat(bool);
+			bool getAutoRepeat() const;
+			
+			void setAutoRepeatDelay(int);
+			int getAutoRepeatDelay() const;
+			
+			void setAutoRepeatInterval(int);
+			int getAutoRepeatInterval() const;
+			
+			void setAutoExclusive(bool);
+			bool isAutoExclusive() const;
+			
+			void setGroup(buttonGroup *group);
+			buttonGroup *getGroup() const;
+			
+			//public Q_SLOTS:
+			slot animateClick(int msec = 100);
+			slot click(const coord &pos);
+			slot toggle();
+			slot setChecked(bool);
+			
+			//Q_SIGNALS:
+			signal0<> pressed;
+			signal0<> released;
+			signal0<> clicked;
+			signal0<> toggled;
+			
+		protected:
+			virtual slot paintEvent(const coord &pos, graphic *bmp, const std::vector<rgba> &colors, const uint32_t &flags, const shapeType &shape) = 0;
+
+			virtual slot setClickSystem(mouseButtons type);
+		private:
+			bool autoExclusive;
+			bool autoRepeat;
+			int autoRepeatDelay;
+			int autoRepeatInterval;
+			bool checkable;
+			bool checked;
+			bool down;
+			graphic *icon;
+			/* coord iconSize; */ 
+			/* shortcut : QKeySequence */
+			std::string text;
+
+			buttonGroup *bGroup;
+			slot onClicked(const coord &pos);
+			slot onPressed(const coord &pos);
+			slot onReleased(const coord &pos);
+
+			friend class buttonGroup;
+	};
+}
+
+#endif // ABSTRACTBUTTON_H

Added: trunk/include/saggui/widgets/buttongroup.h
===================================================================
--- trunk/include/saggui/widgets/buttongroup.h	                        (rev 0)
+++ trunk/include/saggui/widgets/buttongroup.h	2007-04-29 23:16:28 UTC (rev 421)
@@ -0,0 +1,85 @@
+/*
+SAGGUI (Simplified Allegro Gaming Graphical User Interface)
+Copyright (c) 2005-2007, Miguel A. Gavidia
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above 
+       copyright notice, this list of conditions and the following
+       disclaimer.
+    * Redistributions in binary form must reproduce the above 
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials 
+       provided with the distribution.
+    * Neither the name of the "SAGGUI" nor the names of its 
+       contributors may be used to endorse or promote products 
+       derived from this software without specific prior written 
+       permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef BUTTONGROUP_H
+#define BUTTONGROUP_H
+
+#include <list>
+#include "saggui/widgets/abstractbutton.h"
+
+namespace saggui
+{
+	class SAGGUI_EXPORT buttonGroup
+	{
+		public:
+			explicit buttonGroup();
+			~buttonGroup();
+			
+			void setExclusive(bool);
+			bool isExclusive() const;
+			
+			void addButton(abstractButton *);
+			/*void addButton(abstractButton *, int id);*/
+			void removeButton(abstractButton *);
+			
+			std::list<abstractButton*> buttons() const;
+			
+			abstractButton * checkedButton() const;
+			// no setter on purpose!
+			
+			abstractButton *button(int id) const;
+			/*void setId(abstractButton *button, int id);*/
+			int id(abstractButton *button) const;
+			int checkedId() const;
+			
+			//Q_SIGNALS:
+			signal1<abstractButton *> buttonClickedObj;
+			signal1<int> buttonClickedID;
+			signal1<abstractButton *> buttonPressedObj;
+			signal1<int> buttonPressedID;
+			signal1<abstractButton *> buttonReleasedObj;
+			signal1<int> buttonReleasedID;
+			
+		private:
+			bool exclusive;
+			std::list<abstractButton*> group;
+			friend class abstractButton;
+	};
+}
+
+#endif // BUTTONGROUP_H

Modified: trunk/include/saggui/window.h
===================================================================
--- trunk/include/saggui/window.h	2007-04-29 22:54:05 UTC (rev 420)
+++ trunk/include/saggui/window.h	2007-04-29 23:16:28 UTC (rev 421)
@@ -82,70 +82,11 @@
 		    
 		    //! Window colors so that styles can utilize to color themselves
 		    std::vector<rgba> wColors;
-			
 			//! Window shape
 			shapeType shape;
+
+			//! \name Constructor & Destructor
 		    
-	    private:
-		    friend class guiManager;
-		    friend class mouseManager;
-		    
-		    //! Window ID
-		    int ID;
-		    
-		    //! Override == to check ID's between windows
-		    bool operator==(window *w);
-		    
-		    //! Recursively check point to topmost parent
-		    bool checkParentPos(const coord & pos);
-			
-		    //! Check a point against the window plus it's style
-		    bool checkPointPos(const coord & pos);
-		    
-		    //! Get parent position (need a recursive call)
-		    coord getPosition();
-		    
-		    //! Get parent position if not return this->position
-		    coord getParentClipped(coord c);
-		    
-		    //! Get top most parent
-		    window *getAbsoluteParent();
-		    
-		    //! click system type
-		    static mouseButtons clickType;
-		    
-	    protected:
-		    //! Controlling window	
-		    window *parent;
-			
-		    //! Children windows
-		    std::vector<window*>children;
-			
-		    //! Background Buffer
-		    graphic *background;
-		    
-		    //! style
-		    style *wStyle;
-		    
-		    //! Window type so that the guiManager can classify it using the below enums
-		    winType windowType;
-		    
-		    //! Top Padding provided by styles
-		    double topPadding;
-		    //! Left Padding provided by styles
-		    double leftPadding;
-		    //! Bottom Padding provided by styles
-		    double bottomPadding;
-		    //! Right Padding provided by styles
-		    double rightPadding;
-		    
-		    //! Set clickable system
-		    virtual void setClickSystem(mouseButtons type);
-		
-	    public:
-		    
-		    //! \name Constructor & Destructor
-		    
 		    //! Constructor
 		    window(winType wt=W_Basic, winAttributeFlags flags= AT_Default | AT_Enabled | AT_Visible | AT_DefaultStyle, shapeType sh = S_Rectangle);
 			
@@ -211,6 +152,63 @@
 		    
 		    //! Set attribute(s)
 		    inline void setAttribute(winAttributeFlags w, bool tf){ if(tf){attributes |= w;}else{attributes &= ~w;}}
+	
+	    protected:
+		    //! Controlling window	
+		    window *parent;
+			
+		    //! Children windows
+		    std::vector<window*>children;
+			
+		    //! Background Buffer
+		    graphic *background;
+		    
+		    //! style
+		    style *wStyle;
+		    
+		    //! Window type so that the guiManager can classify it using the below enums
+		    winType windowType;
+		    
+		    //! Top Padding provided by styles
+		    double topPadding;
+		    //! Left Padding provided by styles
+		    double leftPadding;
+		    //! Bottom Padding provided by styles
+		    double bottomPadding;
+		    //! Right Padding provided by styles
+		    double rightPadding;
+		    
+		    //! Set clickable system
+		    virtual slot setClickSystem(mouseButtons type);
+	    
+	    private:
+		    
+		    //! Window ID
+		    int ID;
+		    
+		    //! Override == to check ID's between windows
+		    bool operator==(window *w);
+		    
+		    //! Recursively check point to topmost parent
+		    bool checkParentPos(const coord & pos);
+			
+		    //! Check a point against the window plus it's style
+		    bool checkPointPos(const coord & pos);
+		    
+		    //! Get parent position (need a recursive call)
+		    coord getPosition();
+		    
+		    //! Get parent position if not return this->position
+		    coord getParentClipped(coord c);
+		    
+		    //! Get top most parent
+		    window *getAbsoluteParent();
+		    
+		    //! click system type
+		    static mouseButtons clickType;
+		
+		    friend class guiManager;
+		    friend class mouseManager;
 	};
 }
 

Added: trunk/src/widgets/abstractbutton.cpp
===================================================================
--- trunk/src/widgets/abstractbutton.cpp	                        (rev 0)
+++ trunk/src/widgets/abstractbutton.cpp	2007-04-29 23:16:28 UTC (rev 421)
@@ -0,0 +1,267 @@
+/*
+SAGGUI (Simplified Allegro Gaming Graphical User Interface)
+Copyright (c) 2005-2007, Miguel A. Gavidia
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above
+       copyright notice, this list of conditions and the following
+       disclaimer.
+    * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials
+       provided with the distribution.
+    * Neither the name of the "SAGGUI" nor the names of its
+       contributors may be used to endorse or promote products
+       derived from this software without specific prior written
+       permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ABSTRACTBUTTON_CPP
+#define ABSTRACTBUTTON_CPP
+
+#include "saggui/widgets/abstractbutton.h"
+#include "saggui/widgets/buttongroup.h"
+
+namespace saggui
+{
+	abstractButton::abstractButton() : window(W_Basic), mouseEvents(this), keyEvents(this)
+	{
+		setAttribute(AT_Raised,true);
+		autoExclusive=false;
+		autoRepeat=false;
+		autoRepeatDelay=0;
+		autoRepeatInterval=0;
+		checkable=false;
+		checked=false;
+		down=false;
+		icon=0;
+		text="";
+		bGroup=0;
+	}
+	abstractButton::~abstractButton()
+	{
+	}
+	
+	void abstractButton::setText(const std::string &text)
+	{
+		this->text = text;
+	}
+	std::string abstractButton::getText() const
+	{
+		return this->text;
+	}
+			
+	void abstractButton::setIcon(graphic *icon)
+	{
+		this->icon = icon;
+	}
+	
+	graphic *abstractButton::getIcon() const
+	{
+		return this->icon;
+	}
+			
+	coord abstractButton::iconSize() const
+	{
+		coord temp;
+		temp.width = icon->getBmpWidth();
+		temp.height = icon->getBmpHeight();
+		return temp;
+	}
+	
+	void abstractButton::setCheckable(bool checkable)
+	{
+		this->checkable= checkable;
+	}
+	
+	bool abstractButton::isCheckable() const
+	{
+		return this->checkable;
+	}
+			
+	bool abstractButton::isChecked() const
+	{
+		return this->checked;
+	}
+			
+	void abstractButton::setDown(bool)
+	{
+		
+	}
+	
+	bool abstractButton::isDown() const
+	{
+		return this->down;
+	}
+			
+	void abstractButton::setAutoRepeat(bool)
+	{
+	}
+	
+	bool abstractButton::getAutoRepeat() const
+	{
+	}
+			
+	void abstractButton::setAutoRepeatDelay(int)
+	{
+	}
+	
+	int abstractButton::getAutoRepeatDelay() const
+	{
+	}
+			
+	void abstractButton::setAutoRepeatInterval(int)
+	{
+	}
+	int abstractButton::getAutoRepeatInterval() const
+	{
+	}
+			
+	void abstractButton::setAutoExclusive(bool)
+	{
+	}
+	
+	bool abstractButton::isAutoExclusive() const
+	{
+	}
+			
+	void abstractButton::setGroup(buttonGroup *group)
+	{
+	}
+	
+	buttonGroup *abstractButton::getGroup() const
+	{
+	}
+	
+	slot abstractButton::animateClick(int msec)
+	{
+	}
+	
+	slot abstractButton::click(const coord &pos)
+	{
+	}
+	
+	slot abstractButton::toggle()
+	{
+		
+	}
+	
+	slot abstractButton::setChecked(bool)
+	{
+		
+	}
+	
+	// Set click system
+	slot abstractButton::setClickSystem(mouseButtons type)
+	{
+		switch(type)
+		{
+			case M_Left:
+			{
+				onRightClick.disconnect_slot(this,&abstractButton::click);
+				onMiddleClick.disconnect_slot(this,&abstractButton::click);
+				
+				onLeftClick.connect(this,&abstractButton::click);
+				
+				onRightDown.disconnect_slot(this,&abstractButton::onPressed);
+				onRightUp.disconnect_slot(this,&abstractButton::onReleased);
+				onRightClick.disconnect_slot(this,&abstractButton::onClicked);
+				onMiddleDown.disconnect_slot(this,&abstractButton::onPressed);
+				onMiddleUp.disconnect_slot(this,&abstractButton::onReleased);
+				onMiddleClick.disconnect_slot(this,&abstractButton::onClicked);
+				
+				onLeftDown.connect(this,&abstractButton::onPressed);
+				onLeftUp.connect(this,&abstractButton::onReleased);
+				onLeftClick.connect(this,&abstractButton::onClicked);
+				break;
+			}
+			case M_Right:
+			{
+				onLeftClick.disconnect_slot(this,&abstractButton::click);
+				onMiddleClick.disconnect_slot(this,&abstractButton::click);
+				
+				onRightClick.connect(this,&abstractButton::click);
+				
+				onLeftDown.disconnect_slot(this,&abstractButton::onPressed);
+				onLeftUp.disconnect_slot(this,&abstractButton::onReleased);
+				onLeftClick.disconnect_slot(this,&abstractButton::onClicked);
+				onMiddleDown.disconnect_slot(this,&abstractButton::onPressed);
+				onMiddleUp.disconnect_slot(this,&abstractButton::onReleased);
+				onMiddleClick.disconnect_slot(this,&abstractButton::onClicked);
+				
+				onRightDown.connect(this,&abstractButton::onPressed);
+				onRightUp.connect(this,&abstractButton::onReleased);
+				onRightClick.connect(this,&abstractButton::onClicked);
+				break;
+			}
+			case M_Middle:
+			{
+				onRightClick.disconnect_slot(this,&abstractButton::click);
+				onLeftClick.disconnect_slot(this,&abstractButton::click);
+				
+				onMiddleClick.connect(this,&abstractButton::click);
+				
+				onRightDown.disconnect_slot(this,&abstractButton::onPressed);
+				onRightUp.disconnect_slot(this,&abstractButton::onReleased);
+				onRightClick.disconnect_slot(this,&abstractButton::onClicked);
+				onLeftDown.disconnect_slot(this,&abstractButton::onPressed);
+				onLeftUp.disconnect_slot(this,&abstractButton::onReleased);
+				onLeftClick.disconnect_slot(this,&abstractButton::onClicked);
+				
+				onMiddleDown.connect(this,&abstractButton::onPressed);
+				onMiddleUp.connect(this,&abstractButton::onReleased);
+				onMiddleClick.connect(this,&abstractButton::onClicked);
+				break;
+			}
+		}
+	}
+	
+	slot abstractButton::onClicked(const coord &pos)
+	{
+		if(bGroup)
+		{
+			bGroup->buttonClickedObj(this);
+			bGroup->buttonClickedID(getID());
+		}
+	}
+	
+	slot abstractButton::onPressed(const coord &pos)
+	{
+		if(bGroup)
+		{
+			bGroup->buttonPressedObj(this);
+			bGroup->buttonPressedID(getID());
+		}
+	}
+	
+	slot abstractButton::onReleased(const coord &pos)
+	{
+		if(bGroup)
+		{
+			bGroup->buttonReleasedObj(this);
+			bGroup->buttonReleasedID(getID());
+		}
+	}
+}
+
+#endif

Added: trunk/src/widgets/buttongroup.cpp
===================================================================
--- trunk/src/widgets/buttongroup.cpp	                        (rev 0)
+++ trunk/src/widgets/buttongroup.cpp	2007-04-29 23:16:28 UTC (rev 421)
@@ -0,0 +1,133 @@
+/*
+SAGGUI (Simplified Allegro Gaming Graphical User Interface)
+Copyright (c) 2005-2007, Miguel A. Gavidia
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above
+       copyright notice, this list of conditions and the following
+       disclaimer.
+    * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials
+       provided with the distribution.
+    * Neither the name of the "SAGGUI" nor the names of its
+       contributors may be used to endorse or promote products
+       derived from this software without specific prior written
+       permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef BUTTONGROUP_CPP
+#define BUTTONGROUP_CPP
+
+#include "saggui/widgets/buttongroup.h"
+
+namespace saggui
+{
+	buttonGroup::buttonGroup()
+	{
+		exclusive = true;
+	}
+	
+	buttonGroup::~buttonGroup()
+	{
+	}
+	
+	void buttonGroup::setExclusive(bool ex)
+	{
+		this->exclusive = ex;
+	}
+	bool buttonGroup::isExclusive() const
+	{
+		return this->exclusive;
+	}
+			
+	void buttonGroup::addButton(abstractButton *button)
+	{
+		this->group.push_back(button);
+	}
+	
+	/*void addButton(abstractButton *, int id);*/
+	void buttonGroup::removeButton(abstractButton *button)
+	{
+		this->group.remove(button);
+	}
+			
+	std::list<abstractButton*> buttonGroup::buttons() const
+	{
+		return this->group;
+	}
+			
+	abstractButton *buttonGroup::checkedButton() const
+	{
+		std::list<abstractButton*>::const_iterator start = group.begin();
+		std::list<abstractButton*>::const_iterator end = group.begin();
+		for(std::list<abstractButton*>::const_iterator i= start;i!=end;++i)
+		{
+			if((*i)->isChecked() == true)
+			{
+				return (*i);
+			}
+		}
+		
+		return 0;
+	}
+			
+	abstractButton *buttonGroup::button(int id) const
+	{
+		std::list<abstractButton*>::const_iterator start = group.begin();
+		std::list<abstractButton*>::const_iterator end = group.begin();
+		for(std::list<abstractButton*>::const_iterator i= start;i!=end;++i)
+		{
+			if((*i)->getID() == id)
+			{
+				return (*i);
+			}
+		}
+		
+		return 0;
+	}
+	/*void setId(abstractButton *button, int id);*/
+	int buttonGroup::id(abstractButton *button) const
+	{
+		if(button)return button->getID();
+		else return 0;	
+	}
+	
+	int buttonGroup::checkedId() const
+	{
+		std::list<abstractButton*>::const_iterator start = group.begin();
+		std::list<abstractButton*>::const_iterator end = group.begin();
+		for(std::list<abstractButton*>::const_iterator i= start;i!=end;++i)
+		{
+			if((*i)->isChecked() == true)
+			{
+				return (*i)->getID();
+			}
+		}
+		
+		return 0;
+	}
+	
+}
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [420] trunk/SConstruct

[<sag...@li...>]

Revision: 420
          http://saggui.svn.sourceforge.net/saggui/?rev=420&view=rev
Author:   kazzmir
Date:     2007-04-29 15:54:05 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
install allegro header files into include/saggui

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-29 15:36:12 UTC (rev 419)
+++ trunk/SConstruct	2007-04-29 22:54:05 UTC (rev 420)
@@ -3,11 +3,14 @@
 def isCpp( file ):
 	return '.cpp' in file
 
-def findSource( dir ):
+def isH( file ):
+	return '.h' in file
+
+def findFiles( dir, predicate ):
 	source = []
 	for root, dirs, files in os.walk( dir ):
 		if not '.svn' in root:
-			source += map(lambda x: root + '/' + x, filter(isCpp, files))
+			source += map(lambda x: root + '/' + x, filter(predicate, files))
 	return source
 
 def replace(r1,r2):
@@ -24,8 +27,34 @@
 env.Append( CPPPATH = 'include' )
 env.Append( CCFLAGS = '-Wall' )
 
-env.StaticLibrary('lib/saggui', map(replacer, findSource( 'src' ) ))
+def parseHeader(target, source, env):
+	import re
+	write = open(target[0].path,'w')
+	reg = re.compile('^#cmake')
+	for line in file(source[0].path):
+		if reg.match( line ):
+			write.write( "// cmake line\n" )
+		else:
+			write.write( line )
+	write.close
+	return 0
 
+## erase path from name
+def erase(name,path):
+	return name.replace(path,'')
+
+def dirname(path):
+	if path.rfind('/'):
+		return path[0:path.rfind('/')]
+	else:
+		return ''
+
+env.Append(BUILDERS = { "ParseHeader" : Builder(action = parseHeader, name = "ParseHeader")})
+env.StaticLibrary('lib/saggui', map(replacer, findFiles( 'src', isCpp ) ))
+env.ParseHeader('include/saggui/saggui.h', 'cmake/saggui.h.in')
+
 allegroEnv = Environment( ENV = os.environ )
 allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
-allegroEnv.StaticLibrary('lib/alleg', map(replacer, findSource('modules/allegro')))
+allegroEnv.StaticLibrary('lib/alleg', map(replacer, findFiles('modules/allegro',isCpp)))
+for i in findFiles('modules/allegro/', isH):
+	allegroEnv.Install('include/saggui/%s' % dirname(i.replace('modules/allegro','').replace('include','allegro')),i)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [419] trunk

[<sag...@li...>]

Revision: 419
          http://saggui.svn.sourceforge.net/saggui/?rev=419&view=rev
Author:   kazzmir
Date:     2007-04-29 08:36:12 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
fix compiler warnings

Modified Paths:
--------------
    trunk/SConstruct
    trunk/src/widgets/input_box.cpp

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-29 03:56:44 UTC (rev 418)
+++ trunk/SConstruct	2007-04-29 15:36:12 UTC (rev 419)
@@ -1,12 +1,5 @@
 import os
 
-env = Environment( ENV = os.environ )
-
-env.BuildDir('build','src')
-
-env.Append( CPPPATH = 'include' )
-env.Append( CCFLAGS = '-Wall' )
-
 def isCpp( file ):
 	return '.cpp' in file
 
@@ -24,6 +17,13 @@
 
 replacer = replace('^src','build')
 
+env = Environment( ENV = os.environ )
+
+env.BuildDir('build','src')
+
+env.Append( CPPPATH = 'include' )
+env.Append( CCFLAGS = '-Wall' )
+
 env.StaticLibrary('lib/saggui', map(replacer, findSource( 'src' ) ))
 
 allegroEnv = Environment( ENV = os.environ )

Modified: trunk/src/widgets/input_box.cpp
===================================================================
--- trunk/src/widgets/input_box.cpp	2007-04-29 03:56:44 UTC (rev 418)
+++ trunk/src/widgets/input_box.cpp	2007-04-29 15:36:12 UTC (rev 419)
@@ -112,6 +112,9 @@
 					textX = (position.width - rightPadding)-2;
 					cursorX = textX - currentSetFont->getLength(currentSetText.substr(0,currentSetText.length()-cursorIndex));
 					break;
+				case T_Bottom:
+				case T_Top:
+					break;
 			}
 			
 			switch(vAlignment)
@@ -127,6 +130,9 @@
 					textY = (position.height - bottomPadding) - textSizeH - 1;
 					cursorY = textY - textSizeH;
 					break;
+				case T_Right:
+				case T_Left:
+					break;
 			}
 				
 			textY++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [418] trunk/SConstruct

[<sag...@li...>]

Revision: 418
          http://saggui.svn.sourceforge.net/saggui/?rev=418&view=rev
Author:   kazzmir
Date:     2007-04-28 20:56:44 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
put replace logic into a variable

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-29 03:55:47 UTC (rev 417)
+++ trunk/SConstruct	2007-04-29 03:56:44 UTC (rev 418)
@@ -22,8 +22,10 @@
 	search = re.compile( r1 )
 	return lambda x: search.sub( r2, x )
 
-env.StaticLibrary('lib/saggui', map(replace('^src','build'), findSource( 'src' ) ))
+replacer = replace('^src','build')
 
+env.StaticLibrary('lib/saggui', map(replacer, findSource( 'src' ) ))
+
 allegroEnv = Environment( ENV = os.environ )
 allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
-allegroEnv.StaticLibrary('lib/alleg', map(replace('^src','build'), findSource('modules/allegro')))
+allegroEnv.StaticLibrary('lib/alleg', map(replacer, findSource('modules/allegro')))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [417] trunk/SConstruct

[<sag...@li...>]

Revision: 417
          http://saggui.svn.sourceforge.net/saggui/?rev=417&view=rev
Author:   kazzmir
Date:     2007-04-28 20:55:47 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
build files in the build/ directory

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-29 03:45:12 UTC (rev 416)
+++ trunk/SConstruct	2007-04-29 03:55:47 UTC (rev 417)
@@ -17,8 +17,13 @@
 			source += map(lambda x: root + '/' + x, filter(isCpp, files))
 	return source
 
-env.StaticLibrary('lib/saggui', findSource( 'src' ) )
+def replace(r1,r2):
+	import re
+	search = re.compile( r1 )
+	return lambda x: search.sub( r2, x )
 
+env.StaticLibrary('lib/saggui', map(replace('^src','build'), findSource( 'src' ) ))
+
 allegroEnv = Environment( ENV = os.environ )
 allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
-allegroEnv.StaticLibrary('lib/alleg', findSource('modules/allegro'))
+allegroEnv.StaticLibrary('lib/alleg', map(replace('^src','build'), findSource('modules/allegro')))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [416] trunk

[<sag...@li...>]

Revision: 416
          http://saggui.svn.sourceforge.net/saggui/?rev=416&view=rev
Author:   kazzmir
Date:     2007-04-28 20:45:12 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
build allegro module

Modified Paths:
--------------
    trunk/SConstruct
    trunk/modules/allegro/src/al_system.cpp

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-04-29 00:39:41 UTC (rev 415)
+++ trunk/SConstruct	2007-04-29 03:45:12 UTC (rev 416)
@@ -17,6 +17,8 @@
 			source += map(lambda x: root + '/' + x, filter(isCpp, files))
 	return source
 
-source = findSource( 'src' )
+env.StaticLibrary('lib/saggui', findSource( 'src' ) )
 
-env.StaticLibrary('lib/saggui', source )
+allegroEnv = Environment( ENV = os.environ )
+allegroEnv.Append( CPPPATH = ['modules/allegro/include','include'] )
+allegroEnv.StaticLibrary('lib/alleg', findSource('modules/allegro'))

Modified: trunk/modules/allegro/src/al_system.cpp
===================================================================
--- trunk/modules/allegro/src/al_system.cpp	2007-04-29 00:39:41 UTC (rev 415)
+++ trunk/modules/allegro/src/al_system.cpp	2007-04-29 03:45:12 UTC (rev 416)
@@ -40,7 +40,7 @@
 #define AL_SYSTEM_CPP
 
 #include "al_system.h"
-#include "resource_manager.h"
+#include "saggui/resource_manager.h"
 #include "al_font.h"
 
 namespace saggui


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [415] trunk/README

[<sag...@li...>]

Revision: 415
          http://saggui.svn.sourceforge.net/saggui/?rev=415&view=rev
Author:   juvinious
Date:     2007-04-28 17:39:41 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Added list of developers to README

Modified Paths:
--------------
    trunk/README

Modified: trunk/README
===================================================================
--- trunk/README	2007-04-29 00:08:39 UTC (rev 414)
+++ trunk/README	2007-04-29 00:39:41 UTC (rev 415)
@@ -27,6 +27,12 @@
  Please read INSTALL
  Written by: Miguel A. Gavidia (aka juvinious and astarius)
 
+Developers:
+juvinious
+kazzmir
+Sevalecan
+indeterminatus
+
 Contact:
 juv...@us...
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [414] trunk/SConstruct

[<sag...@li...>]

Revision: 414
          http://svn.sourceforge.net/saggui/?rev=414&view=rev
Author:   kazzmir
Date:     2007-04-28 17:08:39 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
put saggui into a lib dir

Modified Paths:
--------------
    trunk/SConstruct


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [413] trunk

[<sag...@li...>]

Revision: 413
          http://svn.sourceforge.net/saggui/?rev=413&view=rev
Author:   kazzmir
Date:     2007-04-28 16:48:13 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
use saggui/blah in includes. fix a compiler warning or two

Modified Paths:
--------------
    trunk/SConstruct
    trunk/src/animation.cpp
    trunk/src/bitmap_font.cpp
    trunk/src/coord.cpp
    trunk/src/font.cpp
    trunk/src/font_base.cpp
    trunk/src/font_manager.cpp
    trunk/src/graphic_manager.cpp
    trunk/src/graphics.cpp
    trunk/src/gui_manager.cpp
    trunk/src/key_events.cpp
    trunk/src/keyinput.cpp
    trunk/src/keyinput_manager.cpp
    trunk/src/keys.cpp
    trunk/src/library_factory.cpp
    trunk/src/mouse.cpp
    trunk/src/mouse_events.cpp
    trunk/src/mouse_manager.cpp
    trunk/src/resource_manager.cpp
    trunk/src/rgba.cpp
    trunk/src/scheme.cpp
    trunk/src/schemes/defaultscheme.cpp
    trunk/src/style.cpp
    trunk/src/system.cpp
    trunk/src/system_factory.cpp
    trunk/src/timer.cpp
    trunk/src/widgets/box.cpp
    trunk/src/widgets/button.cpp
    trunk/src/widgets/checkbox.cpp
    trunk/src/widgets/dialog.cpp
    trunk/src/widgets/input_box.cpp
    trunk/src/widgets/label.cpp
    trunk/src/widgets/progress_bar.cpp
    trunk/src/widgets/radial.cpp
    trunk/src/widgets/scroll_bar.cpp
    trunk/src/widgets/text_box.cpp
    trunk/src/window.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [412] trunk/examples/gamedemo/src/openlayer.cpp

[<sag...@li...>]

Revision: 412
          http://svn.sourceforge.net/saggui/?rev=412&view=rev
Author:   juvinious
Date:     2007-04-28 16:30:16 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Stupid erronerous crap in openlayer.cpp

Modified Paths:
--------------
    trunk/examples/gamedemo/src/openlayer.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [411] trunk/modules/freetype/CMakeLists.txt

[<sag...@li...>]

Revision: 411
          http://svn.sourceforge.net/saggui/?rev=411&view=rev
Author:   juvinious
Date:     2007-04-28 16:03:33 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Fuck you

Modified Paths:
--------------
    trunk/modules/freetype/CMakeLists.txt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [410] trunk

[<sag...@li...>]

Revision: 410
          http://svn.sourceforge.net/saggui/?rev=410&view=rev
Author:   juvinious
Date:     2007-04-28 16:02:35 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Fixed incompatibilities with different cmake patch versions

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/modules/agl/CMakeLists.txt
    trunk/modules/allegro/CMakeLists.txt
    trunk/modules/freetype/CMakeLists.txt
    trunk/modules/openlayer/CMakeLists.txt
    trunk/modules/sdl/CMakeLists.txt
    trunk/modules/sdlgl/CMakeLists.txt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [409] trunk/SConstruct

[<sag...@li...>]

Revision: 409
          http://svn.sourceforge.net/saggui/?rev=409&view=rev
Author:   kazzmir
Date:     2007-04-28 15:18:05 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
adding initial scons file

Added Paths:
-----------
    trunk/SConstruct


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [408] trunk

[<sag...@li...>]

Revision: 408
          http://svn.sourceforge.net/saggui/?rev=408&view=rev
Author:   juvinious
Date:     2007-04-27 23:46:58 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
Updated dates used in BSD License in each file that has had recent changes

Modified Paths:
--------------
    trunk/examples/demo/include/test_classes.h
    trunk/examples/demo/src/allegro.cpp
    trunk/examples/demo/src/allegrogl.cpp
    trunk/examples/demo/src/openlayer.cpp
    trunk/examples/demo/src/sdl.cpp
    trunk/examples/demo/src/sdlgl.cpp
    trunk/examples/demo/src/test_classes.cpp
    trunk/examples/gamedemo/src/allegro.cpp
    trunk/examples/gamedemo/src/allegrogl.cpp
    trunk/examples/gamedemo/src/openlayer.cpp
    trunk/examples/gamedemo/src/sdl.cpp
    trunk/examples/gamedemo/src/sdlgl.cpp
    trunk/include/saggui/animation.h
    trunk/include/saggui/bitmap_font.h
    trunk/include/saggui/debug.h
    trunk/include/saggui/dllspec.h
    trunk/include/saggui/font.h
    trunk/include/saggui/font_base.h
    trunk/include/saggui/font_manager.h
    trunk/include/saggui/graphic_manager.h
    trunk/include/saggui/graphics.h
    trunk/include/saggui/key_events.h
    trunk/include/saggui/keyinput.h
    trunk/include/saggui/keyinput_manager.h
    trunk/include/saggui/keys.h
    trunk/include/saggui/library_factory.h
    trunk/include/saggui/mouse.h
    trunk/include/saggui/mouse_events.h
    trunk/include/saggui/resource_manager.h
    trunk/include/saggui/rgba.h
    trunk/include/saggui/sprite.h
    trunk/include/saggui/system.h
    trunk/include/saggui/system_factory.h
    trunk/include/saggui/widgets/box.h
    trunk/include/saggui/widgets/button.h
    trunk/include/saggui/widgets/checkbox.h
    trunk/include/saggui/widgets/dialog.h
    trunk/include/saggui/widgets/input_box.h
    trunk/include/saggui/widgets/label.h
    trunk/include/saggui/widgets/progress_bar.h
    trunk/include/saggui/widgets/radial.h
    trunk/include/saggui/widgets/scroll_bar.h
    trunk/include/saggui/widgets/text_box.h
    trunk/modules/agl/include/agl_factory.h
    trunk/modules/agl/include/agl_system.h
    trunk/modules/agl/saggui_agl.h
    trunk/modules/agl/src/agl_factory.cpp
    trunk/modules/agl/src/agl_system.cpp
    trunk/modules/allegro/include/al_factory.h
    trunk/modules/allegro/include/al_font.h
    trunk/modules/allegro/include/al_gfx.h
    trunk/modules/allegro/include/al_keyinput.h
    trunk/modules/allegro/include/al_mouse.h
    trunk/modules/allegro/include/al_system.h
    trunk/modules/allegro/saggui_alleg.h
    trunk/modules/allegro/src/al_factory.cpp
    trunk/modules/allegro/src/al_font.cpp
    trunk/modules/allegro/src/al_gfx.cpp
    trunk/modules/allegro/src/al_keyinput.cpp
    trunk/modules/allegro/src/al_mouse.cpp
    trunk/modules/allegro/src/al_system.cpp
    trunk/modules/freetype/include/ft_default.h
    trunk/modules/freetype/include/ft_font.h
    trunk/modules/freetype/saggui_freetype.h
    trunk/modules/freetype/src/ft_font.cpp
    trunk/modules/openlayer/include/ol_factory.h
    trunk/modules/openlayer/include/ol_font.h
    trunk/modules/openlayer/include/ol_gfx.h
    trunk/modules/openlayer/include/ol_system.h
    trunk/modules/openlayer/saggui_ol.h
    trunk/modules/openlayer/src/ol_factory.cpp
    trunk/modules/openlayer/src/ol_font.cpp
    trunk/modules/openlayer/src/ol_gfx.cpp
    trunk/modules/openlayer/src/ol_system.cpp
    trunk/modules/palib/include/saggui/saggui.h
    trunk/modules/sdl/include/sdl_factory.h
    trunk/modules/sdl/include/sdl_gfx.h
    trunk/modules/sdl/include/sdl_keyinput.h
    trunk/modules/sdl/include/sdl_mouse.h
    trunk/modules/sdl/include/sdl_system.h
    trunk/modules/sdl/saggui_sdl.h
    trunk/modules/sdl/src/sdl_factory.cpp
    trunk/modules/sdl/src/sdl_gfx.cpp
    trunk/modules/sdl/src/sdl_keyinput.cpp
    trunk/modules/sdl/src/sdl_mouse.cpp
    trunk/modules/sdl/src/sdl_system.cpp
    trunk/modules/sdlgl/include/sdlgl_factory.h
    trunk/modules/sdlgl/include/sdlgl_gfx.h
    trunk/modules/sdlgl/include/sdlgl_system.h
    trunk/modules/sdlgl/saggui_sdlgl.h
    trunk/modules/sdlgl/src/sdlgl_factory.cpp
    trunk/modules/sdlgl/src/sdlgl_gfx.cpp
    trunk/modules/sdlgl/src/sdlgl_system.cpp
    trunk/src/animation.cpp
    trunk/src/bitmap_font.cpp
    trunk/src/coord.cpp
    trunk/src/font.cpp
    trunk/src/font_base.cpp
    trunk/src/font_manager.cpp
    trunk/src/graphic_manager.cpp
    trunk/src/graphics.cpp
    trunk/src/key_events.cpp
    trunk/src/keyinput.cpp
    trunk/src/keyinput_manager.cpp
    trunk/src/keys.cpp
    trunk/src/library_factory.cpp
    trunk/src/mouse.cpp
    trunk/src/mouse_events.cpp
    trunk/src/resource_manager.cpp
    trunk/src/rgba.cpp
    trunk/src/system.cpp
    trunk/src/system_factory.cpp
    trunk/src/widgets/box.cpp
    trunk/src/widgets/button.cpp
    trunk/src/widgets/checkbox.cpp
    trunk/src/widgets/dialog.cpp
    trunk/src/widgets/input_box.cpp
    trunk/src/widgets/label.cpp
    trunk/src/widgets/progress_bar.cpp
    trunk/src/widgets/radial.cpp
    trunk/src/widgets/scroll_bar.cpp
    trunk/src/widgets/text_box.cpp
    trunk/utils/bmpdump/bmpdump-alleg.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Saggui-svn] SF.net SVN: saggui: [407] trunk/examples/demo/src

[<sag...@li...>]

Revision: 407
          http://svn.sourceforge.net/saggui/?rev=407&view=rev
Author:   juvinious
Date:     2007-03-15 03:27:38 -0700 (Thu, 15 Mar 2007)

Log Message:
-----------
Fixed annoying problem with textBox in demo, embedded it inside a dialog so it can be moveable and resizable

Modified Paths:
--------------
    trunk/examples/demo/src/allegro.cpp
    trunk/examples/demo/src/allegrogl.cpp
    trunk/examples/demo/src/openlayer.cpp
    trunk/examples/demo/src/sdl.cpp
    trunk/examples/demo/src/sdlgl.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.