From fec9d76aeb3738f68e2dfbbfa4c890bff4cff1e8 Mon Sep 17 00:00:00 2001 From: Brian Jordan Date: Thu, 26 Apr 2012 14:56:28 -0400 Subject: UI tweaks --- Video Tuneup/ViewController.h | 1 + Video Tuneup/ViewController.m | 12 ++++++++++-- Video Tuneup/en.lproj/ViewController_iPad.xib | 23 ++++++++++++++++++----- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h index 669bd5f..b39cfbd 100644 --- a/Video Tuneup/ViewController.h +++ b/Video Tuneup/ViewController.h @@ -32,6 +32,7 @@ @property (nonatomic, retain) IBOutlet UIButton *playButton; @property (nonatomic, retain) IBOutlet UIButton *pauseButton; @property (nonatomic, retain) IBOutlet UIButton *rewindButton; +@property (nonatomic, retain) IBOutlet UIButton *exportButton; @property (nonatomic, retain) IBOutlet UIToolbar *videoNavBar; @property (nonatomic, retain) IBOutlet UILabel *exportStatus; @property (nonatomic, retain) IBOutlet UISlider* mScrubber; diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m index 50b9e51..90e709e 100644 --- a/Video Tuneup/ViewController.m +++ b/Video Tuneup/ViewController.m @@ -20,7 +20,7 @@ static const NSString *ItemStatusContext; @implementation ViewController @synthesize player, playerItem, playerView, playButton, pauseButton, rewindButton, editor, videoNavBar, exportStatus, -mScrubber, mediaLibraryButton, mediaLibraryPopover; +mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton; @synthesize derpSendPostRequestButton; @@ -133,6 +133,8 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover; { MPMediaPickerController *mediaPicker = [[MPMediaPickerController alloc] initWithMediaTypes: MPMediaTypeMusic]; + mediaPicker.wantsFullScreenLayout = NO; + mediaPicker.delegate = self; mediaPicker.allowsPickingMultipleItems = NO; mediaPicker.prompt = @"Select songs to play"; @@ -361,6 +363,8 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover; - (IBAction)exportToCameraRoll:(id)sender { + [exportButton setTitle:@"Exporting..." forState:UIControlStateNormal]; + [exportButton setEnabled:NO]; NSLog(@"Editing..."); NSLog(@"Put clips in. Build."); @@ -418,10 +422,14 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover; [alertView show]; // [alertView release]; [exportStatus setText:@"Camera Roll Export Error"]; + [exportButton setEnabled:YES]; } else { NSLog(@"Completed photo album add"); - + + [exportButton setTitle:@"Share to Camera Roll" forState:UIControlStateNormal]; + [exportButton setEnabled:YES]; + [exportStatus setTextColor:[UIColor colorWithRed:255.0 green:255.0 blue:255.0 alpha:255.0]]; [exportStatus setText:@"Exported to Camera Roll"]; [exportStatus setBackgroundColor:[[UIColor alloc] initWithPatternImage:[UIImage imageNamed:@"argyle.png"]]]; diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib index 5c274c9..2810a4b 100644 --- a/Video Tuneup/en.lproj/ViewController_iPad.xib +++ b/Video Tuneup/en.lproj/ViewController_iPad.xib @@ -262,7 +262,7 @@ 2 39 - + Helvetica-Bold 39 16 @@ -288,7 +288,7 @@ - + @@ -313,7 +313,7 @@ 2 15 - + Helvetica-Bold 15 16 @@ -353,7 +353,7 @@ - + @@ -414,6 +414,14 @@ 66 + + + exportButton + + + + 68 + loadDefaultAssetFromFile: @@ -685,7 +693,7 @@ - 67 + 68 @@ -756,6 +764,7 @@ UIButton + UIButton UILabel UISlider UIButton @@ -770,6 +779,10 @@ derpSendPostRequestButton UIButton + + exportButton + UIButton + exportStatus UILabel -- cgit v1.2.3