From: dynaflash Date: Thu, 19 Aug 2010 18:45:59 +0000 (+0000) Subject: MacGui: Encode status readout now two lines, first line is the name of the file being... X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=5bc8b43250ce0970b586868d16ecfb991c3e311e;p=handbrake-jp%2Fhandbrake-jp-git.git MacGui: Encode status readout now two lines, first line is the name of the file being encoded and second line is the progress. Changed both for main window and queue window. git-svn-id: svn://localhost/HandBrake/trunk@3483 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/macosx/Controller.m b/macosx/Controller.m index 47a1aca4..ee08ce18 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -927,7 +927,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It pass_desc = @""; } - string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: pass %d %@ of %d, %.2f %%", @"" ), p.job_cur, pass_desc, p.job_count, 100.0 * p.progress]; + string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, pass_desc, p.job_count, 100.0 * p.progress]; if( p.seconds > -1 ) { @@ -935,13 +935,8 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ), p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds]; } - [fStatusField setStringValue: string]; - /* Set the status string in fQueueController as well but add currentQueueEncodeNameString to delineate - * which encode is being worked on by this instance in a multiple instance situation - */ - NSString * queueStatusString = [NSString stringWithFormat:@"%@ -> %@",string,currentQueueEncodeNameString]; - [fQueueController setQueueStatusString:queueStatusString]; + [fQueueController setQueueStatusString:string]; /* Update slider */ CGFloat progress_total = ( p.progress + p.job_cur - 1 ) / p.job_count; @@ -2099,11 +2094,11 @@ fWorkingCount = 0; NSMutableString * string; if (fPendingCount == 1) { - string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode pending in the queue", @"" ), fPendingCount]; + string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode pending in queue", @"" ), fPendingCount]; } else { - string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode(s) pending in the queue", @"" ), fPendingCount]; + string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode(s) pending in queue", @"" ), fPendingCount]; } [fQueueStatus setStringValue:string]; } diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 35e9f360..8d72cd31 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -12,7 +12,7 @@ YES - + YES @@ -43,7 +43,7 @@ 4103 2 - {{41, 580}, {760, 550}} + {{41, 574}, {754, 556}} 1886912512 HandBrake NSWindow @@ -53,14 +53,14 @@ {1.79769e+308, 1.79769e+308} {213, 107} - + 256 YES 264 - {{17, 8}, {588, 14}} + {{17, 0}, {551, 28}} YES @@ -97,7 +97,7 @@ 1288 - {{18, -20}, {721, 20}} + {{18, -28}, {724, 20}} 16396 100 @@ -105,7 +105,7 @@ 264 - {{13, 22}, {734, 343}} + {{13, 28}, {734, 343}} YES @@ -2758,7 +2758,7 @@ 268 - {{20, 522}, {45, 14}} + {{20, 528}, {45, 14}} YES @@ -2778,7 +2778,7 @@ 264 - {{17, 493}, {35, 14}} + {{17, 499}, {35, 14}} YES @@ -2794,7 +2794,7 @@ 264 - {{55, 493}, {193, 15}} + {{55, 499}, {193, 15}} YES @@ -2846,7 +2846,7 @@ 264 - {{347, 492}, {77, 15}} + {{347, 498}, {77, 15}} YES @@ -2883,7 +2883,7 @@ 264 - {{249, 490}, {46, 17}} + {{249, 496}, {46, 17}} YES @@ -2899,7 +2899,7 @@ 264 - {{297, 492}, {41, 15}} + {{297, 498}, {41, 15}} YES @@ -2947,7 +2947,7 @@ 264 - {{5, 436}, {47, 17}} + {{5, 442}, {47, 17}} YES @@ -2963,7 +2963,7 @@ 264 - {{615, 493}, {57, 14}} + {{615, 499}, {57, 14}} YES @@ -2979,7 +2979,7 @@ 264 - {{672, 493}, {79, 14}} + {{672, 499}, {79, 14}} YES @@ -2998,7 +2998,7 @@ 264 - {{20, 468}, {70, 14}} + {{20, 474}, {70, 14}} YES @@ -3014,7 +3014,7 @@ 264 - {{76, 380}, {177, 22}} + {{76, 386}, {177, 22}} YES @@ -3060,7 +3060,7 @@ 264 - {{649, 432}, {90, 28}} + {{649, 438}, {90, 28}} YES @@ -3083,7 +3083,7 @@ 264 - {{98, 472}, {642, 5}} + {{98, 478}, {642, 5}} {0, 0} @@ -3105,7 +3105,7 @@ 264 - {{70, 522}, {204, 14}} + {{70, 528}, {204, 14}} YES @@ -3124,7 +3124,7 @@ 264 - {{56, 437}, {573, 19}} + {{56, 443}, {573, 19}} YES @@ -3141,7 +3141,7 @@ 264 - {{435, 477}, {54, 16}} + {{435, 483}, {54, 16}} YES @@ -3158,7 +3158,7 @@ 264 - {{492, 477}, {54, 16}} + {{492, 483}, {54, 16}} YES @@ -3175,7 +3175,7 @@ 264 - {{550, 477}, {54, 16}} + {{550, 483}, {54, 16}} YES @@ -3192,7 +3192,7 @@ 264 - {{612, 477}, {54, 16}} + {{612, 483}, {54, 16}} YES @@ -3209,7 +3209,7 @@ 264 - {{20, 412}, {96, 14}} + {{20, 418}, {96, 14}} YES @@ -3225,7 +3225,7 @@ 264 - {{294, 416}, {446, 5}} + {{294, 422}, {446, 5}} {0, 0} @@ -3247,7 +3247,7 @@ 264 - {{124, 412}, {162, 14}} + {{124, 418}, {162, 14}} YES @@ -3263,12 +3263,12 @@ 264 - {{536, 8}, {201, 14}} + {{562, 13}, {181, 14}} YES 67239424 - 71303168 + 71434240 @@ -3279,7 +3279,7 @@ 264 - {{21, 385}, {53, 14}} + {{21, 391}, {53, 14}} YES @@ -3295,7 +3295,7 @@ 268 - {{279, 525}, {461, 5}} + {{279, 531}, {461, 5}} {0, 0} @@ -3318,7 +3318,7 @@ -2147482356 - {{278, 524}, {463, 12}} + {{278, 530}, {463, 12}} 16648 100 @@ -3326,7 +3326,7 @@ 264 - {{399, 383}, {141, 18}} + {{399, 389}, {141, 18}} YES @@ -3348,7 +3348,7 @@ 264 - {{283, 383}, {102, 18}} + {{283, 389}, {102, 18}} YES @@ -3370,7 +3370,7 @@ 264 - {{541, 383}, {141, 18}} + {{541, 389}, {141, 18}} YES @@ -3392,7 +3392,7 @@ 264 - {{491, 492}, {56, 15}} + {{491, 498}, {56, 15}} YES @@ -3408,7 +3408,7 @@ 264 - {{434, 492}, {57, 15}} + {{434, 498}, {57, 15}} YES @@ -3456,7 +3456,7 @@ 264 - {{549, 492}, {57, 15}} + {{549, 498}, {57, 15}} YES @@ -3502,7 +3502,8 @@ - {760, 550} + {754, 556} + {{0, 0}, {1920, 1178}} {213, 129} @@ -4579,7 +4580,7 @@ {1.79769e+308, 1.79769e+308} {338, 232} - + 256 YES @@ -4988,7 +4989,6 @@ {338, 318} - {{0, 0}, {1920, 1178}} {338, 254} @@ -7024,7 +7024,6 @@ - @@ -7049,6 +7048,7 @@ + @@ -11629,10 +11629,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{168, 216}, {760, 550}} + {{168, 210}, {754, 556}} com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 216}, {760, 550}} + + {{168, 210}, {754, 556}} {{65, 541}, {760, 550}} diff --git a/macosx/English.lproj/Queue.xib b/macosx/English.lproj/Queue.xib index d834ed5f..4c9d705c 100644 --- a/macosx/English.lproj/Queue.xib +++ b/macosx/English.lproj/Queue.xib @@ -12,8 +12,8 @@ YES - + YES @@ -42,7 +42,7 @@ 4111 2 - {{893, 130}, {594, 430}} + {{893, 128}, {587, 432}} 1886912512 Queue - HandBrake NSWindow @@ -74,7 +74,7 @@ 4352 - {517, 342} + {517, 329} YES @@ -228,7 +228,7 @@ 0 - {{1, 1}, {517, 342}} + {{1, 1}, {517, 329}} @@ -246,7 +246,7 @@ 256 - {{518, 1}, {15, 342}} + {{518, 1}, {15, 329}} _doScroller: @@ -263,7 +263,7 @@ 0.9656652 - {{20, 20}, {534, 344}} + {{20, 20}, {534, 331}} 18 @@ -391,7 +391,7 @@ - {{0, 7}, {574, 371}} + {{0, 9}, {574, 358}} NSView NSResponder @@ -399,7 +399,7 @@ 264 - {{17, 405}, {148, 14}} + {{17, 407}, {148, 14}} YES @@ -415,7 +415,7 @@ 266 - {{17, 383}, {560, 14}} + {{17, 373}, {560, 30}} YES @@ -429,7 +429,7 @@ - {594, 430} + {587, 432} {{0, 0}, {1920, 1178}} @@ -918,9 +918,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{-1207, 359}, {594, 430}} + {{77, 333}, {587, 432}} com.apple.InterfaceBuilder.CocoaPlugin - {{-1207, 359}, {594, 430}} + {{77, 333}, {587, 432}}