Changeset 116

Timestamp:

02/07/08 03:44:15 (2 years ago)

Author:

mike

Message:

[new] smaller antialiased thumbnails
[new] VM name is taken from filename
[fix] Q Browser resizable

Location:

trunk

Files:

• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• English.lproj/QEditVM.nib/info.nib (modified) (1 diff)
• English.lproj/QEditVM.nib/keyedobjects.nib (modified) (previous)
• QControl/QControlController.m (modified) (3 diffs)
• QControl/QControlTableViewController.m (modified) (3 diffs)
• QDocument/QDocument.m (modified) (3 diffs)
• QDocument/QDocumentEditVMController.h (modified) (1 diff)
• QDocument/QDocumentEditVMController.m (modified) (2 diffs)
• QDocument/QDocumentOpenGLView.m (modified) (1 diff)
• QShared/QQvmManager.m (modified) (2 diffs)

trunk/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>216</integer>
+                <integer>221</integer>
         </array>
         <key>IBSystem Version</key>

trunk/English.lproj/QEditVM.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>10</integer>
+                <integer>12</integer>
         </array>
         <key>IBSystem Version</key>

trunk/QControl/QControlController.m

@@ -256 +256 @@
     if (create) {
         while ( (object = [enumerator nextObject]) ) {
-            if ([[[object objectForKey:@"PC Data"] objectForKey:@"name"] isEqual: name] )
+            if ([[[object objectForKey:@"Temporary"] objectForKey:@"name"] isEqual: name] )
                 return 0;
         }
     } else {
         while ( (object = [enumerator nextObject]) ) {
-            if ([[[object objectForKey:@"PC Data"] objectForKey:@"name"] isEqual: name]) {
-                if ( ![[[thisPC objectForKey:@"PC Data"] objectForKey:@"name"] isEqual:name])
+            if ([[[object objectForKey:@"Temporary"] objectForKey:@"name"] isEqual: name]) {
+                if ( ![[[thisPC objectForKey:@"Temporary"] objectForKey:@"name"] isEqual:name])
                     return 0;
             }
@@ -293 +293 @@
         // do not allow deleting a running VM
     if ([[[VM objectForKey:@"PC Data"] objectForKey:@"state"] isEqual:@"running"]) {
-        [self standardAlert: [NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:standardAlert", @"Localizable", @"QControlController"),[[VM objectForKey:@"PC Data"] objectForKey:@"name"]]
-             informativeText: [NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:informativeText", @"Localizable", @"QControlController"), [[VM objectForKey:@"PC Data"] objectForKey:@"name"]]];
+        [self standardAlert: [NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:standardAlert", @"Localizable", @"QControlController"),[[VM objectForKey:@"Temporary"] objectForKey:@"name"]]
+             informativeText: [NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:informativeText", @"Localizable", @"QControlController"), [[VM objectForKey:@"Temporary"] objectForKey:@"name"]]];
         return;
     }
@@ -303 +303 @@
                     alternateButton: NSLocalizedStringFromTable(@"deleteVM:alternateButton", @"Localizable", @"QControlController")
                         otherButton:nil
-                  informativeTextWithFormat:[NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:informativeTextWithFormat", @"Localizable", @"QControlController"),[[VM objectForKey:@"PC Data"] objectForKey:@"name"]]];
+                  informativeTextWithFormat:[NSString stringWithFormat: NSLocalizedStringFromTable(@"deleteVM:informativeTextWithFormat", @"Localizable", @"QControlController"),[[VM objectForKey:@"Temporary"] objectForKey:@"name"]]];
     
     // display alert

trunk/QControl/QControlTableViewController.m

@@ -145 +145 @@
         }
         
-        NSMutableAttributedString *attrString = [[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"%@\n", [[VM objectForKey:@"Temporary"] objectForKey:@"name"]] attributes:[NSDictionary dictionaryWithObject: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]] forKey:NSFontAttributeName]] autorelease];
+        NSMutableAttributedString *attrString = [[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"%@\n", [[[[VM objectForKey:@"Temporary"] objectForKey:@"URL"] path] lastPathComponent]] attributes:[NSDictionary dictionaryWithObject: [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]] forKey:NSFontAttributeName]] autorelease];
         [attrString appendAttributedString: [[[NSAttributedString alloc] initWithString:state attributes:[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]] forKey:NSFontAttributeName]] autorelease]];
         
@@ -254 +254 @@
                 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 = [[[NSImage alloc] initWithSize:NSMakeSize(80.0,  60.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];
+                        [savedImage drawInRect:NSMakeRect(0.0, 0.0, 80.0, 60.0) fromRect:NSMakeRect(0.0, 0.0, [savedImage size].width, [savedImage size].height) operation:NSCompositeSourceOver fraction:1.0];
                         [thumbnail unlockFocus];
                         return thumbnail;
@@ -293 +293 @@
                                 case QDocumentRunning:
                                 case QDocumentSaving:
-                                        thumbnail = [(QDocumentOpenGLView *)[qDocument screenView] screenshot:NSMakeSize(100.0, 75.0)];
+                                        thumbnail = [(QDocumentOpenGLView *)[qDocument screenView] screenshot:NSMakeSize(80.0, 60.0)];
                                         [VMsImages replaceObjectAtIndex:i withObject:thumbnail];
                                         break;

trunk/QDocument/QDocument.m

@@ -240 +240 @@
 - (IBAction) newDocument:(id)sender
 {
+        Q_DEBUG(@"saveDocument");
+
+        // Todo:
+        // either create a "new document" (immediately create the files) or show a assistent
+        // the -name argument is created by the document name
+
     NSLog(@"We should create a now Document now");
 }
@@ -246 +252 @@
 {
         Q_DEBUG(@"saveDocument");
+        
+        // Todo:
+        // implement saving as following:
+        // if VM is shutdown/saved:
+        //     - save the .qvm package with the save name
+        //     - save configuration.plist
+        // if the VM is running
+        //     - save a snapshot
 
     [distributedObject setCommand:'W' arg1:0 arg2:0 arg3:0 arg4:0];
@@ -253 +267 @@
 {
         Q_DEBUG(@"revertDocumentToSaved");
+        
+        // Todo
+        // only revert running machines
 
     [distributedObject setCommand:'X' arg1:0 arg2:0 arg3:0 arg4:0];

trunk/QDocument/QDocumentEditVMController.h

@@ -38 +38 @@
         
         // Tab 1
-        IBOutlet NSTextField *vMName;
         IBOutlet NSButton *grabless;
         IBOutlet NSButton *qDrivers;

trunk/QDocument/QDocumentEditVMController.m

@@ -78 +78 @@
         
         // Tab 1
-        [vMName setStringValue:@""];
         [grabless setState:NSOffState];
         [qDrivers setState:NSOffState];
@@ -120 +119 @@
         Q_DEBUG(@"setOption:%@ withArgument:%@", key, argument);
         
-        // -name TODO: convert -name from 0.2.0.Q profile
-        if ([key isEqual:@"-name"]) {
-                [vMName setStringValue:argument];
-                return TRUE;
-
         // grabless (-usbdevice tablet)
-        } else if ([key isEqual:@"-usbdevice"] && [argument isEqual:@"tablet"]) {
+        if ([key isEqual:@"-usbdevice"] && [argument isEqual:@"tablet"]) {
                 [grabless setState:NSOffState];
                 return TRUE;

trunk/QDocument/QDocumentOpenGLView.m

@@ -574 +574 @@
         // setup CG
         CGContextRef viewContextRef = [[NSGraphicsContext currentContext] graphicsPort];
-        CGContextSetInterpolationQuality (viewContextRef, kCGInterpolationNone);
-        CGContextSetShouldAntialias (viewContextRef, NO);
+        CGContextSetInterpolationQuality (viewContextRef, kCGInterpolationLow);
+        CGContextSetShouldAntialias (viewContextRef, YES);
 
         // draw screen bitmap directly to Core Graphics context

trunk/QShared/QQvmManager.m

@@ -66 +66 @@
         Q_DEBUG(@"saveVMConfiguration %@", VM);
 
-        //NSURL *URL;
-        //URL = [[[VM objectForKey:@"Temporary"] objectForKey:@"URL"] copy];
-        //[[VM objectForKey:@"Temporary"] removeObjectForKey:@"URL"]; // can't be stored in Propertylist
-
         NSMutableDictionary *temporary;
 
         temporary = [[VM objectForKey:@"Temporary"] copy];
+        [temporary autorelease];
         [VM removeObjectForKey:@"Temporary"]; // don't store temporary items (URL can't be stored in Propertylist anyways)
-        
 
     NSData *data = [NSPropertyListSerialization
@@ -188 +184 @@
                 // exploded arguments
                 [[tempVM objectForKey:@"Temporary"] setObject:[[QQvmManager sharedQvmManager] explodeVMArguments:[tempVM objectForKey:@"Arguments"]] forKey:@"explodedArguments"];
-                
-                // name
-                nameIndex = [[[tempVM objectForKey:@"Temporary"] objectForKey:@"explodedArguments"] indexOfObject:@"-name"];
-                if (nameIndex == NSNotFound) {
-                        name = @"Unknown";
-                        NSLog(@"name: %@", name);
-                } else {
-                        name = [[[tempVM objectForKey:@"Temporary"] objectForKey:@"explodedArguments"] objectAtIndex:(nameIndex + 1)];
-                }
-                [[tempVM objectForKey:@"Temporary"] setObject:name forKey:@"name"];
-                
+
                 // url
                 [[tempVM objectForKey:@"Temporary"] setObject:[NSURL fileURLWithPath:filename] forKey:@"URL"];