[52434] branches/gsoc09-gui/MPGUI
juanger at macports.org
juanger at macports.org
Tue Jun 16 10:59:50 PDT 2009
Revision: 52434
http://trac.macports.org/changeset/52434
Author: juanger at macports.org
Date: 2009-06-16 10:59:49 -0700 (Tue, 16 Jun 2009)
Log Message:
-----------
Fixed the NSArray bindings by using didChangeValueForKey: to notify observer of changes.
Modified Paths:
--------------
branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib
branches/gsoc09-gui/MPGUI/MPActionLauncher.h
branches/gsoc09-gui/MPGUI/MPActionLauncher.m
branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
Modified: branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib
===================================================================
--- branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-06-16 06:54:03 UTC (rev 52433)
+++ branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-06-16 17:59:49 UTC (rev 52434)
@@ -2193,14 +2193,22 @@
<reference key="NSColor" ref="996506875"/>
</object>
</object>
- <object class="NSImageCell" key="NSDataCell" id="9398613">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">33685504</int>
+ <object class="NSTextFieldCell" key="NSDataCell" id="682644242">
+ <int key="NSCellFlags">67239488</int>
+ <int key="NSCellFlags2">272761856</int>
+ <string key="NSContents">Text</string>
<reference key="NSSupport" ref="26"/>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
+ <reference key="NSControlView" ref="199649408"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor" id="625005337">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+ </object>
+ </object>
+ <reference key="NSTextColor" ref="475656758"/>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
@@ -2234,10 +2242,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
- </object>
+ <reference key="NSColor" ref="625005337"/>
</object>
<reference key="NSTextColor" ref="475656758"/>
</object>
@@ -2299,7 +2304,7 @@
<reference key="NSTableView" ref="199649408"/>
</object>
<object class="NSTableColumn" id="285794460">
- <double key="NSWidth">3.210000e+02</double>
+ <double key="NSWidth">3.830000e+02</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -2618,9 +2623,6 @@
<object class="NSCustomObject" id="517167976">
<string key="NSClassName">PortsTableController</string>
</object>
- <object class="NSCustomObject" id="1022824499">
- <string key="NSClassName">MPActionLauncher</string>
- </object>
<object class="NSArrayController" id="341892693">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2640,6 +2642,9 @@
<bool key="NSFilterRestrictsInsertion">YES</bool>
<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
</object>
+ <object class="NSCustomObject" id="1022824499">
+ <string key="NSClassName">MPActionLauncher</string>
+ </object>
<object class="NSUserDefaultsController" id="868875933">
<bool key="NSSharedInstance">YES</bool>
</object>
@@ -3024,14 +3029,6 @@
<int key="connectionID">508</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">portsController</string>
- <reference key="source" ref="1022824499"/>
- <reference key="destination" ref="341892693"/>
- </object>
- <int key="connectionID">509</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.variantsAsString</string>
<reference key="source" ref="635685037"/>
@@ -3047,6 +3044,26 @@
</object>
<int key="connectionID">517</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: arrangedObjects.state</string>
+ <reference key="source" ref="677394896"/>
+ <reference key="destination" ref="341892693"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="677394896"/>
+ <reference key="NSDestination" ref="341892693"/>
+ <string key="NSLabel">value: arrangedObjects.state</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">arrangedObjects.state</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSConditionallySetsEditable</string>
+ <boolean value="NO" key="NS.object.0"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">520</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -4124,21 +4141,21 @@
<reference key="object" ref="677394896"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="9398613"/>
+ <reference ref="682644242"/>
</object>
<reference key="parent" ref="199649408"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">429</int>
- <reference key="object" ref="9398613"/>
- <reference key="parent" ref="677394896"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">503</int>
<reference key="object" ref="1022824499"/>
<reference key="parent" ref="1049"/>
<string key="objectName">ActionLauncher</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">518</int>
+ <reference key="object" ref="682644242"/>
+ <reference key="parent" ref="677394896"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4323,7 +4340,6 @@
<string>422.IBPluginDependency</string>
<string>424.IBPluginDependency</string>
<string>427.IBPluginDependency</string>
- <string>429.IBPluginDependency</string>
<string>430.IBPluginDependency</string>
<string>431.IBPluginDependency</string>
<string>432.IBPluginDependency</string>
@@ -4357,6 +4373,7 @@
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
<string>503.IBPluginDependency</string>
+ <string>518.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>57.IBPluginDependency</string>
@@ -4575,7 +4592,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{493, 75}, {276, 378}}</string>
<string>{{493, 75}, {276, 378}}</string>
<boolean value="YES"/>
@@ -4605,6 +4621,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -4658,7 +4675,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">517</int>
+ <int key="maxID">520</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4666,10 +4683,6 @@
<object class="IBPartialClassDescription">
<string key="className">MPActionLauncher</string>
<string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">portsController</string>
- <string key="NS.object.0">NSArrayController</string>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">MPActionLauncher.h</string>
Modified: branches/gsoc09-gui/MPGUI/MPActionLauncher.h
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionLauncher.h 2009-06-16 06:54:03 UTC (rev 52433)
+++ branches/gsoc09-gui/MPGUI/MPActionLauncher.h 2009-06-16 17:59:49 UTC (rev 52434)
@@ -11,11 +11,11 @@
@interface MPActionLauncher : NSObject {
NSMutableArray *ports;
- IBOutlet NSArrayController *portsController;
}
@property (copy) NSMutableArray *ports;
- (void) loadPorts;
+
@end
Modified: branches/gsoc09-gui/MPGUI/MPActionLauncher.m
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionLauncher.m 2009-06-16 06:54:03 UTC (rev 52433)
+++ branches/gsoc09-gui/MPGUI/MPActionLauncher.m 2009-06-16 17:59:49 UTC (rev 52434)
@@ -24,6 +24,7 @@
NSDictionary *allPorts = [[MPMacPorts sharedInstance] search:MPPortsAll];
NSDictionary *installedPorts = [[MPRegistry sharedRegistry] installed];
+ [self willChangeValueForKey:@"ports"];
for (id port in allPorts) {
MPPort *mpport = [allPorts objectForKey:port];
[mpport setState:MPPortStateNotInstalled];
@@ -33,8 +34,8 @@
for (id port in installedPorts) {
[[allPorts objectForKey:port] setStateFromReceipts:[installedPorts objectForKey:port]];
}
+ [self didChangeValueForKey:@"ports"];
- [portsController rearrangeObjects];
[pool release];
}
Modified: branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-06-16 06:54:03 UTC (rev 52433)
+++ branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-06-16 17:59:49 UTC (rev 52434)
@@ -81,7 +81,7 @@
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
214BAFE20FE7164200BD1B46 /* MPActionLauncher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPActionLauncher.h; sourceTree = "<group>"; };
- 214BAFE30FE7164200BD1B46 /* MPActionLauncher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPActionLauncher.m; sourceTree = "<group>"; };
+ 214BAFE30FE7164200BD1B46 /* MPActionLauncher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPActionLauncher.m; sourceTree = "<group>"; wrapsLines = 0; };
21F165400FE2C04300542AEE /* MacPorts.Framework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MacPorts.Framework.xcodeproj; path = ../MacPorts_Framework/MacPorts.Framework.xcodeproj; sourceTree = SOURCE_ROOT; };
21F167580FE3382D00542AEE /* PortsTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PortsTableController.h; sourceTree = "<group>"; };
21F167590FE3382D00542AEE /* PortsTableController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PortsTableController.m; sourceTree = "<group>"; };
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090616/f76750a1/attachment.html>
More information about the macports-changes
mailing list