HandBrake 0.5.2

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

7 files changed, 36 insertions, 22 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index afa2fb7f9..435e2216e 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -1,4 +1,4 @@
-/* $Id: Controller.h,v 1.5 2003/11/09 19:43:06 titer Exp $
+/* $Id: Controller.h,v 1.6 2003/11/13 01:40:44 titer Exp $
 
    This file is part of the HandBrake source code.
    Homepage: <http://handbrake.m0k.org/>.
@@ -56,7 +56,7 @@
     IBOutlet NSTextField         * fRipStatusField;
     IBOutlet NSTextField         * fRipInfoField;
     IBOutlet NSProgressIndicator * fRipProgress;
-    IBOutlet NSButton            * fSuspendButton;
+    IBOutlet NSButton            * fPauseButton;
     IBOutlet NSButton            * fRipButton;
 
     /* "Done" alert panel */
@@ -105,7 +105,9 @@
     returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 - (void)     _Rip;
 - (IBAction) Cancel: (id) sender;
-- (IBAction) Suspend: (id) sender;
+- (void)     _Cancel: (NSWindow *) sheet returnCode: (int) returnCode
+    contextInfo: (void *) contextInfo;
+- (IBAction) Pause: (id) sender;
 - (IBAction) Resume: (id) sender;
 
 - (IBAction) PreviousPicture: (id) sender;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 0b452bf91..ea5a2c161 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1,4 +1,4 @@
-/* $Id: Controller.mm,v 1.9 2003/11/09 22:06:15 titer Exp $
+/* $Id: Controller.mm,v 1.10 2003/11/13 01:40:44 titer Exp $
 
    This file is part of the HandBrake source code.
    Homepage: <http://handbrake.m0k.org/>.
@@ -327,12 +327,24 @@
 
 - (IBAction) Cancel: (id) sender
 {
-    HBStopRip( fHandle );
+    NSBeginCriticalAlertSheet( @"Cancel - Are you sure?",
+        @"Nooo, keep going!", @"Yep, stop it", nil, fWindow, self,
+        @selector( _Cancel:returnCode:contextInfo: ),
+        nil, nil, @"Encoding won't be recoverable." );
 }
 
-- (IBAction) Suspend: (id) sender
+- (void) _Cancel: (NSWindow *) sheet
+    returnCode: (int) returnCode contextInfo: (void *) contextInfo
+{
+    if( returnCode == NSAlertAlternateReturn )
+    {
+        HBStopRip( fHandle );
+    }
+}
+
+- (IBAction) Pause: (id) sender
 {
-    if( [[fSuspendButton title] compare: @"Resume" ] == NSOrderedSame )
+    if( [[fPauseButton title] compare: @"Resume" ] == NSOrderedSame )
     {
         [self Resume: self];
         return;
@@ -498,7 +510,7 @@
 
             /* Show the new GUI */
             [fWindow setContentView: fRipView ];
-            [fSuspendButton setEnabled: NO];
+            [fPauseButton setEnabled: NO];
             
             [fTitlePopUp removeAllItems];
             HBTitle * title;
@@ -537,8 +549,8 @@
                 [fFileFormatPopUp        setEnabled: NO];
                 [fFileField              setEnabled: NO];
                 [fFileBrowseButton       setEnabled: NO];
-                [fSuspendButton          setEnabled: YES];
-                [fSuspendButton          setTitle: @"Suspend"];
+                [fPauseButton            setEnabled: YES];
+                [fPauseButton            setTitle: @"Pause"];
                 [fRipButton              setTitle: @"Cancel"];
             }
         
@@ -588,7 +600,7 @@
             
             [fRipProgress setDoubleValue: 100 * status.position];
 
-            [fSuspendButton setTitle: @"Resume"];
+            [fPauseButton setTitle: @"Resume"];
             break;
         }
 
@@ -681,8 +693,8 @@
             [fFileFormatPopUp        setEnabled: YES];
             [fFileField              setEnabled: YES];
             [fFileBrowseButton       setEnabled: YES];
-            [fSuspendButton          setEnabled: NO];
-            [fSuspendButton          setTitle: @"Suspend"];
+            [fPauseButton            setEnabled: NO];
+            [fPauseButton            setTitle: @"Pause"];
             [fRipButton              setTitle: @"Rip"];
 
             [self VideoMatrixChanged: self];
diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index cc4cb2ee5..ce3b28a62 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 8c468d47f..161d51070 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -9,13 +9,13 @@
                 Cancel = id; 
                 ClosePanel = id; 
                 NextPicture = id; 
+                Pause = id; 
                 PreviousPicture = id; 
                 Resume = id; 
                 Rip = id; 
                 Scan = id; 
                 ScanMatrixChanged = id; 
                 ShowPicturePanel = id; 
-                Suspend = id; 
                 TitlePopUpChanged = id; 
                 UpdatePicture = id; 
                 VideoMatrixChanged = id; 
@@ -42,6 +42,7 @@
                 fLeftStepper = NSStepper; 
                 fNextButton = NSButton; 
                 fOpenGLCheck = NSButton; 
+                fPauseButton = NSButton; 
                 fPictureGLView = HBPictureGLView; 
                 fPicturePanel = NSPanel; 
                 fPreviousButton = NSButton; 
@@ -59,7 +60,6 @@
                 fScanStatusField = NSTextField; 
                 fScanView = NSView; 
                 fSecondaryLanguagePopUp = NSPopUpButton; 
-                fSuspendButton = NSButton; 
                 fTargetSizeField = HBTargetSizeField; 
                 fTempView = NSView; 
                 fTitlePopUp = NSPopUpButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index fddfb6ac5..a4c078c28 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,15 +19,15 @@
 	<string>349.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>583</integer>
+		<integer>556</integer>
+		<integer>589</integer>
 		<integer>365</integer>
 		<integer>434</integer>
 		<integer>29</integer>
-		<integer>556</integer>
+		<integer>583</integer>
 		<integer>21</integer>
-		<integer>589</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7B85</string>
+	<string>7C107</string>
 </dict>
 </plist>
diff --git a/macosx/English.lproj/MainMenu.nib/objects.nib b/macosx/English.lproj/MainMenu.nib/objects.nib
index c02905a59..956897bce 100644
--- a/macosx/English.lproj/MainMenu.nib/objects.nib
+++ b/macosx/English.lproj/MainMenu.nib/objects.nib
diff --git a/macosx/HandBrake.pbproj/project.pbxproj b/macosx/HandBrake.pbproj/project.pbxproj
index b3b522b6f..c47e0176a 100644
--- a/macosx/HandBrake.pbproj/project.pbxproj
+++ b/macosx/HandBrake.pbproj/project.pbxproj
@@ -295,7 +295,7 @@
 	<key>CFBundleExecutable</key>
 	<string>HandBrake</string>
 	<key>CFBundleGetInfoString</key>
-	<string>HandBrake 0.5.1 - By Eric Petit &lt;[email protected]&gt;</string>
+	<string>HandBrake 0.5.2 - By Eric Petit &lt;[email protected]&gt;</string>
 	<key>CFBundleIconFile</key>
 	<string>HandBrake.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -307,11 +307,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>HB##</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>