Improve code and fix bugs

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

diff --git a/pithos-macos/PithosBrowserController.h b/pithos-macos/PithosBrowserController.h
index 3bef10a..2454f05 100644 (file)
--- a/pithos-macos/PithosBrowserController.h
+++ b/pithos-macos/PithosBrowserController.h
@@ -38,6 +38,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PithosActivityFacility.h"
 @class ASIPithos;
+@class PithosAccount;
 @class PithosNode;
 @class PithosAccountNode;
 @class PithosSharingAccountsNode;
@@ -51,6 +52,7 @@
     
     ASIPithos *pithos;
     
+    PithosAccount *__unsafe_unretained pithosAccountManager;
     PithosNode *rootNode;
     PithosAccountNode *accountNode;
     PithosEmptyNode *containersNode;
@@ -61,14 +63,14 @@
     
     NSViewController *sharedPreviewController;
     
-    NSSplitView *verticalSplitView;
-    NSSplitView *horizontalSplitView;
-    NSView *leftTopView;
-    NSView *leftBottomView;
-    NSOutlineView *outlineView;
-    NSBrowser *browser;
-    NSMenu *outlineViewMenu;
-    NSMenu *browserMenu;
+    IBOutlet NSSplitView *verticalSplitView;
+    IBOutlet NSSplitView *horizontalSplitView;
+    IBOutlet NSView *leftTopView;
+    IBOutlet NSView *leftBottomView;
+    IBOutlet NSOutlineView *outlineView;
+    IBOutlet NSBrowser *browser;
+    IBOutlet NSMenu *outlineViewMenu;
+    IBOutlet NSMenu *browserMenu;
     
     BOOL editingItem;
     
@@ -79,8 +81,8 @@
     PithosNode *clipboardParentNode;
     BOOL clipboardCopy;
     
-    NSTextField *activityTextField;
-    NSProgressIndicator *activityProgressIndicator;
+    IBOutlet NSTextField *activityTextField;
+    IBOutlet NSProgressIndicator *activityProgressIndicator;
     PithosActivityFacility *activityFacility;
     
     NSTimer *refreshTimer;
@@ -102,29 +104,18 @@
     NSOperationQueue *downloadCallbackQueue;
 }
 
-@property (nonatomic, retain) ASIPithos *pithos;
+@property (nonatomic, strong) ASIPithos *pithos;
 
-@property (nonatomic, retain) PithosAccountNode *accountNode;
+@property (nonatomic, unsafe_unretained) PithosAccount *pithosAccountManager;
+@property (nonatomic, strong) PithosAccountNode *accountNode;
 
-@property (nonatomic, assign) IBOutlet NSSplitView *verticalSplitView;
-@property (nonatomic, assign) IBOutlet NSSplitView *horizontalSplitView;
-@property (nonatomic, assign) IBOutlet NSView *leftTopView;
-@property (nonatomic, assign) IBOutlet NSView *leftBottomView;
-@property (nonatomic, assign) IBOutlet NSOutlineView *outlineView;
-@property (nonatomic, assign) IBOutlet NSBrowser *browser;
-@property (nonatomic, assign) IBOutlet NSMenu *outlineViewMenu;
-@property (nonatomic, assign) IBOutlet NSMenu *browserMenu;
+@property (nonatomic, strong) NSArray *draggedNodes;
+@property (nonatomic, strong) PithosNode *draggedParentNode;
 
-@property (nonatomic, retain) NSArray *draggedNodes;
-@property (nonatomic, retain) PithosNode *draggedParentNode;
-
-@property (nonatomic, retain) NSArray *clipboardNodes;
-@property (nonatomic, retain) PithosNode *clipboardParentNode;
+@property (nonatomic, strong) NSArray *clipboardNodes;
+@property (nonatomic, strong) PithosNode *clipboardParentNode;
 @property (nonatomic, assign) BOOL clipboardCopy;
 
-@property (nonatomic, assign) IBOutlet NSTextField *activityTextField;
-@property (nonatomic, assign) IBOutlet NSProgressIndicator *activityProgressIndicator;
-
 - (IBAction)forceRefresh:(id)sender;
 - (IBAction)refresh:(id)sender;
 - (void)resetBrowser;