Skip to content

Commit

Permalink
Added license info to new files. Some name changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicktoumpelis committed Jun 8, 2009
1 parent 21bcfcc commit 4a97570
Show file tree
Hide file tree
Showing 8 changed files with 787 additions and 278 deletions.
866 changes: 653 additions & 213 deletions Canary.xcodeproj/genesis.pbxuser

Large diffs are not rendered by default.

67 changes: 49 additions & 18 deletions Canary.xcodeproj/genesis.perspectivev3
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>13</integer>
<integer>14</integer>
<integer>2</integer>
<integer>1</integer>
<integer>0</integer>
Expand Down Expand Up @@ -323,19 +323,19 @@
<key>PBXProjectModuleGUID</key>
<string>0573D6CD0DA66271002D1CCF</string>
<key>PBXProjectModuleLabel</key>
<string>ORSPreferences.h</string>
<string>ORSCanaryPreferences.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>0573D6CE0DA66271002D1CCF</string>
<key>PBXProjectModuleLabel</key>
<string>ORSPreferences.h</string>
<string>ORSCanaryPreferences.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>05A217170FDD47BC004748C4</string>
<string>05A217430FDD5480004748C4</string>
<key>history</key>
<array>
<string>05372D9D0E7EE8CC008ABD85</string>
Expand Down Expand Up @@ -390,8 +390,6 @@
<string>0508EFE50FDB037300826B32</string>
<string>0508EFE60FDB037300826B32</string>
<string>0508EFE80FDB037300826B32</string>
<string>05163A230FDBD55300C15851</string>
<string>05163A240FDBD55300C15851</string>
<string>05163A250FDBD55300C15851</string>
<string>05163A260FDBD55300C15851</string>
<string>05163A270FDBD55300C15851</string>
Expand All @@ -414,17 +412,19 @@
<string>05163A9F0FDC321D00C15851</string>
<string>05A216150FDD0FE0004748C4</string>
<string>05A216160FDD0FE0004748C4</string>
<string>05A216180FDD0FE0004748C4</string>
<string>05A216760FDD3E64004748C4</string>
<string>05A216770FDD3E64004748C4</string>
<string>05A216B00FDD4226004748C4</string>
<string>05A216B10FDD4226004748C4</string>
<string>05A216B20FDD4226004748C4</string>
<string>05A216E60FDD43BE004748C4</string>
<string>05A216FF0FDD47BC004748C4</string>
<string>05A217000FDD47BC004748C4</string>
<string>05A217010FDD47BC004748C4</string>
<string>05A217020FDD47BC004748C4</string>
<string>05A2171C0FDD5480004748C4</string>
<string>05A2171D0FDD5480004748C4</string>
<string>05A2171E0FDD5480004748C4</string>
<string>05A2171F0FDD5480004748C4</string>
<string>05A217200FDD5480004748C4</string>
<string>05A217210FDD5480004748C4</string>
<string>05A217220FDD5480004748C4</string>
<string>05A217230FDD5480004748C4</string>
<string>05A217240FDD5480004748C4</string>
</array>
<key>prevStack</key>
<array>
Expand Down Expand Up @@ -614,6 +614,36 @@
<string>05A217140FDD47BC004748C4</string>
<string>05A217150FDD47BC004748C4</string>
<string>05A217160FDD47BC004748C4</string>
<string>05A217250FDD5480004748C4</string>
<string>05A217260FDD5480004748C4</string>
<string>05A217270FDD5480004748C4</string>
<string>05A217280FDD5480004748C4</string>
<string>05A217290FDD5480004748C4</string>
<string>05A2172A0FDD5480004748C4</string>
<string>05A2172B0FDD5480004748C4</string>
<string>05A2172C0FDD5480004748C4</string>
<string>05A2172D0FDD5480004748C4</string>
<string>05A2172E0FDD5480004748C4</string>
<string>05A2172F0FDD5480004748C4</string>
<string>05A217300FDD5480004748C4</string>
<string>05A217310FDD5480004748C4</string>
<string>05A217320FDD5480004748C4</string>
<string>05A217330FDD5480004748C4</string>
<string>05A217340FDD5480004748C4</string>
<string>05A217350FDD5480004748C4</string>
<string>05A217360FDD5480004748C4</string>
<string>05A217370FDD5480004748C4</string>
<string>05A217380FDD5480004748C4</string>
<string>05A217390FDD5480004748C4</string>
<string>05A2173A0FDD5480004748C4</string>
<string>05A2173B0FDD5480004748C4</string>
<string>05A2173C0FDD5480004748C4</string>
<string>05A2173D0FDD5480004748C4</string>
<string>05A2173E0FDD5480004748C4</string>
<string>05A2173F0FDD5480004748C4</string>
<string>05A217400FDD5480004748C4</string>
<string>05A217410FDD5480004748C4</string>
<string>05A217420FDD5480004748C4</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -627,18 +657,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {744, 344}}</string>
<string>{{0, 0}, {744, 610}}</string>
<key>RubberWindowFrame</key>
<string>151 122 1021 656 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>344pt</string>
<string>610pt</string>
</dict>
<dict>
<key>Proportion</key>
<string>266pt</string>
<string>0pt</string>
<key>Tabs</key>
<array>
<dict>
Expand Down Expand Up @@ -706,7 +736,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {744, 239}}</string>
<string>{{10, 27}, {744, -27}}</string>
<key>RubberWindowFrame</key>
<string>151 122 1021 656 0 0 1280 778 </string>
</dict>
Expand Down Expand Up @@ -922,6 +952,7 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>05D9E0370E6B233B001E75DE</string>
<string>05A216120FDD0F54004748C4</string>
<string>05A216130FDD0F54004748C4</string>
<string>/Users/genesis/Projects/Ocean Road Software/Canary/source/Canary.xcodeproj</string>
Expand Down Expand Up @@ -1823,7 +1854,7 @@
<key>TableOfContents</key>
<array>
<string>05D9E0370E6B233B001E75DE</string>
<string>05FAC9D90FAC98FF00524FF2</string>
<string>05A217440FDD5480004748C4</string>
<string>05D9E0360E6B233B001E75DE</string>
</array>
<key>WindowString</key>
Expand Down
12 changes: 6 additions & 6 deletions Canary.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
053FBCCA0FA51DA300DA370E /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 053FBC260FA515E100DA370E /* BWToolkitFramework.framework */; };
0573D7340DA6650B002D1CCF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0573D7330DA6650B002D1CCF /* Security.framework */; };
057E321C0F91E19A0055B843 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 057E321B0F91E19A0055B843 /* ScriptingBridge.framework */; };
05A216A70FDD3FB1004748C4 /* ORSPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 05A216A60FDD3FB1004748C4 /* ORSPreferences.m */; };
05A216A70FDD3FB1004748C4 /* ORSCanaryPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 05A216A60FDD3FB1004748C4 /* ORSCanaryPreferences.m */; };
05A5D7820F03F0D100B596A9 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A5D7810F03F0D100B596A9 /* Quartz.framework */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -444,8 +444,8 @@
053FBC660FA516A600DA370E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0573D7330DA6650B002D1CCF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
057E321B0F91E19A0055B843 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; };
05A216A50FDD3FB1004748C4 /* ORSPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ORSPreferences.h; path = Classes/Controller/ORSPreferences.h; sourceTree = "<group>"; };
05A216A60FDD3FB1004748C4 /* ORSPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ORSPreferences.m; path = Classes/Controller/ORSPreferences.m; sourceTree = "<group>"; };
05A216A50FDD3FB1004748C4 /* ORSCanaryPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ORSCanaryPreferences.h; path = Classes/Controller/ORSCanaryPreferences.h; sourceTree = "<group>"; };
05A216A60FDD3FB1004748C4 /* ORSCanaryPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ORSCanaryPreferences.m; path = Classes/Controller/ORSCanaryPreferences.m; sourceTree = "<group>"; };
05A5D7810F03F0D100B596A9 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
Expand Down Expand Up @@ -775,8 +775,8 @@
053FBA390FA50EC700DA370E /* NSString+ORSCanaryAdditions.m */,
053FBA3D0FA50EC700DA370E /* NSMutableAttributedString+ORSCanaryAdditions.h */,
053FBA3B0FA50EC700DA370E /* NSMutableAttributedString+ORSCanaryAdditions.m */,
05A216A50FDD3FB1004748C4 /* ORSPreferences.h */,
05A216A60FDD3FB1004748C4 /* ORSPreferences.m */,
05A216A50FDD3FB1004748C4 /* ORSCanaryPreferences.h */,
05A216A60FDD3FB1004748C4 /* ORSCanaryPreferences.m */,
053FBA400FA50EC700DA370E /* iTunes.h */,
05E2461C0EC22BC500410548 /* Controls */,
0591A9610EC8E73800BF3CAD /* Other Controllers */,
Expand Down Expand Up @@ -1143,7 +1143,7 @@
053FBAE20FA5128900DA370E /* ORSUrlborgShortener.m in Sources */,
053FBAEE0FA512C600DA370E /* ORSCredentialsManager.m in Sources */,
053FBAF10FA5139300DA370E /* main.m in Sources */,
05A216A70FDD3FB1004748C4 /* ORSPreferences.m in Sources */,
05A216A70FDD3FB1004748C4 /* ORSCanaryPreferences.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
6 changes: 3 additions & 3 deletions Classes/Controller/ORSCanaryController.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#import "ORSShortener.h"
#import "ORSCredentialsManager.h"
#import "ORSTwitterEngine.h"
#import "ORSPreferences.h"
#import "ORSCanaryPreferences.h"
#import "ORSShortenerFactory.h"
#import "ORSUpdateDispatcher.h"
#import "ORSDateDifferenceFormatter.h"
Expand All @@ -58,7 +58,7 @@
id <ORSShortener> urlShortener;
ORSUpdateDispatcher *updateDispatcher;
ORSTimelineCacheManager *cacheManager;
ORSPreferences *preferences;
ORSCanaryPreferences *preferences;
// Extra Windows
IBOutlet NSWindow *aboutWindow;
IBOutlet NSWindow *newUserWindow;
Expand Down Expand Up @@ -275,7 +275,7 @@

@property (assign) ORSCredentialsManager *authenticator;
@property (assign) ORSTwitterEngine *twitterEngine;
@property (assign) ORSPreferences *preferences;
@property (assign) ORSCanaryPreferences *preferences;
@property (assign) id <ORSShortener> urlShortener;
@property (assign) ORSUpdateDispatcher *updateDispatcher;
@property (assign) ORSTimelineCacheManager *cacheManager;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Controller/ORSCanaryController.m
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ - (id) init {
defaults = [NSUserDefaults standardUserDefaults];
authenticator = [[ORSCredentialsManager alloc] init];
cacheManager = [[ORSTimelineCacheManager alloc] init];
preferences = [[ORSPreferences alloc] init];
preferences = [[ORSCanaryPreferences alloc] init];

// NotificationCenter stuff -- need to determine a way to find
// which method to call
Expand Down
51 changes: 51 additions & 0 deletions Classes/Controller/ORSCanaryPreferences.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//
// ORSCanaryPreferences.h
// Canary
//
// Created by Nicholas Toumpelis on 08/06/2009.
// Copyright 2008-2009 Ocean Road Software, Nick Toumpelis.
//
// Version 0.7.1
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.

#import <Cocoa/Cocoa.h>
#import "ORSTwitterEngine.h"
#import "ORSShortenerFactory.h"
#import "ORSTimelineCacheManager.h"

@interface ORSCanaryPreferences : NSObject {
NSUserDefaults *defaults;
ORSTwitterEngine *twitterEngine;
ORSTimelineCacheManager *cacheManager;
}

- (NSString *) receivedDMIDSinceLastExecution;
- (NSString *) statusIDSinceLastExecution;
- (BOOL) willRetrieveAllUpdates;
- (int) selectedURLShortener;
- (NSUInteger) maxShownUpdates;
- (float) timelineRefreshPeriod;
- (void) saveLastIDs;

@property (assign) ORSTwitterEngine *twitterEngine;
@property (assign) NSUserDefaults *defaults;
@property (assign) ORSTimelineCacheManager *cacheManager;

@end
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
//
// ORSPreferences.m
// ORSCanaryPreferences.m
// Canary
//
// Created by Νικόλαος Τουμπέλης on 08/06/2009.
// Copyright 2009 __MyCompanyName__. All rights reserved.
// Created by Nicholas Toumpelis on 08/06/2009.
// Copyright 2008-2009 Ocean Road Software, Nick Toumpelis.
//
// Version 0.7.1
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.

#import "ORSPreferences.h"
#import "ORSCanaryPreferences.h"

@implementation ORSPreferences
@implementation ORSCanaryPreferences

@synthesize defaults, twitterEngine, cacheManager;

Expand Down
32 changes: 0 additions & 32 deletions Classes/Controller/ORSPreferences.h

This file was deleted.

0 comments on commit 4a97570

Please sign in to comment.