<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[30442] users/rhwood/Pallet</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/30442">30442</a></dd>
<dt>Author</dt> <dd>rhwood@macports.org</dd>
<dt>Date</dt> <dd>2007-10-27 18:31:19 -0700 (Sat, 27 Oct 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersrhwoodPalletEnglishlprojMainMenunibinfonib">users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib</a></li>
<li><a href="#usersrhwoodPalletEnglishlprojMainMenunibkeyedobjectsnib">users/rhwood/Pallet/English.lproj/MainMenu.nib/keyedobjects.nib</a></li>
<li><a href="#usersrhwoodPalletPAStatusTransformerh">users/rhwood/Pallet/PAStatusTransformer.h</a></li>
<li><a href="#usersrhwoodPalletPAStatusTransformerm">users/rhwood/Pallet/PAStatusTransformer.m</a></li>
<li><a href="#usersrhwoodPalletPortAuthoritym">users/rhwood/Pallet/PortAuthority.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersrhwoodPalletEnglishlprojMainMenunibinfonib"></a>
<div class="modfile"><h4>Modified: users/rhwood/Pallet/English.lproj/MainMenu.nib/info.nib (30441 => 30442)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,9 +25,8 @@
</span><span class="cx"> </array>
</span><span class="cx"> <key>IBOpenObjects</key>
</span><span class="cx"> <array>
</span><del>- <integer>29</integer>
</del><span class="cx"> <integer>568</integer>
</span><del>- <integer>21</integer>
</del><ins>+ <integer>29</integer>
</ins><span class="cx"> <integer>290</integer>
</span><span class="cx"> </array>
</span><span class="cx"> <key>IBSystem Version</key>
</span></span></pre></div>
<a id="usersrhwoodPalletEnglishlprojMainMenunibkeyedobjectsnib"></a>
<div class="binary"><h4>Modified: users/rhwood/Pallet/English.lproj/MainMenu.nib/keyedobjects.nib</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="usersrhwoodPalletPAStatusTransformerh"></a>
<div class="modfile"><h4>Modified: users/rhwood/Pallet/PAStatusTransformer.h (30441 => 30442)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,14 +8,8 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import "PortAuthority.h"
</span><ins>+#import <MacPorts/MPConstants.h>
</ins><span class="cx">
</span><del>-enum portStatuses {
- portStatusInstalled,
- portStatusActive,
- portStatusOutdated,
- portStatusUnknown
-};
-
</del><span class="cx"> @interface PAStatusTransformer : NSValueTransformer
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersrhwoodPalletPAStatusTransformerm"></a>
<div class="modfile"><h4>Modified: users/rhwood/Pallet/PAStatusTransformer.m (30441 => 30442)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,16 +26,17 @@
</span><span class="cx"> if (beforeObject == nil) return nil;
</span><span class="cx"> id resourcePath = [[NSBundle mainBundle] resourcePath];
</span><span class="cx"> switch ([beforeObject intValue]) {
</span><del>- case portStatusUnknown:
</del><ins>+ case MPPortStateUnknown:
+ case MPPortStateNotInstalled:
</ins><span class="cx"> return nil;
</span><span class="cx"> break;
</span><del>- case portStatusActive:
</del><ins>+ case MPPortStateActive:
</ins><span class="cx"> return [resourcePath stringByAppendingPathComponent:@"active.gif"];
</span><span class="cx"> break;
</span><del>- case portStatusInstalled:
</del><ins>+ case MPPortStateInstalled:
</ins><span class="cx"> return [resourcePath stringByAppendingPathComponent:@"installed.gif"];
</span><span class="cx"> break;
</span><del>- case portStatusOutdated:
</del><ins>+ case MPPortStateOutdated:
</ins><span class="cx"> return [resourcePath stringByAppendingPathComponent:@"outdated.gif"];
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersrhwoodPalletPortAuthoritym"></a>
<div class="modfile"><h4>Modified: users/rhwood/Pallet/PortAuthority.m (30441 => 30442)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,7 @@
</span><span class="cx"> - (void)awakeFromNib
</span><span class="cx"> {
</span><span class="cx"> // Get a MacPorts Interpeter
</span><del>- macPorts = [[MPMacPorts alloc] init];
- NSLog([[macPorts search:@"goocanvas"] description]);
</del><ins>+ macPorts = [MPMacPorts sharedInstance];
</ins><span class="cx"> // Load/set preferences/defaults
</span><span class="cx"> if (![[[NSUserDefaultsController sharedUserDefaultsController] values] valueForKey:@"synchronizePortsListOnStartup"]) {
</span><span class="cx"> NSString *userDefaultsValuesPath;
</span><span class="lines">@@ -83,7 +82,10 @@
</span><span class="cx"> [[portsList cornerView] setMenu:portsListHeaderMenu];
</span><span class="cx"> // setup the displayed index
</span><span class="cx"> portsListIndex = [[NSMutableArray alloc] init];
</span><del>- // TESTING TESTING TESTING
</del><ins>+ // START TESTING START TESTING START TESTING
+ NSLog([[[MPRegistery sharedRegistery] installed:@"nonesuch"] description]);
+ NSLog([[[MPRegistery sharedRegistery] installed:@"gtk2"] description]);
+ // END TESTING END TESTING END TESTING
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -121,7 +123,9 @@
</span><span class="cx"> NSLog(@"%i items in the index.", [portsIndex count]);
</span><span class="cx"> [status setStringValue:@""];
</span><span class="cx"> [progressIndicator stopAnimation:nil];
</span><del>- NSLog([[portsIndex valueForKey:@"goocanvas"] description]);
</del><ins>+ // START TESTING START TESTING START TESTING
+ NSLog([[portsIndex valueForKey:@"gtk2"] description]);
+ // END TESTING END TESTING END TESTING
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -151,26 +155,27 @@
</span><span class="cx"> */
</span><span class="cx"> {
</span><span class="cx"> id item;
</span><del>- switch ([[item valueForKey:@"status"] intValue]) {
- case portStatusActive:
</del><ins>+ switch ([[item valueForKey:@"state"] intValue]) {
+ case MPPortStateActive:
</ins><span class="cx"> [self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
</span><span class="cx"> @"uninstall",
</span><span class="cx"> @"-dv",
</span><span class="cx"> [item valueForKey:@"name"]]];
</span><span class="cx"> break;
</span><del>- case portStatusInstalled:
</del><ins>+ case MPPortStateInstalled:
</ins><span class="cx"> [self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
</span><span class="cx"> @"activate",
</span><span class="cx"> @"-dv",
</span><span class="cx"> [item valueForKey:@"name"]]];
</span><span class="cx"> break;
</span><del>- case portStatusOutdated:
</del><ins>+ case MPPortStateOutdated:
</ins><span class="cx"> [self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
</span><span class="cx"> @"upgrade",
</span><span class="cx"> @"-dv",
</span><span class="cx"> [item valueForKey:@"name"]]];
</span><span class="cx"> break;
</span><del>- case portStatusUnknown:
</del><ins>+ case MPPortStateUnknown:
+ case MPPortStateNotInstalled:
</ins><span class="cx"> [self launchAuthorizedExecutableWithArguments:[NSArray arrayWithObjects:macPortsPort,
</span><span class="cx"> @"install",
</span><span class="cx"> @"-dv",
</span><span class="lines">@@ -284,12 +289,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)updateAvailablePorts:(id)output
</span><span class="cx"> {
</span><ins>+ NSLog(output);
</ins><span class="cx"> NSMutableArray *fields;
</span><span class="cx"> NSMutableDictionary *columns;
</span><span class="cx"> columns = [[NSMutableDictionary alloc] initWithCapacity:4];
</span><span class="cx"> fields = [[NSMutableArray alloc] initWithArray:[output componentsSeparatedByString:@" "]];
</span><span class="cx"> [fields removeObjectIdenticalTo:[NSString string]];
</span><del>- [columns setValue:[NSNumber numberWithInt:portStatusUnknown] forKey:@"status"];
</del><ins>+ [columns setValue:[NSNumber numberWithInt:MPPortStateUnknown] forKey:@"state"];
</ins><span class="cx"> [columns setValue:[fields objectAtIndex:0] forKey:@"name"];
</span><span class="cx"> [columns setValue:[fields objectAtIndex:1] forKey:@"version"];
</span><span class="cx"> [columns setValue:[fields objectAtIndex:2] forKey:@"categories"];
</span><span class="lines">@@ -303,15 +309,15 @@
</span><span class="cx"> {
</span><span class="cx"> NSLog(@"request for row %@ column %@\n", [NSNumber numberWithInt:rowIndex], [aTableColumn identifier]);
</span><span class="cx"> NSParameterAssert(rowIndex >= 0 && rowIndex < [portsListIndex count]);
</span><del>- if ([[[aTableColumn identifier] stringValue] isEqualToString:@"status"]) {
</del><ins>+ if ([[[aTableColumn identifier] stringValue] isEqualToString:@"state"]) {
</ins><span class="cx"> switch ([[[portsListIndex objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]] intValue]) {
</span><del>- case portStatusInstalled:
</del><ins>+ case MPPortStateInstalled:
</ins><span class="cx"> return nil;
</span><span class="cx"> break;
</span><del>- case portStatusActive:
</del><ins>+ case MPPortStateActive:
</ins><span class="cx"> return nil;
</span><span class="cx"> break;
</span><del>- case portStatusOutdated:
</del><ins>+ case MPPortStateOutdated:
</ins><span class="cx"> return nil;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre>
</div>
</div>
</body>
</html>