[Bibdesk-commit] SF.net SVN: bibdesk: [5724] trunk/bibdesk_2_test

[<ho...@us...>]

Revision: 5724
Author:   hofman
Date:     2006-03-03 09:36:47 -0800 (Fri, 03 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5724&view=rev

Log Message:
-----------
Rename icon for library groups. 
Move setter for icon to library group. 
Set priority for folder groups and change it for smart groups. 

Modified Paths:
--------------
    trunk/bibdesk_2_test/BDSKSmartGroup.h
    trunk/bibdesk_2_test/BDSKSmartGroup.m
    trunk/bibdesk_2_test/BDSKStaticGroup.m

Added Paths:
-----------
    trunk/bibdesk_2_test/Images/LibraryGroupIcon.tiff

Removed Paths:
-------------
    trunk/bibdesk_2_test/Images/RootGroupIcon.tiff
Modified: trunk/bibdesk_2_test/BDSKSmartGroup.h
===================================================================
--- trunk/bibdesk_2_test/BDSKSmartGroup.h	2006-03-03 15:48:24 UTC (rev 5723)
+++ trunk/bibdesk_2_test/BDSKSmartGroup.h	2006-03-03 17:36:47 UTC (rev 5724)
@@ -13,7 +13,6 @@
 @interface BDSKSmartGroup : BDSKGroup {
     NSSet *items;
     NSMutableSet *children;
-    NSString *groupImageName;
     BOOL isToMany;
     BOOL recreatingChildren;
 }
@@ -29,8 +28,6 @@
 
 - (NSFetchRequest *)fetchRequest;
 
-- (void)setGroupImageName:(NSString *)imageName;
-
 - (NSSet *)items;
 
 - (NSSet *)children;
@@ -44,7 +41,11 @@
 
 
 @interface BDSKLibraryGroup :  BDSKSmartGroup {
+    NSString *groupImageName;
 }
+
+- (void)setGroupImageName:(NSString *)imageName;
+
 @end
 
 
@@ -55,6 +56,4 @@
 - (NSSet *)items;
 - (void)setItems:(NSSet *)newItems;
 
-- (NSSet *)children;
-
 @end

Modified: trunk/bibdesk_2_test/BDSKSmartGroup.m
===================================================================
--- trunk/bibdesk_2_test/BDSKSmartGroup.m	2006-03-03 15:48:24 UTC (rev 5723)
+++ trunk/bibdesk_2_test/BDSKSmartGroup.m	2006-03-03 17:36:47 UTC (rev 5724)
@@ -42,7 +42,6 @@
 	[super dealloc];
 }
 
-
 - (void)commonAwake {
     [[NSNotificationCenter defaultCenter] addObserver:self 
                                              selector:@selector(managedObjectContextObjectsDidChange:) 
@@ -53,7 +52,7 @@
     children = nil;
     
     [self willAccessValueForKey:@"priority"];
-    [self setValue:[NSNumber numberWithInt:2] forKeyPath:@"priority"];
+    [self setValue:[NSNumber numberWithInt:1] forKeyPath:@"priority"];
     [self didAccessValueForKey:@"priority"];
     
     [self refreshMetaData];
@@ -264,17 +263,8 @@
     [self didChangeValueForKey:@"itemPropertyName"];
 }
 
-- (void)setGroupImageName:(NSString *)imageName {
-    if (![groupImageName isEqualToString:imageName]) {
-        [groupImageName release];
-        groupImageName = [imageName retain];
-        [cachedIcon release];
-        cachedIcon = nil;
-    }
-}
-
 - (NSString *)groupImageName {
-    return (groupImageName != nil) ? groupImageName : @"SmartGroupIcon";
+    return @"SmartGroupIcon";
 }
 
 - (BOOL)isLeaf { return ([self valueForKey:@"itemPropertyName"] == nil); }
@@ -388,8 +378,17 @@
 
 - (BOOL)canEditName { return NO; }
 
+- (void)setGroupImageName:(NSString *)imageName {
+    if (![groupImageName isEqualToString:imageName]) {
+        [groupImageName release];
+        groupImageName = [imageName retain];
+        [cachedIcon release];
+        cachedIcon = nil;
+    }
+}
+
 - (NSString *)groupImageName {
-    return (groupImageName != nil) ? groupImageName : @"RootGroupIcon";
+    return (groupImageName != nil) ? groupImageName : @"LibraryGroupIcon";
 }
 
 - (NSString *)itemPropertyName { return nil; }

Modified: trunk/bibdesk_2_test/BDSKStaticGroup.m
===================================================================
--- trunk/bibdesk_2_test/BDSKStaticGroup.m	2006-03-03 15:48:24 UTC (rev 5723)
+++ trunk/bibdesk_2_test/BDSKStaticGroup.m	2006-03-03 17:36:47 UTC (rev 5724)
@@ -45,6 +45,22 @@
         triggerChangeNotificationsForDependentKey:@"items"];
 }
 
+- (void)commonAwake {
+    [self willAccessValueForKey:@"priority"];
+    [self setValue:[NSNumber numberWithInt:2] forKeyPath:@"priority"];
+    [self didAccessValueForKey:@"priority"];
+}
+
+- (void)awakeFromInsert  {
+    [super awakeFromInsert];
+    [self commonAwake];
+}
+
+- (void)awakeFromFetch {
+    [super awakeFromFetch];
+    [self commonAwake];
+}
+
 #pragma mark Accessors
 
 - (NSString *)groupImageName {

Copied: trunk/bibdesk_2_test/Images/LibraryGroupIcon.tiff (from rev 5701, trunk/bibdesk_2_test/Images/RootGroupIcon.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/bibdesk_2_test/Images/RootGroupIcon.tiff
===================================================================
(Binary files differ)



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.