Changeset 148 for trunk/lingosource

Timestamp:

02/18/08 05:09:49 (4 years ago)

Author:

alex

Message:

enabled most of the bbedit function also for windows using user definad apps as relacements

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (2 diffs)
• castlib1/alexUtilities.ls (modified) (2 diffs)
• castlib1/bbedit_Utilities.ls (modified) (17 diffs)
• castlib1/memberInfo.xml (modified) (21 diffs)
• castlib1/svn_Utilities.ls (modified) (2 diffs)
• castlib2/memberInfo.xml (modified) (7 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -53 +53 @@
     pLookUpCommandList.setaprop("Batch compare selected scripts", ["mCompareSelectedScriptmembersBatch me", "bbedit_Utilities"])
     
-    
-  end if
+  end if
+  
+  
+  li.add("External script editor Handlers")
+  subli = []
+  li.add(subli)
+  
+  subli.add("Edit in external editor")
+  pLookUpCommandList.setaprop("Edit in external editor", ["mEdit_text_in_ext_editor me", "bbedit_Utilities"])
+  
+  subli.add("Open in external editor")
+  pLookUpCommandList.setaprop("Open in external editor", ["mOpen_text_with_ext_editor me", "bbedit_Utilities"])
+  
+  subli.add("Refresh members edited in external editor")
+  pLookUpCommandList.setaprop("Refresh members edited in external editor", ["mReImport_text_Opened_In_ext_editor me", "bbedit_Utilities"])
+  
+  subli.add("Open linked script")
+  pLookUpCommandList.setaprop("Open linked script", ["mOpen_Linked_Script_With_ext_editor me", "bbedit_Utilities"])
+  
+  subli.add("Diff selected scripts")
+  pLookUpCommandList.setaprop("Diff selected scripts", ["mLiveCompare_SelectedScript me, convertLineBreaksToUnix", "bbedit_Utilities"])
+  
+  
+  
   
   
@@ -222 +244 @@
     
     subli.add("")
-    subli.add("Open original of selected alex-linked-library-script in BBEdit")
-    pLookUpCommandList.setaprop("Open original of selected alex-linked-library-script in BBEdit", ["mBBedit me", "bbedit_Utilities"])
+    subli.add("Open counterpart of selected alex-linked-library-script in BBEdit")
+    pLookUpCommandList.setaprop("Open counterpart of selected alex-linked-library-script in BBEdit", ["mBBedit me", "bbedit_Utilities"])
     
     subli.add("Check changes in selected alex-linked-library-scripts")

trunk/lingosource/castlib1/alexUtilities.ls

@@ -2427 +2427 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+------------------- subversion support works better with unix linebreaks...
+
+on mConvertLineBreaksToUnix me, st
+  
+  if mCheckForXtra(me, "Pregex") = 1 then
+    scrTextLi = [st]
+    pregex_replace(scrTextLi, "\x0D\x0A?", "g", "\x0A")
+    return scrTextLi[1]
+  else
+    fndStr = numToChar(13) & numToChar(10)
+    offs = offset(fndStr, st)
+    repeat while offs > 0
+      delete char offs of st
+      offs = offset(fndStr, st)
+    end repeat
+    
+    fndStr = numToChar(13)
+    offs = offset(fndStr, st)
+    repeat while offs > 0
+      put numToChar(10) into char offs of st
+      offs = offset(fndStr, st)
+    end repeat
+    
+  end if
+  
+  return st
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+----------- always convert to mac linebreaks for scripts as director internally uses mac linebreaks
+
+on mConvertLineBreaksToMac me, scrText
+  
+  if mCheckForXtra(me, "Pregex") = 1 then
+    
+    scrTextLi = [scrText]
+    pregex_replace(scrTextLi, "\x0D?\x0A", "g", "\x0D")
+    return scrTextLi[1]
+    
+  else
+    
+    -- first convert windows to mac
+    fndStr = numToChar(13) & numToChar(10)
+    offs = offset(fndStr, scrText)
+    repeat while offs > 0
+      put numToChar(13) into char offs to offs+1 of scrText
+      offs = offset(fndStr, scrText)
+    end repeat
+    
+    -- now convert unix to mac
+    fndStr = numToChar(10)
+    offs = offset(fndStr, scrText)
+    repeat while offs > 0
+      put numToChar(13) into char offs of scrText
+      offs = offset(fndStr, scrText)
+    end repeat
+    
+  end if
+  -----------------------------------------
+  
+  return scrText
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetTempFilePath me, theName
+  
+  if mCheckForXtra(me, "BudAPI") then
+    if the platform contains "mac" then
+      
+      resetUNames = 0
+      if baSysFolder("prefs") starts "/" then
+        baReturnUnixNames(0)
+        resetUNames = 1
+      end if
+      tempSrcHFSPath = basysfolder("temp") & theName
+      if resetUNames = 1 then baReturnUnixNames(1)
+      return tempSrcHFSPath
+      
+    else
+      tmpfolder = baSysFolder("temp")
+      return tmpfolder & theName
+    end if
+    
+  else
+    if the platform contains "mac" then
+      
+      tempSrcPath = "/tmp/" & theName
+      
+      return mConvertUnix2Hfs(me, tempSrcPath)
+      
+    else
+      tmpfolder = "C:\WINDOWS\TEMP\"
+      return tmpfolder & theName
+    end if
+    
+  end if
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 on _______________GLOSSARY_ITEMS me
 end
@@ -2591 +2694 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+on _______________EXTERNAL_PATHS me
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetExternalScriptEditor me, externalEditors
+  
+  if mCheckForXtra(me, "budapi") <> 1 then
+    alert "You need the buddyApi xtra for this operation"
+    exit
+  end if
+  
+  savePrefs = 0
+  if ilk(externalEditors) <> #proplist then
+    externalEditors = value(getPref("handlerMenu_externalEditors.txt"))
+    if ilk(externalEditors) <> #proplist then externalEditors = [:]
+    savePrefs = 1
+  end if
+  
+  if the shiftdown then
+    externalScripteditor = ""
+    savePrefs = 1
+  else
+    externalScripteditor = string(externalEditors.getaprop(#externalScripteditor))
+    if baFileExists(externalScripteditor) <> 1 then externalScripteditor = ""
+  end if
+  
+  if length(externalScripteditor) < 1 then
+    
+    alert "Please select an external script editor."
+    externalScripteditor = mGetFilePathFromUser(me)
+    if length(externalScripteditor) < 1 then return ""
+    
+  end if
+  
+  if baFileExists(externalScripteditor) <> 1 then
+    alert "The path to the external script editor seems to have changed. Please try again in order to search the path."
+    externalScripteditor = ""
+  end if
+  
+  externalEditors.setaprop(#externalScripteditor, externalScripteditor)
+  
+  if savePrefs = 1 then setPref("handlerMenu_externalEditors.txt", string(externalEditors))
+  
+  return externalScripteditor
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetSVNDiffBinaryPath me, workingCopies
+  
+  if (mCheckForXtra(me, "budapi") + (mCheckForXtra(me, "Shell") + mCheckForXtra(me, "ff_shell"))) < 2 then
+    alert "You need the shell xtra and the buddyApi xtra in order to proceed"
+    return ""
+  end if
+  
+  savePrefs = 0
+  if ilk(workingCopies) <> #proplist then
+    workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+    if ilk(workingCopies) <> #proplist then workingCopies = [:]
+    savePrefs = 1
+  end if
+  
+  
+  svnBinary = string(workingCopies.getaprop(#svnDiffBinary))
+  
+  
+  if baFileExists(svnBinary) <> 1 then svnBinary = ""
+  
+  
+  if length(svnBinary) < 1 then
+    
+    alert "There is not yet an application specified to handle file diffs. Please select the applivcation you want to use, e.g. TortoiseMerge in your Tortoise folder, if you are using Tortoise."
+    svnBinary = mGetFilePathFromUser(me)
+    if length(svnBinary) < 1 then return ""
+    
+  end if
+  
+  if baFileExists(svnBinary) <> 1 then
+    alert "The path to the svn diff binary seems to have changed. Please try again in order to search the path."
+    svnBinary = ""
+  end if
+  
+  
+  
+  workingCopies.setaprop(#svnDiffBinary, svnBinary)
+  
+  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  
+  return svnBinary
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 on _______________HELPER_HANDLER me
 end
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -6 +6 @@
 end
 
+
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 on _______________BBEDIT_SCRIPTS end
@@ -11 +12 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mOpen_Linked_Script_With_BBedit me
-  
-  if not(the platform contains "mac") then
-    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-    exit
-  end if
+on mOpen_Linked_Script_With_BBedit me, editor
   
   if  mCheckForXtra(me, "ff_shell") = 0 then
@@ -28 +24 @@
   sel = the selection of castlib cl
   
-  clistr = "bbedit"
+  editor = string(editor)
+  if length(editor) < 1 then
+    clistr = "bbedit"
+  else
+    clistr = editor
+  end if
   
   repeat with sub in sel
@@ -51 +52 @@
   
 end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mOpen_Linked_Script_With_ext_editor me
+  editor = mGetExternalScriptEditor(me)
+  if length(editor) < 1 then exit
+  mOpen_Linked_Script_With_BBedit me, editor
+end 
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -132 +141 @@
           ---------------------
           -- create a temporary file from scripttext:
-          tempSrcPath = "/tmp/" & theName & ".ls"
-          
-          -- tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-          -- tempSrcHFSPath = tempSrcHFSPath[1]
-          tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          if mCheckForXtra(me, "BudAPI") then
+            
+            resetUNames = 0
+            if baSysFolder("prefs") starts "/" then
+              baReturnUnixNames(0)
+              resetUNames = 1
+            end if
+            tempSrcHFSPath = basysfolder("temp") & theName & ".ls"
+            baReturnUnixNames(1)
+            tempSrcPath = basysfolder("temp") & theName & ".ls"
+            if resetUNames = 0 then
+              baReturnUnixNames(0)
+            end if  
+          else
+            tempSrcPath = "/tmp/" & theName & ".ls"
+            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          end if
           
           
@@ -144 +165 @@
           mDoShellCmd(me, "bbedit " & tempSrcPath)
           
-          
         end if
-        
-        --        neuer = new(#field)
-        --        neuer.text = theText
-        --        
-        --        oldclipboardNum = new(#field)
-        --        oldclipboardNum.pasteClipBoardInto()
-        --        
-        --        copyToClipBoard(neuer)
-        --        
-        --        shell_cmd("pbpaste | bbedit")
-        --        
-        --        if oldclipboardNum.type <> #empty then copyToClipBoard(oldclipboardNum)
-        --        oldclipboardNum.erase()
-        --        neuer.erase()
-        --        
-        --        exit
         
       end if
@@ -172 +176 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mReImport_text_Opened_In_BBedit me
-  
-  if not(the platform contains "mac") then
-    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-    exit
+on mEdit_text_in_ext_editor me
+  mOpen_text_with_ext_editor me, 1
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetMacBinary me, editor
+  if not(editor starts "/") then
+    editor = mConvertHFS2Unix(me, editor)
+  end if
+  
+  if the last char of editor = "/" then delete the last char of editor
+  
+  olddelim = the itemdelimiter
+  the itemdelimiter = "/"
+  
+  appname = the last item of editor
+  if offset(".app", appname) = length(appname) - 3 then
+    infoplist = editor & "/Contents/Info.plist"
+    exename = mDoShellCmd(me, "grep -A1 -E '<key>CFBundleExecutable<\/key>'" && QUOTE & infoplist & QUOTE & " | grep -vE '<key>CFBundleExecutable</key>' | cut -d\> -f2 | cut -d\< -f1")
+    if the last char of exename = RETURN then delete the last char of exename
+    if the last char of exename = numToChar(10) then delete the last char of exename
+    editor = editor & "/Contents/MacOS/" & exename
+  end if
+  
+  the itemDelimiter = olddelim
+  
+  return editor
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mOpen_text_with_ext_editor me, doLiveEdit
+  
+  if  mCheckForXtra(me, "ff_shell") = 0 then
+    if mCheckForXtra(me, "Shell") = 0 then
+      mShellXtraMissing me
+      exit
+    end if
   end if
   
@@ -182 +220 @@
   sel = the selection of castlib cl
   
+  if mCheckForXtra(me, "BudAPI") then
+    --    tempFolder = basysfolder("temp")
+    
+    if the platform contains "mac" then
+      
+      isMac = 1
+      resetUNames = 0
+      if baSysFolder("prefs") starts "/" then
+        baReturnUnixNames(0)
+        resetUNames = 1
+      end if
+      tempFolderHFS = basysfolder("temp")
+      baReturnUnixNames(1)
+      tempFolder = basysfolder("temp")
+      if resetUNames = 0 then
+        baReturnUnixNames(0)
+      end if
+      
+    else
+      tempFolderHFS = basysfolder("temp")
+      tempFolder = tempFolderHFS
+    end if
+    
+    
+  else
+    alert "You need the buddyApi xtra for this operation"
+    exit
+  end if
+  
+  editor = mGetExternalScriptEditor(me)
+  if length(editor) < 1 then exit
+  
   repeat with sub in sel
     repeat with mem = sub[1] to sub[2]
@@ -187 +257 @@
       memref = member(mem,cl)
       
+      theText = ""
+      theType = memref.type
+      if theType = #script then
+        theText = memref.scripttext
+      else if theType = #text then
+        theText = memref.html
+      else if theType = #field then
+        theText = memref.text
+      end if
+      
+      if length(theText) > 0 then
+        
+        
+        if doLiveEdit then
+          ---------------------
+          tempSrcPath = tempFolder & "temp_LingoScript_file.ls"
+          
+          if isMac then
+            waitparam = ""
+            editor = mGetMacBinary(me, editor)
+            tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          else
+            waitparam = " \w"
+            tempSrcHFSPath = tempSrcPath
+          end if
+          ---------------------
+          
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          
+          mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          
+          theText = mGetTextFromFile(me, tempSrcHFSPath)
+          
+          theText = mForceMacLineBreaks(me, theText)
+          
+          if theType = #script then
+            memref.scripttext = theText
+          else if theType = #text then
+            memref.html = theText
+          else if theType = #field then
+            memref.text = theText
+          end if
+          
+          
+        else
+          
+          theName = memref.name
+          if length(theName) < 1 then
+            theName = "member_" & memref.membernum & "_" & memref.castlibnum
+          end if
+          ---------------------
+          -- create a temporary file from scripttext:
+          tempSrcPath = tempFolder & theName & ".ls"
+          
+          if isMac then
+            waitparam = " &"
+            editor = ""
+            tempSrcHFSPath = tempSrcPath
+          else
+            waitparam = ""
+            tempSrcHFSPath = tempSrcPath
+          end if
+          
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          ---------------------
+          
+          mDoShellCmd(me, QUOTE & editor & QUOTE && tempSrcPath & waitparam)
+          
+        end if
+        
+      end if
+    end repeat
+  end repeat
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReImport_text_Opened_In_ext_editor me
+  mReImport_text_Opened_In_BBedit me
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReImport_text_Opened_In_BBedit me
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  repeat with sub in sel
+    repeat with mem = sub[1] to sub[2]
+      
+      memref = member(mem,cl)
       
       theName = memref.name
@@ -193 +356 @@
       end if
       
-      delim = the last char of the moviepath
-      olddelim = the itemdelimiter
-      the itemdelimiter = delim
-      hd = item 1 of getosdirectory()
-      
-      tempSrcPath = hd & delim & "tmp" & delim & theName & ".ls"
-      the itemdelimiter = olddelim
+      if not(the platform contains "mac") then
+        if mCheckForXtra(me, "BudAPI") then
+          tempSrcPath = basysfolder("temp")
+          put theName & ".ls" after tempSrcPath
+        else
+          alert "You need the buddyApi xtra for this operation"
+          exit
+        end if
+      else
+        delim = the last char of the moviepath
+        olddelim = the itemdelimiter
+        the itemdelimiter = delim
+        hd = item 1 of getosdirectory()
+        
+        tempSrcPath = hd & delim & "tmp" & delim & theName & ".ls"
+        the itemdelimiter = olddelim
+      end if
       
       theText = mGetTextFromFile(me, tempSrcPath)
       
       if length(theText) > 0 then
+        
+        theText = mForceMacLineBreaks(me, theText)
         
         case memref.type of
@@ -216 +391 @@
   end repeat
   
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mForceMacLineBreaks me, theText
+  rettext = ""
+  olddelim = the itemdelimiter
+  the itemdelimiter = numToChar(10)
+  thirteen = numToChar(13)
+  num = the number of items of theText
+  repeat with n = num down to 1
+    i = item n of theText
+    put i after rettext
+    if the last char of i <> thirteen then put thirteen after rettext
+  end repeat
+  the itemdelimiter = olddelim
+  return rettext
 end
 
@@ -544 +736 @@
   end if
 end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mLiveCompare_SelectedScript me, convertLineBreaksToUnix
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  if count(sel) > 0 then
+    memref1 = member(sel[1][1], cl)
+    if sel[1][2] <> sel[1][1] then
+      memref2 = member(sel[1][2], cl)
+    else
+      if count(sel) < 2 then
+        alert "Please select two castmembers!"
+        exit
+      end if
+      memref2 = member(sel[2][1], cl)
+    end if
+  else
+    alert "Please select two castmembers!"
+    exit
+  end if
+  
+  memtype = memref1.type
+  if [#script, #field, #text].getPos(memtype) < 1 then
+    alert "The members must be either #script, #field or #text members!"
+    exit
+  else
+    case memtype of
+        
+        -----------------------
+      #script:
+        ext1 = ".ls"
+        st1 = memref1.scripttext
+        
+        -----------------------
+      #text:
+        ext1 = ".html"
+        st1 = memref1.html
+        
+        -----------------------
+      otherwise:
+        ext1 = ".txt"
+        st1 = memref1.text
+        
+    end case
+    
+  end if
+  
+  memtype = memref2.type
+  if [#script, #field, #text].getPos(memtype) < 1 then
+    alert "The members must be either #script, #field or #text members!"
+    exit
+  else
+    case memtype of
+        
+        -----------------------
+      #script:
+        ext2 = ".ls"
+        st2 = memref2.scripttext
+        
+        -----------------------
+      #text:
+        ext2 = ".html"
+        st2 = memref2.html
+        
+        -----------------------
+      otherwise:
+        ext2 = ".txt"
+        st2 = memref2.text
+        
+    end case
+  end if
+  
+  if not(the platform contains "mac") then
+    
+    bbdiffpath = mGetSVNDiffBinaryPath(me)
+    
+    if length(bbdiffpath) < 1 then exit
+    
+    isMac = 0
+  else
+    isMac = 1
+    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
+    end if
+    
+  end if
+  
+  
+  if  mCheckForXtra(me, "ff_shell") = 0 then
+    if mCheckForXtra(me, "Shell") = 0 then
+      mShellXtraMissing me
+      exit
+    end if
+  end if
+  
+  
+  name1 = memref1.name & "_m" & memref1.memberNum & "_c" & memref1.castlibnum
+  fname1 = mGetTempFilePath(me, name1 & ext1)
+  
+  name2 = memref2.name & "_m" & memref2.memberNum & "_c" & memref2.castlibnum
+  fname2 = mGetTempFilePath(me, name2 & ext2)
+  
+  ------------------------------------------ trac subversion support works better with unix linebreaks...
+  if voidP(convertLineBreaksToUnix) then convertLineBreaksToUnix = 1
+  if convertLineBreaksToUnix = "" then convertLineBreaksToUnix = 1
+  
+  if convertLineBreaksToUnix = 1 then
+    st1 = mConvertLineBreaksToUnix(me, st1)
+    st2 = mConvertLineBreaksToUnix(me, st2)
+  end if
+  -----------------------------------------
+  
+  
+  theResult = mSaveTextToTempFile(me, st1, fname1)
+  theResult = mSaveTextToTempFile(me, st2, fname2)
+  ---------------------
+  
+  
+  if isMac then
+    
+    
+    theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& mConvertHFS2Unix(me, fname1) &QUOTE&&QUOTE& mConvertHFS2Unix(me, fname2) &QUOTE && "2>&1", RETURN, 0, 1)
+    
+    -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished
+    
+    if count(theResult) > 0 then
+      if theResult[1] contains "no such file or directory" then
+        put theResult[1]
+      else
+        put "No differences found for member: " & memref1.name && "(" & memref1 & ") and " & memref2.name && "(" & memref2 & ")"
+      end if
+      writeBack = 0
+      
+    else
+      
+      -------- now write the results of the BBEdit diff back into the script members
+      st1 = mGetTextFromFile(me, fname1)
+      st2 = mGetTextFromFile(me, fname2)
+      
+      writeBack = 1
+      
+    end if
+    
+    ---------------------- windows
+  else
+    
+    
+    theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE && QUOTE & fname1 &QUOTE&&QUOTE& fname2 &QUOTE, RETURN, 0, 0, 0)
+    
+    -------- now write the results of the BBEdit diff back into the script members
+    st1 = mGetTextFromFile(me, fname1)
+    st2 = mGetTextFromFile(me, fname2)
+    
+    writeBack = 1
+  end if
+  
+  
+  if writeBack = 1 then
+    
+    
+    if convertLineBreaksToUnix = 1 then
+      st1 = mConvertLineBreaksToMac(me, st1)
+      st2 = mConvertLineBreaksToMac(me, st2)
+    end if
+    
+    memtype = memref1.type
+    case memtype of
+        -----------------------
+      #script:
+        memref1.scripttext = st1
+        
+        -----------------------
+      #text:
+        memref1.html = st1
+        
+        -----------------------
+      otherwise:
+        memref1.text = st1
+        
+    end case
+    
+    memtype = memref2.type
+    case memtype of
+        -----------------------
+      #script:
+        memref2.scripttext = st2
+        
+        -----------------------
+      #text:
+        memref2.html = st2
+        
+        -----------------------
+      otherwise:
+        memref2.text = st2
+        
+    end case
+    
+  end if
+  
+  
+end
+
 
 
@@ -891 +1291 @@
   
   
-  --  if not(the platform contains "mac") then
-  --    alert "Sorry, BBEdit is a mac application!" & RETURN & "If you change this handler to match something appropriate for Windows, please drop me a note. alex@farbflash.de"
-  --    exit
-  --  end if
-  --  
-  --  if mCheckForXtra(me, "Shell") = 0 then
-  --    mShellXtraMissing me
-  --    exit
-  --  end if
-  
-  
   bbdiffpath = ""
   if the platform contains "mac" then
@@ -925 +1314 @@
   
   
-  
-  
-  
   cl = the activecastlib
   sel = the selection of castlib cl
@@ -946 +1332 @@
         memname = memref.name
         comm = memref.comments
-        if comm.length then
+        
+        if length(comm) < 1 then
+          -- put memref.name && "(" & memref & ") has no comments - not linked" 
+        else
           
           aPath = mGetFilePathFromMemberComments(me, memref, isMac, CurrentOSXUserName)
           
-          if length(aPath) > 0 then
+          if length(aPath) < 1 then
+            -- put memref.name && "(" & memref & ") has no comments - not linked" 
+          else
             
             fio = (xtra "fileio").new()
+            
             if objectP(fio) then
+              
               fio.openFile(aPath, 0)
-              if fio.status() = 0 then
+              
+              if fio.status() <> 0 then
+                put memref.name && "(" & memref & "): Couldn't open file:" && aPath && "fileIO error:" && fio.error(fio.status())
+              else
+                
                 vergText = fio.readFile()
                 fio.closeFile()
                 memscr = memref.scripttext
-                if vergText <> memscr then
+                
+                if vergText = memscr then
+                  put memref.name && "(" & memref & ") has no changes"
+                else
                   
                   isEqual = 0
@@ -975 +1375 @@
                   end if
                   
-                  if isEqual = 0 then
+                  if isEqual <> 0 then
+                    put memref.name && "(" & memref & ") has no changes"
+                  else
                     
                     if length(bbdiffpath) < 1 then
@@ -1009 +1411 @@
                     else
                       
-                      
-                      --                      tempSrcPath = mDoShellCmd(me, "mktemp -t temp_BBDiff_file1.ls", 1)
-                      --                      tempSrcPath = tempSrcPath[1]
                       tempSrcPath = "/tmp/temp_BBEdit_file.ls"
-                      
-                      -- tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-                      -- tempSrcHFSPath = tempSrcHFSPath[1]
                       tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
                       
                       mSaveTextToTempFile(me, memref.scripttext, tempSrcHFSPath)
-                      
-                      --                    comm = memref.comments
-                      --                    if comm.length then
-                      --                      if char 1 of comm = "~" then
-                      --                        put shell_Cmd("echo -n $HOME") into char 1 of comm
-                      --                      end if
-                      --                    end if
-                      
                       
                       if char 1 of comm = "~" then put "$HOME" into char 1 of comm

trunk/lingosource/castlib1/memberInfo.xml

@@ -5 +5 @@
                 <comments></comments>
                 <memberName>doCommandMovieScript</memberName>
-                <fname>doCommandMovieScript</fname>
+                <fName>doCommandMovieScript</fName>
         </doCommandMovieScript>
         <thisMoviesScript>
@@ -11 +11 @@
                 <comments></comments>
                 <memberName>thisMoviesScript</memberName>
-                <fname>thisMoviesScript</fname>
+                <fName>thisMoviesScript</fName>
         </thisMoviesScript>
         <keyboardNavigation_FrameLoop>
@@ -17 +17 @@
                 <comments></comments>
                 <memberName>keyboardNavigation_FrameLoop</memberName>
-                <fname>keyboardNavigation_FrameLoop</fname>
+                <fName>keyboardNavigation_FrameLoop</fName>
         </keyboardNavigation_FrameLoop>
         <menu1_button>
@@ -23 +23 @@
                 <comments></comments>
                 <memberName>menu1_button</memberName>
-                <fname>menu1_button</fname>
+                <fName>menu1_button</fName>
         </menu1_button>
         <menu2_button>
@@ -29 +29 @@
                 <comments></comments>
                 <memberName>menu2_button</memberName>
-                <fname>menu2_button</fname>
+                <fName>menu2_button</fName>
         </menu2_button>
         <simpleBMMenu>
@@ -35 +35 @@
                 <comments></comments>
                 <memberName>simpleBMMenu</memberName>
-                <fname>simpleBMMenu</fname>
+                <fName>simpleBMMenu</fName>
         </simpleBMMenu>
         <OSCmenu_Utilities>
@@ -41 +41 @@
                 <comments></comments>
                 <memberName>OSCmenu_Utilities</memberName>
-                <fname>OSCmenu_Utilities</fname>
+                <fName>OSCmenu_Utilities</fName>
         </OSCmenu_Utilities>
         <alexUtilities>
@@ -47 +47 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>alexUtilities</memberName>
-                <fname>alexUtilities</fname>
+                <fName>alexUtilities</fName>
         </alexUtilities>
         <convert_Lingo_2_CSS_Html>
@@ -53 +53 @@
                 <comments>~/Documents/Scripts/lingo/convert_Lingo_2_CSS_Html.ls</comments>
                 <memberName>convert_Lingo_2_CSS_Html</memberName>
-                <fname>convert_Lingo_2_CSS_Html</fname>
+                <fName>convert_Lingo_2_CSS_Html</fName>
         </convert_Lingo_2_CSS_Html>
         <OSCmenu_Handlers>
@@ -59 +59 @@
                 <comments></comments>
                 <memberName>OSCmenu_Handlers</memberName>
-                <fname>OSCmenu_Handlers</fname>
+                <fName>OSCmenu_Handlers</fName>
         </OSCmenu_Handlers>
         <pastefeld>
@@ -65 +65 @@
                 <comments></comments>
                 <memberName>pastefeld</memberName>
-                <fname>pastefeld</fname>
+                <fName>pastefeld</fName>
         </pastefeld>
         <oldclipboard>
@@ -71 +71 @@
                 <comments></comments>
                 <memberName>oldclipboard</memberName>
-                <fname>oldclipboard</fname>
+                <fName>oldclipboard</fName>
         </oldclipboard>
         <searchword>
@@ -77 +77 @@
                 <comments></comments>
                 <memberName>searchword</memberName>
-                <fname>searchword</fname>
+                <fName>searchword</fName>
         </searchword>
         <resizewindowfs>
@@ -83 +83 @@
                 <comments></comments>
                 <memberName>resizewindowfs</memberName>
-                <fname>resizewindowfs</fname>
+                <fName>resizewindowfs</fName>
         </resizewindowfs>
         <showHideHelp>
@@ -89 +89 @@
                 <comments></comments>
                 <memberName>showHideHelp</memberName>
-                <fname>showHideHelp</fname>
+                <fName>showHideHelp</fName>
         </showHideHelp>
         <helptext>
@@ -98 +98 @@
 rtf</comments>
                 <memberName>helptext</memberName>
-                <fname>helptext</fname>
+                <fName>helptext</fName>
         </helptext>
         <texthyperlinkBehavior>
@@ -104 +104 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/texthyperlinkBehavior.ls</comments>
                 <memberName>texthyperlinkBehavior</memberName>
-                <fname>texthyperlinkBehavior</fname>
+                <fName>texthyperlinkBehavior</fName>
         </texthyperlinkBehavior>
         <statusOutput>
@@ -113 +113 @@
 rtf</comments>
                 <memberName>statusOutput</memberName>
-                <fname>statusOutput</fname>
+                <fName>statusOutput</fName>
         </statusOutput>
         <bbedit_Utilities>
@@ -119 +119 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>bbedit_Utilities</memberName>
-                <fname>bbedit_Utilities</fname>
+                <fName>bbedit_Utilities</fName>
         </bbedit_Utilities>
         <svn_Utilities>
@@ -125 +125 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>svn_Utilities</memberName>
-                <fname>svn_Utilities</fname>
+                <fName>svn_Utilities</fName>
         </svn_Utilities>
         <custom_Utilities>
@@ -131 +131 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>custom_Utilities</memberName>
-                <fname>custom_Utilities</fname>
+                <fName>custom_Utilities</fName>
         </custom_Utilities>
 </Untitled>

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -2985 +2985 @@
 end
 
+
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetSVNDiffBinaryPath me, workingCopies
-  
-  if (mCheckForXtra(me, "budapi") + (mCheckForXtra(me, "Shell") + mCheckForXtra(me, "ff_shell"))) < 2 then
-    alert "You need the shell xtra and the buddyApi xtra in order to proceed"
-    return ""
+on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies, selectMsg
+  
+  movieIdentifier = string(movieIdentifier)
+  if length(movieIdentifier) < 1 then
+    movieIdentifier = the moviepath & the moviename
   end if
   
@@ -3001 +3002 @@
   end if
   
-  
-  svnBinary = string(workingCopies.getaprop(#svnDiffBinary))
-  
-  
-  if baFileExists(svnBinary) <> 1 then svnBinary = ""
-  
-  
-  if length(svnBinary) < 1 then
-    
-    alert "There is not yet an application specified to handle file diffs. Please select the applivcation you want to use, e.g. TortoiseMerge in your Tortoise folder, if you are using Tortoise."
-    svnBinary = mGetFilePathFromUser(me)
-    if length(svnBinary) < 1 then return ""
-    
-  end if
-  
-  if baFileExists(svnBinary) <> 1 then
-    alert "The path to the svn diff binary seems to have changed. Please try again in order to search the path."
-    svnBinary = ""
-  end if
-  
-  
-  
-  workingCopies.setaprop(#svnDiffBinary, svnBinary)
-  
-  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
-  
-  return svnBinary
-  
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies, selectMsg
-  
-  movieIdentifier = string(movieIdentifier)
-  if length(movieIdentifier) < 1 then
-    movieIdentifier = the moviepath & the moviename
-  end if
-  
-  savePrefs = 0
-  if ilk(workingCopies) <> #proplist then
-    workingCopies = value(getPref("svn_workingCopies_paths.txt"))
-    if ilk(workingCopies) <> #proplist then workingCopies = [:]
-    savePrefs = 1
-  end if
-  
   workingFolder = string(workingCopies.getaprop(movieIdentifier))
   

trunk/lingosource/castlib2/memberInfo.xml

@@ -5 +5 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>commonMovieScript</memberName>
-                <fname>commonMovieScript</fname>
+                <fName>commonMovieScript</fName>
         </commonmoviescript>
         <FileIOFunktionen>
@@ -11 +11 @@
                 <comments>~/Documents/Scripts/lingo/FileIOFunktionen.ls</comments>
                 <memberName>FileIOFunktionen</memberName>
-                <fname>FileIOFunktionen</fname>
+                <fName>FileIOFunktionen</fName>
         </FileIOFunktionen>
         <GetSetPrefs>
@@ -17 +17 @@
                 <comments>~/Documents/Scripts/lingo/GetSetPrefs.ls</comments>
                 <memberName>GetSetPrefs</memberName>
-                <fname>GetSetPrefs</fname>
+                <fName>GetSetPrefs</fName>
         </GetSetPrefs>
         <aleXtrasMovieScript>
@@ -23 +23 @@
                 <comments>~/Documents/Scripts/lingo/aleXtrasMovieScript.ls</comments>
                 <memberName>aleXtrasMovieScript</memberName>
-                <fname>aleXtrasMovieScript</fname>
+                <fName>aleXtrasMovieScript</fName>
         </aleXtrasMovieScript>
         <PseudoXMLPS>
@@ -29 +29 @@
                 <comments>~/Documents/Scripts/lingo/PseudoXMLPS.ls</comments>
                 <memberName>PseudoXMLPS</memberName>
-                <fname>PseudoXMLPS</fname>
+                <fName>PseudoXMLPS</fName>
         </PseudoXMLPS>
         <simpleGoToAction>
@@ -35 +35 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/simpleGoToAction.ls</comments>
                 <memberName>simpleGoToAction</memberName>
-                <fname>simpleGoToAction</fname>
+                <fName>simpleGoToAction</fName>
         </simpleGoToAction>
         <SpriteNameBeaver>
@@ -41 +41 @@
                 <comments>~/Documents/Scripts/lingo/SpriteNameBeaver.ls</comments>
                 <memberName>SpriteNameBeaver</memberName>
-                <fname>SpriteNameBeaver</fname>
+                <fName>SpriteNameBeaver</fName>
         </SpriteNameBeaver>
 </Untitled>