[Tux4kids-commits] r679 - in tuxtype/branches/soc-mobin: . data/fonts data/images data/themes data/themes/assamese data/themes/malayalam/images/status data/themes/tamil doc/en po src

mobin-guest at alioth.debian.org mobin-guest at alioth.debian.org
Tue Aug 26 10:40:07 UTC 2008


Author: mobin-guest
Date: 2008-08-26 10:40:05 +0000 (Tue, 26 Aug 2008)
New Revision: 679

Modified:
   tuxtype/branches/soc-mobin/config.log
   tuxtype/branches/soc-mobin/config.status
   tuxtype/branches/soc-mobin/data/fonts/Makefile
   tuxtype/branches/soc-mobin/data/images/Makefile
   tuxtype/branches/soc-mobin/data/themes/Makefile.in
   tuxtype/branches/soc-mobin/data/themes/assamese/Makefile
   tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile
   tuxtype/branches/soc-mobin/data/themes/tamil/Makefile
   tuxtype/branches/soc-mobin/doc/en/Makefile
   tuxtype/branches/soc-mobin/po/Makefile
   tuxtype/branches/soc-mobin/po/Makefile.in
   tuxtype/branches/soc-mobin/src/titlescreen.c
Log:


Modified: tuxtype/branches/soc-mobin/config.log
===================================================================
--- tuxtype/branches/soc-mobin/config.log	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/config.log	2008-08-26 10:40:05 UTC (rev 679)
@@ -584,14 +584,14 @@
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /usr/local/src/26aug/missing --run tar'
-AUTOCONF='${SHELL} /usr/local/src/26aug/missing --run autoconf'
-AUTOHEADER='${SHELL} /usr/local/src/26aug/missing --run autoheader'
-AUTOMAKE='${SHELL} /usr/local/src/26aug/missing --run automake-1.10'
+AMTAR='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar'
+AUTOCONF='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10'
 AWK='mawk'
 BUILD_MINGW32_FALSE=''
 BUILD_MINGW32_TRUE='#'
@@ -626,7 +626,7 @@
 LTLIBICONV='-liconv'
 LTLIBINTL=''
 LTLIBOBJS=''
-MAKEINFO='${SHELL} /usr/local/src/26aug/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo'
 MSGFMT='/usr/bin/msgfmt'
 MSGFMT_015='/usr/bin/msgfmt'
 MSGMERGE='/usr/bin/msgmerge'
@@ -683,7 +683,7 @@
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /usr/local/src/26aug/install-sh'
+install_sh='$(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'

Modified: tuxtype/branches/soc-mobin/config.status
===================================================================
--- tuxtype/branches/soc-mobin/config.status	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/config.status	2008-08-26 10:40:05 UTC (rev 679)
@@ -341,7 +341,7 @@
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/usr/local/src/26aug'
+ac_pwd='/home/mobin/tuxtype/branches/soc-mobin'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -649,19 +649,19 @@
 s, at CYGPATH_W@,|#_!!_#|echo,g
 s, at PACKAGE@,|#_!!_#|tuxtype,g
 s, at VERSION@,|#_!!_#|1.5.16,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/26aug/install-sh,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh,g
 s, at STRIP@,|#_!!_#|,g
 s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
 s, at AWK@,|#_!!_#|mawk,g
 s, at SET_MAKE@,|#_!!_#|,g
 s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/26aug/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar,g
 s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
 s, at USE_NLS@,|#_!!_#|yes,g

Modified: tuxtype/branches/soc-mobin/data/fonts/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/fonts/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/fonts/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -45,11 +45,11 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -83,7 +83,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -111,10 +111,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/data/fonts
-abs_srcdir = /usr/local/src/26aug/data/fonts
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/data/fonts
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/data/fonts
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -141,7 +141,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/data/images/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/images/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/images/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -68,11 +68,11 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -106,7 +106,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -134,10 +134,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/data/images
-abs_srcdir = /usr/local/src/26aug/data/images
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/data/images
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/data/images
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -164,7 +164,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/data/themes/Makefile.in
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/Makefile.in	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/themes/Makefile.in	2008-08-26 10:40:05 UTC (rev 679)
@@ -189,7 +189,6 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = armenian \
   assamese \
-  bengali \
   bokmal \
   brazilian-portuguese \
   catalan \
@@ -200,8 +199,6 @@
   euskara \
   french \
   greek \
-  gujarati \
-  hindi \
   italian \
   jamaican \
   lithuanian \
@@ -213,7 +210,6 @@
   svenska \
   swahili \
   tamil \
-  telugu \
   wolof
 
 themesdir = $(pkgdatadir)/data/themes

Modified: tuxtype/branches/soc-mobin/data/themes/assamese/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/assamese/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/themes/assamese/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -68,11 +68,11 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -106,7 +106,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -134,10 +134,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/data/themes/assamese
-abs_srcdir = /usr/local/src/26aug/data/themes/assamese
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/assamese
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/assamese
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -164,7 +164,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/themes/malayalam/images/status/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -56,11 +56,11 @@
 dist_themes_malayalam_images_statusDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_themes_malayalam_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -94,7 +94,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -122,10 +122,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/data/themes/malayalam/images/status
-abs_srcdir = /usr/local/src/26aug/data/themes/malayalam/images/status
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/malayalam/images/status
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/malayalam/images/status
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -152,7 +152,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/data/themes/tamil/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/data/themes/tamil/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/data/themes/tamil/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -68,11 +68,11 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -106,7 +106,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -134,10 +134,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/data/themes/tamil
-abs_srcdir = /usr/local/src/26aug/data/themes/tamil
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/tamil
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/data/themes/tamil
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -164,7 +164,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/doc/en/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/doc/en/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/doc/en/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -56,11 +56,11 @@
 dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/26aug/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/26aug/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/26aug/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/26aug/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/26aug/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run tar
+AUTOCONF = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run automake-1.10
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -94,7 +94,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/26aug/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/mobin/tuxtype/branches/soc-mobin/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -122,10 +122,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/26aug/doc/en
-abs_srcdir = /usr/local/src/26aug/doc/en
-abs_top_builddir = /usr/local/src/26aug
-abs_top_srcdir = /usr/local/src/26aug
+abs_builddir = /home/mobin/tuxtype/branches/soc-mobin/doc/en
+abs_srcdir = /home/mobin/tuxtype/branches/soc-mobin/doc/en
+abs_top_builddir = /home/mobin/tuxtype/branches/soc-mobin
+abs_top_srcdir = /home/mobin/tuxtype/branches/soc-mobin
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -152,7 +152,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/26aug/install-sh
+install_sh = $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/soc-mobin/po/Makefile
===================================================================
--- tuxtype/branches/soc-mobin/po/Makefile	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/po/Makefile	2008-08-26 10:40:05 UTC (rev 679)
@@ -34,12 +34,12 @@
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/26aug/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/26aug/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/26aug/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh -d
+install_sh = $(SHELL) $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 

Modified: tuxtype/branches/soc-mobin/po/Makefile.in
===================================================================
--- tuxtype/branches/soc-mobin/po/Makefile.in	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/po/Makefile.in	2008-08-26 10:40:05 UTC (rev 679)
@@ -34,12 +34,12 @@
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/26aug/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/26aug/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/26aug/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh -d
+install_sh = $(SHELL) $(SHELL) /home/mobin/tuxtype/branches/soc-mobin/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 

Modified: tuxtype/branches/soc-mobin/src/titlescreen.c
===================================================================
--- tuxtype/branches/soc-mobin/src/titlescreen.c	2008-08-26 09:09:54 UTC (rev 678)
+++ tuxtype/branches/soc-mobin/src/titlescreen.c	2008-08-26 10:40:05 UTC (rev 679)
@@ -1619,8 +1619,11 @@
   old_use_english = settings.use_english;
   strncpy(old_theme_path, settings.theme_data_path, FNLEN - 1);
 
-  sprintf(fn , "%s/words", settings.theme_data_path);
-
+  if(settings.use_english)
+        sprintf(fn , "%s/words", settings.default_data_path);
+  else
+        sprintf(fn , "%s/words", settings.theme_data_path);
+  
   themesDir = opendir(fn);
 
   if (!themesDir)
@@ -1631,33 +1634,34 @@
 
   do
   {
-	themesFile = readdir(themesDir);
-	if (!themesFile)
-		break;
+        themesFile = readdir(themesDir);
+        if (!themesFile)
+                break;
 
-		/* we ignore any hidden file and CVS */
+                /* we ignore any hidden file and CVS */
 
-	if (themesFile->d_name[0] == '.') 
-		continue;
+        if (themesFile->d_name[0] == '.') 
+                continue;
 
-	if (strcmp("CVS", themesFile->d_name)==0)
-		continue;
+        if (strcmp("CVS", themesFile->d_name)==0)
+                continue;
 
-		
-	sprintf(fn, "%s/words/%s", settings.theme_data_path, themesFile->d_name);
+        if(settings.use_english)
+                sprintf(fn, "%s/words/%s",settings.default_data_path, themesFile->d_name);
+        else	
+                sprintf(fn, "%s/words/%s", settings.theme_data_path, themesFile->d_name);
 
-
-		/* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
-	if (CheckFile(fn) == 1) {
-		fp=fopen(fn,"r");
-		    /* HACK: we should get the names from file :) */
-		fscanf(fp, "%[^\n]\n", wordTypes[themes]);
-		    /* Make sure theme name is capitalized: */
+                /* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
+        if (CheckFile(fn) == 1) {
+                fp=fopen(fn,"r");
+                    /* HACK: we should get the names from file :) */
+                fscanf(fp, "%[^\n]\n", wordTypes[themes]);
+                    /* Make sure theme name is capitalized: */
                 wordTypes[themes][0] = toupper(wordTypes[themes][0]);
-		fclose(fp);
-		strncpy( fileNames[themes++], themesFile->d_name, FNLEN-1 );
-		    
-	}
+                fclose(fp);
+                strncpy( fileNames[themes++], themesFile->d_name, FNLEN-1 );
+                    
+        }
   } while (1);
 
   closedir(themesDir);
@@ -1666,13 +1670,13 @@
         // HACK: is font empty now???
   font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
 
-	
+        
   for (i = 0; i<themes; i++) {
-	titles[i] = BlackOutline( wordTypes[i], font, &white );
-	select[i] = BlackOutline( wordTypes[i], font, &yellow);
+        titles[i] = BlackOutline( wordTypes[i], font, &white );
+        select[i] = BlackOutline( wordTypes[i], font, &yellow);
   }
 
-	
+        
   TTF_CloseFont(font);
   font = NULL;
 
@@ -1680,94 +1684,94 @@
 
   bkg = LoadImage("main_bkg.png", IMG_REGULAR);
 
-	
-	/* set initial rect sizes */
+        
+        /* set initial rect sizes */
   titleRects[0].y = 150;
   titleRects[0].w = titleRects[0].h = titleRects[0].x = 0;
   for (i = 1; i<8; i++) {
-	titleRects[i].y = titleRects[i-1].y + 50;
-	titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
+        titleRects[i].y = titleRects[i-1].y + 50;
+        titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
   }
-	
+        
 
   while (!stop) {
-	while (SDL_PollEvent(&event)) 
-		switch (event.type) {
-			case SDL_QUIT:
-				exit(0);
-				break;
-			case SDL_MOUSEMOTION: 
-				for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++)
-					if (inRect( titleRects[i], event.motion.x, event.motion.y )) {
-						loc = loc-(loc%8)+i;
-						break;
-					}
-				
-				break;
-			case SDL_MOUSEBUTTONDOWN: 
-				
-				for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++) 
-					if (inRect(titleRects[i], event.button.x, event.button.y)) {
-						loc = loc-(loc%8)+i;
-						ChooseWord(fileNames[loc]);
-						break;
-					}
-					break;
-			case SDL_KEYDOWN:
-				if (event.key.keysym.sym == SDLK_ESCAPE) { 
-					settings.use_english = old_use_english;
-					strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);
-					stop = 1; 
-					break; 
-				}
-				if (event.key.keysym.sym == SDLK_RETURN) { 
-					ChooseWord(fileNames[loc]);
-					loc=0;
-					break;
-				
-	}
+        while (SDL_PollEvent(&event)) 
+                switch (event.type) {
+                        case SDL_QUIT:
+                                exit(0);
+                                break;
+                        case SDL_MOUSEMOTION: 
+                                for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++)
+                                        if (inRect( titleRects[i], event.motion.x, event.motion.y )) {
+                                                loc = loc-(loc%8)+i;
+                                                break;
+                                        }
+                                
+                                break;
+                        case SDL_MOUSEBUTTONDOWN: 
+                                
+                                for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++) 
+                                        if (inRect(titleRects[i], event.button.x, event.button.y)) {
+                                                loc = loc-(loc%8)+i;
+                                                ChooseWord(fileNames[loc]);
+                                                break;
+                                        }
+                                        break;
+                        case SDL_KEYDOWN:
+                                if (event.key.keysym.sym == SDLK_ESCAPE) { 
+                                        settings.use_english = old_use_english;
+                                        strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);
+                                        stop = 1; 
+                                        break; 
+                                }
+                                if (event.key.keysym.sym == SDLK_RETURN) { 
+                                        ChooseWord(fileNames[loc]);
+                                        loc=0;
+                                        break;
+                                
+        }
 
-				if ((event.key.keysym.sym == SDLK_LEFT) || (event.key.keysym.sym == SDLK_PAGEUP)) {
-					if (loc-(loc%8)-8 >= 0) 
-						loc=loc-(loc%8)-8;
-				}
+                                if ((event.key.keysym.sym == SDLK_LEFT) || (event.key.keysym.sym == SDLK_PAGEUP)) {
+                                        if (loc-(loc%8)-8 >= 0) 
+                                                loc=loc-(loc%8)-8;
+                                }
 
-				if ((event.key.keysym.sym == SDLK_RIGHT) || (event.key.keysym.sym == SDLK_PAGEDOWN)) {
-					if (loc-(loc%8)+8 < themes)
-						loc=(loc-(loc%8)+8);
-				}
+                                if ((event.key.keysym.sym == SDLK_RIGHT) || (event.key.keysym.sym == SDLK_PAGEDOWN)) {
+                                        if (loc-(loc%8)+8 < themes)
+                                                loc=(loc-(loc%8)+8);
+                                }
 
-				if (event.key.keysym.sym == SDLK_UP) {
-					if (loc > 0)
-						loc--;
-				}
+                                if (event.key.keysym.sym == SDLK_UP) {
+                                        if (loc > 0)
+                                                loc--;
+                                }
 
-				if (event.key.keysym.sym == SDLK_DOWN) {
-					if (loc+1<themes)
-						loc++;
-				}
-		}
+                                if (event.key.keysym.sym == SDLK_DOWN) {
+                                        if (loc+1<themes)
+                                                loc++;
+                                }
+                }
 
-	if (old_loc != loc) {
-		int start;
+        if (old_loc != loc) {
+                int start;
 
-		SDL_BlitSurface( bkg, NULL, screen, NULL );
+                SDL_BlitSurface( bkg, NULL, screen, NULL );
   
-		//if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
+                //if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
 
-		start = loc - (loc % 8);
-		for (i = start; i<MIN(start+8,themes); i++) {
-			titleRects[i%8].x = 320 - (titles[i]->w/2);
-			if (i == loc)
-				SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
-			else
-				SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
-		}
+                start = loc - (loc % 8);
+                for (i = start; i<MIN(start+8,themes); i++) {
+                        titleRects[i%8].x = 320 - (titles[i]->w/2);
+                        if (i == loc)
+                                SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
+                        else
+                                SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
+                }
 
-		SDL_UpdateRect(screen, 0, 0, 0 ,0);
-	}
-	SDL_Delay(40);
-	old_loc = loc;
+                SDL_UpdateRect(screen, 0, 0, 0 ,0);
+        }
+        SDL_Delay(40);
+        old_loc = loc;
   }
 
   /* --- clear graphics before quitting --- */ 
@@ -1821,16 +1825,19 @@
   old_use_english = settings.use_english;
   strncpy(old_theme_path, settings.theme_data_path, FNLEN - 1);
 
-  sprintf(fn , "%s/words/%s", settings.theme_data_path,words_file);
-	
+  if(settings.use_english)
+        sprintf(fn , "%s/words/%s", settings.default_data_path,words_file);
+  else
+          sprintf(fn , "%s/words/%s", settings.theme_data_path,words_file);
+                
   fp=fopen(fn,"r");
   fscanf(fp, "%[^\n]\n", str);
 
   while(!feof(fp))
   {
-	/* HACK: we should get the strings from file :) */
-	fscanf(fp, "%[^\n]\n", editWordW[themes]);
-	strcpy(editWordY[themes++],editWordW[themes]);
+        /* HACK: we should get the strings from file :) */
+        fscanf(fp, "%[^\n]\n", editWordW[themes]);
+        strcpy(editWordY[themes++],editWordW[themes]);
   }
   
   fclose(fp); 
@@ -1840,9 +1847,9 @@
   font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
 
   for (i = 0; i<themes; i++) {
-	titles[i] = BlackOutline( editWordW[i], font, &white );
-	strcat(editWordY[i],"|");
-	select[i] = BlackOutline( editWordY[i], font, &yellow);
+        titles[i] = BlackOutline( editWordW[i], font, &white );
+        strcat(editWordY[i],"|");
+        select[i] = BlackOutline( editWordY[i], font, &yellow);
   }
 
   TTF_CloseFont(font);
@@ -1861,146 +1868,147 @@
   rightRect.w = right->w; rightRect.h = right->h;
   rightRect.x = 320 + 100 - (rightRect.w/2); rightRect.y = 430;
 
-	/* set initial rect sizes */ 
+        /* set initial rect sizes */ 
   titleRects[0].y = 30;
   titleRects[0].w = titleRects[0].h = titleRects[0].x = 0;
   for (i = 1; i<8; i++) {
-	titleRects[i].y = titleRects[i-1].y + 50;
-	titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
+        titleRects[i].y = titleRects[i-1].y + 50;
+        titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
   }
-	
+        
 
   while (!stop) {
-	while (SDL_PollEvent(&event)) 
-		switch (event.type) {
-			case SDL_QUIT:
-				exit(0);
-				break;
-			case SDL_MOUSEMOTION: 
-				if (inRect( leftRect, event.button.x, event.button.y )) 
-						if (loc-(loc%8)-8 >= 0) {
-							loc=loc-(loc%8)-8;
-							break;
-						}
-					if (inRect( rightRect, event.button.x, event.button.y )) 
-						if (loc-(loc%8)+8 < themes) {
-							loc=loc-(loc%8)+8;
-							break;
-						}
-				for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++)
-					if (inRect( titleRects[i], event.motion.x, event.motion.y )) {
-						loc = loc-(loc%8)+i;
-						break;
-					}
-					
-				break;
-				
-			case SDL_KEYDOWN:
-				i=1;
-				if (event.key.keysym.sym == SDLK_BACKSPACE) {
-					font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);						
-					
-					len=ConvertFromUTF8(temp,editWordW[loc]);
-					temp[len-1]=temp[len];
-					len=ConvertToUTF8(temp,editWordW[loc]);
-					titles[loc] = BlackOutline(editWordW[loc], font, &white );						
-					len=ConvertFromUTF8(temp,editWordY[loc]);
-					temp[len-2]=temp[len-1];
-					temp[len-1]=temp[len];
-					len=ConvertToUTF8(temp,editWordY[loc]);
-					select[loc] = BlackOutline(editWordY[loc], font, &yellow);
-					TTF_CloseFont(font);
-        				font = NULL;
-					break;
-				}
+        while (SDL_PollEvent(&event)) 
+                switch (event.type) {
+                        case SDL_QUIT:
+                                exit(0);
+                                break;
+                        case SDL_MOUSEMOTION: 
+                                if (inRect( leftRect, event.button.x, event.button.y )) 
+                                                if (loc-(loc%8)-8 >= 0) {
+                                                        loc=loc-(loc%8)-8;
+                                                        break;
+                                                }
+                                        if (inRect( rightRect, event.button.x, event.button.y )) 
+                                                if (loc-(loc%8)+8 < themes) {
+                                                        loc=loc-(loc%8)+8;
+                                                        break;
+                                                }
+                                for (i=0; (i<8) && (loc-(loc%8)+i<themes); i++)
+                                        if (inRect( titleRects[i], event.motion.x, event.motion.y )) {
+                                                loc = loc-(loc%8)+i;
+                                                break;
+                                        }
+                                        
+                                break;
+                                
+                        case SDL_KEYDOWN:
+                                i=1;
+                                if (event.key.keysym.sym == SDLK_BACKSPACE) {
+                                        font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);						
+                                        
+                                        len=ConvertFromUTF8(temp,editWordW[loc]);
+                                        temp[len-1]=temp[len];
+                                        len=ConvertToUTF8(temp,editWordW[loc]);
+                                        titles[loc] = BlackOutline(editWordW[loc], font, &white );						
+                                        len=ConvertFromUTF8(temp,editWordY[loc]);
+                                        temp[len-2]=temp[len-1];
+                                        temp[len-1]=temp[len];
+                                        len=ConvertToUTF8(temp,editWordY[loc]);
+                                        select[loc] = BlackOutline(editWordY[loc], font, &yellow);
+                                        TTF_CloseFont(font);
+                                        font = NULL;
+                                        break;
+                                }
 
-				if (event.key.keysym.sym == SDLK_ESCAPE) { 
-					settings.use_english = old_use_english;
-					strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);					
-					stop = 1; 
-					break; 
-				}
-					
-				if ((event.key.keysym.sym == SDLK_LEFT) || (event.key.keysym.sym == SDLK_PAGEUP)) {
-						if (loc-(loc%8)-8 >= 0) 
-							loc=loc-(loc%8)-8;
-						break;
-					}
+                                if (event.key.keysym.sym == SDLK_ESCAPE) { 
+                                        settings.use_english = old_use_english;
+                                        strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);					
+                                        stop = 1; 
+                                        break; 
+                                }
+                                        
+                                if ((event.key.keysym.sym == SDLK_LEFT) || (event.key.keysym.sym == SDLK_PAGEUP)) {
+                                                if (loc-(loc%8)-8 >= 0) 
+                                                        loc=loc-(loc%8)-8;
+                                                break;
+                                        }
 
-				if ((event.key.keysym.sym == SDLK_RIGHT) || (event.key.keysym.sym == SDLK_PAGEDOWN)) {
-					if (loc-(loc%8)+8 < themes)
-						loc=(loc-(loc%8)+8);
-					break;
-				}
+                                if ((event.key.keysym.sym == SDLK_RIGHT) || (event.key.keysym.sym == SDLK_PAGEDOWN)) {
+                                        if (loc-(loc%8)+8 < themes)
+                                                loc=(loc-(loc%8)+8);
+                                        break;
+                                }
 
 
-				if (event.key.keysym.sym == SDLK_UP) {
-					if (loc > 0)
-						loc--;
-					break;
-				}
-					
-				if (event.key.keysym.sym == SDLK_DOWN) {
-					if (loc+1<themes)
-						loc++;
-					break;
-				}
-				switch (event.key.keysym.sym){
-					case SDLK_RALT:
-					case SDLK_LALT:
-					case SDLK_RSHIFT:
-					case SDLK_LSHIFT:
-					case SDLK_RCTRL:
-					case SDLK_LCTRL:i=0;
-							break;
-				}
-				if(i){
-					
-					font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);						
-					
-					len=ConvertFromUTF8(temp,editWordW[loc]);
-					temp[len]=event.key.keysym.unicode;
-					temp[len+1]=0;
-					ConvertToUTF8(temp,editWordW[loc]);
-					titles[loc] = BlackOutline(editWordW[loc], font, &white );					
-						
-					len=ConvertFromUTF8(temp,editWordY[loc]);
-					temp[len+1]=0;
-					temp[len]=temp[len-1];
-					temp[len-1]=event.key.keysym.unicode;
-					ConvertToUTF8(temp,editWordY[loc]);
-					select[loc] = BlackOutline(editWordY[loc], font, &yellow);
-					TTF_CloseFont(font);
-        				font = NULL;
-					i=0;
-					break;
-				}	
-		}
-	if(!stop){
-	SDL_BlitSurface( bkg, NULL, screen, NULL );
+                                if (event.key.keysym.sym == SDLK_UP) {
+                                        if (loc > 0)
+                                                loc--;
+                                        break;
+                                }
+                                        
+                                if (event.key.keysym.sym == SDLK_DOWN) {
+                                        if (loc+1<themes)
+                                                loc++;
+                                        break;
+                                }
+                                switch (event.key.keysym.sym){
+					case SDLK_CAPSLOCK:
+                                        case SDLK_RALT:
+                                        case SDLK_LALT:
+                                        case SDLK_RSHIFT:
+                                        case SDLK_LSHIFT:
+                                        case SDLK_RCTRL:
+                                        case SDLK_LCTRL:i=0;
+                                                        break;
+                                }
+                                if(i){
+                                        
+                                        font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);						
+                                        
+                                        len=ConvertFromUTF8(temp,editWordW[loc]);
+                                        temp[len]=event.key.keysym.unicode;
+                                        temp[len+1]=0;
+                                        ConvertToUTF8(temp,editWordW[loc]);
+                                        titles[loc] = BlackOutline(editWordW[loc], font, &white );					
+                                                
+                                        len=ConvertFromUTF8(temp,editWordY[loc]);
+                                        temp[len+1]=0;
+                                        temp[len]=temp[len-1];
+                                        temp[len-1]=event.key.keysym.unicode;
+                                        ConvertToUTF8(temp,editWordY[loc]);
+                                        select[loc] = BlackOutline(editWordY[loc], font, &yellow);
+                                        TTF_CloseFont(font);
+                                        font = NULL;
+                                        i=0;
+                                        break;
+                                }	
+                }
+        if(!stop){
+        SDL_BlitSurface( bkg, NULL, screen, NULL );
 
 //	if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);	
 
-	start = loc - (loc % 8);
-	for (i = start; i<MIN(start+8,themes); i++) {
-		titleRects[i%8].x = 320 - (titles[i]->w/2);
-		if (i == loc)
-			SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
-		else
-			SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
-	}
+        start = loc - (loc % 8);
+        for (i = start; i<MIN(start+8,themes); i++) {
+                titleRects[i%8].x = 320 - (titles[i]->w/2);
+                if (i == loc)
+                        SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
+                else
+                        SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
+        }
 
-		/* --- draw buttons --- */
+                /* --- draw buttons --- */
 
-	if (start>0) 
-		SDL_BlitSurface( left, NULL, screen, &leftRect );
+        if (start>0) 
+                SDL_BlitSurface( left, NULL, screen, &leftRect );
 
-	if (start+8<themes) 
-		SDL_BlitSurface( right, NULL, screen, &rightRect );
+        if (start+8<themes) 
+                SDL_BlitSurface( right, NULL, screen, &rightRect );
 
-	SDL_UpdateRect(screen, 0, 0, 0 ,0);
-	}		
-	//SDL_Delay(40);
+        SDL_UpdateRect(screen, 0, 0, 0 ,0);
+        }		
+        //SDL_Delay(40);
 	old_loc = loc;
   }
 
@@ -2012,8 +2020,8 @@
 
   while(i<themes)
   {
-	fprintf(fp, "%s\n", editWordW[i++]);
-	i++;
+        fprintf(fp, "%s\n", editWordW[i++]);
+        i++;
   }
   
   fclose(fp); 




More information about the Tux4kids-commits mailing list