From 8d7bb31b7c7c3c683ad03b1974c8c87907936ec2 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Wed, 19 Sep 2018 17:40:37 +0200 Subject: [PATCH] Updated to current HNHUI for dark mode support for macOS 10.14 --- Cartfile | 2 +- Cartfile.resolved | 4 +- MacPass.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/MacPass.xcscheme | 2 +- MacPass/Base.lproj/ContextBar.xib | 5 +- MacPass/Base.lproj/EntryInspectorView.xib | 48 +++++++++---------- MacPass/Base.lproj/GroupInspectorView.xib | 12 ++--- MacPass/Base.lproj/PasswordCreatorView.xib | 29 +++++------ MacPass/Base.lproj/PasswordEditWindow.xib | 14 +++--- MacPass/Base.lproj/PasswordInputView.xib | 8 ++-- MacPass/Base.lproj/PickcharView.xib | 11 ++--- MacPass/Base.lproj/PluginDataView.xib | 6 +-- MacPass/Base.lproj/ReferenceBuilderView.xib | 14 +++--- MacPass/MPAutotypeDaemon.m | 5 +- MacPass/MPContextBarViewController.m | 16 +++++-- MacPass/MPEntryInspectorViewController.h | 4 +- MacPass/MPGroupInspectorViewController.h | 6 +-- MacPass/MPPasswordEditWindowController.h | 6 +-- MacPass/MPPasswordInputController.m | 2 +- .../Active Highlight.colorset/Contents.json | 38 +++++++++++++++ .../Active Shadow.colorset/Contents.json | 38 +++++++++++++++ .../Colors/Contents.json | 6 +++ .../Inactive Highlight.colorset/Contents.json | 38 +++++++++++++++ .../Inactive Shadow.colorset/Contents.json | 38 +++++++++++++++ MacPass/MacPassImages.xcassets/Contents.json | 6 +++ MacPass/de.lproj/Credits.rtf | 4 +- MacPass/en.lproj/Credits.rtf | 4 +- MacPass/es.lproj/Credits.rtf | 4 +- MacPass/fr.lproj/Credits.rtf | 4 +- MacPass/it.lproj/Credits.rtf | 4 +- MacPass/nl.lproj/Credits.rtf | 4 +- MacPass/pl.lproj/Credits.rtf | 4 +- MacPass/ru.lproj/Credits.rtf | 4 +- MacPass/sv-SE.lproj/Credits.rtf | 4 +- MacPass/zh-Hans.lproj/Credits.rtf | 4 +- 35 files changed, 287 insertions(+), 113 deletions(-) create mode 100644 MacPass/MacPassImages.xcassets/Colors/Active Highlight.colorset/Contents.json create mode 100644 MacPass/MacPassImages.xcassets/Colors/Active Shadow.colorset/Contents.json create mode 100644 MacPass/MacPassImages.xcassets/Colors/Contents.json create mode 100644 MacPass/MacPassImages.xcassets/Colors/Inactive Highlight.colorset/Contents.json create mode 100644 MacPass/MacPassImages.xcassets/Colors/Inactive Shadow.colorset/Contents.json create mode 100644 MacPass/MacPassImages.xcassets/Contents.json diff --git a/Cartfile b/Cartfile index add887c4..df2a98a8 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "sparkle-project/Sparkle" ~> 1.18.1 github "MacPass/KeePassKit" ~> 1.13.9 -github "mstarke/HNHUi" ~> 1.5 +github "mstarke/HNHUi" ~> 2.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index f35897f4..3752b292 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "MacPass/KeePassKit" "1.13.9" -github "mstarke/HNHUi" "1.5" +github "mstarke/HNHUi" "2.0.1" github "robbiehanson/KissXML" "5.2.3" -github "sparkle-project/Sparkle" "1.19.0" +github "sparkle-project/Sparkle" "1.20.0" diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 174ee185..5bee445f 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -1706,7 +1706,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MP; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "HicknHack Software GmbH"; TargetAttributes = { 4C77E36115B84A240093A587 = { diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme index bbb59912..e85860b1 100644 --- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme +++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme @@ -1,6 +1,6 @@ - + - + @@ -15,6 +15,7 @@ + diff --git a/MacPass/Base.lproj/EntryInspectorView.xib b/MacPass/Base.lproj/EntryInspectorView.xib index 9510b916..f17c4791 100644 --- a/MacPass/Base.lproj/EntryInspectorView.xib +++ b/MacPass/Base.lproj/EntryInspectorView.xib @@ -1,8 +1,8 @@ - + - + @@ -105,7 +105,7 @@ - + @@ -272,14 +272,14 @@ - + - + @@ -295,14 +295,14 @@ - + - + @@ -310,14 +310,14 @@ - + - + @@ -352,14 +352,14 @@ - + - + NSAllRomanInputSourcesLocaleIdentifier @@ -441,14 +441,14 @@ - + - + @@ -568,14 +568,14 @@ - + - + @@ -603,7 +603,7 @@ - + @@ -651,9 +651,8 @@ - + - + @@ -206,7 +207,7 @@ - + diff --git a/MacPass/Base.lproj/PasswordEditWindow.xib b/MacPass/Base.lproj/PasswordEditWindow.xib index a7d341f6..eaa24110 100644 --- a/MacPass/Base.lproj/PasswordEditWindow.xib +++ b/MacPass/Base.lproj/PasswordEditWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -20,7 +20,7 @@ - + @@ -73,14 +73,14 @@ - + - + NSAllRomanInputSourcesLocaleIdentifier @@ -95,11 +95,11 @@ - + - + NSAllRomanInputSourcesLocaleIdentifier diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib index 5479fb70..49ce84f2 100644 --- a/MacPass/Base.lproj/PasswordInputView.xib +++ b/MacPass/Base.lproj/PasswordInputView.xib @@ -1,8 +1,8 @@ - + - + @@ -67,14 +67,14 @@ DQ - + - + NSAllRomanInputSourcesLocaleIdentifier diff --git a/MacPass/Base.lproj/PickcharView.xib b/MacPass/Base.lproj/PickcharView.xib index 6cdc5221..b879b09c 100644 --- a/MacPass/Base.lproj/PickcharView.xib +++ b/MacPass/Base.lproj/PickcharView.xib @@ -1,8 +1,7 @@ - + - - + @@ -23,7 +22,7 @@ - + @@ -42,7 +41,7 @@ - + @@ -51,7 +50,7 @@ - + diff --git a/MacPass/Base.lproj/PluginDataView.xib b/MacPass/Base.lproj/PluginDataView.xib index 4d81209d..c94e03ee 100644 --- a/MacPass/Base.lproj/PluginDataView.xib +++ b/MacPass/Base.lproj/PluginDataView.xib @@ -1,8 +1,8 @@ - + - + @@ -54,7 +54,7 @@ - + diff --git a/MacPass/Base.lproj/ReferenceBuilderView.xib b/MacPass/Base.lproj/ReferenceBuilderView.xib index 6cff4e3a..4adb2a9c 100644 --- a/MacPass/Base.lproj/ReferenceBuilderView.xib +++ b/MacPass/Base.lproj/ReferenceBuilderView.xib @@ -1,8 +1,8 @@ - + - + @@ -25,7 +25,7 @@ - + @@ -36,14 +36,14 @@ - + - + @@ -74,7 +74,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m index eb7623df..e41609df 100644 --- a/MacPass/MPAutotypeDaemon.m +++ b/MacPass/MPAutotypeDaemon.m @@ -306,9 +306,12 @@ static MPAutotypeDaemon *_sharedInstance; styleMask:NSWindowStyleMaskNonactivatingPanel|NSWindowStyleMaskTitled backing:NSBackingStoreRetained defer:YES]; - self.matchSelectionWindow.level = NSScreenSaverWindowLevel; + self.matchSelectionWindow.level = kCGAssistiveTechHighWindowLevel; MPAutotypeCandidateSelectionViewController *vc = [[MPAutotypeCandidateSelectionViewController alloc] init]; vc.candidates = candidates; + self.matchSelectionWindow.collectionBehavior |= (NSWindowCollectionBehaviorFullScreenAuxiliary | + NSWindowCollectionBehaviorMoveToActiveSpace | + NSWindowCollectionBehaviorTransient ); self.matchSelectionWindow.contentViewController = vc; } diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m index 79ead7c0..541cfc7e 100644 --- a/MacPass/MPContextBarViewController.m +++ b/MacPass/MPContextBarViewController.m @@ -47,6 +47,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { @property (nonatomic, assign) MPContextTab activeTab; /* Filter */ +@property (weak) IBOutlet HNHUIGradientView *searchBar; @property (weak) IBOutlet NSButton *filterDoneButton; @property (weak) IBOutlet NSTextField *filterLabelTextField; /* History */ @@ -78,12 +79,19 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { self.filterLabelTextField.cell.backgroundStyle = NSBackgroundStyleRaised; /* Setup Trash Bar color */ - if(!HNHUIIsRunningOnYosemiteOrNewer()) { - NSArray *activeColors = @[[NSColor colorWithCalibratedWhite:0.2 alpha:1],[NSColor colorWithCalibratedWhite:0.4 alpha:1]]; - NSArray *inactiveColors = @[[NSColor colorWithCalibratedWhite:0.3 alpha:1],[NSColor colorWithCalibratedWhite:0.6 alpha:1]]; + if(@available(macOS 10.13, *)) { + NSArray *activeColors = @[[NSColor colorNamed:@"Active Shadow"], [NSColor colorNamed:@"Active Highlight"], ]; + NSArray *inactiveColors = @[[NSColor colorNamed:@"Inactive Shadow"], [NSColor colorNamed:@"Inactive Highlight"]]; + self.historyBar.activeGradient = [[NSGradient alloc] initWithColors:activeColors]; + self.searchBar.activeGradient = [[NSGradient alloc] initWithColors:activeColors]; self.trashBar.activeGradient = [[NSGradient alloc] initWithColors:activeColors]; + + self.historyBar.inactiveGradient = [[NSGradient alloc] initWithColors:inactiveColors]; self.trashBar.inactiveGradient = [[NSGradient alloc] initWithColors:inactiveColors]; - //self.emptyTrashButton.textColor = [NSColor whiteColor]; + self.searchBar.inactiveGradient = [[NSGradient alloc] initWithColors:inactiveColors]; + } + else { + } [self.view bind:NSSelectedIndexBinding toObject:self withKeyPath:NSStringFromSelector(@selector(activeTab)) options:nil]; diff --git a/MacPass/MPEntryInspectorViewController.h b/MacPass/MPEntryInspectorViewController.h index 395be4a8..604da835 100644 --- a/MacPass/MPEntryInspectorViewController.h +++ b/MacPass/MPEntryInspectorViewController.h @@ -24,7 +24,7 @@ #import "HNHUi/HNHUi.h" #import -@class HNHUIRoundedSecureTextField; +@class HNHUISecureTextField; @class MPContextButton; @class MPDocument; @@ -39,7 +39,7 @@ @property (weak) IBOutlet NSTextField *titleTextField; @property (weak) IBOutlet NSTextField *usernameTextField; @property (weak) IBOutlet NSTextField *URLTextField; -@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUISecureTextField *passwordTextField; @property (weak) IBOutlet NSButton *generatePasswordButton; @property (weak) IBOutlet NSButton *togglePassword; @property (weak) IBOutlet NSButton *pickExpireDateButton; diff --git a/MacPass/MPGroupInspectorViewController.h b/MacPass/MPGroupInspectorViewController.h index d857b0d7..734ba595 100644 --- a/MacPass/MPGroupInspectorViewController.h +++ b/MacPass/MPGroupInspectorViewController.h @@ -22,19 +22,19 @@ #import "MPViewController.h" @class MPDocument; -@class HNHUIRoundedTextField; +@class HNHUITextField; @interface MPGroupInspectorViewController : MPViewController @property (strong) IBOutlet NSView *contentView; -@property (weak) IBOutlet HNHUIRoundedTextField *titleTextField; +@property (weak) IBOutlet HNHUITextField *titleTextField; @property (weak) IBOutlet NSButton *expiresCheckButton; @property (weak) IBOutlet NSButton *expireDateSelectButton; @property (weak) IBOutlet NSPopUpButton *searchPopupButton; @property (weak) IBOutlet NSPopUpButton *autotypePopupButton; -@property (weak) IBOutlet HNHUIRoundedTextField *autotypeSequenceTextField; +@property (weak) IBOutlet HNHUITextField *autotypeSequenceTextField; - (void)registerNotificationsForDocument:(MPDocument *)document; @end diff --git a/MacPass/MPPasswordEditWindowController.h b/MacPass/MPPasswordEditWindowController.h index b857d7f2..aaa0a112 100644 --- a/MacPass/MPPasswordEditWindowController.h +++ b/MacPass/MPPasswordEditWindowController.h @@ -24,7 +24,7 @@ #import @class MPDocument; -@class HNHUIRoundedSecureTextField; +@class HNHUISecureTextField; @protocol MPPasswordEditWindowDelegate @@ -39,8 +39,8 @@ @interface MPPasswordEditWindowController : HNHUISheetWindowController -@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; -@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordRepeatTextField; +@property (weak) IBOutlet HNHUISecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUISecureTextField *passwordRepeatTextField; @property (weak) IBOutlet NSPathControl *keyfilePathControl; @property (weak) IBOutlet NSButton *togglePasswordButton; @property (weak) IBOutlet NSTextField *errorTextField; diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m index a97b699c..4be0225a 100644 --- a/MacPass/MPPasswordInputController.m +++ b/MacPass/MPPasswordInputController.m @@ -32,7 +32,7 @@ @interface MPPasswordInputController () -@property (weak) IBOutlet HNHUIRoundedSecureTextField *passwordTextField; +@property (weak) IBOutlet HNHUISecureTextField *passwordTextField; @property (weak) IBOutlet NSPathControl *keyPathControl; @property (weak) IBOutlet NSImageView *messageImageView; @property (weak) IBOutlet NSTextField *messageInfoTextField; diff --git a/MacPass/MacPassImages.xcassets/Colors/Active Highlight.colorset/Contents.json b/MacPass/MacPassImages.xcassets/Colors/Active Highlight.colorset/Contents.json new file mode 100644 index 00000000..6336abb6 --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Colors/Active Highlight.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.965", + "alpha" : "1.000", + "blue" : "0.965", + "green" : "0.965" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.300", + "alpha" : "1.000", + "blue" : "0.300", + "green" : "0.300" + } + } + } + ] +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/Colors/Active Shadow.colorset/Contents.json b/MacPass/MacPassImages.xcassets/Colors/Active Shadow.colorset/Contents.json new file mode 100644 index 00000000..6336abb6 --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Colors/Active Shadow.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.965", + "alpha" : "1.000", + "blue" : "0.965", + "green" : "0.965" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.300", + "alpha" : "1.000", + "blue" : "0.300", + "green" : "0.300" + } + } + } + ] +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/Colors/Contents.json b/MacPass/MacPassImages.xcassets/Colors/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Colors/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/Colors/Inactive Highlight.colorset/Contents.json b/MacPass/MacPassImages.xcassets/Colors/Inactive Highlight.colorset/Contents.json new file mode 100644 index 00000000..6336abb6 --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Colors/Inactive Highlight.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.965", + "alpha" : "1.000", + "blue" : "0.965", + "green" : "0.965" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.300", + "alpha" : "1.000", + "blue" : "0.300", + "green" : "0.300" + } + } + } + ] +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/Colors/Inactive Shadow.colorset/Contents.json b/MacPass/MacPassImages.xcassets/Colors/Inactive Shadow.colorset/Contents.json new file mode 100644 index 00000000..6336abb6 --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Colors/Inactive Shadow.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.965", + "alpha" : "1.000", + "blue" : "0.965", + "green" : "0.965" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.300", + "alpha" : "1.000", + "blue" : "0.300", + "green" : "0.300" + } + } + } + ] +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/Contents.json b/MacPass/MacPassImages.xcassets/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/MacPass/MacPassImages.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MacPass/de.lproj/Credits.rtf b/MacPass/de.lproj/Credits.rtf index af84628d..82818310 100644 --- a/MacPass/de.lproj/Credits.rtf +++ b/MacPass/de.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -95,7 +95,7 @@ Basierend auf dem Code im CocoaDev Wiki\ {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\kerning1\expnd0\expndtw3 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 -\cf3 \kerning1\expnd0\expndtw0 Quelltext wird in HNHUIRoundedSecureTextField verwendet\kerning1\expnd0\expndtw3 +\cf3 \kerning1\expnd0\expndtw0 Quelltext wird in HNHUISecureTextField verwendet\kerning1\expnd0\expndtw3 \ \kerning1\expnd0\expndtw0 Copyright \'a92012 Mike Abdullah, Karelia Software. Alle Rechte vorbehalten.\ \ diff --git a/MacPass/en.lproj/Credits.rtf b/MacPass/en.lproj/Credits.rtf index c7e4782e..26f4b155 100644 --- a/MacPass/en.lproj/Credits.rtf +++ b/MacPass/en.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/es.lproj/Credits.rtf b/MacPass/es.lproj/Credits.rtf index ea858b29..d03bd07d 100644 --- a/MacPass/es.lproj/Credits.rtf +++ b/MacPass/es.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -86,7 +86,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/fr.lproj/Credits.rtf b/MacPass/fr.lproj/Credits.rtf index 4ed828a6..349e7951 100644 --- a/MacPass/fr.lproj/Credits.rtf +++ b/MacPass/fr.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/it.lproj/Credits.rtf b/MacPass/it.lproj/Credits.rtf index 93435eba..bf7d4d92 100644 --- a/MacPass/it.lproj/Credits.rtf +++ b/MacPass/it.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/nl.lproj/Credits.rtf b/MacPass/nl.lproj/Credits.rtf index ccf4f675..49ca1400 100644 --- a/MacPass/nl.lproj/Credits.rtf +++ b/MacPass/nl.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/pl.lproj/Credits.rtf b/MacPass/pl.lproj/Credits.rtf index 93435eba..bf7d4d92 100644 --- a/MacPass/pl.lproj/Credits.rtf +++ b/MacPass/pl.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/ru.lproj/Credits.rtf b/MacPass/ru.lproj/Credits.rtf index def039fe..8b8e9885 100644 --- a/MacPass/ru.lproj/Credits.rtf +++ b/MacPass/ru.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/sv-SE.lproj/Credits.rtf b/MacPass/sv-SE.lproj/Credits.rtf index c7e4782e..26f4b155 100644 --- a/MacPass/sv-SE.lproj/Credits.rtf +++ b/MacPass/sv-SE.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 diff --git a/MacPass/zh-Hans.lproj/Credits.rtf b/MacPass/zh-Hans.lproj/Credits.rtf index 93435eba..bf7d4d92 100644 --- a/MacPass/zh-Hans.lproj/Credits.rtf +++ b/MacPass/zh-Hans.lproj/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} {\*\expandedcolortbl;;\csgenericrgb\c20392\c43137\c71765;\csgenericrgb\c14902\c14902\c14902;} @@ -91,7 +91,7 @@ Extracted from code on the CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ -Code reused in HNHUIRoundedSecureTextField\ +Code reused in HNHUISecureTextField\ Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0