From 194873689d1dd426aaa3cd2cee83563e9ec5925c Mon Sep 17 00:00:00 2001 From: Vasileios Georgitzikis Date: Fri, 16 Jul 2010 20:52:55 +0000 Subject: [PATCH] added deletion from queue by clicking backspace. Removed the '-' button from the drawer git-svn-id: https://svn.macports.org/repository/macports/branches/gsoc10-gui@69801 d073be05-634f-4543-b044-5fe20cf6d1d6 --- Pallet/English.lproj/MainMenu.xib | 454 ++++++++++++------------ Pallet/MPActionsController.h | 2 +- Pallet/MPActionsController.m | 3 +- Pallet/MPQueueTableView.h | 18 + Pallet/MPQueueTableView.m | 43 +++ Pallet/Pallet.xcodeproj/project.pbxproj | 8 + 6 files changed, 296 insertions(+), 232 deletions(-) create mode 100644 Pallet/MPQueueTableView.h create mode 100644 Pallet/MPQueueTableView.m diff --git a/Pallet/English.lproj/MainMenu.xib b/Pallet/English.lproj/MainMenu.xib index 7118409..3c36f66 100644 --- a/Pallet/English.lproj/MainMenu.xib +++ b/Pallet/English.lproj/MainMenu.xib @@ -1132,10 +1132,6 @@ -2046279425 70 - - NSImage - TB_Install - 400 @@ -1148,7 +1144,10 @@ 1048576 2147483647 1 - + + NSImage + TB_Install + _popUpItemAction: @@ -1191,7 +1190,7 @@ YES - + {32, 32} @@ -1368,17 +1367,17 @@ 274 YES - + 290 YES - - + + 257 {{741, 4}, {18, 18}} - - + + -1 YES @@ -1406,9 +1405,9 @@ - + _addOption: - + -2038284033 36 @@ -1421,12 +1420,12 @@ 75 - - + + 257 {{721, 4}, {18, 18}} - - + + -1 YES @@ -1450,9 +1449,9 @@ - + _deleteOption: - + -2038284033 36 @@ -1462,10 +1461,10 @@ - + 256 {{7, 3}, {58, 19}} - + -1 YES @@ -1529,11 +1528,11 @@ - + 256 {{71, 3}, {167, 19}} - - + + -1 YES @@ -1591,7 +1590,7 @@ {{71, 3}, {167, 19}} YES - + YES YES @@ -1617,7 +1616,7 @@ - + YES YES @@ -1634,23 +1633,23 @@ 2 {{7, 3}, {58, 19}} {{71, 3}, {167, 19}} - - + + 0 0 YES - + 290 YES - - + + 257 {{741, 4}, {18, 18}} - - + + -1 YES @@ -1674,9 +1673,9 @@ - + _addOption: - + -2038284033 36 @@ -1685,12 +1684,12 @@ 75 - - + + 257 {{721, 4}, {18, 18}} - - + + -1 YES @@ -1714,9 +1713,9 @@ - + _deleteOption: - + -2038284033 36 @@ -1726,10 +1725,10 @@ - + 256 {{37, 3}, {76, 19}} - + -1 YES @@ -1809,10 +1808,10 @@ - + 256 {{119, 3}, {95, 19}} - + -1 YES @@ -1904,11 +1903,11 @@ - + 256 {{220, 4}, {61, 18}} - - + + YES 343014976 @@ -1941,7 +1940,7 @@ {{220, 4}, {61, 18}} YES - + YES YES @@ -1968,7 +1967,7 @@ - + YES YES @@ -1981,7 +1980,7 @@ - + YES YES @@ -1999,22 +1998,22 @@ {{37, 3}, {76, 19}} {{119, 3}, {95, 19}} {{220, 4}, {61, 18}} - - + + 0 0 YES - + 290 YES - - + + 257 {{741, 4}, {18, 18}} - + -1 YES @@ -2039,9 +2038,9 @@ - + _addOption: - + -2038284033 36 @@ -2050,12 +2049,12 @@ 75 - - + + 257 {{721, 4}, {18, 18}} - - + + -1 YES @@ -2079,9 +2078,9 @@ - + _deleteOption: - + -2038284033 36 @@ -2091,10 +2090,10 @@ - + 256 {{37, 3}, {64, 19}} - + -1 YES @@ -2149,10 +2148,10 @@ - + 256 {{107, 3}, {46, 19}} - + -1 YES @@ -2196,11 +2195,11 @@ - + 256 {{159, 3}, {155, 19}} - - + + -1 YES @@ -2310,7 +2309,7 @@ {{159, 3}, {155, 19}} YES - + YES YES @@ -2337,7 +2336,7 @@ - + YES YES @@ -2350,7 +2349,7 @@ - + YES YES @@ -2368,8 +2367,8 @@ {{37, 3}, {64, 19}} {{107, 3}, {46, 19}} {{159, 3}, {155, 19}} - - + + 0 0 YES @@ -2377,7 +2376,7 @@ {{1, 1}, {769, 73}} - + @@ -2421,8 +2420,8 @@ YES YES - - + + YES @@ -2445,9 +2444,9 @@ YES YES - - - + + + YES @@ -2474,9 +2473,9 @@ YES YES - - - + + + YES @@ -2497,9 +2496,9 @@ YES - - - + + + YES @@ -3380,30 +3379,10 @@ 256 YES - - - 294 - {{0, -1}, {40, 35}} - - YES - - -2080244224 - 134217728 - - - - - -2033434369 - 162 - - - 400 - 75 - - 290 - {{40, -1}, {244, 35}} + {{0, -1}, {284, 35}} YES @@ -5005,22 +4984,6 @@ 918 - - - removeFromQueueButton - - - - 922 - - - - removeFromQueue: - - - - 923 - install: @@ -5237,6 +5200,14 @@ 1011 + + + queue + + + + 1022 + @@ -6664,9 +6635,8 @@ YES - - + Drawer Content View @@ -6676,72 +6646,6 @@ - - 850 - - - YES - - - - - - - - - 851 - - - - - 852 - - - - - 853 - - - YES - - - - - - - - 854 - - - - - 855 - - - YES - - - - - - 856 - - - YES - - - - - - 857 - - - - - 858 - - - 867 @@ -6762,15 +6666,6 @@ - - 885 - - - YES - - - - 901 @@ -6824,25 +6719,6 @@ - - 916 - - - - - 919 - - - YES - - - - - - 920 - - - 924 @@ -7081,6 +6957,86 @@ + + 850 + + + YES + + + + + + + + + 854 + + + + + 853 + + + YES + + + + + + + + 885 + + + YES + + + + + + 916 + + + + + 855 + + + YES + + + + + + 858 + + + + + 856 + + + YES + + + + + + 857 + + + + + 852 + + + + + 851 + + + @@ -7401,6 +7357,7 @@ 850.IBPluginDependency 851.IBPluginDependency 852.IBPluginDependency + 853.CustomClassName 853.IBPluginDependency 854.IBPluginDependency 855.IBPluginDependency @@ -7420,10 +7377,8 @@ 900.IBPluginDependency 901.IBPluginDependency 916.IBPluginDependency - 919.IBPluginDependency 92.IBPluginDependency 92.ImportedFromIB2 - 920.IBPluginDependency 924.IBPluginDependency 927.IBPluginDependency 929.IBPluginDependency @@ -7603,10 +7558,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{34, 50}, {773, 452}} + {{34, 79}, {773, 452}} com.apple.InterfaceBuilder.CocoaPlugin - {{34, 50}, {773, 452}} + {{34, 79}, {773, 452}} {{33, 99}, {480, 360}} com.apple.InterfaceBuilder.CocoaPlugin @@ -7764,12 +7719,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{299, 136}, {284, 468}} + {{330, 136}, {284, 468}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + MPQueueTableView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7790,14 +7746,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{316, 191}, {366, 198}} com.apple.InterfaceBuilder.CocoaPlugin {{316, 191}, {366, 198}} @@ -7840,7 +7794,7 @@ - 1011 + 1022 @@ -8181,6 +8135,46 @@ MPPortTableView.h + + MPQueueTableView + NSTableView + + YES + + YES + queue + queueArray + + + YES + NSArrayController + NSMutableArray + + + + YES + + YES + queue + queueArray + + + YES + + queue + NSArrayController + + + queueArray + NSMutableArray + + + + + IBProjectSource + MPQueueTableView.h + + PortsTableController NSObject diff --git a/Pallet/MPActionsController.h b/Pallet/MPActionsController.h index 2857ff7..d303e4f 100644 --- a/Pallet/MPActionsController.h +++ b/Pallet/MPActionsController.h @@ -57,7 +57,7 @@ extern BOOL altWasPressed; - (void) queueOperation: (NSString*) operation portName: (NSString*) name portObject: (id) port variants: (NSMutableArray*) variants; -(IBAction) startQueue:(id) sender; --(IBAction) removeFromQueue:(id) sender; +//-(IBAction) removeFromQueue:(id) sender; -(void) clearQueue; -(void) advanceQueue; diff --git a/Pallet/MPActionsController.m b/Pallet/MPActionsController.m index 97597fe..8e63f98 100644 --- a/Pallet/MPActionsController.m +++ b/Pallet/MPActionsController.m @@ -388,13 +388,14 @@ //[queue retain]; } +/* -(void) removeFromQueue:(id)sender { UInt index = [queue selectionIndex]; [queue removeObject: [[queue selectedObjects] objectAtIndex:0]]; [queue setSelectionIndex: index]; } - +*/ -(void) clearQueue { diff --git a/Pallet/MPQueueTableView.h b/Pallet/MPQueueTableView.h new file mode 100644 index 0000000..6dc2696 --- /dev/null +++ b/Pallet/MPQueueTableView.h @@ -0,0 +1,18 @@ +// +// MPQueueTableView.h +// Pallet +// +// Created by Vasileios Georgitzikis on 16/7/10. +// Copyright 2010 Tzikis. All rights reserved. +// + +#import + + +@interface MPQueueTableView : NSTableView +{ + IBOutlet NSMutableArray *queueArray; + IBOutlet NSArrayController *queue; +} + +@end diff --git a/Pallet/MPQueueTableView.m b/Pallet/MPQueueTableView.m new file mode 100644 index 0000000..a0dbb9d --- /dev/null +++ b/Pallet/MPQueueTableView.m @@ -0,0 +1,43 @@ +// +// MPQueueTableView.m +// Pallet +// +// Created by Vasileios Georgitzikis on 16/7/10. +// Copyright 2010 Tzikis. All rights reserved. +// + +#import "MPQueueTableView.h" + + +@implementation MPQueueTableView + + +-(void)keyDown:(NSEvent *)theEvent { + /* + if ([[theEvent characters] characterAtIndex:0] == NSDeleteCharacter || [[theEvent characters] characterAtIndex:0] == NSBackspaceCharacter && [variantsPanel isVisible])) { + NSLog(@"wtf1"); + if ([variantsPanel isVisible]) { + [variantsPanel close]; + //[variantsPanel close]; + } else { + [variantsPanel makeKeyAndOrderFront:self]; + } + } else { + NSLog(@"wtf2"); + [super keyDown:theEvent]; + } + */ + if ([[theEvent characters] characterAtIndex:0] == NSDeleteCharacter || [[theEvent characters] characterAtIndex:0] == NSBackspaceCharacter) + { + NSLog(@"Deleting our shit"); + NSLog(@"Selection: %i", [queue selectionIndex]); + if([queue selectionIndex]>=0) [queue removeObjectAtArrangedObjectIndex:[queue selectionIndex]]; + } + else + { + [super keyDown:theEvent]; + } + +} + +@end diff --git a/Pallet/Pallet.xcodeproj/project.pbxproj b/Pallet/Pallet.xcodeproj/project.pbxproj index 639d9e7..a93405e 100644 --- a/Pallet/Pallet.xcodeproj/project.pbxproj +++ b/Pallet/Pallet.xcodeproj/project.pbxproj @@ -29,6 +29,8 @@ 1D4B87BC11A54DE000AD9D33 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; 1D4B87CE11A54FEF00AD9D33 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; 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 */; }; 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 */; }; @@ -179,6 +181,8 @@ 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_InstallWithVar.icns; sourceTree = ""; }; 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Growl Registration Ticket.growlRegDict"; sourceTree = ""; }; 1D4B87BA11A54DE000AD9D33 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = "Growl-1.2.1-Framework/Growl.framework"; sourceTree = ""; }; + 1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPQueueTableView.h; sourceTree = ""; }; + 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPQueueTableView.m; sourceTree = ""; }; 1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; 2105F5071028ACBA00A28D1A /* ActivityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityController.h; sourceTree = ""; }; 2105F5081028ACBA00A28D1A /* ActivityController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityController.m; sourceTree = ""; }; @@ -315,6 +319,8 @@ 21FC233A0FE8AB0400B1E835 /* StatePredicateTemplate.m */, 21EB8B0F100CDD37007371EE /* MPPortTableView.h */, 21EB8B10100CDD37007371EE /* MPPortTableView.m */, + 1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */, + 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */, ); name = Helpers; sourceTree = ""; @@ -604,6 +610,7 @@ 21900DDC1095001700ED79CF /* PreferencesController.m in Sources */, 21900DDD1095001700ED79CF /* MPPortTableView.m in Sources */, 21900DDE1095001700ED79CF /* ActivityController.m in Sources */, + 1D9B73FA11F0F6D6006013F5 /* MPQueueTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -620,6 +627,7 @@ 21E2ADB71002EAE0003F8885 /* PreferencesController.m in Sources */, 21EB8B11100CDD37007371EE /* MPPortTableView.m in Sources */, 2105F5091028ACBA00A28D1A /* ActivityController.m in Sources */, + 1D9B73F911F0F6D6006013F5 /* MPQueueTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };