0
@@ -8,6 +8,7 @@
0
             SUPERCLASS = NSProgressIndicator; 
0
         }, 
0
         {CLASS = HideableTextField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, 
0
+        {CLASS = PUImageList; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
0
         {
0
             ACTIONS = {
0
                 authenticate = id; 
0
@@ -29,20 +30,17 @@
0
             CLASS = UploadController; 
0
             LANGUAGE = ObjC; 
0
             OUTLETS = {
0
-                addFilesButton = NSButton; 
0
                 authWindow = NSWindow; 
0
                 categories = NSPopUpButton; 
0
                 dateTaken = NSTextField; 
0
                 description = NSTextField; 
0
-                fileCount = NSTextField; 
0
-                imgMatrix = DumpMatrix; 
0
+                imgStorage = id; 
0
                 keywords = NSTextField; 
0
                 password = NSSecureTextField; 
0
-                progressBar = HideableProgressIndicator; 
0
-                scroller = NSScrollView; 
0
+                progressBar = NSProgressIndicator; 
0
                 uploadButton = NSButton; 
0
                 uploadWindow = NSWindow; 
0
-                uploadingText = HideableTextField; 
0
+                uploadingText = NSTextField; 
0
                 url = NSTextField; 
0
                 username = NSTextField; 
0
             }; 

0
@@ -3,17 +3,16 @@
0
 <plist version="1.0">
0
 <dict>
0
   <key>IBDocumentLocation</key>
0
-	<string>2 4 356 240 0 0 1280 832 </string>
0
+	<string>1 7 356 240 0 0 1024 746 </string>
0
   <key>IBEditorPositions</key>
0
   <dict>
0
     <key>29</key>
0
-		<string>842 533 423 44 0 0 1280 832 </string>
0
+		<string>210 587 423 44 0 0 1024 746 </string>
0
   </dict>
0
   <key>IBFramework Version</key>
0
   <string>364.0</string>
0
   <key>IBOpenObjects</key>
0
   <array>
0
-		<integer>233</integer>
0
     <integer>21</integer>
0
     <integer>29</integer>
0
   </array>

0
@@ -7,6 +7,10 @@
0
   objects = {
0
     080E96DDFE201D6D7F000001 = {
0
       children = (
0
+				DA6AD92F07FA997D00E2D4EF,
0
+				DA6AD93007FA997D00E2D4EF,
0
+				DA6AD91907FA90A900E2D4EF,
0
+				DA6AD91A07FA90A900E2D4EF,
0
         F5601AF00353732F0109FEFA,
0
         F5601AF10353732F0109FEFA,
0
         F5601AF60353732F0109FEFA,
0
@@ -232,6 +236,62 @@
0
 //DA2
0
 //DA3
0
 //DA4
0
+		DA6AD91907FA90A900E2D4EF = {
0
+			fileEncoding = 4;
0
+			isa = PBXFileReference;
0
+			lastKnownFileType = sourcecode.c.h;
0
+			path = PUImage.h;
0
+			refType = 4;
0
+			sourceTree = "<group>";
0
+		};
0
+		DA6AD91A07FA90A900E2D4EF = {
0
+			fileEncoding = 4;
0
+			isa = PBXFileReference;
0
+			lastKnownFileType = sourcecode.c.objc;
0
+			path = PUImage.m;
0
+			refType = 4;
0
+			sourceTree = "<group>";
0
+		};
0
+		DA6AD91B07FA90A900E2D4EF = {
0
+			fileRef = DA6AD91907FA90A900E2D4EF;
0
+			isa = PBXBuildFile;
0
+			settings = {
0
+			};
0
+		};
0
+		DA6AD91C07FA90A900E2D4EF = {
0
+			fileRef = DA6AD91A07FA90A900E2D4EF;
0
+			isa = PBXBuildFile;
0
+			settings = {
0
+			};
0
+		};
0
+		DA6AD92F07FA997D00E2D4EF = {
0
+			fileEncoding = 4;
0
+			isa = PBXFileReference;
0
+			lastKnownFileType = sourcecode.c.h;
0
+			path = PUImageList.h;
0
+			refType = 4;
0
+			sourceTree = "<group>";
0
+		};
0
+		DA6AD93007FA997D00E2D4EF = {
0
+			fileEncoding = 4;
0
+			isa = PBXFileReference;
0
+			lastKnownFileType = sourcecode.c.objc;
0
+			path = PUImageList.m;
0
+			refType = 4;
0
+			sourceTree = "<group>";
0
+		};
0
+		DA6AD93107FA997D00E2D4EF = {
0
+			fileRef = DA6AD92F07FA997D00E2D4EF;
0
+			isa = PBXBuildFile;
0
+			settings = {
0
+			};
0
+		};
0
+		DA6AD93207FA997D00E2D4EF = {
0
+			fileRef = DA6AD93007FA997D00E2D4EF;
0
+			isa = PBXBuildFile;
0
+			settings = {
0
+			};
0
+		};
0
     DACD4B6207FA616E009C4765 = {
0
       buildPhases = (
0
         DACD4B6307FA616E009C4765,
0
@@ -291,6 +351,8 @@
0
         DACD4B6E07FA616E009C4765,
0
         DACD4B6F07FA616E009C4765,
0
         DACD4B7007FA616E009C4765,
0
+				DA6AD91B07FA90A900E2D4EF,
0
+				DA6AD93107FA997D00E2D4EF,
0
       );
0
       isa = PBXHeadersBuildPhase;
0
       runOnlyForDeploymentPostprocessing = 0;
0
@@ -417,6 +479,8 @@
0
         DACD4B8207FA616E009C4765,
0
         DACD4B8307FA616E009C4765,
0
         DACD4B8407FA616E009C4765,
0
+				DA6AD91C07FA90A900E2D4EF,
0
+				DA6AD93207FA997D00E2D4EF,
0
       );
0
       isa = PBXSourcesBuildPhase;
0
       runOnlyForDeploymentPostprocessing = 0;

0
@@ -14,23 +14,21 @@
0
 
0
 @interface UploadController : NSObject
0
 {
0
-    IBOutlet NSButton *addFilesButton;
0
     IBOutlet NSWindow *authWindow;
0
     IBOutlet NSPopUpButton *categories;
0
     IBOutlet NSTextField *dateTaken;
0
     IBOutlet NSTextField *description;
0
-    IBOutlet NSTextField *fileCount;
0
-    IBOutlet DumpMatrix *imgMatrix;
0
     IBOutlet NSTextField *keywords;
0
     IBOutlet NSSecureTextField *password;
0
     IBOutlet NSProgressIndicator *progressBar;
0
-    IBOutlet NSScrollView *scroller;
0
     IBOutlet NSButton *uploadButton;
0
     IBOutlet NSTextField *uploadingText;
0
     IBOutlet NSWindow *uploadWindow;
0
     IBOutlet NSTextField *url;
0
     IBOutlet NSTextField *username;
0
 
0
+	IBOutlet id imgStorage;
0
+
0
     NSUserDefaults *defaults;
0
 
0
     UploadParams *params;

0
@@ -6,6 +6,7 @@
0
 #import "UploadThread.h"
0
 #import "UploadParams.h"
0
 #import "SizeScaler.h"
0
+#import "PUImageList.h"
0
 
0
 @interface UploadController (Private)
0
 
0
@@ -123,13 +124,12 @@
0
         [description setStringValue: [batch description]];
0
         [keywords setStringValue: [batch keywords]];
0
 
0
-        [imgMatrix clear];
0
+        [imgStorage removeAllObjects];
0
         NSEnumerator *e=[[batch files] objectEnumerator];
0
         id object;
0
         while(object = [e nextObject]) {
0
-            [imgMatrix addFile: object];
0
+            [imgStorage addPath: object];
0
         }
0
-        [imgMatrix update];
0
     }
0
 }
0
 
0
@@ -144,7 +144,7 @@
0
     if(_batchController != nil && (kw == [_batchController window])) {
0
         [[_batchController imgMatrix] clear];
0
     } else {
0
-        [imgMatrix clear];
0
+        [imgStorage removeAllObjects];
0
     }
0
 }
0
 
0
@@ -154,7 +154,7 @@
0
     if(_batchController != nil && (kw == [_batchController window])) {
0
         [[_batchController imgMatrix] removeSelected];
0
     } else {
0
-        [imgMatrix removeSelected];
0
+        [imgStorage removeSelected];
0
     }
0
 }
0
 
0
@@ -178,24 +178,25 @@
0
         // This is what's displayed in the image box.
0
         int i=0;
0
         for(i=0; i<[files count]; i++) {
0
-            [imgMatrix addFile: [files objectAtIndex: i]];
0
+			[imgStorage addPath: [files objectAtIndex: i]];
0
         }
0
     }
0
-    [imgMatrix update];
0
 }
0
 
0
 - (IBAction)showFiles:(id)sender
0
 {
0
-    NSLog(@"Files:  %@\n", [imgMatrix files]);
0
+    NSLog(@"Files:  %@", imgStorage);
0
 }
0
 
0
 - (IBAction)showSelectedImages:(id)sender
0
 {
0
+	/*
0
     NSArray *a=[imgMatrix selectedCells];
0
     int i=0;
0
     for(i=0; i<[a count]; i++) {
0
         NSLog(@"Selected image:  %@\n", [[a objectAtIndex: i] image]);
0
     }
0
+	*/
0
 }
0
 
0
 - (IBAction)stopUpload:(id)sender
0
@@ -226,7 +227,7 @@
0
     
0
   Batch *batch=[[Batch alloc] init];
0
 
0
-    NSArray *files=[imgMatrix files];
0
+    NSArray *files=[imgStorage images];
0
     [batch setUrl: [url stringValue]];
0
     [batch setUsername: u];
0
     [batch setPassword: p];
0
@@ -263,7 +264,7 @@
0
                                          toTarget:ut withObject: params];
0
 
0
     [self setButtonAction: BUTTON_STOP];
0
-    [addFilesButton setEnabled: FALSE];
0
+    // [addFilesButton setEnabled: FALSE];
0
     [ut release];
0
 }
0
 
0
@@ -293,10 +294,10 @@
0
 
0
 - (void)updateProgressText
0
 {
0
-    if(currentFile <= [[imgMatrix files] count])
0
+    if(currentFile <= [imgStorage count])
0
     {
0
         NSString *msg=[NSString stringWithFormat:_str(@"UploadingText"),
0
-            currentFile, [[imgMatrix files] count]];
0
+            currentFile, [imgStorage count]];
0
         [uploadingText setStringValue: msg];
0
         [uploadingText displayIfNeeded];
0
     }
0
@@ -335,7 +336,7 @@
0
 -(void)uploadComplete
0
 {
0
     NSLog(@"Upload is complete.\n");
0
-    [addFilesButton setEnabled: TRUE];
0
+    // [addFilesButton setEnabled: TRUE];
0
     [uploadingText setHidden: TRUE];
0
     [progressBar setMinValue: 0];
0
     [progressBar setMaxValue: 0];
0
@@ -368,9 +369,11 @@
0
     // Fill in form entries with defaults
0
     [self dateToToday: self];
0
 
0
-    [imgMatrix clear];
0
+    [imgStorage removeAllObjects];
0
+	/*
0
     [imgMatrix registerForDraggedTypes:[NSArray arrayWithObjects:
0
         NSFilenamesPboardType, nil]];
0
+	*/
0
 
0
     [authWindow makeKeyAndOrderFront: self];    
0
 }

0
@@ -56,7 +56,7 @@
0
         NSLog(@"Uploading %@.", f);
0
 
0
         // Get the file data
0
-        NSData *myData = [[NSData alloc] initWithContentsOfFile:f];
0
+        NSData *myData = [[NSData alloc] initWithContentsOfFile:[f filename]];
0
         [dict setObject:myData forKey:@"image"];
0
 
0
     NSDictionary *argDict=[NSDictionary dictionaryWithObject:dict