From 1bb6aa6c96994bbca7b7fa85f110eb406bb5eaf1 Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Fri, 25 May 2012 13:40:12 +0000
Subject: [PATCH] Gradint update

git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/gradint@1364 29193198-4895-4776-b068-10539e920549
---
 gradint-build/PocketPC/gradint/setup.py | 6 +++---
 gradint-build/README-Android.txt        | 3 +++
 gradint-build/src/frontend.py           | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gradint-build/PocketPC/gradint/setup.py b/gradint-build/PocketPC/gradint/setup.py
index e0461ae..3134eaf 100644
--- a/gradint-build/PocketPC/gradint/setup.py
+++ b/gradint-build/PocketPC/gradint/setup.py
@@ -7,9 +7,8 @@ import os, py_compile, sys
 # can take more RAM than doing it separately.
 
 f=os.getcwd()+os.sep+"gradint.py"
-a=0
 try: a=open(f)
-except: pass
+except: a=0
 if a:
   print "Compiling gradint..."
   del a
@@ -44,7 +43,8 @@ def moveFiles(srcDir,destDir):
         except:
           if not destDir in fail:
             fail[destDir]=1
-            raw_input("Failed to write to "+destDir)
+            raw_input("Problem writing to "+destDir)
+            raw_input("from "+srcDir)
             raw_input("Please do it manually in Explorer")
             raw_input("or remove Application Lock if on")
     try: os.rmdir(srcDir)
diff --git a/gradint-build/README-Android.txt b/gradint-build/README-Android.txt
index 45b60a5..7a2a4e9 100644
--- a/gradint-build/README-Android.txt
+++ b/gradint-build/README-Android.txt
@@ -33,3 +33,6 @@ mv ../android/gradint.py res/raw/script.py
 mv ../android/advanced.txt ../android/settings.txt ../android/samples ../android/vocab.txt res/raw/
 ant debug
 # now copy bin/Gradint-debug.apk to the device
+
+(Might need to go to Application settings and enable
+Unknown sources, as you probably need for SL4A and Python)
diff --git a/gradint-build/src/frontend.py b/gradint-build/src/frontend.py
index b2cd330..a3e5b26 100644
--- a/gradint-build/src/frontend.py
+++ b/gradint-build/src/frontend.py
@@ -1186,6 +1186,9 @@ if useTK:
         if got_program("bbedit"):
             textEditorName="bbedit"
             textEditorCommand="bbedit -w" ; textEditorWaits=1
+        elif got_program("edit"): # TextWrangler
+            textEditorName="edit"
+            textEditorCommand="edit -w" ; textEditorWaits=1
         if sys.version.startswith("2.3.5") and "DISPLAY" in os.environ: explorerCommand = None # 'open' doesn't seem to work when running from within Python in X11 on 10.4
         else: explorerCommand="open"
     elif unix:
-- 
GitLab