Refactor use of pithos objects to accommodate

[pithos-macos] / pithos-macos / PithosPreferencesController.h

diff --git a/pithos-macos/PithosPreferencesController.h b/pithos-macos/PithosPreferencesController.h
index d48a39b..262e418 100644 (file)
--- a/pithos-macos/PithosPreferencesController.h
+++ b/pithos-macos/PithosPreferencesController.h
@@ -2,7 +2,7 @@
 //  PithosPreferencesController.h
 //  pithos-macos
 //
-// Copyright 2011-2012 GRNET S.A. All rights reserved.
+// Copyright 2011-2013 GRNET S.A. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or
 // without modification, are permitted provided that the following
@@ -42,60 +42,69 @@
 @interface PithosPreferencesController : NSWindowController <NSWindowDelegate, NSOutlineViewDataSource> {
     PithosAccount *selectedPithosAccount;
     
-    NSArrayController *accountsArrayController;
+    IBOutlet NSArrayController *accountsArrayController;
     
     BOOL accountRemoveEnable;
     
-    NSString *serverURL;
+    NSString *authURLString;
+    BOOL manual;
+    NSString *pithosObjectStoreURLString;
+    NSString *astakosAccountURLString;
+    NSString *astakosWebloginURLString;
     NSString *authUser;
     NSString *authToken;
-    BOOL manual;
-    BOOL loginEnable;
-    BOOL loginCancelEnable;
+    NSString *displayname;
+    BOOL ignoreSSLErrors;
+    BOOL retrieveTokenEnable;
+    BOOL authorizationSaveEnable;
+    BOOL authorizationCancelEnable;
     
     BOOL syncActive;
+    BOOL syncSkipHidden;
     NSString *syncDirectoryPath;
     NSMutableDictionary *syncAccountsDictionary;
     BOOL syncApplyEnable;
     BOOL syncCancelEnable;
-    NSOutlineView *syncAccountsOutlineView;
+    IBOutlet NSOutlineView *syncAccountsOutlineView;
     PithosEmptyNode *syncAccountsMyAccountNode;
     NSMutableDictionary *syncAccountsRootFilesNodes;
     
-    NSDictionaryController *groupsDictionaryController;
-    NSDictionaryController *selectedGroupMembersDictionaryController;
+    IBOutlet NSDictionaryController *groupsDictionaryController;
+    IBOutlet NSDictionaryController *selectedGroupMembersDictionaryController;
 }
 
-@property (nonatomic, retain) PithosAccount *selectedPithosAccount;
-
-@property (nonatomic, assign) IBOutlet NSArrayController *accountsArrayController;
+@property (nonatomic, strong) PithosAccount *selectedPithosAccount;
 
 @property (nonatomic, assign) BOOL accountRemoveEnable;
 
-@property (nonatomic, copy) NSString *serverURL;
+@property (nonatomic, copy) NSString *authURLString;
+@property (nonatomic, assign) BOOL manual;
+@property (nonatomic, copy) NSString *pithosObjectStoreURLString;
+@property (nonatomic, copy) NSString *astakosAccountURLString;
+@property (nonatomic, copy) NSString *astakosWebloginURLString;
 @property (nonatomic, copy) NSString *authUser;
 @property (nonatomic, copy) NSString *authToken;
-@property (nonatomic, assign) BOOL manual;
-@property (nonatomic, assign) BOOL loginEnable;
-@property (nonatomic, assign) BOOL loginCancelEnable;
+@property (nonatomic, copy) NSString *displayname;
+@property (nonatomic, assign) BOOL ignoreSSLErrors;
+@property (nonatomic, assign) BOOL retrieveTokenEnable;
+@property (nonatomic, assign) BOOL authorizationSaveEnable;
+@property (nonatomic, assign) BOOL authorizationCancelEnable;
 
 @property (nonatomic, assign) BOOL syncActive;
+@property (nonatomic, assign) BOOL syncSkipHidden;
 @property (nonatomic, copy) NSString *syncDirectoryPath;
 @property (nonatomic, copy) NSMutableDictionary *syncAccountsDictionary;
 @property (nonatomic, assign) BOOL syncApplyEnable;
 @property (nonatomic, assign) BOOL syncCancelEnable;
-@property (nonatomic, assign) IBOutlet NSOutlineView *syncAccountsOutlineView;
-@property (nonatomic, retain) NSMutableDictionary *syncAccountsRootFilesNodes;
-
-@property (nonatomic, assign) IBOutlet NSDictionaryController *groupsDictionaryController;
-@property (nonatomic, assign) IBOutlet NSDictionaryController *selectedGroupMembersDictionaryController;
+@property (nonatomic, strong) NSMutableDictionary *syncAccountsRootFilesNodes;
 
 //- (IBAction)toolbarItemSelected:(id)sender;
 
 - (IBAction)addAccount:(id)sender;
 - (IBAction)removeAccount:(id)sender;
-- (IBAction)login:(id)sender;
-- (IBAction)loginCancel:(id)sender;
+- (IBAction)retrieveToken:(id)sender;
+- (IBAction)authorizationSave:(id)sender;
+- (IBAction)authorizationCancel:(id)sender;
 - (IBAction)syncApply:(id)sender;
 - (IBAction)syncCancel:(id)sender;
 - (IBAction)syncRefresh:(id)sender;