Homepage: <http://handbrake.fr/>.
It may be used under the terms of the GNU General Public License. */
-#include "HBQueueController.h"
-#include "Controller.h"
+#import "HBQueueController.h"
+#import "Controller.h"
#import "HBImageAndTextCell.h"
#define HB_ROW_HEIGHT_TITLE_ONLY 17.0
{
// Set the fIsDragging flag so that other's know that a drag operation is being
// performed.
- fIsDragging = YES;
+ fIsDragging = YES;
// By default, NSTableView only drags an image of the first column. Change this to
// drag an image of the queue's icon and desc columns.
// for us to detect when a drag has finished. You can't do it in acceptDrop because
// that won't be called if the dragged item is released outside the view.
[super mouseDown:theEvent];
- fIsDragging = NO;
+ fIsDragging = NO;
}
#endif
hb_audio_config_t * audio;
NSString * thisJobAudioCodecs = [NSString stringWithFormat:@""];
NSString * thisJobAudioInfo = [NSString stringWithFormat:@""];
- for( int i = 0; i < hb_list_count(job->list_audio); i++ )
+ int i;
+ for( i = 0; i < hb_list_count(job->list_audio); i++ )
{
audio = (hb_audio_config_t *) hb_list_audio_config_item( job->list_audio, i );
/* Output Codec */
else if (audio->out.codec == HB_ACODEC_VORBIS)
outputCodec = @"Vorbis";
else
- outputCodec = @"Unknown Codec";
+ outputCodec = @"Unknown Codec";
/* Add the codec to the audio codecs list ( We should check against dupes)*/
thisJobAudioCodecs = [thisJobAudioCodecs stringByAppendingString:[NSString stringWithFormat:@" %@,",outputCodec]];
if (i > 0)
thisJobAudioInfo = [thisJobAudioInfo stringByAppendingString:[NSString stringWithFormat:@"Track %d: Source: %@ Output: %@, 6 Channel Discreet", i + 1, [NSString stringWithUTF8String:audio->lang.description], outputCodec]];
else
thisJobAudioInfo = [thisJobAudioInfo stringByAppendingString:[NSString stringWithFormat:@"Track %d: Source: %@ Output: Unknown Codec Info", i + 1, [NSString stringWithUTF8String:audio->lang.description]]];
-
+
thisJobAudioInfo = [thisJobAudioInfo stringByAppendingString:[NSString stringWithFormat:@", %d kbps, %d Hz", audio->out.bitrate, audio->out.samplerate]];
-
+
}
audioinfo_summary = [[NSString stringWithFormat:@"%@",thisJobAudioInfo]retain];
audioinfo_codecs = [[NSString stringWithFormat:@"%@",thisJobAudioCodecs]retain];
-
+
subtitle = job->subtitle;
mux = job->mux;
if (job->file)
anamorphic_width = 0; // not needed for this case
anamorphic_height = 0; // not needed for this case
}
-
+
}
return self;
}
{
NSMutableAttributedString * finalString = [[[NSMutableAttributedString alloc] initWithString: @""] autorelease];
-
+
// Attributes
NSMutableParagraphStyle * ps = [HBJob descriptionParagraphStyle];
NSDictionary* detailAttr = [HBJob descriptionDetailAttribute];
[finalString appendAttributedString:imageAsString];
}
-
+
// Note: use title->name instead of title->dvd since name is just the chosen
// folder, instead of dvd which is the full path
[finalString appendString:titleName withAttributes:titleAttr];
-
+
NSString * summaryInfo;
-
+
NSString * chapterString = (chapter_start == chapter_end) ?
[NSString stringWithFormat:@"Chapter %d", chapter_start] :
[NSString stringWithFormat:@"Chapters %d through %d", chapter_start, chapter_end];
summaryInfo = [NSString stringWithFormat: @" (Title %d, %@, %d Video Passes)", titleIndex, chapterString, numVideoPasses];
[finalString appendString:[NSString stringWithFormat:@"%@\n", summaryInfo] withAttributes:detailAttr];
-
+
// Insert a short-in-height line to put some white space after the title
[finalString appendString:@"\n" withAttributes:shortHeightAttr];
}
-
+
// End of title stuff
-
+
// Pass Name
if (withPassName)
[finalString appendAttributedString:imageAsString];
}
-
+
NSString * jobPassName;
if (pass == -1)
jobPassName = NSLocalizedString (@"Deep Scan", nil);
{
// Deterimine for sure how we are now setting iPod uuid atom
if (h264_level) // We are encoding for iPod
- jobVideoCodec = @"x264 (H.264 iPod)"; // HB_VCODEC_X264
+ jobVideoCodec = @"x264 (H.264 iPod)"; // HB_VCODEC_X264
else
jobVideoCodec = @"x264 (H.264 Main)"; // HB_VCODEC_X264
}
}
if (jobVideoCodec == nil)
jobVideoCodec = @"unknown";
-
- // Audio Codec needed by FormatInfo and AudioInfo
- NSString * jobAudioCodec = nil;
- if (withFormatInfo || withAudioInfo)
- {
- if (acodec == 256)
- jobAudioCodec = @"AAC"; // HB_ACODEC_FAAC
- else if (acodec == 512)
- jobAudioCodec = @"MP3"; // HB_ACODEC_LAME
- else if (acodec == 1024)
- jobAudioCodec = @"Vorbis"; // HB_ACODEC_VORBIS
- else if (acodec == 2048)
- jobAudioCodec = @"AC3"; // HB_ACODEC_AC3
- }
- if (jobAudioCodec == nil)
- jobAudioCodec = @"unknown";
-
if (withFormatInfo)
{
jobFormatInfo = @"MKV"; // HB_MUX_MKV
else
jobFormatInfo = @"unknown";
-
+
if (chapter_markers == 1)
jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video + %@ Audio, Chapter Markers\n", jobFormatInfo, jobVideoCodec, audioinfo_codecs];
else
jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video + %@ Audio\n", jobFormatInfo, jobVideoCodec, audioinfo_codecs];
-
+
[finalString appendString: @"Format: " withAttributes:detailBoldAttr];
[finalString appendString: jobFormatInfo withAttributes:detailAttr];
}
jobPictureInfo = [NSString stringWithFormat:@"%d x %d", output_width, output_height];
if (keep_ratio == 1)
jobPictureInfo = [jobPictureInfo stringByAppendingString:@" Keep Aspect Ratio"];
-
+
if (grayscale == 1)
jobPictureInfo = [jobPictureInfo stringByAppendingString:@", Grayscale"];
-
+
if (deinterlace == 1)
jobPictureInfo = [jobPictureInfo stringByAppendingString:@", Deinterlace"];
if (withIcon) // implies indent the info
[finalString appendString: @"Picture: " withAttributes:detailBoldAttr];
[finalString appendString:[NSString stringWithFormat:@"%@\n", jobPictureInfo] withAttributes:detailAttr];
}
-
+
if (withVideoInfo)
{
NSString * jobVideoQuality;
NSString * jobVideoDetail;
-
+
if (vquality <= 0 || vquality >= 1)
jobVideoQuality = [NSString stringWithFormat:@"%d kbps", vbitrate];
else
vidQuality = [NSNumber numberWithInt:vquality * 100];
// this is screwed up kind of. Needs to be formatted properly.
if (crf == 1)
- jobVideoQuality = [NSString stringWithFormat:@"%@%% CRF", vidQuality];
+ jobVideoQuality = [NSString stringWithFormat:@"%@%% CRF", vidQuality];
else
jobVideoQuality = [NSString stringWithFormat:@"%@%% CQP", vidQuality];
}
-
+
if (vrate_base == 1126125)
{
// NTSC FILM 23.976
[finalString appendString: @"Video: " withAttributes:detailBoldAttr];
[finalString appendString:[NSString stringWithFormat:@"%@\n", jobVideoDetail] withAttributes:detailAttr];
}
-
+
if (withx264Info)
{
if (vcodec == HB_VCODEC_X264 && x264opts)
[finalString appendString: @"Audio: " withAttributes:detailBoldAttr];
[finalString appendString:[NSString stringWithFormat:@"%@\n", audioinfo_summary] withAttributes:detailAttr];
}
-
+
if (withSubtitleInfo)
{
// subtitle scan == -1 in two cases:
}
}
}
-
-
+
+
if ([[finalString string] hasSuffix: @"\n"])
[finalString deleteCharactersInRange: NSMakeRange([[finalString string] length]-1, 1)];
-
+
return finalString;
}
[self setNeedsDescription: NO];
fStatus = HBStatusNone;
}
- return self;
+ return self;
}
- (void) dealloc
return [fJobs indexOfObject: aJob];
}
-- (NSEnumerator *) jobEnumerator
+- (NSMutableArray *) fJobs
{
- return [fJobs objectEnumerator];
+ return fJobs;
}
- (void) setNeedsDescription: (BOOL)flag
{
fNeedsDescription = NO;
- [fDescription deleteCharactersInRange: NSMakeRange(0, [fDescription length])];
+ [fDescription deleteCharactersInRange: NSMakeRange(0, [fDescription length])];
if ([self count] == 0)
{
NSAssert(NO, @" jobgroup with no jobs");
return;
}
-
+
HBJob * job = [self jobAtIndex:0];
-
+
// append the title
[fDescription appendAttributedString: [job attributedDescriptionWithIcon: NO
withTitle: YES
[fDescription appendString:fPresetName withAttributes:[HBJob descriptionDetailAttribute]];
[fDescription appendString:@"\n" withAttributes:[HBJob descriptionDetailAttribute]];
}
-
+
// append the format and destinaton
[fDescription appendAttributedString: [job attributedDescriptionWithIcon: NO
withTitle: NO
withSubtitleInfo: NO]];
- static NSAttributedString * carriageReturn = [[NSAttributedString alloc] initWithString:@"\n"];
-
- NSEnumerator * e = [self jobEnumerator];
- while ( (job = [e nextObject]) )
+ NSAttributedString * carriageReturn = [[NSAttributedString alloc] initWithString:@"\n"];
+
+ for( job in fJobs )
{
int pass = job->pass;
[fDescription appendAttributedString:carriageReturn];
withAudioInfo: pass == 0 || pass == 2
withSubtitleInfo: YES]];
}
-
+
}
- (NSMutableAttributedString *) attributedDescription
// Try to return the cached value if no changes have happened since the last time
if ((width == fLastDescriptionWidth) && (fLastDescriptionHeight != 0) && !fNeedsDescription)
return fLastDescriptionHeight;
-
+
if (fNeedsDescription)
[self updateDescription];
- // Calculate the height
+ // Calculate the height
NSRect bounds = [fDescription boundingRectWithSize:NSMakeSize(width, 10000) options:NSStringDrawingUsesLineFragmentOrigin];
fLastDescriptionHeight = bounds.size.height + 6.0; // add some border to bottom
fLastDescriptionWidth = width;
NSDictionary * userInfo = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:self->fStatus] forKey:@"HBOldJobGroupStatus"];
self->fStatus = status;
-
+
// Send notification with old status
[[NSNotificationCenter defaultCenter] postNotificationName:HBJobGroupStatusNotification object:self userInfo:userInfo];
}
{
if (showPane == fCurrentJobPaneShown)
return;
-
+
// Things to keep in mind:
// - When the current job pane is shown, it occupies the upper portion of the
// window with the queue occupying the bottom portion of the window.
// - When the current job pane is hidden, it slides up and out of view.
// NSView setHidden is NOT used. The queue pane is resized to occupy the full
// window.
-
+
NSRect windowFrame = [[fCurrentJobPane superview] frame];
NSRect queueFrame, jobFrame;
if (showPane)
jobFrame = [fCurrentJobPane frame];
jobFrame.origin.y = NSHeight(windowFrame);
}
-
+
// Move fCurrentJobPane
NSDictionary * dict1 = [NSDictionary dictionaryWithObjectsAndKeys:
fCurrentJobPane, NSViewAnimationTargetKey,
[anAnimation setDuration:0.25];
[anAnimation setAnimationBlockingMode:NSAnimationBlocking]; // prevent user from resizing the window during an animation
[anAnimation startAnimation];
-
+
fCurrentJobPaneShown = showPane;
}
//------------------------------------------------------------------------------------
- (HBJobGroup *) pendingJobGroupWithDestinationPath: (NSString *)path
{
- HBJobGroup * aJobGroup;
- NSEnumerator * groupEnum = [fJobGroups objectEnumerator];
- while ( (aJobGroup = [groupEnum nextObject]) )
+ for( HBJobGroup * aJobGroup in fJobGroups )
{
if ([[aJobGroup destinationPath] isEqualToString: path])
return aJobGroup;
//------------------------------------------------------------------------------------
- (HBJob *) findJobWithID: (int)aJobID
{
- HBJobGroup * aJobGroup;
- NSEnumerator * groupEnum = [fJobGroups objectEnumerator];
- while ( (aJobGroup = [groupEnum nextObject]) )
+ for( HBJobGroup * aJobGroup in fJobGroups )
{
- HBJob * job;
- NSEnumerator * jobEnum = [aJobGroup jobEnumerator];
- while ( (job = [jobEnum nextObject]) )
+ for( HBJob * job in [aJobGroup fJobs] )
{
if (job->sequence_id == aJobID)
return job;
fCanceledCount = 0;
fWorkingCount = 0;
- NSEnumerator * groupEnum = [fJobGroups objectEnumerator];
- HBJobGroup * aJobGroup;
- while ( (aJobGroup = [groupEnum nextObject]) )
+ for( HBJobGroup * aJobGroup in fJobGroups )
{
switch ([aJobGroup status])
{
fSavedExpandedItems = [[NSMutableIndexSet alloc] init];
else
[fSavedExpandedItems removeAllIndexes];
-
+
// This code stores the sequence_id of the first job of each job group into an
// index set. This is sufficient to identify each group uniquely.
-
+
HBJobGroup * aJobGroup;
- NSEnumerator * e = [fJobGroups objectEnumerator];
- while ( (aJobGroup = [e nextObject]) )
+ for( aJobGroup in fJobGroups )
{
if ([fOutlineView isItemExpanded: aJobGroup])
[fSavedExpandedItems addIndex: [aJobGroup jobAtIndex:0]->sequence_id];
}
-
+
// Save the selection also.
if (!fSavedSelectedItems)
{
if (fSavedExpandedItems)
{
- HBJobGroup * aJobGroup;
- NSEnumerator * e = [fJobGroups objectEnumerator];
- while ( (aJobGroup = [e nextObject]) )
+ for( HBJobGroup * aJobGroup in fJobGroups )
{
HBJob * job = [aJobGroup jobAtIndex:0];
if (job && [fSavedExpandedItems containsIndex: job->sequence_id])
[fOutlineView expandItem: aJobGroup];
}
}
-
+
if (fSavedSelectedItems)
{
NSMutableIndexSet * rowsToSelect = [[[NSMutableIndexSet alloc] init] autorelease];
- HBJobGroup * aJobGroup;
- NSEnumerator * e = [fJobGroups objectEnumerator];
NSInteger i = 0;
- while ( (aJobGroup = [e nextObject]) )
+ for( HBJobGroup * aJobGroup in fJobGroups )
{
HBJob * job = [aJobGroup jobAtIndex:0];
if (job && [fSavedSelectedItems containsIndex: job->sequence_id])
msg = NSLocalizedString( @"Encoding movie", nil );
else
return @""; // unknown condition!
-
+
if( s->param.working.seconds > -1 )
{
return [NSString stringWithFormat:
else if (s->state == HB_STATE_WORKDONE)
return NSLocalizedString( @"Done", nil );
-
+
return @"";
}
#define p s->param.working
if (p.seconds < 0)
return @"";
-
+
// Minutes always needed
NSString * minutes;
if (p.minutes > 1)
minutes = NSLocalizedString( @"1 minute ", nil );
else
minutes = @"";
-
+
if (p.hours >= 1)
{
NSString * hours;
return [NSString stringWithFormat:NSLocalizedString( @"%@%@remaining", nil ), hours, minutes];
}
-
+
else
{
NSString * seconds;
*/
#undef p
}
-
+
return @"";
}
[fProgressBar setDoubleValue:progress_total];
#undef p
}
-
+
else if (s->state == HB_STATE_MUXING)
{
#define p s->param.muxing
[fProgressBar setIndeterminate:NO];
[fProgressBar stopAnimation:nil];
[fProgressBar setDoubleValue:0.0];
-
-
}
-
+
else
[fProgressBar stopAnimation:nil]; // just in case in was animating
}
withAudioInfo: NO
withSubtitleInfo: YES]];
break;
-
+
case 1: // video 1st pass
[fJobDescTextField setAttributedStringValue:
[fCurrentJob attributedDescriptionWithIcon: NO
withAudioInfo: NO
withSubtitleInfo: NO]];
break;
-
+
case 0: // single pass
case 2: // video 2nd pass + audio
[fJobDescTextField setAttributedStringValue:
withAudioInfo: YES
withSubtitleInfo: YES]];
break;
-
+
default: // unknown
[fJobDescTextField setAttributedStringValue:
[fCurrentJob attributedDescriptionWithIcon: NO
else
{
[fJobDescTextField setStringValue: @"No encodes pending"];
-
+
}
-
+
}
//------------------------------------------------------------------------------------
[self setJobGroupCountsNeedUpdating:YES];
[fOutlineView noteNumberOfRowsChanged];
[fOutlineView reloadData];
- [self restoreOutlineViewState];
+ [self restoreOutlineViewState];
[self updateQueueCountField];
}
- (IBAction)removeSelectedJobGroups: (id)sender
{
if (!fHandle) return;
-
+
NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
NSInteger row = [selectedRows firstIndex];
if (row != NSNotFound)
break;
case HBStatusPending:
// Remove from libhb
- HBJob * job;
- NSEnumerator * e = [jobGroup jobEnumerator];
- while (job = [e nextObject])
+ for( HBJob * job in [jobGroup fJobs] )
{
hb_job_t * libhbJob = [self findLibhbJobWithID:job->sequence_id];
if (libhbJob)
case HBStatusNone:
break;
}
-
+
row = [selectedRows indexGreaterThanIndex: row];
}
[self endEditingJobGroupsArray];
- }
+ }
}
//------------------------------------------------------------------------------------
- (IBAction)revealSelectedJobGroups: (id)sender
{
if (!fHandle) return;
-
+
NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
NSInteger row = [selectedRows firstIndex];
if (row != NSNotFound)
HBJobGroup * jobGroup = [fOutlineView itemAtRow: row];
if ([[jobGroup destinationPath] length])
[[NSWorkspace sharedWorkspace] selectFile:[jobGroup destinationPath] inFileViewerRootedAtPath:nil];
-
+
row = [selectedRows indexGreaterThanIndex: row];
}
- }
+ }
}
//------------------------------------------------------------------------------------
- (IBAction)toggleStartCancel: (id)sender
{
if (!fHandle) return;
-
+
hb_state_t s;
hb_get_state2 (fHandle, &s);
- (IBAction)togglePauseResume: (id)sender
{
if (!fHandle) return;
-
+
hb_state_t s;
hb_get_state2 (fHandle, &s);
}
#pragma mark -
-#pragma mark Synchronizing with libhb
+#pragma mark Synchronizing with libhb
//------------------------------------------------------------------------------------
// Queues a job group. The job group's status is set to HBStatusPending.
{
NSAssert(![fJobGroups containsObject:aJobGroup], @"Duplicate job group");
[aJobGroup setStatus:HBStatusPending];
-
+
[self beginEditingJobGroupsArray];
[fJobGroups addObject:aJobGroup];
[self endEditingJobGroupsArray];
//------------------------------------------------------------------------------------
- (void)currentJobChanged: (HBJob *) currentJob
{
- /* if the job has a destination path, lets perform finished job notifications in fHBController
+ /* if the job has a destination path, lets perform finished job notifications in fHBController
* We call this here so that we pickup the last job in the queue and single encodes before fCurrentJob
* is released. So for the first job and the beginning of single encodes we check for the existence
* of a valid fCurrentJob jobGroup
[fHBController writeToActivityLog: "Using preset: %s", [[[fCurrentJob jobGroup] presetName] UTF8String]];
// Check to see if this is also a change in Job Group
-
+
HBJobGroup * theJobGroup = [currentJob jobGroup];
if ((theJobGroup == nil) || (theJobGroup != fCurrentJobGroup)) // no more job groups or start of a new group
{
{
[fCurrentJobGroup setStatus:HBStatusCompleted];
}
-
-
+
}
-
+
// Set the new group
[self setCurrentJobGroup: theJobGroup];
-
+
// Update the UI
[self updateCurrentJobDescription];
[self updateCurrentJobProgress];
else
[self stopAnimatingCurrentJobGroupInQueue];
}
-
+
else // start a new job/pass in the same group
{
// Update the UI
//------------------------------------------------------------------------------------
// Notifies HBQueueController that libhb's state has changed
//------------------------------------------------------------------------------------
-- (void)libhbStateChanged: (hb_state_t &)state
+- (void)libhbStateChanged: (hb_state_t)state
{
switch( state.state )
{
- (void) jobGroupStatusNotification:(NSNotification *)notification
{
[self setJobGroupCountsNeedUpdating: YES];
-// HBQueueJobGroupStatus oldStatus = (HBQueueJobGroupStatus) [[[notification userInfo] objectForKey:@"HBOldJobGroupStatus"] intValue];
+// HBQueueJobGroupStatus oldStatus = (HBQueueJobGroupStatus) [[[notification userInfo] objectForKey:@"HBOldJobGroupStatus"] integerValue];
HBJobGroup * jobGroup = [notification object];
if (jobGroup)
[self updateJobGroupInQueue:jobGroup];
// Required delegate method: Given an item identifier, this method returns an item.
// The toolbar will use this method to obtain toolbar items that can be displayed
// in the customization sheet, or in the toolbar itself.
-
+
NSToolbarItem *toolbarItem = nil;
-
+
if ([itemIdentifier isEqual: HBQueueStartCancelToolbarIdentifier])
{
toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
- // Set the text label to be displayed in the toolbar and customization palette
+
+ // Set the text label to be displayed in the toolbar and customization palette
[toolbarItem setLabel: @"Start"];
[toolbarItem setPaletteLabel: @"Start/Cancel"];
-
+
// Set up a reasonable tooltip, and image
[toolbarItem setToolTip: @"Start Encoding"];
[toolbarItem setImage: [NSImage imageNamed: @"Play"]];
-
- // Tell the item what message to send when it is clicked
+
+ // Tell the item what message to send when it is clicked
[toolbarItem setTarget: self];
[toolbarItem setAction: @selector(toggleStartCancel:)];
}
-
+
if ([itemIdentifier isEqual: HBQueuePauseResumeToolbarIdentifier])
{
toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
- // Set the text label to be displayed in the toolbar and customization palette
+
+ // Set the text label to be displayed in the toolbar and customization palette
[toolbarItem setLabel: @"Pause"];
[toolbarItem setPaletteLabel: @"Pause/Resume"];
-
+
// Set up a reasonable tooltip, and image
[toolbarItem setToolTip: @"Pause Encoding"];
[toolbarItem setImage: [NSImage imageNamed: @"Pause"]];
-
- // Tell the item what message to send when it is clicked
+
+ // Tell the item what message to send when it is clicked
[toolbarItem setTarget: self];
[toolbarItem setAction: @selector(togglePauseResume:)];
}
-
+
return toolbarItem;
}
{
// Required delegate method: Returns the ordered list of items to be shown in the
// toolbar by default.
-
+
return [NSArray arrayWithObjects:
HBQueueStartCancelToolbarIdentifier,
HBQueuePauseResumeToolbarIdentifier,
[toolbarItem setToolTip: @"Start Encoding"];
}
}
-
+
if ([[toolbarItem itemIdentifier] isEqual: HBQueuePauseResumeToolbarIdentifier])
{
if (s.state == HB_STATE_PAUSED)
[toolbarItem setLabel: @"Resume"];
[toolbarItem setToolTip: @"Resume Encoding"];
}
-
+
else if ((s.state == HB_STATE_WORKING) || (s.state == HB_STATE_MUXING))
{
enable = YES;
[toolbarItem setToolTip: @"Pause Encoding"];
}
}
-
+
return enable;
}
#if HB_OUTLINE_METRIC_CONTROLS
[fIndentation setHidden: NO];
[fSpacing setHidden: NO];
- [fIndentation setIntValue:[fOutlineView indentationPerLevel]]; // debug
- [fSpacing setIntValue:3]; // debug
+ [fIndentation setIntegerValue:[fOutlineView indentationPerLevel]]; // debug
+ [fSpacing setIntegerValue:3]; // debug
#endif
// Show/hide UI elements
{
NSUInteger index = [indexSet lastIndex];
NSUInteger aboveInsertIndexCount = 0;
-
+
while (index != NSNotFound)
{
NSUInteger removeIndex;
-
+
if (index >= insertIndex)
{
removeIndex = index + aboveInsertIndexCount;
removeIndex = index;
insertIndex--;
}
-
+
id object = [[array objectAtIndex:removeIndex] retain];
[array removeObjectAtIndex:removeIndex];
[array insertObject:object atIndex:insertIndex];
[object release];
-
+
index = [indexSet indexLessThanIndex:index];
}
}
{
if (item == nil)
return [fJobGroups objectAtIndex:index];
-
+
// We are only one level deep, so we can't be asked about children
NSAssert (NO, @"HBQueueController outlineView:child:ofItem: can't handle nested items.");
return nil;
// Our outline view has no levels, but we can still expand every item. Doing so
// just makes the row taller. See heightOfRowByItem below.
#if HB_QUEUE_DRAGGING
- // Don't autoexpand while dragging, since we can't drop into the items
- return ![(HBQueueOutlineView*)outlineView isDragging];
+ // Don't autoexpand while dragging, since we can't drop into the items
+ return ![(HBQueueOutlineView*)outlineView isDragging];
#else
- return YES;
+ return YES;
#endif
}
// implemented viewDidEndLiveResize to force all of them to be recalculated.
if ([outlineView inLiveResize] && [item lastDescriptionHeight] > 0)
return [item lastDescriptionHeight];
-
+
CGFloat width = [[outlineView tableColumnWithIdentifier: @"desc"] width];
// Column width is NOT what is ultimately used. I can't quite figure out what
// width to use for calculating text metrics. No matter how I tweak this value,
// of the row cell. In previous versions, which ran under Tiger, I was
// reducing width by 47 pixles.
width -= 2; // (?) for intercell spacing
-
+
CGFloat height = [item heightOfDescriptionForWidth: width];
return height;
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
{
- // nb: The "desc" column is currently an HBImageAndTextCell. However, we are longer
- // using the image portion of the cell so we could switch back to a regular NSTextFieldCell.
-
+ // nb: The "desc" column is currently an HBImageAndTextCell. However, we are longer
+ // using the image portion of the cell so we could switch back to a regular NSTextFieldCell.
+
if ([[tableColumn identifier] isEqualToString:@"desc"])
return [item attributedDescription];
else if ([[tableColumn identifier] isEqualToString:@"icon"])
theSize.width = spacingWidth;
[cell setImageSpacing: theSize];
#endif
-
- // nb: The "desc" column is currently an HBImageAndTextCell. However, we are longer
- // using the image portion of the cell so we could switch back to a regular NSTextFieldCell.
+
+ // nb: The "desc" column is currently an HBImageAndTextCell. However, we are longer
+ // using the image portion of the cell so we could switch back to a regular NSTextFieldCell.
// Set the image here since the value returned from outlineView:objectValueForTableColumn: didn't specify the image part
[cell setImage:nil];
}
-
+
else if ([[tableColumn identifier] isEqualToString:@"action"])
{
[cell setEnabled: YES];
#if HB_QUEUE_DRAGGING
- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
- // Dragging is only allowed of the pending items.
- NSEnumerator * e = [items objectEnumerator];
- HBJobGroup * group;
- while ( (group = [e nextObject]) )
- {
- if ([group status] != HBStatusPending)
- return NO;
- }
-
+ // Dragging is only allowed of the pending items.
+ for( HBJobGroup * group in items )
+ {
+ if ([group status] != HBStatusPending)
+ return NO;
+ }
+
// Don't retain since this is just holding temporaral drag information, and it is
//only used during a drag! We could put this in the pboard actually.
fDraggedNodes = items;
-
+
// Provide data for our custom type, and simple NSStrings.
[pboard declareTypes:[NSArray arrayWithObjects: HBQueuePboardType, nil] owner:self];
// the actual data doesn't matter since DragDropSimplePboardType drags aren't recognized by anyone but us!.
- [pboard setData:[NSData data] forType:HBQueuePboardType];
+ [pboard setData:[NSData data] forType:HBQueuePboardType];
return YES;
}
#if HB_QUEUE_DRAGGING
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
- // Don't allow dropping ONTO an item since they can't really contain any children.
+ // Don't allow dropping ONTO an item since they can't really contain any children.
BOOL isOnDropTypeProposal = index == NSOutlineViewDropOnItemIndex;
if (isOnDropTypeProposal)
return NSDragOperationNone;
- // Don't allow dropping INTO an item since they can't really contain any children.
- if (item != nil)
- {
- index = [fOutlineView rowForItem: item] + 1;
- item = nil;
- }
-
- // Prevent dragging into the completed or current job.
- int firstPendingIndex = [fCompleted count];
- if (fCurrentJobGroup)
- firstPendingIndex++;
- index = MAX (index, firstPendingIndex);
-
- [outlineView setDropItem:item dropChildIndex:index];
+ // Don't allow dropping INTO an item since they can't really contain any children.
+ if (item != nil)
+ {
+ index = [fOutlineView rowForItem: item] + 1;
+ item = nil;
+ }
+
+ // Prevent dragging into the completed or current job.
+ int firstPendingIndex = [self completedCount];
+ if (fCurrentJobGroup)
+ firstPendingIndex++;
+ index = MAX (index, firstPendingIndex);
+
+ [outlineView setDropItem:item dropChildIndex:index];
return NSDragOperationGeneric;
}
#endif
- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
{
NSMutableIndexSet *moveItems = [NSMutableIndexSet indexSet];
-
- id obj;
- NSEnumerator *enumerator = [fDraggedNodes objectEnumerator];
- while (obj = [enumerator nextObject])
+
+ for( id obj in fDraggedNodes)
{
[moveItems addIndex:[fJobGroups indexOfObject:obj]];
}
[self moveObjectsInArray:fJobGroups fromIndexes:moveItems toIndex: index];
[fOutlineView reloadData];
[self restoreOutlineViewState];
-
+
return YES;
}
#endif
OSDN Git Service
