Skip to content

Fix formatting and formatting settings #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ReactiveAppKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@
EC9C39E61CF5A5910090F133 /* ReactiveAppKit */,
EC9C39E51CF5A5910090F133 /* Products */,
);
indentWidth = 2;
sourceTree = "<group>";
tabWidth = 2;
};
EC9C39E51CF5A5910090F133 /* Products */ = {
isa = PBXGroup;
Expand Down
8 changes: 0 additions & 8 deletions ReactiveAppKit/ReactiveAppKit.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
//
// ReactiveAppKit.h
// ReactiveAppKit
//
// Created by Srdan Rasic on 25/05/16.
// Copyright © 2016 ReactiveKit. All rights reserved.
//

#import <Cocoa/Cocoa.h>

Expand All @@ -13,7 +9,3 @@ FOUNDATION_EXPORT double ReactiveAppKitVersionNumber;

//! Project version string for ReactiveAppKit.
FOUNDATION_EXPORT const unsigned char ReactiveAppKitVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <ReactiveAppKit/PublicHeader.h>


1 change: 1 addition & 0 deletions Sources/NSButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ extension NSButton {
public var rState: Property<Int> {
return rAssociatedPropertyForValueForKey("state")
}

}
6 changes: 4 additions & 2 deletions Sources/NSControl.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import ReactiveKit
import Cocoa

@objc class RKNSControlHelper: NSObject
{
@objc class RKNSControlHelper: NSObject {

weak var control: NSControl?
let pushStream = PushStream<AnyObject?>()

Expand All @@ -47,6 +47,7 @@ import Cocoa
control?.action = nil
pushStream.completed()
}

}

extension NSControl {
Expand Down Expand Up @@ -92,4 +93,5 @@ extension NSControl {
public var rDoubleValue: Property<Double> {
return rAssociatedPropertyForValueForKey("doubleValue")
}

}
2 changes: 2 additions & 0 deletions Sources/NSImageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ extension NSImageView {
public var rImage: Property<NSImage?> {
return rAssociatedPropertyForValueForKey("image")
}

}

extension NSImageView: BindableType {

public func observer(disconnectDisposable: Disposable) -> (StreamEvent<NSImage?> -> ()) {
return self.rImage.observer(disconnectDisposable)
}

}
2 changes: 2 additions & 0 deletions Sources/NSProgressIndicator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ extension NSProgressIndicator {
public var rProgress: Property<Float> {
return rAssociatedPropertyForValueForKey("progress")
}

}

extension NSProgressIndicator: BindableType {

public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Float> -> ()) {
return self.rProgress.observer(disconnectDisposable)
}

}
3 changes: 2 additions & 1 deletion Sources/NSSegmentedControl.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// THE SOFTWARE.
//


import ReactiveKit
import Cocoa

Expand All @@ -35,11 +34,13 @@ extension NSSegmentedControl {
public var rSelectedSegment: Property<Int> {
return rAssociatedPropertyForValueForKey("selectedSegment")
}

}

extension NSSegmentedControl {

public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Int> -> ()) {
return self.rSelectedSegment.observer(disconnectDisposable)
}

}
1 change: 1 addition & 0 deletions Sources/NSSlider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ extension NSSlider {
public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Double> -> ()) {
return self.rDoubleValue.observer(disconnectDisposable)
}

}
4 changes: 2 additions & 2 deletions Sources/NSTextField.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
// THE SOFTWARE.
//


import ReactiveKit
import Cocoa

extension NSTextField {

public var rFont: Property<NSFont?> {
return rAssociatedPropertyForValueForKey("font")
}
Expand Down Expand Up @@ -55,4 +54,5 @@ extension NSTextField {
public func observer(disconnectDisposable: Disposable) -> (StreamEvent<String> -> ()) {
return self.rStringleValue.observer(disconnectDisposable)
}

}
1 change: 1 addition & 0 deletions Sources/NSView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ extension NSView {
public var rHidden: Property<Bool> {
return rAssociatedPropertyForValueForKey("hidden")
}

}