Missing strings

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

diff --git a/macosx/English.lproj/Portable.nib/classes.nib b/macosx/English.lproj/Portable.nib/classes.nib
index 95131eb042df4050bcaa8fdeaf097bf1573d42f9..c9525762f36e5af2c5e302498ad6a55bf280064f 100644 (file)
--- a/macosx/English.lproj/Portable.nib/classes.nib
+++ b/macosx/English.lproj/Portable.nib/classes.nib
@@ -83,6 +83,7 @@
                 fOpenIndicator = NSProgressIndicator; 
                 fOpenMatrix = NSMatrix; 
                 fOpenPopUp = NSPopUpButton; 
+                fOpenProgressField = NSTextField; 
                 fOpenView = NSView; 
                 fWindow = NSWindow; 
             }; 

diff --git a/macosx/English.lproj/Portable.nib/info.nib b/macosx/English.lproj/Portable.nib/info.nib
index ca8a98874c247eaf62b4288fef9978cd19d5d392..ff2bd783c8ea6b5e91bce2d19841406589de2bdc 100644 (file)
--- a/macosx/English.lproj/Portable.nib/info.nib
+++ b/macosx/English.lproj/Portable.nib/info.nib
@@ -7,9 +7,9 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>248</key>
-               <string>417 394 408 321 0 0 1280 832 </string>
+               <string>483 424 408 321 0 0 1440 878 </string>
                <key>259</key>
-               <string>417 300 408 508 0 0 1280 832 </string>
+               <string>484 331 408 508 0 0 1440 878 </string>
                <key>29</key>
                <string>33 298 338 44 0 0 1280 832 </string>
                <key>303</key>
@@ -22,6 +22,6 @@
                <integer>259</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8H14</string>
+       <string>8F1111g</string>
 </dict>
 </plist>

diff --git a/macosx/English.lproj/Portable.nib/keyedobjects.nib b/macosx/English.lproj/Portable.nib/keyedobjects.nib
index 39a4124bddf5e0132edc75914450cd4bcd27a8e3..cdb138437f7d03b6883816bcdbde0352ef57edd7 100644 (file)
Binary files a/macosx/English.lproj/Portable.nib/keyedobjects.nib and b/macosx/English.lproj/Portable.nib/keyedobjects.nib differ

diff --git a/macosx/PortableController.h b/macosx/PortableController.h
index 3ba3c34ae654d85879c61d534e4067f1f03e180f..6ebcfa8b604e1e702c5e956768703c4b04e98a3d 100644 (file)
--- a/macosx/PortableController.h
+++ b/macosx/PortableController.h
@@ -17,6 +17,7 @@
     IBOutlet NSPopUpButton       * fOpenPopUp;
     IBOutlet NSTextField         * fOpenFolderField;
     IBOutlet NSButton            * fOpenBrowseButton;
+    IBOutlet NSTextField         * fOpenProgressField;
     IBOutlet NSProgressIndicator * fOpenIndicator;
     IBOutlet NSButton            * fOpenGoButton;
     NSString                     * fOpenFolderString;

diff --git a/macosx/PortableController.m b/macosx/PortableController.m
index dc3450d0a478d37c5bb5d8d4734931b359f656bd..a807753a93d6074a5b142a13d48e22c58288ba58 100644 (file)
--- a/macosx/PortableController.m
+++ b/macosx/PortableController.m
@@ -65,14 +65,40 @@
 - (id) tableView:(NSTableView *) t objectValueForTableColumn:
     (NSTableColumn *) col row: (int) row
 {
-    if( [[col identifier] isEqualToString: @"Title"] )
+    if( [[col identifier] isEqualToString: @"Check"] )
     {
-        hb_title_t * title = hb_list_item( fList, row );
-        return [@"Title " stringByAppendingFormat: @"%d", title->index];
+        return [fConvertCheckArray objectAtIndex: row];
     }
-    else if( [[col identifier] isEqualToString: @"Check"] )
+    else
     {
-        return [fConvertCheckArray objectAtIndex: row];
+        hb_title_t * title = hb_list_item( fList, row );
+        if( [[col identifier] isEqualToString: @"Title"] )
+        {
+            return [@"Title " stringByAppendingFormat: @"%d",
+                    title->index];
+        }
+        else if( [[col identifier] isEqualToString: @"Length"] )
+        {
+            if( title->hours > 0 )
+            {
+                return [NSString stringWithFormat:
+                    @"%d hour%s %d min%s", title->hours,
+                    title->hours > 1 ? "s" : "", title->minutes,
+                    title->minutes > 1 ? "s": ""];
+            }
+            else if( title->minutes > 0 )
+            {
+                return [NSString stringWithFormat:
+                    @"%d min%s %d sec%s", title->minutes,
+                    title->minutes > 1 ? "s" : "", title->seconds,
+                    title->seconds > 1 ? "s": ""];
+            }
+            else
+            {
+                return [NSString stringWithFormat: @"%d seconds",
+                        title->seconds];
+            }
+        }
     }
     return nil;
 }
@@ -169,8 +195,8 @@
         job->vcodec   = HB_VCODEC_X264;
         job->h264_13  = 1;
         job->file     = strdup( [[NSString stringWithFormat:
-            @"%@/%p - Title %d.mp4", fConvertFolderString, self, i]
-            UTF8String] );
+            @"%@/%p - Title %d.mp4", fConvertFolderString, self,
+            title->index] UTF8String] );
         hb_add( fHandle, job );
     }
 
@@ -234,6 +260,9 @@
             [fOpenIndicator setIndeterminate: NO];
             [fOpenIndicator setDoubleValue: 100.0 *
                 ( (float) p.title_cur - 0.5 ) / p.title_count];
+            [fOpenProgressField setStringValue: [NSString
+                stringWithFormat: @"Scanning title %d of %d...",
+                p.title_cur, p.title_count]];
             break;
 #undef p