From ae2c7c8f12ba916ab079a9b2c3d3caf3db30d5bb Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Thu, 17 Jan 2008 06:53:40 +0000 Subject: [PATCH] update dock badge images --- Transmission.xcodeproj/project.pbxproj | 4 ++++ macosx/BadgeView.h | 1 - macosx/BadgeView.m | 31 +++++++------------------ macosx/Badger.m | 11 ++++----- macosx/Images/DownloadBadge.png | Bin 525 -> 1798 bytes macosx/Images/UploadBadge.png | Bin 516 -> 1778 bytes 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 8579d0ce3..7cc233da3 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -99,6 +99,7 @@ A24621410C769D0900088E81 /* trevent.h in Headers */ = {isa = PBXBuildFile; fileRef = A24621350C769CF400088E81 /* trevent.h */; }; A24621420C769D0900088E81 /* trevent.c in Sources */ = {isa = PBXBuildFile; fileRef = A24621360C769CF400088E81 /* trevent.c */; }; A24872B60C9B6BB9000F5B92 /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = A24872B50C9B6BB9000F5B92 /* Advanced.png */; }; + A24B65600D3F30870079EA4D /* QuitBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = A24B655F0D3F30870079EA4D /* QuitBadge.png */; }; A24D2A640C0A624600A0ED9F /* IPCController.m in Sources */ = {isa = PBXBuildFile; fileRef = A24D2A620C0A624600A0ED9F /* IPCController.m */; }; A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; @@ -474,6 +475,7 @@ A24621350C769CF400088E81 /* trevent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = trevent.h; path = libtransmission/trevent.h; sourceTree = ""; }; A24621360C769CF400088E81 /* trevent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = trevent.c; path = libtransmission/trevent.c; sourceTree = ""; }; A24872B50C9B6BB9000F5B92 /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Advanced.png; path = macosx/Images/Advanced.png; sourceTree = ""; }; + A24B655F0D3F30870079EA4D /* QuitBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = QuitBadge.png; path = macosx/Images/QuitBadge.png; sourceTree = ""; }; A24D2A610C0A624600A0ED9F /* IPCController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IPCController.h; path = macosx/IPCController.h; sourceTree = ""; }; A24D2A620C0A624600A0ED9F /* IPCController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = IPCController.m; path = macosx/IPCController.m; sourceTree = ""; }; A24D2A770C0A65C400A0ED9F /* ipcparse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipcparse.c; path = libtransmission/ipcparse.c; sourceTree = ""; }; @@ -960,6 +962,7 @@ 4DE5CCA80980739100BE280E /* Badge.png */, 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */, 4DDFDD21099A5D8E00189D81 /* UploadBadge.png */, + A24B655F0D3F30870079EA4D /* QuitBadge.png */, 4DE5CCB80981D27700BE280E /* ResumeAll.png */, 4DE5CCB90981D27700BE280E /* PauseAll.png */, A25FCDDD0A37695F002BCBBE /* PauseSelected.png */, @@ -1643,6 +1646,7 @@ A2623B410D3DC5930045D19A /* ResumeHover.png in Resources */, A2623B420D3DC5930045D19A /* PauseHover.png in Resources */, A2623B4E0D3DC6DF0045D19A /* ActionHover.png in Resources */, + A24B65600D3F30870079EA4D /* QuitBadge.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/BadgeView.h b/macosx/BadgeView.h index 2b28f4025..4dc8c6efc 100644 --- a/macosx/BadgeView.h +++ b/macosx/BadgeView.h @@ -32,7 +32,6 @@ NSDictionary * fAttributes; BOOL fQuitting; - NSImage * fQuitBadge; } - (id) initWithFrame: (NSRect) frame lib: (tr_handle *) lib; diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m index a3fdaa1cf..38efc5058 100644 --- a/macosx/BadgeView.m +++ b/macosx/BadgeView.m @@ -25,7 +25,6 @@ #import "BadgeView.h" #import "NSStringAdditions.h" -#define BADGE_HEIGHT 30.0 #define BETWEEN_PADDING 2.0 @interface BadgeView (Private) @@ -54,7 +53,6 @@ - (void) dealloc { [fAttributes release]; - [fQuitBadge release]; [super dealloc]; } @@ -64,22 +62,8 @@ if (fQuitting) { - if (!fQuitBadge) - { - NSRect badgeRect = NSMakeRect(0.0, 0.0, rect.size.width, BADGE_HEIGHT); - NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect xRadius: 15.0 yRadius: 15.0]; - - fQuitBadge = [[NSImage alloc] initWithSize: badgeRect.size]; - [fQuitBadge lockFocus]; - - [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set]; - [bp fill]; - - [fQuitBadge unlockFocus]; - } - - [self badge: fQuitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit message") - atHeight: (rect.size.height - BADGE_HEIGHT) * 0.5]; + [self badge: [NSImage imageNamed: @"QuitBadge.png"] string: NSLocalizedString(@"Quitting", "Dock Badger -> quit") + atHeight: (rect.size.height - [[NSImage imageNamed: @"UploadBadge"] size].height) * 0.5]; return; } @@ -91,13 +75,16 @@ tr_torrentRates(fLib, &downloadRate, &uploadRate); BOOL upload = checkUpload && uploadRate >= 0.1; + upload = YES; if (upload) - [self badge: [NSImage imageNamed: @"UploadBadge"] string: [NSString stringForSpeedAbbrev: uploadRate] atHeight: 0.0]; - if (checkDownload && downloadRate >= 0.1) + [self badge: [NSImage imageNamed: @"UploadBadge.png"] string: [NSString stringForSpeedAbbrev: uploadRate] atHeight: 0.0]; + //if (checkDownload && downloadRate >= 0.1) + if (YES) { //download rate above upload rate - float bottom = upload ? [[NSImage imageNamed: @"UploadBadge"] size].height + BETWEEN_PADDING : 0.0; - [self badge: [NSImage imageNamed: @"DownloadBadge"] string: [NSString stringForSpeedAbbrev: downloadRate] atHeight: bottom]; + float bottom = upload ? [[NSImage imageNamed: @"UploadBadge.png"] size].height + BETWEEN_PADDING : 0.0; + [self badge: [NSImage imageNamed: @"DownloadBadge.png"] string: [NSString stringForSpeedAbbrev: downloadRate] + atHeight: bottom]; } } } diff --git a/macosx/Badger.m b/macosx/Badger.m index 38d4be26e..2689ab717 100644 --- a/macosx/Badger.m +++ b/macosx/Badger.m @@ -157,7 +157,7 @@ dockIcon = [fDockIcon copy]; NSRect badgeRect; - badgeRect.size = [[NSImage imageNamed: @"UploadBadge"] size]; + badgeRect.size = [[NSImage imageNamed: @"UploadBadge.png"] size]; badgeRect.origin = NSZeroPoint; //ignore shadow of badge when placing string @@ -170,7 +170,7 @@ if (uploadRateString) { //place badge and text - [[NSImage imageNamed: @"UploadBadge"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; + [[NSImage imageNamed: @"UploadBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; [self badgeString: uploadRateString forRect: stringRect]; } @@ -185,7 +185,7 @@ } //place badge and text - [[NSImage imageNamed: @"DownloadBadge"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; + [[NSImage imageNamed: @"DownloadBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; [self badgeString: downloadRateString forRect: stringRect]; } @@ -246,13 +246,10 @@ rect.size = [quitIcon size]; NSRect badgeRect = NSMakeRect(0.0, (rect.size.height - BADGE_HEIGHT) * 0.5, rect.size.width, BADGE_HEIGHT); - NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0]; [quitIcon lockFocus]; - - [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set]; - [bp fill]; + [[NSImage imageNamed: @"QuitBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; [self badgeString: NSLocalizedString(@"Quitting", "Dock Badger -> quit message") forRect: badgeRect]; [quitIcon unlockFocus]; diff --git a/macosx/Images/DownloadBadge.png b/macosx/Images/DownloadBadge.png index ee80adcff9e3ae30f757aec9d1dc9c1079a8fa9d..968b16088fd13717c0bc576e639a422fa35d4f89 100644 GIT binary patch delta 1783 zcmVdbVG7wVRUJ4ZXi@?ZDjy4FEKYSFgOu(u*CoX0338hSaefwW^{L9a%BKPWN%_+ zAVz6&Wp{6KYjYq&Q!|*>Mgsr<246`;K~!jg?V3w$9akC0|9{_k%-p$8$Ihc^NJ~m^ zQE{9!Za^$5Du}QJsA?Bou|YK(9zvA}tBAT$)D<9ALcpRl0tr~73PgofWHgcg&?b!DVy`5tEuF*7#8Lyvsv1Z+AE z4)=k>AON|cz<-?Eg$Icxkaz<+nLhL9-%V{Kh;C+pv9JDMFD_31jDr01J$BFC zyWQZ>P}nvw0HxI}TYb*|jZkb(Yh1%GNnf({y90BY)?%kR%Cdr6?&Tq?M+NZ(PFM zx%q;%UU8xJ?Abs4=7t&Jh6WgW_zUxJ=Kg!{`ABp0zzABcW@xrrx!{|Ka;Ze6Qd!KM zJ4bK5y-{#n&GysI_H*Csgy;QW%SCK zSF0@J*MDYSere>tf4|NEhd=w}d2;RH&wOgE(QGt=54rYR0VxE^m5Ti9D`!g3rGL!) z<+s;NaLoV@esS`IXk0#i>=|P{Gdq>Um&dLIHsA>Cr+QFSpz601o-?-@+K{IEmwyx9L#; zP=}s4K1JShv0C(LV+CM$r`MSC|AZ8ha@97n4h}tWd`cl*92Y`l^?D<)GeB6|{DlzU zoPUF{maVn$-m~|4lh{v4DIujKtu-R8Nht*(#M&1{fUP%J$;6m+aa<9*{efXKYruBZ z0NoOh8N2yqnAwHJi~X$gwhQn34#AR4qGEII3# ztwnGa#$>S8=Av(MOm71>0oGbm6vYsVA%CDDWUx|*K}AAIsa11#%N?Ziu=YnSTU` zBp@_cMo@7{dzmaLjw%Co@?7Ncydz+hJvqRL?js!?3Kqx>)AYFtmlp~HR z=M`#ur?pu*q6%eXHUm2Yb`DG)971k_&B}G+3xE`$5|A!IC1p}cS^L`FX<}xKedVNU zEdKjyd-*-%(`AHC9cUdnbc6KZmYV&_R|2M06;$Q_#|e3@n&skXYpzXZ3clzKnRIoQh+j0@PAzs1fQFr zFX@RdWUtwifQlh>;X3gLhIW=IE(-a;Eq{Erys{EH?H2QD z2?zl|UIzLGA^_AK_k;uqg+j4J1GSoPPz4cuHlfAf3Z z8OP4FwP4e3r`$0ad*@-D%dd|03q;ULkyH|eD5j)XAnS#eQCtyH3s?Q<$+_nqJ#oX( zo1OO`{^7fO?1h(J&~UDP6d@2H81~KpYz4uG5ON3f0Yn4_6hmksRm3DC5V2L&(|UMf za^^d`7S@g3=m(zzPrdjIHQyblkbO)d3<^Oq&j5V_5kg?^A(mLg|K#$n>2uFL`piZ` Z{{y%yMddRXH6j22002ovPDHLkV1mA$ON#&i delta 500 zcmV~g*OQ3{HAJNOqv#LoSOMP_%AmxZA%9B&F5z^(`P1886i=>Q z516!saSO+@@Gp8M+?k1FWhnLEiUV;sR1oWUI&mJ>mbYLnpm zKY!=s=C!{zcyRtep_xsfnzZt9IEMt!Sn)Vj;;qt+69h_ zd4L`(yTkW!!7lYyV34Fe;J8=~q?wZ2yIkjcfN?AmAXjo};Cyi8PbfKO0{90Lz;l=Y zp2Gz2943J0loNoq`NdWhKOKmShrZbHLM)AITS^s qY!3ZLh~`kZo7Wur4gdiE{{sMi+w6=Q-eko900001o91#BYyw{b3#c}2nYxWddbVG7wVRUJ4ZXi@?ZDjy4FEKYSFgOu(u*CoX0338hSaefwW^{L9a%BKPWN%_+ zAVz6&Wp{6KYjYq&Q!|*>Mgsr<21`jqK~!jg?VC+(Tvrvx|9|Ix&3iL%#`e^95Uyzn zX^TXXB9)R5i3&neH!LU%#2P6qs&2Al(-t=h-LNYg76plJ5fbW#)JlK_q9l9?5?2%& zLP}!P;QAw;nK$$9*I_X;AvAHZP!z`2`$=~-_l&M|{`Z{!eY%&J8C&7d(fuc*6>}VE zHyBL-a!Y|F_kW52!YT>AEKFQ@SFT*vAOJG{^uAB8e*GukzIt`D*i8j+ z=-A$qp`)MEQu}@T9_{Ygy@#ChoOg5f-f_3v-CF4=xqm05X-Z0Is-{)aTG6G;mvHgo z9}^dxk~R0z8>biVSP||hfPkpU?gL!YAH8?=}G(JiKo)I{EP9j~!?yroyduJKnQZm)v#gStfe6px^xN zd_(B))_=L5UEF)?@Bbly&m7&m7z_FEflnQ3wcDK-VwwA$fD{5*R+Hy``^%cF#J7KS zX7Q#7ZVKSDUw!DLTTY*Q?9qd*jg6KIKK$PnTypo3N}|!I>)&5EKc*)0Q@{A(+w;Ic z0AKm;#O%_K@BiEM#7rkOwIYOoEuIcbwh2Ullz$REmshT@UaQS~`PxT+^z7PI1px1! znR-Q%@=E9;&vQnZ{GAB_+NeU3O5Qy?^$MQFQwjjs>LY2AuIJrOWU$QAuDo80vYYnXpX{A6y+%}IS5L!K!T3NrL=M;k2!_2NI z3Isb4z@Pa$0vKdaDMiLqV2q*RJW_xnhE&nP%RNevZ2IU{ zg9{v-KyVCe3pnS>q;GSqvuvFOI$*6e8GloOWC9BYYj%kcO+^aQhhDIrU~^_y43B{H z-~PX38&MPmTU$U^Bq~A>MG;9EsYo&$TXr5Cn7~A(5!{h5KtN!J!ZRyYOj1KZh9DFR zNDfQ{X1ZAc%8x-i10rB(?3fr345%O>Lr`Sgs!oL|I<`wv0D`~);Mi{gr3kh+M1TDp zl3RLOL2A$A&%n<^pL2w@4q6CeQgx3qy$1lx<@&L1Qn0uY8F6Go*b$y9|-rh5y- z%$PgzfL~wkthH7OYg+`@A%q?wdVe4eMKByCqYw255g-&pC_p9*U1OL!qcNFQ#_mhU z7ryh3QUE~p{A}iu&lNqp5<~18K@hkH5D4u1YGR-i!YDILJO(>o0i+lr0aTTtsti*T z$i|ZfHS)6npa5Xk6YIyXzy6^s6H{4rg>U4be(fL$gn|GIaOnGjp*JXf!GCB$!{iIx zG<(tj(f}$Q?EVaBPS-P)u-Ns)`f*?&fLEV%OJ7a=;frD1cxI(SP+T0Ee;yj1n~XXiKuc`-KLi;l2PWfUW{lQm2 zUrv8(`SvSeL!NqmY7vF`xXr^#dm|5dyWn7fV1ej>IA{fkr4<+z2ml79Uq~JZpg*cv zh3aE9ZK|@#ruftAwr7?%Ix zhaL%}X+mS;<049%n2O3^inmUmdT;M-p_@GndHUu0yt`h1!Mo_A<6I)K-CoYUUXNo8 zu+ElO$3_JLj5Z{MM3N+wCMkIoS{qRpiiF~5IJAI&a{0B$<(x$OneH{Aq%h`)| z&CJ26j}fb;AW=RJ9U&sez~on<{a?+5U3l$8`^Bxq{R?9%F>(U3o%R3#002ovPDHLk FV1jE`DdqqG delta 491 zcmVa+mfi_ zBKZX4g&j4n$Qij~hwO5X=k74MxuqXihrStbs-Q^L?DVktrGGjzS^OA!!eF34Ah+yz zxBS9Bd0$xCYJPwIKD(a1=_~z8Uwx)4!I&XO?24VSJ9g+fCC9x%u>H@E9xgugrG5#1 zL*Q4iLw4C&2|W4qd~h$A-$iBUiG$O^PQ4&-_5|A9@Nu++o-7y!cO_uw>|Sx2;6C%Q z>`xbV>+T8a6n~L&#znjI)21QxB*Cz-?zCYldW9SKjVPVJ4V_?NAK)X4p zQ@s&P5)21B-UNUxm3zF4JYN9h*a?72xv4?$$$>w?bB+Lz2LeDi2ms+A0EB}85RT^@ zX`nE+(?A>q$)e{V2uHz^=pF@UHpR;zIdonI;dQVadSqV*D-?u?p|>D}2TH=G&%Tnd zCJ0azI!TTy3atmq!l%Jc%fj0rKx4>c+20uA477$#i{o3v{LwUr=5~SR(Eo$i97^sE hHHUry009600|59=1(0QPe_;Rs002ovPDHLkV1i`S>V5zK