MacGui: Queued item editing initial implementation.

- Sends a chosen queued item back to the main window for reload ( and rescan ) via contextual menu (right click)
- Deletes queued item from queue after being reloaded to main window ( after editing or whatever, send back to queue via Add To Queue Button same as a new source).
- New queue window contextual menu also includes delete and show options previously only available via separate icons.
- Note: Needs testing particularly in the subtitle area, which is not to say there aren't other bugs.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3080 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 8 insertions, 2 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 22b3d39a8..d4524169f 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -243,7 +243,7 @@ BOOL                        fIsDragging;
 	NSMutableDictionary          *presetUserDefault;// this is 2 in "Default" preset key
     NSMutableDictionary          *presetUserDefaultParent;
     NSMutableDictionary          *presetUserDefaultParentParent;
-    int                        presetCurrentBuiltInCount; // keeps track of the current number of built in presets
+    int                           presetCurrentBuiltInCount; // keeps track of the current number of built in presets
     IBOutlet NSPanel             * fAddPresetPanel;
 	
     /* NSOutline View for the presets */
@@ -265,6 +265,8 @@ BOOL                        fIsDragging;
     int                          fCanceledCount;
     int                          fWorkingCount;
     
+    int                          fqueueEditRescanItemNum; // queue array item to be reloaded into the main window
+    
     
     /* integer to set to determine the previous state
 		of encode 0==idle, 1==encoding, 2==cancelled*/
@@ -346,7 +348,11 @@ BOOL                        fIsDragging;
 - (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum;
 - (void) processNewQueueEncode;
 - (void) clearQueueEncodedItems;
-- (IBAction)applyQueueSettings:(id)sender;
+/* Queue Editing */
+- (IBAction)applyQueueSettingsToMainWindow:(id)sender;
+- (IBAction)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (int) scanTitleNum selectedQueueItem: (int) selectedQueueItem;
+
+
 - (void) removeQueueFileItem:(int) queueItemToRemove;
 - (void) clearQueueAllItems;
 - (void)moveObjectsInQueueArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex;