From d96f0b629b018aef4011097b34ea53a22b74c32f Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 20 Nov 2007 13:16:24 +0000 Subject: [PATCH] don't display the not available bar for paused transfers --- macosx/English.lproj/StatsWindow.xib | 392 +++++++++++++-------------- macosx/StatsWindowController.m | 2 - macosx/TorrentCell.m | 2 +- 3 files changed, 197 insertions(+), 199 deletions(-) diff --git a/macosx/English.lproj/StatsWindow.xib b/macosx/English.lproj/StatsWindow.xib index 0a456ed82..4770d8ff0 100644 --- a/macosx/English.lproj/StatsWindow.xib +++ b/macosx/English.lproj/StatsWindow.xib @@ -59,7 +59,7 @@ 6 - System + System controlColor 3 @@ -68,7 +68,7 @@ 6 - + controlTextColor 3 @@ -600,162 +600,6 @@ YES - - - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - IBProjectSource - macosx/NSApplicationAdditions.h - - - - NSObject - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - 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 - - - - NSMenu - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - macosx/NSMenuAdditions.h - - StatsWindowController NSWindowController @@ -788,10 +632,166 @@ - + IBProjectSource macosx/StatsWindowController.h + + NSMenu + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/NSMenuAdditions.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/NSApplicationAdditions.h + + + + NSObject + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/UKKQueue/UKFileWatcher.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/UKKQueue/UKMainThreadProxy.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/IPCController.h + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/UKKQueue/UKKQueue.h + + 0 @@ -803,8 +803,8 @@ AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxChAAsADAAxADUANgA8AD0A QgBgAGEAYgBjAGQAZQALAHMAgACMAI0AnQCeAKYApwCqALQAtQC2ALsAvQDCAMMAxgDKANAA2ADZAOAA 4QDpAOoA8QDyAPoA+wECAQMBDAENARQBFQEdAR4BJQEtAS4BNQE9AT4BRQFNAU4BVQFWAV4BXwFmAGQA CwFqAWwBbQFuAW8BcAFzAXcBgQGJAYoBjgGTAZQBmQGaAZ8BoAGlAaYBqwGsAbEBsgHMAc8B0AHSAewC -BwIiAiMCJAIlAiYCJwIoAikCKgIrAiwCLQIuAi8CMAIxAjICMwI0AjUCNgI3AjgCOQI6Aj0CQAJiAoQA -XQKFAoYChwCxAogCiQKKAosCjAKNAo4CjwKQApECkgC5ApMClABcApUClgKXApgCmQKaApsCnAKdAp4C +BwIiAiMCJAIlAiYCJwIoAikCKgIrAiwCLQIuAi8CMAIxAjICMwI0AjUCNgI3AjgCOQI6Aj0CQAJiAoQC +hQKGAocCiAKJAooCiwKMAo0AXQKOAo8CkAKRApIAsQKTApQClQKWApcCmABcApkCmgKbApwAuQKdAp4C nwKiAqUCqFUkbnVsbN8QEgANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAi ACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMFZOU1Jvb3RWJGNsYXNzXU5TT2JqZWN0c0tleXNfEA9O U0NsYXNzZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlPaWRzVmFsdWVzXU5TQ29ubmVjdGlvbnNbTlNO @@ -856,37 +856,37 @@ OTgsIDE3fX3YAI4ADgCPAJAAkQCSAJMAlACVAJYAlwEQAJkAfwCbAJyAH4AXgDCAFIA+gBzSADcAOAFn AWijAWgBaQA7Xk5TTXV0YWJsZUFycmF5V05TQXJyYXnSADcAOAFrAM6jAM4AzwA7XxAWe3swLCAwfSwg ezE2ODAsIDEwMjh9fVp7MjQ1LCAxNzl9XXsxMDAwMDAsIDE3OX1bU3RhdHNXaW5kb3fSADcAOAFxAXKi AXIAO18QEE5TV2luZG93VGVtcGxhdGXSADcAOAF0AXWjAXUBdgA7XE5TTXV0YWJsZVNldFVOU1NldNIA -DgA+AHQBeYBBpwF6AXsBfAF9AX4BfwGAgEyAT4BRgFOAVYBXgFnUAA4BggGDAYQBhQAfAEEBiF1OU0Rl -c3RpbmF0aW9uWE5TU291cmNlV05TTGFiZWyAToACgAeATVhkZWxlZ2F0ZdIANwA4AYsBjKMBjAGNADtf -EBROU05pYk91dGxldENvbm5lY3Rvcl5OU05pYkNvbm5lY3RvctQADgGCAYMBhAGFAH0AHwGSgE6AN4AC -gFBaZlRpbWVGaWVsZNQADgGCAYMBhAGFAHoAHwGYgE6ALYACgFJeZlVwbG9hZGVkRmllbGTUAA4BggGD -AYQBhQBBAB8BnoBOgAeAAoBUVndpbmRvd9QADgGCAYMBhAGFAHwAHwGkgE6ANIACgFZbZlJhdGlvRmll -bGTUAA4BggGDAYQBhQB7AB8BqoBOgDGAAoBYXxAQZkRvd25sb2FkZWRGaWVsZNQADgGCAYMBhAGFAH8A -HwGwgE6APoACgFpfEA9mTnVtT3BlbmVkRmllbGTSAA4APgGzAbSAXq8QFwG1AEEAfQB4AHoAdgB/AIcA -1AB3AFEA5QEHAHsBKQEZAHwA9gFJATkAfgFaAHmAXIAHgDeAJYAtgBCAPoASgCOAIYANgCeAL4AxgDaA -M4A0gCuAPIA5gDqAQIAp0gAOADIAMwHOgASAXV1OU0FwcGxpY2F0aW9u0gA3ADgB0QFpogFpADvSAA4A -PgGzAdSAXq8QFwAfAB8AUQBRAFEAUQBRAHYAdwBRAEEAeAB6AFEAfAB7AFEAeQB+AH0AUQB/AFGAAoAC -gA2ADYANgA2ADYAQgCGADYAHgCWALYANgDSAMYANgCmAOoA3gA2APoAN0gAOAD4BswHugF6vEBgBtQBB -AB8AfQB4AHoAdgB/AIcBBwB3AFEAewDlANQBKQB8ARkBSQFaAH4BOQD2AHmAXIAHgAKAN4AlgC2AEIA+ -gBKAL4AhgA2AMYAngCOANoA0gDOAPIBAgDqAOYArgCnSAA4APgGzAgmAXq8QGAIKAgsCDAINAg4CDwIQ +DgA+AHQBeYBBpwF6AXsBfAF9AX4BfwGAgEyAT4BRgFOAVYBXgFnUAA4BggGDAYQBhQB9AB8BiF1OU0Rl +c3RpbmF0aW9uWE5TU291cmNlV05TTGFiZWyAToA3gAKATVpmVGltZUZpZWxk0gA3ADgBiwGMowGMAY0A +O18QFE5TTmliT3V0bGV0Q29ubmVjdG9yXk5TTmliQ29ubmVjdG9y1AAOAYIBgwGEAYUAfAAfAZKAToA0 +gAKAUFtmUmF0aW9GaWVsZNQADgGCAYMBhAGFAB8AQQGYgE6AAoAHgFJYZGVsZWdhdGXUAA4BggGDAYQB +hQBBAB8BnoBOgAeAAoBUVndpbmRvd9QADgGCAYMBhAGFAHsAHwGkgE6AMYACgFZfEBBmRG93bmxvYWRl +ZEZpZWxk1AAOAYIBgwGEAYUAfwAfAaqAToA+gAKAWF8QD2ZOdW1PcGVuZWRGaWVsZNQADgGCAYMBhAGF +AHoAHwGwgE6ALYACgFpeZlVwbG9hZGVkRmllbGTSAA4APgGzAbSAXq8QFwDUAHkAhwG4AQcA9gB8AHgB +KQE5AH4AegB/ARkAUQFaAHcA5QB7AHYAfQFJAEGAI4ApgBKAXIAvgCuANIAlgDaAOYA6gC2APoAzgA2A +QIAhgCeAMYAQgDeAPIAH0gAOADIAMwHOgASAXV1OU0FwcGxpY2F0aW9u0gA3ADgB0QFpogFpADvSAA4A +PgGzAdSAXq8QFwB3AFEAdgAfAHoAeQBRAFEAfAB9AFEAUQBRAHsAQQB/AFEAeABRAFEAUQB+AB+AIYAN +gBCAAoAtgCmADYANgDSAN4ANgA2ADYAxgAeAPoANgCWADYANgA2AOoAC0gAOAD4BswHugF6vEBgAeQB8 +AbgAfgEpAPYAfwB4AQcBWgDUAHoAhwEZAB8AUQB3ATkAewDlAHYAfQFJAEGAKYA0gFyAOoA2gCuAPoAl +gC+AQIAjgC2AEoAzgAKADYAhgDmAMYAngBCAN4A8gAfSAA4APgGzAgmAXq8QGAIKAgsCDAINAg4CDwIQ AhECEgITAhQCFQIWAhcCGAIZAhoCGwIcAh0CHgIfAiACIYBigGOAZIBlgGaAZ4BogGmAaoBrgGyAbYBu -gG+AcIBxgHKAc4B0gHWAdoB3gHiAeVtBcHBsaWNhdGlvbl8QD1dpbmRvdyAoV2luZG93KVxGaWxlJ3Mg -T3duZXJfEBNTdGF0aWMgVGV4dCAoTGFiZWwpXxAUU3RhdGljIFRleHQgKFJhdGlvOilfEBVTdGF0aWMg -VGV4dCAoTGFiZWwpLTFfEBdTdGF0aWMgVGV4dCAoVXBsb2FkZWQ6KV8QFVN0YXRpYyBUZXh0IChMYWJl -bCktMl8QG1RleHQgRmllbGQgQ2VsbCAoVXBsb2FkZWQ6KV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwp -LTFfEBlTdGF0aWMgVGV4dCAoRG93bmxvYWRlZDopXENvbnRlbnQgVmlld18QFVN0YXRpYyBUZXh0IChM -YWJlbCktM18QGFRleHQgRmllbGQgQ2VsbCAoUmF0aW86KV8QHVRleHQgRmllbGQgQ2VsbCAoRG93bmxv -YWRlZDopXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktNF8QFVN0YXRpYyBUZXh0IChMYWJlbCktNF8Q -GVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTNfECJUZXh0IEZpZWxkIENlbGwgKFByb2dyYW0gU3RhcnRl -ZDopXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktMl8QHlN0YXRpYyBUZXh0IChQcm9ncmFtIFN0YXJ0 -ZWQ6KV8QF1RleHQgRmllbGQgQ2VsbCAoTGFiZWwpXxAfVGV4dCBGaWVsZCBDZWxsIChSdW5uaW5nIFRp -bWU6KV8QG1N0YXRpYyBUZXh0IChSdW5uaW5nIFRpbWU6KdIADgA+AbMCPIBeoNIADgA+AbMCP4BeoNIA -DgA+AbMCQoBerxAfAHgAegF8AH8AhwDUAHcBgAD2AH4BfwG1AEEAHwB9AXoBfQB2AQcBKQBRAOUAewF7 -AX4BGQB8AUkBWgE5AHmAJYAtgFGAPoASgCOAIYBZgCuAOoBXgFyAB4ACgDeATIBTgBCAL4A2gA2AJ4Ax -gE+AVYAzgDSAPIBAgDmAKdIADgA+AbMCZIBerxAfAmUCZgJnAmgCaQJqAmsCbAJtAm4CbwJwAnECcgJz +gG+AcIBxgHKAc4B0gHWAdoB3gHiAeV8QG1N0YXRpYyBUZXh0IChSdW5uaW5nIFRpbWU6KV8QE1N0YXRp +YyBUZXh0IChMYWJlbClbQXBwbGljYXRpb25fEB5TdGF0aWMgVGV4dCAoUHJvZ3JhbSBTdGFydGVkOilf +EBdUZXh0IEZpZWxkIENlbGwgKExhYmVsKV8QH1RleHQgRmllbGQgQ2VsbCAoUnVubmluZyBUaW1lOilf +EBVTdGF0aWMgVGV4dCAoTGFiZWwpLTJfEBRTdGF0aWMgVGV4dCAoUmF0aW86KV8QGVRleHQgRmllbGQg +Q2VsbCAoTGFiZWwpLTFfEBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS0yXxAdVGV4dCBGaWVsZCBDZWxs +IChEb3dubG9hZGVkOilfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTFfEBtUZXh0IEZpZWxkIENlbGwgKFVw +bG9hZGVkOilfEBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS0zXEZpbGUncyBPd25lclxDb250ZW50IFZp +ZXdfEBlTdGF0aWMgVGV4dCAoRG93bmxvYWRlZDopXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktNF8Q +FVN0YXRpYyBUZXh0IChMYWJlbCktM18QGFRleHQgRmllbGQgQ2VsbCAoUmF0aW86KV8QF1N0YXRpYyBU +ZXh0IChVcGxvYWRlZDopXxAVU3RhdGljIFRleHQgKExhYmVsKS00XxAiVGV4dCBGaWVsZCBDZWxsIChQ +cm9ncmFtIFN0YXJ0ZWQ6KV8QD1dpbmRvdyAoV2luZG93KdIADgA+AbMCPIBeoNIADgA+AbMCP4BeoNIA +DgA+AbMCQoBerxAfAHkAfgCHAbgBBwD2AXoBfQFaATkAegF/AHsBSQF8AX4A1AB8ASkAfwB4ARkAHwBR +AHcBgADlAXsAdgB9AEGAKYA6gBKAXIAvgCuATIBTgECAOYAtgFeAMYA8gFGAVYAjgDSANoA+gCWAM4AC +gA2AIYBZgCeAT4AQgDeAB9IADgA+AbMCZIBerxAfAmUCZgJnAmgCaQJqAmsCbAJtAm4CbwJwAnECcgJz AnQCdQJ2AncCeAJ5AnoCewJ8An0CfgJ/AoACgQKCAoOAfoB/gICAgYCCgIOAhICFgIaAh4CIgImAioCL -gIyAjYCOgI+AkICRgJKAk4CUgJWAloCXgJiAmYCagJuAnBALEB8QJBAEEAUQJxAOECMQIBP///////// -/RABECgQFRAeEB0QEBAUEAwQERAiECEQEhATECYQJRAWEA3SAA4APgB0AqGAQaDSAA4APgGzAqSAXqDS +gIyAjYCOgI+AkICRgJKAk4CUgJWAloCXgJiAmYCagJuAnBANECMQBBP//////////RAQEA4QIhAdECUQ +FhAnEBEQJhAeECAQExAUECQQCxASECgQBRAfEAwQIRAVEAHSAA4APgB0AqGAQaDSAA4APgGzAqSAXqDS AA4APgGzAqeAXqDSADcAOAKpAqqiAqoAO15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBU AGYBqwGxAfwCAwIKAhgCKgJGAlQCYAJsAnoChQKTAq8CvQLQAuIC/AMGAxMDFQMXAxkDGwMdAx8DIQMj AyUDJwMpAysDLQMvAzEDMwM1AzcDQANMA04DUANoA3EDegOFA4oDmQOiA7UDvgPJA8sDzgPQBA8EHAQ1 @@ -900,16 +900,16 @@ CbwJ0wn0CfYJ+An6CfwJ/goACg4KLwoxCjMKNQo3CjoKOwo9Cj8KWAp5CnsKfQp/CoEKgwqFCosKrAqu CrAKsgq0CrUKtwq5CtEK8gr0CvYK+Ar6CvwK/gsfCyELIwslCycLKAsqCywLRAtlC2cLaQtrC20Lbwtx C5ILlAuWC5gLmgubC50Lnwu3C9gL2gvcC94L4AviC+QMBQwHDAkMCwwNDA4MEAwSDCoMSwxNDE8MUQxT DFUMVwxqDIsMjQyPDJEMkwyUDJYMmAywDNEM0wzVDNcM2QzbDN0M5gztDPwNBA0NDRQNLQ04DUYNUg1b -DWANcw18DYMNkA2WDZ8NoQ2wDbINtA22DbgNug28Db4Nzw3dDeYN7g3wDfIN9A32Df8OCA4PDiYONQ5G -DkgOSg5MDk4OWQ5qDmwObg5wDnIOgQ6SDpQOlg6YDpoOoQ6yDrQOtg64DroOxg7XDtkO2w7dDt8O8g8D -DwUPBw8JDwsPHQ8mDygPWQ9bD10PXw9hD2MPZQ9nD2kPaw9tD28PcQ9zD3UPdw95D3sPfQ9/D4EPgw+F +DWANcw18DYMNkA2WDZ8NoQ2wDbINtA22DbgNug28Db4Nzw3dDeYN7g3wDfIN9A32DgEOCg4RDigONw5I +DkoOTA5ODlAOXA5tDm8OcQ5zDnUOfg6PDpEOkw6VDpcOng6vDrEOsw61DrcOyg7bDt0O3w7hDuMO9Q8G +DwgPCg8MDw4PHQ8mDygPWQ9bD10PXw9hD2MPZQ9nD2kPaw9tD28PcQ9zD3UPdw95D3sPfQ9/D4EPgw+F D4cPkA+SD5QPog+rD7APuQ+7D+wP7g/wD/IP9A/2D/gP+g/8D/4QABACEAQQBhAIEAoQDBAOEBAQEhAU EBYQGBAaECMQJRBYEFoQXBBeEGAQYhBkEGYQaBBqEGwQbhBwEHIQdBB2EHgQehB8EH4QgBCCEIQQhhCI -EJEQkxDGEMgQyhDMEM4Q0BDSENQQ1hDYENoQ3BDeEOAQ4hDkEOYQ6BDqEOwQ7hDwEPIQ9BD2EQIRFBEh -ETcRThFmEYARmBG2EdIR7hH7EhMSLhJOEmoSghKeEsMS3xMAExoTPBNaE2MTZRNmE28TcRNyE3sTfRO+ +EJEQkxDGEMgQyhDMEM4Q0BDSENQQ1hDYENoQ3BDeEOAQ4hDkEOYQ6BDqEOwQ7hDwEPIQ9BD2ERQRKhE2 +EVcRcRGTEasRwhHeEfoSGhIyElASbBJ5EoYSohK+EtYS8RMLEyMTSBNaE2MTZRNmE28TcRNyE3sTfRO+ E8ATwhPEE8YTyBPKE8wTzhPQE9IT1BPWE9gT2hPcE94T4BPiE+QT5hPoE+oT7BPuE/AT8hP0E/YT+BP6 E/wUBRQHFEgUShRMFE4UUBRSFFQUVhRYFFoUXBReFGAUYhRkFGYUaBRqFGwUbhRwFHIUdBR2FHgUehR8 -FH4UgBSCFIQUhhSIFIoUjBSOFJAUkhSUFJYUmBShFKMUpRSnFKkUqxStFK8UsRSzFLUUtxS5FLsUvRS/ +FH4UgBSCFIQUhhSIFIoUjBSVFJcUmRSbFJ0UnxShFKMUpRSnFKkUqxStFK8UsRSzFLUUtxS5FLsUvRS/ FMEUwxTMFM4UzxTYFNoU2xTkFOYU5xTwFPUAAAAAAAACAgAAAAAAAAKrAAAAAAAAAAAAAAAAAAAVBA diff --git a/macosx/StatsWindowController.m b/macosx/StatsWindowController.m index b078247a5..016f70fca 100644 --- a/macosx/StatsWindowController.m +++ b/macosx/StatsWindowController.m @@ -69,8 +69,6 @@ tr_handle * fLib; fStatsWindowInstance = nil; } -#warning make like pref window panel - @end @implementation StatsWindowController (Private) diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index fdeb7d204..6dd910a6d 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -333,7 +333,7 @@ if (rightWidth > 0) { - if ([fDefaults boolForKey: @"DisplayProgressBarAvailable"]) + if ([torrent isActive] && ![torrent allDownloaded] && [fDefaults boolForKey: @"DisplayProgressBarAvailable"]) { int notAvailableWidth = MIN(barRect.size.width * [torrent notAvailableDesired], rightWidth); rightWidth -= notAvailableWidth;