BuildSystem: darwin

[handbrake-jp/handbrake-jp-git.git] / macosx / PictureController.mm

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 1ffb3ae..30409d9 100644 (file)
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -44,6 +44,7 @@
     else
     {
         [self showWindow:sender];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
         if ([fPreviewController fullScreen] == YES)
         {
             [self setToFullScreenMode];
@@ -55,6 +56,16 @@
     }
 }
 
+- (BOOL) previewFullScreenMode
+{
+    return [fPreviewController fullScreen];
+}
+
+- (IBAction) previewGoWindowed: (id)sender
+{
+    [fPreviewController goWindowedScreen:self];
+}
+
 - (IBAction) showPreviewWindow: (id)sender
 {
     [fPreviewController showWindow:sender];
@@ -92,12 +103,16 @@
 - (void)awakeFromNib
 {
     [fPictureWindow setDelegate:self];
+    if( ![[self window] setFrameUsingName:@"PictureSizing"] )
+        [[self window] center];
+    [self setWindowFrameAutosaveName:@"PictureSizing"];
+    [[self window] setExcludedFromWindowsMenu:YES];
 }
 
 
 - (void)windowWillClose:(NSNotification *)aNotification
 {
-
+[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
 }
 
 - (BOOL)windowShouldClose:(id)fPictureWindow
@@ -369,10 +384,11 @@
 
     //[fPreviewController pictureSliderChanged:nil];
     [self reloadStillPreview];
-    
-
     }
 
+    /* we get the sizing info to display from fPreviewController */
+    [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
+
     if (sender != nil)
     {
         [fHBController pictureSettingsDidChange];
@@ -380,6 +396,11 @@
     
 }
 
+- (NSString*) getPictureSizeInfoString
+{
+    return [fSizeInfoField stringValue];
+}
+
 - (void)reloadStillPreview
 { 
    hb_job_t * job = fTitle->job;