Changeset 118

Timestamp:

02/07/08 11:11:47 (1 year ago)

Author:

mike

Message:

[new] QDocument savepanel while saving
[new] QDocument loadpanel while reverting
[new] QDocument saveAs
[fix] QControlController memory leak

Files:

• trunk/QControl/QControlController.m (modified) (1 diff)
• trunk/QDocument/QDocument.m (modified) (3 diffs)
• trunk/QShared/QPopUpButtonCell.m (modified) (1 diff)
• trunk/qemu/patches/cocoa.m (modified) (1 diff)

trunk/QControl/QControlController.m

@@ -123 +123 @@
-        [VMs release];
-
-[NSMutableArray alloc] init] retain
+NSMutableArray alloc] init
-    NSString *qvmFile;
-        NSMutableDictionary *tempVM;

trunk/QDocument/QDocument.m

@@ -161 +161 @@
-    if (driveFileNames)
-                [driveFileNames release];
+        if (configuration)
+                [configuration release];
-    if([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"/tmp/qDocument_%D.vga", uniqueDocumentID]])
-        [[NSFileManager defaultManager] removeFileAtPath:[NSString stringWithFormat:@"/tmp/qDocument_%D.vga", uniqueDocumentID] handler: nil];
@@ -251 +253 @@
-}
-
+- (void)savePanelDidEnd:(NSOpenPanel *)panel returnCode:(int)returnCode  contextInfo:(void  *)contextInfo
+{
+        Q_DEBUG(@"savePanelDidEnd");
+
+        NSFileManager *fileManager;
+        NSMutableArray *knownVMs;
+
+    if (returnCode == NSOKButton) {
+
+                fileManager = [NSFileManager defaultManager];
+                
+                // move untitled Document to named document
+                if ([fileManager movePath:[[[configuration objectForKey:@"Temporary"] objectForKey:@"URL"] path] toPath:[panel filename] handler:nil]) {
+                        [[configuration objectForKey:@"Temporary"] setObject:[panel URL] forKey:@"URL"];
+                        [self setFileURL:[panel URL]];
+        
+                        // if outside default path, add to knownVNs
+                        if (![[[panel filename] stringByDeletingLastPathComponent] isEqual:[[qApplication userDefaults] objectForKey:@"dataPath"]]) {
+                                if (![[[qApplication userDefaults] objectForKey:@"knownVMs"] containsObject:[panel filename]]) {
+                                        knownVMs = [[[[qApplication userDefaults] objectForKey:@"knownVMs"] mutableCopy] autorelease];
+                                        [knownVMs addObject:[panel filename]];
+                                        [[qApplication userDefaults] setObject:knownVMs forKey:@"knownVMs"];
+                                }
+                        }
+                        
+                        [[NSNotificationCenter defaultCenter] postNotificationName:@"QVMStatusDidChange" object:nil]; //communicate new state
+                } else {
+                        [self defaultAlertMessage:@"Could not save %@" informativeText:[NSString stringWithFormat:@"There was an error while saving %@", [self displayName],  [self displayName]]];
+                }
+    }
+}
+
+- (IBAction)saveDocumentAs:(id)sender
+{
+        Q_DEBUG(@"saveDocumentAs");
+
+        if (VMState == QDocumentShutdown || VMState == QDocumentSaved) {        
+                NSSavePanel *savePanel = [NSSavePanel savePanel];
+                [savePanel setAllowedFileTypes:[NSArray arrayWithObject:@"qvm"]];
+                [savePanel setCanSelectHiddenExtension:YES];
+                [savePanel beginSheetForDirectory:[[qApplication userDefaults] objectForKey:@"dataPath"] file:[self displayName] modalForWindow:[screenView window] modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil];
+        } else {
+                [self defaultAlertMessage:@"VM is running" informativeText:@"Please shutdown the VM before saving the VM to a new Name"];
+        }
+}
+
-- (IBAction) saveDocument:(id)sender
-{
-        Q_DEBUG(@"saveDocument");
-        
-
-// implement saving as following:
-// if VM is shutdown/saved:
-
-    - save configuration.plis
-// if the VM is running
-//     - save a snapshot
-
-
+ Document was not yet saved with a proper name, we call a savepanel and move the VM
+if (VMState == QDocumentShutdown || VMState == QDocumentSaved) {
+       [self saveDocumentAs:self];
+
+if the VM is running, we make a snapsho
+} else if (VMState == QDocumentPaused || VMState == QDocumentRunning) {
+       [self setVMState:QDocumentSaving];
+
+
-}
-
@@ -270 +318 @@
-        Q_DEBUG(@"revertDocumentToSaved");
-        
-// Todo
-// only revert running machines
-
-
+if (VMState == QDocumentPaused || VMState == QDocumentRunning) {
+       [self setVMState:QDocumentLoading];
+
+
-}
-

trunk/QShared/QPopUpButtonCell.m

@@ -52 +52 @@
-- (void) dealloc
-{
-        [image release];
-        [imageNormal release];
-        [super dealloc];

trunk/qemu/patches/cocoa.m

@@ -397 +397 @@
-                break;
-            case 'W': // save VM
+                                savedVm_running = FALSE;
-                do_savevm([@"kju_saved" cString]);
-                break;
-            case 'X': // revert to previous saved state
+                                savedVm_running = FALSE;
-                if (vm_running)
-                    vm_stop(0);