Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

New Icons #1129

Merged
merged 8 commits into from

2 participants

@pjrobertson
Owner

This pull request includes all the icons by Dan Deming-Henes

It also contains a few fixes for the count images (Something I broke during the 64 bit changes) and a single localisation :)

pjrobertson added some commits
@pjrobertson pjrobertson Fix a crash when resetting preferences 8747a65
@pjrobertson pjrobertson Remove a private method to fix a bug in Primer interface
In the 3rd pane in Primer, for some reason when typing in text mode the 3rd pane's text/view slowly changes to look worse and worse.

Morale of the story? Don't call private methods....? :/
3cfceba
@pjrobertson pjrobertson Merge branch 'master' of github.com:quicksilver/Quicksilver 6f244d5
@pjrobertson pjrobertson Add updated and new icons by Dan Deming-Henes
http://strandeddesign.com

The old reference to the mail count badges has been removed, and QS's own badges are now used
74e6ba0
@pjrobertson pjrobertson Remove unused methods, and fix calls to the correct QSCountBadgeImage…
… subclass method
81b82d0
@pjrobertson pjrobertson Localise the term 'Combined Objects'
Hopefully genstrings will pull the string into the en Localizable.strings file ;-)
68a46e7
@pjrobertson

/3.5 works better for centring the text that /4.
You do the maths :)

@pjrobertson

I've searched the code and the plugins for these two methods. Not used anywhere, and they've been put in the QSCountBadgeImage class anyway :)

@skurfer
Owner

The badge number centers nicely in Bezel, but it's way down low in Nostromo. Something I need to fix there? Other than that, looks good.

@pjrobertson
Owner
@pjrobertson
Owner

Lucky for you, it was a bug in the code. Good spot :)

Should be fixed now

@skurfer
Owner

Oh, it was supposed to go on the icon, not in the upper right of the interface? Makes sense. :-)

Also, I noticed there is a way to "explode" things selected with ⌘A: → or /. But we should make something that works with the comma-trick, too.

@skurfer skurfer merged commit b7885ef into quicksilver:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 7, 2012
  1. @pjrobertson
  2. @pjrobertson

    Remove a private method to fix a bug in Primer interface

    pjrobertson authored
    In the 3rd pane in Primer, for some reason when typing in text mode the 3rd pane's text/view slowly changes to look worse and worse.
    
    Morale of the story? Don't call private methods....? :/
  3. @pjrobertson
Commits on Sep 20, 2012
  1. @pjrobertson

    Add updated and new icons by Dan Deming-Henes

    pjrobertson authored
    http://strandeddesign.com
    
    The old reference to the mail count badges has been removed, and QS's own badges are now used
  2. @pjrobertson
  3. @pjrobertson

    Localise the term 'Combined Objects'

    pjrobertson authored
    Hopefully genstrings will pull the string into the en Localizable.strings file ;-)
Commits on Sep 21, 2012
  1. @pjrobertson
  2. @pjrobertson
This page is out of date. Refresh to see the latest.
Showing with 34 additions and 51 deletions.
  1. +4 −3 Quicksilver/Code-QuickStepCore/QSBadgeImage.m
  2. +1 −1  Quicksilver/Code-QuickStepCore/QSObject.m
  3. +3 −37 Quicksilver/Code-QuickStepInterface/QSObjectCell.m
  4. +24 −0 Quicksilver/Quicksilver.xcodeproj/project.pbxproj
  5. BIN  Quicksilver/Resources/Images/AppearanceBack.png
  6. BIN  Quicksilver/Resources/Images/AppearanceSelection.png
  7. BIN  Quicksilver/Resources/Images/AppearanceText.png
  8. BIN  Quicksilver/Resources/Images/BackArrow.png
  9. BIN  Quicksilver/Resources/Images/Button-Add.png
  10. BIN  Quicksilver/Resources/Images/Button-AddMenu.png
  11. BIN  Quicksilver/Resources/Images/Button-GearMenu.png
  12. BIN  Quicksilver/Resources/Images/Button-Info.png
  13. BIN  Quicksilver/Resources/Images/Button-Remove.png
  14. BIN  Quicksilver/Resources/Images/Button-Rescan.png
  15. BIN  Quicksilver/Resources/Images/ContactEmail.icns
  16. BIN  Quicksilver/Resources/Images/DefaultBookmarkIcon.icns
  17. BIN  Quicksilver/Resources/Images/Find.icns
  18. BIN  Quicksilver/Resources/Images/ForwardArrow.png
  19. BIN  Quicksilver/Resources/Images/KeyboardTrigger.png
  20. BIN  Quicksilver/Resources/Images/Pref-PlugIns.png
  21. BIN  Quicksilver/Resources/Images/Pref-Settings.png
  22. BIN  Quicksilver/Resources/Images/QSPlugIn.icns
  23. BIN  Quicksilver/Resources/Images/QuicksilverMenu.png
  24. BIN  Quicksilver/Resources/Images/QuicksilverMenuLight.png
  25. BIN  Quicksilver/Resources/Images/QuicksilverMenuPressed.png
  26. BIN  Quicksilver/Resources/Images/countBadge1&2.tiff
  27. BIN  Quicksilver/Resources/Images/countBadge3.tiff
  28. BIN  Quicksilver/Resources/Images/countBadge4.tiff
  29. BIN  Quicksilver/Resources/Images/countBadge5.tiff
  30. BIN  Quicksilver/Resources/Images/defaultAction.icns
  31. BIN  Quicksilver/Resources/Images/prefsGeneral.png
  32. +2 −10 Quicksilver/Resources/ResourceLocations.plist
View
7 Quicksilver/Code-QuickStepCore/QSBadgeImage.m
@@ -41,11 +41,12 @@ - (void)drawBadgeForIconRect:(NSRect)rect {
[self drawInRect:alignRectInRect(countImageRect, rect, 3) fromRect:countImageRect operation:NSCompositeSourceOver fraction:1.0];
}
-- (void)drawInRect:(NSRect)rect fromRect:(NSRect)fromRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta {
- [super drawInRect:rect fromRect:rectFromSize([self size]) operation:op fraction:delta];
+- (void)drawInRect:(NSRect)rect fromRect:(NSRect)fromRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta respectFlipped:(BOOL)respectContextIsFlipped hints:(NSDictionary *)hints {
+
+ [super drawInRect:rect fromRect:rectFromSize([self size]) operation:op fraction:delta respectFlipped:respectContextIsFlipped hints:hints];
NSString *numString = [NSString stringWithFormat:@"%ld", (long)count];
- NSRect textRect = NSInsetRect(rect, NSHeight(rect) /4, NSHeight(rect)/4);
+ NSRect textRect = NSInsetRect(rect, NSHeight(rect) /3.5, NSHeight(rect)/4);
NSDictionary *numAttributes = [numString attributesToFitNumbersInRect:textRect withAttributes:countBadgeTextAttributes];
NSRect glyphRect = rectFromSize([numString sizeWithAttributes:numAttributes]);
View
2  Quicksilver/Code-QuickStepCore/QSObject.m
@@ -296,7 +296,7 @@ + (id)objectByMergingObjects:(NSArray *)objects {
[object guessName];
else
// fall back on setting a simple name
- [object setName:@"combined objects"];
+ [object setName:NSLocalizedString(@"Combined Objects", nil)];
return object;
}
View
40 Quicksilver/Code-QuickStepInterface/QSObjectCell.m
@@ -18,39 +18,6 @@
#define countBadgeTextAttributes [NSDictionary dictionaryWithObjectsAndKeys:[NSFont boldSystemFontOfSize:24] , NSFontAttributeName, [NSColor whiteColor] , NSForegroundColorAttributeName, nil]
-
-NSImage *QSBadgeImageForCount(NSInteger count) {
- if (count <= 1) return nil;
- NSImage *badgeImage = nil;
- NSString *numString = [NSString stringWithFormat:@"%ld", (long)count];
- if ([numString length] <3)
- badgeImage = [QSResourceManager imageNamed:@"dragBadge1-2"];
- else if ([numString length] <4)
- badgeImage = [QSResourceManager imageNamed:@"dragBadge3"];
- else if ([numString length] <5)
- badgeImage = [QSResourceManager imageNamed:@"dragBadge4"];
- else
- badgeImage = [QSResourceManager imageNamed:@"dragBadge5"];
-
- if (!badgeImage) return nil;
- return badgeImage;
-}
-
-void QSDrawCountBadgeInRect(NSImage *countImage, NSRect badgeRect, NSInteger count) {
- [countImage drawInRect:badgeRect fromRect:rectFromSize([countImage size]) operation:NSCompositeSourceOver fraction:1.0];
- NSString *numString = [NSString stringWithFormat:@"%ld", (long)count];
- NSRect textRect = NSInsetRect(badgeRect, NSHeight(badgeRect) /4, NSHeight(badgeRect)/4);
- NSDictionary *numAttributes = [numString attributesToFitNumbersInRect:textRect withAttributes:countBadgeTextAttributes];
- // NSLog(@"font metric: %f %f", [[numAttributes objectForKey:NSFontAttributeName] ascender] , [[numAttributes objectForKey:NSFontAttributeName] descender]);
- NSRect glyphRect = rectFromSize([numString sizeWithAttributes:numAttributes]);
- NSRect countTextRect = centerRectInRect(glyphRect, badgeRect);
- countTextRect.origin.y += (NSHeight(glyphRect) -[[numAttributes objectForKey:NSFontAttributeName] ascender])/2;
-
- // [[NSColor blackColor] set];
- // NSFrameRect(countTextRect);
- [numString drawInRect:countTextRect withAttributes:numAttributes];
-}
-
@implementation QSObjectCell
@@ -585,11 +552,10 @@ - (void)drawObjectImage:(QSObject *)drawObject inRect:(NSRect)drawingRect cellFr
[cornerBadge drawInRect:badgeRect fromRect:rectFromSize([cornerBadge size]) operation:NSCompositeSourceOver fraction:1.0 respectFlipped:flipped hints:nil];
}
- if ([drawObject primaryCount] >1 && MIN(NSWidth(drawingRect), NSHeight(drawingRect) ) >= 64) {
- NSImage *countImage = [QSCountBadgeImage badgeForCount:[drawObject primaryCount]];
- //NSImage *countImage = QSBadgeImageForCount([drawObject primaryCount]);
+ if ([drawObject primaryCount] > 1 && MIN(NSWidth(drawingRect), NSHeight(drawingRect) ) >= 64) {
+ QSCountBadgeImage *countImage = [QSCountBadgeImage badgeForCount:[drawObject primaryCount]];
if (countImage) {
- NSRect badgeRect = [self badgeRectForBounds:cellFrame badgeImage:countImage];
+ NSRect badgeRect = [self badgeRectForBounds:drawingRect badgeImage:countImage];
[countImage drawInRect:badgeRect fromRect:rectFromSize([countImage size]) operation:NSCompositeSourceOver fraction:1.0 respectFlipped:flipped hints:nil];
}
}
View
24 Quicksilver/Quicksilver.xcodeproj/project.pbxproj
@@ -364,6 +364,10 @@
CDCC201010A4C14B009C4EED /* QSMDPredicate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCC200E10A4C14B009C4EED /* QSMDPredicate.h */; settings = {ATTRIBUTES = (Public, ); }; };
CDCC201110A4C14B009C4EED /* QSMDPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = CDCC200F10A4C14B009C4EED /* QSMDPredicate.m */; };
CDD30969160AEB0800CD34EC /* QSAction.name.strings in Resources */ = {isa = PBXBuildFile; fileRef = 423DA024132F7A2C005ED70F /* QSAction.name.strings */; };
+ CDD3096E160B860A00CD34EC /* countBadge1&2.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CDD3096A160B860A00CD34EC /* countBadge1&2.tiff */; };
+ CDD3096F160B860A00CD34EC /* countBadge3.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CDD3096B160B860A00CD34EC /* countBadge3.tiff */; };
+ CDD30970160B860A00CD34EC /* countBadge4.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CDD3096C160B860A00CD34EC /* countBadge4.tiff */; };
+ CDD30971160B860A00CD34EC /* countBadge5.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CDD3096D160B860A00CD34EC /* countBadge5.tiff */; };
CDD36AF414CD50CC00F5CEC4 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F8D135E09187AE20062C966 /* Quartz.framework */; };
CDD36AF514CD50CD00F5CEC4 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F8D135E09187AE20062C966 /* Quartz.framework */; };
CDDB44E41518C53300800B66 /* QSCrashReporter.xib in Resources */ = {isa = PBXBuildFile; fileRef = CDDB44E31518C53300800B66 /* QSCrashReporter.xib */; };
@@ -1397,6 +1401,10 @@
CDC9C6C413DA2B6D0053B09C /* Clipboard.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Clipboard.icns; sourceTree = "<group>"; };
CDCC200E10A4C14B009C4EED /* QSMDPredicate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSMDPredicate.h; sourceTree = "<group>"; };
CDCC200F10A4C14B009C4EED /* QSMDPredicate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSMDPredicate.m; sourceTree = "<group>"; };
+ CDD3096A160B860A00CD34EC /* countBadge1&2.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "countBadge1&2.tiff"; sourceTree = "<group>"; };
+ CDD3096B160B860A00CD34EC /* countBadge3.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = countBadge3.tiff; sourceTree = "<group>"; };
+ CDD3096C160B860A00CD34EC /* countBadge4.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = countBadge4.tiff; sourceTree = "<group>"; };
+ CDD3096D160B860A00CD34EC /* countBadge5.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = countBadge5.tiff; sourceTree = "<group>"; };
CDDB44E31518C53300800B66 /* QSCrashReporter.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = QSCrashReporter.xib; sourceTree = "<group>"; };
CDDB44E51518C78F00800B66 /* QSCrashReporterWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSCrashReporterWindowController.h; sourceTree = "<group>"; };
CDDB44E61518C78F00800B66 /* QSCrashReporterWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSCrashReporterWindowController.m; sourceTree = "<group>"; };
@@ -2202,6 +2210,17 @@
path = QSDroplet;
sourceTree = "<group>";
};
+ CDD30972160B860C00CD34EC /* Count Badges */ = {
+ isa = PBXGroup;
+ children = (
+ CDD3096A160B860A00CD34EC /* countBadge1&2.tiff */,
+ CDD3096B160B860A00CD34EC /* countBadge3.tiff */,
+ CDD3096C160B860A00CD34EC /* countBadge4.tiff */,
+ CDD3096D160B860A00CD34EC /* countBadge5.tiff */,
+ );
+ name = "Count Badges";
+ sourceTree = "<group>";
+ };
CDE1E65F158A4CFD00355A9F /* VDKQueue */ = {
isa = PBXGroup;
children = (
@@ -2299,6 +2318,7 @@
E103EC8506471DBF00447FE0 /* Images */ = {
isa = PBXGroup;
children = (
+ CDD30972160B860C00CD34EC /* Count Badges */,
CDA9D3DD1549D13B00607BE4 /* AlertCautionIcon.icns */,
7F46BFDC0A87F37F002D31E8 /* prefsGeneral.png */,
7F4ADB5E0A4EB766002A2A1B /* BackArrow.png */,
@@ -3730,6 +3750,10 @@
4D62E31C1476919300362E9A /* QSTriggersPrefPane.strings in Resources */,
CDDB44E41518C53300800B66 /* QSCrashReporter.xib in Resources */,
CDA9D3DE1549D13B00607BE4 /* AlertCautionIcon.icns in Resources */,
+ CDD3096E160B860A00CD34EC /* countBadge1&2.tiff in Resources */,
+ CDD3096F160B860A00CD34EC /* countBadge3.tiff in Resources */,
+ CDD30970160B860A00CD34EC /* countBadge4.tiff in Resources */,
+ CDD30971160B860A00CD34EC /* countBadge5.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  Quicksilver/Resources/Images/AppearanceBack.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/AppearanceSelection.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/AppearanceText.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/BackArrow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-Add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-AddMenu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-GearMenu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-Info.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-Remove.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Button-Rescan.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/ContactEmail.icns
Binary file not shown
View
BIN  Quicksilver/Resources/Images/DefaultBookmarkIcon.icns
Binary file not shown
View
BIN  Quicksilver/Resources/Images/Find.icns
Binary file not shown
View
BIN  Quicksilver/Resources/Images/ForwardArrow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/KeyboardTrigger.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Pref-PlugIns.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/Pref-Settings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/QSPlugIn.icns
Binary file not shown
View
BIN  Quicksilver/Resources/Images/QuicksilverMenu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/QuicksilverMenuLight.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/QuicksilverMenuPressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quicksilver/Resources/Images/countBadge1&2.tiff
Binary file not shown
View
BIN  Quicksilver/Resources/Images/countBadge3.tiff
Binary file not shown
View
BIN  Quicksilver/Resources/Images/countBadge4.tiff
Binary file not shown
View
BIN  Quicksilver/Resources/Images/countBadge5.tiff
Binary file not shown
View
BIN  Quicksilver/Resources/Images/defaultAction.icns
Binary file not shown
View
BIN  Quicksilver/Resources/Images/prefsGeneral.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
12 Quicksilver/Resources/ResourceLocations.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AFPClient</key>
@@ -28,7 +28,7 @@
<array>
<dict>
<key>type</key>
- <string>'osas'</string>
+ <string>&apos;osas&apos;</string>
</dict>
</array>
<key>Computer</key>
@@ -93,14 +93,6 @@
</array>
<key>commandIcon</key>
<string>ForwardArrowIcon</string>
- <key>countBadge1&amp;2</key>
- <string>/Applications/Mail.app/Contents/Resources/newMailBadge1&amp;2.tiff</string>
- <key>countBadge3</key>
- <string>/Applications/Mail.app/Contents/Resources/newMailBadge3.tiff</string>
- <key>countBadge4</key>
- <string>/Applications/Mail.app/Contents/Resources/newMailBadge4.tiff</string>
- <key>countBadge5</key>
- <string>/Applications/Mail.app/Contents/Resources/newMailBadge5.tiff</string>
<key>extrasIcon</key>
<string>AlertNoteIcon</string>
<key>genericPerson</key>
Something went wrong with that request. Please try again.