diff --git a/macosx/English.lproj/StatsWindow.xib b/macosx/English.lproj/StatsWindow.xib index d5a039580..f4579ba49 100644 --- a/macosx/English.lproj/StatsWindow.xib +++ b/macosx/English.lproj/StatsWindow.xib @@ -34,7 +34,7 @@ NSPanel {310, 182} - {180, 182} + {245, 182} 256 @@ -59,7 +59,7 @@ 6 - System + System controlColor 3 @@ -68,7 +68,7 @@ 6 - + controlTextColor 3 @@ -304,7 +304,7 @@ {{0, 0}, {1680, 1028}} - {180, 204} + {245, 204} {310, 204} StatsWindow @@ -712,14 +712,14 @@ - {{238, 746}, {245, 182}} + {{238, 746}, {245, 182}} {196, 240} - {{238, 746}, {245, 182}} + {310, 182} - {180, 182} + {245, 182} @@ -798,12 +798,12 @@ - IBProjectSource + IBProjectSource macosx/NSMenuAdditions.h - + NSObject YES @@ -824,8 +824,86 @@ - - macosx/NSApplicationAdditions.h + + macosx/UKKQueue/UKFileWatcher.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/UKKQueue/UKKQueue.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/UKKQueue/UKMainThreadProxy.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/IPCController.h @@ -868,12 +946,12 @@ - + macosx/StatsWindowController.h - NSObject + YES @@ -894,86 +972,8 @@ - - macosx/UKKQueue/UKKQueue.h - - - - - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - macosx/IPCController.h - - - - - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - macosx/UKKQueue/UKFileWatcher.h - - - - - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - macosx/UKKQueue/UKMainThreadProxy.h + + macosx/NSApplicationAdditions.h @@ -986,11 +986,11 @@ AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxDJAAsADAAxADUANgA8AD0A QgBgAGEAYgBjAGQAZQALAHMAhACQAJEAoQCiAKoAqwCuALgAuQC6AL8AwQDGAMcAygDOANQA3ADdAOQA 5QDtAO4A9QD2AP4A/wEGAQcBEAERARgBGQEhASIBKQExATIBOQFBAUIBSQFRAVIBWQFaAWIBYwFqAXIB -cwF6AYIBgwGKAZIBkwGaAaIBowGqAa4ACwGvAbEBsgGzAbQBtQG4AbwBygHSAdMB1wHcAd0B4gHjAegB -6QHuAe8B9AH1AfoB+wIAAgECBgIHAgwCDQISAhMCNQI4AjkCOwJdAoACowKkAqUCpgKnAqgCqQKqAqsC -rAKtAq4CrwKwArECsgKzArQCtQK2ArcCuAK5AroCuwK8Ar0CvgK/AsACwQLCAsMCxgLJAvcDJQMmAycD -KAMpAyoDKwMsAFwDLQMuAy8DMAMxAzIDMwM0AzUDNgM3AzgAXQM5AzoAtQC9AzsDPAM9Az4DPwNAA0EA -qQNCA0MDRANFA0YDRwNIA0kDSgNLA04DUQNUVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAY +cwF6AYIBgwGKAZIBkwGaAaIBowGqAGQACwGuAbABsQGyAbMBtAG3AbsByQHRAdIB1gHbAdwB4QHiAecB +6AHtAe4B8wH0AfkB+gH/AgACBQIGAgsCDAIRAhICNAI3AjgCOgJcAn8CogKjAqQCpQKmAqcCqAKpAqoC +qwKsAq0CrgKvArACsQKyArMCtAK1ArYCtwK4ArkCugK7ArwCvQK+Ar8CwALBAsICxQLIAvYAXAMkAyUD +JgC9AycDKAMpAyoDKwMsAy0AXQCpAy4DLwMwAzEDMgMzAzQDNQM2AzcDOAM5AzoDOwM8Az0DPgM/A0AD +QQNCA0MDRANFA0YAtQNHA0gDSQNKA00DUANTVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAY ABkAGgAbABwAHQAeAB8AIAAhACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwVk5TUm9vdFYkY2xh c3NdTlNPYmplY3RzS2V5c18QD05TQ2xhc3Nlc1ZhbHVlc18QGU5TQWNjZXNzaWJpbGl0eU9pZHNWYWx1 ZXNdTlNDb25uZWN0aW9uc1tOU05hbWVzS2V5c1tOU0ZyYW1ld29ya11OU0NsYXNzZXNLZXlzWk5TT2lk @@ -1005,7 +1005,7 @@ ZG93Q29udGVudE1heFNpemVcTlNTY3JlZW5SZWN0XxATTlNGcmFtZUF1dG9zYXZlTmFtZV1OU1dpbmRv d1RpdGxlWU5TV1RGbGFnc11OU1dpbmRvd0NsYXNzXxAWTlNXaW5kb3dDb250ZW50TWluU2l6ZVxOU1dp bmRvd1JlY3RZTlNNYXhTaXplXxAPTlNXaW5kb3dCYWNraW5nXxARTlNXaW5kb3dTdHlsZU1hc2tZTlNN aW5TaXplW05TVmlld0NsYXNzgA2AVYALgFGAVIAJEiAAAACACoAMgAiAUxACEA+AUoAAXxAYe3syMzgs -IDc0Nn0sIHsyNDUsIDE4Mn19WlN0YXRpc3RpY3NXTlNQYW5lbFp7MzEwLCAxODJ9WnsxODAsIDE4Mn3X +IDc0Nn0sIHsyNDUsIDE4Mn19WlN0YXRpc3RpY3NXTlNQYW5lbFp7MzEwLCAxODJ9WnsyNDUsIDE4Mn3X AGYADgBnAGgAaQBqAGsAbABtAG4AbwBwAGwAcl8QD05TTmV4dFJlc3BvbmRlclpOU1N1YnZpZXdzWE5T dkZsYWdzW05TRnJhbWVTaXplWE5TV2luZG93W05TU3VwZXJ2aWV3gA6AUIAPEQEAgE6ADoBP0gAOAD4A dAB1gE2uAHYAdwB4AHkAegB7AHwAfQB+AH8AgACBAIIAg4AQgCGAJYApgC2AMYA0gDeAOoA+gEGARIBH @@ -1046,81 +1046,81 @@ mgCbARQAnQCBAJ8AoIAfgBeAMIAUgESAHNgAZgAOAIUAhgBoAIcAagBrAFEAiQGNAY4BDACNAGwAUYAN gCCASIBJCYAOgA1fEBZ7ezExNSwgNjh9LCB7MTEwLCAxNH192ACSAA4AkwCUAJUAlgCXAJgAmQCaAJsB FACdAIIAnwCggB+AF4AwgBSAR4Ac2ABmAA4AhQCGAGgAhwBqAGsAUQCJAZ0BngEMAI0AbABRgA2AIIBL gEwJgA6ADV8QFnt7MTE1LCAzNn0sIHsxMTAsIDE0fX3YAJIADgCTAJQAlQCWAJcAmACZAJoAmwEUAJ0A -gwCfAKCAH4AXgDCAFIBKgBzSADcAOAGrAayjAawBrQA7Xk5TTXV0YWJsZUFycmF5V05TQXJyYXlaezI0 -NSwgMTgyfdIANwA4AbAA0qMA0gDTADtfEBZ7ezAsIDB9LCB7MTY4MCwgMTAyOH19WnsxODAsIDIwNH1a -ezMxMCwgMjA0fVtTdGF0c1dpbmRvd9IANwA4AbYBt6IBtwA7XxAQTlNXaW5kb3dUZW1wbGF0ZdIANwA4 -AbkBuqMBugG7ADtcTlNNdXRhYmxlU2V0VU5TU2V00gAOAD4AdAG+gE2rAb8BwAHBAcIBwwHEAcUBxgHH -AcgByYBYgFuAXYBfgGGAY4BlgGeAaYBrgG3UAA4BywHMAc0BzgBBAB8B0V1OU0Rlc3RpbmF0aW9uWE5T -U291cmNlV05TTGFiZWyAWoAHgAKAWVZ3aW5kb3fSADcAOAHUAdWjAdUB1gA7XxAUTlNOaWJPdXRsZXRD -b25uZWN0b3JeTlNOaWJDb25uZWN0b3LUAA4BywHMAc0BzgCBAB8B24BagESAAoBcXxATZkRvd25sb2Fk -ZWRBbGxGaWVsZNQADgHLAcwBzQHOAIAAHwHhgFqAQYACgF5fEBFmVXBsb2FkZWRBbGxGaWVsZNQADgHL -AcwBzQHOAB8AQQHngFqAAoAHgGBYZGVsZWdhdGXUAA4BywHMAc0BzgB6AB8B7YBagC2AAoBiXmZVcGxv -YWRlZEZpZWxk1AAOAcsBzAHNAc4AfQAfAfOAWoA3gAKAZFpmVGltZUZpZWxk1AAOAcsBzAHNAc4AfwAf -AfmAWoA+gAKAZl8QD2ZOdW1PcGVuZWRGaWVsZNQADgHLAcwBzQHOAIIAHwH/gFqAR4ACgGheZlJhdGlv -QWxsRmllbGTUAA4BywHMAc0BzgB8AB8CBYBagDSAAoBqW2ZSYXRpb0ZpZWxk1AAOAcsBzAHNAc4AewAf -AguAWoAxgAKAbF8QEGZEb3dubG9hZGVkRmllbGTUAA4BywHMAc0BzgCDAB8CEYBagEqAAoBuXWZUaW1l -QWxsRmllbGTSAA4APgIUAhWAcq8QHwFeAZ4AfAFuAOkAUQB7AT0AgAFNAPoCIQB3AHoAggDYAHYAeQB9 -AH8AgQEdAQsBjgB4AIsAQQEtAIMBfgB+gECATIA0gEOAJ4ANgDGAOYBBgDyAK4BwgCGALYBHgCOAEIAp -gDeAPoBEgDOAL4BJgCWAEoAHgDaASoBGgDrSAA4AMgAzAjeABIBxXU5TQXBwbGljYXRpb27SADcAOAI6 -Aa2iAa0AO9IADgA+AhQCPYByrxAfAH8AgwBRAIAAeABBAFEAfQBRAH4AeQAfAFEAUQBRAHcAUQBRAFEA -UQBRAHsAegCCAFEAdgAfAHwAUQCBAFGAPoBKgA2AQYAlgAeADYA3gA2AOoApgAKADYANgA2AIYANgA2A -DYANgA2AMYAtgEeADYAQgAKANIANgESADdIADgA+AhQCX4ByrxAgAV4BngB8AW4A6QAfAFEAewCAAT0B -TQD6AiEAdwB6AIIA2AB2AHkAfQB/AIEBHQELAY4AeABBAIsAgwEtAX4AfoBAgEyANIBDgCeAAoANgDGA -QYA5gDyAK4BwgCGALYBHgCOAEIApgDeAPoBEgDOAL4BJgCWAB4ASgEqANoBGgDrSAA4APgIUAoKAcq8Q -IAKDAoQChQKGAocCiAKJAooCiwKMAo0CjgKPApACkQKSApMClAKVApYClwKYApkCmgKbApwCnQKeAp8C -oAKhAqKAdoB3gHiAeYB6gHuAfIB9gH6Af4CAgIGAgoCDgISAhYCGgIeAiICJgIqAi4CMgI2AjoCPgJCA -kYCSgJOAlICVXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktNl8QGVRleHQgRmllbGQgQ2VsbCAoTGFi -ZWwpLThfEBNTdGF0aWMgVGV4dCAoTGFiZWwpXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktMl8QGFRl -eHQgRmllbGQgQ2VsbCAoUmF0aW86KVxGaWxlJ3MgT3duZXJcQ29udGVudCBWaWV3XxAVU3RhdGljIFRl -eHQgKExhYmVsKS0xXxAVU3RhdGljIFRleHQgKExhYmVsKS0yXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJl -bCktNV8QIlRleHQgRmllbGQgQ2VsbCAoUHJvZ3JhbSBTdGFydGVkOilfEB9UZXh0IEZpZWxkIENlbGwg -KFJ1bm5pbmcgVGltZTopW0FwcGxpY2F0aW9uXxAZU3RhdGljIFRleHQgKERvd25sb2FkZWQ6KV8QFVN0 -YXRpYyBUZXh0IChMYWJlbCktM18QFVN0YXRpYyBUZXh0IChMYWJlbCktNF8QHVRleHQgRmllbGQgQ2Vs -bCAoRG93bmxvYWRlZDopXxAXU3RhdGljIFRleHQgKFVwbG9hZGVkOilfEBtTdGF0aWMgVGV4dCAoUnVu -bmluZyBUaW1lOilfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTVfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTZf -EBVTdGF0aWMgVGV4dCAoTGFiZWwpLTdfEBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS0xXxAZVGV4dCBG -aWVsZCBDZWxsIChMYWJlbCktM18QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTRfEBRTdGF0aWMgVGV4 -dCAoUmF0aW86KV8QD1dpbmRvdyAoV2luZG93KV8QG1RleHQgRmllbGQgQ2VsbCAoVXBsb2FkZWQ6KV8Q -FVN0YXRpYyBUZXh0IChMYWJlbCktOF8QF1RleHQgRmllbGQgQ2VsbCAoTGFiZWwpXxAZVGV4dCBGaWVs -ZCBDZWxsIChMYWJlbCktN18QHlN0YXRpYyBUZXh0IChQcm9ncmFtIFN0YXJ0ZWQ6KdIADgA+AhQCxYBy -oNIADgA+AhQCyIByoNIADgA+AhQCy4ByrxArAV4BngHDAHwBbgDpAB8BwABRAHsBPQCAAcEBTQHCAcgA -+gHJAcUCIQB3AHoBxwCCANgAdgB5AH0AfwHEAIEBHQHGAQsBjgG/AHgAiwBBAS0AgwF+AH6AQIBMgGGA -NIBDgCeAAoBbgA2AMYA5gEGAXYA8gF+Aa4ArgG2AZYBwgCGALYBpgEeAI4AQgCmAN4A+gGOARIAzgGeA -L4BJgFiAJYASgAeANoBKgEaAOtIADgA+AhQC+YByrxArAvoC+wL8Av0C/gL/AwADAQMCAwMDBAMFAwYD -BwMIAwkDCgMLAwwDDQMOAw8DEAMRAxIDEwMUAxUDFgMXAxgDGQMaAxsDHAMdAx4DHwMgAyEDIgMjAySA -moCbgJyAnYCegJ+AoIChgKKAo4CkgKWApoCngKiAqYCqgKuArICtgK6Ar4CwgLGAsoCzgLSAtYC2gLeA -uIC5gLqAu4C8gL2AvoC/gMCAwYDCgMOAxBAlEC8QHxATECkQDBA0EDEQERAWECgQMBAmEB4QIBAOEDMQ -JxP//////////RAFECEQLBANEBUQJBAiECoQEhAyEC0QHRALEAQQARAUEC4QKxAj0gAOAD4AdANNgE2g -0gAOAD4CFANQgHKg0gAOAD4CFANTgHKg0gA3ADgDVQNWogNWADteTlNJQk9iamVjdERhdGEACAAZACIA -JwAxADoAPwBEAFIAVABmAfsCAQJMAlMCWgJoAnoClgKkArACvALKAtUC4wL/Aw0DIAMyA0wDVgNjA2UD -ZwNpA2sDbQNvA3EDcwN1A3cDeQN7A30DfwOBA4MDhQOHA5ADnAOeA6ADuAPBA8oD1QPaA+kD8gQFBA4E -GQQbBB4EIARfBGwEhQSSBKgEtgTABM4E5wT0BP4FEAUkBS4FOgU8BT4FQAVCBUQFRgVLBU0FTwVRBVMF -VQVXBVkFWwV2BYEFiQWUBZ8FvAXOBdkF4gXuBfcGAwYFBgcGCQYMBg4GEAYSBhsGHQY6BjwGPgZABkIG -RAZGBkgGSgZMBk4GUAZSBlQGVgZ3Bn8GhgaQBpIGlAaWBpgGmwacBp4GoAa4BtkG5Qb5BwQHDgccBykH -NQc6BzwHPgdAB0IHRAdJB0sHVQdmB20HdAd9B38HiAeKB4wHmQeiB6cHrgfDB8sH2AfkB/IH9Af2B/gH -+gf8CAMIEAgdCCUIJwgpCDUIPghDCFgIWghcCF4IYAhzCIAIggiFCI4IlwipCLYIvwjKCNYI4AjnCPMJ -FAkWCRgJGgkcCR0JHwkhCTkJWglcCV4JYAliCWQJZglyCZMJlQmXCZkJmwmcCZ4JoAm3CdgJ2gncCd4J -4AniCeQJ6woMCg4KEAoSChQKFQoXChkKMApRClMKVQpXClkKWwpdCmsKjAqOCpAKkgqUCpcKmAqaCpwK -tgrXCtkK2wrdCt8K4QrjCukLCgsMCw4LEAsSCxMLFQsXCzELUgtUC1YLWAtaC1wLXgt/C4ELgwuFC4cL -iAuKC4wLpQvGC8gLygvMC84L0AvSC/ML9Qv3C/kL+wv8C/4MAAwZDDoMPAw+DEAMQgxEDEYMZwxpDGsM -bQxvDHAMcgx0DIsMrAyuDLAMsgy0DLYMuAzLDOwM7gzwDPIM9Az1DPcM+Q0SDTMNNQ03DTkNOw09DT8N -YA1iDWQNZg1oDWkNaw1tDYcNqA2qDawNrg2wDbINtA3VDdcN2Q3bDd0N3g3gDeIN/A4dDh8OIQ4jDiUO -Jw4pDkoOTA5ODlAOUg5TDlUOVw5wDpEOkw6VDpcOmQ6bDp0Ovg7ADsIOxA7GDscOyQ7LDuQPBQ8HDwkP -Cw8NDw8PEQ8aDyEPMA84D0MPTA9TD2wPdw+CD44Plw+cD68PuA+/D8wP0g/bD90P9A/2D/gP+g/8D/4Q -ABACEAQQBhAIEAoQGxApEDIQOhA8ED4QQBBCEEkQUhBZEHAQfxCQEJIQlBCWEJgQrhC/EMEQwxDFEMcQ -2xDsEO4Q8BDyEPQQ/REOERAREhEUERYRJRE2ETgROhE8ET4RSRFaEVwRXhFgEWIRdBGFEYcRiRGLEY0R -nBGtEa8RsRGzEbURwRHSEdQR1hHYEdoR7RH+EgASAhIEEgYSFBIdEh8SYBJiEmQSZhJoEmoSbBJuEnAS -chJ0EnYSeBJ6EnwSfhKAEoIShBKGEogSihKMEo4SkBKSEpQSlhKYEpoSnBKeEqcSqRKrErkSwhLHEtAS -0hMTExUTFxMZExsTHRMfEyETIxMlEycTKRMrEy0TLxMxEzMTNRM3EzkTOxM9Ez8TQRNDE0UTRxNJE0sT -TRNPE1ETWhNcE58ToROjE6UTpxOpE6sTrROvE7ETsxO1E7cTuRO7E70TvxPBE8MTxRPHE8kTyxPNE88T -0RPTE9UT1xPZE9sT3RPfE+gT6hQtFC8UMRQzFDUUNxQ5FDsUPRQ/FEEUQxRFFEcUSRRLFE0UTxRRFFMU -VRRXFFkUWxRdFF8UYRRjFGUUZxRpFGsUbRSJFKUUuxTXFPIU/xUMFSQVPBVYFX0VnxWrFccV3xX3FhcW -MRZPFmcWfxaXFrMWzxbrFwIXFBcyF0oXZBeAF6EXqhesF60Xthe4F7kXwhfEGB0YHxghGCMYJRgnGCkY -KxgtGC8YMRgzGDUYNxg5GDsYPRg/GEEYQxhFGEcYSRhLGE0YTxhRGFMYVRhXGFkYWxhdGF8YYRhjGGUY -ZxhpGGsYbRhvGHEYcxh8GH4Y1xjZGNsY3RjfGOEY4xjlGOcY6RjrGO0Y7xjxGPMY9Rj3GPkY+xj9GP8Z -ARkDGQUZBxkJGQsZDRkPGREZExkVGRcZGRkbGR0ZHxkhGSMZJRknGSkZKxktGS8ZMRkzGTUZNxk5GTsZ -PRk/GUEZQxlFGUcZSRlLGU0ZTxlRGVoZXBleGWAZYhlkGWYZaBlqGWwZbhlwGXIZdBl2GXgZehl8GX4Z -gBmJGYsZjBmVGZcZmBmhGaMZpBmtGbIAAAAAAAACAgAAAAAAAANXAAAAAAAAAAAAAAAAAAAZwQ +gwCfAKCAH4AXgDCAFIBKgBzSADcAOAGrAayjAawBrQA7Xk5TTXV0YWJsZUFycmF5V05TQXJyYXnSADcA +OAGvANKjANIA0wA7XxAWe3swLCAwfSwgezE2ODAsIDEwMjh9fVp7MjQ1LCAyMDR9WnszMTAsIDIwNH1b +U3RhdHNXaW5kb3fSADcAOAG1AbaiAbYAO18QEE5TV2luZG93VGVtcGxhdGXSADcAOAG4AbmjAbkBugA7 +XE5TTXV0YWJsZVNldFVOU1NldNIADgA+AHQBvYBNqwG+Ab8BwAHBAcIBwwHEAcUBxgHHAciAWIBbgF2A +X4BhgGOAZYBngGmAa4Bt1AAOAcoBywHMAc0AQQAfAdBdTlNEZXN0aW5hdGlvblhOU1NvdXJjZVdOU0xh +YmVsgFqAB4ACgFlWd2luZG930gA3ADgB0wHUowHUAdUAO18QFE5TTmliT3V0bGV0Q29ubmVjdG9yXk5T +TmliQ29ubmVjdG9y1AAOAcoBywHMAc0AHwBBAdqAWoACgAeAXFhkZWxlZ2F0ZdQADgHKAcsBzAHNAIIA +HwHggFqAR4ACgF5eZlJhdGlvQWxsRmllbGTUAA4BygHLAcwBzQB7AB8B5oBagDGAAoBgXxAQZkRvd25s +b2FkZWRGaWVsZNQADgHKAcsBzAHNAHwAHwHsgFqANIACgGJbZlJhdGlvRmllbGTUAA4BygHLAcwBzQB/ +AB8B8oBagD6AAoBkXxAPZk51bU9wZW5lZEZpZWxk1AAOAcoBywHMAc0AfQAfAfiAWoA3gAKAZlpmVGlt +ZUZpZWxk1AAOAcoBywHMAc0AgAAfAf6AWoBBgAKAaF8QEWZVcGxvYWRlZEFsbEZpZWxk1AAOAcoBywHM +Ac0AgQAfAgSAWoBEgAKAal8QE2ZEb3dubG9hZGVkQWxsRmllbGTUAA4BygHLAcwBzQCDAB8CCoBagEqA +AoBsXWZUaW1lQWxsRmllbGTUAA4BygHLAcwBzQB6AB8CEIBagC2AAoBuXmZVcGxvYWRlZEZpZWxk0gAO +AD4CEwIUgHKvEB8AUQB4AHkAfwB2AhoAQQDpAIIAegELAHcBHQCBAHsAiwB8AX4AfQB+AZ4AgwEtAT0B +XgD6AU0AgAFuANgBjoANgCWAKYA+gBCAcIAHgCeAR4AtgC+AIYAzgESAMYASgDSARoA3gDqATIBKgDaA +OYBAgCuAPIBBgEOAI4BJ0gAOADIAMwI2gASAcV1OU0FwcGxpY2F0aW9u0gA3ADgCOQGtogGtADvSAA4A +PgITAjyAcq8QHwBBAFEAUQBRAFEAHwAfAHgAUQBRAHoAUQB7AFEAUQB2AFEAgQBRAFEAgwBRAHwAfQB/ +AHkAfgBRAIAAdwCCgAeADYANgA2ADYACgAKAJYANgA2ALYANgDGADYANgBCADYBEgA2ADYBKgA2ANIA3 +gD6AKYA6gA2AQYAhgEfSAA4APgITAl6Acq8QIABRAHgAeQB/AhoAQQB2AIIA6QB6AQsAHwB3AIEAewEd +AIsAfAF+AH0AfgGeAIMBLQFeAT0A+gFNAIABjgDYAW6ADYAlgCmAPoBwgAeAEIBHgCeALYAvgAKAIYBE +gDGAM4ASgDSARoA3gDqATIBKgDaAQIA5gCuAPIBBgEmAI4BD0gAOAD4CEwKBgHKvECACggKDAoQChQKG +AocCiAKJAooCiwKMAo0CjgKPApACkQKSApMClAKVApYClwKYApkCmgKbApwCnQKeAp8CoAKhgHaAd4B4 +gHmAeoB7gHyAfYB+gH+AgICBgIKAg4CEgIWAhoCHgIiAiYCKgIuAjICNgI6Aj4CQgJGAkoCTgJSAlVxD +b250ZW50IFZpZXdfEBRTdGF0aWMgVGV4dCAoUmF0aW86KV8QG1N0YXRpYyBUZXh0IChSdW5uaW5nIFRp +bWU6KV8QE1N0YXRpYyBUZXh0IChMYWJlbClbQXBwbGljYXRpb25fEA9XaW5kb3cgKFdpbmRvdylfEBdT +dGF0aWMgVGV4dCAoVXBsb2FkZWQ6KV8QFVN0YXRpYyBUZXh0IChMYWJlbCktMV8QGFRleHQgRmllbGQg +Q2VsbCAoUmF0aW86KV8QFVN0YXRpYyBUZXh0IChMYWJlbCktMl8QGVRleHQgRmllbGQgQ2VsbCAoTGFi +ZWwpLTJcRmlsZSdzIE93bmVyXxAZU3RhdGljIFRleHQgKERvd25sb2FkZWQ6KV8QFVN0YXRpYyBUZXh0 +IChMYWJlbCktM18QFVN0YXRpYyBUZXh0IChMYWJlbCktNF8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwp +LTRfEBtUZXh0IEZpZWxkIENlbGwgKFVwbG9hZGVkOilfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTVfEBlU +ZXh0IEZpZWxkIENlbGwgKExhYmVsKS0zXxAVU3RhdGljIFRleHQgKExhYmVsKS02XxAeU3RhdGljIFRl +eHQgKFByb2dyYW0gU3RhcnRlZDopXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktN18QFVN0YXRpYyBU +ZXh0IChMYWJlbCktN18QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTVfEBdUZXh0IEZpZWxkIENlbGwg +KExhYmVsKV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTZfEB9UZXh0IEZpZWxkIENlbGwgKFJ1bm5p +bmcgVGltZTopXxAiVGV4dCBGaWVsZCBDZWxsIChQcm9ncmFtIFN0YXJ0ZWQ6KV8QFVN0YXRpYyBUZXh0 +IChMYWJlbCktOF8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTFfEB1UZXh0IEZpZWxkIENlbGwgKERv +d25sb2FkZWQ6KV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTjSAA4APgITAsSAcqDSAA4APgITAseA +cqDSAA4APgITAsqAcq8QKwBRAHgAeQB/AHYCGgBBAOkAggG+AcABxQB6AQsAHwB3AR0AewCBAIsBwQHE +AHwBvwF+AH0AfgGeAIMBwgHDAS0BPQFeAPoBTQCAAccBbgDYAY4BxgHIgA2AJYApgD6AEIBwgAeAJ4BH +gFiAXYBngC2AL4ACgCGAM4AxgESAEoBfgGWANIBbgEaAN4A6gEyASoBhgGOANoA5gECAK4A8gEGAa4BD +gCOASYBpgG3SAA4APgITAviAcq8QKwL5AvoC+wL8Av0C/gL/AwADAQMCAwMDBAMFAwYDBwMIAwkDCgML +AwwDDQMOAw8DEAMRAxIDEwMUAxUDFgMXAxgDGQMaAxsDHAMdAx4DHwMgAyEDIgMjgJqAm4CcgJ2AnoCf +gKCAoYCigKOApIClgKaAp4CogKmAqoCrgKyArYCugK+AsICxgLKAs4C0gLWAtoC3gLiAuYC6gLuAvIC9 +gL6Av4DAgMGAwoDDgMQQCxANECQT//////////0QARAMECwQHRAyEDAQNBAFEBIQERAqEAQQIBAiEBMQ +HhArEBUQIxAvEC4QIRAnEBQQFhAlEA4QJhAoEDMQKRAtEDEQH9IADgA+AHQDTIBNoNIADgA+AhMDT4By +oNIADgA+AhMDUoByoNIANwA4A1QDVaIDVQA7Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABS +AFQAZgH7AgECTAJTAloCaAJ6ApYCpAKwArwCygLVAuMC/wMNAyADMgNMA1YDYwNlA2cDaQNrA20DbwNx +A3MDdQN3A3kDewN9A38DgQODA4UDhwOQA5wDngOgA7gDwQPKA9UD2gPpA/IEBQQOBBkEGwQeBCAEXwRs +BIUEkgSoBLYEwATOBOcE9AT+BRAFJAUuBToFPAU+BUAFQgVEBUYFSwVNBU8FUQVTBVUFVwVZBVsFdgWB +BYkFlAWfBbwFzgXZBeIF7gX3BgMGBQYHBgkGDAYOBhAGEgYbBh0GOgY8Bj4GQAZCBkQGRgZIBkoGTAZO +BlAGUgZUBlYGdwZ/BoYGkAaSBpQGlgaYBpsGnAaeBqAGuAbZBuUG+QcEBw4HHAcpBzUHOgc8Bz4HQAdC +B0QHSQdLB1UHZgdtB3QHfQd/B4gHigeMB5kHogenB64HwwfLB9gH5AfyB/QH9gf4B/oH/AgDCBAIHQgl +CCcIKQg1CD4IQwhYCFoIXAheCGAIcwiACIIIhQiOCJcIqQi2CL8IygjWCOAI5wjzCRQJFgkYCRoJHAkd +CR8JIQk5CVoJXAleCWAJYglkCWYJcgmTCZUJlwmZCZsJnAmeCaAJtwnYCdoJ3AneCeAJ4gnkCesKDAoO +ChAKEgoUChUKFwoZCjAKUQpTClUKVwpZClsKXQprCowKjgqQCpIKlAqXCpgKmgqcCrYK1wrZCtsK3Qrf +CuEK4wrpCwoLDAsOCxALEgsTCxULFwsxC1ILVAtWC1gLWgtcC14LfwuBC4MLhQuHC4gLiguMC6ULxgvI +C8oLzAvOC9AL0gvzC/UL9wv5C/sL/Av+DAAMGQw6DDwMPgxADEIMRAxGDGcMaQxrDG0MbwxwDHIMdAyL +DKwMrgywDLIMtAy2DLgMywzsDO4M8AzyDPQM9Qz3DPkNEg0zDTUNNw05DTsNPQ0/DWANYg1kDWYNaA1p +DWsNbQ2HDagNqg2sDa4NsA2yDbQN1Q3XDdkN2w3dDd4N4A3iDfwOHQ4fDiEOIw4lDicOKQ5KDkwOTg5Q +DlIOUw5VDlcOcA6RDpMOlQ6XDpkOmw6dDr4OwA7CDsQOxg7HDskOyw7kDwUPBw8JDwsPDQ8PDxEPGg8h +DzAPOA9BD0gPYQ9sD3cPgw+MD5EPpA+tD7QPwQ/HD9AP0g/pD+sP7Q/vD/EP8w/1D/cP+Q/7D/0P/xAQ +EB4QJxAvEDEQMxA1EDcQPhBHEE4QZRB0EIUQhxCJEIsQjRCWEKcQqRCrEK0QrxC+EM8Q0RDTENUQ1xDq +EPsQ/RD/EQERAxEPESARIhEkESYRKBE6EUsRTRFPEVERUxFeEW8RcRFzEXURdxGLEZwRnhGgEaIRpBG6 +EcsRzRHPEdER0xHhEfIR9BH2EfgR+hIJEhISFBJVElcSWRJbEl0SXxJhEmMSZRJnEmkSaxJtEm8ScRJz +EnUSdxJ5EnsSfRJ/EoESgxKFEocSiRKLEo0SjxKREpMSnBKeEqASrhK3ErwSxRLHEwgTChMMEw4TEBMS +ExQTFhMYExoTHBMeEyATIhMkEyYTKBMqEywTLhMwEzITNBM2EzgTOhM8Ez4TQBNCE0QTRhNPE1ETlBOW +E5gTmhOcE54ToBOiE6QTphOoE6oTrBOuE7ATshO0E7YTuBO6E7wTvhPAE8ITxBPGE8gTyhPME84T0BPS +E9QT3RPfFCIUJBQmFCgUKhQsFC4UMBQyFDQUNhQ4FDoUPBQ+FEAUQhREFEYUSBRKFEwUThRQFFIUVBRW +FFgUWhRcFF4UYBRiFG8UhhSkFLoUxhTYFPIVChUlFT0VWRVmFYIVmhWyFc4V7BYEFiAWOBZZFnUWjRap +FsMW3xcBFyYXPhdaF3oXlhefF6EXoherF60Xrhe3F7kYEhgUGBYYGBgaGBwYHhggGCIYJBgmGCgYKhgs +GC4YMBgyGDQYNhg4GDoYPBg+GEAYQhhEGEYYSBhKGEwYThhQGFIYVBhWGFgYWhhcGF4YYBhiGGQYZhho +GHEYcxjMGM4Y0BjSGNQY1hjYGNoY3BjeGOAY4hjkGOYY6BjqGOwY7hjwGPIY9Bj2GPgY+hj8GP4ZABkC +GQQZBhkIGQoZDBkOGRAZEhkUGRYZGBkaGRwZHhkgGSIZJBkmGSgZMRkzGTUZNxk5GTsZPRk/GUEZQxlF +GUcZSRlLGU0ZTxlRGVMZVRlXGVkZWxldGV8ZYRljGWUZZxlpGWsZbRlvGXEZcxl1GX4ZgBmBGYoZjBmN +GZYZmBmZGaIZpwAAAAAAAAICAAAAAAAAA1YAAAAAAAAAAAAAAAAAABm2A diff --git a/macosx/StatsWindowController.m b/macosx/StatsWindowController.m index 053eb14a0..0bb019989 100644 --- a/macosx/StatsWindowController.m +++ b/macosx/StatsWindowController.m @@ -107,7 +107,7 @@ tr_handle * fLib; - (NSString *) timeString: (uint64_t) seconds { - NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: 4]; + NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: 3]; if (seconds >= 86400) //24 * 60 * 60 { @@ -123,12 +123,7 @@ tr_handle * fLib; [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d hr", "stats window -> running time"), seconds / 3600]]; seconds %= 3600; } - if (seconds >= 60) - { - [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d min", "stats window -> running time"), seconds / 60]]; - seconds %= 60; - } - [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d sec", "stats window -> running time"), seconds]]; + [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d min", "stats window -> running time"), seconds / 60]]; return [timeArray componentsJoinedByString: @" "]; }