Changeset 42 for trunk/lingosource

Timestamp:

10/23/07 17:24:02 (5 years ago)

Author:

alex

Message:

first try of supporting text and fields

Location:

trunk/lingosource/castlib1

Files:

• OSCmenu_Utilities.ls (modified) (4 diffs)
• alexUtilities.ls (modified) (21 diffs)
• helptext.rtf (added)
• memberInfo.xml (modified) (1 diff)
• menu1_button.rtf (added)
• menu2_button.rtf (added)
• pastefeld.txt (added)
• statusOutput.rtf (added)
• test.rtf (added)
• tester2.rtf (added)
• tester4.txt (added)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -253 +253 @@
   subli = []
   svn_subli.add(subli)
-  subli.add("Export scripts...")
-  pLookUpCommandList.setaprop("Export scripts...", "mExportScriptsToFolder me, skipIcons_optional, selectionOnly_optional, convertLineBreaksToUnix, chooseNewPath_optional")
+  subli.add("Export scripts to SVN working copy...")
+  pLookUpCommandList.setaprop("Export scripts to SVN working copy...", "mExportScriptsToFolder me, skipIcons_optional, selectionOnly_optional, convertLineBreaksToUnix, chooseNewPath_optional")
   
   subli.add("Import script from file...")
@@ -263 +263 @@
   pLookUpCommandList.setaprop("SVN Update ScriptText in Working Copy...", "mSVN_Update_Working_Copy_ScriptText me, chooseNewPath_optional")
   
-  subli.add("SVN Update And Import Scripts...")
-  pLookUpCommandList.setaprop("SVN Update And Import Scripts...", "mSVN_Update_And_Import_ScriptsFromFolder me, chooseNewPath_optional, selectionOnly_optional")
-  
-  subli.add("")
-  subli.add("SVN Commit ScriptText...")
-  pLookUpCommandList.setaprop("SVN Commit ScriptText...", "mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only_optional")
+    subli.add("")
+    subli.add("SVN Import Scripts, Text and Fields from working copy...")
+  pLookUpCommandList.setaprop("SVN Import Scripts, Text and Fields from working copy...", "mSVN_Update_And_Import_ScriptsFromFolder me, chooseNewPath_optional, selectionOnly_optional")
+  
+  
+  subli.add("")
+  subli.add("SVN Commit ScriptText only...")
+  pLookUpCommandList.setaprop("SVN Commit ScriptText only...", "mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only_optional")
   
   subli.add("")
@@ -277 +279 @@
   
   ---------------------------------------------------- svn functions:
+  
+  svn_subli.add("")
+  svn_subli.add("Fields and text ex/import for SVN")
+  subli = []
+  svn_subli.add(subli)
+  
+  subli.add("Export text members to SVN working copy...")
+  pLookUpCommandList.setaprop("Export text members to SVN working copy...", "mExportTextAndFieldsToFolder me, skipIcons_optional, selectionOnly_optional, convertLineBreaksToUnix, chooseNewPath_optional")
+  
+  subli.add("Import text from SVN working copy...")
+  pLookUpCommandList.setaprop("Import text from SVN working copy...", "mImportTextAndFields me, thePath_optional, castlibNumber_optional, dontWarn_optional, infolist_optional")
+  
+  subli.add("")
+  subli.add("SVN Import Scripts, Text and Fields from working copy...")
+  pLookUpCommandList.setaprop("SVN Import Scripts, Text and Fields from working copy...", "mSVN_Update_And_Import_ScriptsFromFolder me, chooseNewPath_optional, selectionOnly_optional")
+  
+  
+  ----------------------------------------------------
+  
+  
   svn_subli.add("")
   svn_subli.add("SVN -- binary director files")
@@ -320 +342 @@
   li.add("Convert textmember to HTML + copy to clipboard")
   pLookUpCommandList.setaprop("Convert textmember to HTML + copy to clipboard", "mCopyConvert2HTML")
-
+  
   
   

trunk/lingosource/castlib1/alexUtilities.ls

@@ -2287 +2287 @@
   
   doit = 0
-  
   
   repeat with n = 1 to cnt
@@ -3182 +3181 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+on _______________SVN_SCRIPT_TEXT me
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 
 on mCompareCurrentScriptToWorkingCopy me, convertLineBreaksToUnix
@@ -3210 +3213 @@
   repeat with sub in sel
     repeat with mem = sub[1] to sub[2]
-      memref = member(mem,cl)   
-      if memref.type = #script then
-        
-        thePath = mFindWorkingCopyCounterpart(me, memref)
+      memref = member(mem,cl)
+      
+      memtype = memref.type
+      if [#script, #field, #text].getPos(memtype) > 0 then
+        
+        case memtype of
+            
+            -----------------------
+          #script:
+            ext = ".ls"
+            st = memref.scripttext
+            
+            -----------------------
+          #field:
+            ext = ".txt"
+            st = memref.text
+            
+            -----------------------
+          #text:
+            ext = ".rtf"
+            st = memref.rtf
+            
+            -----------------------
+          otherwise:
+            ext = ".txt"
+            st = memref.text
+            
+        end case
+        
+        
+        thePath = mFindWorkingCopyCounterpart(me, memref, ext)
         
         if length(thePath) < 1 then
@@ -3220 +3250 @@
         end if
         
-        st = memref.scripttext
         
         
@@ -3376 +3405 @@
           
           
-          memref.scripttext = scrText
+          
+          case memtype of
+              
+              -----------------------
+            #script:
+              memref.scripttext = scrText
+              
+              -----------------------
+            #field:
+              memref.text = scrText
+              
+              -----------------------
+            #text:
+              memref.rtf = scrText
+              
+              -----------------------
+            otherwise:
+              memref.text = scrText
+              
+          end case
+          
+          
+          
           
         end if
@@ -3420 +3471 @@
     repeat with mem = sub[1] to sub[2]
       memref = member(mem,cl)   
-      if memref.type = #script then
-        
-        thePath = mFindWorkingCopyCounterpart(me, memref)
+      memtype = memref.type
+      if [#script, #field, #text].getPos(memtype) > 0 then
+        
+        case memtype of
+            
+            -----------------------
+          #script:
+            ext = ".ls"
+            st = memref.scripttext
+            
+            -----------------------
+          #field:
+            ext = ".txt"
+            st = memref.text
+            
+            -----------------------
+          #text:
+            ext = ".rtf"
+            st = memref.rtf
+            
+            -----------------------
+          otherwise:
+            ext = ".txt"
+            st = memref.text
+            
+        end case
+        
+        
+        thePath = mFindWorkingCopyCounterpart(me, memref, ext)
         
         if length(thePath) < 1 then
@@ -3429 +3506 @@
         end if
         
-        st = memref.scripttext
-        
-        mSaveToTextFile me, st, thePath
+        ------------------- export will now be done in "mExportScriptsToFolder"
+        --        st = memref.scripttext
+        --        mSaveToTextFile me, st, thePath
         
         if the platform contains "mac" then
@@ -3457 +3534 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mFindWorkingCopyCounterpart me, memref
+on mFindWorkingCopyCounterpart me, memref, file_extension
+  
+  file_extension = string(file_extension)
+  if length(file_extension) < 1 then file_extension = ".ls"
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -3544 +3624 @@
       fname = string(infolist[l].getaprop(#fname))
       if length(fname) < 1 then fname = string(infolist.getpropat(l))
-      fpath = theFolder & fname & ".ls"
+      fpath = theFolder & fname & file_extension
       
       --      put "path:" && fpath 
@@ -3651 +3731 @@
         memref = member(n, m)
         
-        if memref.type = #script then
+        memtype = memref.type
+        if [#script, #field, #text].getPos(memtype) > 0 then
+          
+          case memtype of
+              
+              -----------------------
+            #script:
+              ext = ".ls"
+              scrText = memref.scripttext
+              scrtype = memref.scripttype
+              -----------------------
+            #field:
+              ext = ".txt"
+              scrText = memref.text
+              scrtype = #field
+              -----------------------
+            #text:
+              ext = ".rtf"
+              scrText = memref.rtf
+              convertLineBreaksToUnix = 0
+              scrtype = #text
+              -----------------------
+            otherwise:
+              ext = ".txt"
+              scrText = memref.text
+              scrtype = #field
+          end case
+          
+          
           
           memname = memref.name
@@ -3659 +3767 @@
           
           
-          scrText = memref.scripttext
+          -- scrText = memref.scripttext
           
           
@@ -3778 +3886 @@
           -----------------------------------------
           
+          
           if theDefaultName <> origname then
             alterText = ""
-            snam = baShortFileName(thisFolder & origname & ".ls")
+            snam = baShortFileName(thisFolder & origname & ext)
             if length(snam) > 0 then
-              alterText = mGetTextFromFile(me, thisFolder & origname & ".ls")
+              alterText = mGetTextFromFile(me, thisFolder & origname & ext)
             end if
           else
-            alterText = mGetTextFromFile(me, thisFolder & theDefaultName & ".ls")
+            alterText = mGetTextFromFile(me, thisFolder & theDefaultName & ext)
           end if
           
@@ -3796 +3905 @@
               
               
-              mSaveToTextFile me, scrText, thisFolder & theDefaultName & ".ls"
+              mSaveToTextFile me, scrText, thisFolder & theDefaultName & ext
               
               
@@ -3818 +3927 @@
               if theDefaultName <> origname then
                 
-                snam = baShortFileName(thisFolder & origname & ".ls")
+                snam = baShortFileName(thisFolder & origname & ext)
                 if length(snam) > 0 then baDeleteFile(snam)
-                erg = baRenameFile(thisFolder & theDefaultName & ".ls", thisFolder & origname & ".ls")
-                if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".ls to " & thisFolder & origname & ".ls"
+                erg = baRenameFile(thisFolder & theDefaultName & ".ls", thisFolder & origname & ext)
+                if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ext & " to " & thisFolder & origname & ext
                 if bmexp = 1 then
                   snam = baShortFileName(thisFolder & origname & ".jpg")
@@ -3839 +3948 @@
           
           
-          infolist.setaprop(symbol(origname), [#scripttype: memref.scripttype, #comments: memref.comments, #membername: memname, #fname: origname])
+          infolist.setaprop(symbol(origname), [#scripttype: scrtype, #comments: memref.comments, #membername: memname, #fname: origname])
           -- we need to store origname as string additionally to symbol, as the symbol may change the case (although only ufs is case sensitive
           -- I am more comfortable with not relying on case insensitivity of filesystems)
@@ -4009 +4118 @@
     if length(fname) < 1 then fname = string(infoList.getPropAt(n))
     fpath = thePath & fname
-    mImportScriptWithThumbnail me, fpath & ".ls", fd, 1, thisMemberInfo
+    
+    scrtype = thisMemberInfo.getaprop(#scripttype)
+    case scrtype of
+      #field: ext = ".txt"
+      #text: ext = ".rtf"
+      otherwise: ext = ".ls"
+    end case
+    
+    mImportScriptWithThumbnail me, fpath & ext, fd, 1, thisMemberInfo
+    
   end repeat
   
@@ -4110 +4228 @@
       memref = member(m, cl)
       dertyp = memref.type
-      if dertyp = #script then
+      
+      if [#script, #text, #field].getPos(dertyp) > 0 then
         
         found = 0
@@ -4119 +4238 @@
             fname = string(infolist[l].getaprop(#fname))
             if length(fname) < 1 then fname = string(infolist.getpropat(l))
-            fpath = thePath & fname & ".ls"
+            
+            case dertyp of
+              #text: ext = ".rtf"
+              #field: ext = ".txt"
+              otherwise: ext = ".ls"    
+            end case
+            
+            fpath = thePath & fname & ext
             
             found = 1
@@ -4281 +4407 @@
   
   
+  case scrtype of
+    #field, #text: memtype = scrtype
+    otherwise: memtype = #script
+  end case
+  
+  
   askreplace = 1
   scr = member(scrname, castlibNumber)
   if voidP(scr) then
-    scr = new(#script, castlib(castlibNumber))
+    scr = new(memtype, castlib(castlibNumber))
     askreplace = 0
   end if
   if scr.type <> #script then
-    scr = new(#script, castlib(castlibNumber))
+    scr = new(memtype, castlib(castlibNumber))
     askreplace = 0
   end if
@@ -4390 +4522 @@
   
   
-  
-  scr.scripttext = scrtext
+  case scrtype of
+    #field: scr.text = scrtext
+    #text: scr.rtf = scrtext
+    otherwise: memtype = scr.scripttext = scrtext
+  end case
+  
   
   if [#movie, #parent, #score].getPos(scrtype) > 0 then scr.scripttype = scrtype
@@ -4408 +4544 @@
 end
 
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+on _______________SVN_FIELD_TEXT me
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mExportTextAndFieldsToFolder me, skipIcons_optional, selectionOnly_optional, convertLineBreaksToUnix, chooseNewPath_optional
+  mExportScriptsToFolder me, skipIcons_optional, selectionOnly_optional, convertLineBreaksToUnix, chooseNewPath_optional
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mImportTextAndFields me, thePath_optional, castlibNumber_optional, dontWarn_optional, infolist_optional
+  mImportScriptWithThumbnail me, thePath_optional, castlibNumber_optional, dontWarn_optional, infolist_optional
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/lingosource/castlib1/memberInfo.xml

@@ -67 +67 @@
                 <fName>bbdiff</fName>
         </bbdiff>
+        <menu1_button>
+                <scriptType>#text</scriptType>
+                <comments></comments>
+                <memberName>menu1_button</memberName>
+                <fName>menu1_button</fName>
+        </menu1_button>
+        <menu2_button>
+                <scriptType>#text</scriptType>
+                <comments></comments>
+                <memberName>menu2_button</memberName>
+                <fName>menu2_button</fName>
+        </menu2_button>
+        <pastefeld>
+                <scriptType>#field</scriptType>
+                <comments></comments>
+                <memberName>pastefeld</memberName>
+                <fName>pastefeld</fName>
+        </pastefeld>
+        <oldclipboard>
+                <scriptType>#field</scriptType>
+                <comments></comments>
+                <memberName>oldclipboard</memberName>
+                <fName>oldclipboard</fName>
+        </oldclipboard>
+        <searchword>
+                <scriptType>#field</scriptType>
+                <comments></comments>
+                <memberName>searchword</memberName>
+                <fName>searchword</fName>
+        </searchword>
+        <helptext>
+                <scriptType>#text</scriptType>
+                <comments>LinkedTextMember
+Titus:Users:alex:Desktop:handlerMenu_helptext.rtf
+1229860151
+rtf</comments>
+                <memberName>helptext</memberName>
+                <fName>helptext</fName>
+        </helptext>
+        <statusOutput>
+                <scriptType>#text</scriptType>
+                <comments>LinkedTextMember
+Titus:Users:alex:Desktop:handlerMenu_helptext.rtf
+1229860151
+rtf</comments>
+                <memberName>statusOutput</memberName>
+                <fName>statusOutput</fName>
+        </statusOutput>
+        <test>
+                <scriptType>#text</scriptType>
+                <comments></comments>
+                <memberName>test</memberName>
+                <fName>test</fName>
+        </test>
+        <tester2>
+                <scriptType>#text</scriptType>
+                <comments></comments>
+                <memberName>tester2</memberName>
+                <fName>tester2</fName>
+        </tester2>
+        <tester4>
+                <scriptType>#field</scriptType>
+                <comments></comments>
+                <memberName>tester4</memberName>
+                <fName>tester4</fName>
+        </tester4>
 </Untitled>