Changeset 121 for trunk

Timestamp:

02/15/08 22:07:14 (2 years ago)

Author:

mike

Message:

[fix] QControlTableViewController moved VM path to tooltip
[fix] QControlTableViewController tableDoubleAction
[fix] QControlController searchscope fixed for Filevault
[fix] QControlController add dragged vms only once

Location:

trunk

Files:

• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• English.lproj/QDocument.nib/info.nib (modified) (1 diff)
• English.lproj/QDocument.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) (4 diffs)
• QDocument/QDocument.m (modified) (1 diff)
• QDocument/QDocumentEditVMController.h (modified) (3 diffs)
• QDocument/QDocumentEditVMController.m (modified) (5 diffs)
• QDocument/QDocumentOpenGLView.m (modified) (4 diffs)
• QDocument/QDocumentWindowController.m (modified) (2 diffs)
• changelog.txt (modified) (1 diff)

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>218</integer>
+                <integer>224</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>9B18</string>
+        <string>9C31</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>6</integer>
+                <integer>5</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>9B18</string>
+        <string>9C31</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>12</integer>
+                <integer>6</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>9B18</string>
+        <string>9C31</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

trunk/QControl/QControlController.m

@@ -78 +78 @@
         
         // search for qvms
-
         query = [[NSMetadataQuery alloc] init];
         [query setDelegate:self];
@@ -84 +83 @@
         predicate = [NSPredicate predicateWithFormat:@"kMDItemDisplayName ENDSWITH 'qvm'", nil];
     [query setPredicate:predicate];
-    [query setSearchScopes:[NSArray arrayWithObject:@"/Users/"]];
+    [query setSearchScopes:[NSArray arrayWithObject:NSMetadataQueryUserHomeScope]];
         [query startQuery];
 
-        
         // preferences
     if ([[qApplication userDefaults] boolForKey:@"SUCheckAtStartup"]) {
@@ -180 +178 @@
         NSMutableDictionary *tempVM = [[QQvmManager sharedQvmManager] loadVMConfiguration:path];
         if (tempVM) {
-                [knownVMs addObject:path];
-                [VMs addObject:tempVM];
-                [table reloadData];
-                [[qApplication userDefaults] setObject:knownVMs forKey:@"knownVMs"];
+                if (![knownVMs containsObject:path]) {
+                        [knownVMs addObject:path];
+                        [VMs addObject:tempVM];
+                        [table reloadData];
+                        [[qApplication userDefaults] setObject:knownVMs forKey:@"knownVMs"];
+                }
         }
 }

trunk/QControl/QControlTableViewController.m

@@ -63 +63 @@
         // set infos for microIcons
         [table setQControl:qControl];
+        [table setTarget:self];
+        [table setDoubleAction:@selector(tableDoubleClick:)];
 
         // loading initial Thumbnails
@@ -85 +87 @@
         NSString *name;
         NSString *path;
-        NSColor *color;
         QDocument *qDocument;
-        NSMutableParagraphStyle *paragraphStyle;
         NSMutableAttributedString *attrString;
 
@@ -135 +135 @@
                 name = [path lastPathComponent];
                 name = [name substringToIndex:[name length] - 4];
-                paragraphStyle = [[[NSMutableParagraphStyle alloc] init] autorelease];
-                
-                color = [NSColor colorWithDeviceRed:0.75 green:0.75 blue:0.75 alpha:1.0];
-                [paragraphStyle setLineBreakMode:NSLineBreakByTruncatingHead];
 
         attrString = [[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"%@\n", name] attributes:[NSDictionary dictionaryWithObject: [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]] forKey:NSFontAttributeName]] autorelease];
         [attrString appendAttributedString: [[[NSAttributedString alloc] initWithString:[NSString stringWithFormat: @"%@\n", state] attributes:[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]] forKey:NSFontAttributeName]] autorelease]];
-                [attrString appendAttributedString: [[[NSAttributedString alloc] initWithString:[NSString stringWithFormat: @"\n%@", [path stringByDeletingLastPathComponent]]  attributes:[NSDictionary dictionaryWithObjectsAndKeys: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]], NSFontAttributeName, paragraphStyle, NSParagraphStyleAttributeName, color, NSForegroundColorAttributeName, nil]] autorelease]];
 
         return attrString;
@@ -156 +151 @@
 {
         Q_DEBUG(@"toolTipForCell");
-
-    return [[[qControl VMs] objectAtIndex:rowIndex] objectForKey:@"Arguments"];
+        NSString *path;
+        
+        path = [[[[[qControl VMs] objectAtIndex:rowIndex] objectForKey:@"Temporary"] objectForKey:@"URL"] path];
+    return [NSString stringWithFormat:@"%@\n\n%@", [[[qControl VMs] objectAtIndex:rowIndex] objectForKey:@"Arguments"], [path stringByDeletingLastPathComponent]];
 }
 

trunk/QDocument/QDocument.m

@@ -185 +185 @@
     // Add any code here that needs to be executed once the windowController has loaded the document's window.
 
-//      [screenView updateSavedImage:self];
-
         // Tiger compatible custom butoonCell
         [buttonEdit setCell:[[[QButtonCell alloc] initImageCell:[[buttonEdit cell] image] buttonType:QButtonCellAlone target:[[buttonEdit cell] target] action:[[buttonEdit cell] action]] autorelease]];

trunk/QDocument/QDocumentEditVMController.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 
+typedef enum {
+   QDocumentEditVMMachinePc = 0,
+   QDocumentEditVMMachineIsapc = 1,
+   QDocumentEditVMMachineG3bw = 2,
+   QDocumentEditVMMachineMac99 = 3,
+   QDocumentEditVMMachinePrep = 4,
+   QDocumentEditVMMachineRef405ep = 5,
+   QDocumentEditVMMachineTaihu = 6,
+   QDocumentEditVMMachineSS2 = 7,
+   QDocumentEditVMMachineSS5 = 8,
+   QDocumentEditVMMachineSS10 = 9,
+   QDocumentEditVMMachineSS20 = 10,
+   QDocumentEditVMMachineSS600MP = 11,
+   QDocumentEditVMMachineSS1000 = 12,
+   QDocumentEditVMMachineSS2000 = 13,
+   QDocumentEditVMMachineMips = 14,
+   QDocumentEditVMMachineMalta = 15,
+   QDocumentEditVMMachinePica61 = 16,
+   QDocumentEditVMMachineMipssim = 17,
+   QDocumentEditVMMachineArm1 = 18,
+   QDocumentEditVMMachineArm2 = 19,
+   QDocumentEditVMMachineArm3 = 20,
+   QDocumentEditVMMachineArm4 = 21,
+   QDocumentEditVMMachineArm5 = 22,
+   QDocumentEditVMMachineArm6 = 23,
+   QDocumentEditVMMachineArm7 = 24,
+   QDocumentEditVMMachineM68k1 = 25,
+   QDocumentEditVMMachineM68k2 = 26,
+   QDocumentEditVMMachineCris = 27
+} QDocumentEditVMMachine;
+
 
 @interface QDocumentEditVMController : NSObject {
@@ -31 +62 @@
         id document;
         NSMutableDictionary *VM;
+        
+        // niccount
+        int niccount;
         
         // Panel
@@ -82 +116 @@
 
 - (void) resetPanel:(id)sender;
+- (void) setMachine:(QDocumentEditVMMachine)machine;
 - (BOOL) setOption:(NSString *)key withArgument:(NSString *)argument;
 - (void) populatePanel:(id)sender;

trunk/QDocument/QDocumentEditVMController.m

@@ -86 +86 @@
         [M selectItemAtIndex:0];
         [cpu selectItemAtIndex:0];
-        [smp setStringValue:@"0"];
+        [smp setStringValue:@"1"];
         [m setStringValue:@"128"]; // 128
         [vga selectItemAtIndex:0];
@@ -115 +115 @@
 }
 
+- (void) setMachine:(QDocumentEditVMMachine)machine
+{
+        // here, we show the items available for this machine
+}
+
 - (BOOL)setOption:(NSString *)key withArgument:(NSString *)argument
 {
@@ -123 +128 @@
                 [grabless setState:NSOffState];
                 return TRUE;
-
-        // Q Windows driver TODO: add second CD ROM
-//      } else if ([key isEqual:@"-usb"] && [argument isEqual:@"tablet"]) {
-//              [grabless setState:NSOffState];
-//              return TRUE;
-
+/*
+        // TODO: see if we can add a second CD ROM with the drivers, else make floppy
+        // Q Windows driver
+        } else if ([key isEqual:@"-usb"] && [argument isEqual:@"tablet"]) {
+                [grabless setState:NSOffState];
+                return TRUE;
+*/
         // -smb
         } else if ([key isEqual:@"-smb"]) {
@@ -138 +144 @@
         }
                 return TRUE;
+        
+        // TODO: add other machines
+        // select machine
+        } else if ([key isEqual:@"-M"]) {
+        if ([argument isEqual:@"pc"]) {
+            [M selectItemAtIndex:1];
+                        [self setMachine:QDocumentEditVMMachinePc];
+        } else if ([argument isEqual:@"isapc"]) {
+            [M selectItemAtIndex:2];
+                        [self setMachine:QDocumentEditVMMachineIsapc];
+        }
+                return TRUE;
+
+        // TODO: if we have other machines, we must make shure the correct machine is selected
+        // select cpu
+        } else if ([key isEqual:@"-cpu"]) {
+        if ([argument isEqual:@"qemu32"]) {
+            [cpu selectItemAtIndex:0];
+        } else if ([argument isEqual:@"486"]) {
+            [cpu selectItemAtIndex:1];
+        } else if ([argument isEqual:@"pentium"]) {
+            [cpu selectItemAtIndex:2];
+        } else if ([argument isEqual:@"pentium2"]) {
+            [cpu selectItemAtIndex:3];
+        } else if ([argument isEqual:@"pentium3"]) {
+            [cpu selectItemAtIndex:4];
+        }
+                return TRUE;
+
+        // smp
+        } else if ([key isEqual:@"-smp"]) {
+                [smp setStringValue:argument];
+                return TRUE;
                 
-        } else if ([key isEqual:@"-M"]) {
-        if ([argument isEqual:@""]) {
-            [smb selectItemAtIndex:1];
-        } else {
-            [smb insertItemWithTitle:[NSString stringWithString:argument] atIndex:2];
-            [smb selectItemAtIndex:2];
-        }
-
-                return TRUE;
+        // m
+        } else if ([key isEqual:@"-m"]) {
+                [m setStringValue:argument];
+                return TRUE;            
+
+        // graphicscards
+        } else if ([key isEqual:@"-std-vga"]) {
+                [vga selectItemAtIndex:1];
+                return true;
+        } else if ([key isEqual:@"-vmwarevga"]) {
+                [vga selectItemAtIndex:2];
+                return true;
+                
+        // soundcards
+        } else if ([key isEqual:@"-soundhw"]) {
+                if ([argument rangeOfString:@"pcspk"].location != NSNotFound)
+                        [pcspk setState:NSOnState];
+                if ([argument rangeOfString:@"adlib"].location != NSNotFound)
+                        [adlib setState:NSOnState];
+                if ([argument rangeOfString:@"sb16"].location != NSNotFound)
+                        [sb16 setState:NSOnState];
+                if ([argument rangeOfString:@"es1370"].location != NSNotFound)
+                        [es1370 setState:NSOnState];
+                return true;
+        
+        // networkcards
+        } else if ([key isEqual:@"-nic"]) {
+                // we can only handle the first to nics with the gui
+                niccount++;
+                id nicModel;
+                if (niccount == 1) {
+                        nicModel = nicModel1;
+                } else if (niccount == 2) {
+                        nicModel = nicModel1;
+                } else {
+                        return false;
+                }
+        if ([argument isEqual:@"i82551"]) {
+            [nicModel selectItemAtIndex:1];
+        } else if ([argument isEqual:@"i82557b"]) {
+            [nicModel selectItemAtIndex:2];
+        } else if ([argument isEqual:@"i82559er"]) {
+            [nicModel selectItemAtIndex:3];
+        } else if ([argument isEqual:@"ne2k_pci"]) {
+            [nicModel selectItemAtIndex:4];
+        } else if ([argument isEqual:@"ne2k_isa"]) {
+            [nicModel selectItemAtIndex:5];
+        } else if ([argument isEqual:@"rtl8139"]) {
+            [nicModel selectItemAtIndex:6];
+        } else if ([argument isEqual:@"smc91c111"]) {
+            [nicModel selectItemAtIndex:7];
+        } else if ([argument isEqual:@"lance"]) {
+            [nicModel selectItemAtIndex:8];
+        } else if ([argument isEqual:@"mcf_fec"]) {
+            [nicModel selectItemAtIndex:9];
+        }
+                return TRUE;
+
+        // fda
+        // TODO:
+        
+        // cdrom
+        // TODO:
+        
+        // hda
+        // TODO:
+        
+        // hdb
+        // TODO:
+        
+        // hdc
+        // TODO:
+        
+        // hdd
+        // TODO:
+        
+        // boot
+        } else if ([key isEqual:@"-boot"]) {
+        if ([argument isEqual:@"a"]) {
+            [boot selectItemAtIndex:0];
+        } else if ([argument isEqual:@"c"]) {
+            [boot selectItemAtIndex:1];
+        } else if ([argument isEqual:@"d"]) {
+            [boot selectItemAtIndex:2];
+        } else if ([argument isEqual:@"n"]) {
+            [boot selectItemAtIndex:3];
+        }
+                return TRUE;
+        
+        // localtime
+        } else if ([key isEqual:@"-localtime"]) {
+                [localtime setState:NSOnState];
+                return true;
+        
+        // win2khack
+        } else if ([key isEqual:@"-win2khack"]) {
+                [win2kHack setState:NSOnState];
+                return true;
+        
+        // kernel
+        // TODO:
+        
+        // append
+        } else if ([key isEqual:@"-append"]) {
+                [append setStringValue:argument];
+                return TRUE;
+        
+        // initrd
+        // TODO:
 
         }
@@ -160 +299 @@
         NSMutableString *optionalArguments;
         NSString *key;
+        
+        niccount = 0;
 
         optionalArguments = [NSMutableString stringWithString:@""];

trunk/QDocument/QDocumentOpenGLView.m

@@ -662 +662 @@
         displayProperties.x = ([[NSScreen mainScreen] frame].size.width - displayProperties.width) / 2.0;
         displayProperties.y = ([[NSScreen mainScreen] frame].size.height - displayProperties.height) / 2.0;
+                [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
         } else {
                 displayProperties.dx = rect.size.width / (float)screenProperties.width;
@@ -671 +672 @@
         }
 
-        [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
+//      [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
         [self display]; // apply the new rect
     [self update];
@@ -747 +748 @@
         [fullScreenWindow close];
         [[normalWindow contentView] addSubview:self];
+        [self setContentDimensionsForFrame:NSMakeRect(0.0, 0.0, screenProperties.width * displayProperties.zoom, screenProperties.height * displayProperties.zoom)];
+                [self setFrame:NSMakeRect(displayProperties.x, displayProperties.y, displayProperties.width, displayProperties.height)];
         [normalWindow makeKeyAndOrderFront: self];
         [NSMenu setMenuBarVisible:YES];
-        [self setContentDimensionsForFrame:NSMakeRect(0.0, 0.0, screenProperties.width * displayProperties.zoom, screenProperties.height * displayProperties.zoom)];
 
     } else {
@@ -816 +818 @@
 
     // keep Window in correct aspect ratio
-    [normalWindow setMaxSize:NSMakeSize(normalWindowSize.width, normalWindowSize.height)];
-    [normalWindow setAspectRatio:NSMakeSize(normalWindowSize.width, normalWindowSize.height)];
-
+    [normalWindow setMaxSize:NSMakeSize(screenProperties.width, screenProperties.height + TITLE_BAR_HEIGHT + ICON_BAR_HEIGHT)];
+//      [normalWindow setAspectRatio:NSMakeSize(screenProperties.width, screenProperties.height + TITLE_BAR_HEIGHT + ICON_BAR_HEIGHT)];
+//      [normalWindow setResizeIncrements:NSMakeSize(10,10)];
     // update windows
     if (isFullscreen) {

trunk/QDocument/QDocumentWindowController.m

@@ -84 +84 @@
     return proposedFrameSize;
 }
-
+/*
 - (void)windowDidResize:(NSNotification *)notification
 {
@@ -90 +90 @@
 
         if (![screenView isFullscreen]) {
+                // update zoom
+                [screenView displayPropertiesSetZoom:([window frame].size.width / (float)[screenView screenProperties].width)];
+        
                 [screenView setContentDimensionsForFrame:NSMakeRect(0, 0, [window frame].size.width, [window frame].size.height - TITLE_BAR_HEIGHT - ICON_BAR_HEIGHT)];
+                [screenView reshape];
         }
 }
+*/
+
 @end

trunk/changelog.txt

@@ +1 @@
+121
+[fix] QControlTableViewController moved VM path to tooltip
+[fix] QControlTableViewController tableDoubleAction
+[fix] QControlController searchscope fixed for Filevault
+[fix] QControlController add dragged vms only once
+
 120
 [fix] QControlController adapted for smartfolder