Skip to content

Commit dc16283

Browse files
committed
reorganize code
1 parent 9fddf8c commit dc16283

File tree

2 files changed

+296
-312
lines changed

2 files changed

+296
-312
lines changed

BasicCAT/BasicCAT.b4j

+62-53
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,59 @@ Sub newProject(sourceLang As String,targetLang As String)
643643
Utils.enableMenuItems(MenuBar1,Array As String("_Save","_Close"))
644644
End Sub
645645

646+
647+
Sub openProject(path As String)
648+
currentProject.Initialize
649+
currentProject.open(path)
650+
autosaveTimer.Enabled=True
651+
MainForm.Title=getProjectname(path)
652+
Utils.enableMenuItems(MenuBar1,Array As String("_Save","_Close"))
653+
Utils.enableMenuItems(MenuBar1,File.ReadList(File.DirAssets,"menuText.txt"))
654+
End Sub
655+
656+
Public Sub closeProject
657+
autosaveTimer.Enabled=False
658+
If currentProject.IsInitialized Then
659+
If currentProject.projectTM.IsInitialized Then
660+
currentProject.projectTM.close
661+
End If
662+
Dim currentProject As Project
663+
tmTableView.ClearSelection
664+
tmTableView.Items.Clear
665+
projectTreeTableView.ClearSelection
666+
projectTreeTableView.Root.Children.Clear
667+
editorLV.Items.Clear
668+
termLV.Items.Clear
669+
MainForm.Title="BasicCAT"
670+
Utils.disableMenuItems(MenuBar1,Array As String("_Save","_Close"))
671+
Utils.disableMenuItems(MenuBar1,File.ReadList(File.DirAssets,"menuText.txt"))
672+
End If
673+
End Sub
674+
675+
676+
677+
Sub fillWithTM
678+
If tmTableView.Items.Size<>0 Then
679+
Log(tmTableView.SelectedRow)
680+
If tmTableView.SelectedRow=-1 Then
681+
tmTableView.SelectedRow=0
682+
End If
683+
If tmTableView.SelectedRowValues<>Null And editorLV.Items.Size<>0 Then
684+
Try
685+
Dim pane As Pane
686+
pane=editorLV.Items.Get(currentProject.lastEntry)
687+
Catch
688+
Log(LastException)
689+
Return
690+
End Try
691+
Dim targetTextArea As TextArea
692+
targetTextArea=pane.GetNode(1)
693+
targetTextArea.Text=tmTableView.SelectedRowValues(2)
694+
currentProject.contentIsChanged
695+
End If
696+
End If
697+
End Sub
698+
646699
Sub fillWithTheNextTag
647700
If editorLV.Items.Size=0 Then
648701
Return
@@ -1111,6 +1164,12 @@ Public Sub getProjectname(path As String) As String
11111164
Return Projectname
11121165
End Sub
11131166

1167+
'menu actions end
1168+
'-----------------------------
1169+
1170+
'editor relevant
1171+
'-----------------------------
1172+
11141173
Sub ListViewParent_Resize
11151174

11161175
Dim lv As ListView
@@ -1224,6 +1283,9 @@ Sub getVisibleRange(lv As ListView) As Range
12241283
Return visibleRange
12251284
End Sub
12261285

1286+
'other controls
1287+
'------------------------------
1288+
12271289
Sub searchTableView_MouseClicked (EventData As MouseEvent)
12281290
If EventData.PrimaryButtonPressed Then
12291291
If searchTableView.SelectedRowValues<>Null Then
@@ -1253,29 +1315,6 @@ Sub tmTableView_MouseClicked (EventData As MouseEvent)
12531315
End If
12541316
End Sub
12551317

1256-
Sub fillWithTM
1257-
If tmTableView.Items.Size<>0 Then
1258-
Log(tmTableView.SelectedRow)
1259-
If tmTableView.SelectedRow=-1 Then
1260-
tmTableView.SelectedRow=0
1261-
End If
1262-
If tmTableView.SelectedRowValues<>Null And editorLV.Items.Size<>0 Then
1263-
Try
1264-
Dim pane As Pane
1265-
pane=editorLV.Items.Get(currentProject.lastEntry)
1266-
Catch
1267-
Log(LastException)
1268-
Return
1269-
End Try
1270-
Dim targetTextArea As TextArea
1271-
targetTextArea=pane.GetNode(1)
1272-
targetTextArea.Text=tmTableView.SelectedRowValues(2)
1273-
currentProject.contentIsChanged
1274-
End If
1275-
End If
1276-
1277-
End Sub
1278-
12791318
Sub addTermButton_MouseClicked (EventData As MouseEvent)
12801319
If currentProject.IsInitialized Then
12811320
currentProject.projectTerm.addTerm(sourceTermTextField.Text,targetTermTextField1.Text)
@@ -1337,35 +1376,6 @@ Sub searchTableView_Action
13371376
End Select
13381377
End Sub
13391378

1340-
Sub openProject(path As String)
1341-
currentProject.Initialize
1342-
currentProject.open(path)
1343-
autosaveTimer.Enabled=True
1344-
MainForm.Title=getProjectname(path)
1345-
Utils.enableMenuItems(MenuBar1,Array As String("_Save","_Close"))
1346-
Utils.enableMenuItems(MenuBar1,File.ReadList(File.DirAssets,"menuText.txt"))
1347-
End Sub
1348-
1349-
Public Sub closeProject
1350-
autosaveTimer.Enabled=False
1351-
If currentProject.IsInitialized Then
1352-
If currentProject.projectTM.IsInitialized Then
1353-
currentProject.projectTM.close
1354-
End If
1355-
Dim currentProject As Project
1356-
tmTableView.ClearSelection
1357-
tmTableView.Items.Clear
1358-
projectTreeTableView.ClearSelection
1359-
projectTreeTableView.Root.Children.Clear
1360-
editorLV.Items.Clear
1361-
termLV.Items.Clear
1362-
MainForm.Title="BasicCAT"
1363-
Utils.disableMenuItems(MenuBar1,Array As String("_Save","_Close"))
1364-
Utils.disableMenuItems(MenuBar1,File.ReadList(File.DirAssets,"menuText.txt"))
1365-
End If
1366-
End Sub
1367-
1368-
13691379
Sub segmentSearchToggleButton_SelectedChange(Selected As Boolean)
13701380
'toggleTableOrTextArea(Selected,segmentSearchToggleButton,contextWebView,searchTableView)
13711381
toggleTableOrWebView(Selected,segmentSearchToggleButton,contextWebView,searchTableView)
@@ -1387,7 +1397,6 @@ Public Sub changeWhenSegmentOrSelectionChanges
13871397
End If
13881398
End Sub
13891399

1390-
13911400
Sub toggleTableOrWebView(selected As Boolean,tb As ToggleButton, wv As WebView,tv As TableView)
13921401
If selected Then
13931402
tb.Text="L"

0 commit comments

Comments
 (0)