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

Add confirmation dialog for pause all and resume all

This commit is contained in:
0xb00bface 2020-08-19 11:42:50 +02:00
parent 67cbc0cadf
commit 17f1c3aec6
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
3.8.7 3.8.7
======================== ========================
* Added support for Manyvids Live
* no login / favorites
* media player isn't working because of their authetication mechanism
* Fixed bug in recorder servlet. Actions for unpin and notes were mixed up * Fixed bug in recorder servlet. Actions for unpin and notes were mixed up
* Recordings now start immediately for newly added models * Recordings now start immediately for newly added models

2
client/src/main/java/ctbrec/ui/action/FollowAction.java
View File

@ -23,7 +23,7 @@ public class FollowAction extends ModelMassEditAction {
} catch(Exception e) { } catch(Exception e) {
LOG.error("Couldn't follow model {}", m, e); LOG.error("Couldn't follow model {}", m, e);
Platform.runLater(() -> Platform.runLater(() ->
Dialogs.showError("Couldn't follow model", "Following " + m.getName() + " failed: " + e.getMessage(), e)); Dialogs.showError(source.getScene(), "Couldn't follow model", "Following " + m.getName() + " failed: " + e.getMessage(), e));
} }
}; };
} }

2
client/src/main/java/ctbrec/ui/action/PauseAction.java
View File

@ -17,7 +17,7 @@ public class PauseAction extends ModelMassEditAction {
recorder.suspendRecording(m); recorder.suspendRecording(m);
} catch(Exception e) { } catch(Exception e) {
Platform.runLater(() -> Platform.runLater(() ->
Dialogs.showError("Couldn't suspend recording of model", "Suspending recording of " + m.getName() + " failed", e)); Dialogs.showError(source.getScene(), "Couldn't suspend recording of model", "Suspending recording of " + m.getName() + " failed", e));
} }
}; };
} }

2
client/src/main/java/ctbrec/ui/action/ResumeAction.java
View File

@ -17,7 +17,7 @@ public class ResumeAction extends ModelMassEditAction {
recorder.resumeRecording(m); recorder.resumeRecording(m);
} catch(Exception e) { } catch(Exception e) {
Platform.runLater(() -> Platform.runLater(() ->
Dialogs.showError("Couldn't resume recording of model", "Resuming recording of " + m.getName() + " failed", e)); Dialogs.showError(source.getScene(), "Couldn't resume recording of model", "Resuming recording of " + m.getName() + " failed", e));
} }
}; };
} }

2
client/src/main/java/ctbrec/ui/action/StartRecordingAction.java
View File

@ -17,7 +17,7 @@ public class StartRecordingAction extends ModelMassEditAction {
recorder.startRecording(m); recorder.startRecording(m);
} catch(Exception e) { } catch(Exception e) {
Platform.runLater(() -> Platform.runLater(() ->
Dialogs.showError("Couldn't start recording", "Starting recording of " + m.getName() + " failed", e)); Dialogs.showError(source.getScene(), "Couldn't start recording", "Starting recording of " + m.getName() + " failed", e));
} }
}; };
} }

6
client/src/main/java/ctbrec/ui/tabs/RecordedModelsTab.java
View File

@ -423,12 +423,18 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener {
} }
private void pauseAll(ActionEvent evt) { private void pauseAll(ActionEvent evt) {
boolean yes = Dialogs.showConfirmDialog("Pause all models", "", "Pause the recording of all models?", getTabPane().getScene());
if (yes) {
new PauseAction(getTabPane(), recorder.getModels(), recorder).execute(); new PauseAction(getTabPane(), recorder.getModels(), recorder).execute();
} }
}
private void resumeAll(ActionEvent evt) { private void resumeAll(ActionEvent evt) {
boolean yes = Dialogs.showConfirmDialog("Resume all models", "", "Resume the recording of all models?", getTabPane().getScene());
if (yes) {
new ResumeAction(getTabPane(), recorder.getModels(), recorder).execute(); new ResumeAction(getTabPane(), recorder.getModels(), recorder).execute();
} }
}
void initializeUpdateService() { void initializeUpdateService() {
updateService = createUpdateService(); updateService = createUpdateService();