[54516] branches/gsoc09-gui
juanger at macports.org
juanger at macports.org
Tue Jul 28 20:10:54 PDT 2009
Revision: 54516
http://trac.macports.org/changeset/54516
Author: juanger at macports.org
Date: 2009-07-28 20:10:51 -0700 (Tue, 28 Jul 2009)
Log Message:
-----------
Cancel toolbar item is now working.
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/MPActionsController.h
branches/gsoc09-gui/MPGUI/MPActionsController.m
branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
branches/gsoc09-gui/MPGUI/PreferencesController.m
branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.h
branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.m
Modified: branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib
===================================================================
--- branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-07-29 03:10:51 UTC (rev 54516)
@@ -8,8 +8,8 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="371"/>
<integer value="29"/>
- <integer value="658"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -790,6 +790,7 @@
<string>325B7D9A-C8C9-4EC3-9D84-92D792696EBE</string>
<string>38B3CC5A-730B-4ECF-B057-8254756EF49D</string>
<string>586197FD-62CF-4D3E-AE67-9A57601D5B27</string>
+ <string>CBF865FC-FB44-4DF0-B21B-CC2D17E9A169</string>
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSToolbarSeparatorItem</string>
<string>NSToolbarSpaceItem</string>
@@ -1004,6 +1005,28 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
+ <object class="NSToolbarItem" id="651362317">
+ <object class="NSMutableString" key="NSToolbarItemIdentifier">
+ <characters key="NS.bytes">CBF865FC-FB44-4DF0-B21B-CC2D17E9A169</characters>
+ </object>
+ <string key="NSToolbarItemLabel">Cancel</string>
+ <string key="NSToolbarItemPaletteLabel">Cancel</string>
+ <string key="NSToolbarItemToolTip"/>
+ <nil key="NSToolbarItemView"/>
+ <object class="NSCustomResource" key="NSToolbarItemImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSStopProgress</string>
+ </object>
+ <nil key="NSToolbarItemTarget"/>
+ <nil key="NSToolbarItemAction"/>
+ <string key="NSToolbarItemMinSize">{0, 0}</string>
+ <string key="NSToolbarItemMaxSize">{0, 0}</string>
+ <bool key="NSToolbarItemEnabled">YES</bool>
+ <bool key="NSToolbarItemAutovalidates">YES</bool>
+ <int key="NSToolbarItemTag">-1</int>
+ <bool key="NSToolbarIsUserRemovable">YES</bool>
+ <int key="NSToolbarItemVisibilityPriority">0</int>
+ </object>
<object class="NSToolbarFlexibleSpaceItem" id="49194268">
<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
<string key="NSToolbarItemLabel"/>
@@ -1098,6 +1121,7 @@
<reference ref="869476631"/>
<reference ref="49194268"/>
<reference ref="618891101"/>
+ <reference ref="651362317"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1107,6 +1131,7 @@
<reference ref="341138360"/>
<reference ref="433945624"/>
<reference ref="1018787369"/>
+ <reference ref="651362317"/>
<reference ref="49194268"/>
<reference ref="618891101"/>
</object>
@@ -1116,7 +1141,7 @@
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="439893737">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1145,16 +1170,17 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSRuleEditorViewSliceRow" id="803409965">
+ <object class="NSRuleEditorViewSliceRow" id="277972727">
<reference key="NSNextResponder" ref="887125716"/>
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="48769615">
- <reference key="NSNextResponder" ref="803409965"/>
+ <object class="NSButton" id="339632689">
+ <reference key="NSNextResponder" ref="277972727"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{741, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="803409965"/>
+ <reference key="NSSuperview" ref="277972727"/>
+ <reference key="NSNextKeyView" ref="117035873"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1167,8 +1193,8 @@
<int key="NSfFlags">16</int>
</object>
<string key="NSAction">_addOption:</string>
- <reference key="NSTarget" ref="803409965"/>
- <reference key="NSControlView" ref="48769615"/>
+ <reference key="NSTarget" ref="277972727"/>
+ <reference key="NSControlView" ref="339632689"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<object class="NSFont" key="NSAlternateImage" id="28">
@@ -1181,11 +1207,12 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSButton" id="534129101">
- <reference key="NSNextResponder" ref="803409965"/>
+ <object class="NSButton" id="645964487">
+ <reference key="NSNextResponder" ref="277972727"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{721, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="803409965"/>
+ <reference key="NSSuperview" ref="277972727"/>
+ <reference key="NSNextKeyView" ref="339632689"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1194,8 +1221,8 @@
<string key="NSContents">-</string>
<reference key="NSSupport" ref="29"/>
<string key="NSAction">_deleteOption:</string>
- <reference key="NSTarget" ref="803409965"/>
- <reference key="NSControlView" ref="534129101"/>
+ <reference key="NSTarget" ref="277972727"/>
+ <reference key="NSControlView" ref="645964487"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<reference key="NSAlternateImage" ref="28"/>
@@ -1205,10 +1232,11 @@
</object>
</object>
<object class="NSPopUpButton" id="111744215">
- <reference key="NSNextResponder" ref="803409965"/>
+ <reference key="NSNextResponder" ref="277972727"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{7, 3}, {58, 19}}</string>
- <reference key="NSSuperview" ref="803409965"/>
+ <reference key="NSSuperview" ref="277972727"/>
+ <reference key="NSNextKeyView" ref="471209054"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="699711605">
@@ -1271,10 +1299,11 @@
</object>
</object>
<object class="NSPopUpButton" id="471209054">
- <reference key="NSNextResponder" ref="803409965"/>
+ <reference key="NSNextResponder" ref="277972727"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{71, 3}, {167, 19}}</string>
- <reference key="NSSuperview" ref="803409965"/>
+ <reference key="NSSuperview" ref="277972727"/>
+ <reference key="NSNextKeyView" ref="645964487"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="443562245">
@@ -1317,6 +1346,7 @@
</object>
<string key="NSFrameSize">{769, 25}</string>
<reference key="NSSuperview" ref="887125716"/>
+ <reference key="NSNextKeyView" ref="111744215"/>
<int key="NSRuleRowIndex">0</int>
<int key="NSRuleIndentation">0</int>
<reference key="NSContainingRuleEditorView" ref="872100568"/>
@@ -1331,7 +1361,7 @@
<string key="NSRuleOptionFrames.1">{{71, 3}, {167, 19}}</string>
<object class="NSMutableArray" key="NSRuleOptionItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableDictionary" id="258891198">
+ <object class="NSMutableDictionary" id="850630205">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1357,7 +1387,7 @@
</object>
</object>
</object>
- <object class="NSMutableDictionary" id="758746500">
+ <object class="NSMutableDictionary" id="670834164">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1374,22 +1404,23 @@
<int key="NSRuleOptionInitialFrames.count">2</int>
<string key="NSRuleOptionInitialFrames.0">{{7, 3}, {58, 19}}</string>
<string key="NSRuleOptionInitialFrames.1">{{71, 3}, {167, 19}}</string>
- <reference key="NSRuleOptionAddButton" ref="48769615"/>
- <reference key="NSRuleOptionSubtractButton" ref="534129101"/>
+ <reference key="NSRuleOptionAddButton" ref="339632689"/>
+ <reference key="NSRuleOptionSubtractButton" ref="645964487"/>
<int key="NSRuleOptionRowType">0</int>
<int key="NSRuleOptionPlusButtonRowType">0</int>
<bool key="NSRuleOptionEditable">YES</bool>
</object>
- <object class="NSRuleEditorViewSliceRow" id="531722570">
+ <object class="NSRuleEditorViewSliceRow" id="117035873">
<reference key="NSNextResponder" ref="887125716"/>
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="411103992">
- <reference key="NSNextResponder" ref="531722570"/>
+ <object class="NSButton" id="215482025">
+ <reference key="NSNextResponder" ref="117035873"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{741, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="531722570"/>
+ <reference key="NSSuperview" ref="117035873"/>
+ <reference key="NSNextKeyView" ref="588138263"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1398,8 +1429,8 @@
<string key="NSContents">+</string>
<reference key="NSSupport" ref="29"/>
<string key="NSAction">_addOption:</string>
- <reference key="NSTarget" ref="531722570"/>
- <reference key="NSControlView" ref="411103992"/>
+ <reference key="NSTarget" ref="117035873"/>
+ <reference key="NSControlView" ref="215482025"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<reference key="NSAlternateImage" ref="28"/>
@@ -1408,11 +1439,12 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSButton" id="113496329">
- <reference key="NSNextResponder" ref="531722570"/>
+ <object class="NSButton" id="530815018">
+ <reference key="NSNextResponder" ref="117035873"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{721, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="531722570"/>
+ <reference key="NSSuperview" ref="117035873"/>
+ <reference key="NSNextKeyView" ref="215482025"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1421,8 +1453,8 @@
<string key="NSContents">-</string>
<reference key="NSSupport" ref="29"/>
<string key="NSAction">_deleteOption:</string>
- <reference key="NSTarget" ref="531722570"/>
- <reference key="NSControlView" ref="113496329"/>
+ <reference key="NSTarget" ref="117035873"/>
+ <reference key="NSControlView" ref="530815018"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<reference key="NSAlternateImage" ref="28"/>
@@ -1432,10 +1464,11 @@
</object>
</object>
<object class="NSPopUpButton" id="677349919">
- <reference key="NSNextResponder" ref="531722570"/>
+ <reference key="NSNextResponder" ref="117035873"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{37, 3}, {76, 19}}</string>
- <reference key="NSSuperview" ref="531722570"/>
+ <reference key="NSSuperview" ref="117035873"/>
+ <reference key="NSNextKeyView" ref="855084085"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="711386517">
@@ -1491,10 +1524,11 @@
</object>
</object>
<object class="NSPopUpButton" id="855084085">
- <reference key="NSNextResponder" ref="531722570"/>
+ <reference key="NSNextResponder" ref="117035873"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{119, 3}, {95, 19}}</string>
- <reference key="NSSuperview" ref="531722570"/>
+ <reference key="NSSuperview" ref="117035873"/>
+ <reference key="NSNextKeyView" ref="309287992"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="108954362">
@@ -1585,10 +1619,11 @@
</object>
</object>
<object class="NSTextField" id="309287992">
- <reference key="NSNextResponder" ref="531722570"/>
+ <reference key="NSNextResponder" ref="117035873"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{220, 4}, {61, 18}}</string>
- <reference key="NSSuperview" ref="531722570"/>
+ <reference key="NSSuperview" ref="117035873"/>
+ <reference key="NSNextKeyView" ref="530815018"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell">
<int key="NSCellFlags">343014976</int>
@@ -1604,6 +1639,7 @@
</object>
<string key="NSFrame">{{0, 25}, {769, 25}}</string>
<reference key="NSSuperview" ref="887125716"/>
+ <reference key="NSNextKeyView" ref="677349919"/>
<int key="NSRuleRowIndex">1</int>
<int key="NSRuleIndentation">1</int>
<reference key="NSContainingRuleEditorView" ref="872100568"/>
@@ -1620,7 +1656,7 @@
<string key="NSRuleOptionFrames.2">{{220, 4}, {61, 18}}</string>
<object class="NSMutableArray" key="NSRuleOptionItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableDictionary" id="430386518">
+ <object class="NSMutableDictionary" id="388256921">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1647,7 +1683,7 @@
</object>
</object>
</object>
- <object class="NSMutableDictionary" id="1040768029">
+ <object class="NSMutableDictionary" id="117474863">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1660,7 +1696,7 @@
<reference ref="755579174"/>
</object>
</object>
- <object class="NSMutableDictionary" id="605544187">
+ <object class="NSMutableDictionary" id="140113323">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1678,22 +1714,23 @@
<string key="NSRuleOptionInitialFrames.0">{{37, 3}, {76, 19}}</string>
<string key="NSRuleOptionInitialFrames.1">{{119, 3}, {95, 19}}</string>
<string key="NSRuleOptionInitialFrames.2">{{220, 4}, {61, 18}}</string>
- <reference key="NSRuleOptionAddButton" ref="411103992"/>
- <reference key="NSRuleOptionSubtractButton" ref="113496329"/>
+ <reference key="NSRuleOptionAddButton" ref="215482025"/>
+ <reference key="NSRuleOptionSubtractButton" ref="530815018"/>
<int key="NSRuleOptionRowType">0</int>
<int key="NSRuleOptionPlusButtonRowType">0</int>
<bool key="NSRuleOptionEditable">YES</bool>
</object>
- <object class="NSRuleEditorViewSliceRow" id="937239567">
+ <object class="NSRuleEditorViewSliceRow" id="588138263">
<reference key="NSNextResponder" ref="887125716"/>
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="809554824">
- <reference key="NSNextResponder" ref="937239567"/>
+ <object class="NSButton" id="297165836">
+ <reference key="NSNextResponder" ref="588138263"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{741, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="937239567"/>
+ <reference key="NSSuperview" ref="588138263"/>
+ <reference key="NSNextKeyView" ref="872100568"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1702,8 +1739,8 @@
<string key="NSContents">+</string>
<reference key="NSSupport" ref="29"/>
<string key="NSAction">_addOption:</string>
- <reference key="NSTarget" ref="937239567"/>
- <reference key="NSControlView" ref="809554824"/>
+ <reference key="NSTarget" ref="588138263"/>
+ <reference key="NSControlView" ref="297165836"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<reference key="NSAlternateImage" ref="28"/>
@@ -1712,11 +1749,12 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSButton" id="183568195">
- <reference key="NSNextResponder" ref="937239567"/>
+ <object class="NSButton" id="234201907">
+ <reference key="NSNextResponder" ref="588138263"/>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{721, 4}, {18, 18}}</string>
- <reference key="NSSuperview" ref="937239567"/>
+ <reference key="NSSuperview" ref="588138263"/>
+ <reference key="NSNextKeyView" ref="297165836"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSRuleEditorButtonCell" key="NSCell">
@@ -1725,8 +1763,8 @@
<string key="NSContents">-</string>
<reference key="NSSupport" ref="29"/>
<string key="NSAction">_deleteOption:</string>
- <reference key="NSTarget" ref="937239567"/>
- <reference key="NSControlView" ref="183568195"/>
+ <reference key="NSTarget" ref="588138263"/>
+ <reference key="NSControlView" ref="234201907"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<reference key="NSAlternateImage" ref="28"/>
@@ -1736,10 +1774,11 @@
</object>
</object>
<object class="NSPopUpButton" id="974900885">
- <reference key="NSNextResponder" ref="937239567"/>
+ <reference key="NSNextResponder" ref="588138263"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{37, 3}, {64, 19}}</string>
- <reference key="NSSuperview" ref="937239567"/>
+ <reference key="NSSuperview" ref="588138263"/>
+ <reference key="NSNextKeyView" ref="207821348"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="186778731">
@@ -1795,10 +1834,11 @@
</object>
</object>
<object class="NSPopUpButton" id="207821348">
- <reference key="NSNextResponder" ref="937239567"/>
+ <reference key="NSNextResponder" ref="588138263"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{107, 3}, {46, 19}}</string>
- <reference key="NSSuperview" ref="937239567"/>
+ <reference key="NSSuperview" ref="588138263"/>
+ <reference key="NSNextKeyView" ref="11724982"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="898314192">
@@ -1841,10 +1881,11 @@
</object>
</object>
<object class="NSPopUpButton" id="11724982">
- <reference key="NSNextResponder" ref="937239567"/>
+ <reference key="NSNextResponder" ref="588138263"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{159, 3}, {155, 19}}</string>
- <reference key="NSSuperview" ref="937239567"/>
+ <reference key="NSSuperview" ref="588138263"/>
+ <reference key="NSNextKeyView" ref="234201907"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="923487559">
@@ -1937,6 +1978,7 @@
</object>
<string key="NSFrame">{{0, 50}, {769, 25}}</string>
<reference key="NSSuperview" ref="887125716"/>
+ <reference key="NSNextKeyView" ref="974900885"/>
<int key="NSRuleRowIndex">2</int>
<int key="NSRuleIndentation">1</int>
<reference key="NSContainingRuleEditorView" ref="872100568"/>
@@ -1953,7 +1995,7 @@
<string key="NSRuleOptionFrames.2">{{159, 3}, {155, 19}}</string>
<object class="NSMutableArray" key="NSRuleOptionItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableDictionary" id="1040769366">
+ <object class="NSMutableDictionary" id="375100135">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1980,7 +2022,7 @@
</object>
</object>
</object>
- <object class="NSMutableDictionary" id="749529009">
+ <object class="NSMutableDictionary" id="1016684085">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1993,7 +2035,7 @@
<reference ref="385089462"/>
</object>
</object>
- <object class="NSMutableDictionary" id="750041497">
+ <object class="NSMutableDictionary" id="822474154">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2011,8 +2053,8 @@
<string key="NSRuleOptionInitialFrames.0">{{37, 3}, {64, 19}}</string>
<string key="NSRuleOptionInitialFrames.1">{{107, 3}, {46, 19}}</string>
<string key="NSRuleOptionInitialFrames.2">{{159, 3}, {155, 19}}</string>
- <reference key="NSRuleOptionAddButton" ref="809554824"/>
- <reference key="NSRuleOptionSubtractButton" ref="183568195"/>
+ <reference key="NSRuleOptionAddButton" ref="297165836"/>
+ <reference key="NSRuleOptionSubtractButton" ref="234201907"/>
<int key="NSRuleOptionRowType">0</int>
<int key="NSRuleOptionPlusButtonRowType">0</int>
<bool key="NSRuleOptionEditable">YES</bool>
@@ -2020,6 +2062,7 @@
</object>
<string key="NSFrame">{{1, 1}, {769, 73}}</string>
<reference key="NSSuperview" ref="872100568"/>
+ <reference key="NSNextKeyView" ref="277972727"/>
</object>
</object>
<object class="NSMutableSet" key="NSDragTypes">
@@ -2031,6 +2074,7 @@
</object>
<string key="NSFrameSize">{771, 75}</string>
<reference key="NSSuperview" ref="646625812"/>
+ <reference key="NSNextKeyView" ref="887125716"/>
<bool key="NSEnabled">YES</bool>
<double key="NSRuleEditorAlignmentGridWidth">7.500000e+01</double>
<double key="NSRuleEditorSliceHeight">2.500000e+01</double>
@@ -2062,8 +2106,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="258891198"/>
- <reference ref="758746500"/>
+ <reference ref="850630205"/>
+ <reference ref="670834164"/>
</object>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2086,9 +2130,9 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="430386518"/>
- <reference ref="1040768029"/>
- <reference ref="605544187"/>
+ <reference ref="388256921"/>
+ <reference ref="117474863"/>
+ <reference ref="140113323"/>
</object>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2115,9 +2159,9 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1040769366"/>
- <reference ref="749529009"/>
- <reference ref="750041497"/>
+ <reference ref="375100135"/>
+ <reference ref="1016684085"/>
+ <reference ref="822474154"/>
</object>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2138,9 +2182,9 @@
</object>
<object class="NSMutableArray" key="NSRuleEditorSlices">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="803409965"/>
- <reference ref="531722570"/>
- <reference ref="937239567"/>
+ <reference ref="277972727"/>
+ <reference ref="117035873"/>
+ <reference ref="588138263"/>
</object>
<object class="NSArray" key="NSPredicateTemplates">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2153,6 +2197,7 @@
</object>
<string key="NSFrame">{{1, 1}, {771, 25}}</string>
<reference key="NSSuperview" ref="815512319"/>
+ <reference key="NSNextKeyView" ref="872100568"/>
<reference key="NSDocView" ref="872100568"/>
<object class="NSColor" key="NSBGColor">
<int key="NSColorSpace">3</int>
@@ -2182,6 +2227,7 @@
</object>
<string key="NSFrame">{{0, 397}, {773, 27}}</string>
<reference key="NSSuperview" ref="169664854"/>
+ <reference key="NSNextKeyView" ref="646625812"/>
<int key="NSsFlags">66</int>
<reference key="NSVScroller" ref="595148426"/>
<reference key="NSHScroller" ref="969735904"/>
@@ -2366,6 +2412,7 @@
</object>
<string key="NSFrame">{{1, 17}, {756, 366}}</string>
<reference key="NSSuperview" ref="520202466"/>
+ <reference key="NSNextKeyView" ref="199649408"/>
<reference key="NSDocView" ref="199649408"/>
<reference key="NSBGColor" ref="800202432"/>
<int key="NScvFlags">4</int>
@@ -2398,6 +2445,7 @@
</object>
<string key="NSFrame">{{1, 0}, {756, 17}}</string>
<reference key="NSSuperview" ref="520202466"/>
+ <reference key="NSNextKeyView" ref="563815802"/>
<reference key="NSDocView" ref="563815802"/>
<reference key="NSBGColor" ref="800202432"/>
<int key="NScvFlags">4</int>
@@ -2406,6 +2454,7 @@
</object>
<string key="NSFrameSize">{773, 399}</string>
<reference key="NSSuperview" ref="169664854"/>
+ <reference key="NSNextKeyView" ref="221116208"/>
<int key="NSsFlags">50</int>
<reference key="NSVScroller" ref="103858236"/>
<reference key="NSHScroller" ref="950337744"/>
@@ -2431,6 +2480,7 @@
</object>
</object>
<string key="NSFrameSize">{773, 449}</string>
+ <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -2659,8 +2709,9 @@
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="263175754">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2847,10 +2898,7 @@
</object>
<reference key="NSSupport" ref="782475540"/>
<reference key="NSControlView" ref="381832301"/>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">4</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
+ <reference key="NSBackgroundColor" ref="415231890"/>
<reference key="NSTextColor" ref="475656758"/>
<reference key="NSDelegate" ref="381832301"/>
<double key="NSCompletionDelay">0.000000e+00</double>
@@ -2975,7 +3023,6 @@
</object>
</object>
<string key="NSFrameSize">{608, 286}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -3701,6 +3748,14 @@
</object>
<int key="connectionID">756</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">cancel:</string>
+ <reference key="source" ref="800227439"/>
+ <reference key="destination" ref="651362317"/>
+ </object>
+ <int key="connectionID">763</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -4335,6 +4390,7 @@
<reference ref="433945624"/>
<reference ref="1018787369"/>
<reference ref="815358429"/>
+ <reference ref="651362317"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -5027,6 +5083,11 @@
<reference key="object" ref="501461887"/>
<reference key="parent" ref="913553871"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">762</int>
+ <reference key="object" ref="651362317"/>
+ <reference key="parent" ref="978062640"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5266,7 +5327,6 @@
<string>647.IBPluginDependency</string>
<string>651.IBPluginDependency</string>
<string>657.IBEditorWindowLastContentRect</string>
- <string>657.IBPluginDependency</string>
<string>657.IBWindowTemplateEditedContentRect</string>
<string>657.NSWindowTemplate.visibleAtLaunch</string>
<string>658.IBPluginDependency</string>
@@ -5300,6 +5360,7 @@
<string>750.IBPluginDependency</string>
<string>753.IBPluginDependency</string>
<string>754.IBPluginDependency</string>
+ <string>762.IBPluginDependency</string>
<string>77.IBPluginDependency</string>
<string>77.ImportedFromIB2</string>
<string>78.IBPluginDependency</string>
@@ -5457,9 +5518,9 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{55, 138}, {773, 449}}</string>
+ <string>{{65, 1}, {773, 449}}</string>
<reference ref="6"/>
- <string>{{55, 138}, {773, 449}}</string>
+ <string>{{65, 1}, {773, 449}}</string>
<reference ref="9"/>
<string>{{33, 99}, {480, 360}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5491,7 +5552,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{133, 587}, {617, 0}}</string>
+ <string>{{143, 450}, {617, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5553,7 +5614,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{77, 310}, {608, 286}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{77, 310}, {608, 286}}</string>
<reference ref="6"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5588,6 +5648,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<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"/>
@@ -5626,7 +5687,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">761</int>
+ <int key="maxID">763</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5646,6 +5707,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancel:</string>
<string>install:</string>
<string>openPreferences:</string>
<string>selfupdate:</string>
@@ -5661,6 +5723,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
Modified: branches/gsoc09-gui/MPGUI/MPActionLauncher.h
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionLauncher.h 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/MPActionLauncher.h 2009-07-29 03:10:51 UTC (rev 54516)
@@ -15,7 +15,6 @@
#import <Cocoa/Cocoa.h>
#import <MacPorts/MacPorts.h>
-#import "PreferencesController.h"
/*!
@class MPActionLauncher
@@ -23,7 +22,7 @@
@discussion Contains a shared per thread MacPorts Framework wrapper
*/
@interface MPActionLauncher : NSObject {
- NSMutableArray *ports;
+ NSArray *ports;
NSTask *actionTool;
NSConnection *connectionToActionTool;
BOOL isLoading, isBusy;
@@ -32,7 +31,7 @@
@var ports
@abstract An array of available MPPorts
*/
- at property (copy) NSMutableArray *ports;
+ at property (copy) NSArray *ports;
@property NSTask *actionTool;
@@ -52,35 +51,37 @@
/*!
@brief Loads the MPPorts array with the available ports current PKGPath in another thread
*/
-- (void)loadPortsInBackground;
+- (void)loadPorts;
/*!
@brief Installs a single port in another thread
@param port MPPort that represents the port to install
*/
-- (void)installPortInBackground:(MPPort *)port;
+- (void)installPort:(MPPort *)port;
/*!
@brief Uninstalls a single port in another thread
@param port MPPort that represents the port to install
*/
-- (void)uninstallPortInBackground:(MPPort *)port;
+- (void)uninstallPort:(MPPort *)port;
/*!
@brief Upgrades a single port in another thread
@param port MPPort that represents the port to upgrade
*/
-- (void)upgradePortInBackground:(MPPort *)port;
+- (void)upgradePort:(MPPort *)port;
/*!
@brief Syncs the MacPorts installation in another thread
*/
-- (void)syncInBackground;
+- (void)sync;
/*!
@brief Selfupdates the MacPorts installation in another thread
*/
-- (void)selfupdateInBackground;
+- (void)selfupdate;
+- (void)cancelPortProcess;
+
@end
Modified: branches/gsoc09-gui/MPGUI/MPActionLauncher.m
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionLauncher.m 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/MPActionLauncher.m 2009-07-29 03:10:51 UTC (rev 54516)
@@ -13,7 +13,6 @@
#pragma mark Private Methods
@interface MPActionLauncher (Private)
-- (void)loadPorts;
- (void)subscribeToNotifications;
@end
@@ -33,72 +32,69 @@
}
- (id)init {
- NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
if (sharedActionLauncher == nil) {
ports = [NSMutableArray arrayWithCapacity:1];
sharedActionLauncher = self;
}
-
- // This is the path to the MPActionTool
- // NSString *toolPath = [bundlePath stringByAppendingPathComponent:@"Contents/MacOS/MPActionTool"];
- // Launch the MPActionTool
- // actionTool = [NSTask launchedTaskWithLaunchPath:toolPath arguments:[NSArray arrayWithObject:@""]];
-
return sharedActionLauncher;
}
-- (void)loadPortsInBackground {
- [self performSelectorInBackground:@selector(loadPorts) withObject:nil];
+- (void)loadPorts {
+ [self setIsLoading:YES];
+ NSDictionary *allPorts = [[MPMacPorts sharedInstance] search:MPPortsAll];
+ NSDictionary *installedPorts = [[MPRegistry sharedRegistry] installed];
+
+ [self willChangeValueForKey:@"ports"];
+ for (id port in installedPorts) {
+ [[allPorts objectForKey:port] setStateFromReceipts:[installedPorts objectForKey:port]];
+ }
+ ports = [allPorts allValues];
+ [self didChangeValueForKey:@"ports"];
+
+ id theProxy = [NSConnection
+ rootProxyForConnectionWithRegisteredName:@"actionTool"
+ host:nil];
+ [theProxy loadPKGPath];
+
+ [self setIsLoading:NO];
}
-- (void)installPortInBackground:(MPPort *)port {
+- (void)installPort:(MPPort *)port {
NSError * error;
NSArray *empty = [NSArray arrayWithObject: @""];
[port installWithOptions:empty variants:empty error:&error];
}
-- (void)uninstallPortInBackground:(MPPort *)port {
+- (void)uninstallPort:(MPPort *)port {
NSError * error;
[port uninstallWithVersion:@"" error:&error];
}
-- (void)upgradePortInBackground:(MPPort *)port {
+- (void)upgradePort:(MPPort *)port {
NSError * error;
[port upgradeWithError:&error];
}
-- (void)syncInBackground {
+- (void)sync {
NSError * error;
[[MPMacPorts sharedInstance] sync:&error];
}
-- (void)selfupdateInBackground {
+- (void)selfupdate {
NSError * error;
[[MPMacPorts sharedInstance] selfUpdate:&error];
}
-#pragma mark Private Methods implementation
-
-- (void)loadPorts {
- [self setIsLoading:YES];
- NSDictionary *allPorts = [[MPMacPorts sharedInstance] search:MPPortsAll];
- NSDictionary *installedPorts = [[MPRegistry sharedRegistry] installed];
-
- [self willChangeValueForKey:@"ports"];
- for (id port in installedPorts) {
- [[allPorts objectForKey:port] setStateFromReceipts:[installedPorts objectForKey:port]];
+- (void)cancelPortProcess {
+ // TODO: display confirmation dialog
+ NSTask *task = [[MPInterpreter sharedInterpreter] task];
+ if(task != nil && [task isRunning]) {
+ [task terminate];
}
- ports = [allPorts allValues];
- [self didChangeValueForKey:@"ports"];
-
- id theProxy = [NSConnection
- rootProxyForConnectionWithRegisteredName:@"actionTool"
- host:nil];
- [theProxy loadPKGPath];
-
- [self setIsLoading:NO];
}
+#pragma mark Private Methods implementation
+
- (void)subscribeToNotifications {
/*
[[NSNotificationCenter defaultCenter] addObserver:self
Modified: branches/gsoc09-gui/MPGUI/MPActionsController.h
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionsController.h 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/MPActionsController.h 2009-07-29 03:10:51 UTC (rev 54516)
@@ -22,5 +22,6 @@
- (IBAction)upgrade:(id)sender;
- (IBAction)sync:(id)sender;
- (IBAction)selfupdate:(id)sender;
+- (IBAction)cancel:(id)sender;
@end
Modified: branches/gsoc09-gui/MPGUI/MPActionsController.m
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionsController.m 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/MPActionsController.m 2009-07-29 03:10:51 UTC (rev 54516)
@@ -18,32 +18,41 @@
- (IBAction)install:(id)sender {
NSArray *selectedPorts = [ports selectedObjects];
for (id port in selectedPorts) {
- [[MPActionLauncher sharedInstance] installPortInBackground:port];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(installPort:) withObject:port];
}
}
- (IBAction)uninstall:(id)sender {
NSArray *selectedPorts = [ports selectedObjects];
for (id port in selectedPorts) {
- [[MPActionLauncher sharedInstance] uninstallPortInBackground:port];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(uninstallPort:) withObject:port];
}
}
- (IBAction)upgrade:(id)sender {
NSArray *selectedPorts = [ports selectedObjects];
for (id port in selectedPorts) {
- [[MPActionLauncher sharedInstance] upgradePortInBackground:port];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(upgradePort:) withObject:port];
}
}
- (IBAction)sync:(id)sender {
- [[MPActionLauncher sharedInstance] syncInBackground];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(sync) withObject:nil];
}
- (IBAction)selfupdate:(id)sender {
- [[MPActionLauncher sharedInstance] selfupdateInBackground];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(selfupdate) withObject:nil];
}
+- (IBAction)cancel:(id)sender {
+ [[MPActionLauncher sharedInstance] cancelPortProcess];
+}
+
-(BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
BOOL enable = ![[MPActionLauncher sharedInstance] isBusy];
return enable;
@@ -60,7 +69,8 @@
[self openPreferences:self];
} else {
[MPMacPorts setPKGPath:pkgPath];
- [[MPActionLauncher sharedInstance] loadPortsInBackground];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(loadPorts) withObject:nil];
}
}
@@ -69,7 +79,7 @@
}
- (void)applicationWillTerminate:(NSNotification *)aNotification {
- [[[MPActionLauncher sharedInstance] actionTool] terminate];
+ [[MPActionLauncher sharedInstance] cancelPortProcess];
}
@end
Modified: branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-07-29 03:10:51 UTC (rev 54516)
@@ -24,15 +24,12 @@
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
21351FB30FEC67780074ACFE /* MPActionsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 21351FB20FEC67780074ACFE /* MPActionsController.m */; };
214BAFE40FE7164200BD1B46 /* MPActionLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 214BAFE30FE7164200BD1B46 /* MPActionLauncher.m */; };
- 21A5884C0FF5D834003CF725 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
- 21A5895A0FF5E96E003CF725 /* MPActionTool in CopyFiles */ = {isa = PBXBuildFile; fileRef = 21A588140FF5D508003CF725 /* MPActionTool */; };
21B6A38E0FEDCBD5001DF976 /* TB_Install.icns in Resources */ = {isa = PBXBuildFile; fileRef = 21B6A38A0FEDCBD5001DF976 /* TB_Install.icns */; };
21B6A38F0FEDCBD5001DF976 /* TB_Sync.icns in Resources */ = {isa = PBXBuildFile; fileRef = 21B6A38B0FEDCBD5001DF976 /* TB_Sync.icns */; };
21B6A3910FEDCBD5001DF976 /* TB_Upgrade.icns in Resources */ = {isa = PBXBuildFile; fileRef = 21B6A38D0FEDCBD5001DF976 /* TB_Upgrade.icns */; };
21B6A3940FEDE6CA001DF976 /* TB_Uninstall.icns in Resources */ = {isa = PBXBuildFile; fileRef = 21B6A3930FEDE6CA001DF976 /* TB_Uninstall.icns */; };
21E2ADB01002E428003F8885 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 21E2ADAF1002E428003F8885 /* Preferences.xib */; };
21E2ADB71002EAE0003F8885 /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 21E2ADB61002EAE0003F8885 /* PreferencesController.m */; };
- 21E2AEBB1002FC3C003F8885 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F165510FE2C04300542AEE /* MacPorts.framework */; };
21EB8B11100CDD37007371EE /* MPPortTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 21EB8B10100CDD37007371EE /* MPPortTableView.m */; };
21F166D80FE329A700542AEE /* MacPorts.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 21F165510FE2C04300542AEE /* MacPorts.framework */; };
21F166D90FE329AA00542AEE /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F165510FE2C04300542AEE /* MacPorts.framework */; };
@@ -47,20 +44,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2106329F0FF7CC8100FF0217 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 21F165400FE2C04300542AEE /* MacPorts.Framework.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = MacPorts;
- };
- 21A588E40FF5E09A003CF725 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 21A588130FF5D508003CF725;
- remoteInfo = MPActionTool;
- };
21D954D81009731100DEF58A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 21F165400FE2C04300542AEE /* MacPorts.Framework.xcodeproj */;
@@ -119,7 +102,6 @@
dstPath = "";
dstSubfolderSpec = 6;
files = (
- 21A5895A0FF5E96E003CF725 /* MPActionTool in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -144,7 +126,6 @@
21351FB20FEC67780074ACFE /* MPActionsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPActionsController.m; 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>"; wrapsLines = 0; };
- 21A588140FF5D508003CF725 /* MPActionTool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MPActionTool; sourceTree = BUILT_PRODUCTS_DIR; };
21B6A38A0FEDCBD5001DF976 /* TB_Install.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_Install.icns; sourceTree = "<group>"; };
21B6A38B0FEDCBD5001DF976 /* TB_Sync.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_Sync.icns; sourceTree = "<group>"; };
21B6A38D0FEDCBD5001DF976 /* TB_Upgrade.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_Upgrade.icns; sourceTree = "<group>"; };
@@ -172,15 +153,6 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 21A588120FF5D508003CF725 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 21E2AEBB1002FC3C003F8885 /* MacPorts.framework in Frameworks */,
- 21A5884C0FF5D834003CF725 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
8D11072E0486CEB800E47090 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -215,7 +187,6 @@
isa = PBXGroup;
children = (
8D1107320486CEB800E47090 /* MPGUI.app */,
- 21A588140FF5D508003CF725 /* MPActionTool */,
);
name = Products;
sourceTree = "<group>";
@@ -321,23 +292,6 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 21A588130FF5D508003CF725 /* MPActionTool */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 21A588190FF5D527003CF725 /* Build configuration list for PBXNativeTarget "MPActionTool" */;
- buildPhases = (
- 21A588110FF5D508003CF725 /* Sources */,
- 21A588120FF5D508003CF725 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- 210632A00FF7CC8100FF0217 /* PBXTargetDependency */,
- );
- name = MPActionTool;
- productName = MPActionTool;
- productReference = 21A588140FF5D508003CF725 /* MPActionTool */;
- productType = "com.apple.product-type.tool";
- };
8D1107260486CEB800E47090 /* MPGUI */ = {
isa = PBXNativeTarget;
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MPGUI" */;
@@ -352,7 +306,6 @@
buildRules = (
);
dependencies = (
- 21A588E50FF5E09A003CF725 /* PBXTargetDependency */,
21F165820FE2C17C00542AEE /* PBXTargetDependency */,
);
name = MPGUI;
@@ -381,7 +334,6 @@
targets = (
8D1107260486CEB800E47090 /* MPGUI */,
21351F530FEC59520074ACFE /* Docs */,
- 21A588130FF5D508003CF725 /* MPActionTool */,
);
};
/* End PBXProject section */
@@ -482,13 +434,6 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 21A588110FF5D508003CF725 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
8D11072C0486CEB800E47090 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -507,16 +452,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 210632A00FF7CC8100FF0217 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = MacPorts;
- targetProxy = 2106329F0FF7CC8100FF0217 /* PBXContainerItemProxy */;
- };
- 21A588E50FF5E09A003CF725 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 21A588130FF5D508003CF725 /* MPActionTool */;
- targetProxy = 21A588E40FF5E09A003CF725 /* PBXContainerItemProxy */;
- };
21F165820FE2C17C00542AEE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = MacPorts;
@@ -572,74 +507,6 @@
};
name = Release;
};
- 21A588160FF5D509003CF725 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../MacPorts_Framework/build/\"";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INSTALL_PATH = /usr/local/bin;
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
- PREBINDING = NO;
- PRODUCT_NAME = MPActionTool;
- };
- name = Debug;
- };
- 21A588170FF5D509003CF725 /* Debug-InstallMacPorts */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../MacPorts_Framework/build/\"";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INSTALL_PATH = /usr/local/bin;
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
- PREBINDING = NO;
- PRODUCT_NAME = MPActionTool;
- };
- name = "Debug-InstallMacPorts";
- };
- 21A588180FF5D509003CF725 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INSTALL_PATH = /usr/local/bin;
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
- PREBINDING = NO;
- PRODUCT_NAME = MPActionTool;
- ZERO_LINK = NO;
- };
- name = Release;
- };
21FC211D0FE84F7F00B1E835 /* Debug-InstallMacPorts */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -755,16 +622,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 21A588190FF5D527003CF725 /* Build configuration list for PBXNativeTarget "MPActionTool" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 21A588160FF5D509003CF725 /* Debug */,
- 21A588170FF5D509003CF725 /* Debug-InstallMacPorts */,
- 21A588180FF5D509003CF725 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MPGUI" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: branches/gsoc09-gui/MPGUI/PreferencesController.m
===================================================================
--- branches/gsoc09-gui/MPGUI/PreferencesController.m 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MPGUI/PreferencesController.m 2009-07-29 03:10:51 UTC (rev 54516)
@@ -22,7 +22,8 @@
[defaults setObject:path forKey:@"PKGPath"];
NSLog(@"PATH: %@", path);
[MPMacPorts setPKGPath:path];
- [[MPActionLauncher sharedInstance] loadPortsInBackground];
+ [[MPActionLauncher sharedInstance]
+ performSelectorInBackground:@selector(loadPorts) withObject:nil];
}
}
Modified: branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.h
===================================================================
--- branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.h 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.h 2009-07-29 03:10:51 UTC (rev 54516)
@@ -108,6 +108,7 @@
+(void) setDelegate:(id)newDelegate;
+-(NSTask*) task;
//Internal methods
-(BOOL) setOptionsForNewTclPort:(NSArray *)options;
Modified: branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.m
===================================================================
--- branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.m 2009-07-28 23:53:18 UTC (rev 54515)
+++ branches/gsoc09-gui/MacPorts_Framework/MPInterpreter.m 2009-07-29 03:10:51 UTC (rev 54516)
@@ -40,8 +40,8 @@
static AuthorizationRef internalMacPortsAuthRef;
static NSString* PKGPath = @"/Library/Tcl";
static id delegate;
+static NSTask* aTask;
-
#pragma mark -
@implementation MPInterpreter
@@ -666,15 +666,7 @@
}
- (NSString *) evaluateStringWithMPPortProcess:(NSString *) statement error:(NSError **)mportError {
-/* NSString *portProcessInitPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"portProcessInit" ofType:@"tcl"];
- NSString *portProcessPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"MPPortProcess" ofType:@""];
- NSLog(portProcessInitPath);
-
- NSArray *args = [NSArray arrayWithObjects:PKGPath,portProcessInitPath];
-
- NSTask *portProcess = [NSTask launchedTaskWithLaunchPath:[portProcessPath retain] arguments:[args retain]];
- */
- NSTask *aTask = [[NSTask alloc] init];
+ aTask = [[NSTask alloc] init];
NSMutableArray *args = [NSMutableArray array];
/* set arguments */
@@ -696,6 +688,9 @@
return nil;
}
+- (NSTask*) task {
+ return aTask;
+}
#pragma mark -
#pragma mark Authorization Code
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090728/292b3e32/attachment-0001.html>
More information about the macports-changes
mailing list