Changeset 112

Timestamp:

02/06/08 19:40:17 (2 years ago)

Author:

mike

Message:

[fix] QDocumentTableViewController unified thumnailloading
[fix] QDocumentOpenGLView better Window updates
[fix] QApplicationController Memory Leak
[fix] QControlController Memory Leak

Location:

trunk

Files:

• English.lproj/QDocument.nib/info.nib (modified) (1 diff)
• English.lproj/QDocument.nib/keyedobjects.nib (modified) (previous)
• Q.xcodeproj/project.pbxproj (modified) (1 diff)
• QApplication/QApplicationController.m (modified) (2 diffs)
• QControl/QControlController.m (modified) (1 diff)
• QControl/QControlTableViewController.h (modified) (2 diffs)
• QControl/QControlTableViewController.m (modified) (6 diffs)
• QDocument/QDocumentOpenGLView.m (modified) (5 diffs)

trunk/English.lproj/QDocument.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>5</integer>
+                <integer>6</integer>
         </array>
         <key>IBSystem Version</key>

trunk/Q.xcodeproj/project.pbxproj

@@ -88 +88 @@
                         containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */;
                         proxyType = 1;
-                        remoteGlobalIDString = 2796F6680D58E9E8006DA3A0 /* qemu */;
+                        remoteGlobalIDString = 2796F6680D58E9E8006DA3A0;
                         remoteInfo = qemu;
                 };

trunk/QApplication/QApplicationController.m

@@ -25 +25 @@
 #import "QApplicationController.h"
 
-// #define QAPPLICATIONCONTROLLER_DEBUG 1
 
 
@@ -37 +36 @@
 
                 // preferences
-                [[NSUserDefaults standardUserDefaults] registerDefaults:[[NSDictionary alloc] initWithObjects:[NSArray arrayWithObjects:
+                [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:
                         [NSNumber numberWithBool:FALSE], // disable log to console
                         [NSNumber numberWithBool:TRUE], // yellow

trunk/QControl/QControlController.m

@@ -136 +136 @@
         // add knownVMs
         int i;
-        NSMutableArray *knownVMs = [[[qApplication userDefaults] objectForKey:@"knownVMs"] mutableCopy];
+        NSMutableArray *knownVMs = [[[[qApplication userDefaults] objectForKey:@"knownVMs"] mutableCopy] autorelease];
         for (i = [knownVMs count] - 1; i > -1; i--) {
                 // does it still exist?

trunk/QControl/QControlTableViewController.h

@@ -33 +33 @@
         IBOutlet QControlTableView *table;
         IBOutlet QControlController* qControl;
+        NSImage *shutdownImage;
         NSMutableArray *VMsImages;
         NSArray *cpuTypes;
@@ -38 +39 @@
 }
 - (void) tableDoubleClick:(id)sender;
+- (NSImage *) loadThumbnailForVM:(NSMutableDictionary *)VM;
 - (void) updateThumbnails:(id)sender;
 @end

trunk/QControl/QControlTableViewController.m

@@ -37 +37 @@
         if (super) {
         
+                // cache shutdown image
+                shutdownImage = [NSImage imageNamed: @"q_table_shutdown.png"];
+                [shutdownImage retain];
+        
                 // Listen to VM updates
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateThumbnails:) name:@"QVMStatusDidChange" object:nil];
@@ -49 +53 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self];
         [VMsImages release];
+        [shutdownImage release];
         [super dealloc];
 }
@@ -239 +244 @@
 
 #pragma mark create tumbnails
+- (NSImage *) loadThumbnailForVM:(NSMutableDictionary *)VM
+{
+        Q_DEBUG(@"loadThumbnailForVM");
+
+        NSImage *thumbnail;
+        NSImage *savedImage;
+
+        if ([[[VM objectForKey:@"PC Data"] objectForKey:@"state"] isEqual:@"saved"]) { // only return thumbnail for saved VMs
+                savedImage = [[[NSImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/QuickLook/Thumbnail.png", [[[VM objectForKey:@"Temporary"] objectForKey:@"URL"] path]]] autorelease];
+                if (savedImage) { // try screen.png
+                        thumbnail = [[[NSImage alloc] initWithSize:NSMakeSize(100.0,  75.0)] autorelease];
+                        [thumbnail lockFocus];
+                        [savedImage drawInRect:NSMakeRect(0.0, 0.0, 100.0, 75.0) fromRect:NSMakeRect(0.0, 0.0, [savedImage size].width, [savedImage size].height) operation:NSCompositeSourceOver fraction:1.0];
+                        [thumbnail unlockFocus];
+                        return thumbnail;
+                } else { // try old thumbnail.png
+                        savedImage = [[[NSImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/thumbnail.png", [[[VM objectForKey:@"Temporary"] objectForKey:@"URL"] path]]] autorelease];
+                        if (savedImage) {
+                                return savedImage;
+                        }
+                }
+        }
+        return shutdownImage;
+}
+
 - (void) updateThumbnails:(id)sender
 {
@@ -247 +277 @@
         QDocument *qDocument;
         NSImage *thumbnail;
-        NSImage *savedImage;
         
         updateAll = FALSE;
@@ -258 +287 @@
         }
     for (i = 0; i < [[qControl VMs] count]; i++ ) {
-
                 qDocument = [[NSDocumentController sharedDocumentController] documentForURL:[[[[qControl VMs] objectAtIndex:i] objectForKey:@"Temporary"] objectForKey:@"URL"]];
         if (qDocument) {
@@ -268 +296 @@
                                         [VMsImages replaceObjectAtIndex:i withObject:thumbnail];
                                         break;
+                                case QDocumentShutdown:
+                                        [VMsImages replaceObjectAtIndex:i withObject:shutdownImage];
+                                        break;
                                 default:
                                         if (updateAll) {
-                                                savedImage = [[[NSImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/QuickLook/Thumbnail.png", [[[[[qControl VMs] objectAtIndex:i] objectForKey:@"Temporary"] objectForKey:@"URL"] path]]] autorelease];
-                                                if (savedImage) {
-                                                        thumbnail = [[[NSImage alloc] initWithSize:NSMakeSize(100.0,  75.0)] autorelease];
-                                                        [thumbnail lockFocus];
-                                                        [savedImage drawInRect:NSMakeRect(0.0, 0.0, 100.0, 75.0) fromRect:NSMakeRect(0.0, 0.0, [savedImage size].width, [savedImage size].height) operation:NSCompositeSourceOver fraction:1.0];
-                                                        [thumbnail unlockFocus];
-                                                } else {
-                                                        [VMsImages addObject:[NSImage imageNamed: @"q_table_shutdown.png"]];
-                                                }
-                                                [VMsImages addObject:thumbnail];
+                                                [VMsImages addObject:[self loadThumbnailForVM:[[qControl VMs] objectAtIndex:i]]];
                                         }
                                         break;
                         }
         } else if (updateAll) {
-                        if ([[[[[qControl VMs] objectAtIndex:i] objectForKey:@"PC Data"] objectForKey:@"state"] isEqual:@"saved"]) {
-                                savedImage = [[[NSImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/QuickLook/Thumbnail.png", [[[[[qControl VMs] objectAtIndex:i] objectForKey:@"Temporary"] objectForKey:@"URL"] path]]] autorelease];
-                                if (savedImage) {
-                                        thumbnail = [[[NSImage alloc] initWithSize:NSMakeSize(100.0,  75.0)] autorelease];
-                                        [thumbnail lockFocus];
-                                        [savedImage drawInRect:NSMakeRect(0.0, 0.0, 100.0, 75.0) fromRect:NSMakeRect(0.0, 0.0, [savedImage size].width, [savedImage size].height) operation:NSCompositeSourceOver fraction:1.0];
-                                        [thumbnail unlockFocus];
-                                        [VMsImages addObject:thumbnail];
-                                } else { // no screen.png, try old thumbnail.png
-                                        savedImage = [[[NSImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/thumbnail.png", [[[[[qControl VMs] objectAtIndex:i] objectForKey:@"Temporary"] objectForKey:@"URL"] path]]] autorelease];
-                                        if (savedImage) {
-                                                [VMsImages addObject:savedImage];
-                                        } else { // no thumbnail, set shutdown
-                                                [VMsImages addObject:[NSImage imageNamed: @"q_table_shutdown.png"]];
-                                        }
-                                }
-                        } else { // set shutdown
-                                [VMsImages addObject:[NSImage imageNamed: @"q_table_shutdown.png"]];
-                        }
+                        [VMsImages addObject:[self loadThumbnailForVM:[[qControl VMs] objectAtIndex:i]]];
         }
     }

trunk/QDocument/QDocumentOpenGLView.m

@@ -263 +263 @@
         
         [[self openGLContext] makeCurrentContext];
-        [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
-    glViewport(0.0, 0.0, displayProperties.width, displayProperties.height);
+    glViewport([self bounds].origin.x, [self bounds].origin.y, [self bounds].size.width, [self bounds].size.height);
 }
 
@@ -344 +343 @@
                 textures[QDocumentOpenGLTextureScreen] = 1;
                 
-                //calculate the texure rect
+                // calculate the texure rect
                 NSRect clipRect;
                 clipRect = NSMakeRect(
@@ -354 +353 @@
                 unsigned char *startPointer = screenBuffer;
 
-                //adapt the drawRect to the textureRect
+                // adapt the drawRect to the textureRect
                 rect = NSMakeRect(
                         0.0, // we update the whole width, as QEMU in vga is always updating whole memory pages)
@@ -399 +398 @@
                 }
                 glEnd();
-                glDisable( GL_TEXTURE_RECTANGLE_ARB );
+                glDisable(GL_TEXTURE_RECTANGLE_ARB);
 
         } else {
@@ -662 +661 @@
         }
 
+        [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
+        [self display]; // apply the new rect
     [self update];
 }