X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.c;h=dc0f79a2ff3f88a5b99cb3ba50a124992104fd54;hb=7c051389f54e9da902884c617cb881a052b0c101;hp=e40eea0e02490bccd273d16c99402fea801ed0cd;hpb=4d6d308ca900a435e80acf51b71e3ea7eccd8d5c;p=bertos.git

diff --git a/app/demo/demo.c b/app/demo/demo.c
index e40eea0e..dc0f79a2 100755
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/04/27 05:43:07  bernie
+ *#* Fix naming conventions.
+ *#*
+ *#* Revision 1.3  2006/04/11 00:07:32  bernie
+ *#* Implemenent MF_SAVESEL flag.
+ *#*
  *#* Revision 1.2  2006/03/27 04:49:50  bernie
  *#* Add bouncing logo demo.
  *#*
@@ -44,27 +50,27 @@
 
 static struct MenuItem settings_items[] =
 {
-	{ (const_iptr_t)"settings_0", 0, (MenuHook)0,  (iptr_t)0        },
-	{ (const_iptr_t)"settings_1", 0, (MenuHook)0,  (iptr_t)0        },
-	{ (const_iptr_t)"settings_2", 0, (MenuHook)0, (iptr_t)0      },
-	{ (const_iptr_t)"settings_3", 0, (MenuHook)0,  (iptr_t)0   },
-	{ (const_iptr_t)"settings_4", 0, (MenuHook)0,  (iptr_t)0 },
-	{ (const_iptr_t)"settings_5", MIF_TOGGLE, (MenuHook)0, (iptr_t)0             },
+	{ (const_iptr_t)"System",     0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Mouse",      0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Keyboard",   0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Networking", 0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Date & Time",0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Power Saving", MIF_TOGGLE, (MenuHook)0, (iptr_t)0 },
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY, &lcd_bitmap, 0 };
+static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
 
 /*** DISPLAY MENU ****************************/
 
 static struct MenuItem display_items[] =
 {
-	{ (const_iptr_t)"display_0", 0, (MenuHook)0,           (iptr_t)0 },
-	{ (const_iptr_t)"display_1", 0, (MenuHook)0, (iptr_t)0     },
-	{ (const_iptr_t)"display_2", 0, (MenuHook)0,   (iptr_t)0     },
-	{ (const_iptr_t)"display_3", 0, (MenuHook)0,  (iptr_t)0 },
+	{ (const_iptr_t)"Background", 0, (MenuHook)0, (iptr_t)0 },
+	{ (const_iptr_t)"Colors",     0, (MenuHook)0, (iptr_t)0 },
+	{ (const_iptr_t)"Style",      0, (MenuHook)0, (iptr_t)0 },
+	{ (const_iptr_t)"Icon Theme", 0, (MenuHook)0, (iptr_t)0 },
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu display_menu = { display_items, "Display Menu", MF_STICKY, &lcd_bitmap, 0 };
+static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0 };
 
 
 /*** SETUP MENU ******************************/
@@ -77,7 +83,7 @@ static struct MenuItem setup_items[] =
 	{ (const_iptr_t)"Setup 3", 0, (MenuHook)NULL, (iptr_t)0    },
 	{ (const_iptr_t)0, 0, NULL, NULL }
 };
-static struct Menu setup_menu = { setup_items, "Setup Menu", MF_STICKY, &lcd_bitmap, 0 };
+static struct Menu setup_menu = { setup_items, "Setup Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
 
 
 /*** MAIN MENU *******************************/
@@ -106,7 +112,7 @@ Window root_win;
 void schedule(void)
 {
 //	win_compose(&root_win);
-	lcd_blit_bitmap(root_win.bitmap);
+	lcd_blitBitmap(root_win.bitmap);
 	emul_idle();
 	usleep(10000);
 }
@@ -126,7 +132,7 @@ void hello_world(void)
 	text_xprintf(&lcd_bitmap, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER, "Hello, world!");
 	for (int i = 0; i < 1000; ++i)
 	{
-		lcd_blit_bitmap(&lcd_bitmap);
+		lcd_blitBitmap(&lcd_bitmap);
 		emul_idle();
 	}
 }
@@ -164,7 +170,7 @@ void bouncing_logo(void)
 			(lcd_bitmap.width - project_grl_logo.width) / 2,
 			h / SPEED_SCALE,
 			&project_grl_logo);
-		lcd_blit_bitmap(&lcd_bitmap);
+		lcd_blitBitmap(&lcd_bitmap);
 
 		timer_delay(10);
 	}
@@ -259,7 +265,7 @@ int main(int argc, char *argv[])
 			win_raise(&large_win);
 
 		win_compose(&root_win);
-		lcd_blit_bitmap(root_win.bitmap);
+		lcd_blitBitmap(root_win.bitmap);
 		emul_idle();
 		usleep(10000);
 	}