Permalink
Browse files

Removed © song + switched scanner sound + app icon

Due to copyrights
  • Loading branch information...
1 parent 13846b5 commit 60fbd660e460ece796958b91802898aafef08933 @AkdM committed Jan 17, 2017
@@ -3,11 +3,12 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */
- 537819F41DD2814400A1F39E /* KnightRiderThemeSong.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 537819F31DD2814400A1F39E /* KnightRiderThemeSong.mp3 */; };
+ 534E9E551E2E319100E94FD7 /* KITT_scanner.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 534E9E541E2E319100E94FD7 /* KITT_scanner.mp3 */; };
+ 534E9E5F1E2E393600E94FD7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 534E9E5E1E2E393600E94FD7 /* Images.xcassets */; };
537819F81DD3166A00A1F39E /* kitt_car.gif in Resources */ = {isa = PBXBuildFile; fileRef = 537819F71DD3166A00A1F39E /* kitt_car.gif */; };
53FA8DDD1DCDFD1C00FA713F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53FA8DDC1DCDFD1C00FA713F /* AppDelegate.swift */; };
53FA8DDF1DCDFD1C00FA713F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53FA8DDE1DCDFD1C00FA713F /* ViewController.swift */; };
@@ -16,7 +17,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 537819F31DD2814400A1F39E /* KnightRiderThemeSong.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = KnightRiderThemeSong.mp3; sourceTree = "<group>"; };
+ 534E9E541E2E319100E94FD7 /* KITT_scanner.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = KITT_scanner.mp3; sourceTree = "<group>"; };
+ 534E9E5E1E2E393600E94FD7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
537819F71DD3166A00A1F39E /* kitt_car.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = kitt_car.gif; sourceTree = "<group>"; };
53FA8DD91DCDFD1C00FA713F /* KnightTouchBar2000.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KnightTouchBar2000.app; sourceTree = BUILT_PRODUCTS_DIR; };
53FA8DDC1DCDFD1C00FA713F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -56,13 +58,14 @@
53FA8DDB1DCDFD1C00FA713F /* KnightTouchBar2000 */ = {
isa = PBXGroup;
children = (
+ 534E9E541E2E319100E94FD7 /* KITT_scanner.mp3 */,
537819F71DD3166A00A1F39E /* kitt_car.gif */,
- 537819F31DD2814400A1F39E /* KnightRiderThemeSong.mp3 */,
53FA8DDC1DCDFD1C00FA713F /* AppDelegate.swift */,
53FA8DDE1DCDFD1C00FA713F /* ViewController.swift */,
53FA8DF11DCE0E8000FA713F /* TouchBarController.swift */,
53FA8DE21DCDFD1C00FA713F /* Main.storyboard */,
53FA8DE51DCDFD1C00FA713F /* Info.plist */,
+ 534E9E5E1E2E393600E94FD7 /* Images.xcassets */,
);
path = KnightTouchBar2000;
sourceTree = "<group>";
@@ -94,7 +97,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
- LastUpgradeCheck = 0810;
+ LastUpgradeCheck = 0820;
ORGANIZATIONNAME = "Anthony Da Mota";
TargetAttributes = {
53FA8DD81DCDFD1C00FA713F = {
@@ -106,7 +109,7 @@
};
};
buildConfigurationList = 53FA8DD41DCDFD1C00FA713F /* Build configuration list for PBXProject "KnightTouchBar2000" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 8.0";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
@@ -128,7 +131,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 537819F41DD2814400A1F39E /* KnightRiderThemeSong.mp3 in Resources */,
+ 534E9E5F1E2E393600E94FD7 /* Images.xcassets in Resources */,
+ 534E9E551E2E319100E94FD7 /* KITT_scanner.mp3 in Resources */,
537819F81DD3166A00A1F39E /* kitt_car.gif in Resources */,
53FA8DE41DCDFD1C00FA713F /* Main.storyboard in Resources */,
);
@@ -179,6 +183,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -228,6 +233,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -694,18 +694,31 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="IHw-ZF-QKi"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k0d-CT-iGD">
- <rect key="frame" x="18" y="20" width="364" height="17"/>
+ <rect key="frame" x="18" y="20" width="364" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Made by Anthony Da Mota - 2016" id="AOR-lj-bwH">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Made by Anthony Da Mota (@AkdM)" id="AOR-lj-bwH">
<font key="font" size="13" name="CourierNewPSMT"/>
<color key="textColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
+ <button fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RNe-pX-2s0">
+ <rect key="frame" x="122" y="253" width="157" height="29"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="bevel" title="Scanner sound on" bezelStyle="regularSquare" imagePosition="left" alignment="center" state="on" borderStyle="border" inset="2" id="lq6-GO-6ll">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES" accelerator="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent">s</string>
+ </buttonCell>
+ <connections>
+ <action selector="setScannerMusic:" target="XfG-lQ-9wD" id="0uk-7w-I4x"/>
+ </connections>
+ </button>
</subviews>
</view>
<connections>
<outlet property="kittCar" destination="Est-oU-FLN" id="hKz-TF-vEy"/>
+ <outlet property="scannerCheckbox" destination="RNe-pX-2s0" id="8x8-CC-scc"/>
</connections>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -0,0 +1,68 @@
+{
+ "images" : [
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "icon_16x16.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "icon_16x16@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "icon_32x32.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "icon_32x32@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "128x128",
+ "idiom" : "mac",
+ "filename" : "icon_128x128.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "128x128",
+ "idiom" : "mac",
+ "filename" : "icon_128x128@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "256x256",
+ "idiom" : "mac",
+ "filename" : "icon_256x256.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "256x256",
+ "idiom" : "mac",
+ "filename" : "icon_256x256@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "512x512",
+ "idiom" : "mac",
+ "filename" : "icon_512x512.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "512x512",
+ "idiom" : "mac",
+ "filename" : "icon_512x512@2x.png",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -6,8 +6,6 @@
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIconFile</key>
- <string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -17,9 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.1</string>
<key>CFBundleVersion</key>
<string>1</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.entertainment</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Binary file not shown.
Binary file not shown.
@@ -24,11 +24,9 @@ class TouchBarController: NSWindowController, NSTouchBarDelegate, CAAnimationDel
override func windowDidLoad() {
super.windowDidLoad()
-
- handleMusic()
}
- @available(OSX 10.12.1, *)
+ @available(OSX 10.12.2, *)
override func makeTouchBar() -> NSTouchBar? {
let touchBar = NSTouchBar()
touchBar.delegate = self
@@ -40,7 +38,7 @@ class TouchBarController: NSWindowController, NSTouchBarDelegate, CAAnimationDel
}
- @available(OSX 10.12.1, *)
+ @available(OSX 10.12.2, *)
func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItemIdentifier) -> NSTouchBarItem? {
let wholeTouchBar = NSCustomTouchBarItem(identifier: identifier)
@@ -117,13 +115,6 @@ class TouchBarController: NSWindowController, NSTouchBarDelegate, CAAnimationDel
return theLEDAnim
}
-
- func handleMusic() {
- guard let music = NSSound(named: "KnightRiderThemeSong") else {
- return
- }
- music.play()
- }
}
// Apple puts that code in the docs instead of just adding a CGPath accessor to NSBezierPath
@@ -1,3 +1,4 @@
+
//
// ViewController.swift
// KnightTouchBar2000
@@ -10,7 +11,10 @@ import Cocoa
class ViewController: NSViewController {
+ @IBOutlet weak var scannerCheckbox: NSButton!
@IBOutlet weak var kittCar: NSImageView!
+ let scannerSound = NSSound(named: "KITT_scanner")
+
override func viewDidLoad() {
super.viewDidLoad()
@@ -19,6 +23,25 @@ class ViewController: NSViewController {
kittCar.image = NSImage(named: "kitt_car.gif")
kittCar.frame = CGRect(x: 0, y: 0, width: 400, height: 300)
kittCar.animates = true
+
+ scannerSound?.loops = true
+ isScannerChecked()
+ }
+
+ @IBAction func setScannerMusic(_ sender: Any) {
+ isScannerChecked()
+ }
+
+ func isScannerChecked() {
+
+ switch scannerCheckbox.state {
+ case NSOnState:
+ scannerCheckbox.title = "Scanner sound on"
+ scannerSound?.play()
+ default:
+ scannerCheckbox.title = "Scanner sound off"
+ scannerSound?.stop()
+ }
}
override var representedObject: Any? {

0 comments on commit 60fbd66

Please sign in to comment.