From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 20 May 2008 15:48:36 +0000 (+0000)
Subject: Clean up. Remove CVS logs.
X-Git-Tag: 2.0.0~635
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e80e23f444901bfa433a6ddbd99abdd6d7996cc4;p=bertos.git

Clean up. Remove CVS logs.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1299 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/gui/menubar.c b/bertos/gui/menubar.c
index f62a2fee..9bd0c58e 100644
--- a/bertos/gui/menubar.c
+++ b/bertos/gui/menubar.c
@@ -1,14 +1,42 @@
 /**
  * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2004, 2008 Develer S.r.l. (http://www.develer.com/)
  * All Rights Reserved.
+ * -->
+ *
+ * \brief Graphics Menu bar widget
  *
  * \version $Id$
  *
  * \author Stefano Fedrigo <aleph@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  *
- * \brief Graphics Menu bar widget
  */
 
 #include "menubar.h"
@@ -18,6 +46,9 @@
 #include <gfx/font.h>
 #include <cfg/compiler.h>
 
+#warning FIXME:This module is obsolete, you must refactor it!
+
+#if 0
 #if CPU_AVR
 	#include <avr/pgmspace.h> /* strlen_P() */
 #else
@@ -43,11 +74,7 @@ static const pgm_char lab_10[] = " "DOWN_ARROW" ";
 static const pgm_char lab_11[] = " - ";
 static const pgm_char lab_12[] = " + ";
 static const pgm_char lab_13[] = "sel ";
-#if OEM_BRAND == OEM_CLAIRBROS
-static const pgm_char lab_14[] = "gain";
-#else
 static const pgm_char lab_14[] = "lock";
-#endif
 static const pgm_char lab_15[] = "unlock";
 static const pgm_char lab_16[] = "more";
 static const pgm_char lab_17[] = "edit";
@@ -148,3 +175,5 @@ void mbar_draw(const struct MenuBar *mb)
 
 	text_style(mb->bitmap, oldstyle, STYLEF_MASK);
 }
+#endif
+
diff --git a/bertos/gui/menubar.h b/bertos/gui/menubar.h
index 324167f4..8541eae8 100644
--- a/bertos/gui/menubar.h
+++ b/bertos/gui/menubar.h
@@ -1,41 +1,48 @@
 /**
  * \file
- * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2004, 2005, 2008 Develer S.r.l. (http://www.develer.com/)
  * All Rights Reserved.
+ * -->
+ *
+ * \brief Graphic menu bar widget.
  *
  * \version $Id$
  *
  * \author Stefano Fedrigo <aleph@develer.com>
  *
- * \brief Graphic menu bar widget.
  */
 
-/*#*
- *#* $Log: menubar.h,v $
- *#* Revision 1.17  2006/06/16 16:18:49  batt
- *#* Fix doxygen docs.
- *#*
- *#* Revision 1.16  2005/11/16 18:10:19  bernie
- *#* Move top-level headers to cfg/ as in DevLib.
- *#*
- *#* Revision 1.15  2005/02/17 03:49:21  bernie
- *#* Update to new PGM api.
- *#*
- *#* Revision 1.14  2004/10/31 11:02:15  aleph
- *#* Rename functions with correct codying conventions; Simplify version display
- *#*
- *#* Revision 1.13  2004/09/27 12:05:46  powersoft
- *#* Use sel label for toggle menus and remove it
- *#*
- *#* Revision 1.12  2004/09/27 10:05:33  powersoft
- *#* Menu cosmetic fixes
- *#*/
 #ifndef MWARE_MENUBAR_H
 #define MWARE_MENUBAR_H
 
 #include <appconfig.h>
 #include <cfg/compiler.h>
-#include <brand.h>
 
 /** Predefined labels ids */
 enum LabelId
@@ -53,11 +60,7 @@ enum LabelId
 	LABEL_MINUS,
 	LABEL_PLUS,
 	LABEL_SEL,
-	#if OEM_BRAND == OEM_CLAIRBROS
-	LABEL_GAIN,
-	#else
 	LABEL_LOCK,
-	#endif
 	LABEL_UNLOCK,
 	LABEL_MORE,
 	LABEL_EDIT,