nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 08:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more deprecations

Browse Source
This commit is contained in:
Michael Starke
2020-02-03 18:06:21 +01:00
parent 2f42e1498c
commit 55fca262ef
11 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MacPass/DDHotKey+MacPassAdditions.m
View File

@@ -86,19 +86,19 @@
NSEventModifierFlags flags = 0;
switch(self.keyCode) {
case kVK_Command:
flags = NSCommandKeyMask;
flags = NSEventModifierFlagCommand;
break;
case kVK_Shift:
case kVK_RightShift:
flags = NSShiftKeyMask;
flags = NSEventModifierFlagShift;
break;
case kVK_Option:
case kVK_RightOption:
flags = NSAlternateKeyMask;
flags = NSEventModifierFlagOption;
break;
case kVK_Control:
case kVK_RightControl:
flags = NSControlKeyMask;
flags = NSEventModifierFlagControl;
break;
}
BOOL missingModifier = self.modifierFlags == 0;

11
MacPass/DocumentSplitView.xib
View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPDocumentSplitViewController">
@@ -13,7 +15,8 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<point key="canvasLocation" x="141" y="154"/>
</customView>
</objects>
</document>

2
MacPass/DocumentWindow.xib
View File

@@ -20,7 +20,7 @@
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="700" height="500"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</view>
<point key="canvasLocation" x="256" y="42"/>
</window>

2
MacPass/MPAutotypeDaemon.m
View File

@@ -364,7 +364,7 @@ static MPAutotypeDaemon *_sharedInstance;
if(!self.matchSelectionWindow) {
self.matchSelectionWindow = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
styleMask:NSWindowStyleMaskNonactivatingPanel|NSWindowStyleMaskTitled
backing:NSBackingStoreRetained
backing:NSBackingStoreBuffered
defer:YES];
self.matchSelectionWindow.level = kCGAssistiveTechHighWindowLevel;
MPAutotypeCandidateSelectionViewController *vc = [[MPAutotypeCandidateSelectionViewController alloc] init];

6
MacPass/MPContextButton.m
View File

@@ -102,15 +102,15 @@
NSImageRep *rep = [[self imageForSegment:MPContextButtonSegmentButton] bestRepresentationForRect:NSMakeRect(0, 0, 100, 100) context:nil hints:nil];
CGFloat scale = rep.size.width / rep.size.height;
switch (controlSize) {
case NSRegularControlSize:
case NSControlSizeRegular:
[self imageForSegment:MPContextButtonSegmentButton].size = NSMakeSize(16 * scale, 16);
break;
case NSSmallControlSize:
case NSControlSizeSmall:
[self imageForSegment:MPContextButtonSegmentButton].size = NSMakeSize(14 * scale, 14);
break;
case NSMiniControlSize:
case NSControlSizeMini:
[self imageForSegment:MPContextButtonSegmentButton].size = NSMakeSize(8 * scale, 8);
default:

2
MacPass/MPLockDaemon.m
View File

@@ -165,7 +165,7 @@ static MPLockDaemon *_sharedInstance;
}
/* Create event handler if necessary */
if(!self.localEventHandler) {
self.localEventHandler = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask handler:^NSEvent *(NSEvent *theEvent) {
self.localEventHandler = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskAny handler:^NSEvent *(NSEvent *theEvent) {
self.lastLocalEventTime = NSDate.timeIntervalSinceReferenceDate;
return theEvent;
}];

2
MacPass/MPOverlayWindowController.m
View File

@@ -56,7 +56,7 @@
- (void)windowDidLoad {
[super windowDidLoad];
self.window.styleMask = NSBorderlessWindowMask;
self.window.styleMask = NSWindowStyleMaskBorderless;
self.window.alphaValue = 0;
self.window.opaque = NO;
self.window.hasShadow = YES;

2
MacPass/MPPasswordCreatorViewController.m
View File

@@ -161,7 +161,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
if(!self.allowsEntryDefaults || (nil == [self _currentEntryDefaults])) {
return; // We aren't using entry so just leave;
}
BOOL deleteEntryDefaults = MPIsFlagSetInOptions(NSAlternateKeyMask, [NSEvent modifierFlags]);
BOOL deleteEntryDefaults = MPIsFlagSetInOptions(NSEventModifierFlagOption, NSEvent.modifierFlags);
[self _updateSetDefaultsButton:deleteEntryDefaults];
}

2
MacPass/MPPasswordEditWindowController.m
View File

@@ -138,7 +138,7 @@
savePanel.canCreateDirectories = YES;
savePanel.title = NSLocalizedString(@"SAVE_KEYFILE", "Button title to save the generated key file");
[savePanel beginWithCompletionHandler:^(NSInteger result) {
if(result == NSFileHandlingPanelOKButton) {
if(result == NSModalResponseOK) {
NSURL *keyURL = [savePanel URL];
NSError *error;
BOOL saveOk = [data writeToURL:keyURL options:NSDataWritingAtomic error:&error];

4
MacPass/MPTreeDelegate.m
View File

@@ -88,7 +88,7 @@
NSPanel *panel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
styleMask:NSWindowStyleMaskNonactivatingPanel|NSWindowStyleMaskTitled|NSWindowStyleMaskResizable
backing:NSBackingStoreRetained
backing:NSBackingStoreBuffered
defer:YES];
panel.level = NSScreenSaverWindowLevel;
panel.contentViewController = pickFieldViewController;
@@ -112,7 +112,7 @@
NSPanel *panel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
styleMask:NSWindowStyleMaskNonactivatingPanel|NSWindowStyleMaskTitled|NSWindowStyleMaskResizable
backing:NSBackingStoreRetained
backing:NSBackingStoreBuffered
defer:YES];
panel.level = NSScreenSaverWindowLevel;
panel.contentViewController = pickCharViewController;

2
MacPass/MPWorkflowPreferencesController.m
View File

@@ -86,7 +86,7 @@
openPanel.allowedFileTypes = @[@"app"];
[openPanel beginSheetModalForWindow:self.view.window completionHandler:^(NSInteger result) {
if(result == NSFileHandlingPanelOKButton) {
if(result == NSModalResponseOK) {
// TODO: Autorelease pool?
NSMenuItem *customBrowser = [[NSMenuItem alloc] init];
customBrowser.representedObject = [NSBundle bundleWithPath:openPanel.URL.path].bundleIdentifier;