Changeset 76 for trunk/lingosource

Timestamp:

12/07/07 00:24:27 (4 years ago)

Author:

alex

Message:

added new funcion fro roundtrip bbedit

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (1 diff)
• castlib1/alexUtilities.ls (modified) (2 diffs)
• castlib1/bbedit_Utilities.ls (modified) (5 diffs)
• castlib1/convert_Lingo_2_CSS_Html.jpg (deleted)
• castlib1/helptext.rtf (deleted)
• castlib1/menu1_button.rtf (deleted)
• castlib1/menu2_button.rtf (deleted)
• castlib1/statusOutput.rtf (deleted)
• castlib1/texthyperlinkBehavior.jpg (deleted)
• castlib2/FileIOFunktionen.jpg (deleted)
• castlib2/GetSetPrefs.jpg (deleted)
• castlib2/PseudoXMLPS.jpg (deleted)
• castlib2/SpriteNameBeaver.jpg (deleted)
• castlib2/commonMovieScript.jpg (deleted)
• castlib2/simpleGoToAction.jpg (deleted)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -36 +36 @@
     
     subli.add("Edit in BBEdit")
-    pLookUpCommandList.setaprop("Edit in BBEdit", ["mOpen_text_with_BBedit me", "bbedit_Utilities"])
+    pLookUpCommandList.setaprop("Edit in BBEdit", ["mEdit_text_with_BBedit me", "bbedit_Utilities"])
+    
+    subli.add("Open in BBEdit")
+    pLookUpCommandList.setaprop("Open in BBEdit", ["mOpen_text_with_BBedit me", "bbedit_Utilities"])
+    
+    subli.add("Refresh members edited in BBEdit")
+    pLookUpCommandList.setaprop("Refresh members edited in BBEdit", ["mReImport_text_Opened_In_BBedit me", "bbedit_Utilities"])
     
     subli.add("Open linked script")

trunk/lingosource/castlib1/alexUtilities.ls

@@ -441 +441 @@
     
     -- currently there is a bug in buddy beta with bafilelist, so we hack here...
-    
-    retval = []
-    n = 1
-    this = getnthfilenameinfolder(folderpath, n)
-    repeat while length(this) > 0
-      if length(getnthfilenameinfolder(folderpath & this, 1)) = 0 then retval.add(this)
-      n = n + 1
+    if mGetFloatVersionNumber(me, the productversion) < 11 then
+      
+      --  -- budApi version:
+      retval = baFileList(folderpath, "*.*")
+      
+    else
+      
+      retval = []
+      n = 1
       this = getnthfilenameinfolder(folderpath, n)
-    end repeat
-    
-    --  -- budApi version:
-    -- retval = baFileList(folderpath, "*.*")
+      repeat while length(this) > 0
+        if length(getnthfilenameinfolder(folderpath & this, 1)) = 0 then retval.add(this)
+        n = n + 1
+        this = getnthfilenameinfolder(folderpath, n)
+      end repeat
+      
+    end if
+    
     
   else if mCheckForXtra(me, "FileXtra4") = 1 then -- if not buddy then try filextra
@@ -2526 +2532 @@
   end if
 end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetFloatVersionNumber me, prodVers
+    offs = offset(".", prodVers)
+    if offs > 0 then
+      intVers = char 1 to offs of prodVers
+      delete char 1 to offs of prodVers
+    else
+      intVers = ""
+    end if
+    cnt = length(prodVers)
+    repeat with n = 1 to cnt
+      c = prodVers.char[n]
+      if integerP(integer(c)) then
+        put c after intVers
+      else if c <> "." then
+        exit repeat
+      end if
+    end repeat
+    
+  return value(intVers)
+end

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -51 +51 @@
 end
 
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mOpen_text_with_BBedit me
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mEdit_text_with_BBedit me
+  mOpen_text_with_BBedit me, 1
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mOpen_text_with_BBedit me, doLiveEdit
   
   if not(the platform contains "mac") then
@@ -89 +94 @@
       if length(theText) > 0 then
         
-        ---------------------
-        -- create a temporary file from scripttext:
-        -- tempSrcPath = shell_cmd_list("mktemp -t temp_BBEdit_file.ls")
-        -- 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]
-        theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
-        ---------------------
-        
-        mDoShellCmd(me, "bbedit --wait --resume " & tempSrcPath)
-        
-        theText = mGetTextFromFile(me, tempSrcHFSPath)
-        
-        if theType = #script then
-          memref.scripttext = theText
-        else if theType = #text then
-          memref.html = theText
-        else if theType = #field then
-          memref.text = theText
+        
+        if doLiveEdit then
+          ---------------------
+          -- create a temporary file from scripttext:
+          -- tempSrcPath = shell_cmd_list("mktemp -t temp_BBEdit_file.ls")
+          -- 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]
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          ---------------------
+          
+          mDoShellCmd(me, "bbedit --wait --resume " & tempSrcPath)
+          
+          theText = mGetTextFromFile(me, tempSrcHFSPath)
+          
+          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 = "/tmp/" & theName & ".ls"
+          tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
+          tempSrcHFSPath = tempSrcHFSPath[1]
+          theResult = mSaveTextToTempFile(me, theText, tempSrcHFSPath)
+          ---------------------
+          
+          mDoShellCmd(me, "bbedit " & tempSrcPath)
+          
+          
         end if
         
@@ -128 +155 @@
         
       end if
+    end repeat
+  end repeat
+  
+end
+
+
+-- 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
+  end if
+  
+  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
+      if length(theName) < 1 then
+        theName = "member_" & memref.membernum & "_" & memref.castlibnum
+      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
+      
+      theText = mGetTextFromFile(me, tempSrcPath)
+      
+      if length(theText) > 0 then
+        
+        case memref.type of
+          #script: memref.scripttext = theText
+          #text: memref.html = theText
+          #field: memref.text = theText
+        end case
+        
+      end if
+      
     end repeat
   end repeat
@@ -541 +617 @@
         memref.filename = memref.filename
       else
-      if memref.type = #script then
-        aPath = mGetFilePathFromMemberComments(me, memref, isMac, CurrentOSXUserName)
-        if length(aPath) > 0 then
-          dertext = mGetTextFromFile(me, aPath)
-          if length(dertext) > 0 then
-            put "updating scripttext of member:" memref.name && "(" & memref & ")"
-            memref.scripttext = dertext
+        if memref.type = #script then
+          aPath = mGetFilePathFromMemberComments(me, memref, isMac, CurrentOSXUserName)
+          if length(aPath) > 0 then
+            dertext = mGetTextFromFile(me, aPath)
+            if length(dertext) > 0 then
+              put "updating scripttext of member:" memref.name && "(" & memref & ")"
+              memref.scripttext = dertext
+            end if
           end if
         end if
-      end if
       end if
     end repeat
@@ -913 +989 @@
         comm = memref.comments
         if comm.length then
-        
+          
           aPath = mGetFilePathFromMemberComments(me, memref, isMac, CurrentOSXUserName)
           
           if length(aPath) > 0 then
-          
-          fio = (xtra "fileio").new()
-          if objectP(fio) then
-            fio.openFile(aPath, 0)
-            if fio.status() = 0 then
-              vergText = fio.readFile()
-              fio.closeFile()
-              memscr = memref.scripttext
-              if vergText <> memscr then
-                
-                isEqual = 0
-                if mCheckForXtra(me, "Pregex") = 1 then
+            
+            fio = (xtra "fileio").new()
+            if objectP(fio) then
+              fio.openFile(aPath, 0)
+              if fio.status() = 0 then
+                vergText = fio.readFile()
+                fio.closeFile()
+                memscr = memref.scripttext
+                if vergText <> memscr then
                   
-                  memscrLi = [memscr]
-                  pregex_replace(memscrLi, "\s", "ig", "")
-                  memscrLi = memscrLi[1]
+                  isEqual = 0
+                  if mCheckForXtra(me, "Pregex") = 1 then
+                    
+                    memscrLi = [memscr]
+                    pregex_replace(memscrLi, "\s", "ig", "")
+                    memscrLi = memscrLi[1]
+                    
+                    vergTextLi = [vergText]
+                    pregex_replace(vergTextLi, "\s", "ig", "")
+                    vergTextLi = vergTextLi[1]
+                    
+                    isEqual = (memscrLi = vergTextLi)
+                  end if
                   
-                  vergTextLi = [vergText]
-                  pregex_replace(vergTextLi, "\s", "ig", "")
-                  vergTextLi = vergTextLi[1]
-                  
-                  isEqual = (memscrLi = vergTextLi)
-                end if
-                
-                if isEqual = 0 then
-                  
-                  if length(bbdiffpath) < 1 then
+                  if isEqual = 0 then
                     
-                    
-                    if not(the platform contains "mac") then
-                      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 "&memref.comments&QUOTE&")"&RETURN
-                    else
+                    if length(bbdiffpath) < 1 then
                       
-                      if (mCheckForXtra(me, "Shell") + mCheckForXtra(me, "ff_shell")) = 0  then
+                      
+                      if not(the platform contains "mac") then
                         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 "&memref.comments&QUOTE&")"&RETURN
-                        
                       else
                         
-                        neuer = new(#field)
-                        neuer.text = memscr
-                        neuer.copyToClipBoard()
-                        neuer.erase()
-                        mDoShellCmd(me, "PBPaste | BBedit ; BBedit "&memref.comments)
+                        if (mCheckForXtra(me, "Shell") + mCheckForXtra(me, "ff_shell")) = 0  then
+                          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 "&memref.comments&QUOTE&")"&RETURN
+                          
+                        else
+                          
+                          neuer = new(#field)
+                          neuer.text = memscr
+                          neuer.copyToClipBoard()
+                          neuer.erase()
+                          mDoShellCmd(me, "PBPaste | BBedit ; BBedit "&memref.comments)
+                          
+                        end if
                         
                       end if
                       
+                    else
+                      
+                      
+                      tempSrcPath = mDoShellCmd(me, "mktemp -t temp_BBDiff_file1", 1)
+                      tempSrcPath = tempSrcPath[1]
+                      tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
+                      tempSrcHFSPath = tempSrcHFSPath[1]
+                      
+                      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
+                      
+                      mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
+                      
+                      memref.scripttext = mGetTextFromFile(me, tempSrcHFSPath)
+                      
                     end if
-                    
-                  else
-                    
-                    
-                    tempSrcPath = mDoShellCmd(me, "mktemp -t temp_BBDiff_file1", 1)
-                    tempSrcPath = tempSrcPath[1]
-                    tempSrcHFSPath = mDoShellCmd(me, "osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE, 1)
-                    tempSrcHFSPath = tempSrcHFSPath[1]
-                    
-                    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
-                    
-                    mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
-                    
-                    memref.scripttext = mGetTextFromFile(me, tempSrcHFSPath)
                     
                   end if
                   
+                  
                 end if
-                
                 
               end if
               
             end if
-            
-          end if
           end if
         end if