Permalink
Browse files

Imported icons from mattlawer/iTransmission.git. Thanks @mattlawer.

  • Loading branch information...
changpingc committed Nov 12, 2011
1 parent efc60aa commit 17692cf4d0a67357eee9e1a47c74d2ad5cf43547

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -70,7 +70,8 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
- (void)_test
{
- [self.controller openFiles:[NSArray arrayWithObject:[[NSBundle mainBundle] pathForResource:@"ubuntu-11.10-desktop-i386.iso" ofType:@"torrent"]] addType:ITAddTypeManual];
+// [(id)self.statusBarController.contentViewController slideContainerViewToRightAnimated:YES];
+// [self.controller openFiles:[NSArray arrayWithObject:[[NSBundle mainBundle] pathForResource:@"ubuntu-11.10-desktop-i386.iso" ofType:@"torrent"]] addType:ITAddTypeManual];
}
- (void)applicationWillResignActive:(UIApplication *)application
@@ -11,5 +11,5 @@
@interface ITRoundProgressView : UIControl
@property (nonatomic, assign) CGFloat progress;
-
+@property (nonatomic, strong) UIColor *progressColor;
@end
@@ -11,13 +11,15 @@
@implementation ITRoundProgressView
+@synthesize progressColor = _progressColor;
@synthesize progress = _progress;
- (id)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
if (self) {
self.backgroundColor = [UIColor clearColor];
+ self.progressColor = [UIColor controlBlueColor];
self.opaque = NO;
}
return self;
@@ -28,6 +30,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder
self = [super initWithCoder:aDecoder];
if (self) {
self.backgroundColor = [UIColor clearColor];
+ self.progressColor = [UIColor controlBlueColor];
self.opaque = NO;
}
return self;
@@ -45,6 +48,12 @@ - (void)setFrame:(CGRect)frame
[self setNeedsDisplay];
}
+- (void)setProgressColor:(UIColor *)progressColor
+{
+ _progressColor = progressColor;
+ [self setNeedsDisplay];
+}
+
- (void)drawRect:(CGRect)rect {
CGRect allRect = self.bounds;
@@ -53,7 +62,7 @@ - (void)drawRect:(CGRect)rect {
CGContextRef context = UIGraphicsGetCurrentContext();
CGFloat red, green, blue, alpha;
- [[UIColor controlBlueColor] getRed:&red green:&green blue:&blue alpha:&alpha];
+ [self.progressColor getRed:&red green:&green blue:&blue alpha:&alpha];
// Draw background
CGContextSetRGBStrokeColor(context, red, green, blue, 1.0f);
@@ -72,6 +81,8 @@ - (void)drawRect:(CGRect)rect {
CGContextAddArc(context, center.x, center.y, radius, startAngle, endAngle, 0);
CGContextClosePath(context);
CGContextFillPath(context);
+
+// [[NSString stringWithFormat:@"%d", (int)self.progress] drawAtPoint:CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect)) forWidth:3.0f withFont:[UIFont boldSystemFontOfSize:8] fontSize:8 lineBreakMode:UILineBreakModeClip baselineAdjustment:UIBaselineAdjustmentNone];
}
@end
@@ -60,7 +60,7 @@
<object class="IBUILabel" id="415682063">
<reference key="NSNextResponder" ref="603267354"/>
<int key="NSvFlags">297</int>
- <string key="NSFrame">{{166, 2}, {22, 21}}</string>
+ <string key="NSFrame">{{164, 2}, {22, 21}}</string>
<reference key="NSSuperview" ref="603267354"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="877767466"/>
@@ -122,14 +122,13 @@
<string key="NSFrame">{{267, 2}, {47, 21}}</string>
<reference key="NSSuperview" ref="603267354"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:328</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">N/A</string>
+ <string key="IBUIText">200KB/s</string>
<reference key="IBUITextColor" ref="54237955"/>
<nil key="IBUIHighlightedColor"/>
<reference key="IBUIShadowColor" ref="735838984"/>
@@ -151,7 +150,7 @@
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">N/A</string>
+ <string key="IBUIText">200KB/s</string>
<reference key="IBUITextColor" ref="54237955"/>
<nil key="IBUIHighlightedColor"/>
<reference key="IBUIShadowColor" ref="735838984"/>
@@ -17,6 +17,7 @@
#import "ITShadowView.h"
#import "ITInspectorCollectionViewController.h"
#import "ITAppDelegate.h"
+#import "UIColor+Style.h"
@implementation ITTransfersViewController
@synthesize sidebarItem = _sidebarItem;
@@ -216,6 +217,17 @@ - (void)fillInCell:(ITTransferCell*)cell withTorrent:(ITTorrent*)torrent
if ([[cell.roundProgressView allTargets] containsObject:self] == NO) {
[cell.roundProgressView addTarget:self action:@selector(progressControlTapped:) forControlEvents:UIControlEventTouchUpInside];
}
+
+// if ([torrent isActive]) {
+// if ([torrent isChecking])
+// cell.roundProgressView.progressColor = [UIColor controlYellowColor];
+// else if ([torrent isSeeding])
+// cell.roundProgressView.progressColor = [UIColor controlGreenColor];
+// else
+// cell.roundProgressView.progressColor = [UIColor controlBlueColor];
+// }
+// else
+// cell.roundProgressView.progressColor = [UIColor controlGreyColor];
}
- (void)progressControlTapped:(id)sender
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -52,7 +52,8 @@
<p>iTransmission is released under <a href="gplv3.html">GPLv3</a>. </p>
<span class="header">Credit</span>
<p>Mike Chen (@ccp0101 on Twitter) -- Author</p>
- <p>Hans Felsh</p>
+ <p>Hans Felsh (<a href="mailto:hfelsh@gmail.com">hfelsh@gmail.com</a>) -- Testing</p>
+ <p>Mathieu Bolard (<a href="mailto:me@mathieubolard.com">hme@mathieubolard.com</a>) -- Icons and tweaks</p>
<p><p>
</li>
</ul>
@@ -27,7 +27,7 @@
<li>With support for iPad it's now a universal app</li>
<li>Click to open finished downloads in files tab</li>
<li>Registered .torrent file handler, no Safari Download Manager required anymore</li>
- <li>Full support for iOS 5</li>
+ <li>Supports iOS 5</li>
<li>A lot of features have been disabled (or say left out) for now</li>
</ul>
</li>
@@ -12,5 +12,9 @@
+ (UIColor*)barBlueColor;
+ (UIColor*)controlBlueColor;
++ (UIColor*)controlGreenColor;
++ (UIColor*)controlRedColor;
++ (UIColor*)controlYellowColor;
++ (UIColor*)controlGreyColor;
@end
@@ -20,5 +20,24 @@ + (UIColor*)controlBlueColor
return [UIColor colorWithRed:0.09f green:0.32f blue:0.66f alpha:1.0f];
}
++ (UIColor*)controlGreenColor
+{
+ return [UIColor colorWithRed: 0.44 green: 0.89 blue: 0.40 alpha:1.0f];
+}
+
++ (UIColor*)controlRedColor
+{
+ return [UIColor colorWithRed:0.902 green: 0.439 blue: 0.451 alpha:1.0f];
+}
+
++ (UIColor*)controlYellowColor
+{
+ return [UIColor colorWithRed: 0.933 green: 0.890 blue: 0.243 alpha:1.0f];
+}
+
++ (UIColor*)controlGreyColor
+{
+ return [UIColor colorWithWhite:0.2f alpha:1.0f];
+}
@end
Binary file not shown.
Binary file not shown.
@@ -26,7 +26,14 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFiles</key>
- <array/>
+ <array>
+ <string>Icon-Small-50.png</string>
+ <string>Icon-iPad.png</string>
+ <string>Icon-Small@2x.png</string>
+ <string>Icon-Small.png</string>
+ <string>Icon@2x.png</string>
+ <string>Icon.png</string>
+ </array>
<key>CFBundleIdentifier</key>
<string>li.ccp.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -40,7 +47,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>20111111</string>
+ <string>3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIRequiredDeviceCapabilities</key>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>appleId</key>
+ <string>hfelsh@gmail.com</string>
+ <key>artistName</key>
+ <string>Mike Chen</string>
+ <key>bundleVersion</key>
+ <string>2.00</string>
+ <key>itemName</key>
+ <string>iTransmission</string>
+ <key>copyright</key>
+ <string>© 2011 Mike Chen</string>
+ <key>purchaseDate</key>
+ <date>2011-07-13T01:01:01Z</date>
+ <key>releaseDate</key>
+ <string>2011-07-13T01:01:01Z</string>
+ <key>fileExtension</key>
+ <string>.app</string>
+ <key>genre</key>
+ <string>Utilities</string>
+ <key>genreId</key>
+ <integer>6002</integer>
+ <key>kind</key>
+ <string>software</string>
+ <key>playlistArtistName</key>
+ <string>Mike Chen</string>
+ <key>playlistName</key>
+ <string>iTransmission</string>
+ <key>softwareIconNeedsShine</key>
+ <true/>
+ <key>softwareVersionBundleId</key>
+ <string>li.ccp.iTransmission</string>
+</dict>
+</plist>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 17692cf

Please sign in to comment.