Merge pull request #28 from Tectu/master

Merge Tectu Changes

7 files changed, 31 insertions, 189 deletions

diff --git a/include/gwin/button.h b/include/gwin/button.h
index 3d54afbb..e56215fa 100644
--- a/include/gwin/button.h
+++ b/include/gwin/button.h
@@ -1,36 +1,8 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @file    include/gwin/button.h
- * @brief   GWIN Graphic window subsystem header file.
- *
- * @defgroup Button Button
- * @ingroup GWIN
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
  *
- * @details		GWIN allows it to easily create buttons with different styles
- *				and check for different meta states such as: PRESSED, CLICKED,
- *				RELEASED etc.
- *
- * @pre			GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre			GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h
- * @{
+ *              http://chibios-gfx.com/license.html
  */
 
 #ifndef _GWIN_BUTTON_H
diff --git a/include/gwin/console.h b/include/gwin/console.h
index c6d89db6..e1f0260f 100644
--- a/include/gwin/console.h
+++ b/include/gwin/console.h
@@ -1,37 +1,9 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012, 2013

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-/**

- * @file    include/gwin/console.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @defgroup Console Console

- * @ingroup GWIN

- *

- * @details		GWIN allows it to create a console/terminal like window.

- *				You can simply use chprintf() to print to the terminal.

- *

- * @pre			GFX_USE_GWIN must be set to TRUE in your gfxconf.h

- * @pre			GWIN_NEED_CONSOLE must be set to TRUE in your gfxconf.h

- *

- * @{

- */

+/*
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 

 #ifndef _GWIN_CONSOLE_H

 #define _GWIN_CONSOLE_H

diff --git a/include/gwin/graph.h b/include/gwin/graph.h
index 223ba27f..dea8d4ee 100644
--- a/include/gwin/graph.h
+++ b/include/gwin/graph.h
@@ -1,22 +1,9 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 
 /**
  * @file	include/gwin/graph.h
diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index 3d994d0a..1c8672de 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -1,38 +1,8 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @file    include/gwin/gwin.h
- * @brief   GWIN Graphic window subsystem header file.
- *
- * @defgroup Window Window
- * @ingroup GWIN
- *
- * @details	GWIN provides a basic window manager which allows it to easily
- *			create and destroy different windows on runtime. Each window
- *			will have it's own properties such as colors, brushes as well as
- *			it's own drawing origin.
- *			Moving the windows around is not supported yet.
- *
- * @pre		GFX_USE_GWIN must be set to TRUE in your gfxconf.h
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
  *
- * @{
+ *              http://chibios-gfx.com/license.html
  */
 
 #ifndef _GWIN_H
diff --git a/include/gwin/internal.h b/include/gwin/internal.h
index ada8f611..fbd0d1c1 100644
--- a/include/gwin/internal.h
+++ b/include/gwin/internal.h
@@ -1,29 +1,9 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012, 2013

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-/**

- * @file    include/gwin/internal.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @addtogroup GWIN

- * @{

- */

+/*
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 #ifndef _GWIN_INTERNAL_H

 #define _GWIN_INTERNAL_H

 

diff --git a/include/gwin/options.h b/include/gwin/options.h
index e8d527e0..8d78a751 100644
--- a/include/gwin/options.h
+++ b/include/gwin/options.h
@@ -1,22 +1,9 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 
 /**
  * @file    include/gwin/options.h
diff --git a/include/gwin/slider.h b/include/gwin/slider.h
index 1943729f..8f38b504 100644
--- a/include/gwin/slider.h
+++ b/include/gwin/slider.h
@@ -1,34 +1,8 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @file    include/gwin/slider.h
- * @brief   GWIN Graphic window subsystem header file.
- *
- * @defgroup Slider Slider
- * @ingroup GWIN
- *
- * @details		Create sliders with different styles
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
  *
- * @pre			GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre			GWIN_NEED_SLIDER must be set to TRUE in your gfxconf.h
- * @{
+ *              http://chibios-gfx.com/license.html
  */
 
 #ifndef _GWIN_SLIDER_H