gradint-build/src/users.py → src/users.py

-# This file is part of the source code of
-# gradint v0.9982 (c) 2002-2012 Silas S. Brown. GPL v3+.
+# This file is part of the source code of Gradint
+# (c) Silas S. Brown.
 #    This program 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 3 of the License, or
@@ -43,21 +43,21 @@ def setup_samplesDir_ifNec(d=0): # if the user doesn't have a samples directory,
   if not d: d=samplesDirectory
   if not isDirectory(d):
     os.mkdir(d)
-    if fileExists(user0[0]+os.sep+"README"+dottxt): open(d+os.sep+"README"+dottxt,'wb').write(read(user0[0]+os.sep+"README"+dottxt))
+    if fileExists(user0[0]+os.sep+"README"+dottxt): write(d+os.sep+"README"+dottxt,read(user0[0]+os.sep+"README"+dottxt))
 
 def get_userNames(): # list of unicode user names or []
   ret=[]
   u=userNameFile ; c=0
   while fileExists(u):
-    ret.append(unicode(u8strip(read(u)).strip(wsp),'utf-8'))
+    ret.append(unicode(bwspstrip(u8strip(read(u))),'utf-8'))
     c += 1 ; u=addUserToFname(userNameFile,c)
   global lastUserNames ; lastUserNames = ret
   return ret
 
-def set_userName(N,unicodeName): open(addUserToFname(userNameFile,N),"w").write(unicodeName.encode("utf-8")+"\n") # implicitly adds if N=num+1
+def set_userName(N,unicodeName): writeB(open(addUserToFname(userNameFile,N),"w"),unicodeName.encode("utf-8")+B("\n")) # implicitly adds if N=num+1
 
 def wrapped_set_userName(N,unicodeName):
-  if unicodeName.strip(wsp): set_userName(N,unicodeName)
+  if wspstrip(unicodeName): set_userName(N,unicodeName)
   else: app.todo.alert="You need to type the person's name in the box before you press "+localise("Add new name") # don't waitOnMessage because we're in the GUI thread
 
 GUI_usersRow = lastUserNames = None
@@ -91,7 +91,7 @@ def updateUserRow(fromMainMenu=0):
         userBSM = ButtonScrollingMixin() ; userBSM.ourCanvas = c
     else: userBSM = None
     for i in range(len(names)):
-      if names[i].strip(wsp):
+      if wspstrip(names[i]):
         r=Tkinter.Radiobutton(row, text=names[i], variable=app.userNo, value=str(i), takefocus=0)
         r.grid(row=i+1,column=0,sticky="w")
         r["command"]=cmd=lambda e=None,i=i: select_userNumber(i)
@@ -107,41 +107,42 @@ def updateUserRow(fromMainMenu=0):
         r=Tkinter.Frame(row) ; r.grid(row=i+1,column=0,columnspan=4)
         text,entry = addTextBox(r)
         if not fromMainMenu: entry.focus() # because user has just pressed the "add other students" button, or has just added a name and may want to add another
-        l=lambda *args:(wrapped_set_userName(i,asUnicode(text.get())),updateUserRow())
+        l=lambda e=None,wrapped_set_userName=wrapped_set_userName,i=i,text=text:(wrapped_set_userName(i,asUnicode(text.get())),updateUserRow())
         addButton(r,localise("Add new name"),l)
         entry.bind('<Return>',l)
         if not i: Tkinter.Label(row,text="The first name should be that of the\nEXISTING user (i.e. YOUR name).").grid(row=i+2,column=0,columnspan=4)
       if userBSM: userBSM.bindFocusIn(r) # for shift-tab from the bottom
       if hasattr(row,"widgetsToDel"): row.widgetsToDel.append(r)
       if not names[i]: break
-    if userBSM: c.after(cond(winCEsound,1500,300),lambda *args:c.config(scrollregion=c.bbox(Tkinter.ALL),width=c.bbox(Tkinter.ALL)[2],height=min(c["height"],c.winfo_screenheight()/2,c.bbox(Tkinter.ALL)[3]))) # hacky (would be better if it could auto shrink on resize)
-  else: row.widgetsToDel.append(addButton(row,localise("Family mode (multiple user)"),lambda *args:(set_userName(0,""),updateUserRow())))
+    if userBSM: c.after(cond(winCEsound,1500,300),lambda e=None,c=c:c.config(scrollregion=c.bbox(Tkinter.ALL),width=c.bbox(Tkinter.ALL)[2],height=min(c["height"],c.winfo_screenheight()/2,c.bbox(Tkinter.ALL)[3]))) # hacky (would be better if it could auto shrink on resize)
+  else: row.widgetsToDel.append(addButton(row,localise("Family mode (multiple user)"),lambda e=None:(set_userName(0,""),updateUserRow())))
 
 def renameUser(i,radioButton,parent,cancel=0):
-    if hasattr(radioButton,"in_renaming"):
+    if hasattr(radioButton,"in_renaming"): # finish the rename
         del radioButton.in_renaming
         n=asUnicode(radioButton.renameText.get())
         if cancel: pass
-        elif not n.strip(wsp) and len(lastUserNames)>1: tkMessageBox.showinfo(app.master.title(),"You can't have blank user names unless there is only one user.  Keeping the original name instead.")
+        elif not wspstrip(n) and (len(lastUserNames)>1 and not (len(lastUserNames)==2 and not lastUserNames[-1])): tkMessageBox.showinfo(app.master.title(),"You can't have blank user names unless there is only one user.  Keeping the original name instead.")
         else:
             set_userName(i,n)
+            lastUserNames[i] = n
             radioButton["text"]=n
         radioButton.renameEntry.grid_forget()
         radioButton.grid(row=i+1,column=0,sticky="w")
-    else:
+    else: # start the rename
         radioButton.in_renaming = 1
         radioButton.grid_forget()
         radioButton.renameText,radioButton.renameEntry = addTextBox(parent,"nopack")
         radioButton.renameEntry.grid(row=i+1,column=0)
         radioButton.renameText.set(lastUserNames[i])
         radioButton.renameEntry.focus()
-        radioButton.after(10,lambda *args:radioButton.renameEntry.event_generate('<End>'))
-        radioButton.renameEntry.bind('<Return>',lambda *args:renameUser(i,radioButton,parent))
-        radioButton.renameEntry.bind('<Escape>',lambda *args:renameUser(i,radioButton,parent,cancel=1))
+        radioButton.after(10,lambda e=None,radioButton=radioButton:radioButton.renameEntry.event_generate('<End>'))
+        radioButton.renameEntry.bind('<Return>',lambda e=None,radioButton=radioButton,i=i,parent=parent:renameUser(i,radioButton,parent))
+        radioButton.renameEntry.bind('<Escape>',lambda e=None,i=i,radioButton=radioButton,parent=parent:renameUser(i,radioButton,parent,cancel=1))
 
 def deleteUser(i):
     for n in ["Are you sure","Are you REALLY sure","This is your last chance: Are you REALLY SURE"]:
-        if not tkMessageBox.askyesno(app.master.title(),u""+n+" you want to delete "+lastUserNames[i]+" permanently, including any vocabulary list and recordings?"): return
+        if not tkMessageBox.askyesno(app.master.title(),ensure_unicode(n)+" you want to delete "+lastUserNames[i]+" permanently, including any vocabulary list and recordings?"): return
     numUsers=len(lastUserNames)
     for fileOrDir in user0+(userNameFile,):
         d=addUserToFname(fileOrDir,i)

gradint-build/thindown.py → thindown.py

-# This file is part of the source code of
-# gradint v0.9982 (c) 2002-2012 Silas S. Brown. GPL v3+.
+#!/usr/bin/env python
+#  (works on either Python 2 or Python 3)
+
+# program to "thin down" the gradint .py for low memory environments
+# by taking out some of the code that's unused on that platform
+
+# This file is part of the source code of Gradint
+# (c) Silas S. Brown.
 #    This program 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 3 of the License, or
@@ -9,16 +15,17 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 
-# program to "thin down" the gradint .py for low memory environments
-# by taking out some of the code that's unused on that platform
-
-import sys
+import sys, re
 
 tk_only = [ # we want these on WinCE but not S60:
 # note: comments are stripped BEFORE checking against this list
 "def words_exist():",
+"def reviseCount(num):", # used only in Tk for now
 "if mp3web:",
 "class InputSourceManager(object):",
+"class InputSource(object):",
+"class MicInput(InputSource):",
+"class PlayerInput(InputSource):",
 "class ButtonScrollingMixin(object):",
 "class RecorderControls(ButtonScrollingMixin):",
 "def doRecWords():",
@@ -36,9 +43,12 @@ tk_only = [ # we want these on WinCE but not S60:
 "def make_output_row(parent):",
 "def select_userNumber(N,updateGUI=1):",
 "def select_userNumber2(N):",
-"def updateUserRow(fromMainMenu=0):",
+"def updateUserRow(fromMainMenu=0):","def get_userNames():",
+"def set_userName(N,unicodeName):",
+"def wrapped_set_userName(N,unicodeName):",
 "def renameUser(i,radioButton,parent,cancel=0):",
 "def deleteUser(i):",
+"def addUserToFname(fname,userNo):",
 "def setupScrollbar(parent,rowNo):",
 "def focusButton(button):",
 "def bindUpDown(o,alsoLeftRight=False):",
@@ -48,19 +58,76 @@ tk_only = [ # we want these on WinCE but not S60:
 # "def guiVocabList(parsedVocab):", # now actually used on S60
 "def synchronizeListbox(listbox,masterList):",
 "if useTK:",
+"if useTK and not tkSnack:",
 "def openDirectory(dir,inGuiThread=0):",
 "def gui_event_loop():",
+"def makeButton(parent,text,command):",
+"def vocabLinesWithLangs():",
+"if Tk_might_display_wrong_hanzi:",
+"def setup_samplesDir_ifNec(d=0):",
+"def filename2unicode(f):",
+"def unicode2filename(u):",
 ]
 
-not_S60 = [ # but may still need on winCE
+not_S60_or_android = [ # but may still need on winCE
 "if winsound:",
 "if winsound or mingw32:",
+"class ESpeakSynth(Synth):","def espeak_volume_ok():",
+'if winCEsound or ((winsound or mingw32) and not os.sep in tmpPrefix and not tmpPrefix.startswith("C:")):',
+'def got_program(prog):', # as no non-winsound/unix
+'if useTK and runInBackground and not (winsound or mingw32) and hasattr(os,"fork") and not "gradint_no_fork" in os.environ:',
+'def maybe_warn_mp3():',
+'elif (cygwin or ((winsound or mingw32) and winsound_also)) and os.sep in file:',
+'elif (winsound and not (self.length>10 and wavPlayer)) or winCEsound:',
+"elif wavPlayer.find('sndrec32')>=0:",
+'elif wavPlayer:', # it'll take appuifw/android 1st
+'if winsound or mingw32 or cygwin:',
+'elif winsound or mingw32 or cygwin:',
+'for s in synth_priorities.split():', # Ekho/eSpeak/MacOS/SAPI not available on S60/Android (well, not that we can yet call into)
+'def import_recordings(destDir=None):', # TODO: document in advanced.txt that this option is non-functional on S60/Android?  (code WOULD work if suitably configured, but unlikely to be used and we need to save size)
+"elif msvcrt:",
 ]
 
-desktop_only = [ # Don't want these on either WinCE or S60:
+not_android = [
+"if not app and not app==False and not appuifw and not android:",
+"elif not android:",
+"def fileExists(f):", # assume we got os.path
+"def fileExists_stat(f):",
+"def isDirectory(directory):",
+"for p in [progressFile,progressFileBackup,pickledProgressFile]:", # this coherence check is not likely to be a problem on Android, and we could do with saving the space
+"if need_say_where_put_progress:", # ditto
+'def check_for_interrupts():','if emulated_interruptMain:','if emulated_interruptMain or winCEsound:','def handleInterrupt():', # no current way to do this on Android (unlike S60/WinCE)
+r"if not '\xc4'.lower()=='\xc4':", # this workaround is not needed on Android
+r"if not fileExists(configFiles[0]) and sys.argv and (os.sep in sys.argv[0] or (os.sep=='\\' and '/' in sys.argv[0])):", # that logic not likely to work on Android (but we do need the rest of that block)
+"def guiVocabList(parsedVocab):", # not yet available on Android (unlike S60, TODO?)
+]
+
+riscos_only = [
+"if riscos_sound:",
+"elif riscos_sound:",
+'if riscos_sound and hex(int(time.time())).find("0xFFFFFFFF")>=0 and not outputFile:',
+"class OldRiscosSynth(Synth):",
 'if not extsep==".":', # RISC OS
+]
+
+mac_only = [
+'if macsound and __name__=="__main__":',
+'if macsound and "_" in os.environ:',
 "if macsound:","elif macsound:",
+'if hasattr(app,"isBigPrint") and macsound:',
+'elif macsound and got_program("afconvert"):',
+]
+
+desktop_only = [ # Don't want these on either WinCE or S60:
+'if hasattr(app,"isBigPrint") and winsound:',
 "if unix:","elif unix:",
+"def disable_lid(restore):",
+'if unix and isDirectory("/dev/snd") and got_program("arecord"):',
+"if unix and (';' in cmd or '<' in cmd):",
+'elif wavPlayer=="sox":',
+'elif wavPlayer=="aplay" and ((not fileType=="mp3") or madplay_path or gotSox):',
+"def simplified_header(fname):",
+"def win2cygwin(path):","elif cygwin:",
 "if paranoid_file_management:",
 "elif unix and not macsound:",
 "elif unix and hasattr(os,\"popen\"):",
@@ -72,9 +139,8 @@ desktop_only = [ # Don't want these on either WinCE or S60:
 "def decode_mp3(file):",
 "class Mp3FileCache(object):",
 "class OSXSynth_Say(Synth):",
-"def aiff2wav(fname):",
+"def aiff2wav(fname):", # (used only on Mac)
 "class OSXSynth_OSAScript(Synth):",
-"class OldRiscosSynth(Synth):",
 "class PttsSynth(Synth):",
 "def sapi_sox_bug_workaround(wavdata):",
 "class FliteSynth(Synth):",
@@ -87,8 +153,17 @@ desktop_only = [ # Don't want these on either WinCE or S60:
 "class ShellEvent(Event):",
 # And the following are desktop only because they need sox:
 "if gotSox and unix:",
-"class SoundCollector(object):",
+"class SoundCollector(object):","if soundCollector:",
+"def oggenc():",
+"def outfile_writeBytes(o,bytes):",
+"def outfile_close(o):",
+"def outfile_writeFile(o,handle,filename):",
 "class ShSoundCollector(object):",
+"def outfile_write_error():",
+"def lame_quiet():",
+"def beepCmd(soxParams,fname):",
+"def collector_time():",
+"def collector_sleep(s):",
 "def dd_command(offset,length):",
 "def lame_endian_parameters():",
 "if outputFile:",
@@ -98,16 +173,29 @@ desktop_only = [ # Don't want these on either WinCE or S60:
 "def gui_outputTo_end(openDir=True):",
 "def gui_outputTo_start():",
 "def warn_sox_decode():",
+'if disable_once_per_day==1:',
+'if once_per_day&2 and not hasattr(sys,"_gradint_innerImport"):',
+'if once_per_day&1 and fileExists(progressFile) and time.localtime(os.stat(progressFile).st_mtime)[:3]==time.localtime()[:3]:',
+'def optimise_partial_playing(ce):',
+'def optimise_partial_playing_list(ceList):',
 ]
 
 winCE_only = [
 "if use_unicode_filenames:",
-"if winCEsound:",
+"if winCEsound:",'elif winCEsound:',
+'if winCEsound and __name__=="__main__":',
+'elif winCEsound and fileType=="mp3":',
+"if WMstandard:",
+]
+
+not_winCE = [
+"if not winCEsound:",
 ]
 
 S60_only = [
+'if sys.platform.find("ymbian")>-1:',
 "class S60Synth(Synth):",
-"if appuifw:",
+"if appuifw:","elif appuifw:",
 "def s60_recordWord():",
 "def s60_recordFile(language):",
 "def s60_addVocab():",
@@ -128,42 +216,119 @@ android_only = [
 "def android_changeLang():",
 ]
 
+unix_only = [
+"class CoquiSynth(Synth):",
+"class PiperSynth(Synth):",
+]
+
 android_or_S60 = [
-"def droidOrS60RecWord(s60_recordFile,inputFunc):",
+"def droidOrS60RecWord(recFunc,inputFunc):",
 ]
 
 if "s60" in sys.argv: # S60 version
   version = "S60"
-  to_omit = tk_only + desktop_only + winCE_only + not_S60 + android_only
+  to_omit = tk_only + desktop_only + winCE_only + not_S60_or_android + android_only + riscos_only + mac_only + unix_only
 elif "android" in sys.argv: # Android version
   version = "Android"
-  to_omit = tk_only + desktop_only + winCE_only + S60_only
+  to_omit = tk_only + desktop_only + winCE_only + S60_only + not_S60_or_android + not_android + riscos_only + mac_only + unix_only
 elif "wince" in sys.argv: # Windows Mobile version
   version = "WinCE"
-  to_omit = desktop_only + S60_only + android_only + android_or_S60
+  to_omit = desktop_only + S60_only + android_only + android_or_S60 + not_winCE + riscos_only + mac_only + unix_only
+elif "core" in sys.argv: # experimental "core code only" for 'minimal embedded porting' starting point (no UI, no synth, limited file I/O; you'll probably have to load up the event data yourself)
+  version = "core"
+  to_omit = tk_only + not_S60_or_android + not_android + riscos_only + mac_only + desktop_only + winCE_only + S60_only + android_only + android_or_S60 + unix_only + [
+"def main():",
+"def rest_of_main():",
+'if __name__=="__main__":',
+"def transliterates_differently(text,lang):",
+"def primitive_synthloop():",
+"def appendVocabFileInRightLanguages():",
+'def delOrReplace(L2toDel,L1toDel,newL2,newL1,action="delete"):',
+"def generalCheck(text,language,pauseOnError=0):",
+"def localise(s):",
+"def singular(number,s):",
+"def readText(l):",
+"def asUnicode(x):",
+"def updateSettingsFile(fname,newVals):",
+"def clearScreen():",
+"def startBrowser(url):",'def getYN(msg,defaultIfEof="n"):',"def waitOnMessage(msg):",
+"def interrupt_instructions():",
+"def parseSynthVocab(fname,forGUI=0):",
+"def scanSamples_inner(directory,retVal,doLimit):",
+"def getLsDic(directory):",
+"def check_has_variants(directory,ls):",
+"def exec_in_a_func(x):",
+"def scanSamples(directory=None):",
+"def synth_from_partials(text,lang,voice=None,isStart=1):",
+"def partials_langname(lang):",
+"if partialsDirectory and isDirectory(partialsDirectory):",
+'for zipToCheck in ["yali-voice","yali-lower","cameron-voice"]:',
+'def stripPuncEtc(text):',
+'def can_be_synthesized(fname,dirBase=None,lang=None):',
+'def synthcache_lookup(fname,dirBase=None,printErrors=0,justQueryCache=0,lang=None):',
+'def textof(fname):',
+'if synthCache and transTbl in synthCache_contents:',
+'if synthCache:',
+'class Partials_Synth(Synth):',
+'def abspath_from_start(p):',
+'class SynthEvent(Event):',
+'def pinyin_uColon_to_V(pinyin):',
+'def synth_event(language,text,is_prompt=0):',
+'def get_synth_if_possible(language,warn=1,to_transliterate=False):',
+'if wavPlayer_override or (unix and not macsound and not (oss_sound_device=="/dev/sound/dsp" or oss_sound_device=="/dev/dsp")):',
+'def fix_compatibility(utext):',
+'def read_chinese_number(num):',
+'def preprocess_chinese_numbers(utext,isCant=0):',
+'def intor0(v):',
+'def fix_pinyin(pinyin,en_words):',
+'def fix_commas(text):',
+'def shell_escape(text):',
+'class SimpleZhTransliterator(object):',
+'def sort_out_pinyin_3rd_tones(pinyin):',
+'def ensure_unicode(text):',
+'def unzip_and_delete(f,specificFiles="",ignore_fail=0):',
+'class Synth(object):',
+'def quickGuess(letters,lettersPerSec):',"def changeToDirOf(file,winsound_also=0):",'if app or appuifw or android:',
+'def subst_some_synth_for_synthcache(events):',
+'def decide_subst_synth(cache_fname):',
+'if winsound or winCEsound or mingw32 or riscos_sound or not hasattr(os,"tempnam") or android:',
+'if len(sys.argv)>1:',
+'def readSettings(f):',
+'def exc_info(inGradint=True):',
+'if not fileExists(configFiles[0]):',
+'def u8strip(d):']
 else: assert 0, "Unrecognised version on command line"
 
-revertToIndent = -1
-lCount = -1
-omitted = {} ; inTripleQuotes=0
-for l in sys.stdin.xreadlines():
+revertToIndent = lastIndentLevel = indentLevel = -1
+lCount = -1 ; inTripleQuotes=0 ; orig = []
+for l in sys.stdin:
+  orig.append(l)
   lCount += 1
-  if lCount==2: print "\n# NOTE: this version has been automatically TRIMMED for "+version+" (some non-"+version+" code taken out)\n"
+  if lCount==2: print ("\n# NOTE: this version has been automatically TRIMMED for "+version+" (some non-"+version+" code taken out)\n")
   l=l.rstrip()
   assert not "\t" in l, "can't cope with tabs"
-  indentLevel=-1
+  lastIndentLevel,indentLevel = indentLevel,-1
   for i in range(len(l)):
     if not l[i]==" ":
       indentLevel = i ; break
   was_inTripleQuotes = inTripleQuotes
   if (len(l.split('"""'))%2) == 0: inTripleQuotes = not inTripleQuotes
   if indentLevel<0 or indentLevel==len(l) or (revertToIndent>=0 and (indentLevel>revertToIndent or was_inTripleQuotes)): continue
-  revertToIndent = -1
-  code = (l+"#")[:l.find("#")].strip()
-  if code in to_omit and not was_inTripleQuotes:
-    print " "*indentLevel+code+" pass # trimmed"
+  justRevertedI,revertToIndent = revertToIndent,-1
+  code0 = (l+"#")[:l.find("#")].rstrip()
+  code = code0.lstrip()
+  if (code in to_omit or (':' in code and code[:code.index(':')+1] in to_omit)) and not was_inTripleQuotes:
+    if ':' in code and code[:code.index(':')+1] in to_omit: code = code[:code.index(':')+1]
+    if code.startswith("def "): code=re.sub(r"\([^)][^)][^)]+\)",r"(*_)",code)
+    if code.startswith("elif "): pass # can always remove those lines completely, even if will be followed by an 'else' (and will never be the only thing in its block)
+    else:
+      if code.startswith("if "): code="if 0:"
+      print (" "*indentLevel+code+" pass # trimmed")
     revertToIndent = indentLevel
-    omitted[code]=1
-  else: print l
+  elif not code:
+    if "#    " in l or lCount < 2: print (l) # keep start and GPL comments
+  elif ('"' in code and '"' in l[len(code):]) or ("'" in code and "'" in l[len(code):]): print (l) # perhaps # was in a string, keep it
+  else: print (code0)
+orig = "".join(orig)
 for o in to_omit:
-  if not o in omitted: sys.stderr.write("Warning: line not matched: "+o+"\n")
+  if not o in orig: sys.stderr.write("Warning: line not matched: "+o)

gradint-build/vocab.txt → vocab.txt

@@ -55,7 +55,6 @@
 # somefile_lang2.txt to make a version in lang2 (where lang1
 # and lang2 are any language abbreviations).  Each .txt file
 # should contain only 1 phrase in 1 language and nothing else.
-# (RISC OS users should replace '.' with '/')
 # Verbal annotations, and -meaning files (see samples README
 # file for details) can also be in .txt files.
 

win2linux.sh

+#!/bin/bash
+
+# Convert a Windows gradint.exe or gradint-bundle.exe
+# (optionally with bundled samples, partials etc) into
+# a GNU/Linux installation of Gradint.  Use this to
+# support both Windows and GNU/Linux from one bundle.
+
+# (c) 2013,2021-22 Silas S. Brown.  License: GPL v3 (as Gradint)
+
+# This script can be placed on a USB stick or whatever, in
+# the same directory as:
+
+# (1) gradint.exe or gradint-bundle.exe
+
+# (2) 7za binary (for correct CPU type and libraries), if
+# 7za is not installed on the system,
+
+# (3) espeak binary (ditto)
+
+# (4) any *.deb files to install with dpkg, e.g. python-tk
+# and its dependencies (e.g. blt tk-8.5)
+# (these will be installed with --force-depends, in case
+# you're doing an offline install and can manage without
+# having the most up-to-date dependencies - do this at
+# your own risk)
+
+# You can also put the 7za, espeak and deb files into a
+# bin/ subdirectory.
+
+DoneDeb=0
+if ! test "$(echo *.deb)" == "*.deb"; then
+  echo "Installing *.deb (with --force-depends)"
+  sudo dpkg --force-depends -i *.deb
+  DoneDeb=1
+elif ! test "$(echo bin/*.deb)" == "bin/*.deb"; then
+  echo "Installing bin/*.deb (with --force-depends)"
+  sudo dpkg --force-depends -i bin/*.deb
+  DoneDeb=1
+fi
+# TODO: if got internet, sudo apt-get update ; sudo apt-get -f install
+if [ -f espeak ] || [ -f bin/espeak ]; then
+  echo "Copying espeak binary to /usr/local/bin"
+  if [ -f espeak ]; then sudo cp espeak /usr/local/bin/
+  else sudo cp bin/espeak /usr/local/bin/; fi
+elif ! which espeak 2>/dev/null >/dev/null && ! which speak 2>/dev/null >/dev/null; then
+  echo "Warning: no espeak binary found on system, and none to install" # TODO: try to apt-get it?  but might not have an Internet connection
+  echo -n "Press Enter: " ; read
+fi
+mkdir -p "$HOME/gradint0"
+if [ -e gradint-bundle.exe ]; then
+  PATH="$PATH:.:./bin" 7za "-o$HOME/gradint0" x gradint-bundle.exe || exit 1
+else PATH="$PATH:.:./bin" 7za "-o$HOME/gradint0" x gradint.exe || exit 1; fi
+cd "$HOME/gradint0" || exit 1
+mv gradint .. || exit 1
+cd .. && rm -rf gradint0
+cd gradint || exit 1
+unzip library.zip gradint.py || exit 1
+rm -rf tcl library.zip ./*.exe ./*.pyd ./*.dll
+if python -c 'import tkinter'; then
+ if [ -e ~/Desktop ] && ! [ -e ~/Desktop/Gradint ]; then
+  echo "Creating symlink on Desktop"
+  ln -s "$(pwd)/gradint.py" ~/Desktop/Gradint
+  # TODO: what about the menus of various front-ends? (might need to make .desktop files in .local/share/applications or something)
+ else echo "Not creating symlink on desktop" # TODO: cater for more possibilities
+ fi
+else echo "Warning: no tkinter on this system; gradint will be command-line only" ; echo -n "Press Enter: " ; read # TODO: if internet, try sudo apt-get install python-tk
+fi
+echo "Copying espeak-data to /usr/share/"
+sudo cp -r espeak/espeak-data /usr/share/ && rm -rf espeak
+echo "win2linux.sh finished"
+if test $DoneDeb == 1; then
+  echo
+  echo "WARNING: Have installed packages with dpkg --force-depends."
+  echo "If you're connected to the Internet, you might now wish to do:"
+  echo "  sudo apt-get update ; sudo apt-get -f install"
+  echo "or if the machine will later be connected to the"
+  echo "Internet without you, you might wish to do:"
+  echo "  (echo apt-get update; echo apt-get -yf install) | sudo at -M midnight"
+fi

gradint-build/windows/setup.bat → windows/setup.bat

 @echo off
 
+rem   This is Gradint's setup file for Windows.
+rem   If you are seeing this, when you expected
+rem   the Gradint installer to be running, then
+rem   it probably means your copy of Windows has
+rem   an incorrect file association.  That will
+rem   affect other programs, not just Gradint.
+rem   To fix the incorrect association, try
+rem   running regedit and deleting the key:
+rem   Hkey_Current_User\Software\Microsoft\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.bat
+rem   then restart your system and the Gradint
+rem   installer should work normally.
+rem   This problem has been reported on some
+rem   (but not all) Windows 7 setups.
+
+rem --------------------------------------------
+
 rem Find a good place to put Gradint.  On Windows 9x this can be C:\Program Files.  On XP/NT/etc we'd better check for different home directories.  Also check where the profile is.
 
 if not exist "%HOMEDRIVE%%HOMEPATH%" set HOMEDRIVE=C:
@@ -42,6 +58,9 @@ rem copy all program files, even the ones that have never been changed, in case
 tskill gradint-wrapper 2>nul
 taskkill /f /im gradint-wrapper.exe 2>nul >nul
 cd gradint
+rem clean up after old versions
+if exist background1.txt del background1.txt
+if exist background2.txt del background2.txt
 rem support bundles
 for /D %%g in (*_disabled) do xcopy /I %%g "%HOMEDRIVE%%HOMEPATH%\gradint\%%g" /S
 rem support users who install yali BEFORE gradint