[Tux4kids-commits] r542 - in tuxtype: branches/soc3/src trunk/data/images/hands trunk/data/images/keyboard

sreyas-guest at alioth.debian.org sreyas-guest at alioth.debian.org
Sat Jun 21 16:26:31 UTC 2008


Author: sreyas-guest
Date: 2008-06-21 16:26:30 +0000 (Sat, 21 Jun 2008)
New Revision: 542

Modified:
   tuxtype/branches/soc3/src/alphabet.c
   tuxtype/branches/soc3/src/funcs.h
   tuxtype/branches/soc3/src/practice.c
   tuxtype/trunk/data/images/hands/0.png
   tuxtype/trunk/data/images/hands/1.png
   tuxtype/trunk/data/images/hands/2.png
   tuxtype/trunk/data/images/hands/3.png
   tuxtype/trunk/data/images/hands/4.png
   tuxtype/trunk/data/images/hands/5.png
   tuxtype/trunk/data/images/hands/6.png
   tuxtype/trunk/data/images/hands/7.png
   tuxtype/trunk/data/images/hands/8.png
   tuxtype/trunk/data/images/hands/9.png
   tuxtype/trunk/data/images/hands/hands.png
   tuxtype/trunk/data/images/keyboard/Makefile.am
   tuxtype/trunk/data/images/keyboard/Makefile.in
   tuxtype/trunk/data/images/keyboard/keyboard-us.png
   tuxtype/trunk/data/images/keyboard/keyboard.png
Log:


Modified: tuxtype/branches/soc3/src/alphabet.c
===================================================================
--- tuxtype/branches/soc3/src/alphabet.c	2008-06-21 16:14:01 UTC (rev 541)
+++ tuxtype/branches/soc3/src/alphabet.c	2008-06-21 16:26:30 UTC (rev 542)
@@ -55,9 +55,16 @@
 
 /* An individual item in the list of unicode characters in the keyboard setup.   */
 /* Basically, just the Unicode value for the key and the finger used to type it. */
+/*typedef struct keymap {
+	char keyname[5];
+	int shift;
+} keymap;*/
 typedef struct kbd_char {
   wchar_t unicode_value;
   char finger;
+	//keymap key;
+	char keyname[5];
+	int shift;
 } kbd_char;
 
 /* List with one entry for each typable character in keyboard setup - has the */
@@ -84,6 +91,7 @@
 static void clear_keyboard(void);
 static int unicode_in_key_list(wchar_t uni_char);
 int check_needed_unicodes_str(const wchar_t* s);
+int map_keys(wchar_t *wide_str,char *keyname,int *shift);
 
 #ifndef WIN32
 #ifndef MACOSX
@@ -182,11 +190,12 @@
         {
           fprintf(stderr, "Adding key: Unicode char = '%C'\tUnicode value = %d\tfinger = %d\n",
                   wide_str[2], wide_str[2], wcstol(&wide_str[0], NULL, 0)); 
-        }
+	}
 
         /* Just plug values into array: */
         keyboard_list[k].unicode_value = wide_str[2];
         keyboard_list[k].finger = wcstol(&wide_str[0], NULL, 0);
+        map_keys(&wide_str[0],keyboard_list[k].keyname,&keyboard_list[k].shift);
         k++;
       }
     } while (!feof(f));
@@ -204,34 +213,58 @@
 /* Returns -1 if somehow no finger associated with a Unicode value    */
 /* in the list (shouldn't happen).                                    */
 /* Returns -2 if Unicode value not in list.                           */
-int GetFinger(wchar_t uni_char)
+int GetFinger(int i)
 {
-  int i = 0;
-
-  while ((i < MAX_UNICODES)
-     &&  (keyboard_list[i].unicode_value != uni_char))
+  if (i == -1)
   {
-    i++;
-  }
-
-  if (i == MAX_UNICODES)
-  {
-    fprintf(stderr, "GetFinger() - Unicode char '%C' not found in list.\n", uni_char);
+    fprintf(stderr, "GetFinger() - Unicode char '%C' not found in list.\n");
     return -2;
   }
 
   if ((keyboard_list[i].finger < 0)
    || (keyboard_list[i].finger > 9))
   {
-    fprintf(stderr, "GetFinger() - Unicode char '%C' has no valid finger.\n",uni_char);
+    fprintf(stderr, "GetFinger() - Unicode char '%C' has no valid finger.\n");
     return -1;
   }  
 
   return (int)keyboard_list[i].finger; /* Keep compiler from complaining */
 }
 
+int GetIndex(wchar_t uni_char)
+{
+  int i = 0;
 
+  while ((i < MAX_UNICODES)
+     &&  (keyboard_list[i].unicode_value != uni_char))
+  {
+    i++;
+  }
 
+  if (i == MAX_UNICODES)
+  {
+    fprintf(stderr, "GeteKeypress() - Unicode char '%C' not found in list.\n", uni_char);
+    return -1;
+  }
+
+  return i;
+}
+
+void GetKeyPos(int index, char *buf)
+{
+	sprintf(buf,"keyboard/keyboard_%s.png", keyboard_list[index].keyname);
+	
+}
+void GetKeyShift(int index, char *buf)
+{
+	if(keyboard_list[index].shift==0)
+		sprintf(buf,"keyboard/keyboard_None.png");
+		else
+		 	if(keyboard_list[index].shift==1)
+				sprintf(buf,"keyboard/keyboard_D00.png");
+				else
+							sprintf(buf,"keyboard/keyboard_D11.png", settings.default_data_path);			
+}
 int unicode_in_key_list(wchar_t uni_char)
 {
   int i = 0;
@@ -976,6 +1009,353 @@
   return 1;
 }
 
+/* This function just tidies up all the ptr args needed for      */
+/* ConvertUTF8toUTF32() from Unicode, Inc. into a neat wrapper.  */
+/* It returns -1 on error, otherwise returns the length of the   */
+/* converted, null-terminated wchar_t* string now stored in the  */
+/* location of the 'wide_word' pointer.                          */
+int ConvertFromUTF8(wchar_t* wide_word, const unsigned char* UTF8_word)
+{
+  int i = 0;
+  ConversionResult result;
+  UTF8 temp_UTF8[FNLEN];
+  UTF32 temp_UTF32[FNLEN];
+
+  const UTF8* UTF8_Start = temp_UTF8;
+  const UTF8* UTF8_End = &temp_UTF8[FNLEN-1];
+  UTF32* UTF32_Start = temp_UTF32;
+  UTF32* UTF32_End = &temp_UTF32[FNLEN-1];
+
+  strncpy(temp_UTF8, UTF8_word, FNLEN);
+
+  ConvertUTF8toUTF32(&UTF8_Start, UTF8_End,
+                     &UTF32_Start, UTF32_End, 0);
+
+  wide_word[0] = '\0';
+
+  while ((i < FNLEN) && (temp_UTF32[i] != '\0'))
+  {
+    wide_word[i] = temp_UTF32[i];
+    i++; 
+  }
+
+  if (i >= FNLEN)
+  {
+    fprintf(stderr, "convert_from_UTF8(): buffer overflow\n");
+    return -1;
+  }
+  else  //need terminating null:
+  {
+    wide_word[i] = '\0';
+  }
+
+  DEBUGCODE {fprintf(stderr, "wide_word = %ls\n", wide_word);}
+
+  return wcslen(wide_word);
+}
+
+/******************************************************************/
+int map_keys(wchar_t *wide_str,char *keyname,int *shift)
+{
+	wchar_t tmp;
+	if ((wcslen(wide_str) <5))
+		tmp=wide_str[2];
+	else
+		tmp=wide_str[5];
+	switch(tmp)
+	{
+		case '`':strcpy(keyname,"A00");
+			*shift=0;
+			break;
+		case '~':strcpy(keyname,"A00");
+			*shift=2;
+			break;
+		case '1':strcpy(keyname,"A01");
+			*shift=0;
+			break;
+		case '!':strcpy(keyname,"A01");
+			*shift=2;
+			break;
+		case '2':strcpy(keyname,"A02");
+			*shift=0;
+			break;
+		case '@':strcpy(keyname,"A02");
+			*shift=2;
+			break;
+		case '3':strcpy(keyname,"A03");
+			*shift=0;
+			break;
+		case '#':strcpy(keyname,"A03");
+			*shift=2;
+			break;
+		case '4':strcpy(keyname,"A04");
+			*shift=0;
+			break;
+		case '$':strcpy(keyname,"A04");
+			*shift=2;
+			break;
+		case '5':strcpy(keyname,"A05");
+			*shift=0;
+			break;
+		case '%':strcpy(keyname,"A05");
+			*shift=2;
+			break;
+		case '6':strcpy(keyname,"A06");
+			*shift=0;
+			break;
+		case '^':strcpy(keyname,"A06");
+			*shift=1;
+			break;
+		case '7':strcpy(keyname,"A07");
+			*shift=0;
+			break;
+		case '&':strcpy(keyname,"A07");
+			*shift=1;
+			break;
+		case '8':strcpy(keyname,"A08");
+			*shift=0;
+			break;
+		case '*':strcpy(keyname,"A08");
+			*shift=1;
+			break;
+		case '9':strcpy(keyname,"A09");
+			*shift=0;
+			break;
+		case '(':strcpy(keyname,"A09");
+			*shift=1;
+			break;
+		case '0':strcpy(keyname,"A10");
+			*shift=0;
+			break;
+		case ')':strcpy(keyname,"A10");
+			*shift=1;
+			break;
+		case '-':strcpy(keyname,"A11");
+			*shift=0;
+			break;
+		case '_':strcpy(keyname,"A11");
+			*shift=1;
+			break;
+		case '=':strcpy(keyname,"A12");
+			*shift=0;
+			break;
+		case '+':strcpy(keyname,"A12");
+			*shift=1;
+			break;
+		case '\\':strcpy(keyname,"A13");
+			*shift=0;
+			break;
+		case '|':strcpy(keyname,"A13");
+			*shift=1;
+			break;
+		case 'q':strcpy(keyname,"B01;");
+			*shift=0;
+			break;
+		case 'Q':strcpy(keyname,"B01");
+			*shift=2;
+			break;
+		case 'w':strcpy(keyname,"B02");
+			*shift=0;
+			break;
+		case 'W':strcpy(keyname,"B02");
+			*shift=2;
+			break;
+		case 'e':strcpy(keyname,"B03");
+			*shift=0;
+			break;
+		case 'E':strcpy(keyname,"B03");
+			*shift=2;
+			break;
+		case 'r':strcpy(keyname,"B04");
+			*shift=0;
+			break;
+		case 'R':strcpy(keyname,"B04");
+			*shift=2;
+			break;
+		case 't':strcpy(keyname,"B05");
+			*shift=0;
+			break;
+		case 'T':strcpy(keyname,"B05");
+			*shift=2;
+			break;
+		case 'y':strcpy(keyname,"B06");
+			*shift=0;
+			break;
+		case 'Y':strcpy(keyname,"B06");
+			*shift=1;
+			break;
+		case 'u':strcpy(keyname,"0xB07");
+			*shift=0;
+			break;
+		case 'U':strcpy(keyname,"B07");
+			*shift=1;
+			break;
+		case 'i':strcpy(keyname,"B08");
+			*shift=0;
+			break;
+		case 'I':strcpy(keyname,"B08");
+			*shift=1;
+			break;
+		case 'o':strcpy(keyname,"B09");
+			*shift=0;
+			break;
+		case 'O':strcpy(keyname,"B09");
+			*shift=1;
+			break;
+		case 'p':strcpy(keyname,"B10");
+			*shift=0;
+			break;
+		case 'P':strcpy(keyname,"B10");
+			*shift=1;
+			break;
+		case '[':strcpy(keyname,"B11");
+			*shift=0;
+			break;
+		case '{':strcpy(keyname,"B11");
+			*shift=1;
+			break;
+		case ']':strcpy(keyname,"B12");
+			*shift=0;
+			break;
+		case '}':strcpy(keyname,"B12");
+			*shift=1;
+			break;
+		case 'a':strcpy(keyname,"C01");
+			*shift=0;
+			break;
+		case 'A':strcpy(keyname,"C01");
+			*shift=2;
+			break;
+		case 's':strcpy(keyname,"C02");
+			*shift=0;
+			break;
+		case 'S':strcpy(keyname,"C02");
+			*shift=2;
+			break;
+		case 'd':strcpy(keyname,"C03");
+			*shift=0;
+			break;
+		case 'D':strcpy(keyname,"C03");
+			*shift=2;
+			break;
+		case 'f':strcpy(keyname,"C04");
+			*shift=0;
+			break;
+		case 'F':strcpy(keyname,"C04");
+			*shift=2;
+			break;
+		case 'g':strcpy(keyname,"C05");
+			*shift=0;
+			break;
+		case 'G':strcpy(keyname,"C05");
+			*shift=2;
+			break;
+		case 'h':strcpy(keyname,"C06");
+			*shift=0;
+			break;
+		case 'H':strcpy(keyname,"C06");
+			*shift=1;
+			break;
+		case 'j':strcpy(keyname,"C07");
+			*shift=0;
+			break;
+		case 'J':strcpy(keyname,"C07");
+			*shift=1;
+			break;
+		case 'k':strcpy(keyname,"C08");
+			*shift=0;
+			break;
+		case 'K':strcpy(keyname,"C08");
+			*shift=1;
+			break;
+		case 'l':strcpy(keyname,"C09");
+			*shift=0;
+			break;
+		case 'L':strcpy(keyname,"C09");
+			*shift=1;
+			break;
+		case ';':strcpy(keyname,"C10");
+			*shift=0;
+			break;
+		case ':':strcpy(keyname,"C10");
+			*shift=1;
+			break;			
+		case '\'':strcpy(keyname,"C11");
+			*shift=0;
+			break;
+		case '"':strcpy(keyname,"C11");
+			*shift=1;
+			break;
+		case 'z':strcpy(keyname,"D01");
+			*shift=0;
+			break;
+		case 'Z':strcpy(keyname,"D01");
+			*shift=2;
+			break;
+		case 'x':strcpy(keyname,"D02");
+			*shift=0;
+			break;
+		case 'X':strcpy(keyname,"D02");
+			*shift=2;
+			break;
+		case 'c':strcpy(keyname,"D03");
+			*shift=0;
+			break;
+		case 'C':strcpy(keyname,"D03");
+			*shift=2;
+			break;
+		case 'v':strcpy(keyname,"D04");
+			*shift=0;
+			break;
+		case 'V':strcpy(keyname,"D04");
+			*shift=2;
+			break;
+		case 'b':strcpy(keyname,"D05");
+			*shift=0;
+			break;
+		case 'B':strcpy(keyname,"D05");
+			*shift=2;
+			break;
+		case 'n':strcpy(keyname,"D06");
+			*shift=0;
+			break;
+		case 'N':strcpy(keyname,"D06");
+			*shift=1;
+			break;
+		case 'm':strcpy(keyname,"D07");
+			*shift=0;
+			break;
+		case 'M':strcpy(keyname,"D07");
+			*shift=1;
+			break;
+		case ',':strcpy(keyname,"D08");
+			*shift=0;
+			break;
+		case '<':strcpy(keyname,"D08");
+			*shift=1;
+			break;
+		case '.':strcpy(keyname,"D09");
+			*shift=0;
+			break;
+		case '>':strcpy(keyname,"D09");
+			*shift=1;
+			break;
+		case '/':strcpy(keyname,"D10");
+			*shift=0;
+			break;
+		case '?':strcpy(keyname,"D10");
+			*shift=1;
+			break;
+		case ' ':strcpy(keyname,"E03");
+			*shift=0;
+			break;
+	default:strcpy(keyname,"None");
+		*shift=0;
+		break;
+	}
+}
+/****************************************************************/
+
 /****************************************************/
 /*                                                  */
 /*       Local ("private") functions:               */
@@ -1119,48 +1499,4 @@
 }
 
 
-/* This function just tidies up all the ptr args needed for      */
-/* ConvertUTF8toUTF32() from Unicode, Inc. into a neat wrapper.  */
-/* It returns -1 on error, otherwise returns the length of the   */
-/* converted, null-terminated wchar_t* string now stored in the  */
-/* location of the 'wide_word' pointer.                          */
-int ConvertFromUTF8(wchar_t* wide_word, const unsigned char* UTF8_word)
-{
-  int i = 0;
-  ConversionResult result;
-  UTF8 temp_UTF8[FNLEN];
-  UTF32 temp_UTF32[FNLEN];
 
-  const UTF8* UTF8_Start = temp_UTF8;
-  const UTF8* UTF8_End = &temp_UTF8[FNLEN-1];
-  UTF32* UTF32_Start = temp_UTF32;
-  UTF32* UTF32_End = &temp_UTF32[FNLEN-1];
-
-  strncpy(temp_UTF8, UTF8_word, FNLEN);
-
-  ConvertUTF8toUTF32(&UTF8_Start, UTF8_End,
-                     &UTF32_Start, UTF32_End, 0);
-
-  wide_word[0] = '\0';
-
-  while ((i < FNLEN) && (temp_UTF32[i] != '\0'))
-  {
-    wide_word[i] = temp_UTF32[i];
-    i++; 
-  }
-
-  if (i >= FNLEN)
-  {
-    fprintf(stderr, "convert_from_UTF8(): buffer overflow\n");
-    return -1;
-  }
-  else  //need terminating null:
-  {
-    wide_word[i] = '\0';
-  }
-
-  DEBUGCODE {fprintf(stderr, "wide_word = %ls\n", wide_word);}
-
-  return wcslen(wide_word);
-}
-

Modified: tuxtype/branches/soc3/src/funcs.h
===================================================================
--- tuxtype/branches/soc3/src/funcs.h	2008-06-21 16:14:01 UTC (rev 541)
+++ tuxtype/branches/soc3/src/funcs.h	2008-06-21 16:26:30 UTC (rev 542)
@@ -46,8 +46,12 @@
 SDL_Surface* GetWhiteGlyph(wchar_t t);
 SDL_Surface* GetRedGlyph(wchar_t t);
 int LoadKeyboard(void);
-int GetFinger(wchar_t uni_char);
+int GetFinger(int i);
 int RenderLetters(const TTF_Font* letter_font);
+int GetIndex(wchar_t uni_char);
+void GetKeyShift(int index, char *buf);
+void GetKeyPos(int index, char *buf);
+//int map_keys(wchar_t *wide_str,keymap key);
 
 //void UseAlphabet(void);
 

Modified: tuxtype/branches/soc3/src/practice.c
===================================================================
--- tuxtype/branches/soc3/src/practice.c	2008-06-21 16:14:01 UTC (rev 541)
+++ tuxtype/branches/soc3/src/practice.c	2008-06-21 16:26:30 UTC (rev 542)
@@ -24,8 +24,11 @@
 
 static SDL_Surface* bg = NULL;
 static SDL_Surface* hands = NULL; 
+static SDL_Surface* keyboard = NULL;
+static SDL_Surface* keypress1 = NULL;
+static SDL_Surface* keypress2 = NULL;
 static SDL_Surface* hand[11] = {NULL};
-static SDL_Rect hand_loc, letter_loc;
+static SDL_Rect hand_loc, letter_loc,keyboard_loc;
 static TTF_Font* font = NULL;
 static wchar_t phrase[255][FNLEN];
 
@@ -37,6 +40,8 @@
 static void practice_unload_media(void);
 static void print_at(const wchar_t* pphrase, int wrap, int x, int y);
 static void show(unsigned char t);
+SDL_Surface* GetKeypress1(int index);
+SDL_Surface* GetKeypress2(int index);
 
 
 /************************************************************************/
@@ -81,6 +86,7 @@
 
   SDL_BlitSurface(bg, NULL, screen, NULL);
   SDL_BlitSurface(hands, NULL, screen, &hand_loc);
+  SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
   SDL_Flip(screen);
 
   wp = get_phrase(pphrase);
@@ -132,6 +138,7 @@
       case 0:
         start = SDL_GetTicks();
         SDL_BlitSurface(hands, NULL, screen, &hand_loc);
+        SDL_BlitSurface(keyboard, NULL, screen, &keyboard_loc);
         state = 1;
         break;
 
@@ -141,9 +148,18 @@
           /* Show finger hint, if available. Note that GetFinger() */
           /* returns negative values on error and never returns a  */
           /* value greater than 9.                                 */
-          int fing = GetFinger(pphrase[c]);
+          int key = GetIndex(pphrase[c]);
+          int fing = GetFinger(key);
+          keypress1= GetKeypress1(key);
+          keypress2= GetKeypress2(key);
+          /*if (!keypress1)
+          if((!keypress2)*/      
           if (fing >= 0) 
             SDL_BlitSurface(hand[fing], NULL, screen, &hand_loc);
+          SDL_BlitSurface(keypress1, NULL, screen, &keyboard_loc);
+          SDL_BlitSurface(keypress2, NULL, screen, &keyboard_loc);
+          SDL_FreeSurface(keypress1);
+          SDL_FreeSurface(keypress2);
           state = 2;
         }
         break;
@@ -162,9 +178,16 @@
 
       case 4:
         {
-          int fing = GetFinger(pphrase[c]);
+          int key = GetIndex(pphrase[c]);
+          int fing = GetFinger(key);
+          keypress1= GetKeypress1(key);
+          keypress2= GetKeypress2(key);
           if (fing >= 0) 
             SDL_BlitSurface(hand[fing], NULL, screen, &hand_loc);
+          SDL_BlitSurface(keypress1, NULL, screen, &keyboard_loc);
+          SDL_BlitSurface(keypress2, NULL, screen, &keyboard_loc);
+          SDL_FreeSurface(keypress1);
+          SDL_FreeSurface(keypress2);
           state = 11;
           break;
         }
@@ -291,6 +314,7 @@
 
 
   hands = LoadImage("hands/hands.png", IMG_ALPHA);
+	keyboard = LoadImage("keyboard/keyboard.png", IMG_ALPHA);
   bg = LoadImage("main_bkg.png", IMG_ALPHA);
   wrong = LoadSound("tock.wav");
   font = LoadFont(settings.theme_font_name, 30);
@@ -321,6 +345,12 @@
   hand_loc.w = (hand[0]->w);
   hand_loc.h = (hand[0]->h);
 
+	/********Position of keyboard image*/
+  keyboard_loc.x = screen->w/2 -keyboard->w/2; 
+  keyboard_loc.y = screen->h/2;
+  keyboard_loc.w = screen->w/8;
+  keyboard_loc.h = screen->h/8;
+
   /* Now render letters for glyphs in alphabet: */
   RenderLetters(font);
   TTF_CloseFont(font);  /* Don't need it after rendering done */
@@ -339,6 +369,8 @@
         bg = NULL;
 	SDL_FreeSurface(hands);
         hands = NULL;
+   SDL_FreeSurface(keyboard);
+        keyboard = NULL;
 	//TTF_CloseFont(font);
 
 	for (i=0; i<10; i++) 
@@ -591,3 +623,17 @@
 	buf[i+1]=0;
         print_at(buf,wcslen(buf),230 ,400);
 }
+
+SDL_Surface* GetKeypress1(int index)
+{
+	char buf[50];
+	GetKeyPos(index,buf);
+	return (LoadImage(buf, IMG_ALPHA));
+}
+
+SDL_Surface* GetKeypress2(int index)
+{
+	char buf[50];
+	GetKeyShift(index,buf);
+	return (LoadImage(buf, IMG_ALPHA));
+}
\ No newline at end of file

Modified: tuxtype/trunk/data/images/hands/0.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/1.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/2.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/3.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/4.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/5.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/6.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/7.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/8.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/9.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/hands/hands.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/keyboard/Makefile.am
===================================================================
--- tuxtype/trunk/data/images/keyboard/Makefile.am	2008-06-21 16:14:01 UTC (rev 541)
+++ tuxtype/trunk/data/images/keyboard/Makefile.am	2008-06-21 16:26:30 UTC (rev 542)
@@ -11,3 +11,67 @@
   larrow.png \
   space.png \
   rarrow.png
+	keyboard_B05.png \
+	keyboard_C11.png \
+	keyboard_E04.png \
+	keyboard_A00.png \
+	keyboard_B06.png \
+	keyboard_C12.png \
+	keyboard_E05.png \
+	keyboard_A01.png \
+	keyboard_B07.png \
+	keyboard_C13.png \
+	keyboard_E06.png \
+	keyboard_A02.png \
+	keyboard_B08.png \
+	keyboard_D00.png \
+	keyboard_E07.png \
+	keyboard_A03.png \
+	keyboard_B09.png \
+	keyboard_D01.png \
+	keyboard_A04.png \
+	keyboard_B10.png \
+	keyboard_D02.png \
+	keyboard_None.png \
+	keyboard_A05.png \
+	keyboard_B11.png \
+	keyboard_D03.png \
+	keyboard_A06.png \
+	keyboard_B12.png \
+	keyboard_D04.png \
+	keyboard_A07.png \
+	keyboard_B13.png \
+	keyboard_D05.png \
+	keyboard_A08.png \
+	keyboard_C00.png \
+	keyboard_D06.png \
+	keyboard_A09.png \
+	keyboard_C01.png \
+	keyboard_D07.png \
+	keyboard_A10.png \
+	keyboard_C02.png \
+	keyboard_D08.png \
+	keyboard_A11.png \
+	keyboard_C03.png \
+	keyboard_D09.png \
+	keyboard_A12.png \
+	keyboard_C04.png \
+	keyboard_D10.png \
+	keyboard_A13.png \
+	keyboard_C05.png \
+	keyboard_D11.png \
+	keyboard_B00.png \
+	keyboard_C06.png \
+	keyboard_D12.png \
+	keyboard_B01.png \
+	keyboard_C07.png \
+	keyboard_E00.png \
+	keyboard_B02.png \
+	keyboard_C08.png \
+	keyboard_E01.png \
+	keyboard_B03.png \
+	keyboard_C09.png \
+	keyboard_E02.png \
+	keyboard_B04.png \
+	keyboard_C10.png \
+	keyboard_E03.png

Modified: tuxtype/trunk/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/keyboard/Makefile.in	2008-06-21 16:14:01 UTC (rev 541)
+++ tuxtype/trunk/data/images/keyboard/Makefile.in	2008-06-21 16:26:30 UTC (rev 542)
@@ -351,6 +351,70 @@
 	pdf-am ps ps-am uninstall uninstall-am \
 	uninstall-dist_images_keyboardDATA
 
+	keyboard_B05.png \
+	keyboard_C11.png \
+	keyboard_E04.png \
+	keyboard_A00.png \
+	keyboard_B06.png \
+	keyboard_C12.png \
+	keyboard_E05.png \
+	keyboard_A01.png \
+	keyboard_B07.png \
+	keyboard_C13.png \
+	keyboard_E06.png \
+	keyboard_A02.png \
+	keyboard_B08.png \
+	keyboard_D00.png \
+	keyboard_E07.png \
+	keyboard_A03.png \
+	keyboard_B09.png \
+	keyboard_D01.png \
+	keyboard_A04.png \
+	keyboard_B10.png \
+	keyboard_D02.png \
+	keyboard_None.png \
+	keyboard_A05.png \
+	keyboard_B11.png \
+	keyboard_D03.png \
+	keyboard_A06.png \
+	keyboard_B12.png \
+	keyboard_D04.png \
+	keyboard_A07.png \
+	keyboard_B13.png \
+	keyboard_D05.png \
+	keyboard_A08.png \
+	keyboard_C00.png \
+	keyboard_D06.png \
+	keyboard_A09.png \
+	keyboard_C01.png \
+	keyboard_D07.png \
+	keyboard_A10.png \
+	keyboard_C02.png \
+	keyboard_D08.png \
+	keyboard_A11.png \
+	keyboard_C03.png \
+	keyboard_D09.png \
+	keyboard_A12.png \
+	keyboard_C04.png \
+	keyboard_D10.png \
+	keyboard_A13.png \
+	keyboard_C05.png \
+	keyboard_D11.png \
+	keyboard_B00.png \
+	keyboard_C06.png \
+	keyboard_D12.png \
+	keyboard_B01.png \
+	keyboard_C07.png \
+	keyboard_E00.png \
+	keyboard_B02.png \
+	keyboard_C08.png \
+	keyboard_E01.png \
+	keyboard_B03.png \
+	keyboard_C09.png \
+	keyboard_E02.png \
+	keyboard_B04.png \
+	keyboard_C10.png \
+	keyboard_E03.png
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: tuxtype/trunk/data/images/keyboard/keyboard-us.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/keyboard/keyboard.png
===================================================================
(Binary files differ)




More information about the Tux4kids-commits mailing list