Skip to content

Commit

Permalink
Merge darkmode branch from ReAtERaN
Browse files Browse the repository at this point in the history
  • Loading branch information
nark committed Nov 26, 2018
2 parents e073011 + 06ab157 commit 471c1d3
Show file tree
Hide file tree
Showing 42 changed files with 673 additions and 210 deletions.
2 changes: 1 addition & 1 deletion Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<key>LSApplicationCategoryType</key>
<string>public.app-category.lifestyle</string>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.10.0</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Pods/Sparkle/Sparkle.framework/Versions/A/Headers/SPUDownloader.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions Pods/Sparkle/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ If you encounter an error during compilation with Xcode crying about `wired.h` n

If you encounter any other problem, feel free to report it in the issues section here on GitHub.

## Contributeto the project
## Contribute to the project

If you want to contribute to the Wired Client coding effort, check the following steps:

Expand Down
74 changes: 59 additions & 15 deletions Sources/WCAccountsController.m
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ - (BOOL)_verifyUnsavedAndPerformAction:(WCAccountsAction)action argument:(id)arg
if(argument)
[dictionary setObject:argument forKey:@"WCAccountsArgument"];

alert = [[NSAlert alloc] init];
alert = [[NSAlert alloc] init];
if([_accounts count] == 1) {
[alert setMessageText:[NSSWF:
NSLS(@"Save changes to the \u201c%@\u201d account?", @"Save account dialog title (name)"),
Expand All @@ -249,20 +249,65 @@ - (BOOL)_verifyUnsavedAndPerformAction:(WCAccountsAction)action argument:(id)arg
NSLS(@"Save changes to %u accounts?", @"Save account dialog title (count)"),
[_accounts count]]];
}


action = [[dictionary objectForKey:@"WCAccountsAction"] integerValue];
argument = [dictionary objectForKey:@"WCAccountsArgument"];


[alert setInformativeText:NSLS(@"If you don't save the changes, they will be lost.", @"Save account dialog description")];
[alert addButtonWithTitle:NSLS(@"Save", @"Save account dialog button")];
[alert addButtonWithTitle:NSLS(@"Cancel", @"Save account dialog button")];
[alert addButtonWithTitle:NSLS(@"Don't Save", @"Save account dialog button")];
[alert beginSheetModalForWindow:[_administration window]
modalDelegate:self
didEndSelector:@selector(saveSheetDidEnd:returnCode:contextInfo:)
contextInfo:dictionary];
[alert release];

return NO;
NSInteger returnCode = [alert runModal];
if(returnCode != NSAlertSecondButtonReturn) {
if(returnCode == NSAlertFirstButtonReturn) {
[self _save];

[_selectAccounts removeAllObjects];
} else {
[_accounts removeAllObjects];

_creating = NO;
_editing = NO;

[self _validateForAccounts];
[self _readFromAccounts];

[[_administration window] setDocumentEdited:NO];

[self _validate];
}
_touched = NO;
switch(action) {
case WCAccountsDoNothing:
default:
break;

case WCAccountsCloseWindow:
[_accountsTableView deselectAll:self];

[_administration close];
break;

case WCAccountsSelectTab:
[_accountsTableView deselectAll:self];

[_administration selectController:argument];
break;

case WCAccountsSelectRow:
[_selectAccounts removeAllObjects];

[_accountsTableView selectRowIndexes:argument byExtendingSelection:NO];
break;
}

[alert release];
}
_saving = NO;
return NO;
}
return YES;
}

Expand Down Expand Up @@ -1372,7 +1417,6 @@ - (void)wiredAccountDeleteAccountReply:(WIP7Message *)message {
@"Delete and disconnect account dialog description");
}

alert = [[NSAlert alloc] init];
[alert setMessageText:title];
[alert setInformativeText:description];
[alert addButtonWithTitle:NSLS(@"Delete & Disconnect", @"Delete and disconnect account dialog button title")];
Expand Down Expand Up @@ -1957,7 +2001,6 @@ - (void)saveSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode conte
}

_saving = NO;

[dictionary release];
}

Expand Down Expand Up @@ -2247,11 +2290,12 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTab
else
[cell setFont:[[cell font] fontByAddingTrait:NSUnboldFontMask]];


if([cell respondsToSelector:@selector(setTextColor:)]) {
if([value isKindOfClass:value] && [value isEqualToString:NSLS(@"<Multiple values>", @"Account field value")])
[cell setTextColor:[NSColor grayColor]];
else
[cell setTextColor:[NSColor blackColor]];
//else
//[cell setTextColor:[NSColor blackColor]];
}

if(tableColumn == _valueTableColumn)
Expand Down
Loading

0 comments on commit 471c1d3

Please sign in to comment.