Minor UI changes.

Minor fixes.

diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m
index f5d2738..c1dd936 100644 (file)
--- a/pithos-macos/PithosBrowserController.m
+++ b/pithos-macos/PithosBrowserController.m
@@ -135,16 +135,38 @@
     self.outlineViewDataSourceArray = nil;
     
     // Create the outlineView tree
-       NSTreeNode *treeNode = [NSTreeNode treeNodeWithRepresentedObject:
+    // CONTAINERS
+       NSTreeNode *containersTreeNode = [NSTreeNode treeNodeWithRepresentedObject:
                             [[[PithosEmptyNode alloc] initWithDisplayName:@"CONTAINERS" icon:nil] autorelease]];
-       [[treeNode mutableChildNodes] addObject:
+    // CONTAINERS/pithos
+       [[containersTreeNode mutableChildNodes] addObject:
      [NSTreeNode treeNodeWithRepresentedObject:
-      [[[PithosContainerNode alloc] initWithContainerName:@"pithos"] autorelease]]];
-       [[treeNode mutableChildNodes] addObject:
+      [[[PithosContainerNode alloc] initWithContainerName:@"pithos" 
+                                                     icon:[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kToolbarHomeIcon)]
+        ] autorelease]]];
+    // CONTAINERS/trash
+       [[containersTreeNode mutableChildNodes] addObject:
      [NSTreeNode treeNodeWithRepresentedObject:
-      [[[PithosContainerNode alloc] initWithContainerName:@"trash"] autorelease]]];
+      [[[PithosContainerNode alloc] initWithContainerName:@"trash"
+                                                     icon:[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kFullTrashIcon)]
+        ] autorelease]]];
+    // SHARED
+       NSTreeNode *sharedTreeNode = [NSTreeNode treeNodeWithRepresentedObject:
+                                      [[[PithosEmptyNode alloc] initWithDisplayName:@"SHARED" icon:nil] autorelease]];
+    // SHARED/my shared
+       [[sharedTreeNode mutableChildNodes] addObject:
+     [NSTreeNode treeNodeWithRepresentedObject:
+      [[[PithosEmptyNode alloc] initWithDisplayName:@"my shared" 
+                                               icon:[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)]
+        ] autorelease]]];
+    // SHARED/others shared
+       [[sharedTreeNode mutableChildNodes] addObject:
+     [NSTreeNode treeNodeWithRepresentedObject:
+      [[[PithosEmptyNode alloc] initWithDisplayName:@"others shared"
+                                               icon:[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGuestUserIcon)]
+        ] autorelease]]];
     
-    self.outlineViewDataSourceArray = [NSMutableArray arrayWithObject:treeNode];
+    self.outlineViewDataSourceArray = [NSMutableArray arrayWithObjects:containersTreeNode, sharedTreeNode, nil];
     
        // Expand the folder outline view
     [outlineView expandItem:nil expandChildren:YES];
@@ -200,8 +222,7 @@
     
     NSLog(@"Authentication - storageURLPrefix:%@, authUser:%@, authToken:%@", storageURLPrefix, authUser, authToken);
     if ([authUser length] && [authToken length]) {
-    //if (authUser && ([authUser length] > 0) && authToken && ([authToken length] > 0)) {
-        [ASIPithosRequest setStorageURL:[storageURLPrefix stringByAppendingString:authUser]];
+        [ASIPithosRequest setStorageURL:[storageURLPrefix stringByAppendingString:[authUser stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
         [ASIPithosRequest setAuthToken:authToken];
         [self resetContainers];
     } else {
@@ -283,6 +304,15 @@
     return sharedPreviewController;
 }
 
+//- (CGFloat)browser:(NSBrowser *)browser shouldSizeColumn:(NSInteger)columnIndex forUserResize:(BOOL)forUserResize toWidth:(CGFloat)suggestedWidth  {
+//    if (!forUserResize) {
+//        id item = [browser parentForItemsInColumn:columnIndex]; 
+//        if ([self browser:browser isLeafItem:item]) {
+//            suggestedWidth = 200; 
+//        }
+//    }
+//    return suggestedWidth;
+//}
 
 #pragma mark -
 #pragma NSSplitViewDelegate

diff --git a/pithos-macos/PithosBrowserController.xib b/pithos-macos/PithosBrowserController.xib
index d9e2794..7477f57 100644 (file)
--- a/pithos-macos/PithosBrowserController.xib
+++ b/pithos-macos/PithosBrowserController.xib
@@ -486,7 +486,7 @@
                                                                                <object class="NSBrowser" id="259981942">
                                                                                        <reference key="NSNextResponder" ref="987905504"/>
                                                                                        <int key="NSvFlags">4370</int>
-                                                                                       <string key="NSFrameSize">{509, 422}</string>
+                                                                                       <string key="NSFrame">{{-1, -1}, {511, 402}}</string>
                                                                                        <reference key="NSSuperview" ref="987905504"/>
                                                                                        <reference key="NSWindow"/>
                                                                                        <reference key="NSNextKeyView"/>
@@ -507,7 +507,7 @@
                                                                                        <int key="NSColumnResizingType">2</int>
                                                                                        <double key="NSPreferedColumnWidth">170</double>
                                                                                        <bool key="NSAllowsTypeSelect">YES</bool>
-                                                                                       <int key="NSBrFlags">469843968</int>
+                                                                                       <int key="NSBrFlags">134299648</int>
                                                                                        <double key="NSBrowserRowHeight">17</double>
                                                                                </object>
                                                                        </object>
@@ -739,7 +739,7 @@
                                                        <object class="NSButtonCell" key="NSCell" id="682735888">
                                                                <int key="NSCellFlags">67239424</int>
                                                                <int key="NSCellFlags2">0</int>
-                                                               <string key="NSContents">Check</string>
+                                                               <string key="NSContents"/>
                                                                <reference key="NSSupport" ref="957255455"/>
                                                                <reference key="NSControlView" ref="543810542"/>
                                                                <int key="NSButtonFlags">1211912703</int>

diff --git a/pithos-macos/PithosBrowserPreviewController.xib b/pithos-macos/PithosBrowserPreviewController.xib
index f807ddc..8479596 100644 (file)
--- a/pithos-macos/PithosBrowserPreviewController.xib
+++ b/pithos-macos/PithosBrowserPreviewController.xib
@@ -52,7 +52,7 @@
                                        <object class="NSButton" id="241278852">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">269</int>
-                                               <string key="NSFrame">{{59, 8}, {82, 19}}</string>
+                                               <string key="NSFrame">{{59, 18}, {82, 19}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView"/>
@@ -61,9 +61,9 @@
                                                        <int key="NSCellFlags">-2080244224</int>
                                                        <int key="NSCellFlags2">134217728</int>
                                                        <string key="NSContents">More info...</string>
-                                                       <object class="NSFont" key="NSSupport">
+                                                       <object class="NSFont" key="NSSupport" id="611945789">
                                                                <string key="NSName">LucidaGrande</string>
-                                                               <double key="NSSize">12</double>
+                                                               <double key="NSSize">11</double>
                                                                <int key="NSfFlags">16</int>
                                                        </object>
                                                        <reference key="NSControlView" ref="241278852"/>
@@ -78,7 +78,7 @@
                                        <object class="NSTextField" id="361683768">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 35}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 45}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="711438167"/>
@@ -117,7 +117,7 @@
                                        <object class="NSTextField" id="779495175">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 57}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 61}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="348582496"/>
@@ -136,7 +136,7 @@
                                        <object class="NSTextField" id="130674256">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 79}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 77}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="490957876"/>
@@ -155,7 +155,7 @@
                                        <object class="NSTextField" id="363250715">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 101}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 93}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="458298377"/>
@@ -174,7 +174,7 @@
                                        <object class="NSTextField" id="261591603">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 123}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 109}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="933584688"/>
@@ -193,7 +193,7 @@
                                        <object class="NSTextField" id="774296355">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{1, 145}, {98, 14}}</string>
+                                               <string key="NSFrame">{{1, 125}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="183377333"/>
@@ -212,7 +212,7 @@
                                        <object class="NSTextField" id="711438167">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 35}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 45}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="241278852"/>
@@ -221,11 +221,7 @@
                                                        <int key="NSCellFlags">67239488</int>
                                                        <int key="NSCellFlags2">4196352</int>
                                                        <string key="NSContents">Version</string>
-                                                       <object class="NSFont" key="NSSupport" id="611945789">
-                                                               <string key="NSName">LucidaGrande</string>
-                                                               <double key="NSSize">11</double>
-                                                               <int key="NSfFlags">16</int>
-                                                       </object>
+                                                       <reference key="NSSupport" ref="611945789"/>
                                                        <reference key="NSControlView" ref="711438167"/>
                                                        <reference key="NSBackgroundColor" ref="363018318"/>
                                                        <object class="NSColor" key="NSTextColor" id="320633288">
@@ -242,7 +238,7 @@
                                        <object class="NSTextField" id="348582496">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 57}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 61}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="361683768"/>
@@ -260,7 +256,7 @@
                                        <object class="NSTextField" id="490957876">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 79}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 77}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="779495175"/>
@@ -278,7 +274,7 @@
                                        <object class="NSTextField" id="458298377">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 101}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 93}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="130674256"/>
@@ -296,7 +292,7 @@
                                        <object class="NSTextField" id="933584688">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 123}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 109}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="363250715"/>
@@ -314,7 +310,7 @@
                                        <object class="NSTextField" id="183377333">
                                                <reference key="NSNextResponder" ref="1005"/>
                                                <int key="NSvFlags">271</int>
-                                               <string key="NSFrame">{{101, 145}, {98, 14}}</string>
+                                               <string key="NSFrame">{{101, 125}, {98, 14}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="261591603"/>
@@ -344,7 +340,7 @@
                                                                <string>NeXT TIFF v4.0 pasteboard type</string>
                                                        </object>
                                                </object>
-                                               <string key="NSFrame">{{36, 167}, {128, 128}}</string>
+                                               <string key="NSFrame">{{36, 147}, {128, 128}}</string>
                                                <reference key="NSSuperview" ref="1005"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="774296355"/>
@@ -359,33 +355,11 @@
                                                </object>
                                                <bool key="NSEditable">YES</bool>
                                        </object>
-                                       <object class="NSTextField" id="547561616">
-                                               <reference key="NSNextResponder" ref="1005"/>
-                                               <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{17, 303}, {56, 17}}</string>
-                                               <reference key="NSSuperview" ref="1005"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="501039666"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSTextFieldCell" key="NSCell" id="876025049">
-                                                       <int key="NSCellFlags">68288064</int>
-                                                       <int key="NSCellFlags2">272630784</int>
-                                                       <string key="NSContents">Preview:</string>
-                                                       <object class="NSFont" key="NSSupport">
-                                                               <string key="NSName">LucidaGrande</string>
-                                                               <double key="NSSize">13</double>
-                                                               <int key="NSfFlags">1044</int>
-                                                       </object>
-                                                       <reference key="NSControlView" ref="547561616"/>
-                                                       <reference key="NSBackgroundColor" ref="363018318"/>
-                                                       <reference key="NSTextColor" ref="320633288"/>
-                                               </object>
-                                       </object>
                                </object>
-                               <string key="NSFrameSize">{200, 330}</string>
+                               <string key="NSFrameSize">{200, 295}</string>
                                <reference key="NSSuperview"/>
                                <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="547561616"/>
+                               <reference key="NSNextKeyView" ref="501039666"/>
                                <string key="NSClassName">NSView</string>
                        </object>
                        <object class="NSUserDefaultsController" id="684261592">
@@ -548,21 +522,20 @@
                                                <reference key="object" ref="1005"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="501039666"/>
-                                                       <reference ref="547561616"/>
-                                                       <reference ref="183377333"/>
                                                        <reference ref="933584688"/>
                                                        <reference ref="363250715"/>
                                                        <reference ref="130674256"/>
                                                        <reference ref="779495175"/>
                                                        <reference ref="361683768"/>
-                                                       <reference ref="774296355"/>
-                                                       <reference ref="261591603"/>
                                                        <reference ref="458298377"/>
                                                        <reference ref="490957876"/>
                                                        <reference ref="348582496"/>
-                                                       <reference ref="241278852"/>
                                                        <reference ref="711438167"/>
+                                                       <reference ref="501039666"/>
+                                                       <reference ref="183377333"/>
+                                                       <reference ref="774296355"/>
+                                                       <reference ref="261591603"/>
+                                                       <reference ref="241278852"/>
                                                </object>
                                                <reference key="parent" ref="0"/>
                                        </object>
@@ -587,20 +560,6 @@
                                                <reference key="parent" ref="501039666"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">25</int>
-                                               <reference key="object" ref="547561616"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="876025049"/>
-                                               </object>
-                                               <reference key="parent" ref="1005"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">26</int>
-                                               <reference key="object" ref="876025049"/>
-                                               <reference key="parent" ref="547561616"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">29</int>
                                                <reference key="object" ref="183377333"/>
                                                <object class="NSMutableArray" key="children">
@@ -808,8 +767,6 @@
                                        <string>1.editorWindowContentRectSynchronizationRect</string>
                                        <string>20.IBPluginDependency</string>
                                        <string>21.IBPluginDependency</string>
-                                       <string>25.IBPluginDependency</string>
-                                       <string>26.IBPluginDependency</string>
                                        <string>27.IBPluginDependency</string>
                                        <string>28.IBPluginDependency</string>
                                        <string>29.IBPluginDependency</string>
@@ -873,8 +830,6 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -889,7 +844,7 @@
                                <reference key="dict.values" ref="0"/>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">75</int>
+                       <int key="maxID">76</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>

diff --git a/pithos-macos/PithosContainerNode.h b/pithos-macos/PithosContainerNode.h
index 1798280..1a3cb57 100644 (file)
--- a/pithos-macos/PithosContainerNode.h
+++ b/pithos-macos/PithosContainerNode.h
@@ -49,6 +49,8 @@
 }
 
 - (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer;
+- (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer icon:(NSImage *)anIcon;
 - (id)initWithContainerName:(NSString *)aContainerName;
+- (id)initWithContainerName:(NSString *)aContainerName icon:(NSImage *)anIcon;
 
 @end

diff --git a/pithos-macos/PithosContainerNode.m b/pithos-macos/PithosContainerNode.m
index bfa527c..8e94ddb 100644 (file)
--- a/pithos-macos/PithosContainerNode.m
+++ b/pithos-macos/PithosContainerNode.m
@@ -42,31 +42,41 @@
 #import "ASIPithosObject.h"
 #import "ASIDownloadCache.h"
 
-static NSImage *icon = nil;
+static NSImage *classIcon = nil;
 
 @implementation PithosContainerNode
 
 + (void)initialize {
        if (self == [PithosContainerNode class])
-        icon = [[NSImage imageNamed:@"container"] retain];
+        classIcon = [[NSImage imageNamed:@"container"] retain];
 }
 
 #pragma mark -
 #pragma mark Object Lifecycle
 
-- (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer {
+- (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer icon:(NSImage *)anIcon {
     if ((self = [super init])) {
         pithosContainer = [aPithosContainer retain];
         refreshing = NO;
         prefix = nil;
+        
+        icon = [anIcon retain];
     }
     return self;
 }
 
-- (id)initWithContainerName:(NSString *)aContainerName {
+- (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer {
+    return [self initWithPithosContainer:aPithosContainer icon:nil];
+}
+
+- (id)initWithContainerName:(NSString *)aContainerName icon:(NSImage *)anIcon {
     ASIPithosContainer *container = [ASIPithosContainer container];
     container.name = aContainerName;
-    return [self initWithPithosContainer:container];
+    return [self initWithPithosContainer:container icon:anIcon];
+}
+
+- (id)initWithContainerName:(NSString *)aContainerName {
+    return [self initWithContainerName:aContainerName icon:nil];
 }
 
 - (void)dealloc {
@@ -189,7 +199,9 @@ static NSImage *icon = nil;
 }
 
 - (NSImage *)icon {
-    return icon;
+    if (icon)
+        return icon;
+    return classIcon;
 }
 
 @end

diff --git a/pithos-macos/PithosEmptyNode.h b/pithos-macos/PithosEmptyNode.h
index 6c5b489..90f62a2 100644 (file)
--- a/pithos-macos/PithosEmptyNode.h
+++ b/pithos-macos/PithosEmptyNode.h
@@ -38,7 +38,6 @@
 #import "PithosNode.h"
 
 @interface PithosEmptyNode : PithosNode {
-    NSImage *icon;
 }
 
 - (id)initWithDisplayName:(NSString *)aDisplayName icon:(NSImage *)anIcon;

diff --git a/pithos-macos/PithosEmptyNode.m b/pithos-macos/PithosEmptyNode.m
index aa537eb..928562a 100644 (file)
--- a/pithos-macos/PithosEmptyNode.m
+++ b/pithos-macos/PithosEmptyNode.m
@@ -47,13 +47,12 @@
         displayName = [aDisplayName copy];
         icon = [anIcon retain];
         
-        isLeafItem = YES;
+//        isLeafItem = YES;
     }
     return self;
 }
 
 - (void)dealloc {
-    [icon release];
     [super dealloc];
 }
 

diff --git a/pithos-macos/PithosNode.h b/pithos-macos/PithosNode.h
index 8440a3f..8889561 100644 (file)
--- a/pithos-macos/PithosNode.h
+++ b/pithos-macos/PithosNode.h
@@ -44,6 +44,8 @@
     
     NSString *displayName;
     BOOL isLeafItem;
+    
+    NSImage *icon;
 }
 
 @property(readonly) NSString *url;

diff --git a/pithos-macos/PithosNode.m b/pithos-macos/PithosNode.m
index 344a5c3..bc1cc4e 100644 (file)
--- a/pithos-macos/PithosNode.m
+++ b/pithos-macos/PithosNode.m
@@ -53,6 +53,7 @@
 }
 
 - (void)dealloc {
+    [icon release];
     [displayName release];
     [previousChildren release];
     [children release];

diff --git a/pithos-macos/PithosObjectNode.h b/pithos-macos/PithosObjectNode.h
index 6bdb3e7..f51f68d 100644 (file)
--- a/pithos-macos/PithosObjectNode.h
+++ b/pithos-macos/PithosObjectNode.h
@@ -42,8 +42,6 @@
 @interface PithosObjectNode : PithosNode {
     ASIPithosContainer *pithosContainer;
     ASIPithosObject *pithosObject;
-    
-    NSImage *icon;
 }
 
 - (id)initWithPithosContainer:(ASIPithosContainer *)aPithosContainer pithosObject:(ASIPithosObject *)aPithosObject;

diff --git a/pithos-macos/PithosObjectNode.m b/pithos-macos/PithosObjectNode.m
index 490881e..8cd4774 100644 (file)
--- a/pithos-macos/PithosObjectNode.m
+++ b/pithos-macos/PithosObjectNode.m
@@ -53,7 +53,6 @@
 }
 
 - (void)dealloc {
-    [icon release];
     [pithosObject release];
     [pithosContainer release];
     [super dealloc];
@@ -83,9 +82,8 @@
 }
 
 - (NSImage *)icon {
-    if (icon == nil) {
+    if (icon == nil)
         icon = [[[NSWorkspace sharedWorkspace] iconForFileType:[pithosObject.name pathExtension]] retain];
-    }
     return icon;
 }
 

diff --git a/pithos-macos/PithosSubdirNode.m b/pithos-macos/PithosSubdirNode.m
index 78be1f2..058c996 100644 (file)
--- a/pithos-macos/PithosSubdirNode.m
+++ b/pithos-macos/PithosSubdirNode.m
@@ -38,14 +38,13 @@
 #import "PithosSubdirNode.h"
 #import "ASIPithosRequest.h"
 
-static NSImage *icon = nil;
+static NSImage *classIcon = nil;
 
 @implementation PithosSubdirNode
 
 + (void)initialize {
        if (self == [PithosSubdirNode class])
-        // XXX this should point to something we know has the proper icon, maybe something in then app bundle
-        icon = [[[NSWorkspace sharedWorkspace] iconForFile:@"/private/"] retain];
+        classIcon = [[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGenericFolderIcon)] retain];
 }
 
 #pragma mark -
@@ -80,7 +79,9 @@ static NSImage *icon = nil;
 }
 
 - (NSImage *)icon {
-    return icon;
+    if (icon)
+        return icon;
+    return classIcon;
 }
 
 @end

diff --git a/pithos-macos/pithos_macosAppDelegate.m b/pithos-macos/pithos_macosAppDelegate.m
index e734bc4..42d731e 100644 (file)
--- a/pithos-macos/pithos_macosAppDelegate.m
+++ b/pithos-macos/pithos_macosAppDelegate.m
@@ -66,9 +66,11 @@
         NSRange userEndRange = [query rangeOfString:@"&" options:NSCaseInsensitiveSearch 
                                               range:NSMakeRange(authUserStartLocation, [query length] - authUserStartLocation)];
         if (userEndRange.length) {
-            authUser = [query substringWithRange:NSMakeRange(authUserStartLocation, userEndRange.location - authUserStartLocation)];
+            authUser = [[query substringWithRange:NSMakeRange(authUserStartLocation, userEndRange.location - authUserStartLocation)]
+                        stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         } else {
-            authUser = [query substringFromIndex:authUserStartLocation];
+            authUser = [[query substringFromIndex:authUserStartLocation]
+                        stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         }
         // token=
         NSString *authToken;
@@ -80,9 +82,11 @@
         NSRange tokenEndRange = [query rangeOfString:@"&" options:NSCaseInsensitiveSearch 
                                               range:NSMakeRange(authTokenStartLocation, [query length] - authTokenStartLocation)];
         if (tokenEndRange.length) {
-            authToken = [query substringWithRange:NSMakeRange(authTokenStartLocation, tokenEndRange.location - authTokenStartLocation)];
+            authToken = [[query substringWithRange:NSMakeRange(authTokenStartLocation, tokenEndRange.location - authTokenStartLocation)]
+                         stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         } else {
-            authToken = [query substringFromIndex:authTokenStartLocation];
+            authToken = [[query substringFromIndex:authTokenStartLocation]
+                         stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         }
         NSLog(@"query authUser: '%@', authToken: '%@'", authUser, authToken);
         [pithosBrowserController authenticateFromURLWithAuthUser:authUser authToken:authToken];