Skip to content

Add confirmation prompt to Pull action #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tfe wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add confirmation prompt to Pull action #1

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2add3f6
Add confirmation model to pull action
jacklinw Aug 6, 2018
18511f7
Revert unnecessary newline change
tfe Nov 29, 2018
2378aef
Fix indentation
tfe Nov 29, 2018
4f2fc73
Make cancel the default action
tfe Nov 29, 2018
f2ad69f
Add more logic around pull confirmation
tfe Nov 29, 2018
a452373
Turns out stillsCount doesn't give you the count of stills
tfe Nov 30, 2018
4f0aab5
This call is async; need to keep the action inside it
tfe Nov 30, 2018
7f27789
We still need to do the thing in the else case too
tfe Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions ATEM Media Pool Updater/Xcode Files/ATEM Media Pool Updater/SwitcherMediaPoolAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,26 @@ -(void) tableView:(NSTableView *)tableView setObjectValue:(id)object forTableCol
[mw pushStills];
}
} else if([identifier isEqualToString:@"pull"]) {
if (![mw isBusy] && [mw isConnected]) {
[mw pullStills];
// User trying to pull when there are existing local stills. Double-check they meant to do that.
if ([mw localStillsExist]) {
NSAlert* alert = [NSAlert alertWithMessageText:@"Are you sure?"
defaultButton:@"Cancel"
alternateButton:@"Continue"
otherButton:nil
informativeTextWithFormat:@"There are existing local stills. Overwrite?\n(Did you mean to press \"Repair\"?)"];
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
if (returnCode == NSAlertAlternateReturn) {
if (![mw isBusy] && [mw isConnected]) {
[mw pullStills];
}
} else {
return;
}
}];
} else {
if (![mw isBusy] && [mw isConnected]) {
[mw pullStills];
}
}
} else if([identifier isEqualToString:@"repair"]) {
if (![mw localStillsExist]) {
Expand Down