j62
/
ctbrec
2
2
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Review Changes/Fixes 

- Updated the menu wording as per my comment to Enable/Disable but happy to change this to the suggested if you would prefer
This commit is contained in:
XxInvictus 2023-12-07 12:03:56 +10:30
parent a55a92087c
commit 13d2999eba
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java
View File

@ -274,7 +274,7 @@ public class ModelMenuContributor {
}
private void addForceRecord(ContextMenu menu, List<Model> selectedModels) {
var forcePriority = new MenuItem("Force Recording");
var forcePriority = new MenuItem("Enable Force Recording");
forcePriority.setOnAction(e -> {
for (Model model : selectedModels) {
model.setMarkedForLaterRecording(false);
@ -285,7 +285,7 @@ public class ModelMenuContributor {
}
new ForcePriorityHandler(source, recorder, callback).forcePriority(selectedModels);
});
var resumePriority = new MenuItem("Resume Priority");
var resumePriority = new MenuItem("Disable Force Recording");
resumePriority.setOnAction(e -> new ForcePriorityHandler(source, recorder, callback).resumePriority(selectedModels));
var forceResumePriority = recorder.isForcePriority(selectedModels.get(0)) ? resumePriority : forcePriority;
menu.getItems().add(forceResumePriority);

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

@ -306,8 +306,8 @@ public class SettingsTab extends Tab implements TabSelectionListener {
Group.of("Ignore List",
Setting.of("", ignoreList)),
Group.of("Text Filters",
Setting.of("Default Blacklist", filterBlacklist, "Default list of blacklist filters for site views, space seperated"),
Setting.of("Default Whitelist", filterWhitelist, "Default list of whitelist filters for site views, space seperated"))), Category.of("Sites", siteCategories.toArray(new Category[0])),
Setting.of("Blacklist", filterBlacklist, "Default list of blacklist filters for site views, space seperated"),
Setting.of("Whitelist", filterWhitelist, "Default list of whitelist filters for site views, space seperated"))), Category.of("Sites", siteCategories.toArray(new Category[0])),
Category.of("Proxy",
Group.of("Proxy",
Setting.of("Type", proxyType).needsRestart(),

2
common/src/main/java/ctbrec/recorder/RecordingPreconditions.java
View File

@ -115,7 +115,7 @@ public class RecordingPreconditions {
int lowestPrio = Integer.MAX_VALUE;
for (Recording rec : recorder.getRecordingProcesses()) {
Model m = rec.getModel();
if (m.getPriority() < lowestPrio) {
if (m.getPriority() < lowestPrio && !m.isForcePriority()) {
lowest = rec;
lowestPrio = m.getPriority();
}