Changeset 155

Timestamp:

02/21/08 08:37:53 (4 years ago)

Author:

alex

Message:

cleanup and fix some smaller issues

Location:

trunk/lingosource/castlib1

Files:

• OSCmenu_Utilities.ls (modified) (1 diff)
• alexUtilities.ls (modified) (6 diffs)
• bbedit_Utilities.ls (modified) (4 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -28 +28 @@
   
   subli.add("Insert lingodoc script abstract")
-  pLookUpCommandList.setaprop("Insert script abstract", ["snipAbstract me", "alexUtilities"])
+  pLookUpCommandList.setaprop("Insert lingodoc script abstract", ["snipAbstract me", "alexUtilities"])
   
   subli.add("Insert lingodoc handler description")
-  pLookUpCommandList.setaprop("Insert divider", ["snipTitle me", "alexUtilities"])
+  pLookUpCommandList.setaprop("Insert lingodoc handler description", ["snipTitle me", "alexUtilities"])
   
   li.add("")

trunk/lingosource/castlib1/alexUtilities.ls

@@ -390 +390 @@
   if the runmode contains "Plugin" then return retval
   
-  fio = new(xtra "fileio")
-  
-  if not objectP(fio) then return retval
-  
-  retval = fio.displayOpen()
-  
-  fio = void
+  if mCheckForXtra(me, "BudAPI") = 1 then -- if buddy is present...
+    
+    --    if the platform contains "mac" then filter = ""
+    --    else filter = "*.*"
+    return baGetFilename("Please select file", "", "Filename",  "*.*", 1, "Select file", 1, -2, -2)
+    
+  else
+    fio = new(xtra "fileio")
+    
+    if not objectP(fio) then return retval
+    
+    retval = fio.displayOpen()
+    
+    fio = void
+    
+  end if
   
   return retval
@@ -2533 +2542 @@
 
 on snipTitle me
-  str = "-----------------------------------\
-  -- CREATED: <currentDate>\
-  -- ACTION: Description\
-  -- INPUT: -\
-  -- RETURNS: -\
-  -- CALLER: -\
-  -- DEBUG: -\
-  -- TODO: -\
------------------------------------"
-  pasteFieldContent str, 1
+  
+  str = "-----------------------------------"&\
+RETURN & " -- CREATED: <currentDate>"&\
+RETURN & " -- ACTION: Description"&\
+RETURN & " -- INPUT: -"&\
+RETURN & " -- RETURNS: -"&\
+RETURN & " -- CALLER: -"&\
+RETURN & " -- DEBUG: -"&\
+RETURN & " -- TODO: -"&\
+RETURN & "-----------------------------------"
+  
+  mPasteItem me, str, 1
+  
 end
 
@@ -2548 +2560 @@
 
 on snipAbstract me
-  str = "-- <Scriptname>\
------------------------------------\
--- CREATED:\
--- <currentDate>\
---\
--- DESCRIPTION:\
--- -\
---\
--- REQUIRES:\
--- (Prerequisites)\
---\
--- USAGE:\
--- -\
---\
--- PARAMS:\
--- -\
---\
--- RETURNS:\
--- -\
---\
--- WARNINGS:\
--- -\
---\
--- TODO:\
--- -\
------------------------------------"
-  pasteFieldContent str, 1
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on pasteFieldContent whichFieldname, replacePlaceHolder
-  m = member(whichFieldname)
-  if ilk(m) <> #member then exit
-  if [#field, #text].getPos(m.type) > 0 then mPasteItem m.text, replacePlaceHolder
+  
+  str = "  -- <Scriptname>"&\
+RETURN & "  -----------------------------------"&\
+RETURN & "  -- CREATED:"&\
+RETURN & "  -- <currentDate>"&\
+RETURN & "  --"&\
+RETURN & "  -- DESCRIPTION:"&\
+RETURN & "  -- -"&\
+RETURN & "  --"&\
+RETURN & "  -- REQUIRES:"&\
+RETURN & "  -- (Prerequisites)"&\
+RETURN & "  --"&\
+RETURN & "  -- USAGE:"&\
+RETURN & "  -- -"&\
+RETURN & "  --"&\
+RETURN & "  -- PARAMS:"&\
+RETURN & "  -- -"&\
+RETURN & "  --"&\
+RETURN & "  -- RETURNS:"&\
+RETURN & "  -- -"&\
+RETURN & "  --"&\
+RETURN & "  -- WARNINGS:"&\
+RETURN & "  -- -"&\
+RETURN & "  --"&\
+RETURN & "  -- TODO:"&\
+RETURN & "  -- -"&\
+RETURN & "  -----------------------------------"
+  
+  mPasteItem me, str, 1
+  
 end
 
@@ -2628 +2635 @@
   
   
-    if ilk(theMem) = #member then
+  if ilk(theMem) = #member then
     if theMem.type = #script then
       
@@ -2636 +2643 @@
         placeholders = [["<currentDate>", the short date], ["<scriptname>", theMem.name]]
         
-          repeat with repl in placeholders
-            if repl[1] <> repl[2] then
+        repeat with repl in placeholders
+          if repl[1] <> repl[2] then
             offs = offset(repl[1], theText)
             repeat while offs > 0
@@ -2643 +2650 @@
               offs = offset(repl[1], theText)
             end repeat
-            end if
-          end repeat
+          end if
+        end repeat
         
       end if

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -103 +103 @@
       
       if length(theText) > 0 then
-        
         
         if doLiveEdit then
@@ -142 +141 @@
           end if
           
-          tempSrcPath = mGetTempFilePath(me, theName & ".ls")
-          tempSrcHFSPath = mConvertUnix2Hfs(me, tempSrcPath)
+          tempSrcHFSPath = mGetTempFilePath(me, theName & ".ls")
+          tempSrcPath = mConvertHfs2Unix(me, tempSrcHFSPath)
           
           
@@ -153 +152 @@
             mDoShellCmd(me, "bbedit " & tempSrcPath)
           end if
-          
           
         end if
@@ -290 +288 @@
             waitparam = " &"
             editor = mGetMacBinary(me, editor)
-            tempSrcPath = tempSrcHFSPath
+            tempSrcPath = mConvertHfs2Unix(me, tempSrcHFSPath)
           else
             waitparam = ""