Changeset 120 for trunk

Timestamp:

02/11/08 10:17:18 (2 years ago)

Author:

mike

Message:

[fix] QControlController adapted for smartfolder
[fix] QControlTableView adapted for smartfolder
[fix] QControlTableViewController adapted for smartfolder
[fix] QDocument adapted for smartfolder

Location:

trunk

Files:

• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• QControl/QControlController.m (modified) (2 diffs)
• QControl/QControlTableView.m (modified) (10 diffs)
• QControl/QControlTableViewController.m (modified) (1 diff)
• QDocument/QDocument.m (modified) (2 diffs)
• changelog.txt (modified) (1 diff)

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

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

trunk/QControl/QControlController.m

@@ -120 +120 @@
 
 #pragma mark configurations
+NSInteger revCaseInsensitiveCompare(id string1, id string2, void *context)
+
+{
+    return [[string2 lastPathComponent] caseInsensitiveCompare:[string1 lastPathComponent] ];
+}
+
 
 
@@ -126 +132 @@
         Q_DEBUG(@"loadConfigurations");
         
+        NSMutableDictionary *tempVM;
+        NSMutableArray *knownVMs;
+
     if (VMs)
         [VMs release];
-
-    VMs = [[NSMutableArray alloc] init];
-        NSMutableDictionary *tempVM;
-
-        // add knownVMs
+        VMs =[[NSMutableArray alloc] init];
+        
+        // check knownVMs
         int i;
-        NSMutableArray *knownVMs = [[[[qApplication userDefaults] objectForKey:@"knownVMs"] mutableCopy] autorelease];
+        knownVMs = [[[[qApplication userDefaults] objectForKey:@"knownVMs"] mutableCopy] autorelease];
+        [knownVMs sortUsingFunction:revCaseInsensitiveCompare context:nil];
         for (i = [knownVMs count] - 1; i > -1; i--) {
-                // does it still exist?
-        NSFileManager *fileManager = [NSFileManager defaultManager];
-        if ([fileManager fileExistsAtPath:[knownVMs objectAtIndex:i]]) {
-                        tempVM = [[QQvmManager sharedQvmManager] loadVMConfiguration:[knownVMs objectAtIndex:i]];
-                        if (tempVM) {
-                                [VMs addObject:tempVM];
-                        } else {
-                                [knownVMs removeObjectAtIndex:i];
-                        }
+                tempVM = [[QQvmManager sharedQvmManager] loadVMConfiguration:[knownVMs objectAtIndex:i]];
+                if (tempVM) {
+                        [VMs addObject:tempVM];
                 } else {
                         [knownVMs removeObjectAtIndex:i];

trunk/QControl/QControlTableView.m

@@ -31 +31 @@
 #define ICON_WIDTH 9.0
 #define ICON_HEIGHT 9.0
-#define ICON_X 45.0
+#define ICON_X 3.0
 #define ICON_Y 31.0
+#define ICON_SPACE 2.0
 
 @implementation QControlTableView
@@ -65 +66 @@
     NSRect cellRect = [self frameOfCellAtColumn:1 row:row];
     
-    for (i = 1; i < 5; i++) {
+    for (i = 0; i < 4; i++) {
         if (NSPointInRect(pointClicked, NSMakeRect(
-            cellRect.origin.x + cellRect.size.width - i * (ICON_WIDTH + 4),
-            cellRect.origin.y + cellRect.size.height - ICON_HEIGHT - 4,
+            cellRect.origin.x + ICON_X + i * (ICON_WIDTH),
+            cellRect.origin.y + ICON_Y,
             ICON_WIDTH,
             ICON_HEIGHT
@@ -74 +75 @@
             VM = [[qControl VMs] objectAtIndex:row];
             switch (i) {
-                case 1: // delete
-                    if ([[[VM objectForKey:@"PC Data"] objectForKey:@"state"] isEqual:@"shutdown"])
-                        clicked = TRUE;
+                case 0: // edit
+                    clicked = TRUE;
+                break;
+                case 1: // play/pause
+                    clicked = TRUE;
                 break;
                 case 2: // stop
@@ -82 +85 @@
                         clicked = TRUE;
                 break;
-                case 3: // play/pause
-                    clicked = TRUE;
-                break;
-                case 4: // edit
-                    clicked = TRUE;
+                case 3: // delete
+                    if ([[[VM objectForKey:@"PC Data"] objectForKey:@"state"] isEqual:@"shutdown"])
+                        clicked = TRUE;
                 break;
             }
@@ -118 +119 @@
         document = [[NSDocumentController sharedDocumentController] documentForURL:[[VM objectForKey:@"Temporary"] objectForKey:@"URL"]];
         
-    for (i = 1; i < 5; i++) {
+    for (i = 0; i < 4; i++) {
         if (NSPointInRect(pointClicked, NSMakeRect(
-            cellRect.origin.x + cellRect.size.width - i * (ICON_WIDTH + 4),
-            cellRect.origin.y + cellRect.size.height - ICON_HEIGHT - 4,
+            cellRect.origin.x + ICON_X + i * (ICON_WIDTH + ICON_SPACE),
+            cellRect.origin.y + ICON_Y,
             ICON_WIDTH,
             ICON_HEIGHT
         ))) {
             switch (i) {
-                case 1: // delete
-                    if (!document) // only allow if VM is not open
-                        [qControl deleteVM:VM];
-                                        break;
-                case 2: // stop
-                    if (document) {
-                                                if (([document VMState]==QDocumentRunning)||([document VMState]==QDocumentPaused)) {
-                                                        [document VMShutDown:self];
-                                                }
-                                        }
-                                        break;
-                case 3: // play/pause
+                case 0: // edit
+                    [qControl editVM:VM];
+                break;
+                case 1: // play/pause
                                         if (document) {
                                                 switch ([document VMState]) {
@@ -155 +148 @@
                                         }
                                         break;
-                case 4: // edit
-                    [qControl editVM:VM];
-                break;
+                case 2: // stop
+                    if (document) {
+                                                if (([document VMState]==QDocumentRunning)||([document VMState]==QDocumentPaused)) {
+                                                        [document VMShutDown:self];
+                                                }
+                                        }
+                                        break;
+                case 3: // delete
+                    if (!document) // only allow if VM is not open
+                        [qControl deleteVM:VM];
+                                        break;
             }
         }
@@ -191 +192 @@
         
         // edit icon
-        point = NSMakePoint(cellRect.origin.x + ICON_X + (ICON_WIDTH + 4), cellRect.origin.y + ICON_Y);
+        point = NSMakePoint(cellRect.origin.x + ICON_X, cellRect.origin.y + ICON_Y);
         if (NSPointInRect(pointClicked, NSMakeRect(point.x, point.y, ICON_WIDTH, ICON_HEIGHT))) {
             qFraction = 1.0;
@@ -215 +216 @@
 
         // play/pause icon
-        point = NSMakePoint(cellRect.origin.x + ICON_X + 2 * (ICON_WIDTH + 4), cellRect.origin.y + ICON_Y);
+        point = NSMakePoint(cellRect.origin.x + ICON_X + (ICON_WIDTH + ICON_SPACE), cellRect.origin.y + ICON_Y);
         if (NSPointInRect(pointClicked, NSMakeRect(point.x, point.y, ICON_WIDTH, ICON_HEIGHT))) {
             qFraction = 1.0;
@@ -252 +253 @@
 
         // stop icon
-        point = NSMakePoint(cellRect.origin.x + ICON_X + 3 * (ICON_WIDTH + 4), cellRect.origin.y + ICON_Y);
+        point = NSMakePoint(cellRect.origin.x + ICON_X + 2 * (ICON_WIDTH + ICON_SPACE), cellRect.origin.y + ICON_Y);
         if (NSPointInRect(pointClicked, NSMakeRect(point.x, point.y, ICON_WIDTH, ICON_HEIGHT))) {
             qFraction = 1.0;
@@ -276 +277 @@
         
         // delete icon
-        point = NSMakePoint(cellRect.origin.x + ICON_X + 4 * (ICON_WIDTH + 4), cellRect.origin.y + ICON_Y);
+        point = NSMakePoint(cellRect.origin.x + ICON_X + 3 * (ICON_WIDTH + ICON_SPACE), cellRect.origin.y + ICON_Y);
         if (NSPointInRect(pointClicked, NSMakeRect(point.x, point.y, ICON_WIDTH, ICON_HEIGHT)))
             qFraction = 1.0;

trunk/QControl/QControlTableViewController.m

@@ -137 +137 @@
                 paragraphStyle = [[[NSMutableParagraphStyle alloc] init] autorelease];
                 
-                color = [NSColor colorWithDeviceRed:0.5 green:0.5 blue:0.5 alpha:1.0];
+                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", [path stringByDeletingLastPathComponent]]  attributes:[NSDictionary dictionaryWithObjectsAndKeys: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]], NSFontAttributeName, paragraphStyle, NSParagraphStyleAttributeName, color, NSForegroundColorAttributeName, nil]] autorelease]];
-        [attrString appendAttributedString: [[[NSAttributedString alloc] initWithString:state attributes:[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:[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;

trunk/QDocument/QDocument.m

@@ -270 +270 @@
         
                         // 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"];
-                                }
+                        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"];
                         }
                         
@@ -293 +291 @@
                 [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];
+                [savePanel beginSheetForDirectory:nil 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"];

trunk/changelog.txt

@@ +1 @@
+120
+[fix] QControlController adapted for smartfolder
+[fix] QControlTableView adapted for smartfolder
+[fix] QControlTableViewController adapted for smartfolder
+[fix] QDocument adapted for smartfolder
+
 119
-[new] smartfolder for Q Control (get rid of default folder)
+[new] smartfolder for Q Control (ie. show all qvm files using spotlight - get rid of default folder)
 
 118