Revision: 12580
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12580&view=rev
Author: hofman
Date: 2008-01-19 08:14:56 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
More consistent handling of Finder labels. Let FVFinderLabel handle the bit
shift.
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFinderLabel.m
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFinderLabel.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFinderLabel.m 2008-01-19
12:22:05 UTC (rev 12579)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFinderLabel.m 2008-01-19
16:14:56 UTC (rev 12580)
@@ -323,6 +323,10 @@
{
FSRef fileRef;
+ NSParameterAssert(label <= 7);
+
+ if (label > 7) label = 0;
+
if ([aURL isFileURL] && CFURLGetFSRef((CFURLRef)aURL, &fileRef)) {
FSCatalogInfo catalogInfo;
@@ -333,6 +337,8 @@
if (noErr == err) {
+ label = (label << 1L);
+
// coerce to FolderInfo or FileInfo as needed and set the color bit
if ((catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) {
FolderInfo *fInfo = (FolderInfo *)&catalogInfo.finderInfo;
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m 2008-01-19
12:22:05 UTC (rev 12579)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m 2008-01-19
16:14:56 UTC (rev 12580)
@@ -2296,10 +2296,8 @@
{
// Sender is an NSMenuItem, and tag corresponds to the Finder label integer
NSInteger label = [sender tag];
- NSParameterAssert(label >= 0 && label <= 6);
+ NSParameterAssert(label >= 0 && label <= 7);
- label = (label << 1);
-
NSArray *selectedURLs = [self _selectedURLs];
NSUInteger i, iMax = [selectedURLs count];
for (i = 0; i < iMax; i++) {
@@ -2338,7 +2336,7 @@
iconRect.size = NSMakeSize(12, 12);
NSBezierPath *clipPath = [NSBezierPath
bezierPathWithRoundRect:iconRect xRadius:3.0 yRadius:3.0];
- for (i = 0; i < 7; i++) {
+ for (i = 0; i < 8; i++) {
anItem = [submenu addItemWithTitle:[FVFinderLabel
localizedNameForLabel:i] action:@selector(changeFinderLabel:)
keyEquivalent:@""];
[anItem setTag:i];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
