Changeset 257 for trunk/lingosource

Timestamp:

10/03/11 18:02:39 (8 months ago)

Author:

alex

Message:

updated to D11 format

Location:

trunk/lingosource/castlib1

Files:

• alexUtilities.ls (modified) (2 diffs)
• bbedit_Utilities.ls (modified) (13 diffs)
• memberInfo.xml (modified) (1 diff)
• subversion_version_field.txt (modified) (1 diff)
• texthyperlinkBehavior.ls (modified) (1 diff)

trunk/lingosource/castlib1/alexUtilities.ls

@@ -3540 +3540 @@
   end if
   
-  -- pUPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZZçË"&vA& "€Ì‚ƒéæèêíëì„îñï
-Íòôۆ®¯ÎÙ"
-  -- pLowercase = "abcdefghijklmnopqrstuvwxyz‡ˆ"&"‰"&"Š‹ŒŽ‘’“”•–—˜™š›œžŸŸ¿ÏØ"
-  pCaseLists.setaprop(#uppercase, ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "ç", "Ë", vA, "A", "€", "Ì", "", "‚", "ƒ", "é", "æ", "è", "ê", "í", "ë", "ì", "„", "î", "ñ", "ï", "
-", "Í", "ò", "ô", "U", "†", "®", "¯", "Î", "Ù"])
-  pCaseLists.setaprop(#lowercase, ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "‡", "ˆ", vA, "‰", "Š", "‹", "Œ", "", "Ž", "", "", "‘", "’", "“", "”", "•", "–", "—", "˜", "™", "š", "›", "œ", "", "ž", "Ÿ", "Ÿ", "¿", "Ï", "Ø"])
+  -- pUPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZZÁÀ"&vA& "ÄÃÃ
+ÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙ€ÜÆØŒŞ"
+  -- pLowercase = "abcdefghijklmnopqrstuvwxyzáà "&"â"&"ÀãåçéÚêëíìîïñóòÎöõúùûÌÊÞœÿ"
+  pCaseLists.setaprop(#uppercase, ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "Á", "À", vA, "A", "Ä", "Ã", "Ã
+", "Ç", "É", "È", "Ê", "Ë", "Í", "Ì", "Î", "Ï", "Ñ", "Ó", "Ò", "Ô", "Ö", "Õ", "Ú", "Ù", "U", "Ü", "Æ", "Ø", "Œ", "Åž"])
+  pCaseLists.setaprop(#lowercase, ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "á", "à ", vA, "â", "À", "ã", "Ã¥", "ç", "é", "Ú", "ê", "ë", "í", "ì", "î", "ï", "ñ", "ó", "ò", "ÃŽ", "ö", "õ", "ú", "ù", "û", "ÃŒ", "Ê", "Þ", "œ", "ÿ"])
   
 end
@@ -3647 +3647 @@
 on mFindUnixAppInPath me, whichBinaryName
   
-  binaryPath = []
-  
-  binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done", RETURN, 0, 1)
-  
-  if count(binaryPath) > 0 then return binaryPath[1]
+  binaryPath = mDoShellCmd(me, "which" && whichBinaryName, RETURN, 0, 1)
+  if count(binaryPath) < 1 then
+    binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do if [ -d $thisBinPath ]; then find $thisBinPath -name " & whichBinaryName & "; fi ; done", RETURN, 0, 1)
+  end if
+  cnt = count(binaryPath)
+  if cnt > 0 then
+    repeat with n = 1 to cnt
+      if count(mDoShellCmd(me, "if [ -e" && binaryPath[n] && "]; then echo 1; fi", RETURN, 0, 1)) > 0 then return binaryPath[n]
+    end repeat
+  end if
   
   return ""

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -54 +54 @@
   editor = string(editor)
   if length(editor) < 1 then
-    clistr = "bbedit"
+    clistr = mFindUnixAppInPath(me, "bbedit")
+    if length(clistr) < 1 then
+      alert "BBedit not found in your path!"
+      exit
+    end if
   else
     clistr = QUOTE & editor & QUOTE
@@ -118 +122 @@
   end if
   
+  bbeditBinary = mFindUnixAppInPath(me, "bbedit")
+  if length(bbeditBinary) < 1 then
+    alert "BBEdit was not found in your PATH!"
+    exit
+  end if
+  
   cl = the activecastlib
   sel = the selection of castlib cl
-  
   
   repeat with sub in sel
@@ -152 +161 @@
             alert "Unable to save file:" && tempSrcHFSPath
           else
-            mDoShellCmd(me, "bbedit --wait --resume " & tempSrcPath)
+            mDoShellCmd(me, bbeditBinary && "--wait --resume " & tempSrcPath)
             
             theText = mGetTextFromFile(me, tempSrcHFSPath)
             
             if length(theText) < 1 then
-              alert "Something seems wrong: the length of the new text is 0, nating changed. If this was puprosely an empty text, please delete by hand."
+              alert "Something seems wrong: the length of the new text is 0, nothing changed. If this was apparently an empty text, please delete by hand."
             else
               if theType = #script then
@@ -185 +194 @@
             alert "Unable to save temp file:" && tempSrcHFSPath
           else
-            mDoShellCmd(me, "bbedit " & tempSrcPath)
+            mDoShellCmd(me, bbeditBinary && tempSrcPath)
           end if
           
@@ -426 +435 @@
   end if
   
-  bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1)
-  if count(bbdiffpath) > 0 then
-    bbdiffpath = bbdiffpath[1]
+  bbeditBinary = mFindUnixAppInPath(me, "bbedit")
+  if length(bbeditBinary) < 1 then
+    alert "BBEdit was not found in your PATH!"
+    exit
+  end if
+  
+  bbdiffpath = mFindUnixAppInPath(me, "bbdiff")
+  if length(bbdiffpath) < 1 then
+    alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
   else
-    bbdiffpath = ""
-    alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
-  end if
-  
-  if length(bbdiffpath) > 0 then
     if mCheckForXtra(me, "FileIO") = 0 then
       alert "FileIO Xtra missing!"
@@ -520 +530 @@
             neuer.text = theText
             copyToClipBoard(neuer)
-            mDoShellCmd(me, "pbpaste | bbedit")
+            mDoShellCmd(me, "pbpaste |" && bbeditBinary)
             
             
             neuer.text = theText2
             copyToClipBoard(neuer)
-            mDoShellCmd(me, "pbpaste | bbedit")
+            mDoShellCmd(me, "pbpaste |" && bbeditBinary)
             
             
@@ -623 +633 @@
   end if
   
-  --  bbdiffpath = shell_cmd_list("which bbdiff")
-  --  if count(bbdiffpath) > 0 then
-  --    bbdiffpath = bbdiffpath[1]
-  --  else
-  --    bbdiffpath = ""
-  --    alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
-  --  end if
-  
-  
-  bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1)
-  
-  if count(bbdiffpath) > 0 then
-    bbdiffpath = bbdiffpath[1]
-  else
+  
+  bbdiffpath = mFindUnixAppInPath(me, "bbdiff")
+  if length(bbdiffpath) < 1 then
     alert "This function only works with BBDiff, a command line tool provided by BBEdit. Consider installing BBEdits command line tools, it is really helpful."
-    exit 
+    exit
   end if
   
@@ -1155 +1154 @@
   
   the itemdelimiter = olddelim
-  
-  put "Path from member comments is" && aPath
   
   return aPath
@@ -1316 +1313 @@
     
     if mCheckForXtra(me, "Shell") = 1 or mCheckForXtra(me, "ff_shell") = 1 then
-      bbdiffpath = mDoShellCmd(me, "which bbdiff", RETURN, 0, 1)
-      if count(bbdiffpath) > 0 then
-        bbdiffpath = bbdiffpath[1]
-      else
-        bbdiffpath = ""
+      
+      bbeditBinary = mFindUnixAppInPath(me, "bbedit")
+      
+      bbdiffpath = mFindUnixAppInPath(me, "bbdiff")
+      if length(bbdiffpath) < 1 then
         alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
       end if
@@ -1406 +1403 @@
                         put "-------------------------------------------------------"
                         put RETURN&"neuer = new(#field)"&RETURN&"neuer.text = "&memref&".scripttext"&RETURN&"neuer.copyToClipBoard()"&RETURN&"neuer.erase()"&RETURN
-                        put RETURN&"shell_cmd("&QUOTE&"PBPaste | BBedit ; BBedit " & line 1 of memref.comments & QUOTE&")"&RETURN
+                        if length(bbeditBinary) > 0 then
+                          put RETURN&"shell_cmd("&QUOTE&"PBPaste |" && bbeditBinary && ";" && bbeditBinary && line 1 of memref.comments & QUOTE&")"&RETURN
+                        else
+                          put "BBEdit not found in PATH"
+                        end if
                       else
                         
@@ -1412 +1413 @@
                           put "-------------------------------------------------------"
                           put RETURN&"neuer = new(#field)"&RETURN&"neuer.text = "&memref&".scripttext"&RETURN&"neuer.copyToClipBoard()"&RETURN&"neuer.erase()"&RETURN
-                          put RETURN&"shell_cmd("&QUOTE&"PBPaste | BBedit ; BBedit " & line 1 of memref.comments &QUOTE&")"&RETURN
-                          
+                          if length(bbeditBinary) > 0 then
+                            put RETURN&"shell_cmd("&QUOTE&"PBPaste |" && bbeditBinary && ";" && bbeditBinary && line 1 of memref.comments & QUOTE&")"&RETURN
+                          else
+                            put "BBEdit not found in PATH"
+                          end if
                         else
                           
@@ -1424 +1428 @@
                           if char 1 of comm = "~" then put "$HOME" into char 1 of comm
                           
-                          mDoShellCmd(me, "PBPaste | BBedit ; BBedit " & comm)
+                          
+                          if length(bbeditBinary) > 0 then
+                            mDoShellCmd(me, "PBPaste |" && bbeditBinary && ";" && bbeditBinary && comm)
+                          else
+                            put "BBEdit not found in PATH"
+                          end if
                           
                         end if
@@ -1497 +1506 @@
   sel = the selection of castlib cl
   
-  clistr = "bbedit"
+  clistr = mFindUnixAppInPath(me, "bbedit")
+  if length(clistr) < 1 then
+    alert "BBEdit was not found in your PATH!"
+    exit
+  end if
   
   -- home = mDoShellCmd(me, "echo -n $HOME")

trunk/lingosource/castlib1/memberInfo.xml

@@ -3 +3 @@
         <subversion_version_field>
                 <scriptType>#field</scriptType>
-                <comments>http://www.farbflash.de/cgi-bin/versionChecker.pl?movieName=HandlerMenu_OSC?movieName=HandlerMenu_OSC</comments>
+                <comments>http://www.farbflash.de/cgi-bin/versionChecker.pl?movieName=HandlerMenu_OSC?movieName=HandlerMenu_OSC?movieName=HandlerMenu_OSC</comments>
                 <memberName>subversion_version_field</memberName>
                 <fname>subversion_version_field</fname>

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r255
+r258

trunk/lingosource/castlib1/texthyperlinkBehavior.ls

@@ -1 +1 @@
 -- Hyperlink Behavior for custom hyperlink colors in #text members
--- ©03 alex da franca -- alex@farbflash.de
+-- ©03 alex da franca -- alex@farbflash.de
 
 property pSprite