two features: update with existing workfile and autocomplte with source words list

Author: xulihang

BasicCAT/BasicCAT.b4j

@@ -169,53 +169,53 @@ Library8=jrandomaccessfile
 Library9=jb4xencryption
 Module1=FileChooserUtils
 Module10=preTranslateDialog
-Module11=AutoSaver
-Module12=xliffFilter
-Module13=icu4j
-Module14=Preferences
-Module15=tikal
-Module16=idmlFilter
-Module17=PDF2TXT
-Module18=FileUtils
-Module19=XMLUtils
+Module11=SearchView
+Module12=TMManager
+Module13=importDialog
+Module14=idmlFilter
+Module15=Xml2Map
+Module16=XMLUtils
+Module17=Utils
+Module18=TMX
+Module19=searchAndReplaceDialog
 Module2=Project
-Module20=Map2Xml
-Module21=MT
-Module22=Utils
-Module23=SRX
-Module24=SearchView
-Module25=POIWord
-Module26=pdfbox
-Module27=git
-Module28=dictWebView
-Module29=InputTextAreaBox
+Module20=xliffFilter
+Module21=Preferences
+Module22=ITP
+Module23=AutoSaver
+Module24=icu4j
+Module25=tikal
+Module26=PDF2TXT
+Module27=FileUtils
+Module28=Map2Xml
+Module29=MT
 Module3=segmentation
-Module30=searchAndReplaceDialog
-Module31=FontPicker
-Module32=ITP
-Module33=TermEditor
-Module34=TermManager
-Module35=HistoryViewer
-Module36=HistoryRecord
-Module37=TMManager
-Module38=Previewer
-Module39=ClientKVS
+Module30=SRX
+Module31=POIWord
+Module32=pdfbox
+Module33=git
+Module34=dictWebView
+Module35=InputTextAreaBox
+Module36=FontPicker
+Module37=TermEditor
+Module38=TermManager
+Module39=HistoryViewer
 Module4=CustomListView
-Module40=statistics
-Module41=LanguageTool
-Module42=confirmReviewDialog
-Module43=LanguagePairSelector
-Module44=idmlUtils
-Module45=editDistance
-Module46=InputBox
-Module47=MTParamsFiller
-Module48=importDialog
-Module49=progressDialog
+Module40=HistoryRecord
+Module41=Previewer
+Module42=ClientKVS
+Module43=statistics
+Module44=LanguageTool
+Module45=confirmReviewDialog
+Module46=LanguagePairSelector
+Module47=idmlUtils
+Module48=editDistance
+Module49=InputBox
 Module5=txtFilter
-Module50=filterGenericUtils
-Module51=TMX
-Module52=TBX
-Module53=Xml2Map
+Module50=MTParamsFiller
+Module51=progressDialog
+Module52=filterGenericUtils
+Module53=TBX
 Module54=CallSubUtils
 Module55=viewSegment
 Module56=serverLauncher

BasicCAT/BasicCAT.b4j.meta

@@ -188,4 +188,4 @@ ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
 SelectedBuild=0
-VisibleModules=1,2,3,4,5,6,7,8,9,10,24,37,48,16,53,19,22,51,30,12
+VisibleModules=1,2,3,4,5,6,7,8,9,10,57,51

BasicCAT/Files/autocomplete.bjl

@@ -42,7 +42,6 @@ Sub getAllSegmentTranslation(text As String,engine As String) As ResumableSub
 	Dim address As String=""
 	If Main.preferencesMap.ContainsKey("corenlp_address") Then
 		address=Main.preferencesMap.Get("corenlp_address")
-		
 	End If
 	'Log("address:"&address)
 
@@ -81,6 +80,9 @@ Sub getAllSegmentTranslation(text As String,engine As String) As ResumableSub
 		End If
 	End If
 
+	If Main.preferencesMap.GetDefault("addSourceWords",False) Then
+		translationList.AddAll(wordList)
+	End If
 
 	Return duplicatedRemovedList(translationList)
 End Sub

BasicCAT/ITP.bas

@@ -36,6 +36,7 @@ Sub Class_Globals
 	Private maxSuggestionNumSpinner As Spinner
 	Private maxCheckDropdownNumSpinner As Spinner
 	Private lineHeightTextField As TextField
+	Private sourceWordsListCheckBox As CheckBox
 End Sub
 
 'Initializes the object. You can add parameters to this method if needed.
@@ -136,6 +137,10 @@ Sub categoryListView_SelectedIndexChanged(Index As Int)
 			If unsavedPreferences.ContainsKey("maxSuggestionNum") Then
 				maxSuggestionNumSpinner.Value=unsavedPreferences.Get("maxSuggestionNum")
 			End If
+			If unsavedPreferences.ContainsKey("addSourceWords") Then
+				sourceWordsListCheckBox.Checked=unsavedPreferences.Get("addSourceWords")
+			End If
+			
 		Case 5
 			'Language Check
 			SettingPane.RemoveAllNodes
@@ -263,6 +268,10 @@ Sub autocompleteEnabledCheckBox_CheckedChange(Checked As Boolean)
 	unsavedPreferences.Put("autocompleteEnabled",Checked)
 End Sub
 
+Sub sourceWordsListCheckBox_CheckedChange(Checked As Boolean)
+	unsavedPreferences.Put("addSourceWords",Checked)
+End Sub
+
 Sub saveAddressButton_MouseClicked (EventData As MouseEvent)
 	unsavedPreferences.Put("corenlp_address",corenlpAddressTextField.Text)
 End Sub
@@ -417,4 +426,5 @@ Sub lineHeightTextField_TextChanged (Old As String, New As String)
 		fx.Msgbox(frm,"Wrong Value","")	
 	End Try
 
-End Sub
+End Sub
+

BasicCAT/Preferences.bas

@@ -290,11 +290,15 @@ Sub addFilesToTreeTable(filename As String)
 	exportMenu.MenuItems.Add(mi3)
 	exportMenu.MenuItems.Add(mi4)
 	exportMenu.MenuItems.Add(mi5)
+	
+	Dim mi6 As MenuItem
+	mi6.Initialize("Update with existing workfile","updateWithWorkfileMi")
 
 	fileCM.MenuItems.Add(mi)
 	fileCM.MenuItems.Add(mi2)
 	fileCM.MenuItems.Add(exportMenu)
-
+	fileCM.MenuItems.Add(mi6)
+	
 	lbl.ContextMenu=fileCM
 
 	tti.Initialize("tti",Array As Object(lbl))
@@ -303,6 +307,7 @@ Sub addFilesToTreeTable(filename As String)
 	mi3.Tag=filename
 	mi4.Tag=filename
 	mi5.Tag=filename
+	mi6.Tag=filename
 	subTreeTableItem.Children.Add(tti)
 End Sub
 
@@ -807,6 +812,77 @@ Sub importReviewMi_Action
 
 End Sub
 
+Sub updateWithWorkfileMI_Action
+	Dim mi As MenuItem=Sender
+	Dim selectedFilename As String=mi.tag
+	If selectedFilename<>currentFilename Then
+		fx.Msgbox(Main.MainForm,"Please first open this file","")
+		Return
+	End If
+	
+	Dim fc As FileChooser
+	fc.Initialize
+	fc.SetExtensionFilter("workfile",Array("*.json"))
+	Dim workFilePath As String
+	workFilePath=fc.ShowOpen(Main.MainForm)
+	If workFilePath="" Then
+		Return
+	End If
+
+	Dim fileSegments As List
+	fileSegments.Initialize
+	
+	Dim workfile As Map
+	Dim json As JSONParser
+	json.Initialize(File.ReadString(workFilePath,""))
+	workfile=json.NextObject
+	Dim sourceFiles As List
+	sourceFiles=workfile.Get("files")
+	For Each sourceFileMap As Map In sourceFiles
+		Dim innerFilename As String
+		innerFilename=sourceFileMap.GetKeyAt(0)
+		Dim segmentsList As List
+		segmentsList=sourceFileMap.Get(innerFilename)
+		fileSegments.AddAll(segmentsList)
+	Next
+
+	Dim sourceMap As Map
+	sourceMap.Initialize
+	For Each segment As List In fileSegments
+		Dim source As String
+		source=segment.Get(0)
+		sourceMap.Put(source,segment)
+	Next
+	
+	progressDialog.Show("Updating","update")
+    Dim size As Int=segments.Size
+	Dim index As Int
+	progressDialog.update(index,size)
+	Sleep(0)
+	For Each segment As List In segments
+		index=index+1
+		progressDialog.update(index,size)
+		Dim source As String
+		source=segment.Get(0)
+		If sourceMap.ContainsKey(source) Then
+			Dim segmentFromWorkfile As List
+			segmentFromWorkfile=sourceMap.Get(source)
+			Dim extra As Map
+			extra=segment.Get(4)
+			Dim extraFromWorkfile As Map
+			extraFromWorkfile=segmentFromWorkfile.Get(4)
+			If extraFromWorkfile.GetDefault("createdTime",0)>=extra.GetDefault("createdTime",0) Then
+				segment.Clear
+				segment.AddAll(segmentFromWorkfile)
+			End If
+		End If
+	Next
+	progressDialog.close
+	refillVisiblePane
+	contentIsChanged
+	fx.Msgbox(Main.MainForm,"Done","")
+End Sub
+
 Sub removeFileMi_Action
 	Dim mi As MenuItem
 	mi=Sender
@@ -1652,6 +1728,16 @@ Sub viewInfoMI_Action
 	fx.Msgbox(Main.MainForm,infoBuilder.ToString,"")
 End Sub
 
+Sub refillVisiblePane
+	Dim visibleRange As Range
+	visibleRange=Main.getVisibleRange(Main.editorLV)
+	Dim ExtraSize As Int
+	ExtraSize=15
+	For i=Max(0,visibleRange.firstIndex-ExtraSize*2) To Min(Main.editorLV.Items.Size - 1,visibleRange.lastIndex+ExtraSize*2)
+		Main.editorLV.Items.Set(i,"")
+	Next
+	fillPane(visibleRange.firstIndex,visibleRange.lastIndex)
+End Sub
 
 Public Sub fillPane(FirstIndex As Int, LastIndex As Int)
 	Log("fillPane")

BasicCAT/Project.bas

@@ -10,8 +10,6 @@ Sub Process_Globals
 	Private menus As Map
 End Sub
 
-
-
 Sub LanguageHasSpace(lang As String) As Boolean
 	Dim languagesWithoutSpaceList As List
 	languagesWithoutSpaceList=File.ReadList(File.DirAssets,"languagesWithoutSpace.txt")

BasicCAT/Utils.bas

@@ -13,6 +13,7 @@ Sub Process_Globals
     Private progressTypeValue As String
 End Sub
 
+'input a random type name
 Sub Show(title As String,progressType As String)
 	frm.Initialize("frm",600,200)
 	frm.RootPane.LoadLayout("progress")