[52675] branches/gsoc09-gui/MPGUI
juanger at macports.org
juanger at macports.org
Sat Jun 20 21:06:25 PDT 2009
Revision: 52675
http://trac.macports.org/changeset/52675
Author: juanger at macports.org
Date: 2009-06-20 21:06:24 -0700 (Sat, 20 Jun 2009)
Log Message:
-----------
New icons for toolbar items. Sync and Selfupgrade are now fully implemented.
Modified Paths:
--------------
branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib
branches/gsoc09-gui/MPGUI/MPActionLauncher.h
branches/gsoc09-gui/MPGUI/MPActionsController.h
branches/gsoc09-gui/MPGUI/MPActionsController.m
branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
Added Paths:
-----------
branches/gsoc09-gui/MPGUI/TB_Install.icns
branches/gsoc09-gui/MPGUI/TB_Sync.icns
branches/gsoc09-gui/MPGUI/TB_Uninstall.icns
branches/gsoc09-gui/MPGUI/TB_Upgrade.icns
Modified: branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib
===================================================================
--- branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-06-21 03:53:39 UTC (rev 52674)
+++ branches/gsoc09-gui/MPGUI/English.lproj/MainMenu.xib 2009-06-21 04:06:24 UTC (rev 52675)
@@ -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="435"/>
- <integer value="420"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -777,13 +777,15 @@
<bool key="NSToolbarPrefersToBeShown">YES</bool>
<bool key="NSToolbarShowsBaselineSeparator">NO</bool>
<bool key="NSToolbarAllowsUserCustomization">YES</bool>
- <bool key="NSToolbarAutosavesConfiguration">NO</bool>
+ <bool key="NSToolbarAutosavesConfiguration">YES</bool>
<int key="NSToolbarDisplayMode">1</int>
<int key="NSToolbarSizeMode">1</int>
<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>0A6EF369-BA7B-4EB1-A4D4-3D4208A23DBE</string>
+ <string>2A4123B2-E41C-4CFF-B486-8B58C858F21C</string>
<string>325B7D9A-C8C9-4EC3-9D84-92D792696EBE</string>
<string>38B3CC5A-730B-4ECF-B057-8254756EF49D</string>
<string>586197FD-62CF-4D3E-AE67-9A57601D5B27</string>
@@ -793,6 +795,50 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSToolbarItem" id="433945624">
+ <object class="NSMutableString" key="NSToolbarItemIdentifier">
+ <characters key="NS.bytes">0A6EF369-BA7B-4EB1-A4D4-3D4208A23DBE</characters>
+ </object>
+ <string key="NSToolbarItemLabel">Sync</string>
+ <string key="NSToolbarItemPaletteLabel">Sync</string>
+ <string key="NSToolbarItemToolTip"/>
+ <nil key="NSToolbarItemView"/>
+ <object class="NSCustomResource" key="NSToolbarItemImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">TB_Sync</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="NSToolbarItem" id="1018787369">
+ <object class="NSMutableString" key="NSToolbarItemIdentifier">
+ <characters key="NS.bytes">2A4123B2-E41C-4CFF-B486-8B58C858F21C</characters>
+ </object>
+ <string key="NSToolbarItemLabel">Selfupdate</string>
+ <string key="NSToolbarItemPaletteLabel">Selfupdate</string>
+ <string key="NSToolbarItemToolTip"/>
+ <nil key="NSToolbarItemView"/>
+ <object class="NSCustomResource" key="NSToolbarItemImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">TB_Upgrade</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="NSToolbarItem" id="618891101">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">325B7D9A-C8C9-4EC3-9D84-92D792696EBE</characters>
@@ -801,10 +847,9 @@
<string key="NSToolbarItemPaletteLabel">Search</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="848482443">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {133, 22}}</string>
- <reference key="NSSuperview"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="618193001">
<int key="NSCellFlags">343014976</int>
@@ -902,7 +947,7 @@
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSAddTemplate</string>
+ <string key="NSResourceName">TB_Install</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
@@ -924,7 +969,7 @@
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSRemoveTemplate</string>
+ <string key="NSResourceName">TB_Uninstall</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
@@ -1024,6 +1069,8 @@
<reference ref="650498606"/>
<reference ref="244855577"/>
<reference ref="341138360"/>
+ <reference ref="433945624"/>
+ <reference ref="1018787369"/>
<reference ref="869476631"/>
<reference ref="49194268"/>
<reference ref="618891101"/>
@@ -1033,6 +1080,8 @@
<reference ref="650498606"/>
<reference ref="244855577"/>
<reference ref="341138360"/>
+ <reference ref="433945624"/>
+ <reference ref="1018787369"/>
<reference ref="49194268"/>
<reference ref="618891101"/>
</object>
@@ -1936,7 +1985,7 @@
<reference ref="385089462"/>
</object>
</object>
- <object class="NSMutableDictionary" id="631904768">
+ <object class="NSMutableDictionary" id="584342397">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2062,7 +2111,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="833924481"/>
<reference ref="328879136"/>
- <reference ref="631904768"/>
+ <reference ref="584342397"/>
</object>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3126,12 +3175,28 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
+ <string key="label">sync:</string>
+ <reference key="source" ref="800227439"/>
+ <reference key="destination" ref="433945624"/>
+ </object>
+ <int key="connectionID">643</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
<string key="label">uninstall:</string>
<reference key="source" ref="800227439"/>
<reference key="destination" ref="244855577"/>
</object>
- <int key="connectionID">632</int>
+ <int key="connectionID">644</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">selfupdate:</string>
+ <reference key="source" ref="800227439"/>
+ <reference key="destination" ref="1018787369"/>
+ </object>
+ <int key="connectionID">646</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3763,6 +3828,8 @@
<reference ref="618891101"/>
<reference ref="650498606"/>
<reference ref="244855577"/>
+ <reference ref="433945624"/>
+ <reference ref="1018787369"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -4253,6 +4320,16 @@
<reference key="object" ref="244855577"/>
<reference key="parent" ref="978062640"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">641</int>
+ <reference key="object" ref="433945624"/>
+ <reference key="parent" ref="978062640"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">645</int>
+ <reference key="object" ref="1018787369"/>
+ <reference key="parent" ref="978062640"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4485,6 +4562,8 @@
<string>627.IBPluginDependency</string>
<string>628.IBPluginDependency</string>
<string>631.IBPluginDependency</string>
+ <string>641.IBPluginDependency</string>
+ <string>645.IBPluginDependency</string>
<string>72.IBPluginDependency</string>
<string>72.ImportedFromIB2</string>
<string>73.IBPluginDependency</string>
@@ -4650,9 +4729,9 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{51, 252}, {773, 449}}</string>
+ <string>{{36, 214}, {773, 449}}</string>
<reference ref="6"/>
- <string>{{51, 252}, {773, 449}}</string>
+ <string>{{36, 214}, {773, 449}}</string>
<reference ref="9"/>
<string>{{33, 99}, {480, 360}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4683,14 +4762,14 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{129, 532}, {617, 169}}</string>
+ <string>{{114, 663}, {617, 0}}</string>
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{650, 176}, {276, 378}}</string>
- <string>{{650, 176}, {276, 378}}</string>
+ <string>{{627, 81}, {276, 378}}</string>
+ <string>{{627, 81}, {276, 378}}</string>
<reference ref="6"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4740,6 +4819,8 @@
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -4786,7 +4867,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">632</int>
+ <int key="maxID">646</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4807,12 +4888,16 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>install:</string>
+ <string>selfupdate:</string>
+ <string>sync:</string>
<string>uninstall:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<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-06-21 03:53:39 UTC (rev 52674)
+++ branches/gsoc09-gui/MPGUI/MPActionLauncher.h 2009-06-21 04:06:24 UTC (rev 52675)
@@ -23,7 +23,7 @@
*/
@interface MPActionLauncher : NSObject {
NSMutableArray *ports;
- BOOL isLoading;
+ BOOL isLoading, isBusy;
}
/*!
@var ports
@@ -37,6 +37,8 @@
*/
@property BOOL isLoading;
+ at property BOOL isBusy;
+
/*!
@brief Return singleton shared MPActionLauncher instance
*/
@@ -59,4 +61,14 @@
*/
- (void)uninstallPortInBackground:(MPPort *)port;
+/*!
+ @brief Syncs the MacPorts installation in another thread
+ */
+- (void)syncInBackground;
+
+/*!
+ @brief Selfupdates the MacPorts installation in another thread
+ */
+- (void)selfupdateInBackground;
+
@end
Modified: branches/gsoc09-gui/MPGUI/MPActionsController.h
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionsController.h 2009-06-21 03:53:39 UTC (rev 52674)
+++ branches/gsoc09-gui/MPGUI/MPActionsController.h 2009-06-21 04:06:24 UTC (rev 52675)
@@ -16,5 +16,7 @@
- (IBAction)install:(id)sender;
- (IBAction)uninstall:(id)sender;
+- (IBAction)sync:(id)sender;
+- (IBAction)selfupdate:(id)sender;
@end
Modified: branches/gsoc09-gui/MPGUI/MPActionsController.m
===================================================================
--- branches/gsoc09-gui/MPGUI/MPActionsController.m 2009-06-21 03:53:39 UTC (rev 52674)
+++ branches/gsoc09-gui/MPGUI/MPActionsController.m 2009-06-21 04:06:24 UTC (rev 52675)
@@ -25,4 +25,18 @@
}
}
+- (IBAction)sync:(id)sender {
+ [[MPActionLauncher sharedInstance] syncInBackground];
+}
+
+- (IBAction)selfupdate:(id)sender {
+ [[MPActionLauncher sharedInstance] selfupdateInBackground];
+}
+
+-(BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem
+{
+ BOOL enable = ![[MPActionLauncher sharedInstance] isBusy];
+ return enable;
+}
+
@end
Modified: branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-06-21 03:53:39 UTC (rev 52674)
+++ branches/gsoc09-gui/MPGUI/MPGUI.xcodeproj/project.pbxproj 2009-06-21 04:06:24 UTC (rev 52675)
@@ -24,6 +24,10 @@
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 */; };
+ 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 */; };
21F166D80FE329A700542AEE /* MacPorts.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 21F165510FE2C04300542AEE /* MacPorts.framework */; };
21F166D90FE329AA00542AEE /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F165510FE2C04300542AEE /* MacPorts.framework */; };
21F1675A0FE3382D00542AEE /* PortsTableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 21F167590FE3382D00542AEE /* PortsTableController.m */; };
@@ -103,6 +107,10 @@
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; };
+ 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>"; };
+ 21B6A3930FEDE6CA001DF976 /* TB_Uninstall.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_Uninstall.icns; sourceTree = "<group>"; };
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>"; };
@@ -229,6 +237,10 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 21B6A38A0FEDCBD5001DF976 /* TB_Install.icns */,
+ 21B6A38B0FEDCBD5001DF976 /* TB_Sync.icns */,
+ 21B6A3930FEDE6CA001DF976 /* TB_Uninstall.icns */,
+ 21B6A38D0FEDCBD5001DF976 /* TB_Upgrade.icns */,
21FC226B0FE88A2A00B1E835 /* Installed.tiff */,
21FC226C0FE88A2A00B1E835 /* Outdated.tiff */,
8D1107310486CEB800E47090 /* Info.plist */,
@@ -342,6 +354,10 @@
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
21FC226D0FE88A2A00B1E835 /* Installed.tiff in Resources */,
21FC226E0FE88A2A00B1E835 /* Outdated.tiff in Resources */,
+ 21B6A38E0FEDCBD5001DF976 /* TB_Install.icns in Resources */,
+ 21B6A38F0FEDCBD5001DF976 /* TB_Sync.icns in Resources */,
+ 21B6A3910FEDCBD5001DF976 /* TB_Upgrade.icns in Resources */,
+ 21B6A3940FEDE6CA001DF976 /* TB_Uninstall.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: branches/gsoc09-gui/MPGUI/TB_Install.icns
===================================================================
(Binary files differ)
Property changes on: branches/gsoc09-gui/MPGUI/TB_Install.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/gsoc09-gui/MPGUI/TB_Sync.icns
===================================================================
(Binary files differ)
Property changes on: branches/gsoc09-gui/MPGUI/TB_Sync.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/gsoc09-gui/MPGUI/TB_Uninstall.icns
===================================================================
(Binary files differ)
Property changes on: branches/gsoc09-gui/MPGUI/TB_Uninstall.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/gsoc09-gui/MPGUI/TB_Upgrade.icns
===================================================================
(Binary files differ)
Property changes on: branches/gsoc09-gui/MPGUI/TB_Upgrade.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090620/ec276e4b/attachment-0001.html>
More information about the macports-changes
mailing list