diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2005-10-30 01:24:35 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2005-10-30 01:24:35 +0000 |
commit | a3ed62b36f4d8e4c118bab5f270aa3d73c8c86ec (patch) | |
tree | 170f7f5f8fe3f086d1bbb68843e77a0a8ea4a0ab | |
parent | 6934eaf225773b3892897f45a99a792c6aa2756b (diff) | |
download | rockbox-a3ed62b36f4d8e4c118bab5f270aa3d73c8c86ec.tar.gz rockbox-a3ed62b36f4d8e4c118bab5f270aa3d73c8c86ec.zip |
Corrected a bug on archos with buttonbar which was erased when filetree refreshed (mistake introduced in 2005/10/29 commit; Changed some copyrights in the files (I hope this time will be the good one and the last one ! )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7684 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/buttonbar.c | 18 | ||||
-rw-r--r-- | apps/gui/buttonbar.h | 2 | ||||
-rw-r--r-- | apps/gui/icon.c | 2 | ||||
-rw-r--r-- | apps/gui/icon.h | 2 | ||||
-rw-r--r-- | apps/gui/list.c | 2 | ||||
-rw-r--r-- | apps/gui/list.h | 2 | ||||
-rw-r--r-- | apps/gui/scrollbar.c | 2 | ||||
-rw-r--r-- | apps/gui/scrollbar.h | 2 | ||||
-rw-r--r-- | apps/gui/splash.c | 2 | ||||
-rw-r--r-- | apps/gui/splash.h | 2 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 2 | ||||
-rw-r--r-- | apps/plugins/starfield.c | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 5 | ||||
-rw-r--r-- | apps/screen_access.h | 4 |
15 files changed, 29 insertions, 22 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index 45dc056232..1f6d35700c 100644 --- a/apps/gui/buttonbar.c +++ b/apps/gui/buttonbar.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Linus Nielsen Feltzing (2002), Kevin FERRARE (2005) | 10 | * Copyright (C) Linus Nielsen Feltzing (2002) |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -16,7 +16,13 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | /* | |
20 | 2005 Kevin Ferrare : | ||
21 | - Multi screen support | ||
22 | - Rewrote a lot of code to avoid global vars and make it accept eventually | ||
23 | more that 3 buttons on the bar (just the prototype of gui_buttonbar_set | ||
24 | and the constant BUTTONBAR_MAX_BUTTONS to modify) | ||
25 | */ | ||
20 | #include "config.h" | 26 | #include "config.h" |
21 | #include "buttonbar.h" | 27 | #include "buttonbar.h" |
22 | 28 | ||
@@ -43,8 +49,7 @@ void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) | |||
43 | int xpos, ypos, button_width, text_width; | 49 | int xpos, ypos, button_width, text_width; |
44 | int fw, fh; | 50 | int fw, fh; |
45 | struct screen * display = buttonbar->display; | 51 | struct screen * display = buttonbar->display; |
46 | 52 | ||
47 | display->setfont(FONT_SYSFIXED); | ||
48 | display->getstringsize("M", &fw, &fh); | 53 | display->getstringsize("M", &fw, &fh); |
49 | 54 | ||
50 | button_width = display->width/BUTTONBAR_MAX_BUTTONS; | 55 | button_width = display->width/BUTTONBAR_MAX_BUTTONS; |
@@ -62,7 +67,6 @@ void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) | |||
62 | display->set_drawmode(DRMODE_COMPLEMENT); | 67 | display->set_drawmode(DRMODE_COMPLEMENT); |
63 | display->fillrect(xpos, ypos, button_width - 1, fh); | 68 | display->fillrect(xpos, ypos, button_width - 1, fh); |
64 | display->set_drawmode(DRMODE_SOLID); | 69 | display->set_drawmode(DRMODE_SOLID); |
65 | display->setfont(FONT_UI); | ||
66 | } | 70 | } |
67 | 71 | ||
68 | void gui_buttonbar_set(struct gui_buttonbar * buttonbar, | 72 | void gui_buttonbar_set(struct gui_buttonbar * buttonbar, |
@@ -99,7 +103,8 @@ void gui_buttonbar_draw(struct gui_buttonbar * buttonbar) | |||
99 | { | 103 | { |
100 | struct screen * display = buttonbar->display; | 104 | struct screen * display = buttonbar->display; |
101 | int i; | 105 | int i; |
102 | 106 | display->setfont(FONT_SYSFIXED); | |
107 | |||
103 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 108 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
104 | display->fillrect(0, display->height - BUTTONBAR_HEIGHT, | 109 | display->fillrect(0, display->height - BUTTONBAR_HEIGHT, |
105 | display->width, BUTTONBAR_HEIGHT); | 110 | display->width, BUTTONBAR_HEIGHT); |
@@ -109,6 +114,7 @@ void gui_buttonbar_draw(struct gui_buttonbar * buttonbar) | |||
109 | gui_buttonbar_draw_button(buttonbar, i); | 114 | gui_buttonbar_draw_button(buttonbar, i); |
110 | display->update_rect(0, display->height - BUTTONBAR_HEIGHT, | 115 | display->update_rect(0, display->height - BUTTONBAR_HEIGHT, |
111 | display->width, BUTTONBAR_HEIGHT); | 116 | display->width, BUTTONBAR_HEIGHT); |
117 | display->setfont(FONT_UI); | ||
112 | } | 118 | } |
113 | 119 | ||
114 | bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar) | 120 | bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar) |
diff --git a/apps/gui/buttonbar.h b/apps/gui/buttonbar.h index 9a3f9f4d01..e7a366420c 100644 --- a/apps/gui/buttonbar.h +++ b/apps/gui/buttonbar.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 073cabc532..db69b4b128 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Robert E. Hak(2002), Kevin FERRARE (2005) | 10 | * Copyright (C) Robert E. Hak(2002) |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 8fe7262ffe..3bafdd9084 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/list.c b/apps/gui/list.c index ed26f1c9a8..8c4154631b 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/list.h b/apps/gui/list.h index 4472fadbf8..012251b3d6 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c index da6e18ca91..837b084b62 100644 --- a/apps/gui/scrollbar.c +++ b/apps/gui/scrollbar.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Markus Braun (2002), Kevin FERRARE (2005) | 10 | * Copyright (C) Markus Braun (2002) |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/scrollbar.h b/apps/gui/scrollbar.h index c8ce694caa..3c562b415f 100644 --- a/apps/gui/scrollbar.h +++ b/apps/gui/scrollbar.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 Kevin FERRARE | 10 | * Copyright (C) 2005 Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 9d1cf75732..385d75a2cf 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Daniel Stenberg (2002), Kevin FERRARE (2005) | 10 | * Copyright (C) Daniel Stenberg (2002) |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/splash.h b/apps/gui/splash.h index 3758c9bb23..ca4cf268dd 100644 --- a/apps/gui/splash.h +++ b/apps/gui/splash.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 0f24208d33..c17a741732 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002), Kevin FERRARE (2005) | 10 | * Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002) |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index d80968ff5e..ff44b769e6 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 3d86b4c395..cc8c8b7d20 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * Copyright (C) 2005 Kévin Ferrare | 8 | * Copyright (C) 2005 Kevin Ferrare |
9 | * | 9 | * |
10 | * All files in this archive are subject to the GNU General Public License. | 10 | * All files in this archive are subject to the GNU General Public License. |
11 | * See the file COPYING in the source tree root for full license agreement. | 11 | * See the file COPYING in the source tree root for full license agreement. |
diff --git a/apps/screen_access.c b/apps/screen_access.c index 8656ee8ace..815bdcfe49 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by Kevin FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -27,7 +27,6 @@ | |||
27 | #include <icons.h> | 27 | #include <icons.h> |
28 | 28 | ||
29 | #include "screen_access.h" | 29 | #include "screen_access.h" |
30 | #include "buttonbar.h" | ||
31 | 30 | ||
32 | struct screen screens[NB_SCREENS]; | 31 | struct screen screens[NB_SCREENS]; |
33 | 32 | ||
@@ -156,7 +155,7 @@ void screen_update_nblines(struct screen * screen) | |||
156 | int height=screen->height; | 155 | int height=screen->height; |
157 | if(global_settings.statusbar) | 156 | if(global_settings.statusbar) |
158 | height -= STATUSBAR_HEIGHT; | 157 | height -= STATUSBAR_HEIGHT; |
159 | #if CONFIG_KEYPAD == RECORDER_PAD | 158 | #ifdef HAS_BUTTONBAR |
160 | if(global_settings.buttonbar) | 159 | if(global_settings.buttonbar) |
161 | height -= BUTTONBAR_HEIGHT; | 160 | height -= BUTTONBAR_HEIGHT; |
162 | #endif | 161 | #endif |
diff --git a/apps/screen_access.h b/apps/screen_access.h index 2113a38757..a6190b1956 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 by K�in FERRARE | 10 | * Copyright (C) 2005 by Kevin Ferrare |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -21,6 +21,8 @@ | |||
21 | #define _SCREEN_ACCESS_H_ | 21 | #define _SCREEN_ACCESS_H_ |
22 | 22 | ||
23 | #include "lcd.h" | 23 | #include "lcd.h" |
24 | #include "buttonbar.h" | ||
25 | |||
24 | enum screen_type { | 26 | enum screen_type { |
25 | SCREEN_MAIN | 27 | SCREEN_MAIN |
26 | #ifdef HAVE_REMOTE_LCD | 28 | #ifdef HAVE_REMOTE_LCD |