Skip to content

Commit

Permalink
Merge branch 'release/0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
katsuyoshi committed Sep 25, 2018
2 parents a12c324 + f1582a3 commit bdcbab6
Show file tree
Hide file tree
Showing 25 changed files with 245 additions and 76 deletions.

Large diffs are not rendered by default.

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

@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7AF2157DC7F00EDAB40"
BuildableName = "WipingMyMac.app"
BlueprintName = "WipingMyMac"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7C52157DC8000EDAB40"
BuildableName = "WipingMyMacTests.xctest"
BlueprintName = "WipingMyMacTests"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7D02157DC8000EDAB40"
BuildableName = "WipingMyMacUITests.xctest"
BlueprintName = "WipingMyMacUITests"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7AF2157DC7F00EDAB40"
BuildableName = "WipingMyMac.app"
BlueprintName = "WipingMyMac"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7AF2157DC7F00EDAB40"
BuildableName = "WipingMyMac.app"
BlueprintName = "WipingMyMac"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46E5A7AF2157DC7F00EDAB40"
BuildableName = "WipingMyMac.app"
BlueprintName = "WipingMyMac"
ReferencedContainer = "container:WipingMyMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>SwipingMyMac.xcscheme</key>
<key>WipingMyMac.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -12,11 +12,11 @@
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="SwipingMyMac" id="1Xt-HY-uBw">
<menuItem title="WipingMyMac" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="SwipingMyMac" systemMenu="apple" id="uQy-DD-JDr">
<menu key="submenu" title="WipingMyMac" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About SwipingMyMac" id="5kV-Vb-QxS">
<menuItem title="About WipingMyMac" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
Expand All @@ -30,7 +30,7 @@
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide SwipingMyMac" keyEquivalent="h" id="Olw-nP-bQN">
<menuItem title="Hide WipingMyMac" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
Expand All @@ -48,7 +48,7 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit SwipingMyMac" keyEquivalent="q" id="4sb-4s-VLi">
<menuItem title="Quit WipingMyMac" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
</connections>
Expand Down Expand Up @@ -661,7 +661,7 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
<items>
<menuItem title="SwipingMyMac Help" keyEquivalent="?" id="FKE-Sm-Kum">
<menuItem title="WipingMyMac Help" keyEquivalent="?" id="FKE-Sm-Kum">
<connections>
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
</connections>
Expand All @@ -684,7 +684,7 @@
<!--Window Controller-->
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
<windowController id="B8D-0N-5wS" customClass="WindowController" sceneMemberID="viewController">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
Expand Down Expand Up @@ -713,7 +713,7 @@
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l8I-vL-9Za">
<rect key="frame" x="18" y="20" width="444" height="230"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<textFieldCell key="cell" selectable="YES" alignment="center" allowsEditingTextAttributes="YES" id="kND-Ju-0E9">
<textFieldCell key="cell" selectable="YES" enabled="NO" alignment="center" allowsEditingTextAttributes="YES" id="kND-Ju-0E9">
<font key="font" size="57" name=".SFNSDisplay"/>
<string key="title">Wiping my Mac
Quit: ⌘+q</string>
Expand Down
2 changes: 1 addition & 1 deletion SwipingMyMac/Info.plist → WipingMyMac/Info.plist
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.1</string>
<string>0.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions SwipingMyMac/UnhandledView.m → WipingMyMac/UnhandledView.m
Expand Up @@ -7,6 +7,7 @@
//

#import "UnhandledView.h"
#import "KioskManager.h"

@implementation UnhandledView

Expand All @@ -29,4 +30,9 @@ - (void)keyUp:(NSEvent *)theEvent
{
}

- (void)mouseDown:(NSEvent *)event
{
[[KioskManager sharedManager] becomeFullScreen];
}

@end
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions WipingMyMac/WindowController.h
@@ -0,0 +1,17 @@
//
// WindowController.h
// WipingMyMac
//
// Created by 伊藤ソフトデザイン on 2018/09/25.
// Copyright © 2018年 ITO SOFT DESIGN. All rights reserved.
//

#import <Cocoa/Cocoa.h>

NS_ASSUME_NONNULL_BEGIN

@interface WindowController : NSWindowController

@end

NS_ASSUME_NONNULL_END
29 changes: 29 additions & 0 deletions WipingMyMac/WindowController.m
@@ -0,0 +1,29 @@
//
// WindowController.m
// WipingMyMac
//
// Created by 伊藤ソフトデザイン on 2018/09/25.
// Copyright © 2018年 ITO SOFT DESIGN. All rights reserved.
//

#import "WindowController.h"
#import "KioskManager.h"

@interface WindowController ()

@end

@implementation WindowController

- (void)windowDidLoad {
[super windowDidLoad];

// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
}

- (void)windowDidExitFullScreen:(NSNotification *)notification
{
[[KioskManager sharedManager] performSelector:@selector(becomeFullScreen) withObject:nil afterDelay:0.1];
}

@end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit bdcbab6

Please sign in to comment.