[69912] branches/gsoc10-gui
tzikis at macports.org
tzikis at macports.org
Wed Jul 21 09:03:13 PDT 2010
Revision: 69912
http://trac.macports.org/changeset/69912
Author: tzikis at macports.org
Date: 2010-07-21 09:03:13 -0700 (Wed, 21 Jul 2010)
Log Message:
-----------
Added a checkbox class, and changed the variants checkboxes to that. Variants selection is complete GUI-wise. The framework MPPort nowalso sends the default_variants it gets, but it doesn't get any in this state
Modified Paths:
--------------
branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m
branches/gsoc10-gui/MacPorts_Framework/MPPort.m
branches/gsoc10-gui/Pallet/English.lproj/MainMenu.xib
branches/gsoc10-gui/Pallet/MPActionsController.h
branches/gsoc10-gui/Pallet/MPActionsController.m
branches/gsoc10-gui/Pallet/Pallet.xcodeproj/project.pbxproj
Added Paths:
-----------
branches/gsoc10-gui/Pallet/MPCheckbox.h
branches/gsoc10-gui/Pallet/MPCheckbox.m
Modified: branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m 2010-07-21 16:03:13 UTC (rev 69912)
@@ -368,6 +368,11 @@
int tclCount;
int tclResult;
int i;
+
+ if([list rangeOfString:@"depends_run"].location != NSNotFound)
+ {
+ //NSLog(@"%@", list);
+ }
const char **tclElements;
tclResult = Tcl_SplitList(_interpreter, [list UTF8String], &tclCount, &tclElements);
if (tclResult == TCL_OK) {
Modified: branches/gsoc10-gui/MacPorts_Framework/MPPort.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPPort.m 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/MacPorts_Framework/MPPort.m 2010-07-21 16:03:13 UTC (rev 69912)
@@ -90,6 +90,12 @@
// tokenize the properties
// create sets of the depends_* tokenized properties that contain only the dependency name, not the dependency type
// make the descriptions readable
+
+ if([string rangeOfString:@"default_variants"].location != NSNotFound)
+ {
+ NSLog(@"%@", string);
+ }
+
if ([self objectForKey:@"maintainers"] != nil) {
[self setObject:[self objectForKey:@"maintainers"] forKey:@"maintainersAsString"];
[self setObject:[interpreter arrayFromTclListAsString:[self objectForKey:@"maintainers"]] forKey:@"maintainers"];
@@ -118,6 +124,13 @@
[self addDependencyAsPortName:@"depends_run"];
}
+ //Code for fetching default variants
+ if ([self objectForKey:@"default_variants"] != nil) {
+ NSLog(@"Default Variants str: %@", string);
+ [self setObject:[self objectForKey:@"default_variants"] forKey:@"default_variantsAsString"];
+ [self setObject:[interpreter arrayFromTclListAsString:[self objectForKey:@"default_variants"]] forKey:@"default_variants"];
+ }
+
@try {
if ([[self valueForKey:@"description"] characterAtIndex:0] == '{') {
[self setValue:[self valueForKey:@"description"] forKey:@"description"];
Modified: branches/gsoc10-gui/Pallet/English.lproj/MainMenu.xib
===================================================================
--- branches/gsoc10-gui/Pallet/English.lproj/MainMenu.xib 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/Pallet/English.lproj/MainMenu.xib 2010-07-21 16:03:13 UTC (rev 69912)
@@ -12,9 +12,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="657"/>
+ <integer value="371"/>
+ <integer value="936"/>
<integer value="840"/>
- <integer value="371"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1025,11 +1025,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"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="618193001">
<int key="NSCellFlags">343014976</int>
@@ -1147,11 +1145,9 @@
<string key="NSToolbarItemPaletteLabel">Install</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSPopUpButton" key="NSToolbarItemView" id="1026904284">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {60, 60}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<int key="NSTag">-1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="8730458">
@@ -1161,10 +1157,6 @@
<reference key="NSControlView" ref="1026904284"/>
<int key="NSButtonFlags">-2046279425</int>
<int key="NSButtonFlags2">70</int>
- <object class="NSCustomResource" key="NSNormalImage" id="758517218">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">TB_Install</string>
- </object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -1177,7 +1169,10 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSImage" ref="758517218"/>
+ <object class="NSCustomResource" key="NSImage" id="994336938">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">TB_Install</string>
+ </object>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="566991132"/>
<string key="NSAction">_popUpItemAction:</string>
@@ -1220,7 +1215,7 @@
<bool key="NSAltersState">YES</bool>
</object>
</object>
- <reference key="NSToolbarItemImage" ref="758517218"/>
+ <reference key="NSToolbarItemImage" ref="994336938"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{32, 32}</string>
@@ -3105,6 +3100,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 305}, {537, 22}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="707808617">
<int key="NSCellFlags">68288064</int>
@@ -3128,6 +3124,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 120}, {144, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="798522413">
<int key="NSCellFlags">68288064</int>
@@ -3144,6 +3141,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 45}, {144, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="998352231">
<int key="NSCellFlags">68288064</int>
@@ -3160,6 +3158,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 20}, {144, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="966698815">
<int key="NSCellFlags">68288064</int>
@@ -3176,6 +3175,7 @@
<int key="NSvFlags">270</int>
<string key="NSFrame">{{29, 218}, {562, 79}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="483525090">
<int key="NSCellFlags">67239424</int>
@@ -3196,6 +3196,7 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{175, 45}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="354994927">
<int key="NSCellFlags">68288064</int>
@@ -3212,6 +3213,7 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{175, 20}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="933723021">
<int key="NSCellFlags">68288064</int>
@@ -3235,6 +3237,7 @@
</object>
<string key="NSFrame">{{175, 120}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="1041076608">
<int key="NSCellFlags">67239424</int>
@@ -3295,6 +3298,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 95}, {144, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="659320119">
<int key="NSCellFlags">68288064</int>
@@ -3318,6 +3322,7 @@
</object>
<string key="NSFrame">{{175, 95}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="484672324">
<int key="NSCellFlags">67239424</int>
@@ -3378,6 +3383,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 70}, {153, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="283467999">
<int key="NSCellFlags">68288064</int>
@@ -3401,6 +3407,7 @@
</object>
<string key="NSFrame">{{175, 70}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="459791851">
<int key="NSCellFlags">67239424</int>
@@ -3473,6 +3480,7 @@
</object>
<string key="NSFrame">{{575, 309}, {32, 32}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="15325454">
<int key="NSCellFlags">130560</int>
@@ -3489,6 +3497,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{29, 145}, {60, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="322020470">
<int key="NSCellFlags">68288064</int>
@@ -3512,6 +3521,7 @@
</object>
<string key="NSFrame">{{175, 145}, {416, 17}}</string>
<reference key="NSSuperview" ref="263175754"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="501461887">
<int key="NSCellFlags">67239424</int>
@@ -3570,6 +3580,7 @@
</object>
<string key="NSFrameSize">{608, 341}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -3835,7 +3846,7 @@
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="59672295">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4130,6 +4141,7 @@
</object>
</object>
<string key="NSFrameSize">{366, 198}</string>
+ <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1024, 578}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -7364,7 +7376,9 @@
<string>1000.IBPluginDependency</string>
<string>1001.IBPluginDependency</string>
<string>1002.IBPluginDependency</string>
+ <string>1003.CustomClassName</string>
<string>1003.IBPluginDependency</string>
+ <string>1004.CustomClassName</string>
<string>1004.IBPluginDependency</string>
<string>1005.IBPluginDependency</string>
<string>1006.IBPluginDependency</string>
@@ -7721,20 +7735,28 @@
<string>942.IBPluginDependency</string>
<string>953.IBPluginDependency</string>
<string>955.IBPluginDependency</string>
+ <string>969.CustomClassName</string>
<string>969.IBPluginDependency</string>
<string>970.IBPluginDependency</string>
<string>971.IBPluginDependency</string>
<string>972.IBPluginDependency</string>
+ <string>979.CustomClassName</string>
<string>979.IBPluginDependency</string>
<string>980.IBPluginDependency</string>
+ <string>981.CustomClassName</string>
<string>981.IBPluginDependency</string>
<string>982.IBPluginDependency</string>
+ <string>983.CustomClassName</string>
<string>983.IBPluginDependency</string>
<string>984.IBPluginDependency</string>
+ <string>994.CustomClassName</string>
<string>994.IBPluginDependency</string>
<string>995.IBPluginDependency</string>
+ <string>997.CustomClassName</string>
<string>997.IBPluginDependency</string>
+ <string>998.CustomClassName</string>
<string>998.IBPluginDependency</string>
+ <string>999.CustomClassName</string>
<string>999.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -7743,7 +7765,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -7989,9 +8013,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{409, 194}, {608, 341}}</string>
+ <string>{{354, 194}, {608, 341}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{409, 194}, {608, 341}}</string>
+ <string>{{354, 194}, {608, 341}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8106,20 +8130,28 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</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>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>MPCheckbox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
@@ -8139,7 +8171,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1038</int>
+ <int key="maxID">1040</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -8334,16 +8366,16 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ActivityController</string>
<string>NSToolbarItem</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
+ <string>MPCheckbox</string>
<string>NSPanel</string>
<string>NSArrayController</string>
<string>NSArrayController</string>
@@ -8391,43 +8423,43 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx0</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx1</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx2</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx3</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx4</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx5</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx6</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx7</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx8</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">chckbx9</string>
- <string key="candidateClassName">NSButton</string>
+ <string key="candidateClassName">MPCheckbox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">infoPanel</string>
@@ -8469,6 +8501,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">MPCheckbox</string>
+ <string key="superclassName">NSButton</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">MPCheckbox.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">MPPortTableView</string>
<string key="superclassName">NSTableView</string>
<object class="NSMutableDictionary" key="outlets">
Modified: branches/gsoc10-gui/Pallet/MPActionsController.h
===================================================================
--- branches/gsoc10-gui/Pallet/MPActionsController.h 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/Pallet/MPActionsController.h 2010-07-21 16:03:13 UTC (rev 69912)
@@ -10,6 +10,7 @@
#import "MPActionLauncher.h"
#import "PortsTableController.h"
#import "ActivityController.h"
+#import "MPCheckbox.h"
#import "GrowlNotifications.h"
@@ -33,18 +34,18 @@
//Info Panel
IBOutlet NSPanel *infoPanel;
- id checkboxes[10];
+ MPCheckbox* checkboxes[10];
- IBOutlet NSButton *chckbx0;
- IBOutlet NSButton *chckbx1;
- IBOutlet NSButton *chckbx2;
- IBOutlet NSButton *chckbx3;
- IBOutlet NSButton *chckbx4;
- IBOutlet NSButton *chckbx5;
- IBOutlet NSButton *chckbx6;
- IBOutlet NSButton *chckbx7;
- IBOutlet NSButton *chckbx8;
- IBOutlet NSButton *chckbx9;
+ IBOutlet MPCheckbox *chckbx0;
+ IBOutlet MPCheckbox *chckbx1;
+ IBOutlet MPCheckbox *chckbx2;
+ IBOutlet MPCheckbox *chckbx3;
+ IBOutlet MPCheckbox *chckbx4;
+ IBOutlet MPCheckbox *chckbx5;
+ IBOutlet MPCheckbox *chckbx6;
+ IBOutlet MPCheckbox *chckbx7;
+ IBOutlet MPCheckbox *chckbx8;
+ IBOutlet MPCheckbox *chckbx9;
}
- (IBAction)openPreferences:(id)sender;
Modified: branches/gsoc10-gui/Pallet/MPActionsController.m
===================================================================
--- branches/gsoc10-gui/Pallet/MPActionsController.m 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/Pallet/MPActionsController.m 2010-07-21 16:03:13 UTC (rev 69912)
@@ -36,11 +36,23 @@
//NSLog(@"%@",[[port valueForKey:@"variants"] objectAtIndex:i]);
if ([checkboxes[i] state] == NSOnState)
{
- [variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]];
- [variants addObject: [NSString stringWithString:@"+"]];
+ if (![checkboxes[i] isDefault])
+ {
+ [variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]];
+ [variants addObject: [NSString stringWithString:@"+"]];
+ }
+
[variantsString appendString:@"+"];
[variantsString appendString:[[port valueForKey:@"variants"] objectAtIndex:i]];
}
+ else if([checkboxes[i] isDefault])
+ {
+ [variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]];
+ [variants addObject: [NSString stringWithString:@"-"]];
+ [variantsString appendString:@"-"];
+ [variantsString appendString:[[port valueForKey:@"variants"] objectAtIndex:i]];
+ }
+
}
//NSLog(@"End of Variants");
@@ -65,7 +77,6 @@
if([[port valueForKey:@"variants"] count] > 0)
{
- //id checkboxes[10];
checkboxes[0]=chckbx0;
checkboxes[1]=chckbx1;
checkboxes[2]=chckbx2;
@@ -81,14 +92,27 @@
{
[checkboxes[i] setAlphaValue:0];
}
- //[chckbx1 setAlphaValue:0];
- //NSLog(@"Variants count: %i", [[port valueForKey:@"variants"] count]);
//NSLog(@"Port variants:");
+
+ NSArray *defaultsArray = [port valueForKey:@"default_variants"];
+ //defaultsArray = [NSArray arrayWithObject:@"universal"];
+ NSLog(@"Default variants count: %i", [defaultsArray count]);
for(UInt i=0; i<[[port valueForKey:@"variants"] count];i++)
{
//NSLog(@"%@",[[port valueForKey:@"variants"] objectAtIndex:i]);
+ if([defaultsArray indexOfObject:[[port valueForKey:@"variants"] objectAtIndex:i]] != NSNotFound)
+ {
+ //NSLog(@"Default %@", [[port valueForKey:@"variants"] objectAtIndex:i]);
+ [checkboxes[i] setState:NSOnState];
+ [checkboxes[i] setIsDefault:YES];
+ }
+ else
+ {
+ [checkboxes[i] setState:NSOffState];
+ [checkboxes[i] setIsDefault:NO];
+ }
+
[checkboxes[i] setAlphaValue:1];
- [checkboxes[i] setState:NSOffState];
NSAttributedString *tempString = [[NSAttributedString alloc]\
initWithString:[[port valueForKey:@"variants"] objectAtIndex:i]\
attributes: [NSDictionary dictionaryWithObject: [NSColor whiteColor] forKey: NSForegroundColorAttributeName]];
Added: branches/gsoc10-gui/Pallet/MPCheckbox.h
===================================================================
--- branches/gsoc10-gui/Pallet/MPCheckbox.h (rev 0)
+++ branches/gsoc10-gui/Pallet/MPCheckbox.h 2010-07-21 16:03:13 UTC (rev 69912)
@@ -0,0 +1,19 @@
+//
+// MPCheckbox.h
+// Pallet
+//
+// Created by Vasileios Georgitzikis on 21/7/10.
+// Copyright 2010 Tzikis. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+ at interface MPCheckbox : NSButton {
+
+
+ BOOL isDefault;
+}
+
+ at property (nonatomic) BOOL isDefault;
+ at end
Added: branches/gsoc10-gui/Pallet/MPCheckbox.m
===================================================================
--- branches/gsoc10-gui/Pallet/MPCheckbox.m (rev 0)
+++ branches/gsoc10-gui/Pallet/MPCheckbox.m 2010-07-21 16:03:13 UTC (rev 69912)
@@ -0,0 +1,16 @@
+//
+// MPCheckbox.m
+// Pallet
+//
+// Created by Vasileios Georgitzikis on 21/7/10.
+// Copyright 2010 Tzikis. All rights reserved.
+//
+
+#import "MPCheckbox.h"
+
+
+ at implementation MPCheckbox
+
+ at synthesize isDefault;
+
+ at end
Modified: branches/gsoc10-gui/Pallet/Pallet.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc10-gui/Pallet/Pallet.xcodeproj/project.pbxproj 2010-07-21 12:05:53 UTC (rev 69911)
+++ branches/gsoc10-gui/Pallet/Pallet.xcodeproj/project.pbxproj 2010-07-21 16:03:13 UTC (rev 69912)
@@ -33,6 +33,8 @@
1D4B87D411A5500100AD9D33 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; };
1D9B73F911F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; };
1D9B73FA11F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; };
+ 1DA3219411F748330004ECB1 /* MPCheckbox.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DA3219311F748330004ECB1 /* MPCheckbox.m */; };
+ 1DA3219511F748330004ECB1 /* MPCheckbox.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DA3219311F748330004ECB1 /* MPCheckbox.m */; };
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
2105F5091028ACBA00A28D1A /* ActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2105F5081028ACBA00A28D1A /* ActivityController.m */; };
21351FB30FEC67780074ACFE /* MPActionsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 21351FB20FEC67780074ACFE /* MPActionsController.m */; };
@@ -186,6 +188,8 @@
1D4B87BA11A54DE000AD9D33 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = "Growl-1.2.1-Framework/Growl.framework"; sourceTree = "<group>"; };
1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPQueueTableView.h; sourceTree = "<group>"; };
1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPQueueTableView.m; sourceTree = "<group>"; };
+ 1DA3219211F748330004ECB1 /* MPCheckbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCheckbox.h; sourceTree = "<group>"; };
+ 1DA3219311F748330004ECB1 /* MPCheckbox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCheckbox.m; sourceTree = "<group>"; };
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
2105F5071028ACBA00A28D1A /* ActivityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityController.h; sourceTree = "<group>"; };
2105F5081028ACBA00A28D1A /* ActivityController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityController.m; sourceTree = "<group>"; };
@@ -324,6 +328,8 @@
21EB8B10100CDD37007371EE /* MPPortTableView.m */,
1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */,
1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */,
+ 1DA3219211F748330004ECB1 /* MPCheckbox.h */,
+ 1DA3219311F748330004ECB1 /* MPCheckbox.m */,
);
name = Helpers;
sourceTree = "<group>";
@@ -617,6 +623,7 @@
21900DDD1095001700ED79CF /* MPPortTableView.m in Sources */,
21900DDE1095001700ED79CF /* ActivityController.m in Sources */,
1D9B73FA11F0F6D6006013F5 /* MPQueueTableView.m in Sources */,
+ 1DA3219511F748330004ECB1 /* MPCheckbox.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -634,6 +641,7 @@
21EB8B11100CDD37007371EE /* MPPortTableView.m in Sources */,
2105F5091028ACBA00A28D1A /* ActivityController.m in Sources */,
1D9B73F911F0F6D6006013F5 /* MPQueueTableView.m in Sources */,
+ 1DA3219411F748330004ECB1 /* MPCheckbox.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100721/57369f61/attachment-0001.html>
More information about the macports-changes
mailing list