diff options
| -rw-r--r-- | Video Tuneup/ViewController.h | 1 | ||||
| -rw-r--r-- | Video Tuneup/ViewController.m | 12 | ||||
| -rw-r--r-- | 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 @@ <int key="type">2</int> <double key="pointSize">39</double> </object> - <object class="NSFont" key="IBUIFont" id="478916101"> + <object class="NSFont" key="IBUIFont" id="1018549859"> <string key="NSName">Helvetica-Bold</string> <double key="NSSize">39</double> <int key="NSfFlags">16</int> @@ -288,7 +288,7 @@ </object> <reference key="IBUINormalTitleShadowColor" ref="752673392"/> <reference key="IBUIFontDescription" ref="395720110"/> - <reference key="IBUIFont" ref="478916101"/> + <reference key="IBUIFont" ref="1018549859"/> </object> <object class="IBUIButton" id="267035392"> <reference key="NSNextResponder" ref="766721923"/> @@ -313,7 +313,7 @@ <int key="type">2</int> <double key="pointSize">15</double> </object> - <object class="NSFont" key="IBUIFont" id="815400478"> + <object class="NSFont" key="IBUIFont" id="779288036"> <string key="NSName">Helvetica-Bold</string> <double key="NSSize">15</double> <int key="NSfFlags">16</int> @@ -353,7 +353,7 @@ </object> <reference key="IBUINormalTitleShadowColor" ref="752673392"/> <reference key="IBUIFontDescription" ref="1067550929"/> - <reference key="IBUIFont" ref="815400478"/> + <reference key="IBUIFont" ref="779288036"/> </object> </array> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -415,6 +415,14 @@ <int key="connectionID">66</int> </object> <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">exportButton</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="806269495"/> + </object> + <int key="connectionID">68</int> + </object> + <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> <string key="label">loadDefaultAssetFromFile:</string> <reference key="source" ref="1049445720"/> @@ -685,7 +693,7 @@ <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">67</int> + <int key="maxID">68</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -756,6 +764,7 @@ </dictionary> <dictionary class="NSMutableDictionary" key="outlets"> <string key="derpSendPostRequestButton">UIButton</string> + <string key="exportButton">UIButton</string> <string key="exportStatus">UILabel</string> <string key="mScrubber">UISlider</string> <string key="mediaLibraryButton">UIButton</string> @@ -770,6 +779,10 @@ <string key="name">derpSendPostRequestButton</string> <string key="candidateClassName">UIButton</string> </object> + <object class="IBToOneOutletInfo" key="exportButton"> + <string key="name">exportButton</string> + <string key="candidateClassName">UIButton</string> + </object> <object class="IBToOneOutletInfo" key="exportStatus"> <string key="name">exportStatus</string> <string key="candidateClassName">UILabel</string> |