[30442] users/rhwood/Pallet
source_changes at macosforge.org
source_changes at macosforge.org
Sat Oct 27 18:31:19 PDT 2007
Revision: 30442
http://trac.macosforge.org/projects/macports/changeset/30442
Author: rhwood at macports.org
Date: 2007-10-27 18:31:19 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
Pallet now displays the port state in the left-most column of its display.
Use constants from MacPorts/MPConstants instead of our own enum to know the port state.
Modified Paths:
--------------
users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib
users/rhwood/Pallet/English.lproj/MainMenu.nib/keyedobjects.nib
users/rhwood/Pallet/PAStatusTransformer.h
users/rhwood/Pallet/PAStatusTransformer.m
users/rhwood/Pallet/PortAuthority.m
Modified: users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib
===================================================================
--- users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib 2007-10-28 01:23:43 UTC (rev 30441)
+++ users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib 2007-10-28 01:31:19 UTC (rev 30442)
@@ -25,9 +25,8 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>29</integer>
<integer>568</integer>
- <integer>21</integer>
+ <integer>29</integer>
<integer>290</integer>
</array>
<key>IBSystem Version</key>
Modified: users/rhwood/Pallet/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: users/rhwood/Pallet/PAStatusTransformer.h
===================================================================
--- users/rhwood/Pallet/PAStatusTransformer.h 2007-10-28 01:23:43 UTC (rev 30441)
+++ users/rhwood/Pallet/PAStatusTransformer.h 2007-10-28 01:31:19 UTC (rev 30442)
@@ -8,14 +8,8 @@
#import <Foundation/Foundation.h>
#import "PortAuthority.h"
+#import <MacPorts/MPConstants.h>
-enum portStatuses {
- portStatusInstalled,
- portStatusActive,
- portStatusOutdated,
- portStatusUnknown
-};
-
@interface PAStatusTransformer : NSValueTransformer
{
}
Modified: users/rhwood/Pallet/PAStatusTransformer.m
===================================================================
--- users/rhwood/Pallet/PAStatusTransformer.m 2007-10-28 01:23:43 UTC (rev 30441)
+++ users/rhwood/Pallet/PAStatusTransformer.m 2007-10-28 01:31:19 UTC (rev 30442)
@@ -26,16 +26,17 @@
if (beforeObject == nil) return nil;
id resourcePath = [[NSBundle mainBundle] resourcePath];
switch ([beforeObject intValue]) {
- case portStatusUnknown:
+ case MPPortStateUnknown:
+ case MPPortStateNotInstalled:
return nil;
break;
- case portStatusActive:
+ case MPPortStateActive:
return [resourcePath stringByAppendingPathComponent:@"active.gif"];
break;
- case portStatusInstalled:
+ case MPPortStateInstalled:
return [resourcePath stringByAppendingPathComponent:@"installed.gif"];
break;
- case portStatusOutdated:
+ case MPPortStateOutdated:
return [resourcePath stringByAppendingPathComponent:@"outdated.gif"];
break;
}
Modified: users/rhwood/Pallet/PortAuthority.m
===================================================================
--- users/rhwood/Pallet/PortAuthority.m 2007-10-28 01:23:43 UTC (rev 30441)
+++ users/rhwood/Pallet/PortAuthority.m 2007-10-28 01:31:19 UTC (rev 30442)
@@ -45,8 +45,7 @@
- (void)awakeFromNib
{
// Get a MacPorts Interpeter
- macPorts = [[MPMacPorts alloc] init];
- NSLog([[macPorts search:@"goocanvas"] description]);
+ macPorts = [MPMacPorts sharedInstance];
// Load/set preferences/defaults
if (![[[NSUserDefaultsController sharedUserDefaultsController] values] valueForKey:@"synchronizePortsListOnStartup"]) {
NSString *userDefaultsValuesPath;
@@ -83,7 +82,10 @@
[[portsList cornerView] setMenu:portsListHeaderMenu];
// setup the displayed index
portsListIndex = [[NSMutableArray alloc] init];
- // TESTING TESTING TESTING
+ // START TESTING START TESTING START TESTING
+ NSLog([[[MPRegistery sharedRegistery] installed:@"nonesuch"] description]);
+ NSLog([[[MPRegistery sharedRegistery] installed:@"gtk2"] description]);
+ // END TESTING END TESTING END TESTING
}
/*
@@ -121,7 +123,9 @@
NSLog(@"%i items in the index.", [portsIndex count]);
[status setStringValue:@""];
[progressIndicator stopAnimation:nil];
- NSLog([[portsIndex valueForKey:@"goocanvas"] description]);
+ // START TESTING START TESTING START TESTING
+ NSLog([[portsIndex valueForKey:@"gtk2"] description]);
+ // END TESTING END TESTING END TESTING
}
/*
@@ -151,26 +155,27 @@
*/
{
id item;
- switch ([[item valueForKey:@"status"] intValue]) {
- case portStatusActive:
+ switch ([[item valueForKey:@"state"] intValue]) {
+ case MPPortStateActive:
[self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
@"uninstall",
@"-dv",
[item valueForKey:@"name"]]];
break;
- case portStatusInstalled:
+ case MPPortStateInstalled:
[self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
@"activate",
@"-dv",
[item valueForKey:@"name"]]];
break;
- case portStatusOutdated:
+ case MPPortStateOutdated:
[self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
@"upgrade",
@"-dv",
[item valueForKey:@"name"]]];
break;
- case portStatusUnknown:
+ case MPPortStateUnknown:
+ case MPPortStateNotInstalled:
[self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
@"install",
@"-dv",
@@ -284,12 +289,13 @@
- (void)updateAvailablePorts:(id)output
{
+ NSLog(output);
NSMutableArray *fields;
NSMutableDictionary *columns;
columns = [[NSMutableDictionary alloc] initWithCapacity:4];
fields = [[NSMutableArray alloc] initWithArray:[output componentsSeparatedByString:@" "]];
[fields removeObjectIdenticalTo:[NSString string]];
- [columns setValue:[NSNumber numberWithInt:portStatusUnknown] forKey:@"status"];
+ [columns setValue:[NSNumber numberWithInt:MPPortStateUnknown] forKey:@"state"];
[columns setValue:[fields objectAtIndex:0] forKey:@"name"];
[columns setValue:[fields objectAtIndex:1] forKey:@"version"];
[columns setValue:[fields objectAtIndex:2] forKey:@"categories"];
@@ -303,15 +309,15 @@
{
NSLog(@"request for row %@ column %@\n", [NSNumber numberWithInt:rowIndex], [aTableColumn identifier]);
NSParameterAssert(rowIndex >= 0 && rowIndex < [portsListIndex count]);
- if ([[[aTableColumn identifier] stringValue] isEqualToString:@"status"]) {
+ if ([[[aTableColumn identifier] stringValue] isEqualToString:@"state"]) {
switch ([[[portsListIndex objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]] intValue]) {
- case portStatusInstalled:
+ case MPPortStateInstalled:
return nil;
break;
- case portStatusActive:
+ case MPPortStateActive:
return nil;
break;
- case portStatusOutdated:
+ case MPPortStateOutdated:
return nil;
break;
default:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071027/434bc2a5/attachment.html
More information about the macports-changes
mailing list