Skip to content

Commit bbc3a8a

Browse files
loutskiyloutskiy
committed
merge
1 parent 56c0baf commit bbc3a8a

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

‎installer/macOS/KeyChain Installer.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
A776F48D21D0C696006736C9 /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F75B21A6B4A60021ED5E /* Print.swift */; };
1212
A776F48F21D0C92E006736C9 /* UninstallVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A776F48E21D0C92E006736C9 /* UninstallVC.swift */; };
1313
A776F49021D0D147006736C9 /* Alerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F75721A6B4620021ED5E /* Alerts.swift */; };
14-
A78BBE432209D4E7007A5BB4 /* bin.tar.gz in Resources */ = {isa = PBXBuildFile; fileRef = A78BBE422209D4E7007A5BB4 /* bin.tar.gz */; };
1514
A793A32921C2672B0061249D /* LicenseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A793A32821C2672B0061249D /* LicenseVC.swift */; };
1615
A799115F21C41AD500CB13B7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A799115E21C41AD500CB13B7 /* AppDelegate.swift */; };
1716
A799116321C41AD500CB13B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A799116221C41AD500CB13B7 /* Assets.xcassets */; };
1817
A799116621C41AD500CB13B7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A799116421C41AD500CB13B7 /* Main.storyboard */; };
1918
A7A912B621CCE12D00A7594E /* NotificationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F75F21A6B6C70021ED5E /* NotificationExtensions.swift */; };
2019
A7A912B721CCF43A00A7594E /* Consts.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F75921A6B4860021ED5E /* Consts.swift */; };
2120
A7A912B821CCF8BD00A7594E /* AppleScriptManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F75521A6B4520021ED5E /* AppleScriptManager.swift */; };
21+
A7C2B31E221300EB00A89CFE /* bin.tar.gz in Resources */ = {isa = PBXBuildFile; fileRef = A7C2B31D221300EB00A89CFE /* bin.tar.gz */; };
2222
A7DF22B621CA7BA3008F2364 /* UnistallerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DF22B521CA7BA3008F2364 /* UnistallerManager.swift */; };
2323
A7DF22B721CA7BA3008F2364 /* UnistallerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DF22B521CA7BA3008F2364 /* UnistallerManager.swift */; };
2424
A7E7F73E21A6B0CE0021ED5E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E7F73D21A6B0CE0021ED5E /* AppDelegate.swift */; };
@@ -44,14 +44,14 @@
4444
A0679F4132141184C33311C6 /* Pods-Keychain Installer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Keychain Installer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Keychain Installer/Pods-Keychain Installer.debug.xcconfig"; sourceTree = "<group>"; };
4545
A1FECE3906833024E5D5394D /* Pods_Keychain_Uninstaller.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Keychain_Uninstaller.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4646
A776F48E21D0C92E006736C9 /* UninstallVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UninstallVC.swift; sourceTree = "<group>"; };
47-
A78BBE422209D4E7007A5BB4 /* bin.tar.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = bin.tar.gz; sourceTree = "<group>"; };
4847
A793A32821C2672B0061249D /* LicenseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LicenseVC.swift; sourceTree = "<group>"; };
4948
A799115C21C41AD500CB13B7 /* Keychain Uninstaller.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Keychain Uninstaller.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5049
A799115E21C41AD500CB13B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5150
A799116221C41AD500CB13B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5251
A799116521C41AD500CB13B7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5352
A799116721C41AD500CB13B7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5453
A799116821C41AD500CB13B7 /* Keychain_Uninstaller.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Keychain_Uninstaller.entitlements; sourceTree = "<group>"; };
54+
A7C2B31D221300EB00A89CFE /* bin.tar.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = bin.tar.gz; sourceTree = "<group>"; };
5555
A7DF22B521CA7BA3008F2364 /* UnistallerManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = UnistallerManager.swift; path = Common/UnistallerManager.swift; sourceTree = SOURCE_ROOT; };
5656
A7E7F73A21A6B0CD0021ED5E /* KeyChain Installer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KeyChain Installer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5757
A7E7F73D21A6B0CE0021ED5E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -168,7 +168,7 @@
168168
A7E7F74321A6B0D10021ED5E /* Main.storyboard */,
169169
A7E7F74621A6B0D10021ED5E /* Info.plist */,
170170
A7E7F74721A6B0D10021ED5E /* Keychain_Installer.entitlements */,
171-
A78BBE422209D4E7007A5BB4 /* bin.tar.gz */,
171+
A7C2B31D221300EB00A89CFE /* bin.tar.gz */,
172172
);
173173
path = "KeyChain Installer";
174174
sourceTree = "<group>";
@@ -265,7 +265,7 @@
265265
isa = PBXResourcesBuildPhase;
266266
buildActionMask = 2147483647;
267267
files = (
268-
A78BBE432209D4E7007A5BB4 /* bin.tar.gz in Resources */,
268+
A7C2B31E221300EB00A89CFE /* bin.tar.gz in Resources */,
269269
A7E7F74221A6B0D10021ED5E /* Assets.xcassets in Resources */,
270270
A7E7F74521A6B0D10021ED5E /* Main.storyboard in Resources */,
271271
);

‎installer/macOS/KeyChain Installer/Base.lproj/Main.storyboard

+2-2
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@
685685
<scene sceneID="R2V-B0-nI4">
686686
<objects>
687687
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
688-
<window key="window" title="KeyChain Installer v0.15" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
688+
<window key="window" title="KeyChain Installer v0.16" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
689689
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
690690
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
691691
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
@@ -987,7 +987,7 @@
987987
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
988988
<subviews>
989989
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" smartInsertDelete="YES" id="g3g-3i-3YG">
990-
<rect key="frame" x="0.0" y="-23" width="410" height="425"/>
990+
<rect key="frame" x="0.0" y="-24" width="410" height="425"/>
991991
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
992992
<color key="textColor" red="0.14118" green="0.16078000000000001" blue="0.18038999999999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
993993
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

‎keychain_common-Bridging-Header.h

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

‎keychain_mac/SelectKeyVC.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
6161
{
6262
//we have only one table in the screen and thus we are not checking the row count based on the target table view
6363
// long recordCount = [self.dataArray count];
64-
return keyfile_singleton::instance();
64+
return 0;
6565
}
6666

6767
- (void)runModal {

0 commit comments

Comments
 (0)