jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change labels in the merge settings 

Change labels in the merge settings to make it clearer, that the merge
directory also affects the manual merge
This commit is contained in:
0xboobface 2018-08-29 14:03:43 +02:00
parent 154995a760
commit 13c5bdfd40
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ctbrec/ui/SettingsTab.java
View File

@ -199,7 +199,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
GridPane.setMargin(automerge, new Insets(0, 0, 0, CHECKBOX_MARGIN)); GridPane.setMargin(automerge, new Insets(0, 0, 0, CHECKBOX_MARGIN));
mergeLayout.add(automerge, 1, 0); mergeLayout.add(automerge, 1, 0);
l = new Label("Keep segments"); l = new Label("Keep segments after auto-merge");
mergeLayout.add(l, 0, 1); mergeLayout.add(l, 0, 1);
automergeKeepSegments.setSelected(Config.getInstance().getSettings().automergeKeepSegments); automergeKeepSegments.setSelected(Config.getInstance().getSettings().automergeKeepSegments);
automergeKeepSegments.setOnAction((e) -> Config.getInstance().getSettings().automergeKeepSegments = automergeKeepSegments.isSelected()); automergeKeepSegments.setOnAction((e) -> Config.getInstance().getSettings().automergeKeepSegments = automergeKeepSegments.isSelected());
@ -218,7 +218,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
mergeLayout.add(mergeDirectory, 1, 2); mergeLayout.add(mergeDirectory, 1, 2);
mergeLayout.add(createMergeDirButton(), 3, 2); mergeLayout.add(createMergeDirButton(), 3, 2);
mergePane = new TitledPane("Auto-merge", mergeLayout); mergePane = new TitledPane("Merging", mergeLayout);
mergePane.setCollapsible(false); mergePane.setCollapsible(false);
mainLayout.add(mergePane, 0, 3); mainLayout.add(mergePane, 0, 3);